Cards no longer try to lay on top of each other

card.c

@@ -48,12 +48,33 @@ void remove_from_hand(Hand *h, Card *c) {
   bool card_found = false;
   for (int i = 0; i < h->count - 1; i++) {
     if (h->cards[i] == c) card_found = true;
-    h->cards[i] = h->cards[i + 1];
+    if (card_found) h->cards[i] = h->cards[i + 1];
   }
   h->count--;
 }
 
 void add_to_hand(Hand *h, Card *c) {
+  int order_guy[48];
+  int order_guy_count = 0;
+
+  for (int i = 0; i < 48; i++) {
+    order_guy[i] = 0;
+  }
+
+  for (int i = 0; i < h->count; i++) {
+    if (h->cards[i] == NULL) continue;
+    order_guy[h->cards[i]->order] = 1;
+    order_guy_count++;
+  }
+
+  int first_open_spot = h->count;
+  for (int i = 0; i < order_guy_count; i++) {
+    if (order_guy[i]) continue; 
+    first_open_spot = i;
+    break;
+  }
+
+  c->order = first_open_spot;
   h->cards[h->count] = c;
 
   c->move.position = &c->position;
@@ -61,12 +82,16 @@ void add_to_hand(Hand *h, Card *c) {
   c->move.origin.y = c->position.y;
   switch (h->display_type) {
   case HAND_DISPLAY_ROW:
-    c->move.destination.x = h->position.x + (h->count * (CARD_WIDTH + 10));
+    c->move.destination.x = h->position.x + (first_open_spot * (CARD_WIDTH + 10));
     c->move.destination.y = h->position.y;
     break;
   case HAND_DISPLAY_FIELD:
-    c->move.destination.x = h->position.x + ((h->count / 2) * (CARD_WIDTH + 10));
-    c->move.destination.y = h->position.y + (h->count % 2 * (CARD_HEIGHT + 10));
+    c->move.destination.x = h->position.x + ((first_open_spot / 2) * (CARD_WIDTH + 10));
+    c->move.destination.y = h->position.y + (first_open_spot % 2 * (CARD_HEIGHT + 10));
+    break;
+  case HAND_DISPLAY_DECK:
+    c->move.destination.x = h->position.x;
+    c->move.destination.y = h->position.y;
     break;
   }
   c->move.curve = CURVE_EASE_IN_OUT;

card.h

@@ -56,11 +56,13 @@ struct Card {
   bool selected;
   bool visible;
   Move move;
+  int order;
 };
 
 typedef enum HandDisplayType {
   HAND_DISPLAY_ROW,
   HAND_DISPLAY_FIELD,
+  HAND_DISPLAY_DECK,
 } HandDisplayType;
 
 struct Hand {
@@ -74,6 +76,8 @@ void draw_card(Card *c, Texture2D *cards_texture);
 bool point_within_card(Card *c, Vector2 v);
 void shuffle_hand(Hand *h);
 void deal(Hand *from, Hand *to, int count, bool up);
+void remove_from_hand(Hand *h, Card *c);
+void add_to_hand(Hand *h, Card *c);
 bool card_done_moving(Card *c);
 Rectangle next_card_position(Hand *h);
 

game.c

@@ -13,6 +13,8 @@ char teyaku_calculation[400];
 
 void initialize_game(Game *g) {
   g->deck.count = 0;
+  g->deck.position = (Vector2) { 800, 400 };
+  g->deck.display_type = HAND_DISPLAY_DECK;
   g->should_close = false;
   g->state = GAME_STATE_INITIALIZING;
   g->field_multiplier = NULL;
@@ -58,6 +60,7 @@ void initialize_game(Game *g) {
     g->cards[i].move.end_time = 0.;
     g->cards[i].move.position = &g->cards[i].position;
     g->cards[i].move.destination = (Vector2) { 800, 400 };
+    g->cards[i].order = i;
     g->deck.cards[i] = &g->cards[i];
     g->deck.count++;
   }
@@ -114,10 +117,8 @@ void handle_input(Game *g) {
   case GAME_STATE_PLAYER_CHOOSING_TARGET:
     if (IsMouseButtonPressed(0)) {
       mouse_pos = GetMousePosition();
-      bool clicked_hand_card = false;
       for (int i = 0; i < g->player_hand.count; i++) {
 	if (point_within_card(g->player_hand.cards[i], mouse_pos)) {
-	  clicked_hand_card = true;
 	  if (g->player_hand.cards[i]->selected) {
 	    g->player_hand.cards[i]->selected = false;
 	  } else {
@@ -143,11 +144,10 @@ void handle_input(Game *g) {
 	  if (valid_play(&g->field, selected_card, g->field.cards[i])) {
 	    g->current_play_from_hand = selected_card;
 	    g->current_play_target = g->field.cards[i];
-	    printf("Valid\n");
-	    break;
 	  } else {
 	    printf("Invalid\n");
 	  }
+	  break;
 	}
       }
 
@@ -155,7 +155,6 @@ void handle_input(Game *g) {
 	if (valid_play(&g->field, selected_card, NULL)) {
 	  g->current_play_from_hand = selected_card;
 	  g->current_play_target = NULL;
-	  printf("Valid\n");
 	} else {
 	  printf("Invalid\n");
 	}
@@ -209,7 +208,6 @@ void run_frame_player_choosing_from_hand(Game *g) {
       return;
     }
   }
-
 }
 
 void run_frame_player_choosing_target(Game *g) {
@@ -241,7 +239,30 @@ void run_frame_player_choosing_target(Game *g) {
       add_to_hand(&g->field, g->current_play_from_hand);
       g->current_play_from_hand = NULL;
     }
+    g->state = GAME_STATE_PLAYER_FROM_DECK;
+  }
+}
+
+void run_frame_player_from_deck(Game *g) {
+  Card *top_card = g->deck.cards[g->deck.count - 1];
+  if (top_card->visible) {
+    Card *target = valid_target(top_card, &g->field);
+    if (target) {
+      remove_from_hand(&g->field, target);
+      add_to_hand(&g->player_scored, target);
+      remove_from_hand(&g->deck, top_card);
+      add_to_hand(&g->player_scored, top_card);
+    } else {
+      remove_from_hand(&g->deck, top_card);
+      add_to_hand(&g->field, top_card);
+    }
     g->state = GAME_STATE_INITIALIZING;
+  } else {
+    remove_from_hand(&g->deck, top_card);
+    add_to_hand(&g->deck, top_card);
+    top_card->visible = true;
+    top_card->move.end_time = 0.3;
+    top_card->move.destination.x = top_card->move.destination.x + 100;
   }
 }
 
@@ -274,6 +295,9 @@ void run_frame(Game *g) {
   case GAME_STATE_PLAYER_CHOOSING_TARGET:
     run_frame_player_choosing_target(g);
     break;
+  case GAME_STATE_PLAYER_FROM_DECK:
+    run_frame_player_from_deck(g);
+    break;
   }
 }
 

game.h

@@ -16,6 +16,7 @@ typedef enum GameState {
   GAME_STATE_CALCULATING_TEYAKU,
   GAME_STATE_PLAYER_CHOOSING_FROM_HAND,
   GAME_STATE_PLAYER_CHOOSING_TARGET,
+  GAME_STATE_PLAYER_FROM_DECK,
 } GameState;
 
 struct Game {

play.c

@@ -24,3 +24,13 @@ bool valid_play(Hand *field, Card *played, Card *target) {
     return played->month == target->month;
   }
 }
+
+Card *valid_target(Card *active, Hand *field) {
+  for (int i = 0; i < field->count; i++) {
+    if (field->cards[i]->month == active->month) {
+      return field->cards[i];
+    }
+  }
+
+  return NULL;
+}

play.h

@@ -6,5 +6,6 @@
 #include "card.h"
 
 bool valid_play(Hand *field, Card *played, Card *target);
+Card *valid_target(Card *active, Hand *field);
 
 #endif