Skip to content

Commit dc39a69

Browse files
Blitz54LocalIdentity
andauthored
Add new 0.5 Spectres (#2026)
* Fix exporters and add some spectres * More spectres * Refix export scripts * More spectre stuff * Add skills for the big ape --------- Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent e46e260 commit dc39a69

14 files changed

Lines changed: 15076 additions & 7855 deletions

File tree

src/Classes/MinionListControl.lua

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ end
4949
function MinionListClass:AddValueTooltip(tooltip, index, minionId)
5050
if tooltip:CheckForUpdate(minionId) then
5151
local minion = self.data.minions[minionId]
52-
tooltip:AddLine(18, "^7"..minion.name)
52+
tooltip.center = true
53+
tooltip:AddLine(20, "^7"..minion.name, "FONTIN SC")
54+
tooltip.center = false
5355
tooltip:AddSeparator(10)
5456
tooltip:AddLine(14, s_format("^7Spectre Reservation: %s%d", colorCodes.SPIRIT, tostring(minion.spectreReservation)))
5557
tooltip:AddLine(14, s_format("^7Companion Reservation: %s%s%%", colorCodes.SPIRIT, tostring(minion.companionReservation)))
@@ -65,23 +67,27 @@ function MinionListClass:AddValueTooltip(tooltip, index, minionId)
6567
tooltip:AddLine(14, s_format("^7Evasion Multiplier: x%.2f", 1 + minion.evasion))
6668
end
6769
tooltip:AddLine(14, s_format("^7Resistances: %s%d ^7/ %s%d ^7/ %s%d ^7/ %s%d",
68-
colorCodes.FIRE, minion.fireResist,
69-
colorCodes.COLD, minion.coldResist,
70-
colorCodes.LIGHTNING, minion.lightningResist,
70+
colorCodes.FIRE, minion.fireResist,
71+
colorCodes.COLD, minion.coldResist,
72+
colorCodes.LIGHTNING, minion.lightningResist,
7173
colorCodes.CHAOS, minion.chaosResist
7274
))
7375
tooltip:AddLine(14, s_format("^7Base Damage: x%.2f", minion.damage))
7476
tooltip:AddLine(14, s_format("^7Base Attack Speed: %.2f", 1 / minion.attackTime))
7577
tooltip:AddLine(14, s_format("^7Base Movement Speed: %.2f", minion.baseMovementSpeed / 10))
76-
for _, skillId in ipairs(minion.skillList) do
77-
if self.data.skills[skillId] then
78-
tooltip:AddLine(14, "^7Skill: "..self.data.skills[skillId].name)
78+
if #minion.skillList > 0 then
79+
tooltip:AddSeparator(10)
80+
for _, skillId in ipairs(minion.skillList) do
81+
if self.data.skills[skillId] then
82+
local color = data.skillColorMap[self.data.skills[skillId].color] or colorCodes.NORMAL
83+
tooltip:AddLine(14, "^7Skill: " .. color .. self.data.skills[skillId].name)
84+
end
7985
end
8086
end
8187
tooltip:AddSeparator(10)
8288
if #minion.spawnLocation > 0 then
8389
local coloredLocations = {}
84-
for _, location in ipairs(minion.spawnLocation) do -- Print (Map) or (Act 7) in white, and map name in green.
90+
for _, location in ipairs(minion.spawnLocation) do -- Print (Map) or (Act 7) in white, and map name in green.
8591
local mainText, bracket = location:match("^(.-)%s*(%b())%s*$")
8692
table.insert(coloredLocations, bracket and (colorCodes.RELIC .. mainText .. " " .. "^7" .. bracket) or (colorCodes.RELIC .. location))
8793
end

src/Data/SkillStatMap.lua

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,12 @@ return {
10891089
["lightning_damage_%_to_add_as_chaos"] = {
10901090
mod("LightningDamageGainAsChaos", "BASE", nil),
10911091
},
1092+
["non_skill_base_all_damage_%_to_gain_as_lightning"] = {
1093+
mod("DamageGainAsLightning", "BASE", nil),
1094+
},
1095+
["non_skill_base_all_damage_%_to_gain_as_cold"] = {
1096+
mod("DamageGainAsCold", "BASE", nil),
1097+
},
10921098
["non_skill_base_all_damage_%_to_gain_as_chaos"] = {
10931099
mod("DamageGainAsChaos", "BASE", nil),
10941100
},
@@ -1850,7 +1856,7 @@ return {
18501856
},
18511857
["spell_skills_fire_2_additional_projectiles_final_chance_%"] = {
18521858
mod("TwoAdditionalProjectilesChance", "BASE", nil),
1853-
},
1859+
},
18541860
["additional_beam_only_chains"] = {
18551861
mod("BeamChainCountMax", "BASE", nil),
18561862
},

0 commit comments

Comments
 (0)