diff --git a/sndinfo.txt b/sndinfo.txt index 5d6837c..0dc3264 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -1,5 +1,5 @@ -kiri/gretchencounter_click "sounds/kirigretchencounter_click.ogg" -kiri/gretchencounter_blip "sounds/kirigretchencounter_blip.ogg" -kiri/gretchencounter_onoff "sounds/kirigretchencounter_onoff.ogg" +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" diff --git a/sounds/kirigretchencounter_blip.ogg b/sounds/gretchencounter_blip.ogg similarity index 95% rename from sounds/kirigretchencounter_blip.ogg rename to sounds/gretchencounter_blip.ogg index 5478699..a1043b5 100644 Binary files a/sounds/kirigretchencounter_blip.ogg and b/sounds/gretchencounter_blip.ogg differ diff --git a/sounds/kirigretchencounter_click.ogg b/sounds/gretchencounter_click.ogg similarity index 94% rename from sounds/kirigretchencounter_click.ogg rename to sounds/gretchencounter_click.ogg index b5cff5a..602d626 100644 Binary files a/sounds/kirigretchencounter_click.ogg and b/sounds/gretchencounter_click.ogg differ diff --git a/sounds/kirigretchencounter_onoff.ogg b/sounds/gretchencounter_onoff.ogg similarity index 98% rename from sounds/kirigretchencounter_onoff.ogg rename to sounds/gretchencounter_onoff.ogg index 04d7ad4..792e873 100644 Binary files a/sounds/kirigretchencounter_onoff.ogg and b/sounds/gretchencounter_onoff.ogg differ diff --git a/sounds/kiri_caco_despawn.ogg b/sounds/kiri_caco_despawn.ogg index f618712..7089fbf 100644 Binary files a/sounds/kiri_caco_despawn.ogg and b/sounds/kiri_caco_despawn.ogg differ diff --git a/sounds/kiri_caco_throw.ogg b/sounds/kiri_caco_throw.ogg index 384c7b4..f191617 100644 Binary files a/sounds/kiri_caco_throw.ogg and b/sounds/kiri_caco_throw.ogg differ diff --git a/source_data/Makefile b/source_data/Makefile index 262bbb4..f53f3da 100644 --- a/source_data/Makefile +++ b/source_data/Makefile @@ -9,9 +9,9 @@ all : \ ../sprites/gretchencounter/kgcnb0.png \ ../sprites/gretchencounter/bright_kgcma0.png \ ../sprites/gretchencounter/bright_kgcmb0.png \ - ../sounds/kirigretchencounter_click.ogg \ - ../sounds/kirigretchencounter_blip.ogg \ - ../sounds/kirigretchencounter_onoff.ogg \ + ../sounds/gretchencounter_click.ogg \ + ../sounds/gretchencounter_blip.ogg \ + ../sounds/gretchencounter_onoff.ogg \ ../sprites/gretchencounter/kgcpa0.png \ ../sprites/gretchencounter/kgcpb0.png \ ../sprites/gretchencounter/bright_kgcpa0.png \ @@ -107,13 +107,13 @@ all : \ --frame-range 1,1 --save-as $@ # Sounds -../sounds/kirigretchencounter_click.ogg : kirigretchencounter_click.wav +../sounds/gretchencounter_click.ogg : gretchencounter_click.wav ffmpeg -i $^ "-filter:a" "volume=1.0" $@ -../sounds/kirigretchencounter_blip.ogg : kirigretchencounter_blip.wav +../sounds/gretchencounter_blip.ogg : gretchencounter_blip.wav ffmpeg -i $^ "-filter:a" "volume=1.0" $@ -../sounds/kirigretchencounter_onoff.ogg : on_off_switch.wav +../sounds/gretchencounter_onoff.ogg : gretchencounter_on_off_switch.wav ffmpeg -i $^ "-filter:a" "volume=1.0" $@ # ---------------------------------------------------------------------- @@ -154,7 +154,7 @@ all : \ # Base sprite with no numerical indicator, but anim frames (0,1,2) for # status light. -../sprites/jumpercables/jmppa0.png ../sprites/jumpercables/jmppb0.png ../sprites/jumpercables/jmppc0.png : povsprite.aseprite +../sprites/jumpercables/jmppa0.png ../sprites/jumpercables/jmppb0.png ../sprites/jumpercables/jmppc0.png : jumpercables_weaponsprite.aseprite aseprite -b $^ \ --ignore-layer "brightmap_display" \ --ignore-layer "brightmap_leds" \ @@ -186,7 +186,7 @@ all : \ ../sprites/jumpercables/jmpjd0.png \ ../sprites/jumpercables/jmpje0.png \ ../sprites/jumpercables/jmpjf0.png \ -../sprites/jumpercables/jmpjg0.png : povsprite.aseprite +../sprites/jumpercables/jmpjg0.png : jumpercables_weaponsprite.aseprite aseprite -b $^ \ --layer "numberindicatorl" \ @@ -215,7 +215,7 @@ all : \ letter_sprites_% : - aseprite -b povsprite.aseprite \ + aseprite -b jumpercables_weaponsprite.aseprite \ --layer "numberindicator$*" \ --frame-range 0,6 --save-as tmp.png @@ -346,7 +346,7 @@ letter_sprites_% : mv indic_$*_e.png ../sprites/jumpercables/jmi$*o0.png mv indic_$*_f.png ../sprites/jumpercables/jmi$*p0.png -brightmaps : povsprite.aseprite +brightmaps : jumpercables_weaponsprite.aseprite aseprite -b $^ \ --layer "brightmap_display" \ diff --git a/source_data/kirigretchencounter_blip.wav b/source_data/gretchencounter_blip.wav similarity index 100% rename from source_data/kirigretchencounter_blip.wav rename to source_data/gretchencounter_blip.wav diff --git a/source_data/kirigretchencounter_click.wav b/source_data/gretchencounter_click.wav similarity index 100% rename from source_data/kirigretchencounter_click.wav rename to source_data/gretchencounter_click.wav diff --git a/source_data/on_off_switch.aup3 b/source_data/gretchencounter_on_off_switch.aup3 similarity index 100% rename from source_data/on_off_switch.aup3 rename to source_data/gretchencounter_on_off_switch.aup3 diff --git a/source_data/on_off_switch.wav b/source_data/gretchencounter_on_off_switch.wav similarity index 100% rename from source_data/on_off_switch.wav rename to source_data/gretchencounter_on_off_switch.wav diff --git a/source_data/povsprite.aseprite b/source_data/jumpercables_weaponsprite.aseprite similarity index 99% rename from source_data/povsprite.aseprite rename to source_data/jumpercables_weaponsprite.aseprite index b9d6fed..b6210ab 100644 Binary files a/source_data/povsprite.aseprite and b/source_data/jumpercables_weaponsprite.aseprite differ diff --git a/sprites/cacoplush/bright_cacoplushie_glowing1.png b/sprites/cacoplush/bright_cacoplushie_glowing1.png index ada0e8d..ce1376a 100644 Binary files a/sprites/cacoplush/bright_cacoplushie_glowing1.png and b/sprites/cacoplush/bright_cacoplushie_glowing1.png differ diff --git a/sprites/cacoplush/bright_cacoplushie_glowing2.png b/sprites/cacoplush/bright_cacoplushie_glowing2.png index 166854a..2d7947d 100644 Binary files a/sprites/cacoplush/bright_cacoplushie_glowing2.png and b/sprites/cacoplush/bright_cacoplushie_glowing2.png differ diff --git a/sprites/cacoplush/bright_cacoplushie_glowing3.png b/sprites/cacoplush/bright_cacoplushie_glowing3.png index face163..a62eeb5 100644 Binary files a/sprites/cacoplush/bright_cacoplushie_glowing3.png and b/sprites/cacoplush/bright_cacoplushie_glowing3.png differ diff --git a/sprites/cacoplush/bright_cacoplushie_idle.png b/sprites/cacoplush/bright_cacoplushie_idle.png index add2e84..c5276bd 100644 Binary files a/sprites/cacoplush/bright_cacoplushie_idle.png and b/sprites/cacoplush/bright_cacoplushie_idle.png differ diff --git a/sprites/cacoplush/bright_cacoplushie_pickup.png b/sprites/cacoplush/bright_cacoplushie_pickup.png index 2ac9db3..c5276bd 100644 Binary files a/sprites/cacoplush/bright_cacoplushie_pickup.png and b/sprites/cacoplush/bright_cacoplushie_pickup.png differ diff --git a/sprites/cacoplush/cacoplushie_glowing1.png b/sprites/cacoplush/cacoplushie_glowing1.png index ea81390..45be1e4 100644 Binary files a/sprites/cacoplush/cacoplushie_glowing1.png and b/sprites/cacoplush/cacoplushie_glowing1.png differ diff --git a/sprites/cacoplush/cacoplushie_glowing2.png b/sprites/cacoplush/cacoplushie_glowing2.png index 1a62e04..6d54e7e 100644 Binary files a/sprites/cacoplush/cacoplushie_glowing2.png and b/sprites/cacoplush/cacoplushie_glowing2.png differ diff --git a/sprites/cacoplush/cacoplushie_glowing3.png b/sprites/cacoplush/cacoplushie_glowing3.png index ddd2594..96fb5f8 100644 Binary files a/sprites/cacoplush/cacoplushie_glowing3.png and b/sprites/cacoplush/cacoplushie_glowing3.png differ diff --git a/sprites/cacoplush/cacoplushie_idle.png b/sprites/cacoplush/cacoplushie_idle.png index ab6cd4d..3e47a70 100644 Binary files a/sprites/cacoplush/cacoplushie_idle.png and b/sprites/cacoplush/cacoplushie_idle.png differ diff --git a/sprites/cacoplush/cacoplushie_pickup.png b/sprites/cacoplush/cacoplushie_pickup.png index 09a1f51..3e47a70 100644 Binary files a/sprites/cacoplush/cacoplushie_pickup.png and b/sprites/cacoplush/cacoplushie_pickup.png differ diff --git a/sprites/jumpercables/bright_jmpr_1.png b/sprites/jumpercables/bright_jmpr_1.png index dd2bfd1..14aec37 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 362d848..aaed8cd 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 4799e47..a0b2bef 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 9252485..68c025e 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 c8bef72..df312da 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 11a6cba..c8fa148 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 b11bece..6aea1ec 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 a640a47..20e16fa 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 cb2b0a5..1822c4c 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 5b0c589..d45919f 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 25b0d4c..2cb457b 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 379fe6e..65d3bc8 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 dfb600f..8d599a3 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 8dd38d4..4144bf2 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 79488c5..f1049c4 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 904a729..ae2f075 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 93e5789..5856bf4 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 0945d8e..4ca2a4a 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 36a1526..19d7360 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 8f147bd..eb00606 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 80154e9..799b0a6 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 46ac5d4..3009a9e 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 dab4651..ea238b1 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 ee01cef..33575b7 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 c39e4d3..2513f74 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 d98ffc6..e7e504f 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 e852301..62b1e88 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 9bedece..cedd52e 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 7b3f76f..c458f82 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 28a1218..841e927 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 e06d88a..dcf25b1 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 0bbf394..c651c40 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 efd8537..2fff727 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 5766c78..768ffbe 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 eafd80a..0717e33 100644 Binary files a/sprites/jumpercables/jmirp0.png and b/sprites/jumpercables/jmirp0.png differ