Merge pull request #303 from CortinthusYu/fix_wrio_c1

把莱欧一命和二命的加成从倍率改成了增伤
wormtql · Oct 18, 2023 · 39dca10 · 39dca10
2 parents 04b5c43 + 5a9694c
commit 39dca10
Show file tree

Hide file tree

Showing 7 changed files with 195 additions and 199 deletions.
diff --git a/mona_core/src/character/characters/cryo/wriothesley.rs b/mona_core/src/character/characters/cryo/wriothesley.rs
@@ -208,22 +208,19 @@ impl CharacterTrait for Wriothesley {
             if context.character_common_data.constellation >= 2 {
                 let talent2_stack = context.attribute.get_value(AttributeName::USER1);
                 let value = talent2_stack * 0.4;
-                ratio = ratio * (1.0 + value);
+                builder.add_extra_bonus("2命「予骄暴者以镣锁」伤害加成",value);
             }
         }
         builder.add_atk_ratio("技能倍率", ratio);
 
         if s == ChargedTalent1 {
             if context.character_common_data.has_talent1 {
-                let mul_punch_bonus = if context.character_common_data.constellation >= 1 {
+                let punch_bonus = if context.character_common_data.constellation >= 1 {
                     2.0
                 } else {
                     0.5
                 };
-                let ratio_punch_bonus = mul_punch_bonus * ratio;
-                if mul_punch_bonus >= 0.0 {
-                    builder.add_atk_ratio("「惩戒·凌跃拳」倍率加成",ratio_punch_bonus);
-                }
+                builder.add_extra_bonus("1命「予行恶者以惩惧」伤害加成",punch_bonus);
 
                 if context.character_common_data.constellation >= 6 {
                     builder.add_extra_critical_damage("6命「予无罪者以念抚」", 0.8);
@@ -232,7 +229,6 @@ impl CharacterTrait for Wriothesley {
             }
         }
 
-
         builder.damage(
             &context.attribute,
             &context.enemy,

diff --git a/src/assets/_gen_artifact.js b/src/assets/_gen_artifact.js
@@ -387,7 +387,7 @@ export default {
 
 
 
-        effect4: 213,
+        effect4: 212,
 
 
 
@@ -748,7 +748,7 @@ export default {
         maxStar: 5,
 
 
-        effect2: 232,
+        effect2: 234,
 
 
 
@@ -790,7 +790,7 @@ export default {
 
             {"default":0,"max":3,"min":0,"name":"same_count","title":384,"type":"int"},
 
-            {"default":0,"max":3,"min":0,"name":"diff_count","title":93,"type":"int"},
+            {"default":0,"max":3,"min":0,"name":"diff_count","title":94,"type":"int"},
 
             {"default":0.0,"max":1.0,"min":0.0,"name":"rate","title":751,"type":"float"},
 
@@ -1015,7 +1015,7 @@ export default {
         maxStar: 4,
 
 
-        effect2: 234,
+        effect2: 232,
 
 
 
@@ -1263,7 +1263,7 @@ export default {
 
         config4: [
 
-            {"default":0.0,"max":3.0,"min":0.0,"name":"stack","title":601,"type":"float"},
+            {"default":0.0,"max":3.0,"min":0.0,"name":"stack","title":600,"type":"float"},
 
         ],
     },
@@ -1754,7 +1754,7 @@ export default {
 
         config4: [
 
-            {"default":0.0,"max":1.0,"min":0.0,"name":"rate","title":699,"type":"float"},
+            {"default":0.0,"max":1.0,"min":0.0,"name":"rate","title":700,"type":"float"},
 
         ],
     },
@@ -2223,7 +2223,7 @@ export default {
 
             {"default":0.0,"max":1.0,"min":0.0,"name":"rate_q","title":228,"type":"float"},
 
-            {"default":0.0,"max":4.0,"min":0.0,"name":"stack","title":601,"type":"float"},
+            {"default":0.0,"max":4.0,"min":0.0,"name":"stack","title":600,"type":"float"},
 
         ],
     },
@@ -2327,7 +2327,7 @@ export default {
 
         config4: [
 
-            {"default":4.0,"max":5.0,"min":0.0,"name":"stack","title":600,"type":"float"},
+            {"default":4.0,"max":5.0,"min":0.0,"name":"stack","title":601,"type":"float"},
 
         ],
     },
@@ -2340,7 +2340,7 @@ export default {
         maxStar: 5,
 
 
-        effect2: 234,
+        effect2: 232,
 
 
 

diff --git a/src/assets/_gen_buff.js b/src/assets/_gen_buff.js
@@ -423,7 +423,7 @@ export default {
 
     "ElementalMastery": {
         name: "ElementalMastery",
-        nameLocale: 229,
+        nameLocale: 230,
 
         description: null,
 
@@ -508,7 +508,7 @@ export default {
 
     "BaseDmg": {
         name: "BaseDmg",
-        nameLocale: 463,
+        nameLocale: 462,
 
         description: 1610,
 
@@ -1628,7 +1628,7 @@ export default {
 
             {"default":1.0,"max":1.0,"min":0.0,"name":"rate_q1","title":44,"type":"float"},
 
-            {"default":1.0,"max":1.0,"min":0.0,"name":"rate_q2","title":41,"type":"float"},
+            {"default":1.0,"max":1.0,"min":0.0,"name":"rate_q2","title":40,"type":"float"},
 
             {"default":0.0,"max":1.0,"min":0.0,"name":"rate_talent2","title":20,"type":"float"},
 
@@ -1829,7 +1829,7 @@ export default {
 
             {"default":1,"max":5,"min":1,"name":"refine","title":1387,"type":"intInput"},
 
-            {"default":1.0,"max":1.0,"min":0.0,"name":"rate","title":620,"type":"float"},
+            {"default":1.0,"max":1.0,"min":0.0,"name":"rate","title":619,"type":"float"},
 
         ],
     },
@@ -1865,7 +1865,7 @@ export default {
 
             {"default":1,"max":5,"min":1,"name":"refine","title":1387,"type":"intInput"},
 
-            {"default":900.0,"name":"em","title":230,"type":"floatInput"},
+            {"default":900.0,"name":"em","title":229,"type":"floatInput"},
 
         ],
     },
@@ -1884,7 +1884,7 @@ export default {
 
             {"default":1,"max":5,"min":1,"name":"refine","title":1387,"type":"intInput"},
 
-            {"default":900.0,"name":"em","title":230,"type":"floatInput"},
+            {"default":900.0,"name":"em","title":229,"type":"floatInput"},
 
         ],
     },
@@ -1935,7 +1935,7 @@ export default {
         genre: "Resonance",
         config: [
 
-            {"default":1.0,"max":1.0,"min":0.0,"name":"rate","title":620,"type":"float"},
+            {"default":1.0,"max":1.0,"min":0.0,"name":"rate","title":619,"type":"float"},
 
         ],
     },
@@ -1952,9 +1952,9 @@ export default {
         genre: "Resonance",
         config: [
 
-            {"default":1.0,"max":1.0,"min":0.0,"name":"rate1","title":747,"type":"float"},
+            {"default":1.0,"max":1.0,"min":0.0,"name":"rate1","title":748,"type":"float"},
 
-            {"default":1.0,"max":1.0,"min":0.0,"name":"rate2","title":749,"type":"float"},
+            {"default":1.0,"max":1.0,"min":0.0,"name":"rate2","title":750,"type":"float"},
 
         ],
     },
@@ -1986,9 +1986,9 @@ export default {
         genre: "Resonance",
         config: [
 
-            {"default":1.0,"max":1.0,"min":0.0,"name":"rate1","title":747,"type":"float"},
+            {"default":1.0,"max":1.0,"min":0.0,"name":"rate1","title":748,"type":"float"},
 
-            {"default":1.0,"max":1.0,"min":0.0,"name":"rate2","title":749,"type":"float"},
+            {"default":1.0,"max":1.0,"min":0.0,"name":"rate2","title":750,"type":"float"},
 
         ],
     },
@@ -2076,15 +2076,15 @@ export default {
         name: "DeepwoodMemories4",
         nameLocale: 1133,
 
-        description: 212,
+        description: 213,
 
 
         badge: getImageA("UI_RelicIcon_15025_4"),
 
         genre: "Artifact",
         config: [
 
-            {"default":1.0,"max":1.0,"min":0.0,"name":"rate","title":620,"type":"float"},
+            {"default":1.0,"max":1.0,"min":0.0,"name":"rate","title":619,"type":"float"},
 
         ],
     },