diff --git a/TODO.md b/TODO.md index 1e43594..1192627 100644 --- a/TODO.md +++ b/TODO.md @@ -4,16 +4,14 @@ - ~~Jumper cables~~ - ~~Jumper cables ammohandler stuff~~ - ~~Fix wiring kit brightmaps~~ - -- Caco plush +- ~~Headers and comment formatting pass~~ +- ~~Caco plush~~ - ~~Caco plush spawnflags~~ - ~~Add caco plush to menu~~ - ~~Caco plush documentation~~ - ~~Brightmaps for caco plush~~ - ~~Set actual chance for caco plush spawn~~ - - Caco plush sprite scaling - -- Headers and comment formatting pass + - ~~Caco plush sprite scaling~~ - Organize source_data diff --git a/source_data/Makefile b/source_data/Makefile index 946f4ca..262bbb4 100644 --- a/source_data/Makefile +++ b/source_data/Makefile @@ -379,21 +379,18 @@ brightmaps : povsprite.aseprite ../sprites/cacoplush/cacoplushie_idle.png : cacoplushie.aseprite aseprite -b $^ \ --ignore-layer "brightmap" \ - --scale 0.77 \ --frame-range 0,0 --save-as $@ ../sprites/cacoplush/cacoplushie_pickup.png : cacoplushie.aseprite aseprite -b $^ \ --ignore-layer "brightmap" \ --frame-range 0,0 \ - --scale 0.25 \ --save-as $@ ../sprites/cacoplush/cacoplushie_glowing1.png \ ../sprites/cacoplush/cacoplushie_glowing2.png \ ../sprites/cacoplush/cacoplushie_glowing3.png : cacoplushie.aseprite aseprite -b $^ \ - --scale 0.77 \ --ignore-layer "brightmap" \ --frame-range 1,3 --save-as ../sprites/cacoplush/cacoplushie_glowing.png @@ -402,21 +399,18 @@ brightmaps : povsprite.aseprite ../sprites/cacoplush/bright_cacoplushie_idle.png : cacoplushie.aseprite aseprite -b $^ \ --layer "brightmap" \ - --scale 0.77 \ --frame-range 0,0 --save-as $@ ../sprites/cacoplush/bright_cacoplushie_pickup.png : cacoplushie.aseprite aseprite -b $^ \ --layer "brightmap" \ --frame-range 0,0 \ - --scale 0.25 \ --save-as $@ ../sprites/cacoplush/bright_cacoplushie_glowing1.png \ ../sprites/cacoplush/bright_cacoplushie_glowing2.png \ ../sprites/cacoplush/bright_cacoplushie_glowing3.png : cacoplushie.aseprite aseprite -b $^ \ - --scale 0.77 \ --layer "brightmap" \ --frame-range 1,3 --save-as ../sprites/cacoplush/bright_cacoplushie_glowing.png diff --git a/textures.txt b/textures.txt index 6ed73f2..be618ac 100644 --- a/textures.txt +++ b/textures.txt @@ -64,35 +64,45 @@ sprite JMPPC0, 320, 200 { // Caco plushie // First-person view while holding. -Sprite "KCPLB0", 100, 83 +Sprite "KCPLB0", 130, 108 { - Offset -120, -100 + XScale 1.3 + YScale 1.3 + Offset -150, -100 Patch "sprites/cacoplush/cacoplushie_idle.png", 0, 0 } // Pickup sprite on the ground. -Sprite "KCPLD0", 32, 27 +Sprite "KCPLD0", 130, 108 { - Offset 16, 13 + XScale 4 + YScale 4 + Offset 64, 52 Patch "sprites/cacoplush/cacoplushie_pickup.png", 0, 0 } // Glowing frames. -Sprite "KCPLE0", 100, 83 +Sprite "KCPLE0", 130, 108 { - Offset -120, -100 + XScale 1.3 + YScale 1.3 + Offset -150, -100 Patch "sprites/cacoplush/cacoplushie_glowing1.png", 0, 0 } -Sprite "KCPLF0", 100, 83 +Sprite "KCPLF0", 130, 108 { - Offset -120, -100 + XScale 1.3 + YScale 1.3 + Offset -150, -100 Patch "sprites/cacoplush/cacoplushie_glowing2.png", 0, 0 } -Sprite "KCPLG0", 100, 83 +Sprite "KCPLG0", 130, 108 { - Offset -120, -100 + XScale 1.3 + YScale 1.3 + Offset -150, -100 Patch "sprites/cacoplush/cacoplushie_glowing3.png", 0, 0 } diff --git a/zscript/gretchencounter.zs b/zscript/gretchencounter.zs index e88dfde..f6bf2a2 100644 --- a/zscript/gretchencounter.zs +++ b/zscript/gretchencounter.zs @@ -10,7 +10,6 @@ // Try not to think about it. // - #include "zscript/snektech.zs" const HDLD_KIRI_GRETCHENCOUNTER = "kgc";