Rename unique_identifier --> personality_value, minor fixes

tests/data/Moves.json

@@ -63,7 +63,7 @@
         "mirror"
       ],
       "effect": {
-        "name": "ChangeTargetSpDef",
+        "name": "change_target_special_defense",
         "chance": 10,
         "parameters": [
           -1
@@ -83,7 +83,7 @@
         "snatch"
       ],
       "effect": {
-        "name": "ChangeTargetDef",
+        "name": "change_target_defense",
         "chance": -1,
         "parameters": [
           2
@@ -127,7 +127,7 @@
         "ballistics"
       ],
       "effect": {
-        "name": "ChangeTargetSpDef",
+        "name": "change_target_special_defense",
         "chance": -1,
         "parameters": [
           -2
@@ -150,7 +150,7 @@
         "distance"
       ],
       "effect": {
-        "name": "Acrobatics",
+        "name": "acrobatics",
         "chance": -1
       }
     },
@@ -165,7 +165,7 @@
       "category": "status",
       "flags": [],
       "effect": {
-        "name": "Acupressure",
+        "name": "acupressure",
         "chance": -1
       }
     },
@@ -200,7 +200,7 @@
         "distance"
       ],
       "effect": {
-        "name": "IncreasedCriticalStage"
+        "name": "increased_critical_stage"
       }
     },
     {
@@ -216,7 +216,7 @@
         "ignore-substitute"
       ],
       "effect": {
-        "name": "AfterYou"
+        "name": "after_you"
       }
     },
     {
@@ -232,7 +232,7 @@
         "snatch"
       ],
       "effect": {
-        "name": "ChangeTargetSpeed",
+        "name": "change_target_speed",
         "parameters": [
           2
         ]
@@ -252,7 +252,7 @@
         "mirror"
       ],
       "effect": {
-        "name": "IncreasedCriticalStage"
+        "name": "increased_critical_stage"
       }
     },
     {
@@ -270,7 +270,7 @@
         "distance"
       ],
       "effect": {
-        "name": "Flinch",
+        "name": "flinch",
         "chance": 30
       }
     },
@@ -323,7 +323,7 @@
         "snatch"
       ],
       "effect": {
-        "name": "ChangeTargetSpDef",
+        "name": "change_target_special_defense",
         "parameters": [
           2
         ]
@@ -344,7 +344,7 @@
         "mirror"
       ],
       "effect": {
-        "name": "PreventFoeRunning"
+        "name": "prevent_foes_exit"
       }
     },
     {
@@ -361,7 +361,7 @@
         "mirror"
       ],
       "effect": {
-        "name": "ChangeAllTargetStats",
+        "name": "change_all_target_stats",
         "chance": 10,
         "parameters": [
           1
@@ -396,7 +396,7 @@
         "snatch"
       ],
       "effect": {
-        "name": "HealEachEndOfTurn",
+        "name": "heal_each_end_of_turn",
         "parameters": [
           6.25
         ]
@@ -432,7 +432,7 @@
         "mirror"
       ],
       "effect": {
-        "name": "2_5HitMove"
+        "name": "2_5_hit_move"
       }
     },
     {
@@ -449,7 +449,7 @@
         "distance"
       ],
       "effect": {
-        "name": "CurePartyStatus"
+        "name": "cure_party_status"
       }
     },
     {
@@ -465,7 +465,7 @@
         "ignore-substitute"
       ],
       "effect": {
-        "name": "ChangeTargetSpDef",
+        "name": "change_target_special_defense",
         "parameters": [
           1
         ]
@@ -500,7 +500,7 @@
         "mirror"
       ],
       "effect": {
-        "name": "Assurance"
+        "name": "double_power_if_target_damaged_in_turn"
       }
     },
     {
@@ -536,7 +536,7 @@
         "mirror"
       ],
       "effect": {
-        "name": "IncreasedCriticalStage"
+        "name": "increased_critical_stage"
       }
     },
     {
@@ -556,7 +556,7 @@
         "mental"
       ],
       "effect": {
-        "name": "Attract"
+        "name": "attract"
       }
     },
     {
@@ -590,9 +590,11 @@
         "mirror"
       ],
       "effect": {
-        "name": "ChangeTargetAtt",
+        "name": "change_target_attack",
         "chance": 10,
-        "parameters": [-1]
+        "parameters": [
+          -1
+        ]
       }
     },
     {
@@ -621,7 +623,7 @@
         "snatch"
       ],
       "effect": {
-        "name": "Automize"
+        "name": "automize"
       }
     },
     {
@@ -639,7 +641,7 @@
         "mirror"
       ],
       "effect": {
-        "name": "ModifyDamageIfHitByTarget"
+        "name": "double_power_user_damaged_by_target_in_turn"
       }
     },
     {
@@ -657,8 +659,10 @@
         "mirror"
       ],
       "effect": {
-        "name": "ChangeTargetAtt",
-        "parameters": [-1]
+        "name": "change_target_attack",
+        "parameters": [
+          -1
+        ]
       }
     },
     {

tests/integration.rs

@@ -115,14 +115,18 @@ fn validate_assurance() {
     battle.sides()[1].set_pokemon(0, Some(p2.clone())).unwrap();
 
     let script = lib
-        .load_script(ScriptOwnerData::None, ScriptCategory::Move, &"assurance".into())
+        .load_script(
+            ScriptOwnerData::None,
+            ScriptCategory::Move,
+            &"double_power_if_target_damaged_in_turn".into(),
+        )
         .unwrap()
         .unwrap();
 
     let mv = p1.learned_moves().read()[0].as_ref().unwrap().clone();
     let choice = Arc::new(TurnChoice::Move(MoveChoice::new(p1.clone(), mv.clone(), 1, 0)));
     script.on_before_turn(&choice).unwrap();
-    assert!(battle.sides()[1].has_volatile_script(&"assurance_data".into()));
+    assert!(battle.sides()[1].has_volatile_script(&"double_power_if_target_damaged_in_turn_data".into()));
 
     let executing_move = Arc::new(ExecutingMove::new(
         vec![],
@@ -136,7 +140,7 @@ fn validate_assurance() {
     script.change_base_power(&executing_move, &p2, 0, &mut v).unwrap();
     assert_eq!(v, 20_u8);
 
-    let s = battle.sides()[1].get_volatile_script(&"assurance_data".into());
+    let s = battle.sides()[1].get_volatile_script(&"double_power_if_target_damaged_in_turn_data".into());
     let binding = s.as_ref().unwrap().get().unwrap().read();
     let data_script = binding.as_ref().unwrap();
 
@@ -147,5 +151,5 @@ fn validate_assurance() {
     assert_eq!(v, 40_u8);
 
     data_script.on_end_turn().unwrap();
-    assert!(!battle.sides()[1].has_volatile_script(&"assurance_data".into()));
+    assert!(!battle.sides()[1].has_volatile_script(&"double_power_if_target_damaged_in_turn_data".into()));
 }