Skip to content

Commit 64c901b

Browse files
committed
Spec stuff and fixes/cleanup
1 parent 1a2c849 commit 64c901b

7 files changed

Lines changed: 831 additions & 63 deletions

File tree

src/Classes/MinionListControl.lua

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function MinionListClass:AddValueTooltip(tooltip, index, minionId)
5959
if i == 1 then
6060
tooltip:AddLine(14, s_format("^7Spawn: %s", spawn))
6161
else
62-
tooltip:AddLine(14, s_format("^7%s%s", " ", spawn)) -- Indented so all locations line up vertically in toolip
62+
tooltip:AddLine(14, s_format("^7%s%s", " ", spawn)) -- Indented so all locations line up vertically in tooltip
6363
end
6464
end
6565
end
@@ -139,25 +139,31 @@ function SpawnListClass:AddValueTooltip(tooltip, index, value)
139139
end
140140
if foundArea then
141141
tooltip:AddLine(18, foundArea.name)
142-
tooltip:AddLine(14, "Level: "..foundArea.level)
142+
tooltip:AddLine(14, "Area Level: "..foundArea.level)
143+
if foundArea.description and foundArea.description ~= "" then
144+
tooltip:AddLine(14, colorCodes.CURRENCY .. '"' .. foundArea.description .. '"^7')
145+
end
143146
local biomeNameMap = {
144147
water_biome = "Water",
145148
mountain_biome = "Mountain",
146149
grass_biome = "Grass",
147150
forest_biome = "Forest",
148151
swamp_biome = "Swamp",
149152
desert_biome = "Desert",
153+
faridun_city = "Faridun City",
154+
ezomyte_city = "Ezomyte City",
155+
vaal_city = "Vaal City",
150156
}
151157
if #foundArea.tags > 0 then
152-
local friendlyTags = {}
158+
local biomeNameList = {}
153159
for _, tag in ipairs(foundArea.tags) do
154-
local friendlyName = biomeNameMap[tag]
155-
if friendlyName then
156-
table.insert(friendlyTags, friendlyName)
160+
local biomeName = biomeNameMap[tag]
161+
if biomeName then
162+
table.insert(biomeNameList, biomeName)
157163
end
158164
end
159-
if #friendlyTags > 0 then
160-
tooltip:AddLine(14, "Biome: " .. table.concat(friendlyTags, ", "))
165+
if #biomeNameList > 0 then
166+
tooltip:AddLine(14, "Biome: " .. table.concat(biomeNameList, ", "))
161167
end
162168
end
163169
if #foundArea.monsterVarieties > 0 and foundArea.baseName ~= "The Ziggurat Refuge" then

