Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/Classes/TimelessJewelListControl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@
Limited to: 1 Historic
Variant: Doryani (Corrupted Soul)
Variant: Xibaqua (Divine Flesh)
Variant: Ahuana (Immortal Ambition)
Variant: Mazcotl (Immortal Ambition)

Check warning on line 86 in src/Classes/TimelessJewelListControl.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Mazcotl)
Selected Variant: ]] .. variant .. "\n" .. [[
Radius: Large
Implicits: 0
{variant:1}Bathed in the blood of ]] .. data.seed .. [[ sacrificed in the name of Doryani
{variant:2}Bathed in the blood of ]] .. data.seed .. [[ sacrificed in the name of Xibaqua
{variant:3}Bathed in the blood of ]] .. data.seed .. [[ sacrificed in the name of Ahuana
{variant:3}Bathed in the blood of ]] .. data.seed .. [[ sacrificed in the name of Mazcotl

Check warning on line 92 in src/Classes/TimelessJewelListControl.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Mazcotl)
Passives in radius are Conquered by the Vaal
Historic
]]
Expand Down
4 changes: 4 additions & 0 deletions src/Classes/TradeHelpers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@
for _, pat in ipairs(timelessPatterns) do
local value, conqueror = modLine:match(pat)
if conqueror then
-- 3.30 changed the conqueror name but didn't change the stat id
if conqueror == "mazcotl" then

Check warning on line 200 in src/Classes/TradeHelpers.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (mazcotl)
conqueror = "ahuana"
end
return "explicit.pseudo_timeless_jewel_" .. conqueror, tonumber(value)
end
end
Expand Down
2 changes: 1 addition & 1 deletion src/Classes/TreeTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@
{ label = "Any", id = 1 },
{ label = "Doryani (Corrupted Soul)", id = 2 },
{ label = "Xibaqua (Divine Flesh)", id = 3 },
{ label = "Ahuana (Immortal Ambition)", id = 4 }
{ label = "Mazcotl (Immortal Ambition)", id = 4 }

