From efda5e69e5e7d639a230a748d3d95aff8efa92ca Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Mon, 28 Oct 2019 14:31:45 +0100 Subject: [PATCH] 1.0.2 Release: - Relocated crosshairs so UT ones can still be used. - Corrected Item Lore so it mentions the Stunner and Impaler also being enhanced by the Amplifier, in case people haven't noticed. - Fix biorifle/napalm glob splash code like in Doom Tournament. --- ItemLore.md | 3 +- Readme.md | 2 +- .../crosshairs/{XHAIRB8.png => XHAIRB15.png} | Bin .../crosshairs/{XHAIRB9.png => XHAIRB16.png} | Bin .../crosshairs/{XHAIRB10.png => XHAIRB17.png} | Bin .../crosshairs/{XHAIRB11.png => XHAIRB18.png} | Bin .../crosshairs/{XHAIRB12.png => XHAIRB19.png} | Bin xhairs.txt | 10 ++-- zscript/napalm.zsc | 47 +++++++----------- zscript/ubiorifle.zsc | 21 +++++--- 10 files changed, 39 insertions(+), 44 deletions(-) rename graphics/crosshairs/{XHAIRB8.png => XHAIRB15.png} (100%) rename graphics/crosshairs/{XHAIRB9.png => XHAIRB16.png} (100%) rename graphics/crosshairs/{XHAIRB10.png => XHAIRB17.png} (100%) rename graphics/crosshairs/{XHAIRB11.png => XHAIRB18.png} (100%) rename graphics/crosshairs/{XHAIRB12.png => XHAIRB19.png} (100%) diff --git a/ItemLore.md b/ItemLore.md index 833c287..1583ada 100644 --- a/ItemLore.md +++ b/ItemLore.md @@ -24,7 +24,8 @@ This mod's version of the Translator has additional features: ## Amplifier -When active, dramatically enhances the power of the Dispersion Pistol and ASMD. +When active, dramatically enhances the power of the Dispersion Pistol, ASMD, +Stunner and Impaler. ## Dampener diff --git a/Readme.md b/Readme.md index 4fb6ece..ac9adf2 100644 --- a/Readme.md +++ b/Readme.md @@ -73,7 +73,7 @@ This mod requires GZDoom 4.2.3 or later, and runs on top of Doom Tournament. ## In progress - - N/A, this is the 1.0.1 release. + - N/A, this is the 1.0.2 release. ## Planned diff --git a/graphics/crosshairs/XHAIRB8.png b/graphics/crosshairs/XHAIRB15.png similarity index 100% rename from graphics/crosshairs/XHAIRB8.png rename to graphics/crosshairs/XHAIRB15.png diff --git a/graphics/crosshairs/XHAIRB9.png b/graphics/crosshairs/XHAIRB16.png similarity index 100% rename from graphics/crosshairs/XHAIRB9.png rename to graphics/crosshairs/XHAIRB16.png diff --git a/graphics/crosshairs/XHAIRB10.png b/graphics/crosshairs/XHAIRB17.png similarity index 100% rename from graphics/crosshairs/XHAIRB10.png rename to graphics/crosshairs/XHAIRB17.png diff --git a/graphics/crosshairs/XHAIRB11.png b/graphics/crosshairs/XHAIRB18.png similarity index 100% rename from graphics/crosshairs/XHAIRB11.png rename to graphics/crosshairs/XHAIRB18.png diff --git a/graphics/crosshairs/XHAIRB12.png b/graphics/crosshairs/XHAIRB19.png similarity index 100% rename from graphics/crosshairs/XHAIRB12.png rename to graphics/crosshairs/XHAIRB19.png diff --git a/xhairs.txt b/xhairs.txt index e7312bd..1b770b7 100644 --- a/xhairs.txt +++ b/xhairs.txt @@ -1,5 +1,5 @@ -8 "Unreal Crosshair 1" -9 "Unreal Crosshair 2" -10 "Unreal Crosshair 3" -11 "Unreal Crosshair 4" -12 "Unreal Crosshair 5" +15 "Unreal Crosshair 1" +16 "Unreal Crosshair 2" +17 "Unreal Crosshair 3" +18 "Unreal Crosshair 4" +19 "Unreal Crosshair 5" diff --git a/zscript/napalm.zsc b/zscript/napalm.zsc index 31387b5..f87229a 100644 --- a/zscript/napalm.zsc +++ b/zscript/napalm.zsc @@ -741,36 +741,8 @@ Class UNapalmGlob : UNapalm { int numsplash; - override void AlignSelf() + void SpawnSplash() { - Super.AlignSelf(); - if ( Scale.x > 1 ) numsplash = int(8*Scale.x)-1; - } - override void OnDestroy() - { - Vector3 ofs = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch)); - while ( numsplash > 0 ) - { - for ( int i=0; i<2; i++ ) - { - if ( numsplash-- <= 0 ) return; - Vector3 dir = (ofs+(FRandom[FlameT](-.8,.8),FRandom[FlameT](-.8,.8),FRandom[FlameT](-.8,.8))).unit(); - A_SetScale(scale.x-0.05); - let d = Spawn("UNapalmSplash",pos+ofs*4); - d.target = target; - d.master = self; - d.scale *= FRandom[FlameT](0.5,0.7); - d.angle = atan2(dir.y,dir.x); - d.pitch = -asin(dir.z); - d.vel = (cos(d.angle)*cos(d.pitch),sin(d.angle)*cos(d.pitch),-sin(d.pitch))*d.speed*FRandom[FlameT](0.3,0.5)*scale.x; - d.vel.z -= 2; - } - } - } - 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++ ) { @@ -787,6 +759,23 @@ Class UNapalmGlob : UNapalm d.vel.z -= 2; } } + override void AlignSelf() + { + Super.AlignSelf(); + if ( Scale.x > 1 ) numsplash = int(8*Scale.x)-1; + SpawnSplash(); + } + override void OnDestroy() + { + Vector3 ofs = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch)); + while ( numsplash > 0 ) SpawnSplash(); + } + override void Tick() + { + Super.Tick(); + if ( isFrozen() ) return; + SpawnSplash(); + } } Class UNapalmSplash : UNapalm diff --git a/zscript/ubiorifle.zsc b/zscript/ubiorifle.zsc index bb21d99..723d2cc 100644 --- a/zscript/ubiorifle.zsc +++ b/zscript/ubiorifle.zsc @@ -538,15 +538,8 @@ Class UBioGlob : UBioGel { int numsplash; - override void AlignSelf() + void SpawnSplash() { - Super.AlignSelf(); - if ( !bAMBUSH && (Scale.x > 1) ) numsplash = int(4*Scale.x)-1; - } - override void Tick() - { - Super.Tick(); - if ( isFrozen() || !sting_biosplash ) return; Vector3 ofs = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch)); for ( int i=0; i<2; i++ ) { @@ -563,6 +556,18 @@ Class UBioGlob : UBioGel d.vel.z -= 2; } } + override void AlignSelf() + { + Super.AlignSelf(); + if ( !bAMBUSH && (Scale.x > 1) ) numsplash = int(4*Scale.x)-1; + if ( sting_biosplash ) SpawnSplash(); + } + override void Tick() + { + Super.Tick(); + if ( isFrozen() || !sting_biosplash ) return; + SpawnSplash(); + } } Class UBioSplash : UBioGel