diff --git a/language.version b/language.version index 660eb1835..3ee1fe6c2 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1153 \cu(Fri Oct 4 19:24:59 CEST 2024)\c-"; -SWWM_SHORTVER="\cw1.3pre r1153 \cu(2024-10-04 19:24:59)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1152 \cu(Mon Sep 30 21:39:42 CEST 2024)\c-"; +SWWM_SHORTVER="\cw1.3pre r1152 \cu(2024-09-30 21:39:42)\c-"; diff --git a/zscript/items/swwm_lamp.zsc b/zscript/items/swwm_lamp.zsc index 315be4c66..cba2cc0ba 100644 --- a/zscript/items/swwm_lamp.zsc +++ b/zscript/items/swwm_lamp.zsc @@ -46,7 +46,7 @@ Class LampMoth : Actor Super.PostBeginPlay(); A_StartSound("moth/fly",CHAN_BODY,CHANF_LOOP,.02,4.,FRandom[Moth](.8,1.2)); if ( master && master.player ) SetFriendPlayer(master.player); - else A_SetFriendly(false); + else bFRIENDLY = false; } override int DamageMobj( Actor inflictor, Actor source, int damage, Name mod, int flags, double angle ) { @@ -77,7 +77,7 @@ Class LampMoth : Actor if ( CompanionLamp(lamp).moff.Find(self) == CompanionLamp(lamp).moff.Size() ) CompanionLamp(lamp).moff.Push(self); if ( master && master.player ) SetFriendPlayer(master.player); - else A_SetFriendly(false); + else bFRIENDLY = false; } } } diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index 26cbe2162..36a021d9f 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -420,7 +420,7 @@ Class GhostPower : Powerup if ( !gt ) { gt = Spawn("GhostTarget",Owner.pos); - if ( Owner.bFRIENDLY || Owner.player ) gt.A_SetFriendly(true); + if ( Owner.bFRIENDLY || Owner.player ) gt.bFRIENDLY = true; } a.target = gt; a.LastHeard = gt; diff --git a/zscript/player/swwm_player.zsc b/zscript/player/swwm_player.zsc index 504b4c78f..87bb2e3a1 100644 --- a/zscript/player/swwm_player.zsc +++ b/zscript/player/swwm_player.zsc @@ -198,7 +198,7 @@ Class Demolitionist : PlayerPawn // give it a face if it belongs to a player if ( player ) { - v.A_SetFriendly(true); + v.bFRIENDLY = true; v.A_ChangeModel("",0,"","",1,"models","VoodooDollFace.png",CMDL_USESURFACESKIN,-1); } Destroy(); diff --git a/zscript/swwm_gesture.zsc b/zscript/swwm_gesture.zsc index 2f751a79d..7a57526e6 100644 --- a/zscript/swwm_gesture.zsc +++ b/zscript/swwm_gesture.zsc @@ -272,7 +272,7 @@ Class SWWMGesture : SWWMWeapon if ( SWWMUtility.IdentifyingCaco(t) || SWWMUtility.IdentifyingDrug(t) || SWWMUtility.IdentifyingDoubleBoi(t) ) SWWMUtility.AchievementProgressInc("friend",1,player); } - t.A_SetFriendly(true); + t.bFRIENDLY = true; if ( deathmatch ) t.SetFriendPlayer(player); // cancel any attacks diff --git a/zscript/swwm_gesture_fx.zsc b/zscript/swwm_gesture_fx.zsc index ab21d4aca..ed4ca6dd8 100644 --- a/zscript/swwm_gesture_fx.zsc +++ b/zscript/swwm_gesture_fx.zsc @@ -120,7 +120,7 @@ Class LoveHeart : Actor } if ( s ) s.smooch++; let raging = RagekitPower(self.target.FindInventory("RagekitPower")); - if ( (target is 'WolfensteinSS') || (target.Species == 'WolfensteinSS') ) target.A_SetFriendly(false); + if ( (target is 'WolfensteinSS') || (target.Species == 'WolfensteinSS') ) target.bFRIENDLY = false; if ( target.IsFriend(self.target) || SWWMUtility.IdentifyingDog(target) ) { int healamt = clamp(special2,5,15); @@ -141,7 +141,7 @@ Class LoveHeart : Actor } if ( !target.bFRIENDLY && s ) s.befriend++; - target.A_SetFriendly(true); + target.bFRIENDLY = true; if ( deathmatch ) target.SetFriendPlayer(self.target.player); }