Merge pull request #2452 from planetarium/feature/world-8-shatter-str…

…ike-test-data test data for shatter strike
planetarium · Mar 12, 2024 · 5d00f8d · 5d00f8d
2 parents 9c6eb18 + e5af4d8
commit 5d00f8d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/Lib9c.DevExtensions/Data/TestbedCreateAvatar.json b/Lib9c.DevExtensions/Data/TestbedCreateAvatar.json
@@ -356,7 +356,16 @@
             "ID": 10354001,
             "Level": 17,
             "OptionIds": [
-                1055100124,
+                1015200124,
+                1055400033,
+                1065000612
+            ]
+        },
+        {
+            "ID": 10354001,
+            "Level": 17,
+            "OptionIds": [
+                1055400125,
                 1055400033,
                 1065000612
             ]

diff --git a/Lib9c/Action/CombinationEquipment5.cs b/Lib9c/Action/CombinationEquipment5.cs
@@ -29,7 +29,13 @@ public static Skill GetSkill(EquipmentItemOptionSheet.Row row, SkillSheet skillS
                 var skillRow = skillSheet.OrderedList.First(r => r.Id == row.SkillId);
                 var dmg = random.Next(row.SkillDamageMin, row.SkillDamageMax + 1);
                 var chance = random.Next(row.SkillChanceMin, row.SkillChanceMax + 1);
-                var skill = SkillFactory.GetV1(skillRow, dmg, chance);
+
+                var hasStatDamageRatio = row.StatDamageRatioMin != default && row.StatDamageRatioMax != default;
+                var statDamageRatio = hasStatDamageRatio ?
+                    random.Next(row.StatDamageRatioMin, row.StatDamageRatioMax + 1) : default;
+                var refStatType = hasStatDamageRatio ? row.ReferencedStatType : StatType.NONE;
+
+                var skill = SkillFactory.Get(skillRow, dmg, chance, statDamageRatio, refStatType);
                 return skill;
             }
             catch (InvalidOperationException)

diff --git a/Lib9c/TableCSV/Item/EquipmentItemOptionSheet.csv b/Lib9c/TableCSV/Item/EquipmentItemOptionSheet.csv
@@ -2069,4 +2069,5 @@ id,stat_type,stat_min,stat_max,skill_id,skill_damage_min,skill_damage_max,skill_
 1055400121,DEF,1,1,,,,,,,,
 1055400122,HIT,1,1,,,,,,,,
 1055400123,DEF,1,1,,,,,,,,
-1055400124,,,,700010,50,80,28,28,,,
+1055400124,,,,700010,50,80,28,28,,,
+1055400125,,,,700011,0,0,28,28,2300,2300,HP