src/Data/Spectres.lua

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8966,7 +8966,7 @@ minions["Metadata/Monsters/VaalMonsters/Zealots/VaalZealotDaggersBlood"] = {
89668966
"Aggorat (Act 3)",
89678967
"Aggorat (Act 9)",
89688968
"Lost Towers (Map)",
8969-
"Frigid Bluffs (Map)",
8969+
"Frigid Bluffs",
89708970
},
89718971
skillList = {
89728972
"MeleeAtAnimationSpeed",
@@ -9035,7 +9035,7 @@ minions["Metadata/Monsters/VaalMonsters/Zealots/VaalZealotDaggersCold_"] = {
90359035
"Utzaal (Act 9)",
90369036
"Aggorat (Act 3)",
90379037
"Aggorat (Act 9)",
9038-
"Frigid Bluffs (Map)",
9038+
"Frigid Bluffs",
90399039
},
90409040
skillList = {
90419041
"MeleeAtAnimationSpeed",
@@ -11748,7 +11748,7 @@ minions["Metadata/Monsters/Breach/BreachEliteFallenLunarisMonster__"] = {
1174811748
companionReservation = 42.3,
1174911749
monsterCategory = "Demon",
1175011750
spawnLocation = {
11751-
"Twisted Domain (Map)",
11751+
"Twisted Domain",
1175211752
},
1175311753
skillList = {
1175411754
"MeleeAtAnimationSpeedComboTEMP",
@@ -11781,7 +11781,7 @@ minions["Metadata/Monsters/Breach/BreachEliteCorruptedEliteBloater__"] = {
1178111781
companionReservation = 45.6,
1178211782
monsterCategory = "Demon",
1178311783
spawnLocation = {
11784-
"Twisted Domain (Map)",
11784+
"Twisted Domain",
1178511785
},
1178611786
skillList = {
1178711787
"MeleeAtAnimationSpeed",
@@ -11812,7 +11812,7 @@ minions["Metadata/Monsters/Breach/BreachFodderCorruptedEliteRanger"] = {
1181211812
companionReservation = 33,
1181311813
monsterCategory = "Demon",
1181411814
spawnLocation = {
11815-
"Twisted Domain (Map)",
11815+
"Twisted Domain",
1181611816
},
1181711817
skillList = {
1181811818
"MeleeAtAnimationSpeed",
@@ -11844,7 +11844,7 @@ minions["Metadata/Monsters/Breach/BreachFodderCorruptedEliteToothy__"] = {
1184411844
companionReservation = 33,
1184511845
monsterCategory = "Demon",
1184611846
spawnLocation = {
11847-
"Twisted Domain (Map)",
11847+
"Twisted Domain",
1184811848
},
1184911849
skillList = {
1185011850
"MeleeAtAnimationSpeed",
@@ -11875,7 +11875,7 @@ minions["Metadata/Monsters/Breach/BreachEliteCorruptedEliteGuard"] = {
1187511875
companionReservation = 40.2,
1187611876
monsterCategory = "Humanoid",
1187711877
spawnLocation = {
11878-
"Twisted Domain (Map)",
11878+
"Twisted Domain",
1187911879
},
1188011880
skillList = {
1188111881
"MPSBreachEliteBoneProjectile",
@@ -11907,7 +11907,7 @@ minions["Metadata/Monsters/Breach/BreachElitePaleElite1"] = {
1190711907
companionReservation = 42.3,
1190811908
monsterCategory = "Demon",
1190911909
spawnLocation = {
11910-
"Twisted Domain (Map)",
11910+
"Twisted Domain",
1191111911
},
1191211912
skillList = {
1191311913
"GSBreachElitePaleEliteBoltImpact",
@@ -11943,7 +11943,7 @@ minions["Metadata/Monsters/Breach/Monsters/FingerDemon/FingerDemon"] = {
1194311943
companionReservation = 31.5,
1194411944
monsterCategory = "Demon",
1194511945
spawnLocation = {
11946-
"Twisted Domain (Map)",
11946+
"Twisted Domain",
1194711947
},
1194811948
skillList = {
1194911949
"MeleeAtAnimationSpeedComboTEMP",
@@ -11972,7 +11972,7 @@ minions["Metadata/Monsters/Breach/Monsters/HandSpider/HandSpider"] = {
1197211972
companionReservation = 30,
1197311973
monsterCategory = "Demon",
1197411974
spawnLocation = {
11975-
"Twisted Domain (Map)",
11975+
"Twisted Domain",
1197611976
},
1197711977
skillList = {
1197811978
"MeleeAtAnimationSpeedComboTEMP",
@@ -12001,7 +12001,7 @@ minions["Metadata/Monsters/Breach/Monsters/FingersBat/FingersBat"] = {
1200112001
companionReservation = 33,
1200212002
monsterCategory = "Demon",
1200312003
spawnLocation = {
12004-
"Twisted Domain (Map)",
12004+
"Twisted Domain",
1200512005
},
1200612006
skillList = {
1200712007
"MeleeAtAnimationSpeed",
@@ -12032,7 +12032,7 @@ minions["Metadata/Monsters/Breach/BreachFodderDemonicSpikeThrower"] = {
1203212032
companionReservation = 32.1,
1203312033
monsterCategory = "Demon",
1203412034
spawnLocation = {
12035-
"Twisted Domain (Map)",
12035+
"Twisted Domain",
1203612036
},
1203712037
skillList = {
1203812038
"MeleeAtAnimationSpeedComboTEMP",
@@ -12064,7 +12064,7 @@ minions["Metadata/Monsters/Breach/BreachElitePaleElite2"] = {
1206412064
companionReservation = 40.2,
1206512065
monsterCategory = "Demon",
1206612066
spawnLocation = {
12067-
"Twisted Domain (Map)",
12067+
"Twisted Domain",
1206812068
},
1206912069
skillList = {
1207012070
"GABreachEliteHellscapeStabWeb",

0 commit comments

Comments
 (0)