TODO.md

@@ -4,14 +4,16 @@
 - ~~Jumper cables~~
   - ~~Jumper cables ammohandler stuff~~
   - ~~Fix wiring kit brightmaps~~
-- ~~Headers and comment formatting pass~~
-- ~~Caco plush~~
+
+- 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~~
+  - Caco plush sprite scaling
+
+- Headers and comment formatting pass
 
 - Organize source_data
 

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/cacoplushie_throw.ogg"
-kiri/cacoplushie_despawn   "sounds/cacoplushie_despawn.ogg"
+kiri/gretchencounter_click "sounds/kirigretchencounter_click.ogg"
+kiri/gretchencounter_blip  "sounds/kirigretchencounter_blip.ogg"
+kiri/gretchencounter_onoff "sounds/kirigretchencounter_onoff.ogg"
+kiri/cacoplushie_throw     "sounds/kiri_caco_throw.ogg"
+kiri/cacoplushie_despawn   "sounds/kiri_caco_despawn.ogg"

source_data/Makefile

@@ -9,16 +9,16 @@ all : \
 	../sprites/gretchencounter/kgcnb0.png \
 	../sprites/gretchencounter/bright_kgcma0.png \
 	../sprites/gretchencounter/bright_kgcmb0.png \
-	../sounds/gretchencounter_click.ogg \
-	../sounds/gretchencounter_blip.ogg \
-	../sounds/gretchencounter_onoff.ogg \
+	../sounds/kirigretchencounter_click.ogg \
+	../sounds/kirigretchencounter_blip.ogg \
+	../sounds/kirigretchencounter_onoff.ogg \
 	../sprites/gretchencounter/kgcpa0.png \
 	../sprites/gretchencounter/kgcpb0.png \
 	../sprites/gretchencounter/bright_kgcpa0.png \
 	../sprites/gretchencounter/bright_kgcpb0.png \
 	../sprites/gretchencounter/bright_kgcmc0.png \
-	../sounds/cacoplushie_throw.ogg \
-	../sounds/cacoplushie_despawn.ogg \
+	../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 \
@@ -107,13 +107,13 @@ all : \
 		--frame-range 1,1 --save-as $@
 
 # Sounds
-../sounds/gretchencounter_click.ogg : gretchencounter_click.wav
+../sounds/kirigretchencounter_click.ogg : kirigretchencounter_click.wav
 	ffmpeg -i $^ "-filter:a" "volume=1.0" $@
 
-../sounds/gretchencounter_blip.ogg : gretchencounter_blip.wav
+../sounds/kirigretchencounter_blip.ogg : kirigretchencounter_blip.wav
 	ffmpeg -i $^ "-filter:a" "volume=1.0" $@
 
-../sounds/gretchencounter_onoff.ogg : gretchencounter_on_off_switch.wav
+../sounds/kirigretchencounter_onoff.ogg : on_off_switch.wav
 	ffmpeg -i $^ "-filter:a" "volume=1.0" $@
 
 # ----------------------------------------------------------------------
@@ -146,15 +146,15 @@ all : \
 	letter_sprites_r \
 	brightmaps
 
-../sprites/jumpercables/jmpka0.png : jumpercables_pickupsprite.aseprite
+../sprites/jumpercables/jmpka0.png : kit.aseprite
 	aseprite -b $^ --save-as $@
 
-../sprites/jumpercables/jmpra0.png : jumpercables_deployedsprite.aseprite
+../sprites/jumpercables/jmpra0.png : jmpra0.aseprite
 	aseprite -b $^ --save-as $@
 
 # 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 : jumpercables_weaponsprite.aseprite
+../sprites/jumpercables/jmppa0.png ../sprites/jumpercables/jmppb0.png ../sprites/jumpercables/jmppc0.png : povsprite.aseprite
 	aseprite -b $^ \
 		--ignore-layer "brightmap_display" \
 		--ignore-layer "brightmap_leds" \
