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
9 changes: 5 additions & 4 deletions locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,6 @@
"preset_affix_Condi Quickness Harbinger 12.8%": "Condi Quickness Harbinger 12.8%",
"preset_affix_Condi Quickness Herald 0%": "Condi Quickness Herald 0%",
"preset_affix_Condi Quickness Scrapper 28.7%": "Condi Quickness Scrapper 28.7%",
"preset_affix_Condi Quickness Untamed 30%": "Condi Quickness Untamed 30%",
"preset_affix_Condi Tempest": "Condi Tempest",
"preset_affix_Heal (Fractal)": "Heal (Fractal)",
"preset_affix_Heal (Raid)": "Heal (Raid)",
Expand All @@ -635,6 +634,7 @@
"preset_affix_Power DPS (no dragon)": "Power DPS (no dragon)",
"preset_affix_Power Quickbrand 25%": "Power Quickbrand 25%",
"preset_affix_Power Quickness Untamed 40%": "Power Quickness Untamed 40%",
"preset_affix_Quickness Condi Untamed 42%": "Quickness Condi Untamed 42%",
"preset_affix_Trailblazer/Dire": "Trailblazer/Dire",
"preset_affix_Viper Only": "Viper Only",
"preset_buff_Benchmark": "Benchmark",
Expand Down Expand Up @@ -690,7 +690,6 @@
"preset_distribution_Condi Mirage Staxe IH Oasis": "Condi Mirage Staxe IH Oasis",
"preset_distribution_Condi Quickness Berserker Blademaster": "Condi Quickness Berserker Blademaster",
"preset_distribution_Condi Quickness Herald SB M/A": "Condi Quickness Herald SB M/A",
"preset_distribution_Condi Quickness Untamed": "Condi Quickness Untamed",
"preset_distribution_Condi Reaper Scepter": "Condi Reaper Scepter",
"preset_distribution_Condi Reaper Spear": "Condi Reaper Spear",
"preset_distribution_Condi Renegade SB Devastation": "Condi Renegade SB Devastation",
Expand Down Expand Up @@ -780,6 +779,7 @@
"preset_distribution_Quickness Condi Firebrand P/T P/P": "Quickness Condi Firebrand P/T P/P",
"preset_distribution_Quickness Condi Harbinger": "Quickness Condi Harbinger",
"preset_distribution_Quickness Condi Scrapper": "Quickness Condi Scrapper",
"preset_distribution_Quickness Condi Untamed": "Quickness Condi Untamed",
"preset_distribution_Quickness Power Berserker GS A/A": "Quickness Power Berserker GS A/A",
"preset_distribution_Quickness Power Catalyst Scepter Inferno": "Quickness Power Catalyst Scepter Inferno",
"preset_distribution_Quickness Power Catalyst Scepter PF": "Quickness Power Catalyst Scepter PF",
Expand Down Expand Up @@ -817,7 +817,6 @@
"preset_extra_Condi Quickness Bers": "Condi Quickness Bers",
"preset_extra_Condi Quickness Herald": "Condi Quickness Herald",
"preset_extra_Condi Quickness Scrapper": "Condi Quickness Scrapper",
"preset_extra_Condi Quickness Untamed": "Condi Quickness Untamed",
"preset_extra_Condi Reaper Scepter": "Condi Reaper Scepter",
"preset_extra_Condi Reaper Spear": "Condi Reaper Spear",
"preset_extra_Condi Ren": "Condi Ren",
Expand Down Expand Up @@ -905,6 +904,7 @@
"preset_extra_Quickness Condi Deadeye Spear": "Quickness Condi Deadeye Spear",
"preset_extra_Quickness Condi Firebrand": "Quickness Condi Firebrand",
"preset_extra_Quickness Condi Harbinger": "Quickness Condi Harbinger",
"preset_extra_Quickness Condi Untamed": "Quickness Condi Untamed",
"preset_female": "female",
"preset_infusion_Condition Damage + Expertise": "Condition Damage + Expertise",
"preset_infusion_Condition Damage + Precision": "Condition Damage + Precision",
Expand Down Expand Up @@ -957,7 +957,6 @@
"preset_trait_Condi Mirage Staxe IH Oasis": "Condi Mirage Staxe IH Oasis",
"preset_trait_Condi Quickness Berserker Blademaster": "Condi Quickness Berserker Blademaster",
"preset_trait_Condi Quickness Herald": "Condi Quickness Herald",
"preset_trait_Condi Quickness Untamed": "Condi Quickness Untamed",
"preset_trait_Condi Reaper Scepter": "Condi Reaper Scepter",
"preset_trait_Condi Reaper Spear": "Condi Reaper Spear",
"preset_trait_Condi Renegade SB Invocation": "Condi Renegade SB Invocation",
Expand Down Expand Up @@ -1063,6 +1062,7 @@
"preset_trait_Quickness Condi Firebrand P/T P/P": "Quickness Condi Firebrand P/T P/P",
"preset_trait_Quickness Condi Harbinger": "Quickness Condi Harbinger",
"preset_trait_Quickness Condi Scrapper": "Quickness Condi Scrapper",
"preset_trait_Quickness Condi Untamed": "Quickness Condi Untamed",
"preset_trait_Quickness Fire SE Evoker Condi": "Quickness Fire SE Evoker Condi",
"preset_trait_Quickness Fire SE Evoker Inferno": "Quickness Fire SE Evoker Inferno",
"preset_trait_Quickness Fire SE Evoker Trailblazer": "Quickness Fire SE Evoker Trailblazer",
Expand Down Expand Up @@ -1145,6 +1145,7 @@
"traitNote_Be sure to change the condition coefficient values below when adding or removing traits without checkboxes that implement their full effects like demonic lore.": "Be sure to change the condition coefficient values below when adding or removing traits without checkboxes that implement their full effects like demonic lore.",
"traitNote_Be sure to change the power coefficient value below when adding or removing traits that change your rotation like improved alacrity.": "Be sure to change the power coefficient value below when adding or removing traits that change your rotation like improved alacrity.",
"traitNote_Call and Response damage isn't simulated correctly.": "Call and Response damage isn't simulated correctly.",
"traitNote_Carrion Devourer, Murellow, and some spider pets have skills that mechanically function as though cast by the player; do not include them in flat pet damage. Elite Insights logs will generally reflect this correctly.": "Carrion Devourer, Murellow, and some spider pets have skills that mechanically function as though cast by the player; do not include them in flat pet damage. Elite Insights logs will generally reflect this correctly.",
"traitNote_Damage dealt by the mechanist mech is not currently simulated accurately. It inherits some, but not all, player stats and bonuses.": "Damage dealt by the mechanist mech is not currently simulated accurately. It inherits some, but not all, player stats and bonuses.",
"traitNote_Enchanted Daggers/Form of the Assassin lifesteal damage may not be shown in arcdps area stats or parsed arcdps logs.": "Enchanted Daggers/Form of the Assassin lifesteal damage may not be shown in arcdps area stats or parsed arcdps logs.",
"traitNote_Enter identical uptimes for \"regular\" Elemental Empowerment and Empowered Empowerment, if applicable.": "Enter identical uptimes for \"regular\" Elemental Empowerment and Empowered Empowerment, if applicable.",
Expand Down
3 changes: 3 additions & 0 deletions src/assets/modifierdata/ranger.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
- section: Skills
note: >-
Carrion Devourer, Murellow, and some spider pets have skills that mechanically function as though cast by
the player; do not include them in flat pet damage. Elite Insights logs will generally reflect this correctly.
items:

