From ba1583ca76ff3ea79a2cfa61eecf7ce19c240c64 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sun, 5 Jun 2022 00:34:58 +0200 Subject: [PATCH] Don't ignite friends with "pants on fire" cheat. --- language.version | 4 ++-- zscript/handler/swwm_handler_cheats.zsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 8ebc06cf0..fe5d426d8 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.21 r4 \cu(Tue 7 Jun 12:06:53 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.2.21 r4 \cu(2022-06-07 12:06:53)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.21 r5 \cu(Tue 7 Jun 12:07:04 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.2.21 r5 \cu(2022-06-07 12:07:04)\c-"; diff --git a/zscript/handler/swwm_handler_cheats.zsc b/zscript/handler/swwm_handler_cheats.zsc index 06da6d805..ef8440cbf 100644 --- a/zscript/handler/swwm_handler_cheats.zsc +++ b/zscript/handler/swwm_handler_cheats.zsc @@ -402,7 +402,7 @@ extend Class SWWMHandler bool burned = false; while ( a = Actor(ti.Next()) ) { - if ( !a.bSHOOTABLE || a.player || !SWWMUtility.InPlayerFOV(players[e.Args[0]],a) ) continue; + if ( !a.bSHOOTABLE || a.player || a.IsFriend(players[e.Args[0]].mo) || !SWWMUtility.InPlayerFOV(players[e.Args[0]],a) ) continue; OnFire.Apply(a,players[e.Args[0]].mo,500); burned = true; }