From 2db96586c2c064d8deba0df313422afdff25583f Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Fri, 19 Jan 2024 04:25:20 +0100
Subject: [PATCH] Cleaned up TrapExplosiveGas

---
 scripts/trapexplosivegas.pex        | Bin 5587 -> 5498 bytes
 source/scripts/trapexplosivegas.psc |  22 +++-------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/scripts/trapexplosivegas.pex b/scripts/trapexplosivegas.pex
index b812410924a17cba29094e2704e730b7ea3fc688..31df29ae9da0efbae99436fcb56c72f5569addb2 100644
GIT binary patch
literal 5498
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

literal 5587
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
C8(!`J

diff --git a/source/scripts/trapexplosivegas.psc b/source/scripts/trapexplosivegas.psc
index 7199d9d4..9d780a22 100644
--- a/source/scripts/trapexplosivegas.psc
+++ b/source/scripts/trapexplosivegas.psc
@@ -1,7 +1,4 @@
 scriptName TrapExplosiveGas extends objectReference
-;
-;
-;==================================================
 
 formlist property flExplodesGasTrapOnHit auto
 {projectiles that will set this off when they hit}
@@ -18,7 +15,6 @@ formlist property flExplodesGasTrapEquippedSpell auto
 formlist property trapGasWeapon auto
 {weapons that will set this off on hit, specifically explosions}
 
-bool actorHasWeaponsDrawn = TRUE ;remove this later
 bool property checkActorEquippedItems = TRUE auto
 {Whether or not to check items the player is carrying
 	default = True on explosive gas
@@ -32,11 +28,10 @@ keyword property flameKeyword Auto
 keyword property lightningKeyword auto	
 bool property lightningIgnites = TRUE Auto
 {if this is true lightning should ignite this trap
-	default == false}
+	default == true}
 	
 light property Torch01 auto
 projectile property storedProjectile auto hidden
-objectReference property storedObjRef auto hidden
 MagicEffect property storedEffect1 auto hidden
 MagicEffect property storedEffect2 auto hidden
 MagicEffect property storedEffect3 auto hidden
@@ -48,17 +43,13 @@ auto state waiting
 	event onHit(objectReference akAggressor, form akWeapon, projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
 		if !akProjectile || akProjectile != storedProjectile
 			storedProjectile = akProjectile
-; 			debug.Trace(self + " is testing " + akProjectile + " due to onHit, akWeapon = " + akWeapon)
 			
 			;USKP 1.3.2 added NONE checks due to numerous Papyrus errors.
 			If( (trapGasWeapon != NONE && trapGasWeapon.hasForm(akWeapon)) || akweapon == torch01 )
-; 				debug.Trace(self + " is exploding due to " + akWeapon + " being in formlist " + TrapGasWeapon)
 				GasExplode(akAggressor)
 			ElseIf( flExplodesGasTrapOnHit != NONE && flExplodesGasTrapOnHit.hasForm(akProjectile) )
-; 				debug.Trace(self + " is exploding due to " + akProjectile)
 				GasExplode(akAggressor)
 			ElseIf akWeapon.HasKeyword(flameKeyword) || ( lightningIgnites && akWeapon.HasKeyword(lightningKeyword) )
-; 				debug.Trace(self + " is exploding due to " + akWeapon + " - hasKeyword")
 				GasExplode(akAggressor)
 			endif
 		endif
@@ -81,15 +72,11 @@ auto state waiting
 				storedEffect4 = akEffect
 				storedEffectIncrement = 1
 			endif
-; 			debug.Trace(self + " is testing " + akEffect + " due to onMagicEffectApply")
 			if flExplodesGasTrapOnMagicEffectApply.hasForm(akEffect as form)
-; 				debug.Trace(self + " is exploding due to " + akEffect)
 				GasExplode(akCaster)
 			elseif akEffect.hasKeyword(flameKeyword)
-; 				debug.Trace(self + " is exploding due to " + akEffect)
 				GasExplode(akCaster)
 			elseif lightningIgnites && akEffect.hasKeyword(lightningKeyword)
-; 				debug.Trace(self + " is exploding due to " + akEffect)
 				GasExplode(akCaster)
 			endif
 		endif
@@ -128,10 +115,7 @@ auto state waiting
 EndState
 
 function GasExplode(objectReference causeActor)
-	;if (causeActor as actor)
-		self.setActorCause(causeActor as actor)
-	;endif
-; 	debug.Trace(self + " has exploded")
+	self.setActorCause(causeActor as actor)
 	self.damageObject(5)
 endFunction
 
@@ -161,5 +145,5 @@ event onReset()
 endEvent
 
 event OnDestructionStageChanged(int aiOldStage, int aiCurrentStage)
-; 	debug.Trace(self + " has received destruction event #" + aiCurrentStage)
+	;
 endEvent