From a09ccd015b3ce8ea1ab4350f6252298ad8160559 Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Thu, 11 May 2023 12:20:01 +0300
Subject: [PATCH] feat(client): move card type specific components

---
 client/src/plugins/game/card/mod.rs   | 6 ------
 client/src/plugins/game/supply/mod.rs | 9 ++++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/src/plugins/game/card/mod.rs b/client/src/plugins/game/card/mod.rs
index a8f1a22..fc78f20 100644
--- a/client/src/plugins/game/card/mod.rs
+++ b/client/src/plugins/game/card/mod.rs
@@ -149,12 +149,6 @@ fn on_spawn_card(
             (
                 PickableBundle::default(),
                 RapierPickTarget::default(),
-                OnPointer::<Over>::target_component_mut::<Transform>(|_over, transform| {
-                    transform.translation.y += 0.2;
-                }),
-                OnPointer::<Out>::target_component_mut::<Transform>(|_out, transform| {
-                    transform.translation.y -= 0.2;
-                }),
                 OnPointer::<Click>::target_insert(ClickedCard),
             )
         );
diff --git a/client/src/plugins/game/supply/mod.rs b/client/src/plugins/game/supply/mod.rs
index 0061cca..b7ba73a 100644
--- a/client/src/plugins/game/supply/mod.rs
+++ b/client/src/plugins/game/supply/mod.rs
@@ -7,6 +7,7 @@
  */
 
 use bevy::prelude::*;
+use bevy_mod_picking::prelude::*;
 use bevy_rapier3d::prelude::*;
 
 use crate::{plugins::GameActionCreateCallEvent, api::game::{Action, Command}, Global, game_status::PlayerState};
@@ -55,7 +56,13 @@ fn spawn_supply_piles(
                 rigid_body: RigidBody::Fixed,
                 ..Default::default()
             })
-            .insert(visual_card_kind::Supply(index));
+            .insert(visual_card_kind::Supply(index))
+            .insert(OnPointer::<Over>::target_component_mut::<Transform>(|_over, transform| {
+                transform.translation.y += 0.2;
+            }))
+            .insert(OnPointer::<Out>::target_component_mut::<Transform>(|_over, transform| {
+                transform.translation.y -= 0.2;
+            }));
     }
 
     psp_ev_w.send(PositionSupplyPilesEvent);
-- 
2.44.1