From 34e54637339b9e0b79f883d40e0f405870fb78cc Mon Sep 17 00:00:00 2001 From: Kiri Date: Sun, 27 Aug 2023 18:51:44 -0700 Subject: [PATCH] Added pickup sprite. --- TODO.md | 1 + gldefs.txt | 11 ++++++ source_data/Makefile | 34 +++++++++++++++++- .../gretchencounter_pickupsprite.aseprite | Bin 0 -> 3470 bytes sprites/bright_kgcpa0.png | Bin 0 -> 1140 bytes sprites/bright_kgcpb0.png | Bin 0 -> 1211 bytes sprites/kgcpa0.png | Bin 0 -> 1427 bytes sprites/kgcpb0.png | Bin 0 -> 1427 bytes textures.txt | 9 +++++ zscript.zs | 2 +- 10 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 source_data/gretchencounter_pickupsprite.aseprite create mode 100644 sprites/bright_kgcpa0.png create mode 100644 sprites/bright_kgcpb0.png create mode 100644 sprites/kgcpa0.png create mode 100644 sprites/kgcpb0.png create mode 100644 textures.txt 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 0000000000000000000000000000000000000000..b9e91828caa0a82a6041410997b0d7276ad69916 GIT binary patch literal 3470 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