Merge branch 'fix_skill-tags' into dev

PathOfBuildingCommunity · Apr 17, 2021 · 4f804b7 · 4f804b7
2 parents 2315bbe + 7c8aa14
commit 4f804b7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/Data/Global.lua b/src/Data/Global.lua
@@ -240,16 +240,16 @@ SkillType = {
 	FiresArrowsAtTargetLocation = 100,
 	SecondWindSupport = 101,
 	Type97= 102,
-	CantUseFistOfWar = 103,
-	SlamSkill = 104,
-	StanceSkill = 105, -- Bload and Sand + Flesh and Stone
-	CreatesMirageWarrior = 106,
-	UsesSupportedTriggerSkill = 107,
-	SteelSkill = 108,
-	Hex = 109,
-	Mark = 110,
-	Aegis = 111,
-	Orb = 112,
+	SlamSkill = 103,
+	StanceSkill = 104,
+	CreatesMirageWarrior = 105, -- Bload and Sand + Flesh and Stone
+	UsesSupportedTriggerSkill = 106,
+	SteelSkill = 107,
+	Hex = 108,
+	Mark = 109,
+	Aegis = 110,
+	Orb = 111,
+	Type112 = 112,
 }
 
 GlobalCache = { 

diff --git a/src/Export/Scripts/skills.lua b/src/Export/Scripts/skills.lua
@@ -90,7 +90,6 @@ local skillTypes = {
 	"FiresArrowsAtTargetLocation",
 	"SecondWindSupport",
 	"Type97",
-	"CantUseFistOfWar",
 	"SlamSkill",
 	"StanceSkill",
 	"CreatesMirageWarrior",
@@ -100,6 +99,7 @@ local skillTypes = {
 	"Mark",
 	"Aegis",
 	"Orb",
+	"Type112",
 }
 
 local function mapAST(ast)