More work on switching battle data to interior mutability, instead of exterior mutability.

src/static_data/libraries/move_library.rs

@@ -37,7 +37,6 @@ pub mod tests {
     use crate::static_data::libraries::data_library::DataLibrary;
     use crate::static_data::libraries::move_library::MoveLibrary;
     use crate::static_data::moves::move_data::{MoveCategory, MoveData, MoveTarget};
-    use crate::static_data::moves::secondary_effect::SecondaryEffect;
     use crate::StringKey;
     use hashbrown::HashSet;
 
@@ -51,7 +50,7 @@ pub mod tests {
             30,
             MoveTarget::Any,
             0,
-            SecondaryEffect::empty(),
+            None,
             HashSet::new(),
         )
     }

src/static_data/moves/move_data.rs

@@ -45,7 +45,7 @@ pub struct MoveData {
     base_usages: u8,
     target: MoveTarget,
     priority: i8,
-    secondary_effect: SecondaryEffect,
+    secondary_effect: Option<SecondaryEffect>,
     flags: HashSet<StringKey>,
 }
 
@@ -59,7 +59,7 @@ impl MoveData {
         base_usages: u8,
         target: MoveTarget,
         priority: i8,
-        secondary_effect: SecondaryEffect,
+        secondary_effect: Option<SecondaryEffect>,
         flags: HashSet<StringKey>,
     ) -> MoveData {
         MoveData {
@@ -102,14 +102,10 @@ impl MoveData {
         self.priority
     }
 
-    pub fn secondary_effect(&self) -> &SecondaryEffect {
+    pub fn secondary_effect(&self) -> &Option<SecondaryEffect> {
         &self.secondary_effect
     }
 
-    pub fn has_secondary_effect(&self) -> bool {
-        self.secondary_effect.effect_name() != &StringKey::empty()
-    }
-
     pub fn has_flag(&self, key: &StringKey) -> bool {
         self.flags.contains(key)
     }

src/static_data/moves/secondary_effect.rs

@@ -16,13 +16,6 @@ pub struct SecondaryEffect {
 }
 
 impl SecondaryEffect {
-    pub fn empty() -> SecondaryEffect {
-        SecondaryEffect {
-            chance: 0.0,
-            effect_name: StringKey::empty(),
-            parameters: vec![],
-        }
-    }
     pub fn new(chance: f32, effect_name: StringKey, parameters: Vec<EffectParameter>) -> SecondaryEffect {
         SecondaryEffect {
             chance,
@@ -49,7 +42,7 @@ mod tests {
 
     #[test]
     fn create_secondary_effect() {
-        let empty = SecondaryEffect::empty();
+        let empty = SecondaryEffect::new(0.0, "".into(), vec![]);
         assert_approx_eq!(empty.chance(), 0.0);
         assert_eq!(empty.effect_name(), &"".into());
         assert_eq!(empty.parameters().len(), 0);