Sheep body #712

cxong · Sep 13, 2024 · 2023f7e · 2023f7e
1 parent 5e4ceff
commit 2023f7e
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 3 deletions.
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json b/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json
@@ -8,7 +8,7 @@
         "Sprites": "chars/heads/jones"
       },
       "Sounds": "man",
-      "BloodColor": "0066ff"
+      "BloodColor": "00ccff"
     },
     {
       "Name": "Naamah",
@@ -17,7 +17,7 @@
         "Sprites": "chars/heads/lady"
       },
       "Sounds": "woman",
-      "BloodColor": "0066ff"
+      "BloodColor": "00ccff"
     },
     {
       "Name": "Sheep",

diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/legs_idle_24x24.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/legs_idle_24x24.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/legs_run_24x24.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/legs_run_24x24.png
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/src.blend b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/src.blend
diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_24x24.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_24x24.png
diff --git a/...olf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_handgun_24x24.png b/...olf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_handgun_24x24.png
diff --git a/graphics/chars/bodies/base/legs_idle_24x24.png b/graphics/chars/bodies/base/legs_idle_24x24.png
diff --git a/graphics/chars/bodies/base/legs_run_24x24.png b/graphics/chars/bodies/base/legs_run_24x24.png
diff --git a/graphics/chars/bodies/base/src.blend b/graphics/chars/bodies/base/src.blend
diff --git a/graphics/chars/bodies/base/upper_idle_24x24.png b/graphics/chars/bodies/base/upper_idle_24x24.png
diff --git a/graphics/chars/bodies/base/upper_idle_dualgun_24x24.png b/graphics/chars/bodies/base/upper_idle_dualgun_24x24.png
diff --git a/graphics/chars/bodies/base/upper_idle_handgun_24x24.png b/graphics/chars/bodies/base/upper_idle_handgun_24x24.png
diff --git a/graphics/chars/bodies/base/upper_idle_rifle_24x24.png b/graphics/chars/bodies/base/upper_idle_rifle_24x24.png
diff --git a/graphics/chars/bodies/base/upper_idle_riflefire_24x24.png b/graphics/chars/bodies/base/upper_idle_riflefire_24x24.png
diff --git a/graphics/chars/bodies/base/upper_run_24x24.png b/graphics/chars/bodies/base/upper_run_24x24.png
diff --git a/graphics/chars/bodies/base/upper_run_dualgun_24x24.png b/graphics/chars/bodies/base/upper_run_dualgun_24x24.png
diff --git a/graphics/chars/bodies/base/upper_run_handgun_24x24.png b/graphics/chars/bodies/base/upper_run_handgun_24x24.png
diff --git a/graphics/chars/bodies/base/upper_run_rifle_24x24.png b/graphics/chars/bodies/base/upper_run_rifle_24x24.png
diff --git a/graphics/chars/bodies/base/upper_run_riflefire_24x24.png b/graphics/chars/bodies/base/upper_run_riflefire_24x24.png
diff --git a/graphics/chars/bodies/make_spritesheet.sh b/graphics/chars/bodies/make_spritesheet.sh
@@ -3,6 +3,7 @@
 # Create character spritesheet and join all the rendered images
 #
 set -e
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 if [ "$#" -ne 1 ]; then
     echo "Usage: make_spritesheet.sh body"
     exit 1
@@ -37,6 +38,7 @@ do
     fi
     for action in $actions
     do
+      rm -rf out
       if [[ $action == *"run"* ]]
       then
         frames=$run_frames
@@ -48,7 +50,7 @@ do
       then
         collections=$collections,hand_right
       fi
-      "$BLENDER" -noaudio -b "$INFILE" -P render.py -- "$collections" "$action" "$frames" "$part"
+      "$BLENDER" -noaudio -b "$INFILE" -P ${SCRIPT_DIR}/render.py -- "$collections" "$action" "$frames" "$part"
 
       DIMENSIONS=`identify -format "%wx%h" "out/${part}_${action}_0_00.png"`
       OUTFILE=$1/${part}_${action}_${DIMENSIONS}.png