Adds assist and assurance, fixes

gen_7_scripts/src/moves/acrobatics.rs

@@ -1,20 +1,16 @@
+use crate::script;
+use core::any::Any;
 use pkmn_lib_interface::app_interface::{ExecutingMove, Pokemon};
 use pkmn_lib_interface::handling::{Script, ScriptCapabilities};
 
-pub struct Acrobatics {}
-
-impl Acrobatics {
-    pub const fn get_const_name() -> &'static str {
-        "acrobatics"
-    }
-}
+script!(Acrobatics, "acrobatics");
 
 impl Script for Acrobatics {
     fn new() -> Self {
         Self {}
     }
 
-    fn get_name() -> &'static str {
+    fn get_name(&self) -> &'static str {
         Self::get_const_name()
     }
 
@@ -37,4 +33,8 @@ impl Script for Acrobatics {
             }
         }
     }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
 }

gen_7_scripts/src/moves/acupressure.rs

@@ -1,3 +1,4 @@
+use core::any::Any;
 use core::mem::transmute;
 use pkmn_lib_interface::app_interface::{ExecutingMove, Pokemon, Statistic};
 use pkmn_lib_interface::handling::{Script, ScriptCapabilities};
@@ -15,7 +16,7 @@ impl Script for Acupressure {
         Self {}
     }
 
-    fn get_name() -> &'static str {
+    fn get_name(&self) -> &'static str {
         Self::get_const_name()
     }
 
@@ -32,4 +33,8 @@ impl Script for Acupressure {
             unsafe { transmute(target.battle().unwrap().random().get_between(1, 6) as u8) };
         target.change_stat_boost(rand_stat, 2, false);
     }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
 }

gen_7_scripts/src/moves/after_you.rs

@@ -1,3 +1,4 @@
+use core::any::Any;
 use pkmn_lib_interface::app_interface::{ExecutingMove, Pokemon};
 use pkmn_lib_interface::handling::{Script, ScriptCapabilities};
 
@@ -14,7 +15,7 @@ impl Script for AfterYou {
         Self {}
     }
 
-    fn get_name() -> &'static str {
+    fn get_name(&self) -> &'static str {
         Self::get_const_name()
     }
 
@@ -32,4 +33,8 @@ impl Script for AfterYou {
             mv.get_hit_data(&target, hit).fail()
         }
     }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
 }

gen_7_scripts/src/moves/assist.rs

@@ -0,0 +1,66 @@
+use crate::script;
+use alloc::vec::Vec;
+use core::any::Any;
+use pkmn_lib_interface::app_interface::{MoveData, Party, Pokemon, StringKey, TurnChoice};
+use pkmn_lib_interface::handling::{Script, ScriptCapabilities};
+
+script!(Assist, "assist");
+
+impl Assist {
+    fn get_party_moves(party: &Party, user: &Pokemon) -> Vec<MoveData> {
+        let mut possible_moves = Vec::new();
+        // Iterate over every mon in the party
+        for mon_index in 0..party.length() {
+            let mon = party.get_pokemon(mon_index);
+            if let Some(mon) = mon {
+                // Ignore moves from the user
+                if mon == *user {
+                    continue;
+                }
+                // Iterate over all moves. We make the assumption of 4 moves.
+                for move_index in 0..4 {
+                    let mv = mon.get_learned_move(move_index);
+                    if let Some(mv) = mv {
+                        // Make sure we can copy the move, otherwise add it as possible move.
+                        if crate::utils::copyable_moves::can_copy_move(&mv.move_data()) {
+                            possible_moves.push(mv.move_data())
+                        }
+                    }
+                }
+            }
+        }
+        possible_moves
+    }
+}
+
+impl Script for Assist {
+    fn new() -> Self {
+        Self {}
+    }
+
+    fn get_name(&self) -> &'static str {
+        Self::get_const_name()
+    }
+
+    fn get_capabilities(&self) -> &[ScriptCapabilities] {
+        &[ScriptCapabilities::ChangeMove]
+    }
+
+    fn change_move(&self, choice: TurnChoice, move_name: &mut StringKey) {
+        let user = choice.user();
+        let battle = user.battle().unwrap();
+        let party = battle.find_party_for_pokemon(&user).unwrap().party();
+        let possible_moves = Self::get_party_moves(&party, &user);
+
+        if possible_moves.len() == 0 {
+            choice.fail();
+            return;
+        }
+        let random = battle.random().get_max(possible_moves.len() as i32);
+        *move_name = possible_moves[random as usize].name();
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+}

