From 3dd2b45f2a2c5ddff200df962a055091ec9ca81d Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 16 Jun 2021 20:31:35 +0200 Subject: [PATCH] More deathmatch stuff. --- language.version | 4 ++-- sndinfo.txt | 1 + sounds/GFRAG.ogg | Bin 0 -> 20004 bytes zscript/handler/swwm_handler_damage.zsc | 8 +++++++- zscript/handler/swwm_handler_worldload.zsc | 3 +++ zscript/items/swwm_ammoextra.zsc | 8 +++++++- zscript/items/swwm_baseitem.zsc | 20 ++++++++++++++++++-- zscript/items/swwm_powerups.zsc | 10 ++++++++++ zscript/kbase/swwm_kbase.zsc | 7 +++++-- zscript/swwm_player.zsc | 7 +++++++ zscript/swwm_thinkers_player.zsc | 2 +- zscript/weapons/swwm_baseweapon.zsc | 2 +- zscript/weapons/swwm_splode.zsc | 2 +- zscript/weapons/swwm_tastytreat.zsc | 2 +- 14 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 sounds/GFRAG.ogg diff --git a/language.version b/language.version index 78b8720bd..2c7736021 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r543 \cu(Wed 16 Jun 17:47:21 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r543 \cu(2021-06-16 17:47:21)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r544 \cu(Wed 16 Jun 20:31:35 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r544 \cu(2021-06-16 20:31:35)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index c5bf050bb..6a60f40b3 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -936,6 +936,7 @@ misc/orbexplode sounds/ORBEXPLODE.ogg misc/omgfart sounds/omgfart.ogg misc/voice sounds/dlgvoice.ogg misc/sewercount sounds/sewercount.ogg +misc/frag sounds/GFRAG.ogg misc/gibber1 sounds/general/Gib1.ogg misc/gibber2 sounds/general/Gib2.ogg misc/gibber3 sounds/general/Gib3.ogg diff --git a/sounds/GFRAG.ogg b/sounds/GFRAG.ogg new file mode 100644 index 0000000000000000000000000000000000000000..37a7e0122e484fd02853267b60d05b899ec1cd9a GIT binary patch literal 20004 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 undJB56vwV9do5xod1M`xIw?^3D@p4h8^9;eKTR literal 0 HcmV?d00001 diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc index 996eb48e2..cc1680081 100644 --- a/zscript/handler/swwm_handler_damage.zsc +++ b/zscript/handler/swwm_handler_damage.zsc @@ -209,7 +209,13 @@ extend Class SWWMHandler // scoring int score = min(1000,int(ceil(e.Thing.GetSpawnHealth()*.05)*10)); // player score is always the same - if ( e.Thing.player ) score = 1000; + if ( e.Thing.player ) + { + score = 1000; + // deathmatch frag sound + if ( src.player == players[consoleplayer] ) + S_StartSound("misc/frag",CHAN_WEAPON,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1.,ATTN_NONE); + } SWWMScoreObj scr = null; if ( src.player == players[consoleplayer] ) scr = SWWMScoreObj.Spawn(score,e.Thing.Vec3Offset(0,0,e.Thing.Height/2)); diff --git a/zscript/handler/swwm_handler_worldload.zsc b/zscript/handler/swwm_handler_worldload.zsc index 2e93f92b1..44e229ec1 100644 --- a/zscript/handler/swwm_handler_worldload.zsc +++ b/zscript/handler/swwm_handler_worldload.zsc @@ -214,6 +214,9 @@ extend Class SWWMHandler for ( int i=0; i MaxAmount) && (Stamina != 0) ) + if ( !deathmatch && bALWAYSPICKUP && (Amount+item.Amount > MaxAmount) && (Stamina != 0) ) { int sellprice = int(abs(Stamina)*.5); SWWMScoreObj.Spawn(sellprice,Owner.Vec3Offset(FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8),FRandom[ScoreBits](-8,8)+Owner.Height/2)); @@ -18,6 +24,16 @@ Mixin Class SWWMAutoUseFix } return Super.HandlePickup(item); } + override bool TryPickup( in out Actor toucher ) + { + if ( !deathmatch ) return Super.TryPickup(toucher); + // pretend to have a max amount of 0 so we can only be picked up if we can be used + int oldmax = MaxAmount; + MaxAmount = 0; + bool ret = Super.TryPickup(toucher); + MaxAmount = oldmax; + return ret; + } } Class CrossLineFinder : LineTracer diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index edbaafaf2..27cb670ac 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -1280,6 +1280,11 @@ Class Omnisight : Inventory } return false; } + override bool ShouldSpawn() + { + if ( deathmatch ) return false; + return Super.ShouldSpawn(); + } Default { //$Title Omnisight @@ -1913,6 +1918,11 @@ Class SWWMLamp : Inventory Amount++; return true; } + override bool ShouldSpawn() + { + if ( deathmatch ) return false; + return Super.ShouldSpawn(); + } override void DoEffect() { Super.DoEffect(); diff --git a/zscript/kbase/swwm_kbase.zsc b/zscript/kbase/swwm_kbase.zsc index 10b754761..768c00421 100644 --- a/zscript/kbase/swwm_kbase.zsc +++ b/zscript/kbase/swwm_kbase.zsc @@ -314,8 +314,11 @@ Class DemolitionistMenu : GenericMenu tabs.Push(TAB_MISSION); tabs.Push(TAB_STATS); tabs.Push(TAB_INVENTORY); - tabs.Push(TAB_KEYS); - tabs.Push(TAB_LIBRARY); + if ( !deathmatch ) + { + tabs.Push(TAB_KEYS); + tabs.Push(TAB_LIBRARY); + } if ( !deathmatch && (G_SkillPropertyInt(SKILLP_ACSReturn) < 4) ) tabs.Push(TAB_STORE); for ( int i=0; i MaxAmount) && (item.Stamina > 0) ) + if ( !deathmatch && (Amount+item.Amount > MaxAmount) && (item.Stamina > 0) ) { // sell excess int sellprice = item.Stamina/2; diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc index 66da89bb4..092e41ba3 100644 --- a/zscript/weapons/swwm_splode.zsc +++ b/zscript/weapons/swwm_splode.zsc @@ -48,7 +48,7 @@ Class ExplodiumGun : SWWMWeapon return true; if ( (item.GetClass() == 'ExplodiumGun') && !item.ShouldStay() ) { - if ( (Amount+item.Amount > MaxAmount) && (Stamina > 0) ) + if ( !deathmatch && (Amount+item.Amount > MaxAmount) && (Stamina > 0) ) { // sell excess int sellprice = int(Stamina*.5); diff --git a/zscript/weapons/swwm_tastytreat.zsc b/zscript/weapons/swwm_tastytreat.zsc index 118a7bbd0..44376ceeb 100644 --- a/zscript/weapons/swwm_tastytreat.zsc +++ b/zscript/weapons/swwm_tastytreat.zsc @@ -21,7 +21,7 @@ Class CandyGun : SWWMWeapon [ammoget, spareget] = CandyGun(item).PickupForAmmoAndSpares(self); if ( ammoget || spareget ) item.bPickupGood = true; - if ( !spareget ) + if ( !deathmatch && !spareget ) { // sell excess int sellprice = item.Stamina/2;