Order test result: show failed first

nmeylan · Feb 13, 2024 · 55a9579 · 55a9579
1 parent f492739
commit 55a9579
Show file tree

Hide file tree

Showing 15 changed files with 1,870 additions and 1,769 deletions.
diff --git a/doc/progress/each-bonus_progress.md b/doc/progress/each-bonus_progress.md
diff --git a/doc/progress/stats-for-each-card_progress.md b/doc/progress/stats-for-each-card_progress.md
diff --git a/doc/progress/stats-for-each-items_progress.md b/doc/progress/stats-for-each-items_progress.md
diff --git a/lib/models/src/enums/bonus.rs b/lib/models/src/enums/bonus.rs
diff --git a/lib/models/src/enums/mob.rs b/lib/models/src/enums/mob.rs
@@ -53,10 +53,10 @@ pub enum MobGroup {
     Goblin,
     #[value_string = "RC2_Kobold"]
     Kobold,
-    #[value_string = "RC2_Orc"]
-    Orc,
     #[value_string = "RC2_Golem"]
     Golem,
+    #[value_string = "RC2_Orc"]
+    Orc,
     #[value_string = "RC2_Guardian"]
     Guardian,
     #[value_string = "RC2_Ninja"]

diff --git a/server/src/server/script/bonus.rs b/server/src/server/script/bonus.rs
diff --git a/server/src/server/service/item_service.rs b/server/src/server/service/item_service.rs
@@ -134,7 +134,7 @@ impl ItemService {
                         LoadConstant(_) | LoadValue |  LoadGlobal => {}
                         CallNative { reference, .. } => {
                             let native = vm.get_from_native_pool(*reference).unwrap();
-                            if !(native.name == "bonus" || native.name == "bonus2" || native.name == "bonus3" || native.name == "bonus4" || native.name == "bonus5") {
+                            if !(native.name == "bonus" || native.name == "bonus2" || native.name == "bonus3" || native.name == "bonus4" || native.name == "bonus5" || native.name == "skill") {
                                 complex_script = true; break;
                             }
                         }

diff --git a/server/src/tests/common/fixtures/battle_fixture.rs b/server/src/tests/common/fixtures/battle_fixture.rs
diff --git a/server/src/tests/common/fixtures/data/stats-for-cards.json b/server/src/tests/common/fixtures/data/stats-for-cards.json
@@ -5824,7 +5824,7 @@
             "itemId": 4367,
             "bonuses": [
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": -100
               }
             ]
@@ -16685,7 +16685,7 @@
                 "value": -3
               },
               {
-                "bonus": "SpRegenPercentage",
+                "bonus": "NaturalSpRecoveryPercentage",
                 "value": -20
               }
             ]
@@ -17433,7 +17433,7 @@
             "itemId": 4336,
             "bonuses": [
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": 10
               },
               {
@@ -21176,7 +21176,7 @@
                 "value": 100
               },
               {
-                "bonus": "SpRegenPercentage",
+                "bonus": "NaturalSpRecoveryPercentage",
                 "value": -100
               }
             ]
@@ -30376,7 +30376,7 @@
             "itemId": 4259,
             "bonuses": [
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": 30
               },
               {
@@ -32987,7 +32987,7 @@
                 "value": 8
               },
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": -25
               }
             ]
@@ -33577,7 +33577,7 @@
                 "value": -3
               },
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": -20
               }
             ]
@@ -39762,7 +39762,7 @@
                 "value": 500
               },
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": 10
               }
             ]
@@ -46653,7 +46653,7 @@
             "itemId": 4070,
             "bonuses": [
               {
-                "bonus": "SpRegenPercentage",
+                "bonus": "NaturalSpRecoveryPercentage",
                 "value": 15
               }
             ]
@@ -48589,7 +48589,7 @@
                 "value": 15
               },
               {
-                "bonus": "SpRegenPercentage",
+                "bonus": "NaturalSpRecoveryPercentage",
                 "value": 3
               }
             ]
@@ -48737,7 +48737,7 @@
             "itemId": 4038,
             "bonuses": [
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": 20
               }
             ]
@@ -49476,11 +49476,11 @@
             "itemId": 4199,
             "bonuses": [
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": 10
               },
               {
-                "bonus": "SpRegenPercentage",
+                "bonus": "NaturalSpRecoveryPercentage",
                 "value": 10
               }
             ]
@@ -59866,7 +59866,7 @@
             "itemId": 4036,
             "bonuses": [
               {
-                "bonus": "HpRegenPercentage",
+                "bonus": "NaturalHpRecoveryPercentage",
                 "value": 10
               }
             ]

diff --git a/server/src/tests/common/fixtures/data/stats-for-each-stats.json b/server/src/tests/common/fixtures/data/stats-for-each-stats.json
@@ -648,9 +648,9 @@
     "crit": 17.2,
     "def": 0,
     "vitDEF": [
-      24,
-      25,
-      26
+      -1,
+      -2,
+      -2
     ],
     "cast": 0,
     "atkLeft": 284,
@@ -688,7 +688,7 @@
           },
           {
             "bonus": "DefPercentage",
-            "value": 2
+            "value": -50
           }
         ],
         "atk": 180,
@@ -723,10 +723,10 @@
     "maxDmg": 237,
     "avgDmg": 204,
     "dps": 282.45,
