From c40eb28e71676fe33949f181b72c8591012493fc Mon Sep 17 00:00:00 2001 From: yrriban Date: Wed, 12 Mar 2025 22:26:53 -0400 Subject: [PATCH] Fix demo_in; add a dsda path selector; add a text generation without the MAP prefix. --- dcc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dcc b/dcc index dca5e69..2f9ebaf 100755 --- a/dcc +++ b/dcc @@ -8,13 +8,14 @@ fi PWAD="$2" MAP="$3" COMMAND=() +DSDA="${HOME}/dsda-doom/dsda-0.28.3" PWADPATH="${HOME}/doom/pwads/${PWAD}" DEMOPATH="${HOME}/doom/demos/${PWAD}" VIDPATH="${HOME}/doom/fabricate/${PWAD}" MAPSTR="$(tr ' ' '-' <<< "${MAP}")" MAPFILE="${PWAD}_map${MAPSTR}" DEMONAME="${MAPFILE}.lmp" -DEMO_IN="$(find "${DEMOPATH}" -name "${MAPFILE}"'*' | tail -2 | head -1)" +DEMO_IN="$(ls "${DEMOPATH}/${MAPFILE}"* -t | head -1)" if ! [[ -e "${PWADPATH}" ]]; then echo "PWAD ${PWAD} not found." >&2 @@ -49,6 +50,15 @@ case $1 in display "${HOME}/doom/fabricate/${PWAD}/${PWAD}_map${MAPSTR}_base.png" exit $? ;; + "nmtext") + LABEL="$(printf "%s\nUV-Max Demo" "$(cat -)")" + convert -background transparent -fill white -font "League-Spartan-Bold" -strokewidth 10 \ + -stroke "srgb(176,0,0)" -interline-spacing -10 -pointsize 64 -trim +repage -border 5 \ + -bordercolor transparent -gravity NorthWest \ + label:"${LABEL}" -stroke none -strokewidth 0 -annotate +8+6 "${LABEL}" \ + "${HOME}/doom/fabricate/${PWAD}/${PWAD}_map${MAPSTR}_text.png" + exit $? + ;; "text") LABEL="$(printf "MAP%s: %s\nUV-Max Demo" "${MAPSTR}" "$(cat -)")" convert -background transparent -fill white -font "League-Spartan-Bold" -strokewidth 10 \ @@ -103,6 +113,5 @@ if [[ -e "${PWADPATH}/options" ]]; then OPTIONS=("-assign" "$(< "${PWADPATH}/options")") fi # TODO: properly split MAP into an array in case this is a UDoom wad. -/home/tynan/src/dsda-doom/prboom2/cmake/dsda-doom \ - -skill 4 -warp ${MAP} \ +"${DSDA}" -skill 4 -warp ${MAP} \ "${IWAD[@]}" "${WADS[@]}" "${DEH[@]}" "${COMPLEVEL[@]}" "${OPTIONS[@]}" "${COMMAND[@]}"