From cfb02aabdb216ba9b0f4aea7342901af86832c79 Mon Sep 17 00:00:00 2001 From: Kiri Date: Sun, 3 Sep 2023 17:18:00 -0700 Subject: [PATCH] =?UTF-8?q?Is=20this=20a=20release=20candidate=3F=20?= =?UTF-8?q?=F0=9F=A6=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sndinfo.txt | 4 ++-- ...co_despawn.ogg => cacoplushie_despawn.ogg} | Bin 6257 -> 6257 bytes ...i_caco_throw.ogg => cacoplushie_throw.ogg} | Bin 4705 -> 4705 bytes source_data/Makefile | 14 +++++++------- ...co_despawn.wav => cacoplushie_despawn.wav} | Bin ...i_caco_throw.wav => cacoplushie_throw.wav} | Bin ...e => jumpercables_deployedsprite.aseprite} | Bin ...ite => jumpercables_pickupsprite.aseprite} | Bin ...aseprite => jumpercables_reticle.aseprite} | Bin sprites/jumpercables/bright_jmpr_1.png | Bin 1172 -> 1172 bytes sprites/jumpercables/bright_jmpr_2.png | Bin 1088 -> 1088 bytes sprites/jumpercables/bright_jmpr_3.png | Bin 1145 -> 1145 bytes sprites/jumpercables/jmila0.png | Bin 373 -> 373 bytes sprites/jumpercables/jmilb0.png | Bin 342 -> 342 bytes sprites/jumpercables/jmilc0.png | Bin 365 -> 365 bytes sprites/jumpercables/jmild0.png | Bin 367 -> 367 bytes sprites/jumpercables/jmile0.png | Bin 357 -> 357 bytes sprites/jumpercables/jmilf0.png | Bin 362 -> 362 bytes sprites/jumpercables/jmilg0.png | Bin 369 -> 369 bytes sprites/jumpercables/jmilh0.png | Bin 350 -> 350 bytes sprites/jumpercables/jmili0.png | Bin 374 -> 374 bytes sprites/jumpercables/jmilj0.png | Bin 371 -> 371 bytes sprites/jumpercables/jmilk0.png | Bin 367 -> 367 bytes sprites/jumpercables/jmill0.png | Bin 364 -> 364 bytes sprites/jumpercables/jmilm0.png | Bin 364 -> 364 bytes sprites/jumpercables/jmiln0.png | Bin 363 -> 363 bytes sprites/jumpercables/jmilo0.png | Bin 366 -> 366 bytes sprites/jumpercables/jmilp0.png | Bin 360 -> 360 bytes sprites/jumpercables/jmira0.png | Bin 369 -> 369 bytes sprites/jumpercables/jmirb0.png | Bin 343 -> 343 bytes sprites/jumpercables/jmirc0.png | Bin 363 -> 363 bytes sprites/jumpercables/jmird0.png | Bin 365 -> 365 bytes sprites/jumpercables/jmire0.png | Bin 357 -> 357 bytes sprites/jumpercables/jmirf0.png | Bin 361 -> 361 bytes sprites/jumpercables/jmirg0.png | Bin 367 -> 367 bytes sprites/jumpercables/jmirh0.png | Bin 350 -> 350 bytes sprites/jumpercables/jmiri0.png | Bin 370 -> 370 bytes sprites/jumpercables/jmirj0.png | Bin 369 -> 369 bytes sprites/jumpercables/jmirk0.png | Bin 366 -> 366 bytes sprites/jumpercables/jmirl0.png | Bin 360 -> 360 bytes sprites/jumpercables/jmirm0.png | Bin 360 -> 360 bytes sprites/jumpercables/jmirn0.png | Bin 360 -> 360 bytes sprites/jumpercables/jmiro0.png | Bin 363 -> 363 bytes sprites/jumpercables/jmirp0.png | Bin 359 -> 359 bytes 44 files changed, 9 insertions(+), 9 deletions(-) rename sounds/{kiri_caco_despawn.ogg => cacoplushie_despawn.ogg} (96%) rename sounds/{kiri_caco_throw.ogg => cacoplushie_throw.ogg} (96%) rename source_data/{kiri_caco_despawn.wav => cacoplushie_despawn.wav} (100%) rename source_data/{kiri_caco_throw.wav => cacoplushie_throw.wav} (100%) rename source_data/{jmpra0.aseprite => jumpercables_deployedsprite.aseprite} (100%) rename source_data/{kit.aseprite => jumpercables_pickupsprite.aseprite} (100%) rename source_data/{jmpr_reticle.aseprite => jumpercables_reticle.aseprite} (100%) 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 7089fbfe042de9a9b97d80ed847c541c18b3100d..984b96c1699ff56d327908faee213c1c20c410fc 100644 GIT binary patch delta 69 zcmexp@X J*@)Mk8vuWz65ap+ delta 69 zcmexp@X;ZJW5^{QumDK)72c^C Jn~iw&Spn|m7G?kd 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 14aec37a231baa13f3b933162f1bfeebaafa06e8..c0cfff22e235733201a9ffaa3d7ab530bbab91e6 100644 GIT binary patch delta 65 zcmbQjIfZjV1slI{?Rw7CjdiD(`3+62ObxXS46F;oF13Hg00D-5g KpUXO@geCx7S`lIZ diff --git a/sprites/jumpercables/bright_jmpr_3.png b/sprites/jumpercables/bright_jmpr_3.png index a0b2bef0b04410b7596f2060026ee39096c4d702..00993525195c18e133814720fe404736cc43d746 100644 GIT binary patch delta 65 zcmey#@sndh1slI{?Rw7Cjdkmp`3+62ObxXS46FAnAn_=8c9sCXU7%>AnAnAnAnAnmm8c9sCXU7%>Anmm8cD2Oy{VW12s~Z= KT-G@yGywpe0uvbk diff --git a/sprites/jumpercables/jmili0.png b/sprites/jumpercables/jmili0.png index 65d3bc829e4d5a4ea14a2cb09977a76a4669ef17..78e8a40ebfa0958e4078723d745d08b2a92b68b3 100644 GIT binary patch delta 64 zcmeyy^o?o4Og4Tat`(M_C(iHYH#D^}HPALNure?RxX8dU*^*I78c9sCXU7%>AnAnAnAnAnAnAn_-26Py45 delta 64 zcmey!^pR=8Og47Q(8XEB6X&<_8<<;}nrj;vSQ!`u@ETT6HepnfMiNsD=seB<1fH&b JF6*2UngDwC5)}Xd diff --git a/sprites/jumpercables/jmirb0.png b/sprites/jumpercables/jmirb0.png index 799b0a6b94d7d6922e33c074e0508ecaa84046c7..299db737b5531a01c26065f43cd446f08acf0834 100644 GIT binary patch delta 64 zcmcc4be(C!Og4Vw+Vz~N6X)mf8=6{~8fqIDSQ!|6TgJU-vJ|6|G?G~R@68M#;OXk; Jvd$@?2>_816Epw- delta 64 zcmcc4be(C!Og47Q(8XEB6X)mf8<<;}nrj;vSQ!`u@ETT6mSR+rMiNsD=seB<1fH&b JF6*2UngC`B5v>3K diff --git a/sprites/jumpercables/jmirc0.png b/sprites/jumpercables/jmirc0.png index 3009a9eb9049ac86401627f299ee4a3d983365e5..7d931d500565abda2a1a42d2462198fbc674790b 100644 GIT binary patch delta 64 zcmaFO^qOhHOg4Vw+Vz~N6X!SZ8=6{~8fqIDSQ!|6TgJU-vL2(7G?G~R@68M#;OXk; Jvd$@?2>_uf6NCT& delta 64 zcmaFO^qOhHOg47Q(8XEB6X!SZ8<<;}nrj;vSQ!`u@ETT6)?-wXMiNsD=seB<1fH&b JF6*2UngDhp5&ZxF diff --git a/sprites/jumpercables/jmird0.png b/sprites/jumpercables/jmird0.png index ea238b1346d796f24509fcc92e5406504973d1c0..59b1e9108d30cbc2a9658158100f66cfd320f3d7 100644 GIT binary patch delta 64 zcmaFM^p_zS6N~@= delta 64 zcmaFM^p_f`6Kntg delta 64 zcmaFL^pt7BOg47Q(8XEB6X#d)8<<;}nrj;vSQ!`u@ETT6)?ieUMiNsD=seB<1fH&b JF6*2UngDT55#;~? diff --git a/sprites/jumpercables/jmirf0.png b/sprites/jumpercables/jmirf0.png index 2513f7472c1d31c628dc6db7f127ed60b833b10d..8c7e96640556b07d3a194991a4d59dcaf8361cac 100644 GIT binary patch delta 64 zcmaFK^pa`9Og4Vw+Vz~N6X)0Q8=6{~8fqIDSQ!|6TgJU-vJRt?G?G~R@68M#;OXk; Jvd$@?2>_ps6MO&w delta 64 zcmaFK^pa`9Og47Q(8XEB6X)0Q8<<;}nrj;vSQ!`u@ETT6)?rkVMiNsD=seB<1fH&b JF6*2UngDc$5%mB7 diff --git a/sprites/jumpercables/jmirg0.png b/sprites/jumpercables/jmirg0.png index e7e504f85223854a10d63829b14f56863733b280..80dc51db27a263a412e27fcb21ffdb2fe23cdacb 100644 GIT binary patch delta 64 zcmaFQ^qy(LOg4Vw+Vz~N6X&<^8=6{~8fqIDSQ!|6TgJU-vJs<_G?G~R@68M#;OXk; Jvd$@?2>_&F6O;e| delta 64 zcmaFQ^qy(LOg47Q(8XEB6X&<^8<<;}nrj;vSQ!`u@ETT6HeytgMiNsD=seB<1fH&b JF6*2UngDrP5)A+V diff --git a/sprites/jumpercables/jmirh0.png b/sprites/jumpercables/jmirh0.png index 62b1e88f80d85f4fe68eb673d6aa6f6da25f007f..201466588c5ad3f510386f5069ca10e47828d05f 100644 GIT binary patch delta 64 zcmcb|bdPDmOg4Vw+Vz~N6XzH68=6{~8fqIDSQ!|6TgJU-vLd6BG?G~R@68M#;OXk; Jvd$@?2>_O}6HovE delta 64 zcmcb|bdPDmOg47Q(8XEB6XzH68<<;}nrj;vSQ!`u@ETT6R%BF?MiNsD=seB<1fH&b JF6*2UngDC85y=1m diff --git a/sprites/jumpercables/jmiri0.png b/sprites/jumpercables/jmiri0.png index cedd52e07721f18bd5c37a5a6d3bf8a85defe134..f62293eca11dd4cbc09a5e4b2af9c080aa4e8974 100644 GIT binary patch delta 64 zcmeyw^oeQ0Og4Vw+Vz~N6X&<{8=6{~8fqIDSQ!|6TgJU-vMHmIG?G~R@68M#;OXk; Jvd$@?2>__-26Py45 delta 64 zcmey!^pR=8Og47Q(8XEB6X&<_8<<;}nrj;vSQ!`u@ETT6HepnfMiNsD=seB<1fH&b JF6*2UngDwC5)}Xd diff --git a/sprites/jumpercables/jmirk0.png b/sprites/jumpercables/jmirk0.png index 841e9271e2d02efae8c8984b96b2e1a95d98a865..93e12905abdb0a93dbda450f65bb2d65b25f0d1c 100644 GIT binary patch delta 64 zcmaFI^p0u5Og4Vw+Vz~N6X!Sc8=6{~8fqIDSQ!|6TgJU-vLU0AG?G~R@68M#;OXk; Jvd$@?2>_#$6OaG^ delta 64 zcmaFI^p0u5Og47Q(8XEB6X!Sc8<<;}nrj;vSQ!`u@ETT6He^(iMiNsD=seB<1fH&b JF6*2UngDo=5(xkR diff --git a/sprites/jumpercables/jmirl0.png b/sprites/jumpercables/jmirl0.png index dcf25b15f2e9bafe241e88cfff36c2dd20d62e48..05fdb9d9452612c8e204a0524116fec24a59b4d6 100644 GIT binary patch delta 64 zcmaFC^nz)^Og4Vw+Vz~N6X)0R8=6{~8fqIDSQ!|6TgJU-vNofVG?G~R@68M#;OXk; Jvd$@?2>_nI6L_nI6L_nI6L_uf6NCT& delta 64 zcmaFO^qOhHOg47Q(8XEB6X!SZ8<<;}nrj;vSQ!`u@ETT6)?-wXMiNsD=seB<1fH&b JF6*2UngDhp5&ZxF diff --git a/sprites/jumpercables/jmirp0.png b/sprites/jumpercables/jmirp0.png index 0717e33dd8e9ece6f135f9f6351ebaa10418684a..30a137c5f6953af929a00fa12ba17ee5f30a1362 100644 GIT binary patch delta 64 zcmaFP^qgtJOg4Vw+Vz~N6X)0P8=6{~8fqIDSQ!|6TgJU-vKFI~G?G~R@68M#;OXk; Jvd$@?2>_k(6LbIo delta 64 zcmaFP^qgtJOg47Q(8XEB6X)0P8<<;}nrj;vSQ!`u@ETT6)?!qWMiNsD=seB<1fH&b JF6*2UngDX@5$yl~