- id: pet-dps
Expand Down
3 changes: 3 additions & 0 deletions src/assets/presetdata/credit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,6 @@ Rumi:

Sotym:
authorUrl: https://www.youtube.com/@MCASotym

Chimera:
authorUrl: https://www.youtube.com/channel/UCSc1F9n90zY4kPiC-OBjlsg
4 changes: 2 additions & 2 deletions src/assets/presetdata/preset-affixes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,14 @@ list:
"minQuicknessDuration": "44.7"
}

- name: Condi Quickness Untamed 30%
- name: Quickness Condi Untamed 42%
hidden: true
value:
{
"affixes": ["Viper", "Ritualist"],
"optimizeFor": "Damage",
"minBoonDuration": "0",
"minQuicknessDuration": "30"
"minQuicknessDuration": "42"
}

- name: Condi Boon Daredevil 62%
Expand Down
11 changes: 6 additions & 5 deletions src/assets/presetdata/preset-distribution.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -884,16 +884,17 @@ list:
url: https://www.youtube.com/watch?v=0DH0NXcqUrM
log: https://dps.report/BWYo-20251211-175030_golem

- name: Condi Quickness Untamed
# bursting expertisefood
- name: Quickness Condi Untamed
profession: Untamed
value:
{
"values2": { "Power": 2104, "Power2": 0, "Burning": 3.46, "Bleeding": 21.84, "Poisoned": 13.23, "Torment": 0, "Confusion": 0 }
"values2": { "Power": 2181, "Power2": 0, "Burning": 3.52, "Bleeding": 21.39, "Poisoned": 12.66, "Torment": 0, "Confusion": 0 }
}
credit:
- author: Tiramichu
url: https://www.youtube.com/watch?v=svoHI_hOhds
log: https://dps.report/r4Vc-20231014-151702_golem
- author: Chimera
url: https://www.youtube.com/watch?v=UXvYfstA4-Q
log: https://dps.report/9Au7-20250425-170634_golem

- name: Power Soulbeast
profession: Soulbeast
Expand Down
2 changes: 1 addition & 1 deletion src/assets/presetdata/preset-extras.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3007,7 +3007,7 @@ list:
"lifestealAmount": ""
}

- name: Condi Quickness Untamed
- name: Quickness Condi Untamed
profession: Untamed
value:
{
Expand Down
8 changes: 4 additions & 4 deletions src/assets/presetdata/preset-traits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7079,7 +7079,7 @@ list:
"skills": {}
}

- name: Condi Quickness Untamed
- name: Quickness Condi Untamed
profession: Untamed
traits:
{
Expand Down Expand Up @@ -7112,7 +7112,7 @@ list:
"hunters-tactics": {},
"vicious-quarry": {},
"sharpened-edges": {
"amount": "4.66"
"amount": "3.38"
}
},
{
Expand All @@ -7127,7 +7127,7 @@ list:
{
"natural-fortitude": {},
"vow-of-the-untamed-you": {
"amount": "88.2"
"amount": "80.5"
},
"ferocious-symbiosis": {
"amount": ""
Expand All @@ -7139,7 +7139,7 @@ list:
{
"skills": {
"pet-dps": {
"amount": "3552"
"amount": "5009"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/assets/presetdata/templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1288,12 +1288,12 @@ list:
id: condi-quickness-untamed
specialization: Untamed
boonType: Condi
priority: Condi Quickness Untamed 30%
distribution: Condi Quickness Untamed
traits: Condi Quickness Untamed
extras: Condi Quickness Untamed
weaponType: Two-handed
outdated: true
priority: Quickness Condi Untamed 42%
distribution: Quickness Condi Untamed
traits: Quickness Condi Untamed
extras: Quickness Condi Untamed
weaponType: Dual wield
outdated: false

- name: Quickness Power Untamed
id: quickness-power-untamed
Expand Down