Merge pull request #296 from ChrisMGeo/bug-fixes

Fix Tighnari val and Weapons baseAttack

assets/data/characters/tighnari/en.json

@@ -59,38 +59,38 @@
         }
       ],
       "type": "NORMAL_ATTACK",
-      "attribute-scaling" : [
+      "attribute-scaling": [
         {
-          "name" : "1-Hit DMG (%)",
-          "value" : "44.63 48.27 51.9 57.09 60.72 64.88 70.58 76.29 82 88.23 94.46"
+          "name": "1-Hit DMG (%)",
+          "value": "44.63 48.27 51.9 57.09 60.72 64.88 70.58 76.29 82 88.23 94.46"
         },
         {
-          "name" : "2-Hit DMG (%)",
-          "value" : "41.97 45.38 48.8 53.68 57.1 61 66.37 71.74 77.1 82.96 88.82"
+          "name": "2-Hit DMG (%)",
+          "value": "41.97 45.38 48.8 53.68 57.1 61 66.37 71.74 77.1 82.96 88.82"
         },
         {
-          "name" : "3-Hit DMG (%)",
-          "value" : "26.45x2 28.6x2 30.75x2 33.83x2 35.98x2 38.44x2 41.82x2 45.2x2 48.59x2 52.28x2 55.96x2"
+          "name": "3-Hit DMG (%)",
+          "value": "26.45x2 28.6x2 30.75x2 33.83x2 35.98x2 38.44x2 41.82x2 45.2x2 48.59x2 52.28x2 55.96x2"
         },
         {
-          "name" : "4-Hit DMG (%)",
-          "value" : "68.63 74.21 79.8 87.78 93.37 99.75 108.53 117.31 126.08 135.66 145.24"
+          "name": "4-Hit DMG (%)",
+          "value": "68.63 74.21 79.8 87.78 93.37 99.75 108.53 117.31 126.08 135.66 145.24"
         },
         {
-          "name" : "Aimed Shot (%)",
-          "value" : "43.86 47.43 51 56.1 59.67 63.75 69.36 74.97 80.58 86.7 92.82"
+          "name": "Aimed Shot (%)",
+          "value": "43.86 47.43 51 56.1 59.67 63.75 69.36 74.97 80.58 86.7 92.82"
         },
         {
-          "name" : "Level 1 Aimed Shot (%)",
-          "val" : "124 133.3 142.6 155 164.3 173.6 186 198.4 210.8 223.2 235.6"
+          "name": "Level 1 Aimed Shot (%)",
+          "value": "124 133.3 142.6 155 164.3 173.6 186 198.4 210.8 223.2 235.6"
         },
         {
-          "name" : "Wreath Arrow DMG (%)",
-          "val" : "87.2 93.74 100.28 109 115.54 122.08 130.8 139.52 148.24 156.96 165.68"
+          "name": "Wreath Arrow DMG (%)",
+          "value": "87.2 93.74 100.28 109 115.54 122.08 130.8 139.52 148.24 156.96 165.68"
         },
         {
-          "name" : "Clusterbloom Arrow DMG (%)",
-          "val" : "38.6 41.49 44.39 48.25 51.14 54.04 57.9 61.76 65.62 69.48 73.34"
+          "name": "Clusterbloom Arrow DMG (%)",
+          "value": "38.6 41.49 44.39 48.25 51.14 54.04 57.9 61.76 65.62 69.48 73.34"
         }
       ]
     },
@@ -117,7 +117,7 @@
         }
       ],
       "type": "ELEMENTAL_SKILL",
