Merge branch 'develop' into DFN-Item-Updates

DragonSlayer62 · Mar 15, 2024 · 9c8b08b · 9c8b08b
2 parents 8b1ef94 + 40d65be
commit 9c8b08b
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 10 deletions.
diff --git a/.github/workflows/UOX3Build.yml b/.github/workflows/UOX3Build.yml
@@ -34,7 +34,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
     runs-on: ${{ matrix.os }}

diff --git a/data/js/commands/targeting/get.js b/data/js/commands/targeting/get.js
@@ -297,6 +297,28 @@ function HandleGetItem( socket, ourItem, uKey )
 	case "DEF":
 		socket.SysMessage( ourItem.Resist( 1 ));
 		break;
+	case "DEF":
+	case "RESISTARMOR":
+		socket.SysMessage( ourObj.Resist( 1 ));
+		break;
+	case "RESISTLIGHT":
+		socket.SysMessage( ourObj.Resist( 2 ));
+		break;
+	case "RESISTWATER":
+		socket.SysMessage( ourObj.Resist( 3 ));
+		break;
+	case "RESISTCOLD":
+		socket.SysMessage( ourObj.Resist( 4 ));
+		break;
+	case "RESISTFIRE":
+		socket.SysMessage( ourObj.Resist( 5 ));
+		break;
+	case "RESISTENERGY":
+		socket.SysMessage( ourObj.Resist( 6 ));
+		break;
+	case "RESISTPOISON":
+		socket.SysMessage( ourObj.Resist( 7 ));
+		break;
 	case "ARMORCLASS":
 	case "ARMOURCLASS":
 	case "AC":

diff --git a/data/js/commands/targeting/set.js b/data/js/commands/targeting/set.js
@@ -69,6 +69,35 @@ function onCallback0( socket, ourObj )
 		ourObj.fame = nVal;
 		okMsg( socket );
 		break;
+	case "DEF":
+	case "RESISTARMOR":
+		ourObj.Resist( 1, nVal );
+		okMsg( socket );
+		break;
+	case "RESISTLIGHT":
+		ourObj.Resist( 2, nVal );
+		okMsg( socket );
+		break;
+	case "RESISTWATER":
+		ourObj.Resist( 3, nVal );
+		okMsg( socket );
+		break;
+	case "RESISTCOLD":
+		ourObj.Resist( 4, nVal );
+		okMsg( socket );
+		break;
+	case "RESISTFIRE":
+		ourObj.Resist( 5, nVal );
+		okMsg( socket );
+		break;
+	case "RESISTENERGY":
+		ourObj.Resist( 6, nVal );
+		okMsg( socket );
+		break;
+	case "RESISTPOISON":
+		ourObj.Resist( 7, nVal );
+		okMsg( socket );
+		break;
 	case "HP":
 	case "HEALTH":
 		ourObj.health = nVal;

