Allow the player to choose their teyaku

dialog.c

@@ -45,6 +45,29 @@ void handle_click_quit(Game *g) {
   g->should_close = true;
 }
 
+void handle_click_claim_set_teyaku(Game *g) {
+  g->player.teyaku.chaff = CHAFF_TEYAKU_NONE;
+  teyaku_to_string(&g->player.teyaku, g->player.teyaku_string);
+  g->state = GAME_STATE_START_OF_TURN;
+}
+
+void handle_click_claim_chaff_teyaku(Game *g) {
+  g->player.teyaku.set = SET_TEYAKU_NONE;
+  teyaku_to_string(&g->player.teyaku, g->player.teyaku_string);
+  g->state = GAME_STATE_START_OF_TURN;
+}
+
+void handle_click_claim_both_teyaku(Game *g) {
+  g->state = GAME_STATE_START_OF_TURN;
+}
+
+void handle_click_dont_claim_teyaku(Game *g) {
+  (&g->player.teyaku)->chaff = CHAFF_TEYAKU_NONE;
+  g->player.teyaku.set = SET_TEYAKU_NONE;
+  teyaku_to_string(&g->player.teyaku, g->player.teyaku_string);
+  g->state = GAME_STATE_START_OF_TURN;
+}
+
 void init_dialogs(Game *g) {
   Dialog *cancel_dialog = &dialogs[0];
   cancel_dialog->text_count = 1;
@@ -134,6 +157,36 @@ void init_dialogs(Game *g) {
   strcpy(dekiyaku_end_of_round_dialog->options[0].text, "Okay");
   dekiyaku_end_of_round_dialog->options[0].color = GREEN;
   dekiyaku_end_of_round_dialog->options[0].handle = &handle_click_ok_end_of_round;
+
+  Dialog *teyaku_dialog = &dialogs[5];
+  teyaku_dialog->text_count = 3;
+  teyaku_dialog->text[0] = malloc(200);
+  teyaku_dialog->text[1] = malloc(200);
+  teyaku_dialog->text[2] = malloc(200);
+  strcpy(teyaku_dialog->text[0], "You can claim some teyaku");
+  teyaku_dialog->text_color = BLACK;
+  teyaku_dialog->options_count = 4;
+  teyaku_dialog->game = g;
+
+  teyaku_dialog->options[0].text = malloc(50);
+  strcpy(teyaku_dialog->options[0].text, "Claim Set Teyaku");
+  teyaku_dialog->options[0].color = SKYBLUE;
+  teyaku_dialog->options[0].handle = &handle_click_claim_set_teyaku;
+
+  teyaku_dialog->options[1].text = malloc(50);
+  strcpy(teyaku_dialog->options[1].text, "Claim Chaff Teyaku");
+  teyaku_dialog->options[1].color = SKYBLUE;
+  teyaku_dialog->options[1].handle = &handle_click_claim_chaff_teyaku;
+  
+  teyaku_dialog->options[2].text = malloc(50);
+  strcpy(teyaku_dialog->options[2].text, "Claim Both Teyaku");
+  teyaku_dialog->options[2].color = GREEN;
+  teyaku_dialog->options[2].handle = &handle_click_claim_both_teyaku;
+
+  teyaku_dialog->options[3].text = malloc(50);
+  strcpy(teyaku_dialog->options[3].text, "Don't Claim");
+  teyaku_dialog->options[3].color = RED;
+  teyaku_dialog->options[3].handle = &handle_click_dont_claim_teyaku;
 }
 
 void cancel_dialog(Game *g) { g->dialog = &dialogs[0]; }
@@ -141,14 +194,24 @@ void shoubu_dialog(Game *g) { g->dialog = &dialogs[1]; }
 void no_dekiyaku_end_of_round_dialog(Game *g) { g->dialog = &dialogs[2]; }
 void end_of_game_dialog(Game *g) { g->dialog = &dialogs[3]; }
 void dekiyaku_end_of_round_dialog(Game *g) { g->dialog = &dialogs[4]; }
+void teyaku_dialog(Game *g) { g->dialog = &dialogs[5]; }
 
 Rectangle dialog_option_outer_rectangle(Dialog *d, int i) {
-  return (Rectangle) {
+  if (d->options_count < 4) {
-    ((960 * (i + 1)) / (d->options_count + 1)) - 10 + 200,
+    return (Rectangle) {
-    500,
+      ((960 * (i + 1)) / (d->options_count + 1)) - 10 + 200,
-    MeasureText(d->options[i].text, DIALOG_OPTION_FONT_SIZE) + 20,
+      500,
-    40,
+      MeasureText(d->options[i].text, DIALOG_OPTION_FONT_SIZE) + 20,
-  };
+      40,
+    };
+  } else {
+    return (Rectangle) {
+      ((960 * (i % 2)) / ((d->options_count / 2) + 1)) - 10 + 250,
+      500 + ((i / 2) * 50),
+      MeasureText(d->options[i].text, DIALOG_OPTION_FONT_SIZE) + 20,
+      40,
+    };
+  }
 }
 
 Rectangle dialog_option_inner_rectangle(Dialog *d, int i) {

dialog.h

@@ -21,7 +21,7 @@ struct Dialog {
   char *text[8];
   int text_count;
   Color text_color;
-  DialogOption options[3];
+  DialogOption options[4];
   int options_count;
   Game *game;
 };
@@ -32,6 +32,7 @@ void shoubu_dialog(Game *g);
 void no_dekiyaku_end_of_round_dialog(Game *g);
 void end_of_game_dialog(Game *g);
 void dekiyaku_end_of_round_dialog(Game *g);
+void teyaku_dialog(Game *g);
 void dialog_draw(Dialog *d);
 void dialog_handle_input(Dialog *d);
 

game.c

@@ -311,6 +311,10 @@ void run_frame_initializing(Game *g) {
   g->right.dekiyaku_action = DEKIYAKU_ACTION_NONE;
   g->left.dekiyaku_action = DEKIYAKU_ACTION_NONE;
 
+  strcpy(g->player.teyaku_string, "");
+  strcpy(g->right.teyaku_string, "");
+  strcpy(g->left.teyaku_string, "");
+
   g->current_play_from_hand = NULL;
   g->current_play_target = NULL;
 
@@ -377,7 +381,14 @@ void run_frame_calculating_teyaku(Game *g) {
   teyaku_to_string(&g->right.teyaku, g->right.teyaku_string);
   calculate_teyaku(g->left.hand, &g->left.teyaku);
   teyaku_to_string(&g->left.teyaku, g->left.teyaku_string);
-  g->state = GAME_STATE_START_OF_TURN;
+
+  if (teyaku_points(&g->player.teyaku) > 0) {
+    teyaku_dialog(g);
+    set_teyaku_to_string(&g->player.teyaku, g->dialog->text[1]);
+    chaff_teyaku_to_string(&g->player.teyaku, g->dialog->text[2]);
+  } else {
+    g->state = GAME_STATE_START_OF_TURN;
+  }
 }
 
 void run_frame_start_of_turn(Game *g) {
@@ -840,7 +851,7 @@ void draw_frame(Game *g) {
   DrawText(g->left.points_string, 40, 800, 20, BLACK);
   DrawText(g->left.teyaku_string, 40, 830, 20, BLACK);
 
-  char round_text[20];
+  char round_text[40];
   if (g->current_round < g->number_of_rounds)
     sprintf(round_text, "Round %d / %d", g->current_round+1, g->number_of_rounds);
   else

teyaku.c

@@ -75,6 +75,10 @@ int chaff_teyaku_points(ChaffTeyaku ct) {
   return chaff_teyaku_points_array[ct];
 }
 
+int teyaku_points(Teyaku *t) {
+  return set_teyaku_points(t->set) + chaff_teyaku_points(t->chaff);
+}
+
 char *set_teyaku_english(SetTeyaku st) {
   return set_teyaku_english_array[st];
 }
@@ -89,6 +93,14 @@ void calculate_teyaku(const Hand h, Teyaku *t) {
   t->calculated = true;
 }
 
+void set_teyaku_to_string(Teyaku *t, char *str) {
+  sprintf(str, "Set: %s(%d)", set_teyaku_english(t->set), set_teyaku_points(t->set));
+}
+
+void chaff_teyaku_to_string(Teyaku *t, char *str) {
+  sprintf(str, "Chaff: %s(%d)", chaff_teyaku_english(t->chaff), chaff_teyaku_points(t->chaff));
+}
+
 void teyaku_to_string(Teyaku *t, char *str) {
   int set_points = set_teyaku_points(t->set);
   int chaff_points = chaff_teyaku_points(t->chaff);

teyaku.h

@@ -34,7 +34,10 @@ typedef struct Teyaku {
   bool calculated;
 } Teyaku;
 
+int teyaku_points(Teyaku *t);
 void calculate_teyaku(const Hand h, Teyaku *t);
+void set_teyaku_to_string(Teyaku *t, char *str);
+void chaff_teyaku_to_string(Teyaku *t, char *str);
 void teyaku_to_string(Teyaku *t, char *str);
 
 #endif