-      "attribute-scaling" : [
+      "attribute-scaling": [
         {
           "name": "Skill DMG (%)",
           "value": "149.6 160.82 172.04 187 198.22 209.44 224.4 239.36 254.32 269.28 284.24 299.2 317.9"
@@ -128,7 +128,7 @@
         },
         {
           "name": "Vijnana Suffusion Duration",
-          "value": "12" 
+          "value": "12"
         },
         {
           "name": "CD",
@@ -159,7 +159,7 @@
         }
       ],
       "type": "ELEMENTAL_BURST",
-      "attribute-scaling" : [
+      "attribute-scaling": [
         {
           "name": "Tanglevine Shaft DMG (%)",
           "value": "55.62 59.79 63.96 69.53 73.7 77.87 83.43 88.99 94.55 100.12 105.68 111.24 118.19"

assets/data/weapons/akuoumaru/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Watatsumi Wavewalker",
   "passiveDesc": "For every point of the entire party's combined maximum Energy capacity, the Elemental Burst DMG of the character equipping this weapon is increased by 0.12/0.15/0.18/0.21/0.24%. A maximum of 40/50/60/70/80% increased Elemental Burst DMG can be achieved this way.",
   "location": "Gacha",
-  "ascensionMaterial": "distantant-sea"
+  "ascensionMaterial": "distant-sea"
 }

assets/data/weapons/amenoma-kageuchi/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Iwakura Succession",
   "passiveDesc": "After casting an Elemental Skill, gain 1 Succession Seed. This effect can be triggered once every 5s. The Succession Seed lasts for 30s. Up to 3 Succession Seeds may exist simultaneously. After using an Elemental Burst, all Succession Seeds are consumed and after 2s, the character regenerates 6/7.5/9/10.5/12 Energy for each seed consumed.",
   "location": "Crafting",
-  "ascensionMaterial": "distantant-sea"
+  "ascensionMaterial": "distant-sea"
 }

assets/data/weapons/aqua-simulacra/en.json

@@ -7,5 +7,5 @@
   "passiveName": "The Cleansing Form",
   "passiveDesc": "HP is increased by 16%. When there are opponents nearby, the DMG dealt by the wielder of this weapon is increased by 20%. This will take effect whether the character is on-field or not.",
   "location": "Gacha",
-  "ascensionMaterial": "Luminous Sands from Guyun"
+  "ascensionMaterial": "guyun"
 }

assets/data/weapons/ballad-of-the-fjords/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Tales of the Tundra",
   "passiveDesc": "When there are at least 3 different Elemental Types in your party, Elemental Mastery will be increased by 120.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Goblet Of The Pristine Sea"
+  "ascensionMaterial": "pristine-sea"
 }

assets/data/weapons/beacon-of-the-reed-sea/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Desert Watch",
   "passiveDesc": "After the character's Elemental Skill hits an opponent, their ATK will be increased by 20% for 8s. After the character takes DMG, their ATK will be increased by 20% for 8s. The 2 aforementioned effects can be triggered even when the character is not on the field. Additionally, when not protected by a shield, the character's Max HP will be increased by 32%.",
   "location": "Gacha",
-  "ascensionMaterial": "Echo of Scorching Might"
+  "ascensionMaterial": "scorching"
 }

assets/data/weapons/everlasting-moonglow/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Byakuya Kougetsu",
   "passiveDesc": "Healing Bonus increased by 10/12.5/15/17.5/20%, Normal Attack DMG is increased by 1/1.5/2/2.5/3% of the Max HP of the character equipping this weapon. For 12s after using an Elemental Burst, Normal Attacks that hit opponents will restore 0.6 Energy. Energy can be restored this way once every 0.1s.",
   "location": "Gacha",
-  "ascensionMaterial": "distantant-sea"
-}
+  "ascensionMaterial": "distant-sea"
+}

assets/data/weapons/finale-of-the-deep/en.json

@@ -7,5 +7,5 @@
   "passiveName": "An End Sublime",
   "passiveDesc": "When using an Elemental Skill, ATK will be increased by 12% for 15s, and a Bond of Life worth 25% of Max HP will be granted. This effect can be triggered once every 10s. When the Bond of Life is cleared, a maximum of 150 ATK will be gained based on 2.4% of the Bond when cleared for 15s. Bond of Life: Absorbs healing for the character based on its base value, and clears after healing equal to this value is obtained.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Dross Of Pure Sacred Dewdrop"
+  "ascensionMaterial": "pure-sacred-dewdrop"
 }

assets/data/weapons/fleuve-cendre-ferryman/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Ironbone",
   "passiveDesc": "Increases Elemental Skill CRIT Rate by 8%. Additionally, increases Energy Recharge by 16% for 5s after using an Elemental Skill.s",
   "location": "Fontaine Fishing Association",
-  "ascensionMaterial": "Fragment Of An Ancient Chord"
+  "ascensionMaterial": "ancient-chord"
 }

