Sync decks of spawned actors

benfrankel · Jul 27, 2024 · a185ac1 · a185ac1
1 parent 96a5f05
commit a185ac1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/game/actor.rs b/src/game/actor.rs
@@ -28,6 +28,7 @@ use crate::game::actor::level::Level;
 use crate::game::actor::movement::Movement;
 use crate::game::actor::movement::MovementController;
 use crate::game::actor::movement::OldMovementController;
+use crate::game::audio::music::Beat;
 use crate::game::card::deck::Deck;
 use crate::game::combat::death::DespawnOnDeath;
 use crate::game::combat::hit::Hurtbox;
@@ -106,7 +107,9 @@ pub struct Actor {
 }
 
 impl EntityCommand for Actor {
-    fn apply(self, id: Entity, world: &mut World) {
+    fn apply(mut self, id: Entity, world: &mut World) {
+        self.deck.active += world.resource::<Beat>().total as isize - 1;
+
         world
             .entity_mut(id)
             .insert((

diff --git a/src/game/card/deck.rs b/src/game/card/deck.rs
@@ -12,7 +12,7 @@ pub(super) fn plugin(app: &mut App) {
     app.configure::<(Deck, IsDeckDisplay)>();
 }
 
-#[derive(Component, Reflect, Serialize, Deserialize, Clone)]
+#[derive(Component, Reflect, Serialize, Deserialize, Clone, Default)]
 #[reflect(Component)]
 #[serde(default)]
 pub struct Deck {
@@ -34,15 +34,6 @@ impl Configure for Deck {
     }
 }
 
-impl Default for Deck {
-    fn default() -> Self {
-        Self {
-            card_keys: Vec::new(),
-            active: -1,
-        }
-    }
-}
-
 impl Deck {
     pub fn new(card_keys: impl Into<Vec<String>>) -> Self {
         Self {