Skip to content

Fix copy/pasted item implicits #72

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

Merged
LocalIdentity merged 3 commits into from
Dec 20, 2019
Merged

Fix copy/pasted item implicits #72

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aad2c1
Merge pull request #3 from LocalIdentity/master
Quotae Dec 16, 2019
a6544e1
Fix copy/pasted item implicits
Quotae Dec 16, 2019
6ecf79e
Fix typo
Quotae Dec 16, 2019
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
11 changes: 7 additions & 4 deletions Classes/Item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ function ItemClass:ParseRaw(raw)
self.league = specVal
elseif specName == "Crafted" then
self.crafted = true
elseif specName == "Implicit" then
self.implicit = true
elseif specName == "Prefix" then
local range, affix = specVal:match("{range:([%d.]+)}(.+)")
t_insert(self.prefixes, {
Expand Down Expand Up @@ -295,8 +297,9 @@ function ItemClass:ParseRaw(raw)
local fractured = line:match("{fractured}") or line:match(" %(fractured%)")
local rangeSpec = line:match("{range:([%d.]+)}")
local crafted = line:match("{crafted}") or line:match(" %(crafted%)")
local implicit = line:match("{implicit}") or line:match(" %(implicit%)")
local custom = line:match("{custom}")
line = line:gsub("%b{}", ""):gsub(" %(fractured%)",""):gsub(" %(crafted%)","")
line = line:gsub("%b{}", ""):gsub(" %(fractured%)",""):gsub(" %(crafted%)",""):gsub(" %(implicit%)","")
local rangedLine
if line:match("%(%d+%-%d+ to %d+%-%d+%)") or line:match("%(%-?[%d%.]+ to %-?[%d%.]+%)") or line:match("%(%-?[%d%.]+%-[%d%.]+%)") then
rangedLine = itemLib.applyRange(line, 1)
Expand All @@ -317,7 +320,7 @@ function ItemClass:ParseRaw(raw)
end
end
if modList then
t_insert(self.modLines, { line = line, extra = extra, modList = modList, variantList = variantList, crafted = crafted, custom = custom, fractured = fractured, range = rangedLine and (tonumber(rangeSpec) or 0.5) })
t_insert(self.modLines, { line = line, extra = extra, modList = modList, variantList = variantList, crafted = crafted, custom = custom, fractured = fractured, implicit = implicit, range = rangedLine and (tonumber(rangeSpec) or 0.5) })
if mode == "GAME" then
if gameModeStage == "FINDIMPLICIT" then
gameModeStage = "IMPLICIT"
Expand All @@ -332,12 +335,12 @@ function ItemClass:ParseRaw(raw)
end
elseif mode == "GAME" then
if gameModeStage == "IMPLICIT" or gameModeStage == "EXPLICIT" then
t_insert(self.modLines, { line = line, extra = line, modList = { }, variantList = variantList, crafted = crafted, custom = custom, fractured = fractured })
t_insert(self.modLines, { line = line, extra = line, modList = { }, variantList = variantList, crafted = crafted, custom = custom, fractured = fractured, implicit = implicit })
elseif gameModeStage == "FINDEXPLICIT" then
gameModeStage = "DONE"
end
elseif foundExplicit then
t_insert(self.modLines, { line = line, extra = line, modList = { }, variantList = variantList, crafted = crafted, custom = custom, fractured = fractured })
t_insert(self.modLines, { line = line, extra = line, modList = { }, variantList = variantList, crafted = crafted, custom = custom, fractured = fractured, implicit = implicit })
end
end
end
Expand Down