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
8 changes: 6 additions & 2 deletions locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@
"extraSubText_Relic of the Zephyrite: not implemented": "Relic of the Zephyrite: not implemented",
"extraSubText_after final mantra": "after final mantra",
"extraSubText_approximate": "approximate",
"extraSubText_damage reduction not included": "damage reduction not included",
"extraSubText_female": "female",
"extraSubText_male": "male",
"extraSubText_with quickness (7 hits)": "with quickness (7 hits)",
Expand Down Expand Up @@ -917,6 +918,8 @@
"skillSubText_Total Flat Pet Damage (no modifiers)": "Total Flat Pet Damage (no modifiers)",
"skillSubText_damage buff only": "damage buff only",
"skillSubText_damage over time tick (approx.)": "damage over time tick (approx.)",
"skillSubText_damage reduction while active": "damage reduction while active",
"skillSubText_damage reduction while earth active": "damage reduction while earth active",
"skillSubText_draconic echo passive": "draconic echo passive",
"skillSubText_draconic echo passive, 100% uptime": "draconic echo passive, 100% uptime",
"skillSubText_ferocity only": "ferocity only",
Expand Down Expand Up @@ -963,7 +966,6 @@
"traitSubText": "",
"traitSubText_100%": "100%",
"traitSubText_100% burning enemy": "100% burning enemy",
"traitSubText_100% earth attunement": "100% earth attunement",
"traitSubText_100% flanking": "100% flanking",
"traitSubText_100% flanking (check both)": "100% flanking (check both)",
"traitSubText_100% fury": "100% fury",
Expand Down Expand Up @@ -1011,6 +1013,7 @@
"traitSubText_clone": "clone",
"traitSubText_conversion only": "conversion only",
"traitSubText_critical damage bonus only": "critical damage bonus only",
"traitSubText_damage reduction while active": "damage reduction while active",
"traitSubText_disabled/defiant": "disabled/defiant",
"traitSubText_fixed": "fixed",
"traitSubText_full endurance": "full endurance",
Expand All @@ -1036,7 +1039,6 @@
"traitSubText_per herald upkeep": "per herald upkeep",
"traitSubText_per hit (including non critical)": "per hit (including non critical)",
"traitSubText_permanent": "permanent",
"traitSubText_pet unleashed": "pet unleashed",
"traitSubText_phantasm": "phantasm",
"traitSubText_player unleashed": "player unleashed",
"traitSubText_power bonus only": "power bonus only",
Expand All @@ -1048,6 +1050,8 @@
"traitSubText_toughness from carapace": "toughness from carapace",
"traitSubText_virtuoso": "virtuoso",
"traitSubText_virtuoso (bugged version)": "virtuoso (bugged version)",
"traitSubText_when pet unleashed": "when pet unleashed",
"traitSubText_while active": "while active",
"traitSubText_with 1h weapon": "with 1h weapon",
"traitSubText_with active sand shade": "with active sand shade",
"traitSubText_with active shade": "with active shade",
Expand Down
29 changes: 28 additions & 1 deletion src/assets/modifierdata/elementalist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,17 @@
gw2id: 62887
temporaryBuff: true

- id: rocky-loop
text: Rocky Loop
subText: damage reduction while active
modifiers:
damage:
Damage Reduction: [15%, mult]
wvwModifiers:
damage:
Damage Reduction: [10%, mult]
gw2id: 62975

- id: relentless-fire
text: Relentless Fire
amountData:
Expand Down Expand Up @@ -110,6 +121,22 @@
gw2id: 5635
temporaryBuff: true

- id: grinding-stones
text: Grinding Stones
subText: damage reduction while active
modifiers:
damage:
Damage Reduction: [25%, mult]
gw2id: 40963

- id: woven-earth
text: Woven Earth
subText: damage reduction while earth active
modifiers:
damage:
Damage Reduction: [20%, mult]
gw2id: 43638

# - id: flame-axe
# text: Flame Axe
# subText: when equipped
Expand Down Expand Up @@ -357,7 +384,7 @@
- id: stone-flesh
text: Stone Flesh
minor: true
subText: 100% earth attunement
subText: damage reduction while active
modifiers:
damage:
Damage Reduction: [7%, unknown]
Expand Down
18 changes: 18 additions & 0 deletions src/assets/modifierdata/engineer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
Outgoing Condition Damage: [12%, add] #unconfirmed
gw2id: 63113