diff --git a/data/js/magic/clumsy.js b/data/js/magic/clumsy.js
@@ -138,7 +138,7 @@ function onSpellCast( mSock, mChar, directCast, spellNum )
 	{
 		//Check for enough reagents
 		// type == 0 -> SpellBook
-		if( spellType == 0 && !TriggerEvent( 6004, "CheckReagents", pUser, mSpell))
+		if( spellType == 0 && !TriggerEvent( 6004, "CheckReagents", mChar, mSpell))
 		{
 			mChar.SetTimer( Timer.SPELLTIME, 0 );
 			mChar.isCasting = false;
@@ -194,7 +194,7 @@ function onSpellCast( mSock, mChar, directCast, spellNum )
 
 		if( spellType == 0 )
 		{
-			TriggerEvent( 6004, "DeleteReagents", pUser, mSpell );
+			TriggerEvent( 6004, "DeleteReagents", mChar, mSpell );
 			mChar.SpellFail();
 			mChar.SetTimer( Timer.SPELLTIME, 0 );
 			mChar.isCasting = false;
@@ -318,7 +318,7 @@ function onSpellSuccess( mSock, mChar, ourTarg )
 	}
 	if( !mChar.npc && spellType == 0 )
 	{
-		TriggerEvent( 6004, "DeleteReagents", pUser, mSpell );
+		TriggerEvent( 6004, "DeleteReagents", mChar, mSpell );
 	}
 
 	if( !mChar.InRange( ourTarg, 10 ))

diff --git a/data/js/magic/createfood.js b/data/js/magic/createfood.js
@@ -235,7 +235,7 @@ function onSpellSuccess( mSock, mChar, ourTarg )
 	{
 		//Check for enough reagents
 		// type == 0 -> SpellBook
-		if( spellType == 0 && !TriggerEvent( 6004, "CheckReagents", pUser, mSpell))
+		if( spellType == 0 && !TriggerEvent( 6004, "CheckReagents", mChar, mSpell))
 		{
 			mChar.SetTimer( Timer.SPELLTIME, 0 );
 			mChar.isCasting = false;
@@ -263,7 +263,7 @@ function onSpellSuccess( mSock, mChar, ourTarg )
 		// Only remove reagents for normal spells
 		if( spellType == 0 )
 		{
-			TriggerEvent( 6004, "DeleteReagents", pUser, mSpell );
+			TriggerEvent( 6004, "DeleteReagents", mChar, mSpell );
 			mChar.SpellFail();
 			mChar.SetTimer( Timer.SPELLTIME, 0 );
 			mChar.isCasting = false;
@@ -280,7 +280,7 @@ function onSpellSuccess( mSock, mChar, ourTarg )
 	}
 	if( !mChar.npc && spellType == 0 )
 	{
-		TriggerEvent( 6004, "DeleteReagents", pUser, mSpell );
+		TriggerEvent( 6004, "DeleteReagents", mChar, mSpell );
 	}
 
 	sourceChar.SoundEffect( mSpell.soundEffect, true );

diff --git a/data/js/magic/level1targ.js b/data/js/magic/level1targ.js
@@ -366,7 +366,7 @@ function onSpellSuccess( mSock, mChar, ourTarg, spellID )
 	{
 		//Check for enough reagents
 		// type == 0 -> SpellBook
-		if( spellType == 0 && !TriggerEvent( 6004, "CheckReagents", pUser, mSpell))
+		if( spellType == 0 && !TriggerEvent( 6004, "CheckReagents", mChar, mSpell))
 		{
 			mChar.SetTimer( Timer.SPELLTIME, 0 );
 			mChar.isCasting = false;
@@ -393,7 +393,7 @@ function onSpellSuccess( mSock, mChar, ourTarg, spellID )
 	{
 		if( spellType == 0 )
 		{
-			TriggerEvent( 6004, "DeleteReagents", pUser, mSpell );
+			TriggerEvent( 6004, "DeleteReagents", mChar, mSpell );
 			mChar.SpellFail();
 			mChar.SetTimer( Timer.SPELLTIME, 0 );
 			mChar.isCasting = false;
@@ -410,7 +410,7 @@ function onSpellSuccess( mSock, mChar, ourTarg, spellID )
 	}
 	if( !mChar.npc && spellType == 0 )
 	{
-		TriggerEvent( 6004, "DeleteReagents", pUser, mSpell );
+		TriggerEvent( 6004, "DeleteReagents", mChar, mSpell );
 	}
 
 	if( !mChar.InRange( ourTarg, 10 ) )

diff --git a/source/Changelog.txt b/source/Changelog.txt
@@ -1,3 +1,7 @@
+18/02/2024 - Dragon Slayer/Xuri
+	Updated set and get commands (set.js, get.js) with additional ways to set/get resistance types on objects using the syntax 'set/set [type] #. Available resistance types:
+		resistarmor, resistlight, resistwater, resistcold, resistfire, resistenergy, resistpoison
+
 20/12/2023 - Dragon Slayer
 	Added Elixiers of Ingot Conversions (js ElixierOfIngots)