-    "averageReceivedDamage": -0.51,
-    "avgDamageReceived": 1,
-    "minDamageReceived": 1,
-    "maxDamageReceived": 1,
+    "averageReceivedDamage": -5.05,
+    "avgDamageReceived": 10,
+    "minDamageReceived": 9,
+    "maxDamageReceived": 11,
     "formData": "eyJBX0pPQiI6NywiQV9CYXNlTFYiOjk1LCJBX0pvYkxWIjo1MCwiQV9TVFIiOjUwLCJBX0FHSSI6NTAsIkFfVklUIjo1MCwiQV9JTlQiOjUwLCJBX0RFWCI6NTAsIkFfTFVLIjo1MCwiQV9BcnJvdyI6MCwiQl9FbmVteSI6MjcyLCJBX3dlYXBvbjEiOjE1LCJBX1dlYXBvblR5cGUiOjEsIkFfQWN0aXZlU2tpbGwiOjAsIkFfQWN0aXZlU2tpbGxMViI6MCwiQV9hY2NlczEiOiIzMjYiLCJBX2FjY2VzMiI6IjMyNiIsIkFfbGVmdCI6IjMwNSIsIkFfYm9keSI6IjI3OSIsIkFfaGVhZDEiOiIxNDIiLCJBX2hlYWQyIjoiMjQzIiwiQV9oZWFkMyI6IjI2OCIsIkFfc2hvZXMiOiIzMTciLCJBX3Nob3VsZGVyIjoiMzExIiwiX2lkIjoicDM4amE2In0=",
     "_id": "p38ja6",
     "matkMin": 99,
@@ -1702,9 +1702,9 @@
     "crit": 17.2,
     "def": 0,
     "vitDEF": [
-      16,
-      16,
-      17
+      -1,
+      -1,
+      -1
     ],
     "cast": 0,
     "atkLeft": 299,
@@ -1742,7 +1742,7 @@
           },
           {
             "bonus": "DefPercentage",
-            "value": 3
+            "value": -67
           }
         ],
         "atk": 200,
@@ -1777,10 +1777,10 @@
     "maxDmg": 247,
     "avgDmg": 206,
     "dps": 273.02,
-    "averageReceivedDamage": -0.72,
-    "avgDamageReceived": 1,
-    "minDamageReceived": 1,
-    "maxDamageReceived": 1,
+    "averageReceivedDamage": -7.21,
+    "avgDamageReceived": 10,
+    "minDamageReceived": 8,
+    "maxDamageReceived": 11,
     "formData": "eyJBX0pPQiI6NywiQV9CYXNlTFYiOjk1LCJBX0pvYkxWIjo1MCwiQV9TVFIiOjUwLCJBX0FHSSI6NTAsIkFfVklUIjo1MCwiQV9JTlQiOjUwLCJBX0RFWCI6NTAsIkFfTFVLIjo1MCwiQV9BcnJvdyI6MCwiQl9FbmVteSI6MjcyLCJBX3dlYXBvbjEiOjQ3LCJBX1dlYXBvblR5cGUiOjMsIkFfQWN0aXZlU2tpbGwiOjAsIkFfQWN0aXZlU2tpbGxMViI6MCwiQV9hY2NlczEiOiIzMjYiLCJBX2FjY2VzMiI6IjMyNiIsIkFfbGVmdCI6IjMwNSIsIkFfYm9keSI6IjI3OSIsIkFfaGVhZDEiOiIxNDIiLCJBX2hlYWQyIjoiMjQzIiwiQV9oZWFkMyI6IjI2OCIsIkFfc2hvZXMiOiIzMTciLCJBX3Nob3VsZGVyIjoiMzExIiwiX2lkIjoiNjhwYzM5In0=",
     "_id": "68pc39",
     "matkMin": 99,
@@ -1957,7 +1957,7 @@
             "value": 4
           },
           {
-            "bonus": "HitPercentage",
+            "bonus": "PerfectHitPercentage",
             "value": 25
           }
         ],
@@ -2054,7 +2054,7 @@
         "index": 69,
         "name": "Light Epsilon",
         "refinement": 0,
-        "itemId": 1315,
+        "itemId": 1366,
         "bonuses": [
           {
             "bonus": "ElementWeapon",
@@ -4120,7 +4120,7 @@
             "value": 10
           },
           {
-            "bonus": "SpRegenPercentage",
+            "bonus": "NaturalSpRecoveryPercentage",
             "value": 15
           }
         ],
@@ -4631,7 +4631,7 @@
         "itemId": 1224,
         "bonuses": [
           {
-            "bonus": "ChanceToInflictStatusWeaponBreakOnAttackPercentage",
+            "bonus": "BreakWeaponPercentage",
             "value": 5
           }
         ],
@@ -4731,7 +4731,7 @@
         "itemId": 1225,
         "bonuses": [
           {
-            "bonus": "ChanceToInflictStatusArmorBreakOnAttackPercentage",
+            "bonus": "BreakArmorPercentage",
             "value": 5
           }
         ],
@@ -6239,7 +6239,7 @@
             "value": 3
           },
           {
-            "bonus": "SpRegenPercentage",
+            "bonus": "NaturalSpRecoveryPercentage",
             "value": 5
           }
         ],
@@ -6573,11 +6573,11 @@
             "value": 1
           },
           {
-            "bonus": "HpRegenPercentage",
+            "bonus": "NaturalHpRecoveryPercentage",
             "value": 5
           },
           {
-            "bonus": "SpRegenPercentage",
+            "bonus": "NaturalSpRecoveryPercentage",
             "value": 3
           }
         ],