Skip to content
Merged
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
6 changes: 3 additions & 3 deletions locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
"buildTemplateName_Condi Barrier \"Carrion\" Specter SC/D": "Condi Barrier \"Carrion\" Specter SC/D",
"buildTemplateName_Condi Berserker Blademaster": "Condi Berserker Blademaster",
"buildTemplateName_Condi Berserker UF": "Condi Berserker UF",
"buildTemplateName_Condi Catalyst P/D Steamshrieker": "Condi Catalyst P/D Steamshrieker",
"buildTemplateName_Condi Catalyst P/D Steamshrieker (Approx.)": "Condi Catalyst P/D Steamshrieker (Approx.)",
"buildTemplateName_Condi Chrono Scepter": "Condi Chrono Scepter",
"buildTemplateName_Condi Chrono Staff SC/D (Approx.)": "Condi Chrono Staff SC/D (Approx.)",
"buildTemplateName_Condi Daredevil": "Condi Daredevil",
Expand Down Expand Up @@ -897,8 +897,8 @@
"preset_extra_Power Quickness Herald (Raid)": "Power Quickness Herald (Raid)",
"preset_extra_Power Quickness Untamed (Raid)": "Power Quickness Untamed (Raid)",
"preset_extra_Power Staff Daredevil": "Power Staff Daredevil",
"preset_extra_Power Tempest Bloodstone (Fractal)": "Power Tempest Bloodstone (Fractal)",
"preset_extra_Power Tempest Bloodstone (Raid)": "Power Tempest Bloodstone (Raid)",
"preset_extra_Power Tempest Inferno (Fractal)": "Power Tempest Inferno (Fractal)",
"preset_extra_Power Tempest Inferno (Raid)": "Power Tempest Inferno (Raid)",
"preset_extra_Power Weaver (Raid)": "Power Weaver (Raid)",
"preset_extra_Power Willbender Virtues (Fractal)": "Power Willbender Virtues (Fractal)",
"preset_extra_Quickness Condi Deadeye Spear": "Quickness Condi Deadeye Spear",
Expand Down
15 changes: 7 additions & 8 deletions src/assets/presetdata/preset-distribution.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ list:
profession: Tempest
value:
{
"values2": { "Power": 2657, "Power2": 0, "Burning": 10.65, "Bleeding": 19.24, "Poisoned": 0, "Torment": 0, "Confusion": 0 }
"values2": { "Power": 2588, "Power2": 0, "Burning": 10.65, "Bleeding": 19.24, "Poisoned": 0, "Torment": 0, "Confusion": 0 }
}
credit:
- author: '[NA] Crone'
Expand Down Expand Up @@ -529,17 +529,16 @@ list:
url: https://www.youtube.com/watch?v=50-VmnennEs
log: https://dps.report/0kW0-20251120-143549_golem

# use bloodstone-relic-prenerf-2 if resimulating
- name: Power Tempest Inferno
profession: Tempest
value:
{
"values2": { "Power": 3795, "Power2": 0, "Burning": 10.68, "Bleeding": 4.54, "Poisoned": 0, "Torment": 0, "Confusion": 0 }
"values2": { "Power": 3685, "Power2": 0, "Burning": 10.5, "Bleeding": 4.37, "Poisoned": 0, "Torment": 0, "Confusion": 0 }
}
credit:
- author: '[NA] Crone'
url: https://www.youtube.com/watch?v=CA3NUCMzkpc
log: https://dps.report/iv40-20250624-172217_golem
- author: Kadenar
url: https://www.youtube.com/watch?v=1CnW1G_AB4c
log: https://dps.report/lpOL-20251006-093317_golem

# currently exact copy of alacrity fire tempest (i.e. incorrectly ignoring transcendent tempest reduced overload cooldown)
- name: '"Fire Wizard" (Approx.)'
Expand Down Expand Up @@ -632,7 +631,7 @@ list:
profession: Catalyst
value:
{
"values2": { "Power": 2463, "Power2": 0, "Burning": 8.61, "Bleeding": 23.3, "Poisoned": 0.15, "Torment": 0, "Confusion": 0 }
"values2": { "Power": 2397, "Power2": 0, "Burning": 8.61, "Bleeding": 23.3, "Poisoned": 0.15, "Torment": 0, "Confusion": 0 }
}
credit:
- author: Maragon
Expand All @@ -644,7 +643,7 @@ list:
profession: Catalyst
value:
{
"values2": { "Power": 2007, "Power2": 0, "Burning": 8.8, "Bleeding": 25.31, "Poisoned": 0, "Torment": 0, "Confusion": 0 }
"values2": { "Power": 1953, "Power2": 0, "Burning": 8.8, "Bleeding": 25.31, "Poisoned": 0, "Torment": 0, "Confusion": 0 }
}
credit:
- author: Kadenar
Expand Down
12 changes: 6 additions & 6 deletions src/assets/presetdata/preset-extras.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,7 @@ list:
"lifestealAmount": ""
}