gen_7_scripts/src/moves/assurance.rs

@@ -0,0 +1,109 @@
+use crate::script;
+use alloc::boxed::Box;
+use core::any::Any;
+use core::sync::atomic::{AtomicBool, Ordering};
+use pkmn_lib_interface::app_interface::{
+    BattleSide, DamageSource, ExecutingMove, Pokemon, TurnChoice,
+};
+use pkmn_lib_interface::handling::{Script, ScriptCapabilities};
+
+script!(Assurance, "assurance");
+
+impl Script for Assurance {
+    fn new() -> Self {
+        Self {}
+    }
+
+    fn get_name(&self) -> &'static str {
+        Self::get_const_name()
+    }
+
+    fn get_capabilities(&self) -> &[ScriptCapabilities] {
+        &[
+            ScriptCapabilities::OnBeforeTurn,
+            ScriptCapabilities::ChangeBasePower,
+        ]
+    }
+
+    fn on_before_turn(&self, choice: TurnChoice) {
+        if let TurnChoice::Move(data) = &choice {
+            let side: BattleSide = choice
+                .user()
+                .battle()
+                .unwrap()
+                .sides()
+                .get(data.target_side() as u32)
+                .unwrap();
+            side.add_volatile(Box::new(AssuranceData {
+                for_position: data.target_index(),
+                has_hit: AtomicBool::new(false),
+            }));
+        }
+    }
+
+    fn change_base_power(
+        &self,
+        _move: ExecutingMove,
+        target: Pokemon,
+        _hit: u8,
+        base_power: &mut u8,
+    ) {
+        if let Some(s) = target
+            .battle_side()
+            .get_volatile::<AssuranceData>(AssuranceData::get_const_name())
+        {
+            if s.has_hit.load(Ordering::Relaxed) {
+                *base_power *= 2;
+            }
+        }
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+}
+
+script!(
+    AssuranceData,
+    "assurance_data",
+    for_position: u8,
+    has_hit: AtomicBool
+);
+
+impl Script for AssuranceData {
+    fn new() -> Self {
+        Self {
+            for_position: 0,
+            has_hit: AtomicBool::new(false),
+        }
+    }
+
+    fn get_name(&self) -> &'static str {
+        Self::get_const_name()
+    }
+
+    fn get_capabilities(&self) -> &[ScriptCapabilities] {
+        &[ScriptCapabilities::OnEndTurn, ScriptCapabilities::OnDamage]
+    }
+
+    fn on_end_turn(&self) {
+        let side: BattleSide = self.get_owner().unwrap();
+        side.remove_volatile(self);
+    }
+
+    fn on_damage(
+        &self,
+        pokemon: Pokemon,
+        _source: DamageSource,
+        _old_health: u32,
+        _new_health: u32,
+    ) {
+        if pokemon.battle_side_index() == self.for_position {
+            self.has_hit.store(true, Ordering::Relaxed);
+        }
+    }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
+}

gen_7_scripts/src/moves/mod.rs

@@ -2,3 +2,5 @@ pub mod acrobatics;
 pub mod acupressure;
 pub mod after_you;
 pub mod multi_hit_move;
+pub mod assist;
+pub mod assurance;

gen_7_scripts/src/moves/multi_hit_move.rs

@@ -1,3 +1,4 @@
+use core::any::Any;
 use pkmn_lib_interface::app_interface::TurnChoice;
 use pkmn_lib_interface::handling::{Script, ScriptCapabilities};
 
@@ -14,7 +15,7 @@ impl Script for MultiHitMove {
         Self {}
     }
 
-    fn get_name() -> &'static str {
+    fn get_name(&self) -> &'static str {
         Self::get_const_name()
     }
 
@@ -34,4 +35,8 @@ impl Script for MultiHitMove {
             _ => *number_of_hits,
         }
     }
+
+    fn as_any(&self) -> &dyn Any {
+        self
+    }
 }