move battling from pcb to si

Author: Lamby777

pets-lib/src/battle/mod.rs

@@ -340,7 +340,7 @@ impl BattleEngine {
 
             "Run" => {
                 // TODO: implement running mechanic described earlier
-                pcb().bind_mut().battling.clear();
+                si().bind_mut().battling.clear();
 
                 // TODO: don't change scenes, just remove the battle
                 // stuff since it's all overlayed on top of the world

pets-lib/src/stats/autoload.rs

@@ -14,8 +14,10 @@ use crate::common::*;
 #[class(base=Object)]
 pub struct StatsInterface {
     base: Base<Object>,
-
     pub save: SaveFile,
+
+    /// The enemies that are currently in battle with you
+    pub battling: Vec<EnemyData>,
 }
 
 #[godot_api]
@@ -65,6 +67,10 @@ impl IObject for StatsInterface {
         // randomize seed for godot
         randomize();
 
-        Self { base, save }
+        Self {
+            base,
+            save,
+            battling: vec![],
+        }
     }
 }

pets-lib/src/world/mod.rs

@@ -134,10 +134,7 @@ impl World {
         let enemy_data = EnemyData::from_registry(eid.clone());
 
         // TODO: THIS BELONGS IN STATSINTERFACE!!!!!!!! WTF
-        pcb()
-            .bind_mut()
-            .battling
-            .push(Rc::new(RefCell::new(enemy_data.clone())));
+        si().bind_mut().battling.push(enemy_data.clone());
         let world = World::singleton();
 
         let mat = PartyCB::fx_material();

pets-lib/src/world/partycb.rs

@@ -79,9 +79,6 @@ pub struct PartyCB {
     #[init(val = LimiQ::new(2000))]
     past_rotations: LimiQ<Vector2>,
 
-    /// The enemies that are currently in battle with you
-    pub battling: Vec<Rc<RefCell<EnemyData>>>,
-
     pub tpbeacon_debounce: bool,
     pub in_water: bool,
 
@@ -148,7 +145,7 @@ impl PartyCB {
     }
 
     pub fn is_in_battle(&self) -> bool {
-        !self.battling.is_empty()
+        !si().bind().battling.is_empty()
     }
 
     /// Set character positions based on past pos/rot