OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix friendly fire blocking self-damage.

Browse source
This commit is contained in:
Mari the Deer 2022-08-17 19:03:19 +02:00
commit a87c249bc0
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r337 \cu(Wed 17 Aug 17:34:15 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r337 \cu(2022-08-17 17:34:15)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r338 \cu(Wed 17 Aug 19:03:19 CEST 2022)\c-";
SWWM_SHORTVER="\cw1.3pre r338 \cu(2022-08-17 19:03:19)\c-";

2
zscript/swwm_player_items.zsc
View file

@ -33,7 +33,7 @@ Class SayaCollar : SWWMArmor
override void ModifyDamage( int damage, Name damageType, out int newdamage, bool passive, Actor inflictor, Actor source, int flags )
{
int ff = swwm_friendlyfire;
if ( !source || !source.IsFriend(Owner) || !ff ) return;
if ( !source || (source == Owner) || !source.IsFriend(Owner) || !ff ) return;
// 1: block incoming friendly damage
// 2: also block outgoing friendly damage
if ( (passive && ff) || (!passive && (ff == 2)) )