diff --git a/TODO.md b/TODO.md index e3dc686..2deaa80 100644 --- a/TODO.md +++ b/TODO.md @@ -4,3 +4,4 @@ x On/Off switch - Pickup sprites - Battery usage x Brightmaps +- In-inventory sprite diff --git a/gldefs.txt b/gldefs.txt index c0f247c..e4e213f 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -22,3 +22,14 @@ brightmap sprite kgcnb0 disablefullbright } +brightmap sprite kgcpa0 +{ + map "sprites/bright_kgcpa0.png" + disablefullbright +} + +brightmap sprite kgcpb0 +{ + map "sprites/bright_kgcpb0.png" + disablefullbright +} diff --git a/source_data/Makefile b/source_data/Makefile index 841a042..46356ff 100644 --- a/source_data/Makefile +++ b/source_data/Makefile @@ -6,7 +6,11 @@ all : \ ../sprites/bright_kgcma0.png \ ../sprites/bright_kgcmb0.png \ ../sounds/kirigretchencounter_click.ogg \ - ../sounds/kirigretchencounter_blip.ogg + ../sounds/kirigretchencounter_blip.ogg \ + ../sprites/kgcpa0.png \ + ../sprites/kgcpb0.png \ + ../sprites/bright_kgcpa0.png \ + ../sprites/bright_kgcpb0.png # Base frames ../sprites/kgcma0.png : gretchencounter_weaponsprite.aseprite @@ -47,6 +51,34 @@ all : \ --layer "needle" \ --frame-range 1,1 --save-as $@ +# Pickup sprite +../sprites/kgcpa0.png : gretchencounter_pickupsprite.aseprite + aseprite $^ \ + -b \ + --ignore-layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/kgcpb0.png : gretchencounter_pickupsprite.aseprite + aseprite $^ \ + -b \ + --ignore-layer "brightmap" \ + --frame-range 1,1 --save-as $@ + +../sprites/bright_kgcpa0.png : gretchencounter_pickupsprite.aseprite + aseprite $^ \ + -b \ + --layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/bright_kgcpb0.png : gretchencounter_pickupsprite.aseprite + aseprite $^ \ + -b \ + --layer "brightmap" \ + --frame-range 1,1 --save-as $@ + + + + # Sounds ../sounds/kirigretchencounter_click.ogg : kirigretchencounter_click.wav ffmpeg -i $^ "-filter:a" "volume=1.0" $@ diff --git a/source_data/gretchencounter_pickupsprite.aseprite b/source_data/gretchencounter_pickupsprite.aseprite new file mode 100644 index 0000000..b9e9182 Binary files /dev/null and b/source_data/gretchencounter_pickupsprite.aseprite differ diff --git a/sprites/bright_kgcpa0.png b/sprites/bright_kgcpa0.png new file mode 100644 index 0000000..1edd33f Binary files /dev/null and b/sprites/bright_kgcpa0.png differ diff --git a/sprites/bright_kgcpb0.png b/sprites/bright_kgcpb0.png new file mode 100644 index 0000000..0acea52 Binary files /dev/null and b/sprites/bright_kgcpb0.png differ diff --git a/sprites/kgcpa0.png b/sprites/kgcpa0.png new file mode 100644 index 0000000..f7b70d1 Binary files /dev/null and b/sprites/kgcpa0.png differ diff --git a/sprites/kgcpb0.png b/sprites/kgcpb0.png new file mode 100644 index 0000000..f7b70d1 Binary files /dev/null and b/sprites/kgcpb0.png differ diff --git a/textures.txt b/textures.txt new file mode 100644 index 0000000..479051e --- /dev/null +++ b/textures.txt @@ -0,0 +1,9 @@ +sprite KGCPA0, 32, 32 { + offset 16, 32 + patch KGCPA0,0,0 { } +} + +sprite KGCPB0, 32, 32 { + offset 16, 32 + patch KGCPB0,0,0 { } +} diff --git a/zscript.zs b/zscript.zs index 45b6810..f614036 100644 --- a/zscript.zs +++ b/zscript.zs @@ -48,7 +48,7 @@ class GretchenCounter : HDWeapon states { spawn: - SARG F -1; + KGCP # -1 { frame = invoker.onSwitch; } stop; // Needle overlay states.