Skip to content

Fix Mace Strike import and "Two Hand" naming on items #1758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Blitz54 wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix Mace Strike import and "Two Hand" naming on items #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/Classes/ImportTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,30 @@ function ImportTabClass:ImportItemsAndSkills(charData)
gemId = "Metadata/Items/Gems/SkillGemSummonBeast"
end

-- This could be done better with the character melee skills data at some point.
if typeLine:match("Mace Strike") then
local weapon1Sel = self.build.itemsTab.activeItemSet["Weapon 1"].selItemId or 0
local weapon2Sel = self.build.itemsTab.activeItemSet["Weapon 2"].selItemId or 0
if weapon2Sel == 0 then
if self.build.itemsTab.items[weapon1Sel].base.type == "One Hand Mace" then
gemId = "Metadata/Items/Gems/SkillGemPlayerDefault1HMace"
elseif self.build.itemsTab.items[weapon1Sel].base.type == "Two Hand Mace" then
gemId = "Metadata/Items/Gems/SkillGemPlayerDefault2HMace"
end
else
if self.build.itemsTab.items[weapon2Sel].base.type == "One Hand Mace" or self.build.itemsTab.items[weapon2Sel].base.type == "Two Hand Mace" then
gemId = "Metadata/Items/Gems/SkillGemPlayerDefaultMaceMace" -- Dual wielding maces
elseif self.build.itemsTab.items[weapon1Sel].base.type == "One Hand Mace" then
gemId = "Metadata/Items/Gems/SkillGemPlayerDefault1HMace"
elseif self.build.itemsTab.items[weapon1Sel].base.type == "Two Hand Mace" then
gemId = "Metadata/Items/Gems/SkillGemPlayerDefault2HMace"
end
end
end
if typeLine:match("Spear Stab") and (self.build.itemsTab.activeItemSet["Weapon 2"].selItemId or 0) ~= 0 then
gemId = "Metadata/Items/Gems/SkillGemPlayerDefaultSpearOffHand"
end

if gemId then
local gemInstance = { level = 20, quality = 0, enabled = true, enableGlobal1 = true, enableGlobal2 = true, count = 1, gemId = gemId }
gemInstance.support = skillData.support
Expand Down
32 changes: 16 additions & 16 deletions src/Classes/TradeQueryGenerator.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ local tradeCategoryNames = {
["Quiver"] = { "Quiver" },
["Shield"] = { "Shield", "Shield: Armour", "Shield: Armour/Energy Shield", "Shield: Armour/Evasion", "Shield: Evasion" },
["Focus"] = { "Focus" },
["1HWeapon"] = { "One Handed Mace", "Wand", "Sceptre", "Flail", "Spear" },
["2HWeapon"] = { "Staff", "Staff: Warstaff", "Two Handed Mace", "Crossbow", "Bow", "Talisman" },
-- ["1HAxe"] = { "One Handed Axe" },
-- ["1HSword"] = { "One Handed Sword", "Thrusting One Handed Sword" },
["1HMace"] = { "One Handed Mace" },
["1HWeapon"] = { "One Hand Mace", "Wand", "Sceptre", "Flail", "Spear" },
["2HWeapon"] = { "Staff", "Staff: Warstaff", "Two Hand Mace", "Crossbow", "Bow", "Talisman" },
-- ["1HAxe"] = { "One Hand Axe" },
-- ["1HSword"] = { "One Hand Sword", "Thrusting One Hand Sword" },
["1HMace"] = { "One Hand Mace" },
["Sceptre"] = { "Sceptre" },
-- ["Dagger"] = { "Dagger" },
["Wand"] = { "Wand" },
Expand All @@ -36,9 +36,9 @@ local tradeCategoryNames = {
["Quarterstaff"] = { "Staff: Warstaff" },
["Bow"] = { "Bow" },
["Crossbow"] = { "Crossbow"},
-- ["2HAxe"] = { "Two Handed Axe" },
-- ["2HSword"] = { "Two Handed Sword" },
["2HMace"] = { "Two Handed Mace" },
-- ["2HAxe"] = { "Two Hand Axe" },
-- ["2HSword"] = { "Two Hand Sword" },
["2HMace"] = { "Two Hand Mace" },
-- ["FishingRod"] = { "Fishing Rod" },
["BaseJewel"] = { "Jewel" },
["RadiusJewel"] = { "Jewel: Radius" },
Expand Down Expand Up @@ -642,19 +642,19 @@ function TradeQueryGeneratorClass:StartQuery(slot, options)
elseif existingItem.type == "Staff" then
itemCategoryQueryStr = "weapon.staff"
itemCategory = "Staff"
elseif existingItem.type == "Two Handed Sword" then
elseif existingItem.type == "Two Hand Sword" then
itemCategoryQueryStr = "weapon.twosword"
itemCategory = "2HSword"
elseif existingItem.type == "Two Handed Axe" then
elseif existingItem.type == "Two Hand Axe" then
itemCategoryQueryStr = "weapon.twoaxe"
itemCategory = "2HAxe"
elseif existingItem.type == "Two Handed Mace" then
elseif existingItem.type == "Two Hand Mace" then
itemCategoryQueryStr = "weapon.twomace"
itemCategory = "2HMace"
elseif existingItem.type == "Fishing Rod" then
itemCategoryQueryStr = "weapon.rod"
itemCategory = "FishingRod"
elseif existingItem.type == "One Handed Sword" then
elseif existingItem.type == "One Hand Sword" then
itemCategoryQueryStr = "weapon.onesword"
itemCategory = "1HSword"
elseif existingItem.type == "Spear" then
Expand All @@ -663,10 +663,10 @@ function TradeQueryGeneratorClass:StartQuery(slot, options)
elseif existingItem.type == "Flail" then
itemCategoryQueryStr = "weapon.flail"
itemCategory = "weapon.flail"
elseif existingItem.type == "One Handed Axe" then
elseif existingItem.type == "One Hand Axe" then
itemCategoryQueryStr = "weapon.oneaxe"
itemCategory = "1HAxe"
elseif existingItem.type == "One Handed Mace" then
elseif existingItem.type == "One Hand Mace" then
itemCategoryQueryStr = "weapon.onemace"
itemCategory = "1HMace"
elseif existingItem.type == "Sceptre" then
Expand All @@ -681,10 +681,10 @@ function TradeQueryGeneratorClass:StartQuery(slot, options)
elseif existingItem.type == "Claw" then
itemCategoryQueryStr = "weapon.claw"
itemCategory = "Claw"
elseif existingItem.type:find("Two Handed") ~= nil then
elseif existingItem.type:find("Two Hand") ~= nil then
itemCategoryQueryStr = "weapon.twomelee"
itemCategory = "2HWeapon"
elseif existingItem.type:find("One Handed") ~= nil then
elseif existingItem.type:find("One Hand") ~= nil then
itemCategoryQueryStr = "weapon.one"
itemCategory = "1HWeapon"
else
Expand Down
Loading