data: Fix trait attribute conversions

locales/en/translation.json

@@ -1180,8 +1180,9 @@
   "traitNote_Natural Fortitude Unleashed Ambush lifesteal damage may be omitted in arcdps area stats or parsed arcdps logs.": "Natural Fortitude Unleashed Ambush lifesteal damage may be omitted in arcdps area stats or parsed arcdps logs.",
   "traitNote_Non-100% Chaotic Potency with-staff values combined with Toxic Maintenance Oil/Enhanced Lucent Oil result in inconsistent boon duration between weapon sets, which will be averaged.": "Non-100% Chaotic Potency with-staff values combined with Toxic Maintenance Oil/Enhanced Lucent Oil result in inconsistent boon duration between weapon sets, which will be averaged.",
   "traitNote_Signet of Spite non-100% uptime (i.e. on any build that uses shroud rotation) is currently simulated poorly (as a fractional affect both in and out of shroud).\n\nNightmare Weapon stacks on allies are affected by ally lifesteal damage/all damage modifiers like Soul Barbs, Relic of Atrocity, Lead Attacks, and numerous revenant traits.": "Signet of Spite non-100% uptime (i.e. on any build that uses shroud rotation) is currently simulated poorly (as a fractional affect both in and out of shroud).\n\nNightmare Weapon stacks on allies are affected by ally lifesteal damage/all damage modifiers like Soul Barbs, Relic of Atrocity, Lead Attacks, and numerous revenant traits.",
+  "traitNote_Some stat bonuses, like Alchemic Vigor, are not affected by generic conversion effects like Magnanimous Tuning Crystal or Reinforced Armor, but traits may be overridden by the game code to convert them.": "Some stat bonuses, like Alchemic Vigor, are not affected by generic conversion effects like Magnanimous Tuning Crystal or Reinforced Armor, but traits may be overridden by the game code to convert them.",
+  "traitNote_Some stat bonuses, like Furious Demise precision, are not affected by generic conversion effects like Toxic Focusing Crystal, but traits may be overridden by the game code to convert them.\n\nThe durations of transferred self conditions (plague sending, dagger 4, staff 4) aren't simulated correctly.": "Some stat bonuses, like Furious Demise precision, are not affected by generic conversion effects like Toxic Focusing Crystal, but traits may be overridden by the game code to convert them.\n\nThe durations of transferred self conditions (plague sending, dagger 4, staff 4) aren't simulated correctly.",
   "traitNote_The durations of transferred self conditions (cannon backfire + generosity sigil) aren't simulated correctly.": "The durations of transferred self conditions (cannon backfire + generosity sigil) aren't simulated correctly.",
-  "traitNote_The durations of transferred self conditions (plague sending, dagger 4, staff 4) aren't simulated correctly.": "The durations of transferred self conditions (plague sending, dagger 4, staff 4) aren't simulated correctly.",
   "traitNote_Vampiric Slash lifesteal damage may not be shown in arcdps area stats or parsed arcdps logs.": "Vampiric Slash lifesteal damage may not be shown in arcdps area stats or parsed arcdps logs.",
   "traitNote_With Jagged Mind and Master of Fragmentation, Bladesong Harmony should scale based off of \"player critical chance plus 25%.\" The optimizer doesn't support this, but it can be entered as if Bladesong Harmony hits are always critical, which will be true with ≥75% player critical chance.": "With Jagged Mind and Master of Fragmentation, Bladesong Harmony should scale based off of \"player critical chance plus 25%.\" The optimizer doesn't support this, but it can be entered as if Bladesong Harmony hits are always critical, which will be true with ≥75% player critical chance.",
   "traitSubText": "",
@@ -1240,6 +1241,7 @@
   "traitSubText_base": "base",
   "traitSubText_base (+80 prec)": "base (+80 prec)",
   "traitSubText_base amount": "base amount",
+  "traitSubText_base conversion": "base conversion",
   "traitSubText_base only": "base only",
   "traitSubText_base, bugged: 160 expertise": "base, bugged: 160 expertise",
   "traitSubText_base, intended: 120 expertise": "base, intended: 120 expertise",
@@ -1250,6 +1252,8 @@
   "traitSubText_bug: converted like 360 vitality": "bug: converted like 360 vitality",
   "traitSubText_bugged 10% chill mod": "bugged 10% chill mod",
   "traitSubText_clone": "clone",
+  "traitSubText_conversion of Alchemic Vigor": "conversion of Alchemic Vigor",
+  "traitSubText_conversion of Vital Persistance": "conversion of Vital Persistance",
   "traitSubText_conversion only": "conversion only",
   "traitSubText_damage reduction while active": "damage reduction while active",
   "traitSubText_disabled/defiant": "disabled/defiant",

src/assets/modifierdata/engineer.yaml

@@ -215,7 +215,7 @@
       text: Chemical Rounds
       modifiers:
         attributes:
-          Condition Damage: [120, buff]
+          Condition Damage: [120, converted]
       gw2id: 1878
       defaultEnabled: true
       temporaryBuff: false

src/assets/modifierdata/necromancer.yaml

