Update modules, modparser and exporters.

Author: QuickStick123

src/Classes/ImportTab.lua

@@ -816,7 +816,7 @@ function ImportTabClass:ImportItem(itemData, slotName)
 		if item.name:match("Energy Blade") then
 			local oneHanded = false
 			for _, p in ipairs(itemData.properties) do
-				if self.build.data.weaponTypeInfo[p.name] and self.build.data.weaponTypeInfo[p.name].oneHand then
+				if self.build.data.weaponClassInfo[p.name] and self.build.data.weaponClassInfo[p.name].oneHand then
 					oneHanded = true
 					break
 				end

src/Classes/Item.lua

@@ -1307,6 +1307,7 @@ function ItemClass:BuildModListForSlotNum(baseList, slotNum)
 	if self.base.weapon then
 		local weaponData = { }
 		self.weaponData[slotNum] = weaponData
+		weaponData.class = self.base.class
 		weaponData.category = self.base.category
 		weaponData.name = self.name
 		weaponData.AttackSpeedInc = calcLocal(modList, "Speed", "INC", ModFlag.Attack) + m_floor(self.quality / 8 * calcLocal(modList, "AlternateQualityLocalAttackSpeedPer8Quality", "INC", 0))

src/Classes/ItemDBControl.lua

@@ -96,7 +96,7 @@ function ItemDBClass:DoesItemMatchFilters(item)
 				return false
 			end
 		elseif categorySel == 4 or categorySel == 5 then
-			local weaponInfo = self.itemsTab.build.data.weaponTypeInfo[item.category]
+			local weaponInfo = self.itemsTab.build.data.weaponClassInfo[item.class]
 			if not (weaponInfo and weaponInfo.melee and ((categorySel == 4 and weaponInfo.oneHand) or (categorySel == 5 and not weaponInfo.oneHand))) then 
 				return false
 			end

src/Classes/ItemsTab.lua

@@ -1914,21 +1914,21 @@ function ItemsTabClass:CraftItem()
 		item:BuildAndParseRaw()
 		return item
 	end
-	controls.rarityLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 20, 0, 16}, "Rarity:")
-	controls.rarity = new("DropDownControl", nil, {-80, 20, 100, 18}, rarityDropList)
+	controls.rarityLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {70, 20, 0, 16}, "Rarity:")
+	controls.rarity = new("DropDownControl", {"TOPLEFT",controls.rarityLabel,"TOPRIGHT"}, {5, 0, 100, 18}, rarityDropList)
 	controls.rarity.selIndex = self.lastCraftRaritySel or 3
-	controls.title = new("EditControl", nil, {70, 20, 190, 18}, "", "Name")
+	controls.title = new("EditControl", {"TOPLEFT",controls.rarity,"TOPRIGHT"}, {5, 0, 190, 18}, "", "Name")
 	controls.title.shown = function()
 		return controls.rarity.selIndex >= 3
 	end
-	controls.categoryLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 45, 0, 16}, "Category:")
-	controls.category = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 45, 295, 18}, self.build.data.itemBaseCategoryList, function(index, value)
+	controls.categoryLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {70, 45, 0, 16}, "^7Category:")
+	controls.category = new("DropDownControl", {"TOPLEFT",controls.categoryLabel,"TOPRIGHT"}, {5, 0, 295, 18}, self.build.data.itemBaseCategoryList, function(index, value)
 		controls.base.list = self.build.data.itemBaseLists[self.build.data.itemBaseCategoryList[index]]
 		controls.base.selIndex = 1
 	end)
-	controls.type.selIndex = self.lastCraftTypeSel or 1
-	controls.baseLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {50, 70, 0, 16}, "Base:")
-	controls.base = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {55, 70, 200, 18}, self.build.data.itemBaseLists[self.build.data.itemBaseCategoryList[controls.type.selIndex]])
+	controls.category.selIndex = self.lastCraftTypeSel or 1
+	controls.baseLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {70, 70, 0, 16}, "Base:")
+	controls.base = new("DropDownControl", {"TOPLEFT",controls.baseLabel,"TOPRIGHT"}, {5, 0, 200, 18}, self.build.data.itemBaseLists[self.build.data.itemBaseCategoryList[controls.category.selIndex]])
 	controls.base.selIndex = self.lastCraftBaseSel or 1
 	controls.base.tooltipFunc = function(tooltip, mode, index, value)
 		tooltip:Clear()
@@ -1944,13 +1944,13 @@ function ItemsTabClass:CraftItem()
 			self:EditDisplayItemText()
 		end
 		self.lastCraftRaritySel = controls.rarity.selIndex
-		self.lastCraftTypeSel = controls.type.selIndex
+		self.lastCraftTypeSel = controls.category.selIndex
 		self.lastCraftBaseSel = controls.base.selIndex
 	end)
 	controls.cancel = new("ButtonControl", nil, {45, 100, 80, 20}, "Cancel", function()
 		main:ClosePopup()
 	end)
-	main:OpenPopup(370, 130, "Craft Item", controls)
+	main:OpenPopup(460, 130, "Craft Item", controls)
 end
 
 -- Opens the item text editor popup

src/Classes/SkillListControl.lua

@@ -211,13 +211,13 @@ function SkillListClass:GetRowIcon(column, index, socketGroup)
 		local slot = socketGroup.slot
 		local itemsTab = self.skillsTab.build.itemsTab
 		local weapon1Sel = itemsTab.activeItemSet["Weapon 1"].selItemId or 0
