Update game screen for extra sexiness

game_state.c

@@ -5,7 +5,6 @@
 struct GameState {
     LaserTagTeam team;
     uint8_t health;
-    uint16_t score;
     uint16_t ammo;
     uint32_t game_time;
     bool game_over;
@@ -19,7 +18,6 @@ GameState* game_state_alloc() {
     }
     state->team = TeamRed;
     state->health = INITIAL_HEALTH;
-    state->score = 0;
     state->ammo = INITIAL_AMMO;
     state->game_time = 0;
     state->game_over = false;
@@ -30,7 +28,6 @@ GameState* game_state_alloc() {
 void game_state_reset(GameState* state) {
     furi_assert(state);
     state->health = INITIAL_HEALTH;
-    state->score = 0;
     state->ammo = INITIAL_AMMO;
     state->game_time = 0;
     state->game_over = false;
@@ -71,17 +68,6 @@ uint8_t game_state_get_health(GameState* state) {
     return state->health;
 }
 
-void game_state_increase_score(GameState* state, uint16_t points) {
-    furi_assert(state);
-    state->score += points;
-    FURI_LOG_I("GameState", "Score increased to %d", state->score);
-}
-
-uint16_t game_state_get_score(GameState* state) {
-    furi_assert(state);
-    return state->score;
-}
-
 void game_state_decrease_ammo(GameState* state, uint16_t amount) {
     furi_assert(state);
     if(state->ammo > amount) {

game_state.h

@@ -26,9 +26,6 @@ void game_state_decrease_health(GameState* state, uint8_t amount);
 void game_state_increase_health(GameState* state, uint8_t amount);
 uint8_t game_state_get_health(GameState* state);
 
-void game_state_increase_score(GameState* state, uint16_t points);
-uint16_t game_state_get_score(GameState* state);
-
 void game_state_decrease_ammo(GameState* state, uint16_t amount);
 void game_state_increase_ammo(GameState* state, uint16_t amount);
 uint16_t game_state_get_ammo(GameState* state);

laser_tag_app.c

@@ -202,7 +202,9 @@ void laser_tag_app_fire(LaserTagApp* app) {
     infrared_controller_send(app->ir_controller);
     FURI_LOG_D(TAG, "Laser fired, decreasing ammo by 1");
     game_state_decrease_ammo(app->game_state, 1);
+
     notification_message(app->notifications, &sequence_blink_blue_100);
+
     FURI_LOG_I(TAG, "Notifying user with blink blue");
     app->need_redraw = true;
 }
@@ -214,7 +216,14 @@ void laser_tag_app_handle_hit(LaserTagApp* app) {
     game_state_decrease_health(app->game_state, 10);
     notification_message(app->notifications, &sequence_vibro_1);
     FURI_LOG_I(TAG, "Notifying user with vibration");
-    app->need_redraw = true;
+
+    if(game_state_is_game_over(app->game_state)) {
+        FURI_LOG_I(TAG, "Game over, playing game over sound");
+
+        notification_message(app->notifications, &sequence_error);
+
+        app->need_redraw = true;
+    }
 }
 
 static bool laser_tag_app_enter_game_state(LaserTagApp* app) {

laser_tag_view.c

@@ -1,6 +1,4 @@
-
 #include "laser_tag_view.h"
-#include "laser_tag_icons.h"
 #include <furi.h>
 #include <gui/elements.h>
 
@@ -12,7 +10,6 @@ typedef struct {
     LaserTagTeam team;
     uint8_t health;
     uint16_t ammo;
-    uint16_t score;
     uint32_t game_time;
     bool game_over;
 } LaserTagViewModel;
@@ -25,31 +22,28 @@ static void laser_tag_view_draw_callback(Canvas* canvas, void* model) {
     canvas_clear(canvas);
     canvas_set_color(canvas, ColorBlack);
 
-    canvas_draw_icon(canvas, 0, 0, m->team == TeamRed ? TEAM_RED_ICON : TEAM_BLUE_ICON);
-    canvas_draw_icon(canvas, 0, 10, HEALTH_ICON);
-    FuriString* str = furi_string_alloc_printf("%d", m->health);
-    canvas_draw_str_aligned(canvas, 20, 14, AlignLeft, AlignBottom, furi_string_get_cstr(str));
+    canvas_draw_str_aligned(
+        canvas, 5, 10, AlignLeft, AlignBottom, m->team == TeamRed ? "Team: Red" : "Team: Blue");
+
+    canvas_draw_str_aligned(canvas, 5, 25, AlignLeft, AlignBottom, "Health:");
+    canvas_draw_frame(canvas, 55, 20, 60, 10);
+    canvas_draw_box(canvas, 56, 21, (58 * m->health) / 100, 8);
 
-    canvas_draw_icon(canvas, 0, 20, AMMO_ICON);
-    furi_string_reset(str);
-    furi_string_printf(str, "%d", m->ammo);
-    canvas_draw_str_aligned(canvas, 20, 24, AlignLeft, AlignBottom, furi_string_get_cstr(str));
+    canvas_draw_str_aligned(canvas, 5, 40, AlignLeft, AlignBottom, "Ammo:");
+    canvas_draw_frame(canvas, 55, 35, 60, 10);
+    canvas_draw_box(canvas, 56, 36, (58 * m->ammo) / 100, 8);
 
-    canvas_draw_str_aligned(canvas, 64, 10, AlignCenter, AlignBottom, "Score:");
-    furi_string_reset(str);
-    furi_string_printf(str, "%d", m->score);
-    canvas_draw_str_aligned(canvas, 64, 20, AlignCenter, AlignBottom, furi_string_get_cstr(str));
+    if(m->ammo == 0) {
+        canvas_draw_str_aligned(canvas, 5, 55, AlignLeft, AlignBottom, "Press 'X' to Reload");
+    }
 
     uint32_t minutes = m->game_time / 60;
     uint32_t seconds = m->game_time % 60;
-    furi_string_reset(str);
-    furi_string_printf(str, "%02ld:%02ld", minutes, seconds);
-    canvas_draw_str_aligned(canvas, 64, 40, AlignCenter, AlignBottom, furi_string_get_cstr(str));
-
-    canvas_draw_icon(canvas, 112, 0, LASER_GUN_ICON);
+    FuriString* str = furi_string_alloc_printf("%02ld:%02ld", minutes, seconds);
+    canvas_draw_str_aligned(canvas, 5, 60, AlignLeft, AlignBottom, furi_string_get_cstr(str));
 
     if(m->game_over) {
-        canvas_draw_icon(canvas, 56, 28, GAME_OVER_ICON);
+        canvas_draw_str_aligned(canvas, 5, 75, AlignLeft, AlignBottom, "GAME OVER");
     }
 
     furi_string_free(str);
@@ -113,7 +107,6 @@ void laser_tag_view_update(LaserTagView* laser_tag_view, GameState* game_state)
             model->team = game_state_get_team(game_state);
             model->health = game_state_get_health(game_state);
             model->ammo = game_state_get_ammo(game_state);
-            model->score = game_state_get_score(game_state);
             model->game_time = game_state_get_time(game_state);
             model->game_over = game_state_is_game_over(game_state);
         },