@@ -253,6 +253,10 @@
 - section: Curses
   id: 39
   note: >-
+    Some stat bonuses, like Furious Demise precision, are not affected by generic conversion effects like
+    Toxic Focusing Crystal, but traits may be overridden by the game code to convert them.
+
+
     The durations of transferred self conditions (plague sending, dagger 4, staff 4) aren't simulated correctly.
   items:
 
@@ -742,6 +746,9 @@
 
 - section: Harbinger
   id: 64
+  note: >-
+    Some stat bonuses, like Alchemic Vigor, are not affected by generic conversion effects like Magnanimous
+    Tuning Crystal or Reinforced Armor, but traits may be overridden by the game code to convert them.
   items:
 
     - id: blight
@@ -832,31 +839,94 @@
 
     - id: implacable-foe
       text: Implacable Foe
+      subText: base conversion
       modifiers:
         conversion:
           Ferocity: {Vitality: 13%}
       gw2id: 2192
       defaultEnabled: true
       temporaryBuff: false
 
+    - id: implacable-foe-alchemic-vigor
+      text: Implacable Foe
+      subText: conversion of Alchemic Vigor
+      modifiers:
+        attributes:
+          Ferocity: [31, buff] # pseudo-conversion of alchemic vigor (minor in this line)
+      gw2id: 2192
+      defaultEnabled: true
+      temporaryBuff: false
+
+    - id: implacable-foe-vital-persistence
+      text: Implacable Foe
+      subText: conversion of Vital Persistance
+      modifiers:
+        attributes:
+          Ferocity: [24, buff] # pseudo-conversion of vital persistence
+      gw2id: 2192
+      defaultEnabled: false
+      temporaryBuff: false
+
     - id: twisted-medicine
       text: Twisted Medicine
+      subText: base conversion
       modifiers:
         conversion:
           Concentration: {Vitality: 13%}
       gw2id: 2220
       defaultEnabled: true
       temporaryBuff: false
 
+    - id: twisted-medicine-alchemic-vigor
+      text: Twisted Medicine
+      subText: conversion of Alchemic Vigor
+      modifiers:
+        attributes:
+          Concentration: [31, buff] # pseudo-conversion of alchemic vigor (minor in this line)
+      gw2id: 2220
+      defaultEnabled: true
+      temporaryBuff: false
+
+    - id: twisted-medicine-vital-persistence
+      text: Twisted Medicine
+      subText: conversion of Vital Persistance
+      modifiers:
+        attributes:
+          Concentration: [24, buff] # pseudo-conversion of vital persistence
+      gw2id: 2220
+      defaultEnabled: false
+      temporaryBuff: false
+
     - id: dark-gunslinger
       text: Dark Gunslinger
+      subText: base conversion
       modifiers:
         conversion:
           Expertise: {Vitality: 13%}
       gw2id: 2209
       defaultEnabled: true
       temporaryBuff: false
 
+    - id: dark-gunslinger-alchemic-vigor
+      text: Dark Gunslinger
+      subText: conversion of Alchemic Vigor
+      modifiers:
+        attributes:
+          Expertise: [31, buff] # pseudo-conversion of alchemic vigor (minor in this line)
+      gw2id: 2209
+      defaultEnabled: true
+      temporaryBuff: false
+
+    - id: dark-gunslinger-vital-persistence
+      text: Dark Gunslinger
+      subText: conversion of Vital Persistance
+      modifiers:
+        attributes:
+          Expertise: [24, buff] # pseudo-conversion of vital persistence
+      gw2id: 2209
+      defaultEnabled: false
+      temporaryBuff: false
+
     - id: cascading-corruption
       text: Cascading Corruption
       subText: power bonus only

src/assets/modifierdata/revenant.yaml

@@ -591,12 +591,14 @@
       minor: true
       modifiers:
         attributes:
-          Healing Power: [120, converted] # tested by Leder
+          Healing Power: [120, buff]
+          Concentration: [8, buff] # pseudo-conversion of own healing power
         conversion:
           Concentration: {Healing Power: 7%}
       wvwModifiers:
         attributes:
-          Healing Power: [120, converted]
+          Healing Power: [120, buff]
+          Concentration: [5, buff] # pseudo-conversion of own healing power
         conversion:
           Concentration: {Healing Power: 4%}
       gw2id: 1821

src/assets/presetdata/preset-distribution.yaml

@@ -1286,7 +1286,7 @@ list:
     profession: Amalgam
     value:
       {
-        "values2": { "Power": 3030, "Power2": 0, "Burning": 11.78, "Bleeding": 13.6, "Poisoned": 7.38, "Torment": 0, "Confusion": 0 }
+        "values2": { "Power": 3024, "Power2": 0, "Burning": 11.77, "Bleeding": 13.59, "Poisoned": 7.38, "Torment": 0, "Confusion": 0 }
       }
     credit:
       - author: beng / L3m0n
