Merge branch 'develop' into durabilitypr-replacement

DragonSlayer62 · Jan 29, 2025 · 20a2903 · 20a2903
2 parents 5c03abe + deeede6
commit 20a2903
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 37 deletions.
diff --git a/data/js/item/equip_effects/skill_boosting_equipment.js b/data/js/item/equip_effects/skill_boosting_equipment.js
@@ -31,18 +31,18 @@ function onEquip( pEquipper, iEquipped )
 	}
 }
 
-function onUnequip( pUnquipper, iUnequipped )
+function onUnequip( pUnequipper, iUnequipped )
 {
 	var skillBonusID = iUnequipped.GetTag( "skillBonusID" );
 	var skillBonusVal = iUnequipped.GetTag( "skillBonusVal" );
 
 	switch( skillBonusID )
 	{
 		case 7: // Blacksmithing
-			pUnquipper.skills.blacksmithing -= skillBonusVal;
+			pUnequipper.skills.blacksmithing -= skillBonusVal;
 			break;
 		case 45: // Mining
-			pUnquipper.skills.mining -= skillBonusVal;
+			pUnequipper.skills.mining -= skillBonusVal;
 			break;
 		default:
 			break;

diff --git a/source/Changelog.txt b/source/Changelog.txt
@@ -1,3 +1,7 @@
+22/01/2025 - Dragon Slayer
+	Fixed an issue that prevented onUnequip JS event from triggering on items being unequipped
+	Minor cleanup of skill_boosting_equipment.js script
+
 21/01/2025 - Dragon Slayer
 	Fixed damage dealt in combat was incorrectly modified while applying defense modifiers. (combat.cpp)
 

diff --git a/source/cChar.cpp b/source/cChar.cpp
@@ -2924,24 +2924,24 @@ bool CChar::WearItem( CItem *toWear )
 	}
 
 	scriptTriggers.clear();
-    scriptTriggers.shrink_to_fit();
-    scriptTriggers = this->GetScriptTriggers();
-    for( auto i : scriptTriggers )
-    {
-        cScript *tScript = JSMapping->GetScript( i );
-        if( tScript != nullptr )
-        {
-            // If script returns false, prevent item from being equipped
-            if( tScript->OnEquipAttempt( this, toWear ) == 0 )
-            {
-                CSocket *mSock = this->GetSocket();
-                if( mSock != nullptr )
-                {
-                    Bounce( mSock, toWear );
-                }
-                return false;
-            }
-        }
+	scriptTriggers.shrink_to_fit();
+	scriptTriggers = this->GetScriptTriggers();
+	for( auto i : scriptTriggers )
+	{
+		cScript *tScript = JSMapping->GetScript( i );
+		if( tScript != nullptr )
+		{
+			// If script returns false, prevent item from being equipped
+			if( tScript->OnEquipAttempt( this, toWear ) == 0 )
+			{
+				CSocket *mSock = this->GetSocket();
+				if( mSock != nullptr )
+				{
+					Bounce( mSock, toWear );
+				}
+				return false;
+			}
+		}
 	}
 
 	bool rValue = true;
@@ -2970,7 +2970,7 @@ bool CChar::WearItem( CItem *toWear )
 			IncStaminaLeech( itemLayers[tLayer]->GetStaminaLeech() );
 			IncManaLeech( itemLayers[tLayer]->GetManaLeech() );
 
-      IncHitChance( itemLayers[tLayer]->GetHitChance() );
+			IncHitChance( itemLayers[tLayer]->GetHitChance() );
 			IncDefenseChance( itemLayers[tLayer]->GetDefenseChance() );
 
 			IncHealthBonus( itemLayers[tLayer]->GetHealthBonus() );
@@ -3030,20 +3030,20 @@ bool CChar::TakeOffItem( ItemLayers Layer )
 		}
 
 		scriptTriggers.clear();
-        scriptTriggers.shrink_to_fit();
-        scriptTriggers = this->GetScriptTriggers();
-        for( auto i : scriptTriggers )
-        {
-            cScript *tScript = JSMapping->GetScript( i );
-            if( tScript != nullptr )
-            {
-                // If script returns false, prevent item from being equipped
-                if( tScript->OnUnequipAttempt( this, itemLayers[Layer] ) == 0 )
-                {
-                    return false;
-                }
-            }
-        }
+		scriptTriggers.shrink_to_fit();
+		scriptTriggers = this->GetScriptTriggers();
+		for( auto i : scriptTriggers )
+		{
+			cScript *tScript = JSMapping->GetScript( i );
+			if( tScript != nullptr )
+			{
+				// If script returns false, prevent item from being equipped
+				if( tScript->OnUnequipAttempt( this, itemLayers[Layer] ) == 0 )
+				{
+					return false;
+				}
+			}
+		}
 
 		if( Layer == IL_PACKITEM )	// It's our pack!
 		{
@@ -3055,7 +3055,7 @@ bool CChar::TakeOffItem( ItemLayers Layer )
 
 		IncSwingSpeedIncrease( -itemLayers[Layer]->GetSwingSpeedIncrease() );
 
-    IncHealthLeech( -itemLayers[Layer]->GetHealthLeech() );
+		IncHealthLeech( -itemLayers[Layer]->GetHealthLeech() );
 		IncStaminaLeech( -itemLayers[Layer]->GetStaminaLeech() );
 		IncManaLeech( -itemLayers[Layer]->GetManaLeech() );
 
@@ -3078,6 +3078,9 @@ bool CChar::TakeOffItem( ItemLayers Layer )
 			}
 		}
 
+		scriptTriggers.clear();
+		scriptTriggers.shrink_to_fit();
+		scriptTriggers = itemLayers[Layer]->GetScriptTriggers();
 		for( auto i : scriptTriggers )
 		{
 			cScript *tScript = JSMapping->GetScript( i );