From 7ca40eb252fd852766c186603bf28fb32227b454 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Mon, 16 Jan 2023 13:27:25 +0100
Subject: [PATCH] Ghost Artifact no longer changes player render style.

---
 language.version                |  4 ++--
 zscript/items/swwm_powerups.zsc | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/language.version b/language.version
index ddff9a22f..fb9e5ab9a 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r735 \cu(Sat 14 Jan 22:16:25 CET 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r735 \cu(2023-01-14 22:16:25)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r736 \cu(Mon 16 Jan 13:27:25 CET 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r736 \cu(2023-01-16 13:27:25)\c-";
diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc
index b838c37dd..d3a55bd11 100644
--- a/zscript/items/swwm_powerups.zsc
+++ b/zscript/items/swwm_powerups.zsc
@@ -324,27 +324,32 @@ Class GhostTarget : Actor
 	}
 }
 
-Class GhostPower : PowerInvisibility
+Class GhostPower : Powerup
 {
 	Mixin SWWMShadedPowerup;
 
 	Actor snd;
 
+	bool bSavedInvisible, bSavedCantSeek, bSavedShadow;
+
 	Default
 	{
 		Inventory.Icon "graphics/HUD/Icons/I_Ghost.png";
 		Powerup.Duration -60;
-		Powerup.Strength 100;
-		Powerup.Mode "Translucent";
 		Powerup.Color "F0 E0 FF", 0.1;
 		+INVENTORY.ADDITIVETIME;
-		+CANTSEEK;
 	}
 
 	override void InitEffect()
 	{
 		Super.InitEffect();
 		if ( !Owner ) return;
+		bSavedInvisible = Owner.bINVISIBLE;
+		bSavedCantSeek = Owner.bCANTSEEK;
+		bSavedShadow = Owner.bSHADOW;
+		Owner.bINVISIBLE = true;
+		Owner.bCANTSEEK = true;
+		Owner.bSHADOW = true;
 		SWWMHandler.DoFlash(Owner,Color(96,224,192,255),20);
 		if ( Owner is 'Demolitionist' )
 			Demolitionist(Owner).lastbump *= 1.04;
@@ -354,6 +359,9 @@ Class GhostPower : PowerInvisibility
 	{
 		Super.EndEffect();
 		if ( !Owner ) return;
+		Owner.bINVISIBLE = bSavedInvisible;
+		Owner.bCANTSEEK = bSavedCantSeek;
+		Owner.bSHADOW = bSavedShadow;
 		Owner.A_StartSound("powerup/ghostend",CHAN_ITEMEXTRA,CHANF_OVERLAP);
 		SWWMHandler.DoFlash(Owner,Color(96,224,192,255),20);
 		if ( Owner is 'Demolitionist' )
@@ -391,14 +399,6 @@ Class GhostPower : PowerInvisibility
 		snd.target = Owner;
 		snd.master = self;
 	}
-
-	override void AlterWeaponSprite( VisStyle vis, in out int changed )
-	{
-		// leave weapons alone
-		vis.RenderStyle = STYLE_Normal;
-		vis.Alpha = 1.f;
-		changed = 1;
-	}
 }
 
 Class GhostArtifactX : SWWMItemOverlay {}