diff --git a/sndinfo.txt b/sndinfo.txt index 0dc3264..25982d6 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -1,5 +1,5 @@ kiri/gretchencounter_click "sounds/gretchencounter_click.ogg" kiri/gretchencounter_blip "sounds/gretchencounter_blip.ogg" kiri/gretchencounter_onoff "sounds/gretchencounter_onoff.ogg" -kiri/cacoplushie_throw "sounds/kiri_caco_throw.ogg" -kiri/cacoplushie_despawn "sounds/kiri_caco_despawn.ogg" +kiri/cacoplushie_throw "sounds/cacoplushie_throw.ogg" +kiri/cacoplushie_despawn "sounds/cacoplushie_despawn.ogg" diff --git a/sounds/kiri_caco_despawn.ogg b/sounds/cacoplushie_despawn.ogg similarity index 96% rename from sounds/kiri_caco_despawn.ogg rename to sounds/cacoplushie_despawn.ogg index 7089fbf..984b96c 100644 Binary files a/sounds/kiri_caco_despawn.ogg and b/sounds/cacoplushie_despawn.ogg differ diff --git a/sounds/kiri_caco_throw.ogg b/sounds/cacoplushie_throw.ogg similarity index 96% rename from sounds/kiri_caco_throw.ogg rename to sounds/cacoplushie_throw.ogg index f191617..59b7278 100644 Binary files a/sounds/kiri_caco_throw.ogg and b/sounds/cacoplushie_throw.ogg differ diff --git a/source_data/Makefile b/source_data/Makefile index f53f3da..e1bb748 100644 --- a/source_data/Makefile +++ b/source_data/Makefile @@ -17,8 +17,8 @@ all : \ ../sprites/gretchencounter/bright_kgcpa0.png \ ../sprites/gretchencounter/bright_kgcpb0.png \ ../sprites/gretchencounter/bright_kgcmc0.png \ - ../sounds/kiri_caco_despawn.ogg \ - ../sounds/kiri_caco_throw.ogg \ + ../sounds/cacoplushie_throw.ogg \ + ../sounds/cacoplushie_despawn.ogg \ ../sprites/cacoplush/cacoplushie_idle.png \ ../sprites/cacoplush/cacoplushie_glowing1.png \ ../sprites/cacoplush/cacoplushie_glowing2.png \ @@ -146,10 +146,10 @@ all : \ letter_sprites_r \ brightmaps -../sprites/jumpercables/jmpka0.png : kit.aseprite +../sprites/jumpercables/jmpka0.png : jumpercables_pickupsprite.aseprite aseprite -b $^ --save-as $@ -../sprites/jumpercables/jmpra0.png : jmpra0.aseprite +../sprites/jumpercables/jmpra0.png : jumpercables_deployedsprite.aseprite aseprite -b $^ --save-as $@ # Base sprite with no numerical indicator, but anim frames (0,1,2) for @@ -169,7 +169,7 @@ all : \ ../graphics/jumpercables/jmpr_reticle1.png \ ../graphics/jumpercables/jmpr_reticle2.png \ -../graphics/jumpercables/jmpr_reticle3.png : jmpr_reticle.aseprite +../graphics/jumpercables/jmpr_reticle3.png : jumpercables_reticle.aseprite aseprite -b $^ \ --frame-range 0,2 --save-as $@ @@ -369,10 +369,10 @@ brightmaps : jumpercables_weaponsprite.aseprite # Caco plush # Sounds -../sounds/kiri_caco_despawn.ogg : kiri_caco_despawn.wav +../sounds/cacoplushie_despawn.ogg : cacoplushie_despawn.wav ffmpeg -i $^ "-filter:a" "volume=1.0" $@ -../sounds/kiri_caco_throw.ogg : kiri_caco_throw.wav +../sounds/cacoplushie_throw.ogg : cacoplushie_throw.wav ffmpeg -i $^ "-filter:a" "volume=1.0" $@ # Sprites diff --git a/source_data/kiri_caco_despawn.wav b/source_data/cacoplushie_despawn.wav similarity index 100% rename from source_data/kiri_caco_despawn.wav rename to source_data/cacoplushie_despawn.wav diff --git a/source_data/kiri_caco_throw.wav b/source_data/cacoplushie_throw.wav similarity index 100% rename from source_data/kiri_caco_throw.wav rename to source_data/cacoplushie_throw.wav diff --git a/source_data/jmpra0.aseprite b/source_data/jumpercables_deployedsprite.aseprite similarity index 100% rename from source_data/jmpra0.aseprite rename to source_data/jumpercables_deployedsprite.aseprite diff --git a/source_data/kit.aseprite b/source_data/jumpercables_pickupsprite.aseprite similarity index 100% rename from source_data/kit.aseprite rename to source_data/jumpercables_pickupsprite.aseprite diff --git a/source_data/jmpr_reticle.aseprite b/source_data/jumpercables_reticle.aseprite similarity index 100% rename from source_data/jmpr_reticle.aseprite rename to source_data/jumpercables_reticle.aseprite diff --git a/sprites/jumpercables/bright_jmpr_1.png b/sprites/jumpercables/bright_jmpr_1.png index 14aec37..c0cfff2 100644 Binary files a/sprites/jumpercables/bright_jmpr_1.png and b/sprites/jumpercables/bright_jmpr_1.png differ diff --git a/sprites/jumpercables/bright_jmpr_2.png b/sprites/jumpercables/bright_jmpr_2.png index aaed8cd..29c8814 100644 Binary files a/sprites/jumpercables/bright_jmpr_2.png and b/sprites/jumpercables/bright_jmpr_2.png differ diff --git a/sprites/jumpercables/bright_jmpr_3.png b/sprites/jumpercables/bright_jmpr_3.png index a0b2bef..0099352 100644 Binary files a/sprites/jumpercables/bright_jmpr_3.png and b/sprites/jumpercables/bright_jmpr_3.png differ diff --git a/sprites/jumpercables/jmila0.png b/sprites/jumpercables/jmila0.png index 68c025e..191ac8e 100644 Binary files a/sprites/jumpercables/jmila0.png and b/sprites/jumpercables/jmila0.png differ diff --git a/sprites/jumpercables/jmilb0.png b/sprites/jumpercables/jmilb0.png index df312da..3abf4ea 100644 Binary files a/sprites/jumpercables/jmilb0.png and b/sprites/jumpercables/jmilb0.png differ diff --git a/sprites/jumpercables/jmilc0.png b/sprites/jumpercables/jmilc0.png index c8fa148..76d1a07 100644 Binary files a/sprites/jumpercables/jmilc0.png and b/sprites/jumpercables/jmilc0.png differ diff --git a/sprites/jumpercables/jmild0.png b/sprites/jumpercables/jmild0.png index 6aea1ec..4216502 100644 Binary files a/sprites/jumpercables/jmild0.png and b/sprites/jumpercables/jmild0.png differ diff --git a/sprites/jumpercables/jmile0.png b/sprites/jumpercables/jmile0.png index 20e16fa..6d5aed7 100644 Binary files a/sprites/jumpercables/jmile0.png and b/sprites/jumpercables/jmile0.png differ diff --git a/sprites/jumpercables/jmilf0.png b/sprites/jumpercables/jmilf0.png index 1822c4c..12c2f06 100644 Binary files a/sprites/jumpercables/jmilf0.png and b/sprites/jumpercables/jmilf0.png differ diff --git a/sprites/jumpercables/jmilg0.png b/sprites/jumpercables/jmilg0.png index d45919f..07c94a3 100644 Binary files a/sprites/jumpercables/jmilg0.png and b/sprites/jumpercables/jmilg0.png differ diff --git a/sprites/jumpercables/jmilh0.png b/sprites/jumpercables/jmilh0.png index 2cb457b..753f9d0 100644 Binary files a/sprites/jumpercables/jmilh0.png and b/sprites/jumpercables/jmilh0.png differ diff --git a/sprites/jumpercables/jmili0.png b/sprites/jumpercables/jmili0.png index 65d3bc8..78e8a40 100644 Binary files a/sprites/jumpercables/jmili0.png and b/sprites/jumpercables/jmili0.png differ diff --git a/sprites/jumpercables/jmilj0.png b/sprites/jumpercables/jmilj0.png index 8d599a3..1eb6248 100644 Binary files a/sprites/jumpercables/jmilj0.png and b/sprites/jumpercables/jmilj0.png differ diff --git a/sprites/jumpercables/jmilk0.png b/sprites/jumpercables/jmilk0.png index 4144bf2..de5572b 100644 Binary files a/sprites/jumpercables/jmilk0.png and b/sprites/jumpercables/jmilk0.png differ diff --git a/sprites/jumpercables/jmill0.png b/sprites/jumpercables/jmill0.png index f1049c4..0c2586b 100644 Binary files a/sprites/jumpercables/jmill0.png and b/sprites/jumpercables/jmill0.png differ diff --git a/sprites/jumpercables/jmilm0.png b/sprites/jumpercables/jmilm0.png index ae2f075..26ddfcf 100644 Binary files a/sprites/jumpercables/jmilm0.png and b/sprites/jumpercables/jmilm0.png differ diff --git a/sprites/jumpercables/jmiln0.png b/sprites/jumpercables/jmiln0.png index 5856bf4..81a6d9b 100644 Binary files a/sprites/jumpercables/jmiln0.png and b/sprites/jumpercables/jmiln0.png differ diff --git a/sprites/jumpercables/jmilo0.png b/sprites/jumpercables/jmilo0.png index 4ca2a4a..acb3a85 100644 Binary files a/sprites/jumpercables/jmilo0.png and b/sprites/jumpercables/jmilo0.png differ diff --git a/sprites/jumpercables/jmilp0.png b/sprites/jumpercables/jmilp0.png index 19d7360..bf2d5c7 100644 Binary files a/sprites/jumpercables/jmilp0.png and b/sprites/jumpercables/jmilp0.png differ diff --git a/sprites/jumpercables/jmira0.png b/sprites/jumpercables/jmira0.png index eb00606..04d66f5 100644 Binary files a/sprites/jumpercables/jmira0.png and b/sprites/jumpercables/jmira0.png differ diff --git a/sprites/jumpercables/jmirb0.png b/sprites/jumpercables/jmirb0.png index 799b0a6..299db73 100644 Binary files a/sprites/jumpercables/jmirb0.png and b/sprites/jumpercables/jmirb0.png differ diff --git a/sprites/jumpercables/jmirc0.png b/sprites/jumpercables/jmirc0.png index 3009a9e..7d931d5 100644 Binary files a/sprites/jumpercables/jmirc0.png and b/sprites/jumpercables/jmirc0.png differ diff --git a/sprites/jumpercables/jmird0.png b/sprites/jumpercables/jmird0.png index ea238b1..59b1e91 100644 Binary files a/sprites/jumpercables/jmird0.png and b/sprites/jumpercables/jmird0.png differ diff --git a/sprites/jumpercables/jmire0.png b/sprites/jumpercables/jmire0.png index 33575b7..f021a87 100644 Binary files a/sprites/jumpercables/jmire0.png and b/sprites/jumpercables/jmire0.png differ diff --git a/sprites/jumpercables/jmirf0.png b/sprites/jumpercables/jmirf0.png index 2513f74..8c7e966 100644 Binary files a/sprites/jumpercables/jmirf0.png and b/sprites/jumpercables/jmirf0.png differ diff --git a/sprites/jumpercables/jmirg0.png b/sprites/jumpercables/jmirg0.png index e7e504f..80dc51d 100644 Binary files a/sprites/jumpercables/jmirg0.png and b/sprites/jumpercables/jmirg0.png differ diff --git a/sprites/jumpercables/jmirh0.png b/sprites/jumpercables/jmirh0.png index 62b1e88..2014665 100644 Binary files a/sprites/jumpercables/jmirh0.png and b/sprites/jumpercables/jmirh0.png differ diff --git a/sprites/jumpercables/jmiri0.png b/sprites/jumpercables/jmiri0.png index cedd52e..f62293e 100644 Binary files a/sprites/jumpercables/jmiri0.png and b/sprites/jumpercables/jmiri0.png differ diff --git a/sprites/jumpercables/jmirj0.png b/sprites/jumpercables/jmirj0.png index c458f82..32febca 100644 Binary files a/sprites/jumpercables/jmirj0.png and b/sprites/jumpercables/jmirj0.png differ diff --git a/sprites/jumpercables/jmirk0.png b/sprites/jumpercables/jmirk0.png index 841e927..93e1290 100644 Binary files a/sprites/jumpercables/jmirk0.png and b/sprites/jumpercables/jmirk0.png differ diff --git a/sprites/jumpercables/jmirl0.png b/sprites/jumpercables/jmirl0.png index dcf25b1..05fdb9d 100644 Binary files a/sprites/jumpercables/jmirl0.png and b/sprites/jumpercables/jmirl0.png differ diff --git a/sprites/jumpercables/jmirm0.png b/sprites/jumpercables/jmirm0.png index c651c40..06bfbc5 100644 Binary files a/sprites/jumpercables/jmirm0.png and b/sprites/jumpercables/jmirm0.png differ diff --git a/sprites/jumpercables/jmirn0.png b/sprites/jumpercables/jmirn0.png index 2fff727..0d2ade0 100644 Binary files a/sprites/jumpercables/jmirn0.png and b/sprites/jumpercables/jmirn0.png differ diff --git a/sprites/jumpercables/jmiro0.png b/sprites/jumpercables/jmiro0.png index 768ffbe..6cf26b6 100644 Binary files a/sprites/jumpercables/jmiro0.png and b/sprites/jumpercables/jmiro0.png differ diff --git a/sprites/jumpercables/jmirp0.png b/sprites/jumpercables/jmirp0.png index 0717e33..30a137c 100644 Binary files a/sprites/jumpercables/jmirp0.png and b/sprites/jumpercables/jmirp0.png differ