diff --git a/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json b/data/.wolf3d/N3Ddata.cdogscpn/character_classes.json index 4676fceff..005a754f9 100644 --- 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 index 9477e7cef..de4abca6c 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/legs_idle_24x24.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/legs_idle_24x24.png differ 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 index 7bd41e29f..bd87a791d 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/legs_run_24x24.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/legs_run_24x24.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/src.blend b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/src.blend index 2c3b602fc..ca45acd7d 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/src.blend and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/src.blend differ 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 index 25a480859..3b755716f 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_24x24.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_24x24.png differ diff --git a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_handgun_24x24.png b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_handgun_24x24.png index c77e4378c..b8b4eba49 100644 Binary files a/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_handgun_24x24.png and b/data/.wolf3d/N3Ddata.cdogscpn/graphics/chars/bodies/sheep/upper_idle_handgun_24x24.png differ diff --git a/graphics/chars/bodies/base/legs_idle_24x24.png b/graphics/chars/bodies/base/legs_idle_24x24.png index b8c458350..d5f717154 100644 Binary files a/graphics/chars/bodies/base/legs_idle_24x24.png and b/graphics/chars/bodies/base/legs_idle_24x24.png differ diff --git a/graphics/chars/bodies/base/legs_run_24x24.png b/graphics/chars/bodies/base/legs_run_24x24.png index 99d5424b1..28ade2716 100644 Binary files a/graphics/chars/bodies/base/legs_run_24x24.png and b/graphics/chars/bodies/base/legs_run_24x24.png differ diff --git a/graphics/chars/bodies/base/src.blend b/graphics/chars/bodies/base/src.blend index 9503132cf..c68a36ac4 100644 Binary files a/graphics/chars/bodies/base/src.blend and b/graphics/chars/bodies/base/src.blend differ diff --git a/graphics/chars/bodies/base/upper_idle_24x24.png b/graphics/chars/bodies/base/upper_idle_24x24.png index 7eedc2d3c..71b564c32 100644 Binary files a/graphics/chars/bodies/base/upper_idle_24x24.png and b/graphics/chars/bodies/base/upper_idle_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_idle_dualgun_24x24.png b/graphics/chars/bodies/base/upper_idle_dualgun_24x24.png index b3e0c65ba..89ab86ff4 100644 Binary files a/graphics/chars/bodies/base/upper_idle_dualgun_24x24.png and b/graphics/chars/bodies/base/upper_idle_dualgun_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_idle_handgun_24x24.png b/graphics/chars/bodies/base/upper_idle_handgun_24x24.png index f824e9021..c26bd66be 100644 Binary files a/graphics/chars/bodies/base/upper_idle_handgun_24x24.png and b/graphics/chars/bodies/base/upper_idle_handgun_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_idle_rifle_24x24.png b/graphics/chars/bodies/base/upper_idle_rifle_24x24.png index 18839ebd8..84203b94b 100644 Binary files a/graphics/chars/bodies/base/upper_idle_rifle_24x24.png and b/graphics/chars/bodies/base/upper_idle_rifle_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_idle_riflefire_24x24.png b/graphics/chars/bodies/base/upper_idle_riflefire_24x24.png index 633263708..9ec3c963e 100644 Binary files a/graphics/chars/bodies/base/upper_idle_riflefire_24x24.png and b/graphics/chars/bodies/base/upper_idle_riflefire_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_run_24x24.png b/graphics/chars/bodies/base/upper_run_24x24.png index 0d2a6578c..b1781105a 100644 Binary files a/graphics/chars/bodies/base/upper_run_24x24.png and b/graphics/chars/bodies/base/upper_run_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_run_dualgun_24x24.png b/graphics/chars/bodies/base/upper_run_dualgun_24x24.png index 2f73ba204..70864bf04 100644 Binary files a/graphics/chars/bodies/base/upper_run_dualgun_24x24.png and b/graphics/chars/bodies/base/upper_run_dualgun_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_run_handgun_24x24.png b/graphics/chars/bodies/base/upper_run_handgun_24x24.png index f83d3129b..d33fa53a8 100644 Binary files a/graphics/chars/bodies/base/upper_run_handgun_24x24.png and b/graphics/chars/bodies/base/upper_run_handgun_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_run_rifle_24x24.png b/graphics/chars/bodies/base/upper_run_rifle_24x24.png index f88f1ddf3..ecd658aca 100644 Binary files a/graphics/chars/bodies/base/upper_run_rifle_24x24.png and b/graphics/chars/bodies/base/upper_run_rifle_24x24.png differ diff --git a/graphics/chars/bodies/base/upper_run_riflefire_24x24.png b/graphics/chars/bodies/base/upper_run_riflefire_24x24.png index 01e4d0d33..94d567514 100644 Binary files a/graphics/chars/bodies/base/upper_run_riflefire_24x24.png and b/graphics/chars/bodies/base/upper_run_riflefire_24x24.png differ diff --git a/graphics/chars/bodies/make_spritesheet.sh b/graphics/chars/bodies/make_spritesheet.sh index 1c28c3a41..4db910394 100755 --- 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