card placing 2/2

src/card/drag.rs

@@ -2,7 +2,7 @@ use bevy::prelude::*;
 
 use crate::{
     animation::transform::AnimatedTransform,
-    card::{CardInHand, Hand, InsertCard},
+    card::{Card, CardInHand, Hand, InsertCard},
 };
 
 #[derive(EntityEvent)]
@@ -11,9 +11,6 @@ pub struct CardDropped(pub Entity);
 #[derive(Component)]
 pub struct DraggableCard;
 
-#[derive(Component)]
-pub struct DraggedCard;
-
 #[derive(Resource)]
 pub struct MousePosition(pub Vec3);
 
@@ -38,20 +35,13 @@ pub fn card_drag_start(
     event: On<Pointer<DragStart>>,
     mut commands: Commands,
     card_query: Query<(), With<DraggableCard>>,
-    dragged_option: Option<Single<&DraggedCard>>,
     mut hand: Single<&mut Hand>,
 ) {
-    if dragged_option.is_some() {
-        return;
-    }
     if let Err(_) = card_query.get(event.entity) {
         return;
     }
 
-    commands
+    commands.entity(event.entity).remove::<CardInHand>();
-        .entity(event.entity)
-        .insert(DraggedCard)
-        .remove::<CardInHand>();
 
     if let Some(pos) = hand.0.iter().position(|ent| *ent == event.entity) {
         hand.0.remove(pos);
@@ -59,22 +49,21 @@ pub fn card_drag_start(
 }
 
 pub fn card_drag(
-    _: On<Pointer<Drag>>,
+    event: On<Pointer<Drag>>,
-    mut card_transform: Single<&mut AnimatedTransform, With<DraggedCard>>,
+    mut card_transform: Query<&mut AnimatedTransform, With<Card>>,
     mouse_pos: Res<MousePosition>,
 ) {
-    card_transform.translation = mouse_pos.0;
+    if let Ok(mut card) = card_transform.get_mut(event.entity) {
+        card.translation = mouse_pos.0;
+    }
 }
 
 pub fn card_drag_end(
-    _: On<Pointer<DragEnd>>,
+    event: On<Pointer<DragEnd>>,
     mut commands: Commands,
-    dragged: Single<Entity, With<DraggedCard>>,
+    cards: Query<(), With<Card>>,
 ) {
-    commands.trigger(InsertCard(dragged.entity()));
+    if let Ok(_) = cards.get(event.entity) {
-    commands.trigger(CardDropped(dragged.entity()));
+        commands.trigger(CardDropped(event.entity));
-    commands
+    }
-        .entity(dragged.entity())
-        .remove::<DraggedCard>()
-        .insert(CardInHand);
 }

src/card/playing.rs

@@ -2,7 +2,10 @@ use bevy::prelude::*;
 
 use crate::{
     animation::transform::AnimatedTransform,
-    card::drag::{CardDropped, MousePosition},
+    card::{
+        CardInHand, InsertCard,
+        drag::{CardDropped, MousePosition},
+    },
     grid::Grid,
     unit::UnitTextures,
 };
@@ -24,5 +27,7 @@ pub fn card_playing_system(
         commands.entity(event.0).despawn();
     } else {
         commands.entity(fosma).despawn();
+        commands.entity(event.0).insert(CardInHand);
+        commands.trigger(InsertCard(event.0));
     }
 }

src/grid.rs

@@ -24,10 +24,10 @@ impl Grid {
         let mut elements: Vec<Option<Entity>> = Vec::new();
         elements.resize(cells * cells, None);
         Grid {
-            bounds: Rect {
+            bounds: Rect::from_corners(
-                min: start,
+                start,
-                max: start + Vec2::new(side * (cells as f32), side * (cells as f32)),
+                start + Vec2::new(side * (cells as f32), -side * (cells as f32)),
-            },
+            ),
             columns: cells,
             rows: cells,
             elements: elements,
@@ -57,10 +57,6 @@ impl Grid {
         }
     }
 
-    pub fn is_free(&self, position: Vec2) -> bool {
-        self.is_occupied(position) == false
-    }
-
     pub fn try_set(&mut self, position: Vec2, entity: Entity) -> bool {
         if self.is_occupied(position) {
             return false;