Check warning on line 1224 in src/Classes/TreeTab.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Mazcotl)
},
[2] = {
{ label = "Any", id = 1 },
Expand Down
14 changes: 7 additions & 7 deletions src/Data/ModCache.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14567,10 +14567,10 @@ c["Banners also grant 1% of Physical Damage gained as Extra Fire Damage to you a
c["Base Critical Strike Chance for Attacks with Weapons is 8%"]={{[1]={flags=0,keywordFlags=0,name="WeaponBaseCritChance",type="OVERRIDE",value=8}},nil}
c["Base Ignite Duration is 1 second"]={{[1]={flags=0,keywordFlags=0,name="IgniteDurationBase",type="OVERRIDE",value=1}},nil}
c["Base Spell Critical Strike Chance of Spells is equal to that of Main Hand Weapon"]={{[1]={flags=2,keywordFlags=0,name="BaseCritFromMainHand",type="FLAG",value=true}},nil}
c["Bathed in the blood of 0 sacrificed in the name of 0 Passives in radius are Conquered by the 1"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={id=0}}}},nil}
c["Bathed in the blood of 4050 sacrificed in the name of Ahuana"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="2_v2",type="vaal"},id=4050}}}},nil}
c["Bathed in the blood of 8000 sacrificed in the name of Ahuana"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="2_v2",type="vaal"},id=8000}}}},nil}
c["Bathed in the blood of 0 sacrificed in the name of 0 Passives in radius are Conquered by the 1"]={nil,nil}
c["Bathed in the blood of 4050 sacrificed in the name of Mazcotl"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="2_v2",type="vaal"},id=4050}}}},nil}
c["Bathed in the blood of 8000 sacrificed in the name of Doryani"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=3,type="vaal"},id=8000}}}},nil}
c["Bathed in the blood of 8000 sacrificed in the name of Mazcotl"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="2_v2",type="vaal"},id=8000}}}},nil}
c["Bathed in the blood of 8000 sacrificed in the name of Xibaqua"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=1,type="vaal"},id=8000}}}},nil}
c["Bathed in the blood of 8000 sacrificed in the name of Zerphi"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=2,type="vaal"},id=8000}}}},nil}
c["Battlemage"]={{[1]={flags=0,keywordFlags=0,name="Battlemage",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="MainHandWeaponDamageAppliesToSpells",type="MAX",value=100}},nil}
Expand Down Expand Up @@ -14968,13 +14968,13 @@ c["Cold Skills have 20% chance to Poison on Hit"]={{[1]={flags=0,keywordFlags=64
c["Cold Skills have a 25% chance to apply Cold Exposure on Hit"]={{[1]={flags=0,keywordFlags=0,name="ColdExposureChance",type="BASE",value=25}},nil}
c["Cold-only Splash Damage to surrounding targets"]={nil,"Cold-only Splash Damage to surrounding targets "}
c["Cold-only Splash Damage to surrounding targets With at least 40 Strength in Radius, 25% of Glacial"]={nil,"Cold-only Splash Damage to surrounding targets With at least 40 Strength in Radius, 25% of Glacial "}
c["Commanded leadership over 0 warriors under 0 Passives in radius are Conquered by the 2"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={id=0}}}},nil}
c["Commanded leadership over 0 warriors under 0 Passives in radius are Conquered by the 2"]={nil,nil}
c["Commanded leadership over 14000 warriors under Akoya"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="3_v2",type="karui"},id=14000}}}},nil}
c["Commanded leadership over 18000 warriors under Akoya"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="3_v2",type="karui"},id=18000}}}},nil}
c["Commanded leadership over 18000 warriors under Kaom"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=1,type="karui"},id=18000}}}},nil}
c["Commanded leadership over 18000 warriors under Kiloava"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=3,type="karui"},id=18000}}}},nil}
c["Commanded leadership over 18000 warriors under Rakiata"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=2,type="karui"},id=18000}}}},nil}
c["Commissioned 0 coins to commemorate 0 Passives in radius are Conquered by the 5"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={id=0}}}},nil}
c["Commissioned 0 coins to commemorate 0 Passives in radius are Conquered by the 5"]={nil,nil}
c["Commissioned 160000 coins to commemorate Cadiro"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=1,type="eternal"},id=160000}}}},nil}
c["Commissioned 160000 coins to commemorate Caspiro"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="3_v2",type="eternal"},id=160000}}}},nil}
c["Commissioned 160000 coins to commemorate Chitus"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=3,type="eternal"},id=160000}}}},nil}
Expand Down Expand Up @@ -15331,7 +15331,7 @@ c["Debuffs on you expire 90% faster"]={{[1]={flags=0,keywordFlags=0,name="SelfDe
c["Defences are Zero"]={{[1]={flags=0,keywordFlags=0,name="Armour",type="MORE",value=-100},[2]={flags=0,keywordFlags=0,name="EnergyShield",type="MORE",value=-100},[3]={flags=0,keywordFlags=0,name="Evasion",type="MORE",value=-100},[4]={flags=0,keywordFlags=0,name="Ward",type="MORE",value=-100}},nil}
c["Defend with 120% of Armour against Projectile Attacks"]={nil,"Defend with 120% of Armour against Projectile Attacks "}
c["Defend with 120% of Armour against Projectile Attacks 5% more chance to Evade Melee Attacks"]={nil,"Defend with 120% of Armour against Projectile Attacks 5% more chance to Evade Melee Attacks "}
c["Denoted service of 0 dekhara in the akhara of 0 Passives in radius are Conquered by the 3"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={id=0}}}},nil}
c["Denoted service of 0 dekhara in the akhara of 0 Passives in radius are Conquered by the 3"]={nil,nil}
c["Denoted service of 4250 dekhara in the akhara of Balbala"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="1_v2",type="maraketh"},id=4250}}}},nil}
c["Denoted service of 8000 dekhara in the akhara of Asenath"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=2,type="maraketh"},id=8000}}}},nil}
c["Denoted service of 8000 dekhara in the akhara of Balbala"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id="1_v2",type="maraketh"},id=8000}}}},nil}
Expand Down Expand Up @@ -19586,7 +19586,7 @@ c["Regenerate 9 Mana per second"]={{[1]={flags=0,keywordFlags=0,name="ManaRegen"
c["Regenerate 9.4 Life per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRegen",type="BASE",value=9.4}},nil}
c["Regenerate 90 Energy Shield per second"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldRegen",type="BASE",value=90}},nil}
c["Regenerate 90 Life per second"]={{[1]={flags=0,keywordFlags=0,name="LifeRegen",type="BASE",value=90}},nil}
c["Remembrancing 0 songworthy deeds by the line of 0 Passives in radius are Conquered by the 6"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={id=0}}}},nil}
c["Remembrancing 0 songworthy deeds by the line of 0 Passives in radius are Conquered by the 6"]={nil,nil}
c["Remembrancing 4050 songworthy deeds by the line of Medved"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=3,type="kalguur"},id=4050}}}},nil}
c["Remembrancing 8000 songworthy deeds by the line of Medved"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=3,type="kalguur"},id=8000}}}},nil}
c["Remembrancing 8000 songworthy deeds by the line of Uhtred"]={{[1]={flags=0,keywordFlags=0,name="JewelData",type="LIST",value={key="conqueredBy",value={conqueror={id=2,type="kalguur"},id=8000}}}},nil}
Expand Down
4 changes: 2 additions & 2 deletions src/Data/Uniques/jewel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1866,13 +1866,13 @@
Variant: Doryani (Corrupted Soul)
Variant: Xibaqua (Divine Flesh)
Variant: Zerphi (Eternal Youth) (Pre 3.11.0)
Variant: Ahuana (Immortal Ambition)
Variant: Mazcotl (Immortal Ambition)

