diff --git a/TODO.md b/TODO.md index 6ec3260..33c103a 100644 --- a/TODO.md +++ b/TODO.md @@ -3,3 +3,4 @@ - Makefile for caco plush sprites - Brightmaps for caco plush - Fix wiring kit brightmaps +- Organize source_data diff --git a/sounds/kiri_caco_despawn.ogg b/sounds/kiri_caco_despawn.ogg new file mode 100644 index 0000000..f618712 Binary files /dev/null and b/sounds/kiri_caco_despawn.ogg differ diff --git a/sounds/kiri_caco_throw.ogg b/sounds/kiri_caco_throw.ogg new file mode 100644 index 0000000..384c7b4 Binary files /dev/null and b/sounds/kiri_caco_throw.ogg differ diff --git a/source_data/Makefile b/source_data/Makefile index 4ded0d5..e5aee8a 100644 --- a/source_data/Makefile +++ b/source_data/Makefile @@ -16,7 +16,14 @@ all : \ ../sprites/gretchencounter/kgcpb0.png \ ../sprites/gretchencounter/bright_kgcpa0.png \ ../sprites/gretchencounter/bright_kgcpb0.png \ - ../sprites/gretchencounter/bright_kgcmc0.png + ../sprites/gretchencounter/bright_kgcmc0.png \ + ../sounds/kiri_caco_despawn.ogg \ + ../sounds/kiri_caco_throw.ogg \ + ../sprites/cacoplush/cacoplushie_idle.png \ + ../sprites/cacoplush/cacoplushie_glowing1.png \ + ../sprites/cacoplush/cacoplushie_glowing2.png \ + ../sprites/cacoplush/cacoplushie_glowing3.png + # Base frames ../sprites/gretchencounter/kgcma0.png : gretchencounter_weaponsprite.aseprite @@ -353,3 +360,25 @@ brightmaps : povsprite.aseprite rm tmp?.png +# ---------------------------------------------------------------------- +# Caco plush + +# Sounds +../sounds/kiri_caco_despawn.ogg : kiri_caco_despawn.wav + ffmpeg -i $^ "-filter:a" "volume=1.0" $@ +../sounds/kiri_caco_throw.ogg : kiri_caco_throw.wav + ffmpeg -i $^ "-filter:a" "volume=1.0" $@ + + +../sprites/cacoplush/cacoplushie_idle.png : cacoplushie.aseprite + aseprite -b $^ \ + --ignore-layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/cacoplush/cacoplushie_glowing1.png \ +../sprites/cacoplush/cacoplushie_glowing2.png \ +../sprites/cacoplush/cacoplushie_glowing3.png : cacoplushie.aseprite + aseprite -b $^ \ + --ignore-layer "brightmap" \ + --frame-range 1,3 --save-as ../sprites/cacoplush/cacoplushie_glowing.png + diff --git a/source_data/cacoplushie.aseprite b/source_data/cacoplushie.aseprite new file mode 100644 index 0000000..5d93efd Binary files /dev/null and b/source_data/cacoplushie.aseprite differ diff --git a/source_data/kiri_caco_despawn.wav b/source_data/kiri_caco_despawn.wav new file mode 100644 index 0000000..eab0bb8 Binary files /dev/null and b/source_data/kiri_caco_despawn.wav differ diff --git a/source_data/kiri_caco_throw.wav b/source_data/kiri_caco_throw.wav new file mode 100644 index 0000000..e60a851 Binary files /dev/null and b/source_data/kiri_caco_throw.wav differ diff --git a/sprites/cacoplush/cacoplushie_glowing1.png b/sprites/cacoplush/cacoplushie_glowing1.png new file mode 100644 index 0000000..45be1e4 Binary files /dev/null and b/sprites/cacoplush/cacoplushie_glowing1.png differ diff --git a/sprites/cacoplush/cacoplushie_glowing2.png b/sprites/cacoplush/cacoplushie_glowing2.png new file mode 100644 index 0000000..6d54e7e Binary files /dev/null and b/sprites/cacoplush/cacoplushie_glowing2.png differ diff --git a/sprites/cacoplush/cacoplushie_glowing3.png b/sprites/cacoplush/cacoplushie_glowing3.png new file mode 100644 index 0000000..96fb5f8 Binary files /dev/null and b/sprites/cacoplush/cacoplushie_glowing3.png differ diff --git a/sprites/cacoplush/cacoplushie_idle.png b/sprites/cacoplush/cacoplushie_idle.png new file mode 100644 index 0000000..3e47a70 Binary files /dev/null and b/sprites/cacoplush/cacoplushie_idle.png differ