From 8746f035006084d3a181e71d297895b75a231a62 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Mon, 13 Jun 2022 21:25:30 +0200 Subject: [PATCH] Adds a bunch of script functions, adds parameters to the existing ones. --- src/dynamic_data/script_handling/script.rs | 256 ++++++++++++++++++--- 1 file changed, 218 insertions(+), 38 deletions(-) diff --git a/src/dynamic_data/script_handling/script.rs b/src/dynamic_data/script_handling/script.rs index 107cdb6..6ebeccb 100644 --- a/src/dynamic_data/script_handling/script.rs +++ b/src/dynamic_data/script_handling/script.rs @@ -1,8 +1,10 @@ use crate::dynamic_data::choices::TurnChoice; +use crate::dynamic_data::models::battle::Battle; use crate::dynamic_data::models::damage_source::DamageSource; use crate::dynamic_data::models::executing_move::ExecutingMove; use crate::dynamic_data::models::pokemon::Pokemon; use crate::static_data::moves::secondary_effect::EffectParameter; +use crate::static_data::{Item, Statistic}; use crate::StringKey; use parking_lot::{MappedRwLockReadGuard, RwLock, RwLockReadGuard, RwLockWriteGuard}; use std::any::Any; @@ -19,21 +21,19 @@ pub trait Script { fn add_suppression(&mut self); fn remove_suppression(&mut self); - // FIXME: add missing parameters, and make all these mut fn stack(&mut self) {} fn on_remove(&mut self) {} fn on_initialize(&mut self, _pars: &[EffectParameter]) {} fn on_before_turn(&mut self, _choice: &TurnChoice) {} fn change_speed(&mut self, _choice: &TurnChoice, _speed: &mut u32) {} fn change_priority(&mut self, _choice: &TurnChoice, _priority: &mut i8) {} - fn change_attack(&mut self, _choice: &TurnChoice, _move_name: &mut StringKey) {} + fn change_move(&mut self, _choice: &TurnChoice, _move_name: &mut StringKey) {} fn change_number_of_hits(&mut self, _choice: &TurnChoice, _number_of_hits: &mut u8) {} - fn prevent_attack(&mut self, _move: &ExecutingMove, _prevent: &mut bool) {} - fn fail_attack(&mut self, _move: &ExecutingMove, _fail: &mut bool) {} - fn stop_before_attack(&mut self, _move: &ExecutingMove, _stop: &mut bool) {} - fn on_before_attack(&mut self, _move: &ExecutingMove) {} - fn fail_incoming_attack(&mut self, _move: &ExecutingMove, _target: &Pokemon, _fail: &mut bool) { - } + fn prevent_move(&mut self, _move: &ExecutingMove, _prevent: &mut bool) {} + fn fail_move(&mut self, _move: &ExecutingMove, _fail: &mut bool) {} + fn stop_before_move(&mut self, _move: &ExecutingMove, _stop: &mut bool) {} + fn on_before_move(&mut self, _move: &ExecutingMove) {} + fn fail_incoming_move(&mut self, _move: &ExecutingMove, _target: &Pokemon, _fail: &mut bool) {} fn is_invulnerable( &mut self, _move: &ExecutingMove, @@ -41,43 +41,223 @@ pub trait Script { _invulnerable: &mut bool, ) { } - fn on_attack_miss(&self) {} - fn change_attack_type(&self) {} - fn block_critical(&self) {} - fn override_base_power(&self) {} - fn change_damage_stats_user(&self) {} - fn bypass_defensive_stat(&self) {} - fn bypass_offensive_stat(&self) {} - fn change_stat_modifier(&self) {} - fn change_damage_modifier(&self) {} - fn change_damage(&self) {} - fn change_incoming_damage(&self) {} - fn on_incoming_hit(&self) {} - fn on_opponent_faints(&self) {} - fn prevent_stat_boost_change(&self) {} - fn change_stat_boost_change(&self) {} - fn on_secondary_effect(&self) {} - fn on_after_hits(&self) {} - fn prevent_self_switch(&self) {} - fn prevent_opponent_switch(&self) {} - fn modify_effect_chance(&self) {} - fn modify_incoming_effect_change(&self) {} - fn on_fail(&self) {} - fn on_opponent_fail(&self) {} - fn prevent_self_run_away(&self) {} - fn prevent_opponent_run_away(&self) {} - fn on_end_turn(&self) {} + fn on_move_miss(&mut self, _move: &ExecutingMove, _target: &Pokemon) {} + fn change_move_type(&mut self, _move: &ExecutingMove, _target: &Pokemon, _move_type: &mut u8) {} + fn change_effectiveness( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _effectiveness: &mut f32, + ) { + } + fn block_critical( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _block_critical: &mut bool, + ) { + } + fn block_incoming_critical( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _block_critical: &mut bool, + ) { + } + fn change_critical_stage( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _stage: &mut u8, + ) { + } + fn change_critical_modifier( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _modifier: &mut f32, + ) { + } + fn change_stab_modifier( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _modifier: &mut f32, + ) { + } + + fn change_base_power( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _base_power: &mut u8, + ) { + } + fn change_damage_stats_user( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _stats_user: &mut Pokemon, + ) { + } + fn bypass_defensive_stat( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _bypass: &mut bool, + ) { + } + fn bypass_offensive_stat( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _bypass: &mut bool, + ) { + } + fn change_offensive_stat( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _amount: &mut f32, + ) { + } + fn change_defensive_stat( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _amount: &mut f32, + ) { + } + + fn change_stat_modifier( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _modifier: &mut f32, + ) { + } + fn change_damage_modifier( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _modifier: &mut f32, + ) { + } + fn change_damage( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _damage: &mut u32, + ) { + } + fn change_incoming_damage( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _damage: &mut u32, + ) { + } + fn on_incoming_hit(&mut self, _move: &ExecutingMove, _target: &Pokemon, _hit: u8) {} + fn on_opponent_faints(&mut self, _move: &ExecutingMove, _target: &Pokemon, _hit: u8) {} + fn prevent_stat_boost_change( + &mut self, + _target: &Pokemon, + _stat: Statistic, + _amount: i8, + _self_inflicted: bool, + _prevent: &mut bool, + ) { + } + fn change_stat_boost_change( + &mut self, + _target: &Pokemon, + _stat: Statistic, + _self_inflicted: bool, + _amount: *mut i8, + ) { + } + fn prevent_secondary_effect( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _prevent: &mut bool, + ) { + } + fn change_effect_chance( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _chance: &mut f32, + ) { + } + fn change_incoming_effect_change( + &mut self, + _move: &ExecutingMove, + _target: &Pokemon, + _hit: u8, + _chance: &mut f32, + ) { + } + fn on_secondary_effect(&mut self, _move: &ExecutingMove, _target: &Pokemon, _hit: u8) {} + fn on_after_hits(&mut self, _move: &ExecutingMove, _target: &Pokemon) {} + fn prevent_self_switch(&mut self, _choice: &TurnChoice, _prevent: &mut bool) {} + fn prevent_opponent_switch(&mut self, _choice: &TurnChoice, _prevent: &mut bool) {} + fn on_fail(&mut self, _target: &Pokemon) {} + fn on_opponent_fail(&mut self, _target: &Pokemon) {} + fn prevent_self_run_away(&mut self, _choice: &TurnChoice, _prevent: &mut bool) {} + fn prevent_opponent_run_away(&mut self, _choice: &TurnChoice, _prevent: &mut bool) {} + fn on_end_turn(&mut self) {} fn on_damage( - &self, + &mut self, _pokemon: &Pokemon, _source: DamageSource, _old_health: u32, _new_health: u32, ) { } - fn on_faint(&self, _pokemon: &Pokemon, _source: DamageSource) {} - fn on_switch_in(&self, _pokemon: &Pokemon) {} - fn on_after_held_item_consume(&self) {} + fn on_faint(&mut self, _pokemon: &Pokemon, _source: DamageSource) {} + fn on_switch_in(&mut self, _pokemon: &Pokemon) {} + fn on_after_held_item_consume(&mut self, _pokemon: &Pokemon, _item: &Item) {} + fn change_experience_gained( + &mut self, + _fainted_mon: &Pokemon, + _winning_mon: &Pokemon, + _amount: &mut u32, + ) { + } + fn share_experience( + &mut self, + _fainted_mon: &Pokemon, + _winning_mon: &Pokemon, + _shares: &mut bool, + ) { + } + fn block_weather(&mut self, _battle: &Battle, _blocked: &mut bool) {} + fn change_capture_rate_bonus( + &mut self, + _target: &Pokemon, + _pokeball: &Item, + _modifier: &mut u8, + ) { + } fn as_any(&self) -> &dyn Any; }