@@ -1297,7 +1297,7 @@ list:
     profession: Amalgam
     value:
       {
-        "values2": { "Power": 3102, "Power2": 0, "Burning": 11.98, "Bleeding": 13.32, "Poisoned": 6.11, "Torment": 0, "Confusion": 2.71 }
+        "values2": { "Power": 3102, "Power2": 0, "Burning": 11.96, "Bleeding": 13.3, "Poisoned": 6.11, "Torment": 0, "Confusion": 2.71 }
       }
     credit:
       - author: '[LN] Toilet'
@@ -1600,18 +1600,18 @@ list:
     profession: Harbinger
     value:
       {
-        "values2": { "Power": 2252, "Power2": 0, "Burning": 1.93, "Bleeding": 9.28, "Poisoned": 6.08, "Torment": 17.58, "Confusion": 0.64 }
+        "values2": { "Power": 2497, "Power2": 0, "Burning": 1.94, "Bleeding": 8.17, "Poisoned": 6.15, "Torment": 18.37, "Confusion": 0.63 }
       }
     credit:
       - author: 'Sarulias'
-        url: https://www.youtube.com/watch?v=hGy1hhhvhhc
-        log: https://dps.report/9GSF-20231002-152522_golem
+        url: https://www.youtube.com/watch?v=ER3qccGutd0
+        log: https://dps.report/IZRW-20240206-201123_golem
 
   - name: Quickness Power Harbinger
     profession: Harbinger
     value:
       {
-        "values2": { "Power": 1656, "Power2": 1965, "Burning": 0.55, "Bleeding": 0.55, "Poisoned": 0.55, "Torment": 10.11, "Confusion": 0.55 }
+        "values2": { "Power": 1696, "Power2": 1938, "Burning": 0.55, "Bleeding": 0.55, "Poisoned": 0.55, "Torment": 10.11, "Confusion": 0.55 }
       }
     credit:
       - author: 'Sarulias'
@@ -1623,7 +1623,7 @@ list:
     profession: Harbinger
     value:
       {
-        "values2": { "Power": 1756, "Power2": 2122, "Burning": 0.67, "Bleeding": 0.67, "Poisoned": 1.48, "Torment": 9.89, "Confusion": 0.66 }
+        "values2": { "Power": 1778, "Power2": 2149, "Burning": 0.67, "Bleeding": 0.68, "Poisoned": 1.51, "Torment": 9.99, "Confusion": 0.67 }
       }
     credit:
       - author: 'Sarulias'

src/assets/presetdata/preset-traits.yaml

@@ -10390,7 +10390,11 @@ list:
             },
             "alchemic-vigor": {},
             "implacable-foe": {},
+            "implacable-foe-alchemic-vigor": {},
+            "twisted-medicine": {},
+            "twisted-medicine-alchemic-vigor": {},
             "dark-gunslinger": {},
+            "dark-gunslinger-alchemic-vigor": {},
             "cascading-corruption": {},
             "doom-approaches": {},
             "blight": {
@@ -10445,7 +10449,7 @@ list:
             },
             "lingering-curse": {},
             "barbed-precision-on-crit": {
-              "amount": "2.89"
+              "amount": "2.96"
             }
           },
           {
@@ -10456,18 +10460,22 @@ list:
             "death-perception": {}
           },
           {
+            "wicked-corruption-base": {},
             "wicked-corruption": {
               "amount": ""
             },
             "septic-corruption": {
-              "amount": "21.6"
+              "amount": "21"
             },
             "alchemic-vigor": {},
             "implacable-foe": {},
+            "implacable-foe-alchemic-vigor": {},
+            "twisted-medicine": {},
+            "twisted-medicine-alchemic-vigor": {},
             "dark-gunslinger": {},
+            "dark-gunslinger-alchemic-vigor": {},
             "cascading-corruption": {},
             "doom-approaches": {},
-            "twisted-medicine": {},
             "blight": {
               "amount": ""
             }
@@ -10478,7 +10486,7 @@ list:
       {
         "skills": {
           "signet-of-spite": {
-            "amount": "14.2"
+            "amount": "14.5"
           }
         }
       }
@@ -10539,8 +10547,11 @@ list:
             },
             "alchemic-vigor": {},
             "implacable-foe": {},
+            "implacable-foe-alchemic-vigor": {},
             "twisted-medicine": {},
+            "twisted-medicine-alchemic-vigor": {},
             "dark-gunslinger": {},
+            "dark-gunslinger-alchemic-vigor": {},
             "cascading-corruption": {},
             "doom-approaches": {},
             "blight": {
@@ -10617,8 +10628,11 @@ list:
             },
             "alchemic-vigor": {},
             "implacable-foe": {},
+            "implacable-foe-alchemic-vigor": {},
             "twisted-medicine": {},
+            "twisted-medicine-alchemic-vigor": {},
             "dark-gunslinger": {},
+            "dark-gunslinger-alchemic-vigor": {},
             "cascading-corruption": {},
             "doom-approaches": {},
             "blight": {

src/assets/presetdata/templates.yaml

@@ -1882,7 +1882,7 @@ list:
         traits: DPS Harbinger
         extras: DPS Harbinger
         weaponType: Dual wield
-        outdated: false
+        outdated: true
 
       - name: Power Harbinger
         id: pharb