Merge pull request #299 from DragonSlayer62/Flipped-Skills

Flipped Imbuing and Mysticism Skill
UOX3DevTeam · Jan 25, 2025 · 8cac193 · 8cac193
2 parents 9d52d4d + f9b3a33
commit 8cac193
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/data/dfndata/skills/skills.dfn b/data/dfndata/skills/skills.dfn
@@ -1206,10 +1206,10 @@ SKILLPOINT=990,5,0
 SKILLPOINT=1000,0,0
 }
 
-// Imbuing
+// Mysticism
 [SKILL 55]
 {
-NAME=IMBUING
+NAME=MYSTICISM
 STR=0
 DEX=0
 INT=0
@@ -1227,10 +1227,10 @@ SKILLPOINT=990,5,0
 SKILLPOINT=1000,0,0
 }
 
-// Mysticism
+// Imbuing
 [SKILL 56]
 {
-NAME=MYSTICISM
+NAME=IMBUING
 STR=0
 DEX=0
 INT=0

diff --git a/source/Changelog.txt b/source/Changelog.txt
@@ -1,5 +1,8 @@
+12/08/2024 - Dragon Slayer
+	Fixed an issue where Imbuing and Mysticism skills were listed in wrong order in skills.dfn and enums.h
+
 4/07/2024 - Dragon Slayer
-	Fixed Cleaver ID missing in the jse_objectassociations.scp or carving corpses
+	Fixed Cleaver ID missing in the jse_objectassociations.scp for carving corpses
 
 18/06/2024 - Dragon Slayer
 	Added three new DFN tags for Items:

diff --git a/source/UOXJSPropertySpecs.h b/source/UOXJSPropertySpecs.h
@@ -690,8 +690,8 @@ inline JSPropertySpec CSkillsProps[] =
 	{ "bushido",			BUSHIDO,			JSPROP_ENUMANDPERM, nullptr, nullptr },
 	{ "ninjitsu",			NINJITSU,			JSPROP_ENUMANDPERM, nullptr, nullptr },
 	{ "spellweaving",		SPELLWEAVING,		JSPROP_ENUMANDPERM, nullptr, nullptr },
-	{ "imbuing",			IMBUING,			JSPROP_ENUMANDPERM, nullptr, nullptr },
 	{ "mysticism",			MYSTICISM,			JSPROP_ENUMANDPERM, nullptr, nullptr },
+	{ "imbuing",			IMBUING,			JSPROP_ENUMANDPERM, nullptr, nullptr },
 	{ "throwing",			THROWING,			JSPROP_ENUMANDPERM, nullptr, nullptr },
 	{ "allskills",			ALLSKILLS,			JSPROP_ENUMANDPERM, nullptr, nullptr },
 	{ nullptr,				static_cast<SI08>(0),			static_cast<UI08>(0), nullptr, nullptr }

diff --git a/source/enums.h b/source/enums.h
@@ -373,8 +373,8 @@ enum Skills
     BUSHIDO,
     NINJITSU,
     SPELLWEAVING,
-    IMBUING,
     MYSTICISM,
+    IMBUING,
     THROWING,
 
     ALLSKILLS, // #skills+1