From d99fad4756fe92405747b0a6aab94e54a1374c51 Mon Sep 17 00:00:00 2001 From: Kiri Date: Sat, 26 Aug 2023 13:59:08 -0700 Subject: [PATCH] Added cleanup stuff in Makefile. --- source_data/Makefile | 10 ++++++---- zscript.zs | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/source_data/Makefile b/source_data/Makefile index 7e0c87d..138b252 100644 --- a/source_data/Makefile +++ b/source_data/Makefile @@ -236,10 +236,12 @@ brightmaps : povsprite.aseprite --layer "brightmap_leds" \ --frame-range 0,2 --save-as brightmap_leds.png - aseprite -b $^ \ - --layer "brightmap_digits" \ - --frame-range 0,0 --save-as brightmap_digits.png - composite brightmap_display.png brightmap_leds1.png -compose screen ../sprites/jmpr_brightmap_1.png composite brightmap_display.png brightmap_leds2.png -compose screen ../sprites/jmpr_brightmap_2.png composite brightmap_display.png brightmap_leds3.png -compose screen ../sprites/jmpr_brightmap_3.png + + rm brightmap_display.png + rm brightmap_leds?.png + + rm tmp?.png + diff --git a/zscript.zs b/zscript.zs index 8b56d42..9190c35 100644 --- a/zscript.zs +++ b/zscript.zs @@ -358,6 +358,7 @@ class JumperCablesUsable : HDWeapon #### # 0 A_Jump(256,"ready"); deploy: + // Lower it down... JMPP A 1 offset(0, 16); JMPP A 1 offset(0, 32); JMPP A 1 offset(0, 48); @@ -366,16 +367,17 @@ class JumperCablesUsable : HDWeapon JMPP A 1 offset(0, 96); JMPP A 1 offset(0, 128); + // Play some sounds. JMPP A 0 A_JumpIf(!pressingfire(),"ready"); JMPP A 4 A_StartSound("weapons/pismagclick",CHAN_WEAPON); JMPP A 2 A_StartSound("derp/crawl",CHAN_WEAPON,CHANF_OVERLAP); + // Actual cable attachment happens here. JMPP A 1 { - // invoker.owner.A_Log("Blep"); - A_WeaponReady(WRF_NOFIRE | WRF_ALLOWRELOAD | WRF_ALLOWUSER4); AttachCables(HDPlayerPawn(invoker.owner)); } + // Raise it back up... JMPP A 1 offset(0, 128); JMPP A 1 offset(0, 96); JMPP A 1 offset(0, 72);