feat: display blue square on squad leader

buxx · Aug 20, 2023 · c6b0fc4 · c6b0fc4
1 parent 4437ca8
commit c6b0fc4
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 6 deletions.
diff --git a/battle_core/src/game/squad.rs b/battle_core/src/game/squad.rs
@@ -159,6 +159,7 @@ pub struct SquadMemberStatus {
     ammunition_reserve: AmmunitionReserveStatus,
     under_fire_coefficient: f32,
     current: CurrentAction,
+    leader: bool,
 }
 
 // FIXME : this func is here because AmmunitionReserveStatus, Soldier, etc will have to move
@@ -196,6 +197,7 @@ impl SquadMemberStatus {
             ammunition_reserve: ammunition_reserve_status(soldier),
             under_fire_coefficient: (*soldier.under_fire().value() as f32 / UNDER_FIRE_MAX as f32),
             current: CurrentAction::from_soldier(battle_state, squad, soldier),
+            leader: battle_state.squad(soldier.squad_uuid()).leader() == soldier.uuid(),
         }
     }
 
@@ -222,6 +224,10 @@ impl SquadMemberStatus {
     pub fn ammunition_reserve(&self) -> &AmmunitionReserveStatus {
         &self.ammunition_reserve
     }
+
+    pub fn leader(&self) -> bool {
+        self.leader
+    }
 }
 
 #[derive(Clone, Debug)]

diff --git a/battle_gui/src/engine/ui.rs b/battle_gui/src/engine/ui.rs
@@ -46,7 +46,13 @@ impl Engine {
                     DEFAULT_SELECTED_SQUARE_SIDE,
                     DEFAULT_SELECTED_SQUARE_SIDE,
                 );
-                let color = SoldierHealthBuilder::new(&soldier).build().color();
+
+                let color =
+                    if self.battle_state.squad(soldier.squad_uuid()).leader() == soldier.uuid() {
+                        Color::BLUE
+                    } else {
+                        SoldierHealthBuilder::new(&soldier).build().color()
+                    };
                 mesh_builder.rectangle(DrawMode::Stroke(StrokeOptions::default()), rect, color)?;
             }
         }

diff --git a/battle_gui/src/ui/hud/detail.rs b/battle_gui/src/ui/hud/detail.rs
@@ -1,8 +1,8 @@
 use battle_core::{game::squad::SquadStatusResume, types::WindowPoint};
 use ggez::{
     graphics::{
-        Canvas, Color, DrawMode, DrawParam, FillOptions, Mesh, MeshBuilder, Rect, Text,
-        TextFragment, TextLayout,
+        Canvas, Color, DrawMode, DrawParam, FillOptions, Mesh, MeshBuilder, Rect, StrokeOptions,
+        Text, TextFragment, TextLayout,
     },
     Context, GameResult,
 };
@@ -144,7 +144,20 @@ impl Component<HudEvent> for SquadDetail {
                     )
                     .set_layout(TextLayout::center()),
                     DrawParam::default().dest(text_center_dest.to_vec2()),
-                )
+                );
+
+                if soldier_status.leader() {
+                    mesh_builder.rectangle(
+                        DrawMode::Stroke(StrokeOptions::default()),
+                        Rect::new(
+                            soldiers_status_start_point.x - SOLDIER_WIDTH + 1.,
+                            soldiers_status_start_point.y + 1.,
+                            SOLDIER_WIDTH - 1.,
+                            SOLDIER_WIDTH - 1.,
+                        ),
+                        Color::BLUE,
+                    )?;
+                }
             }
 
             canvas.draw(

diff --git a/battle_gui/src/ui/hud/squad.rs b/battle_gui/src/ui/hud/squad.rs
@@ -160,7 +160,7 @@ impl Component<HudEvent> for SquadStatuses {
                 SQUAD_TYPE_WIDTH + SQUAD_CARD_MARGIN,
                 SQUAD_CARD_HEADER_HEIGHT + SQUAD_CARD_MARGIN,
             ));
-            for (i, solider_status) in draw_card.squad_status.members().iter().enumerate() {
+            for (i, soldier_status) in draw_card.squad_status.members().iter().enumerate() {
                 let soldiers_health_dest = soldiers_healths_start_point.apply(Vec2::new(
                     (SQUAD_CARD_SOLDIER_HEALTH_WIDTH + SQUAD_CARD_MARGIN) * i as f32,
                     0.,
@@ -179,9 +179,22 @@ impl Component<HudEvent> for SquadStatuses {
                         r: 1.,
                         g: 0.,
                         b: 0.,
-                        a: solider_status.under_fire_coefficient(),
+                        a: soldier_status.under_fire_coefficient(),
                     },
                 )?;
+
+                if soldier_status.leader() {
+                    mesh_builder.rectangle(
+                        DrawMode::Stroke(StrokeOptions::default()),
+                        Rect::new(
+                            soldiers_health_dest.x + 1.,
+                            soldiers_health_dest.y + 1.,
+                            SQUAD_CARD_SOLDIER_HEALTH_WIDTH - 1.,
+                            SQUAD_CARD_SOLDIER_HEALTH_HEIGHT - 1.,
+                        ),
+                        Color::BLUE,
+                    )?;
+                }
             }
 
             // Outline when hover or selected