assets/data/weapons/flowing-purity/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Unfinished Masterpiece",
   "passiveDesc": "When using an Elemental Skill, All Elemental DMG Bonus will be increased by 8% for 15s, and a Bond of Life worth 24% of Max HP will be granted. This effect can be triggered once every 10s. When the Bond of Life is cleared, every 1,000 HP cleared in the process will provide 2% All Elemental DMG Bonus. Up to a maximum of 12% All Elemental DMG can be gained this way. This effect lasts 15s. Bond of Life: Absorbs healing for the character based on its base value, and clears after healing equal to this value is obtained.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Dross Of Pure Sacred Dewdrop"
+  "ascensionMaterial": "pure-sacred-dewdrop"
 }

assets/data/weapons/freedom-sworn/en.json

@@ -2,7 +2,7 @@
   "name": "Freedom-Sworn",
   "type": "Sword",
   "rarity": 5,
-  "BaseAttack": 46,
+  "baseAttack": 46,
   "subStat": "Elemental Mastery",
   "passiveName": "Revolutionary Chorale",
   "passiveDesc": "A part of the \"Millennial Movement\" that wanders amidst the winds. Increases DMG by 10%/12.5%/15%/17.5%/20%. When the character wielding this weapon triggers Elemental Reactions, they gain a Sigil of Rebellion. This effect can be triggered once every 0.5s and can be triggered even if said character is not on the field.When you possess 2 Sigils of Rebellion, all of them will be consumed and all nearby party members will obtain \"Millennial Movement: Song of Resistance\" for 12s. \"Millennial Movement: Song of Resistance\" increases Normal, Charged, and Plunging Attack DMG by 16%/20%/24%/28%/32% and increases ATK by 20%/25%/30%/35%/40%. Once this effect is triggered, you will not gain Sigils of Rebellion for 20s.Of the many effects of the \"Millennial Movement,\" buffs of the same type will not stack.",

assets/data/weapons/hakushin-ring/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Sakura Saiguu",
   "passiveDesc": "After the character equipped with this weapon triggers an Electro elemental reaction, nearby party members of an Elemental Type involved in the elemental reaction receive a 10/12.5/15/17.5/20% Elemental DMG Bonus for their element, lasting 6s. Elemental Bonuses gained in this way cannot be stacked.",
   "location": "Crafting",
-  "ascensionMaterial": "distantant-sea"
+  "ascensionMaterial": "distant-sea"
 }

assets/data/weapons/hunter-s-path/en.json

@@ -7,5 +7,5 @@
   "passiveName": "At the End of the Beast-Paths",
   "passiveDesc": "Gain 12% All Elemental DMG Bonus. Obtain the Tireless Hunt effect after hitting an opponent with a Charged Attack. This effect increases Charged Attack DMG by 160% of Elemental Mastery. This effect will be removed after 12 Charged Attacks or 10s. Only 1 instance of Tireless Hunt can be gained every 12s.",
   "location": "Gacha Banner",
-  "ascensionMaterial": "Echo of Scorching Might"
-}
+  "ascensionMaterial": "scorching"
+}

assets/data/weapons/light-of-foliar-incision/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Whitemoon Bristle",
   "passiveDesc": "CRIT Rate is increased by 4%. After Normal Attacks deal Elemental DMG, the Foliar Incision effect will be obtained, increasing DMG dealt by Normal Attacks and Elemental Skills by 120% of Elemental Mastery.",
   "location": "Gacha",
-  "ascensionMaterial": "Copper Talisman of the Forest Dew"
+  "ascensionMaterial": "talisman"
 }

assets/data/weapons/mailed-flower/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Whispers of Wind and Flower",
   "passiveDesc": "Within 8s after the character's Elemental Skill hits an opponent or the character triggers an Elemental Reaction, their ATK and Elemental Mastery will be increased by 12% and 48 respectively.",
   "location": "Windblume's Breath Event",
-  "ascensionMaterial": "Fetters of the Dandelion Gladiator"
+  "ascensionMaterial": "dandelion"
 }

assets/data/weapons/mistsplitter-reforged/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Mistsplitter's Edge",
   "passiveDesc": "Gain a 12% Elemental DMG Bonus for every element and receive the might of Mistsplitter's Emblem. At stack levels 1/2/3, Mistsplitter's Emblem provides a 8/16/28% Elemental DMG Bonus for the character's Elemental Type. The character will obtain 1 stack of Mistsplitter's Emblem in each of the following scenarios: Normal Attack deals Elemental DMG (stack lasts 5s), casting Elemental Burst (stack lasts 10s); Energy is less than 100% (stack disappears when Energy is full). Each stack's duration is calculated independently.",
   "location": "Gacha",