-		local weapon1Class = itemsTab.items[weapon1Sel] and itemsTab.items[weapon1Sel].base.class or "None"
+		local weapon1Class = itemsTab.items[weapon1Sel] and itemsTab.items[weapon1Sel].base.class or "Unarmed"
 		local weapon1SwapSel = itemsTab.activeItemSet["Weapon 1 Swap"].selItemId or 0
-		local weapon1SwapType = itemsTab.items[weapon1SwapSel] and itemsTab.items[weapon1SwapSel].base.class or "None"
+		local weapon1SwapType = itemsTab.items[weapon1SwapSel] and itemsTab.items[weapon1SwapSel].base.class or "Unarmed"
 		local weapon2Sel = itemsTab.activeItemSet["Weapon 2"].selItemId or 0
-		local weapon2Class = itemsTab.items[weapon2Sel] and itemsTab.items[weapon2Sel].base.class or "None"
+		local weapon2Class = itemsTab.items[weapon2Sel] and itemsTab.items[weapon2Sel].base.class or "Unarmed"
 		local weapon2SwapSel = itemsTab.activeItemSet["Weapon 2 Swap"].selItemId or 0
-		local weapon2SwapType = itemsTab.items[weapon2SwapSel] and itemsTab.items[weapon2SwapSel].base.class or "None"
+		local weapon2SwapType = itemsTab.items[weapon2SwapSel] and itemsTab.items[weapon2SwapSel].base.class or "Unarmed"
 		if slot == "Weapon 1" and weapon1Class == "Bow" then
 			slot = weapon1Class
 		end

src/Data/Global.lua

@@ -236,12 +236,15 @@ ModFlag.Fishing =	 0x0000000002000000
 ModFlag.Crossbow =	 0x0000000004000000
 ModFlag.Flail =		 0x0000000008000000
 ModFlag.Spear =		 0x0000000010000000
+ModFlag.Warstaff =	 0x0000000020000000
+ModFlag.Sceptre =	 0x0000000040000000
+
 -- Weapon classes
 ModFlag.WeaponMelee =0x0000000100000000
 ModFlag.WeaponRanged=0x0000000200000000
 ModFlag.Weapon1H =	 0x0000000400000000
 ModFlag.Weapon2H =	 0x0000000800000000
-ModFlag.WeaponMask = 0x0000000F1FFF0000
+ModFlag.WeaponMask = 0x0000000F4FFF0000
 
 KeywordFlag = { }
 -- Skill keywords

src/Data/Minions.lua

@@ -20,7 +20,7 @@ minions["RaisedZombie"] = {
 	attackTime = 1.25,
 	attackRange = 9,
 	accuracy = 1,
-	weaponType1 = "One Handed Axe",
+	weaponType1 = "One Hand Axe",
 	limit = "ActiveZombieLimit",
 	skillList = {
 		"MinionMeleeStep",
@@ -93,7 +93,7 @@ minions["RaisedSkeletonWarrior"] = {
 	attackTime = 1,
 	attackRange = 12,
 	accuracy = 1,
-	weaponType1 = "One Handed Sword",
+	weaponType1 = "One Hand Sword",
 	weaponType2 = "Shield",
 	limit = "ActiveSkeletonLimit",
 	skillList = {
@@ -121,7 +121,7 @@ minions["RaisedSkeletonBrute"] = {
 	attackTime = 1.75,
 	attackRange = 16,
 	accuracy = 1,
-	weaponType1 = "Two Handed Mace",
+	weaponType1 = "Two Hand Mace",
 	limit = "ActiveSkeletonLimit",
 	skillList = {
 		"MinionMeleeStep",
@@ -173,7 +173,7 @@ minions["RaisedSkeletonFrostMage"] = {
 	attackTime = 1,
 	attackRange = 80,
 	accuracy = 1,
-	weaponType1 = "None",
+	weaponType1 = "Unarmed",
 	limit = "ActiveSkeletonLimit",
 	skillList = {
 		"FrostBoltSkeletonMageMinion",
@@ -199,7 +199,7 @@ minions["RaisedSkeletonCleric"] = {
 	attackTime = 1,
 	attackRange = 80,
 	accuracy = 1,
-	weaponType1 = "One Handed Mace",
+	weaponType1 = "Sceptre",
 	limit = "ActiveSkeletonLimit",
 	skillList = {
 		"HealSkeletonClericMinion",
@@ -225,7 +225,7 @@ minions["RaisedSkeletonArsonist"] = {
 	attackTime = 1,
 	attackRange = 80,
 	accuracy = 1,
-	weaponType1 = "None",
+	weaponType1 = "Unarmed",
 	limit = "ActiveSkeletonLimit",
 	skillList = {
 		"FireBombSkeletonMinion",
@@ -251,8 +251,8 @@ minions["RaisedSkeletonReaver"] = {
 	attackTime = 0.83,
 	attackRange = 14,
 	accuracy = 1,
-	weaponType1 = "One Handed Axe",
-	weaponType2 = "One Handed Axe",
+	weaponType1 = "One Hand Axe",
+	weaponType2 = "One Hand Axe",
 	limit = "ActiveSkeletonLimit",
 	skillList = {
 		"MinionMeleeStep",