From 12d3e6686ae8e4f9dae14143b4b0365ff927db10 Mon Sep 17 00:00:00 2001
From: Dragon Slayer <85514184+DragonSlayer62@users.noreply.github.com>
Date: Mon, 27 May 2024 16:58:40 -0500
Subject: [PATCH] Missing Wand ID's

---
 data/js/server/data/weapontypes.js | 4 ++++
 source/Changelog.txt               | 3 +++
 source/combat.cpp                  | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/data/js/server/data/weapontypes.js b/data/js/server/data/weapontypes.js
index 42fe15a2b..0a6940e56 100644
--- a/data/js/server/data/weapontypes.js
+++ b/data/js/server/data/weapontypes.js
@@ -208,6 +208,10 @@ function GetWeaponType( mChar, itemID )
 		case 0x48B3: //gargish axe - SA
 			weaponType = "TWOHND_AXES"; break;
 		// Default Maces
+		case 0x0DF2: // Wand
+		case 0x0DF3: // Wand
+		case 0x0DF4: // Wand
+		case 0x0DF5: // Wand
 		case 0x0FB4: //sledge hammer
 		case 0x0FB5: //sledge hammer
 		case 0x0F5C: //mace
diff --git a/source/Changelog.txt b/source/Changelog.txt
index f64afbc32..424b6f5f6 100644
--- a/source/Changelog.txt
+++ b/source/Changelog.txt
@@ -1,3 +1,6 @@
+27/05/2024 - Dragon Slayer
+	Added Missing Wand ID's to combat weapon type in core and in js.
+
 1/05/2024 - Dragon Slayer/Xuri
 	Fixed AutoUnequipAttempt function in clumsy.js, createfood.js level1target.js, will no longer fail on casting and return to hardcode.
 	Fixed createfood to check for reagents on cast.
diff --git a/source/combat.cpp b/source/combat.cpp
index 8817d7b3d..b38953b35 100644
--- a/source/combat.cpp
+++ b/source/combat.cpp
@@ -801,6 +801,10 @@ UI08 CHandleCombat::GetWeaponType( CItem *i )
 		case 0x48B3: //gargish axe - SA
 			return TWOHND_AXES;
 		// Default Maces
+		case 0x0DF2: // Wand
+		case 0x0DF3: // Wand
+		case 0x0DF4: // Wand
+		case 0x0DF5: // Wand
 		case 0x13E3: //smith's hammer
 		case 0x13E4: //smith's hammer
 		case 0x13B3: //club