@@ -169,7 +169,7 @@ all : \
 
 ../graphics/jumpercables/jmpr_reticle1.png \
 ../graphics/jumpercables/jmpr_reticle2.png \
-../graphics/jumpercables/jmpr_reticle3.png : jumpercables_reticle.aseprite
+../graphics/jumpercables/jmpr_reticle3.png : jmpr_reticle.aseprite
 	aseprite -b $^ \
 		--frame-range 0,2 --save-as $@
 
@@ -186,7 +186,7 @@ all : \
 ../sprites/jumpercables/jmpjd0.png \
 ../sprites/jumpercables/jmpje0.png \
 ../sprites/jumpercables/jmpjf0.png \
-../sprites/jumpercables/jmpjg0.png : jumpercables_weaponsprite.aseprite
+../sprites/jumpercables/jmpjg0.png : povsprite.aseprite
 
 	aseprite -b $^ \
 		--layer "numberindicatorl" \
@@ -215,7 +215,7 @@ all : \
 letter_sprites_% :
 
 
-	aseprite -b jumpercables_weaponsprite.aseprite \
+	aseprite -b povsprite.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 : jumpercables_weaponsprite.aseprite
+brightmaps : povsprite.aseprite
 
 	aseprite -b $^ \
 		--layer "brightmap_display" \
@@ -369,28 +369,31 @@ brightmaps : jumpercables_weaponsprite.aseprite
 # Caco plush
 
 # Sounds
-../sounds/cacoplushie_despawn.ogg : cacoplushie_despawn.wav
+../sounds/kiri_caco_despawn.ogg : kiri_caco_despawn.wav
 	ffmpeg -i $^ "-filter:a" "volume=1.0" $@
 
-../sounds/cacoplushie_throw.ogg : cacoplushie_throw.wav
+../sounds/kiri_caco_throw.ogg : kiri_caco_throw.wav
 	ffmpeg -i $^ "-filter:a" "volume=1.0" $@
 
 # Sprites
 ../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
 
@@ -399,18 +402,21 @@ brightmaps : jumpercables_weaponsprite.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
 

textures.txt

@@ -64,45 +64,35 @@ sprite JMPPC0, 320, 200 {
 // Caco plushie
 
 // First-person view while holding.
-Sprite "KCPLB0", 130, 108
+Sprite "KCPLB0", 100, 83
 {
-    XScale 1.3
-    YScale 1.3
-    Offset -150, -100
+    Offset -120, -100
     Patch "sprites/cacoplush/cacoplushie_idle.png", 0, 0
 }
 
 // Pickup sprite on the ground.
-Sprite "KCPLD0", 130, 108
+Sprite "KCPLD0", 32, 27
 {
-    XScale 4
-    YScale 4
-    Offset 64, 52
+    Offset 16, 13
     Patch "sprites/cacoplush/cacoplushie_pickup.png", 0, 0
 }
 
 // Glowing frames.
-Sprite "KCPLE0", 130, 108
+Sprite "KCPLE0", 100, 83
 {
-    XScale 1.3
-    YScale 1.3
-    Offset -150, -100
+    Offset -120, -100
     Patch "sprites/cacoplush/cacoplushie_glowing1.png", 0, 0
 }
 
-Sprite "KCPLF0", 130, 108
+Sprite "KCPLF0", 100, 83
 {
-    XScale 1.3
-    YScale 1.3
-    Offset -150, -100
+    Offset -120, -100
     Patch "sprites/cacoplush/cacoplushie_glowing2.png", 0, 0
 }
 
-Sprite "KCPLG0", 130, 108
+Sprite "KCPLG0", 100, 83
 {
-    XScale 1.3
-    YScale 1.3
-    Offset -150, -100
+    Offset -120, -100
     Patch "sprites/cacoplush/cacoplushie_glowing3.png", 0, 0
 }
 

zscript/gretchencounter.zs

@@ -10,6 +10,7 @@
 // Try not to think about it.
 //
 
+
 #include "zscript/snektech.zs"
 
 const HDLD_KIRI_GRETCHENCOUNTER = "kgc";