From 4016063379889716201aa606ef9a490cc9f5e38d Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 13 Jun 2021 18:05:52 +0200 Subject: [PATCH] Give score for defacing textures. --- language.version | 4 ++-- zscript/swwm_gesture_fx.zsc | 6 ++++++ zscript/swwm_player.zsc | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/language.version b/language.version index 949c22df1..faa4f5eec 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r539 \cu(Sun 13 Jun 16:47:25 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r539 \cu(2021-06-13 16:47:25)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r540 \cu(Sun 13 Jun 18:05:52 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r540 \cu(2021-06-13 18:05:52)\c-"; diff --git a/zscript/swwm_gesture_fx.zsc b/zscript/swwm_gesture_fx.zsc index bf33ec328..2b060399f 100644 --- a/zscript/swwm_gesture_fx.zsc +++ b/zscript/swwm_gesture_fx.zsc @@ -302,6 +302,12 @@ Class LoveHeart : Actor [remove, replacewith] = SWWMUtility.DefaceTexture(HitTexture); if ( !remove ) return; A_StartSound("bestsound",CHAN_ITEMEXTRA,CHANF_OVERLAP); + if ( target && target.player ) + { + int scr = (TexMan.GetName(HitTexture).Left(6)~=="ZZWOLF")?200:20; + SWWMCredits.Give(target.player,scr); + if ( target.player == players[consoleplayer] ) SWWMScoreObj.Spawn(scr,pos); + } if ( HitLine ) { if ( Hit3DFloor ) diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 1651bc510..9dcb860f5 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -530,6 +530,9 @@ Class Demolitionist : PlayerPawn player.usedown = true; A_StartSound("bestsound",CHAN_ITEMEXTRA,CHANF_OVERLAP); lastbump *= .97; + int scr = (TexMan.GetName(d.HitTexture).Left(6)~=="ZZWOLF")?200:20; + SWWMCredits.Give(player,scr); + if ( player == players[consoleplayer] ) SWWMScoreObj.Spawn(scr,d.HitLocation); if ( d.HitType == TRACE_HitWall ) { if ( d.Hit3DFloor )