- name: Power Tempest Bloodstone (Fractal)
- name: Power Tempest Inferno (Fractal)
profession: Tempest
value:
{
Expand All @@ -1949,8 +1949,8 @@ list:
"ranger": {}
},
"Relics": {
"bloodstone-relic": {
"amount": "0.6"
"fireworks-relic": {
"amount": "100"
}
},
"Sigil1": {
Expand Down Expand Up @@ -1979,7 +1979,7 @@ list:
"lifestealAmount": ""
}

- name: Power Tempest Bloodstone (Raid)
- name: Power Tempest Inferno (Raid)
profession: Tempest
value:
{
Expand All @@ -1995,8 +1995,8 @@ list:
"ranger": {}
},
"Relics": {
"bloodstone-relic": {
"amount": "0.6"
"fireworks-relic": {
"amount": "100"
}
},
"Sigil1": {
Expand Down
19 changes: 11 additions & 8 deletions src/assets/presetdata/preset-traits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4472,7 +4472,7 @@ list:
{
"skills": {
"signet-of-fire": {
"amount": "22"
"amount": ""
},
"signet-of-earth": {},
"ele-summon-dps": {
Expand Down Expand Up @@ -4728,13 +4728,13 @@ list:
"items": [
{
"empowering-flame": {
"amount": "68"
"amount": "70"
},
"burning-precision": {},
"burning-rage": {},
"power-overwhelming": {},
"power-overwhelming-2": {
"amount": "68"
"amount": "70"
},
"pyromancers-training": {},
"persisting-flames": {
Expand Down Expand Up @@ -4766,7 +4766,7 @@ list:
"gathered-focus": {},
"hardy-conduit": {},
"transcendent-tempest": {
"amount": "50"
"amount": "65"
},
"tempestuous-aria": {
"amount": ""
Expand All @@ -4778,7 +4778,10 @@ list:
{
"skills": {
"ele-summon-dps": {
"amount": "1278"
"amount": "1417"
},
"signet-of-fire": {
"amount": "20"
}
}
}
Expand Down Expand Up @@ -5717,7 +5720,7 @@ list:
{
"skills": {
"signet-of-fire": {
"amount": "13"
"amount": ""
},
"signet-of-earth": {},
"ele-summon-dps": {
Expand Down Expand Up @@ -5816,7 +5819,7 @@ list:
{
"skills": {
"signet-of-fire": {
"amount": "14"
"amount": ""
},
"signet-of-earth": {},
"ele-summon-dps": {
Expand Down Expand Up @@ -5913,7 +5916,7 @@ list:
"amount": "72.5"
},
"signet-of-fire": {
"amount": "12.6"
"amount": ""
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/assets/presetdata/templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1019,9 +1019,9 @@ list:
distribution: Power Tempest Inferno
traits: Power Tempest Inferno
fractal:
extras: Power Tempest Bloodstone (Fractal)
extras: Power Tempest Inferno (Fractal)
raid:
extras: Power Tempest Bloodstone (Raid)
extras: Power Tempest Inferno (Raid)
weaponType: Dual wield
outdated: false

Expand Down Expand Up @@ -1187,7 +1187,7 @@ list:
weaponType: Dual wield
outdated: false

- name: Condi Catalyst P/D Steamshrieker
- name: Condi Catalyst P/D Steamshrieker (Approx.)
id: condi-cat-pd
specialization: Catalyst
boonType: Condi
Expand Down
17 changes: 17 additions & 0 deletions src/assets/testData.js
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,23 @@ const testPresets = async () => {
Object.keys(entry.skills.skills).forEach((id) =>
gentleAssert(allTraitIds.has(id), `${entry.name} has nonexistent skill id: ${id}`),
);

const { traits, skills } = entry;

const strengthOfStone = 275;
if (traits.selectedTraits.some((arr) => arr.some((trait) => trait === strengthOfStone))) {
gentleAssert(
[undefined, '', '100'].includes(skills.skills['signet-of-fire']?.amount),
`${entry.name} traits has Strength of Stone but partial fire signet uptime`,
);
}

if (entry.name.includes('Inferno')) {
gentleAssert(
![undefined, '', '100'].includes(skills.skills['signet-of-fire']?.amount),
`${entry.name} traits has Inferno in the name but 100% fire signet uptime`,
);
}
}
if (type === 'distribution') {
if (
Expand Down