Check warning on line 1869 in src/Data/Uniques/jewel.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Mazcotl)
Radius: Large
Implicits: 0
{variant:1}Bathed in the blood of (100-8000) sacrificed in the name of Doryani
{variant:2}Bathed in the blood of (100-8000) sacrificed in the name of Xibaqua
{variant:3}Bathed in the blood of (100-8000) sacrificed in the name of Zerphi
{variant:4}Bathed in the blood of (100-8000) sacrificed in the name of Ahuana
{variant:4}Bathed in the blood of (100-8000) sacrificed in the name of Mazcotl

Check warning on line 1875 in src/Data/Uniques/jewel.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Mazcotl)
Passives in radius are Conquered by the Vaal
Historic
]],[[
Expand Down
4 changes: 2 additions & 2 deletions src/Export/Uniques/jewel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1767,13 +1767,13 @@ Limited to: 1 Historic
Variant: Doryani (Corrupted Soul)
Variant: Xibaqua (Divine Flesh)
Variant: Zerphi (Eternal Youth) (Pre 3.11.0)
Variant: Ahuana (Immortal Ambition)
Variant: Mazcotl (Immortal Ambition)
Radius: Large
Implicits: 0
{variant:1}Bathed in the blood of (100-8000) sacrificed in the name of Doryani
{variant:2}Bathed in the blood of (100-8000) sacrificed in the name of Xibaqua
{variant:3}Bathed in the blood of (100-8000) sacrificed in the name of Zerphi
{variant:4}Bathed in the blood of (100-8000) sacrificed in the name of Ahuana
{variant:4}Bathed in the blood of (100-8000) sacrificed in the name of Mazcotl
Passives in radius are Conquered by the Vaal
Historic
]],[[
Expand Down
41 changes: 17 additions & 24 deletions src/Modules/ModParser.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
["zerphi"] = { id = 2, type = "vaal" },
["doryani"] = { id = 3, type = "vaal" },
["ahuana"] = { id = "2_v2", type = "vaal" },
-- Ahuana variant was renamed to Mazcotl in 3.30

Check warning on line 46 in src/Modules/ModParser.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Mazcotl)
["mazcotl"] = { id = "2_v2", type = "vaal" },

Check warning on line 47 in src/Modules/ModParser.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (mazcotl)
["deshret"] = { id = 1, type = "maraketh" },
["asenath"] = { id = 2, type = "maraketh" },
["nasima"] = { id = 3, type = "maraketh" },
Expand Down Expand Up @@ -2137,6 +2139,13 @@
["fire"] = "Fire",
["chaos"] = "Chaos",
}
local function timelessJewel(num, _, name)
local conqueror = conquerorList[name:lower()]
if not conqueror then return nil end
return {
mod("JewelData", "LIST", { key = "conqueredBy", value = { id = num, conqueror = conqueror } })
}
end
-- List of special modifiers
---@type table<string, Mod[]|fun(num: number, ...: string): Mod[]>
local specialModList = {
Expand Down Expand Up @@ -5905,30 +5914,14 @@
["%+(%d+)%% to quality"] = function(num) return { mod("Quality", "BASE", num) } end,
["infernal blow debuff deals an additional (%d+)%% of damage per charge"] = function(num) return { mod("DebuffEffect", "BASE", num, { type = "SkillName", skillName = "Infernal Blow", includeTransfigured = true }) } end,
-- Legion modifiers
["bathed in the blood of (%d+) sacrificed in the name of (.+)"] = function(num, _, name)
return { mod("JewelData", "LIST",
{ key = "conqueredBy", value = { id = num, conqueror = conquerorList[name:lower()] } }) } end,
["carved to glorify (%d+) new faithful converted by high templar (.+)"] = function(num, _, name)
return { mod("JewelData", "LIST",
{ key = "conqueredBy", value = { id = num, conqueror = conquerorList[name:lower()] } }) } end,
["commanded leadership over (%d+) warriors under (.+)"] = function(num, _, name)
return { mod("JewelData", "LIST",
{ key = "conqueredBy", value = { id = num, conqueror = conquerorList[name:lower()] } }) } end,
["commissioned (%d+) coins to commemorate (.+)"] = function(num, _, name)
return { mod("JewelData", "LIST",
{ key = "conqueredBy", value = { id = num, conqueror = conquerorList[name:lower()] } }) } end,
["denoted service of (%d+) dekhara in the akhara of (.+)"] = function(num, _, name)
return { mod("JewelData", "LIST",
{ key = "conqueredBy", value = { id = num, conqueror = conquerorList[name:lower()] } }) } end,
["remembrancing (%d+) songworthy deeds by the line of (.+)"] = function(num, _, name)
return { mod("JewelData", "LIST",
{ key = "conqueredBy", value = { id = num, conqueror = conquerorList[name:lower()] } }) } end,
["subjugating (%d+) souls in the thrall of (.+)"] = function(num, _, name)
return { mod("JewelData", "LIST",
{ key = "conqueredBy", value = { id = num, conqueror = conquerorList[name:lower()] } }) } end,
["binding (%d+) souls to phylacteries to sustain (.+)"] = function(num, _, name)
return { mod("JewelData", "LIST",
{ key = "conqueredBy", value = { id = num, conqueror = conquerorList[name:lower()] } }) } end,
["bathed in the blood of (%d+) sacrificed in the name of (.+)"] = timelessJewel,
["carved to glorify (%d+) new faithful converted by high templar (.+)"] = timelessJewel,
["commanded leadership over (%d+) warriors under (.+)"] = timelessJewel,
["commissioned (%d+) coins to commemorate (.+)"] = timelessJewel,
["denoted service of (%d+) dekhara in the akhara of (.+)"] = timelessJewel,
["remembrancing (%d+) songworthy deeds by the line of (.+)"] = timelessJewel,
["subjugating (%d+) souls in the thrall of (.+)"] = timelessJewel,
["binding (%d+) souls to phylacteries to sustain (.+)"] = timelessJewel,
["passives in radius are conquered by the (%D+)"] = { },
["passives affected are conquered by the abyssal"] = { },
["historic"] = { },
Expand Down
Loading