-  "ascensionMaterial": "distantant-sea"
+  "ascensionMaterial": "distant-sea"
 }

assets/data/weapons/oathsworn-eye/en.json

@@ -7,5 +7,5 @@
   "passiveName": "People of the Faltering Light",
   "passiveDesc": "Increases Energy Recharge by 24/30/36/42/48% for 10s after using an Elemental Skill.",
   "location": "Three Realms Gateway Offering Event",
-  "ascensionMaterial": "distantant-sea"
+  "ascensionMaterial": "distant-sea"
 }

assets/data/weapons/primordial-jade-cutter/en.json

@@ -2,7 +2,7 @@
   "name": "Primordial Jade Cutter",
   "type": "Sword",
   "rarity": 5,
-  "BaseAttack": 44,
+  "baseAttack": 44,
   "subStat": "CRIT Rate",
   "passiveName": "Protector's Virtue",
   "passiveDesc": "HP increased by 20%/25%/30%/35%/40%. Additionally, provides an ATK Bonus based on 1.2%/1.5%/1.8%/2.1%/2.4% of the wielder's Max HP.",

assets/data/weapons/prototype-starglitter/en.json

@@ -1,12 +1,11 @@
 {
-    "name": "Prototype Starglitter",
-    "type": "polearm",
-    "rarity": 4,
-    "baseAttack": 42,
-    "subStat": "Energy Recharge",
-    "passiveName": "Magic Affinity",
-    "passiveDesc": "After using an Elemental Skill, increases Normal and Charged Attack DMG by 8% for 12s. Max 2 stacks.",
-    "location": "forging",
-    "ascensionMaterial": "aerosiderite"
-  }
-
+  "name": "Prototype Starglitter",
+  "type": "Polearm",
+  "rarity": 4,
+  "baseAttack": 42,
+  "subStat": "Energy Recharge",
+  "passiveName": "Magic Affinity",
+  "passiveDesc": "After using an Elemental Skill, increases Normal and Charged Attack DMG by 8% for 12s. Max 2 stacks.",
+  "location": "forging",
+  "ascensionMaterial": "aerosiderite"
+}

assets/data/weapons/rightful-reward/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Tip of the Spear",
   "passiveDesc": "When the wielder is healed, restore 8 Energy. This effect can be triggered once every 10s, and can occur even when the character is not on the field.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Broken Goblet Of The Pristine Sea"
+  "ascensionMaterial": "pristine-sea"
 }

assets/data/weapons/royal-spear/en.json

@@ -6,5 +6,6 @@
   "subStat": "ATK",
   "passiveName": "Focus",
   "passiveDesc": "Upon damaging an opponent, increases CRIT Rate by 8%. Max 5 stacks. A CRIT Hit removes all stacks.",
-  "location": "Starglitter Exchange"
+  "location": "Starglitter Exchange",
+  "ascensionMaterial": "elixir"
 }

assets/data/weapons/sacrificial-jade/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Jade Circulation",
   "passiveDesc": "When not on the field for more than 5s, Max HP will be increased by 32% and Elemental Mastery will be increased by 40. These effects will be canceled after the wielder has been on the field for 10s.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Luminous Sands From Guyun "
+  "ascensionMaterial": "guyun"
 }

assets/data/weapons/scion-of-the-blazing-sun/en.json

@@ -7,5 +7,5 @@
   "passiveName": "The Way of Sunfire",
   "passiveDesc": "After a Charged Attack hits an opponent, a Sunfire Arrow will descend upon the opponent hit, dealing 60% ATK as DMG, and applying the Heartsearer effect to the opponent damaged by said Arrow for 10s. Opponents affected by Heartsearer take 28% more Charged Attack DMG from the wielder. A Sunfire Arrow can be triggered once every 10s.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Echo Of Scorching Might"
+  "ascensionMaterial": "scorching"
 }

assets/data/weapons/song-of-stillness/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Benthic Pulse",
   "passiveDesc": "After the wielder is healed, they will deal 16% more DMG for 8s. This can be triggered even when the character is not on the field.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Fragment Of An Ancient Chord "
+  "ascensionMaterial": "ancient-chord"
 }

assets/data/weapons/sword-of-descension/en.json

@@ -2,7 +2,7 @@
   "name": "Sword of Descension",
   "type": "Sword",
   "rarity": 4,
