From c7d1ee78a2edfc7c5406ce4bb538a771c64d2c70 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Mon, 28 Oct 2019 14:28:22 +0100 Subject: [PATCH] 1.0.2 release: - Fix Minigun altfire not triggering while primary was previously held. - Fix Rocket Launcher fire button handling. You can fire tight wads properly now. - Corrected Biorifle Glob behaviour, now spawns an initial splash on impact, as intended. - Rename some textures to fix a small map conflict. --- Readme.md | 2 +- gldefs.txt | 12 +++--- graphics/{SkySetB_back.png => dtsky_back.png} | Bin graphics/{SkySetB_down.png => dtsky_down.png} | Bin .../{SkySetB_front.png => dtsky_front.png} | Bin graphics/{SkySetB_left.png => dtsky_left.png} | Bin .../{SkySetB_right.png => dtsky_right.png} | Bin graphics/{SkySetB_up.png => dtsky_up.png} | Bin zscript/biorifle.zsc | 21 ++++++---- zscript/eightball.zsc | 38 +++++++++++------- zscript/minigun.zsc | 2 +- 11 files changed, 44 insertions(+), 31 deletions(-) rename graphics/{SkySetB_back.png => dtsky_back.png} (100%) rename graphics/{SkySetB_down.png => dtsky_down.png} (100%) rename graphics/{SkySetB_front.png => dtsky_front.png} (100%) rename graphics/{SkySetB_left.png => dtsky_left.png} (100%) rename graphics/{SkySetB_right.png => dtsky_right.png} (100%) rename graphics/{SkySetB_up.png => dtsky_up.png} (100%) diff --git a/Readme.md b/Readme.md index 573e987..2a27916 100644 --- a/Readme.md +++ b/Readme.md @@ -61,7 +61,7 @@ This mod requires GZDoom 4.2.3 or later. ## In progress - - N/A, this is the 1.0.1 release + - N/A, this is the 1.0.2 release ## Planned diff --git a/gldefs.txt b/gldefs.txt index b0536f7..a313566 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -820,10 +820,10 @@ HardwareShader PostProcess scene // Skyboxes SkyBox "KGDaySky" fliptop { - "graphics/SkySetB_front.png" - "graphics/SkySetB_right.png" - "graphics/SkySetB_back.png" - "graphics/SkySetB_left.png" - "graphics/SkySetB_up.png" - "graphics/SkySetB_down.png" + "graphics/dtsky_front.png" + "graphics/dtsky_right.png" + "graphics/dtsky_back.png" + "graphics/dtsky_left.png" + "graphics/dtsky_up.png" + "graphics/dtsky_down.png" } diff --git a/graphics/SkySetB_back.png b/graphics/dtsky_back.png similarity index 100% rename from graphics/SkySetB_back.png rename to graphics/dtsky_back.png diff --git a/graphics/SkySetB_down.png b/graphics/dtsky_down.png similarity index 100% rename from graphics/SkySetB_down.png rename to graphics/dtsky_down.png diff --git a/graphics/SkySetB_front.png b/graphics/dtsky_front.png similarity index 100% rename from graphics/SkySetB_front.png rename to graphics/dtsky_front.png diff --git a/graphics/SkySetB_left.png b/graphics/dtsky_left.png similarity index 100% rename from graphics/SkySetB_left.png rename to graphics/dtsky_left.png diff --git a/graphics/SkySetB_right.png b/graphics/dtsky_right.png similarity index 100% rename from graphics/SkySetB_right.png rename to graphics/dtsky_right.png diff --git a/graphics/SkySetB_up.png b/graphics/dtsky_up.png similarity index 100% rename from graphics/SkySetB_up.png rename to graphics/dtsky_up.png diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc index f2911ea..df886ac 100644 --- a/zscript/biorifle.zsc +++ b/zscript/biorifle.zsc @@ -639,15 +639,8 @@ Class BioGlob : BioGel { int numsplash; - override void AlignSelf() + void SpawnSplash() { - Super.AlignSelf(); - if ( !bAMBUSH && (Scale.x > 1) ) numsplash = int(2*Scale.x)-1; - } - override void Tick() - { - Super.Tick(); - if ( isFrozen() ) return; Vector3 ofs = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch)); for ( int i=0; i<2; i++ ) { @@ -664,6 +657,18 @@ Class BioGlob : BioGel d.vel.z -= 2; } } + override void AlignSelf() + { + Super.AlignSelf(); + if ( !bAMBUSH && (Scale.x > 1) ) numsplash = int(2*Scale.x)-1; + SpawnSplash(); + } + override void Tick() + { + Super.Tick(); + if ( isFrozen() ) return; + SpawnSplash(); + } } Class BioSplash : BioGel diff --git a/zscript/eightball.zsc b/zscript/eightball.zsc index 25be721..2f4d7c8 100644 --- a/zscript/eightball.zsc +++ b/zscript/eightball.zsc @@ -467,6 +467,14 @@ Class UTRocketLauncher : UTWeapon if ( invoker.LockedTarget ) invoker.LockedOn = true; } + action bool FireCheck() + { + let weap = Weapon(invoker); + if ( !weap ) return false; + if ( weap.bAltFire ) return !(player.cmd.buttons&BT_ALTATTACK); + else return !(player.cmd.buttons&BT_ATTACK); + } + Default { Tag "$T_EIGHTBALL"; @@ -526,53 +534,53 @@ Class UTRocketLauncher : UTWeapon AltFire: // one is loaded already EBLI A 1 A_LoadRocket(false); - EBLI A 2 A_JumpIf((!invoker.bAltFire&&invoker.bSingleRocket)||(invoker.Ammo1.Amount<=0)||!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireOne"); + EBLI A 2 A_JumpIf((!invoker.bAltFire&&invoker.bSingleRocket)||(invoker.Ammo1.Amount<=0)||FireCheck(),"FireOne"); EBLI A 0; // no tween // load two EBR1 A 0 A_PlaySound("utrl/rotate",CHAN_6,0.1); - EBR1 ABCDEFG 2 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireOne"); + EBR1 ABCDEFG 2 A_JumpIf(FireCheck(),"FireOne"); EBL2 A 0 A_PlaySound("utrl/load",CHAN_6); - EBL2 ABCDEFG 3 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireOne"); + EBL2 ABCDEFG 3 A_JumpIf(FireCheck(),"FireOne"); EBR2 A 0 { A_LoadRocket(); - return A_JumpIf((invoker.Ammo1.Amount<=0)||!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireTwo"); + return A_JumpIf((invoker.Ammo1.Amount<=0)||FireCheck(),"FireTwo"); } // load three EBR2 A 0 A_PlaySound("utrl/rotate",CHAN_6,0.1); - EBR2 ABCDEFG 2 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireTwo"); + EBR2 ABCDEFG 2 A_JumpIf(FireCheck(),"FireTwo"); EBL3 A 0 A_PlaySound("utrl/load",CHAN_6); - EBL3 ABCDEFG 3 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireTwo"); + EBL3 ABCDEFG 3 A_JumpIf(FireCheck(),"FireTwo"); EBR3 A 0 { A_LoadRocket(); - return A_JumpIf((invoker.Ammo1.Amount<=0)||!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireThree"); + return A_JumpIf((invoker.Ammo1.Amount<=0)||FireCheck(),"FireThree"); } // load four EBR3 A 0 A_PlaySound("utrl/rotate",CHAN_6,0.1); - EBR3 ABCDEFG 2 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireThree"); + EBR3 ABCDEFG 2 A_JumpIf(FireCheck(),"FireThree"); EBL4 A 0 A_PlaySound("utrl/load",CHAN_6); - EBL4 ABCDEFG 3 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireThree"); + EBL4 ABCDEFG 3 A_JumpIf(FireCheck(),"FireThree"); EBR4 A 0 { A_LoadRocket(); - return A_JumpIf((invoker.Ammo1.Amount<=0)||!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireFour"); + return A_JumpIf((invoker.Ammo1.Amount<=0)||FireCheck(),"FireFour"); } // load five EBR4 A 0 A_PlaySound("utrl/rotate",CHAN_6,0.1); - EBR4 ABCDEFG 2 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireFour"); + EBR4 ABCDEFG 2 A_JumpIf(FireCheck(),"FireFour"); EBL5 A 0 A_PlaySound("utrl/load",CHAN_6); - EBL5 ABCDEFG 3 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireFour"); + EBL5 ABCDEFG 3 A_JumpIf(FireCheck(),"FireFour"); EBR5 A 0 { A_LoadRocket(); - return A_JumpIf((invoker.Ammo1.Amount<=0)||!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireFive"); + return A_JumpIf((invoker.Ammo1.Amount<=0)||FireCheck(),"FireFive"); } // load six EBR5 A 0 A_PlaySound("utrl/rotate",CHAN_6,0.1); - EBR5 ABCDEFG 2 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireFive"); + EBR5 ABCDEFG 2 A_JumpIf(FireCheck(),"FireFive"); EBL6 A 0 A_PlaySound("utrl/load",CHAN_6); - EBL6 ABCDEF 3 A_JumpIf(!(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)),"FireFive"); + EBL6 ABCDEF 3 A_JumpIf(FireCheck(),"FireFive"); EBL6 F 0 A_LoadRocket(); Goto FireSix; FireOne: diff --git a/zscript/minigun.zsc b/zscript/minigun.zsc index e0aa476..2a29733 100644 --- a/zscript/minigun.zsc +++ b/zscript/minigun.zsc @@ -248,7 +248,7 @@ Class Minigun : UTWeapon A_Overlay(-9999,"FireDummy"); } MGNF ABCDEFGHIJKLMNOPQRS 1 A_FireBullet(); - MGNF A 0 A_JumpIf(invoker.bAltFire,1); + MGNF A 0 A_JumpIf(player.cmd.buttons&BT_ALTATTACK,1); Goto Hold+1; AltHold: MGNF B 0 A_PlaySound("minigun/altfire",CHAN_WEAPON,1.0,true);