From b98e8cd96f1560dac8ca2ba3a1b3a9a1817fb3d8 Mon Sep 17 00:00:00 2001 From: Kiri Date: Fri, 8 Sep 2023 18:48:19 -0700 Subject: [PATCH] Moved more stuff around. --- TODO.md | 3 +- source_data/Makefile | 416 +-------------------------------- source_data/cacoplushie.mk | 64 +++++ source_data/gretchencounter.mk | 106 +++++++++ source_data/jumpercables.mk | 248 ++++++++++++++++++++ 5 files changed, 421 insertions(+), 416 deletions(-) create mode 100644 source_data/cacoplushie.mk create mode 100644 source_data/gretchencounter.mk create mode 100644 source_data/jumpercables.mk diff --git a/TODO.md b/TODO.md index 2941ff5..ee8177e 100644 --- a/TODO.md +++ b/TODO.md @@ -13,6 +13,5 @@ - ~~Set actual chance for caco plush spawn~~ - ~~Caco plush sprite scaling~~ - ~~Frag counter in loadout starts with no battery~~ - -- Organize source_data +- ~~Organize source_data~~ diff --git a/source_data/Makefile b/source_data/Makefile index e1bb748..e77a189 100644 --- a/source_data/Makefile +++ b/source_data/Makefile @@ -1,416 +1,4 @@ -# ---------------------------------------------------------------------- -# Gretchen Counter +all : -all : \ - ../sprites/gretchencounter/kgcmb0.png \ - ../sprites/gretchencounter/kgcma0.png \ - ../sprites/gretchencounter/kgcmc0.png \ - ../sprites/gretchencounter/kgcna0.png \ - ../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 \ - ../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 \ - ../sprites/cacoplush/cacoplushie_idle.png \ - ../sprites/cacoplush/cacoplushie_glowing1.png \ - ../sprites/cacoplush/cacoplushie_glowing2.png \ - ../sprites/cacoplush/cacoplushie_glowing3.png \ - ../sprites/cacoplush/cacoplushie_pickup.png \ - ../sprites/cacoplush/bright_cacoplushie_idle.png \ - ../sprites/cacoplush/bright_cacoplushie_pickup.png \ - ../sprites/cacoplush/bright_cacoplushie_glowing1.png \ - ../sprites/cacoplush/bright_cacoplushie_glowing2.png \ - ../sprites/cacoplush/bright_cacoplushie_glowing3.png - -# Base frames -../sprites/gretchencounter/kgcma0.png : gretchencounter_weaponsprite.aseprite - aseprite $^ \ - -b \ - --ignore-layer "brightmap" \ - --frame-range 0,0 --save-as $@ - -../sprites/gretchencounter/kgcmb0.png : gretchencounter_weaponsprite.aseprite - aseprite $^ \ - -b \ - --ignore-layer "brightmap" \ - --frame-range 1,1 --save-as $@ - -../sprites/gretchencounter/kgcmc0.png : gretchencounter_weaponsprite.aseprite - aseprite $^ \ - -b \ - --ignore-layer "brightmap" \ - --frame-range 2,2 --save-as $@ - -# Brightmaps -../sprites/gretchencounter/bright_kgcma0.png : gretchencounter_weaponsprite.aseprite - aseprite $^ \ - -b \ - --layer "brightmap" \ - --frame-range 0,0 --save-as $@ - -../sprites/gretchencounter/bright_kgcmb0.png : gretchencounter_weaponsprite.aseprite - aseprite $^ \ - -b \ - --layer "brightmap" \ - --frame-range 1,1 --save-as $@ - -../sprites/gretchencounter/bright_kgcmc0.png : gretchencounter_weaponsprite.aseprite - aseprite $^ \ - -b \ - --layer "brightmap" \ - --frame-range 2,2 --save-as $@ - -# Needle -../sprites/gretchencounter/kgcna0.png : gretchencounter_weaponsprite.aseprite - aseprite $^ \ - -b \ - --layer "needle" \ - --frame-range 0,0 --save-as $@ - -../sprites/gretchencounter/kgcnb0.png : gretchencounter_weaponsprite.aseprite - aseprite $^ \ - -b \ - --layer "needle" \ - --frame-range 1,1 --save-as $@ - -# Pickup sprite -../sprites/gretchencounter/kgcpa0.png : gretchencounter_pickupsprite.aseprite - aseprite $^ \ - -b \ - --ignore-layer "brightmap" \ - --frame-range 0,0 --save-as $@ - -../sprites/gretchencounter/kgcpb0.png : gretchencounter_pickupsprite.aseprite - aseprite $^ \ - -b \ - --ignore-layer "brightmap" \ - --frame-range 1,1 --save-as $@ - -../sprites/gretchencounter/bright_kgcpa0.png : gretchencounter_pickupsprite.aseprite - aseprite $^ \ - -b \ - --layer "brightmap" \ - --frame-range 0,0 --save-as $@ - -../sprites/gretchencounter/bright_kgcpb0.png : gretchencounter_pickupsprite.aseprite - aseprite $^ \ - -b \ - --layer "brightmap" \ - --frame-range 1,1 --save-as $@ - -# Sounds -../sounds/gretchencounter_click.ogg : gretchencounter_click.wav - ffmpeg -i $^ "-filter:a" "volume=1.0" $@ - -../sounds/gretchencounter_blip.ogg : gretchencounter_blip.wav - ffmpeg -i $^ "-filter:a" "volume=1.0" $@ - -../sounds/gretchencounter_onoff.ogg : gretchencounter_on_off_switch.wav - ffmpeg -i $^ "-filter:a" "volume=1.0" $@ - -# ---------------------------------------------------------------------- -# Jumper Cables - -all : \ - ../sprites/jumpercables/jmpka0.png \ - ../sprites/jumpercables/jmpra0.png \ - ../sprites/jumpercables/jmppa0.png \ - ../sprites/jumpercables/jmppb0.png \ - ../sprites/jumpercables/jmppc0.png \ - ../graphics/jumpercables/jmpr_reticle1.png \ - ../graphics/jumpercables/jmpr_reticle2.png \ - ../graphics/jumpercables/jmpr_reticle3.png \ - ../sprites/jumpercables/jmpia0.png \ - ../sprites/jumpercables/jmpib0.png \ - ../sprites/jumpercables/jmpic0.png \ - ../sprites/jumpercables/jmpid0.png \ - ../sprites/jumpercables/jmpie0.png \ - ../sprites/jumpercables/jmpif0.png \ - ../sprites/jumpercables/jmpig0.png \ - ../sprites/jumpercables/jmpja0.png \ - ../sprites/jumpercables/jmpjb0.png \ - ../sprites/jumpercables/jmpjc0.png \ - ../sprites/jumpercables/jmpjd0.png \ - ../sprites/jumpercables/jmpje0.png \ - ../sprites/jumpercables/jmpjf0.png \ - ../sprites/jumpercables/jmpjg0.png \ - letter_sprites_l \ - letter_sprites_r \ - brightmaps - -../sprites/jumpercables/jmpka0.png : jumpercables_pickupsprite.aseprite - aseprite -b $^ --save-as $@ - -../sprites/jumpercables/jmpra0.png : jumpercables_deployedsprite.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 - aseprite -b $^ \ - --ignore-layer "brightmap_display" \ - --ignore-layer "brightmap_leds" \ - --ignore-layer "numberindicatorl" \ - --ignore-layer "numberindicatorr" \ - --frame-range 0,2 --save-as $@ - - # Correct Aseprite's automatic naming to Doom's. (Number at the - # end is for rotations, letters are for frame numbers.) - mv ../sprites/jumpercables/jmppa1.png ../sprites/jumpercables/jmppb0.png - mv ../sprites/jumpercables/jmppa2.png ../sprites/jumpercables/jmppc0.png - -../graphics/jumpercables/jmpr_reticle1.png \ -../graphics/jumpercables/jmpr_reticle2.png \ -../graphics/jumpercables/jmpr_reticle3.png : jumpercables_reticle.aseprite - aseprite -b $^ \ - --frame-range 0,2 --save-as $@ - -../sprites/jumpercables/jmpia0.png \ -../sprites/jumpercables/jmpib0.png \ -../sprites/jumpercables/jmpic0.png \ -../sprites/jumpercables/jmpid0.png \ -../sprites/jumpercables/jmpie0.png \ -../sprites/jumpercables/jmpif0.png \ -../sprites/jumpercables/jmpig0.png \ -../sprites/jumpercables/jmpja0.png \ -../sprites/jumpercables/jmpjb0.png \ -../sprites/jumpercables/jmpjc0.png \ -../sprites/jumpercables/jmpjd0.png \ -../sprites/jumpercables/jmpje0.png \ -../sprites/jumpercables/jmpjf0.png \ -../sprites/jumpercables/jmpjg0.png : jumpercables_weaponsprite.aseprite - - aseprite -b $^ \ - --layer "numberindicatorl" \ - --frame-range 0,6 --save-as ../sprites/jumpercables/jmpia.png - - aseprite -b $^ \ - --layer "numberindicatorr" \ - --frame-range 0,6 --save-as ../sprites/jumpercables/jmpja.png - - mv ../sprites/jumpercables/jmpia1.png ../sprites/jumpercables/jmpia0.png - mv ../sprites/jumpercables/jmpia2.png ../sprites/jumpercables/jmpib0.png - mv ../sprites/jumpercables/jmpia3.png ../sprites/jumpercables/jmpic0.png - mv ../sprites/jumpercables/jmpia4.png ../sprites/jumpercables/jmpid0.png - mv ../sprites/jumpercables/jmpia5.png ../sprites/jumpercables/jmpie0.png - mv ../sprites/jumpercables/jmpia6.png ../sprites/jumpercables/jmpif0.png - mv ../sprites/jumpercables/jmpia7.png ../sprites/jumpercables/jmpig0.png - mv ../sprites/jumpercables/jmpja1.png ../sprites/jumpercables/jmpja0.png - mv ../sprites/jumpercables/jmpja2.png ../sprites/jumpercables/jmpjb0.png - mv ../sprites/jumpercables/jmpja3.png ../sprites/jumpercables/jmpjc0.png - mv ../sprites/jumpercables/jmpja4.png ../sprites/jumpercables/jmpjd0.png - mv ../sprites/jumpercables/jmpja5.png ../sprites/jumpercables/jmpje0.png - mv ../sprites/jumpercables/jmpja6.png ../sprites/jumpercables/jmpjf0.png - mv ../sprites/jumpercables/jmpja7.png ../sprites/jumpercables/jmpjg0.png - - -letter_sprites_% : - - - aseprite -b jumpercables_weaponsprite.aseprite \ - --layer "numberindicator$*" \ - --frame-range 0,6 --save-as tmp.png - - convert tmp6.png \ - tmp3.png -composite \ - tmp5.png -composite \ - tmp4.png -composite \ - tmp2.png -composite \ - tmp1.png -composite \ - indic_$*_0.png - - convert tmp4.png \ - tmp5.png -composite \ - indic_$*_1.png - - convert tmp6.png \ - tmp7.png -composite \ - tmp3.png -composite \ - tmp5.png -composite \ - tmp2.png -composite \ - indic_$*_2.png - - convert tmp3.png \ - tmp4.png -composite \ - tmp5.png -composite \ - tmp6.png -composite \ - tmp7.png -composite \ - indic_$*_3.png - - convert tmp1.png \ - tmp4.png -composite \ - tmp5.png -composite \ - tmp7.png -composite \ - indic_$*_4.png - - convert tmp6.png \ - tmp7.png -composite \ - tmp3.png -composite \ - tmp4.png -composite \ - tmp1.png -composite \ - indic_$*_5.png - - convert tmp6.png \ - tmp7.png -composite \ - tmp3.png -composite \ - tmp4.png -composite \ - tmp1.png -composite \ - tmp2.png -composite \ - indic_$*_6.png - - convert tmp6.png \ - tmp5.png -composite \ - tmp4.png -composite \ - indic_$*_7.png - - convert tmp6.png \ - tmp7.png -composite \ - tmp3.png -composite \ - tmp5.png -composite \ - tmp4.png -composite \ - tmp2.png -composite \ - tmp1.png -composite \ - indic_$*_8.png - - convert tmp6.png \ - tmp7.png -composite \ - tmp3.png -composite \ - tmp5.png -composite \ - tmp4.png -composite \ - tmp1.png -composite \ - indic_$*_9.png - - convert tmp6.png \ - tmp7.png -composite \ - tmp5.png -composite \ - tmp4.png -composite \ - tmp2.png -composite \ - tmp1.png -composite \ - indic_$*_a.png - - convert tmp7.png \ - tmp3.png -composite \ - tmp4.png -composite \ - tmp2.png -composite \ - tmp1.png -composite \ - indic_$*_b.png - - convert tmp3.png \ - tmp1.png -composite \ - tmp2.png -composite \ - tmp6.png -composite \ - indic_$*_c.png - - convert tmp7.png \ - tmp3.png -composite \ - tmp4.png -composite \ - tmp2.png -composite \ - tmp5.png -composite \ - indic_$*_d.png - - convert tmp6.png \ - tmp7.png -composite \ - tmp3.png -composite \ - tmp2.png -composite \ - tmp1.png -composite \ - indic_$*_e.png - - convert tmp6.png \ - tmp7.png -composite \ - tmp2.png -composite \ - tmp1.png -composite \ - indic_$*_f.png - - mv indic_$*_0.png ../sprites/jumpercables/jmi$*a0.png - mv indic_$*_1.png ../sprites/jumpercables/jmi$*b0.png - mv indic_$*_2.png ../sprites/jumpercables/jmi$*c0.png - mv indic_$*_3.png ../sprites/jumpercables/jmi$*d0.png - mv indic_$*_4.png ../sprites/jumpercables/jmi$*e0.png - mv indic_$*_5.png ../sprites/jumpercables/jmi$*f0.png - mv indic_$*_6.png ../sprites/jumpercables/jmi$*g0.png - mv indic_$*_7.png ../sprites/jumpercables/jmi$*h0.png - mv indic_$*_8.png ../sprites/jumpercables/jmi$*i0.png - mv indic_$*_9.png ../sprites/jumpercables/jmi$*j0.png - mv indic_$*_a.png ../sprites/jumpercables/jmi$*k0.png - mv indic_$*_b.png ../sprites/jumpercables/jmi$*l0.png - mv indic_$*_c.png ../sprites/jumpercables/jmi$*m0.png - mv indic_$*_d.png ../sprites/jumpercables/jmi$*n0.png - mv indic_$*_e.png ../sprites/jumpercables/jmi$*o0.png - mv indic_$*_f.png ../sprites/jumpercables/jmi$*p0.png - -brightmaps : jumpercables_weaponsprite.aseprite - - aseprite -b $^ \ - --layer "brightmap_display" \ - --frame-range 0,0 --save-as brightmap_display.png - - aseprite -b $^ \ - --layer "brightmap_leds" \ - --frame-range 0,2 --save-as brightmap_leds.png - - composite brightmap_display.png brightmap_leds1.png -compose screen ../sprites/jumpercables/bright_jmpr_1.png - composite brightmap_display.png brightmap_leds2.png -compose screen ../sprites/jumpercables/bright_jmpr_2.png - composite brightmap_display.png brightmap_leds3.png -compose screen ../sprites/jumpercables/bright_jmpr_3.png - - rm brightmap_display.png - rm brightmap_leds?.png - - rm tmp?.png - -# ---------------------------------------------------------------------- -# Caco plush - -# Sounds -../sounds/cacoplushie_despawn.ogg : cacoplushie_despawn.wav - ffmpeg -i $^ "-filter:a" "volume=1.0" $@ - -../sounds/cacoplushie_throw.ogg : cacoplushie_throw.wav - ffmpeg -i $^ "-filter:a" "volume=1.0" $@ - -# Sprites -../sprites/cacoplush/cacoplushie_idle.png : cacoplushie.aseprite - aseprite -b $^ \ - --ignore-layer "brightmap" \ - --frame-range 0,0 --save-as $@ - -../sprites/cacoplush/cacoplushie_pickup.png : cacoplushie.aseprite - aseprite -b $^ \ - --ignore-layer "brightmap" \ - --frame-range 0,0 \ - --save-as $@ - -../sprites/cacoplush/cacoplushie_glowing1.png \ -../sprites/cacoplush/cacoplushie_glowing2.png \ -../sprites/cacoplush/cacoplushie_glowing3.png : cacoplushie.aseprite - aseprite -b $^ \ - --ignore-layer "brightmap" \ - --frame-range 1,3 --save-as ../sprites/cacoplush/cacoplushie_glowing.png - - -# Brightmaps -../sprites/cacoplush/bright_cacoplushie_idle.png : cacoplushie.aseprite - aseprite -b $^ \ - --layer "brightmap" \ - --frame-range 0,0 --save-as $@ - -../sprites/cacoplush/bright_cacoplushie_pickup.png : cacoplushie.aseprite - aseprite -b $^ \ - --layer "brightmap" \ - --frame-range 0,0 \ - --save-as $@ - -../sprites/cacoplush/bright_cacoplushie_glowing1.png \ -../sprites/cacoplush/bright_cacoplushie_glowing2.png \ -../sprites/cacoplush/bright_cacoplushie_glowing3.png : cacoplushie.aseprite - aseprite -b $^ \ - --layer "brightmap" \ - --frame-range 1,3 --save-as ../sprites/cacoplush/bright_cacoplushie_glowing.png +include *.mk diff --git a/source_data/cacoplushie.mk b/source_data/cacoplushie.mk new file mode 100644 index 0000000..7f4fd65 --- /dev/null +++ b/source_data/cacoplushie.mk @@ -0,0 +1,64 @@ + +# ---------------------------------------------------------------------- +# Caco plush + +all : \ + ../sounds/cacoplushie_throw.ogg \ + ../sounds/cacoplushie_despawn.ogg \ + ../sprites/cacoplush/cacoplushie_idle.png \ + ../sprites/cacoplush/cacoplushie_glowing1.png \ + ../sprites/cacoplush/cacoplushie_glowing2.png \ + ../sprites/cacoplush/cacoplushie_glowing3.png \ + ../sprites/cacoplush/cacoplushie_pickup.png \ + ../sprites/cacoplush/bright_cacoplushie_idle.png \ + ../sprites/cacoplush/bright_cacoplushie_pickup.png \ + ../sprites/cacoplush/bright_cacoplushie_glowing1.png \ + ../sprites/cacoplush/bright_cacoplushie_glowing2.png \ + ../sprites/cacoplush/bright_cacoplushie_glowing3.png + +# Sounds +../sounds/cacoplushie_despawn.ogg : cacoplushie_despawn.wav + ffmpeg -i $^ "-filter:a" "volume=1.0" $@ + +../sounds/cacoplushie_throw.ogg : cacoplushie_throw.wav + ffmpeg -i $^ "-filter:a" "volume=1.0" $@ + +# Sprites +../sprites/cacoplush/cacoplushie_idle.png : cacoplushie.aseprite + aseprite -b $^ \ + --ignore-layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/cacoplush/cacoplushie_pickup.png : cacoplushie.aseprite + aseprite -b $^ \ + --ignore-layer "brightmap" \ + --frame-range 0,0 \ + --save-as $@ + +../sprites/cacoplush/cacoplushie_glowing1.png \ +../sprites/cacoplush/cacoplushie_glowing2.png \ +../sprites/cacoplush/cacoplushie_glowing3.png : cacoplushie.aseprite + aseprite -b $^ \ + --ignore-layer "brightmap" \ + --frame-range 1,3 --save-as ../sprites/cacoplush/cacoplushie_glowing.png + + +# Brightmaps +../sprites/cacoplush/bright_cacoplushie_idle.png : cacoplushie.aseprite + aseprite -b $^ \ + --layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/cacoplush/bright_cacoplushie_pickup.png : cacoplushie.aseprite + aseprite -b $^ \ + --layer "brightmap" \ + --frame-range 0,0 \ + --save-as $@ + +../sprites/cacoplush/bright_cacoplushie_glowing1.png \ +../sprites/cacoplush/bright_cacoplushie_glowing2.png \ +../sprites/cacoplush/bright_cacoplushie_glowing3.png : cacoplushie.aseprite + aseprite -b $^ \ + --layer "brightmap" \ + --frame-range 1,3 --save-as ../sprites/cacoplush/bright_cacoplushie_glowing.png + diff --git a/source_data/gretchencounter.mk b/source_data/gretchencounter.mk new file mode 100644 index 0000000..78f5e98 --- /dev/null +++ b/source_data/gretchencounter.mk @@ -0,0 +1,106 @@ +# ---------------------------------------------------------------------- +# Gretchen Counter + +all : \ + ../sprites/gretchencounter/kgcmb0.png \ + ../sprites/gretchencounter/kgcma0.png \ + ../sprites/gretchencounter/kgcmc0.png \ + ../sprites/gretchencounter/kgcna0.png \ + ../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 \ + ../sprites/gretchencounter/kgcpa0.png \ + ../sprites/gretchencounter/kgcpb0.png \ + ../sprites/gretchencounter/bright_kgcpa0.png \ + ../sprites/gretchencounter/bright_kgcpb0.png \ + ../sprites/gretchencounter/bright_kgcmc0.png + +# Base frames +../sprites/gretchencounter/kgcma0.png : gretchencounter_weaponsprite.aseprite + aseprite $^ \ + -b \ + --ignore-layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/gretchencounter/kgcmb0.png : gretchencounter_weaponsprite.aseprite + aseprite $^ \ + -b \ + --ignore-layer "brightmap" \ + --frame-range 1,1 --save-as $@ + +../sprites/gretchencounter/kgcmc0.png : gretchencounter_weaponsprite.aseprite + aseprite $^ \ + -b \ + --ignore-layer "brightmap" \ + --frame-range 2,2 --save-as $@ + +# Brightmaps +../sprites/gretchencounter/bright_kgcma0.png : gretchencounter_weaponsprite.aseprite + aseprite $^ \ + -b \ + --layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/gretchencounter/bright_kgcmb0.png : gretchencounter_weaponsprite.aseprite + aseprite $^ \ + -b \ + --layer "brightmap" \ + --frame-range 1,1 --save-as $@ + +../sprites/gretchencounter/bright_kgcmc0.png : gretchencounter_weaponsprite.aseprite + aseprite $^ \ + -b \ + --layer "brightmap" \ + --frame-range 2,2 --save-as $@ + +# Needle +../sprites/gretchencounter/kgcna0.png : gretchencounter_weaponsprite.aseprite + aseprite $^ \ + -b \ + --layer "needle" \ + --frame-range 0,0 --save-as $@ + +../sprites/gretchencounter/kgcnb0.png : gretchencounter_weaponsprite.aseprite + aseprite $^ \ + -b \ + --layer "needle" \ + --frame-range 1,1 --save-as $@ + +# Pickup sprite +../sprites/gretchencounter/kgcpa0.png : gretchencounter_pickupsprite.aseprite + aseprite $^ \ + -b \ + --ignore-layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/gretchencounter/kgcpb0.png : gretchencounter_pickupsprite.aseprite + aseprite $^ \ + -b \ + --ignore-layer "brightmap" \ + --frame-range 1,1 --save-as $@ + +../sprites/gretchencounter/bright_kgcpa0.png : gretchencounter_pickupsprite.aseprite + aseprite $^ \ + -b \ + --layer "brightmap" \ + --frame-range 0,0 --save-as $@ + +../sprites/gretchencounter/bright_kgcpb0.png : gretchencounter_pickupsprite.aseprite + aseprite $^ \ + -b \ + --layer "brightmap" \ + --frame-range 1,1 --save-as $@ + +# Sounds +../sounds/gretchencounter_click.ogg : gretchencounter_click.wav + ffmpeg -i $^ "-filter:a" "volume=1.0" $@ + +../sounds/gretchencounter_blip.ogg : gretchencounter_blip.wav + ffmpeg -i $^ "-filter:a" "volume=1.0" $@ + +../sounds/gretchencounter_onoff.ogg : gretchencounter_on_off_switch.wav + ffmpeg -i $^ "-filter:a" "volume=1.0" $@ + diff --git a/source_data/jumpercables.mk b/source_data/jumpercables.mk new file mode 100644 index 0000000..bcfa569 --- /dev/null +++ b/source_data/jumpercables.mk @@ -0,0 +1,248 @@ +# ---------------------------------------------------------------------- +# Jumper Cables + +all : \ + ../sprites/jumpercables/jmpka0.png \ + ../sprites/jumpercables/jmpra0.png \ + ../sprites/jumpercables/jmppa0.png \ + ../sprites/jumpercables/jmppb0.png \ + ../sprites/jumpercables/jmppc0.png \ + ../graphics/jumpercables/jmpr_reticle1.png \ + ../graphics/jumpercables/jmpr_reticle2.png \ + ../graphics/jumpercables/jmpr_reticle3.png \ + ../sprites/jumpercables/jmpia0.png \ + ../sprites/jumpercables/jmpib0.png \ + ../sprites/jumpercables/jmpic0.png \ + ../sprites/jumpercables/jmpid0.png \ + ../sprites/jumpercables/jmpie0.png \ + ../sprites/jumpercables/jmpif0.png \ + ../sprites/jumpercables/jmpig0.png \ + ../sprites/jumpercables/jmpja0.png \ + ../sprites/jumpercables/jmpjb0.png \ + ../sprites/jumpercables/jmpjc0.png \ + ../sprites/jumpercables/jmpjd0.png \ + ../sprites/jumpercables/jmpje0.png \ + ../sprites/jumpercables/jmpjf0.png \ + ../sprites/jumpercables/jmpjg0.png \ + letter_sprites_l \ + letter_sprites_r \ + brightmaps + +../sprites/jumpercables/jmpka0.png : jumpercables_pickupsprite.aseprite + aseprite -b $^ --save-as $@ + +../sprites/jumpercables/jmpra0.png : jumpercables_deployedsprite.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 + aseprite -b $^ \ + --ignore-layer "brightmap_display" \ + --ignore-layer "brightmap_leds" \ + --ignore-layer "numberindicatorl" \ + --ignore-layer "numberindicatorr" \ + --frame-range 0,2 --save-as $@ + + # Correct Aseprite's automatic naming to Doom's. (Number at the + # end is for rotations, letters are for frame numbers.) + mv ../sprites/jumpercables/jmppa1.png ../sprites/jumpercables/jmppb0.png + mv ../sprites/jumpercables/jmppa2.png ../sprites/jumpercables/jmppc0.png + +../graphics/jumpercables/jmpr_reticle1.png \ +../graphics/jumpercables/jmpr_reticle2.png \ +../graphics/jumpercables/jmpr_reticle3.png : jumpercables_reticle.aseprite + aseprite -b $^ \ + --frame-range 0,2 --save-as $@ + +../sprites/jumpercables/jmpia0.png \ +../sprites/jumpercables/jmpib0.png \ +../sprites/jumpercables/jmpic0.png \ +../sprites/jumpercables/jmpid0.png \ +../sprites/jumpercables/jmpie0.png \ +../sprites/jumpercables/jmpif0.png \ +../sprites/jumpercables/jmpig0.png \ +../sprites/jumpercables/jmpja0.png \ +../sprites/jumpercables/jmpjb0.png \ +../sprites/jumpercables/jmpjc0.png \ +../sprites/jumpercables/jmpjd0.png \ +../sprites/jumpercables/jmpje0.png \ +../sprites/jumpercables/jmpjf0.png \ +../sprites/jumpercables/jmpjg0.png : jumpercables_weaponsprite.aseprite + + aseprite -b $^ \ + --layer "numberindicatorl" \ + --frame-range 0,6 --save-as ../sprites/jumpercables/jmpia.png + + aseprite -b $^ \ + --layer "numberindicatorr" \ + --frame-range 0,6 --save-as ../sprites/jumpercables/jmpja.png + + mv ../sprites/jumpercables/jmpia1.png ../sprites/jumpercables/jmpia0.png + mv ../sprites/jumpercables/jmpia2.png ../sprites/jumpercables/jmpib0.png + mv ../sprites/jumpercables/jmpia3.png ../sprites/jumpercables/jmpic0.png + mv ../sprites/jumpercables/jmpia4.png ../sprites/jumpercables/jmpid0.png + mv ../sprites/jumpercables/jmpia5.png ../sprites/jumpercables/jmpie0.png + mv ../sprites/jumpercables/jmpia6.png ../sprites/jumpercables/jmpif0.png + mv ../sprites/jumpercables/jmpia7.png ../sprites/jumpercables/jmpig0.png + mv ../sprites/jumpercables/jmpja1.png ../sprites/jumpercables/jmpja0.png + mv ../sprites/jumpercables/jmpja2.png ../sprites/jumpercables/jmpjb0.png + mv ../sprites/jumpercables/jmpja3.png ../sprites/jumpercables/jmpjc0.png + mv ../sprites/jumpercables/jmpja4.png ../sprites/jumpercables/jmpjd0.png + mv ../sprites/jumpercables/jmpja5.png ../sprites/jumpercables/jmpje0.png + mv ../sprites/jumpercables/jmpja6.png ../sprites/jumpercables/jmpjf0.png + mv ../sprites/jumpercables/jmpja7.png ../sprites/jumpercables/jmpjg0.png + + +letter_sprites_% : + + + aseprite -b jumpercables_weaponsprite.aseprite \ + --layer "numberindicator$*" \ + --frame-range 0,6 --save-as tmp.png + + convert tmp6.png \ + tmp3.png -composite \ + tmp5.png -composite \ + tmp4.png -composite \ + tmp2.png -composite \ + tmp1.png -composite \ + indic_$*_0.png + + convert tmp4.png \ + tmp5.png -composite \ + indic_$*_1.png + + convert tmp6.png \ + tmp7.png -composite \ + tmp3.png -composite \ + tmp5.png -composite \ + tmp2.png -composite \ + indic_$*_2.png + + convert tmp3.png \ + tmp4.png -composite \ + tmp5.png -composite \ + tmp6.png -composite \ + tmp7.png -composite \ + indic_$*_3.png + + convert tmp1.png \ + tmp4.png -composite \ + tmp5.png -composite \ + tmp7.png -composite \ + indic_$*_4.png + + convert tmp6.png \ + tmp7.png -composite \ + tmp3.png -composite \ + tmp4.png -composite \ + tmp1.png -composite \ + indic_$*_5.png + + convert tmp6.png \ + tmp7.png -composite \ + tmp3.png -composite \ + tmp4.png -composite \ + tmp1.png -composite \ + tmp2.png -composite \ + indic_$*_6.png + + convert tmp6.png \ + tmp5.png -composite \ + tmp4.png -composite \ + indic_$*_7.png + + convert tmp6.png \ + tmp7.png -composite \ + tmp3.png -composite \ + tmp5.png -composite \ + tmp4.png -composite \ + tmp2.png -composite \ + tmp1.png -composite \ + indic_$*_8.png + + convert tmp6.png \ + tmp7.png -composite \ + tmp3.png -composite \ + tmp5.png -composite \ + tmp4.png -composite \ + tmp1.png -composite \ + indic_$*_9.png + + convert tmp6.png \ + tmp7.png -composite \ + tmp5.png -composite \ + tmp4.png -composite \ + tmp2.png -composite \ + tmp1.png -composite \ + indic_$*_a.png + + convert tmp7.png \ + tmp3.png -composite \ + tmp4.png -composite \ + tmp2.png -composite \ + tmp1.png -composite \ + indic_$*_b.png + + convert tmp3.png \ + tmp1.png -composite \ + tmp2.png -composite \ + tmp6.png -composite \ + indic_$*_c.png + + convert tmp7.png \ + tmp3.png -composite \ + tmp4.png -composite \ + tmp2.png -composite \ + tmp5.png -composite \ + indic_$*_d.png + + convert tmp6.png \ + tmp7.png -composite \ + tmp3.png -composite \ + tmp2.png -composite \ + tmp1.png -composite \ + indic_$*_e.png + + convert tmp6.png \ + tmp7.png -composite \ + tmp2.png -composite \ + tmp1.png -composite \ + indic_$*_f.png + + mv indic_$*_0.png ../sprites/jumpercables/jmi$*a0.png + mv indic_$*_1.png ../sprites/jumpercables/jmi$*b0.png + mv indic_$*_2.png ../sprites/jumpercables/jmi$*c0.png + mv indic_$*_3.png ../sprites/jumpercables/jmi$*d0.png + mv indic_$*_4.png ../sprites/jumpercables/jmi$*e0.png + mv indic_$*_5.png ../sprites/jumpercables/jmi$*f0.png + mv indic_$*_6.png ../sprites/jumpercables/jmi$*g0.png + mv indic_$*_7.png ../sprites/jumpercables/jmi$*h0.png + mv indic_$*_8.png ../sprites/jumpercables/jmi$*i0.png + mv indic_$*_9.png ../sprites/jumpercables/jmi$*j0.png + mv indic_$*_a.png ../sprites/jumpercables/jmi$*k0.png + mv indic_$*_b.png ../sprites/jumpercables/jmi$*l0.png + mv indic_$*_c.png ../sprites/jumpercables/jmi$*m0.png + mv indic_$*_d.png ../sprites/jumpercables/jmi$*n0.png + mv indic_$*_e.png ../sprites/jumpercables/jmi$*o0.png + mv indic_$*_f.png ../sprites/jumpercables/jmi$*p0.png + +brightmaps : jumpercables_weaponsprite.aseprite + + aseprite -b $^ \ + --layer "brightmap_display" \ + --frame-range 0,0 --save-as brightmap_display.png + + aseprite -b $^ \ + --layer "brightmap_leds" \ + --frame-range 0,2 --save-as brightmap_leds.png + + composite brightmap_display.png brightmap_leds1.png -compose screen ../sprites/jumpercables/bright_jmpr_1.png + composite brightmap_display.png brightmap_leds2.png -compose screen ../sprites/jumpercables/bright_jmpr_2.png + composite brightmap_display.png brightmap_leds3.png -compose screen ../sprites/jumpercables/bright_jmpr_3.png + + rm brightmap_display.png + rm brightmap_leds?.png + + rm tmp?.png