-  "BaseAttack": 39,
+  "baseAttack": 39,
   "subStat": "ATK",
   "passiveName": "Descension",
   "passiveDesc": "Hitting enemies with Normal or Charged Attacks grants a 50% chance to deal 200% ATK as DMG in a small AoE. This effect can only occur once every 10s. Additionally, if the Traveler equips the Sword of Descension, their ATK is increased by 66.",

assets/data/weapons/talking-stick/en.json

@@ -7,5 +7,5 @@
   "passiveName": "The Silver Tongue",
   "passiveDesc": "ATK will be increased by 16% for 15s after being affected by Pyro. This effect can be triggered once every 12s. All Elemental DMG Bonus will be increased by 12% for 15s after being affected by Hydro, Cryo, Electro, or Dendro. This effect can be triggered once every 12s.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Oasis Garden’s Reminiscence "
+  "ascensionMaterial": "oasis"
 }

assets/data/weapons/the-first-great-magic/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Parsifal the Great",
   "passiveDesc": "DMG dealt by Charged Attacks increased by 16%. For every party member with the same Elemental Type as the wielder (including the wielder themselves), gain 1 Gimmick stack. For every party member with a different Elemental Type from the wielder, gain 1 Theatrics stack. When the wielder has 1/2/3 or more Gimmick stacks, ATK will be increased by 16%/32%/48%. When the wielder has 1/2/3 or more Theatrics stacks, Movement SPD will be increased by 4%/7%/10%.",
   "location": "Gacha",
-  "ascensionMaterial": "Fragment Of An Ancient Chord"
+  "ascensionMaterial": "ancient-chord"
 }

assets/data/weapons/the-unforged/en.json

@@ -6,5 +6,6 @@
   "subStat": "ATK",
   "passiveName": "Golden Majesty",
   "passiveDesc": "Increases Shield Strength by 20/25/30/35/40%, scoring hits on opponents increases ATK by 4/5/6/7/8% for 8s. Max 5 stacks. Can only occur once every 0.3s. While protected by a shield this ATK increase effect is increased by 100%",
-  "location": "Gacha"
+  "location": "Gacha",
+  "ascensionMaterial": "elixir"
 }

assets/data/weapons/tidal-shadow/en.json

@@ -7,5 +7,5 @@
   "passiveName": "White Cruising Wave",
   "passiveDesc": "After the wielder is healed, ATK will be increased by 24% for 8s. This can be triggered even when the character is not on the field.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Broken Goblet Of The Pristine Sea"
+  "ascensionMaterial": "pristine-sea"
 }

assets/data/weapons/tulaytullah-s-remembrance/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Bygone Azure Teardrop",
   "passiveDesc": "Normal Attack SPD is increased by 10%. After the wielder unleashes an Elemental Skill, Normal Attack DMG will increase by 4.8% every second for 14s. After this character hits an opponent with a Normal Attack during this duration, Normal Attack DMG will be increased by 9.6%. This increase can be triggered once every 0.3s.",
   "location": "Gacha",
-  "ascensionMaterial": "Echo of Scorching Might"
+  "ascensionMaterial": "scorching"
 }

assets/data/weapons/uraku-misugiri/en.json

@@ -7,5 +7,5 @@
 	"passiveName": "Brocade Bloom, Shrine Sword",
 	"passiveDesc": "Normal Attack DMG is increased by 16/20/24/28/32% and Elemental Skill DMG is increased by 24/30/36/42/48%. After a nearby active character deals Geo DMG, the aforementioned effects increase by 100% for 15s. Additionally, the wielder's DEF is increased by 20/25/30/35/40%.",
 	"location": "Gacha",
-	"ascensionMaterial": "distantant-sea"
+	"ascensionMaterial": "distant-sea"
 }

assets/data/weapons/wolf-fang/en.json

@@ -7,5 +7,5 @@
   "passiveName": "Northwind Wolf",
   "passiveDesc": "DMG dealt by Elemental Skill and Elemental Burst is increased by 16%. When an Elemental Skill hits an opponent, its CRIT Rate will be increased by 2%. When an Elemental Burst hits an opponent, its CRIT Rate will be increased by 2%. Both of these effects last 10s separately, have 4 max stacks, and can be triggered once every 0.1s.",
   "location": "BP Bounty",
-  "ascensionMaterial": "Fragment Of An Ancient Chord"
+  "ascensionMaterial": "ancient-chord"
 }