- id: spectrum-shield
text: Spectrum Shield
subText: while active
modifiers:
damage:
Damage Reduction: [50%, mult]
gw2id: 41218

- section: Explosives
id: 6
items:
Expand Down Expand Up @@ -397,6 +405,16 @@
- section: Holosmith
id: 57
items:

- id: light-density-amplifier
text: Light Density Amplifier
subText: while active
modifiers:
damage:
Damage Reduction: [15%, mult]
gw2id: 2114
defaultEnabled: false

- id: lasers-edge
text: Laser's Edge
amountData:
Expand Down
9 changes: 4 additions & 5 deletions src/assets/modifierdata/guardian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -639,13 +639,12 @@

- id: deathless-courage
text: Deathless Courage
amountData:
label: '% uptime'
default: 0
defaultInput: ???
quantityEntered: 100
subText: damage reduction while active
modifiers:
damage:
Damage Reduction: [50%, unknown]
wvwModifiers:
damage:
Damage Reduction: [20%, unknown]
gw2id: 2198
defaultEnabled: true
2 changes: 1 addition & 1 deletion src/assets/modifierdata/metadata.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export type ConversionAfterBuffsDestinationKey =

// these values don't behave well if scaled up and down,
// so disallow them in modifiers with an amount key
export const damageKeysBlacklist = [] as const;
export const damageKeysBlacklist = ['Damage Reduction'] as const;
export const attributePointKeysBlacklist = [
'Precision',
'Toughness',
Expand Down
19 changes: 19 additions & 0 deletions src/assets/modifierdata/necromancer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,25 @@
Siphon Coefficient: 0.2
temporaryBuff: true

- id: rise-shout
text: "Rise!"
subText: damage reduction while active
modifiers:
damage:
Damage Reduction: [33%, mult]
gw2id: 30772

- id: infusing-terror
text: Infusing Terror
subText: damage reduction while active
modifiers:
damage:
Damage Reduction: [66%, mult]
wvwModifiers:
damage:
Damage Reduction: [20%, mult]
gw2id: 29958

- section: Spite
id: 53
items:
Expand Down
12 changes: 10 additions & 2 deletions src/assets/modifierdata/ranger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@
Outgoing Healing: 25%
temporaryBuff: true

- id: dolyak-stance
text: Dolyak Stance
subText: while active
modifiers:
damage:
Damage Reduction: [33%, mult]
gw2id: 45789

- section: Marksmanship
id: 8
note: Farsighted currently breaks air and hydromancy sigil simulation, and possibly some other effects.
Expand Down Expand Up @@ -341,7 +349,7 @@
modifiers:
damage:
Outgoing Strike Damage: [10%, unknown]
Damage Reduction: [10%, unknown]
Damage Reduction: [5%, unknown]
gw2id: 2032
defaultEnabled: true

Expand Down Expand Up @@ -693,7 +701,7 @@

- id: vow-of-the-untamed-pet
text: Vow of the Untamed
subText: pet unleashed
subText: when pet unleashed
modifiers:
damage:
Damage Reduction: [25%, unknown]
Expand Down
2 changes: 1 addition & 1 deletion src/assets/modifierdata/relics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@

- id: relic-of-nourys
text: Relic of Nourys
subText: damage reduction not included
amountData:
label: '% uptime'
default: 0
Expand All @@ -247,7 +248,6 @@
damage:
Outgoing Strike Damage: [25%, add] # tested by crone
Outgoing Condition Damage: [25%, add] # tested by crone
Damage Reduction: [15%, unknown]
gw2id: 101191

- id: living-city-relic
Expand Down
23 changes: 16 additions & 7 deletions src/assets/modifierdata/revenant.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,6 @@
Outgoing Condition Damage: [7%, add] #unconfirmed
gw2id: 28113

- id: vengeful-hammers
text: Vengeful Hammers
modifiers:
damage:
Damage Reduction: [20%, mult]
gw2id: 26557

- id: soulcleaves-summit
text: Soulcleave's Summit
subText: siphon only
Expand Down Expand Up @@ -162,6 +155,22 @@
gw2id: 26937
temporaryBuff: true

- id: vengeful-hammers
text: Vengeful Hammers
subText: damage reduction while active
modifiers:
damage:
Damage Reduction: [20%, mult]
gw2id: 26557

- id: forced-engagement
text: Forced Engagement
subText: damage reduction while active
modifiers:
damage:
Damage Reduction: [33%, mult]
gw2id: 26679

- section: Corruption
id: 14
items:
Expand Down