fix movement

Author: zeitlinger

client/src/client.rs

@@ -54,24 +54,26 @@ fn render(game: &Game, state: &State, features: &Features) -> StateUpdate {
 
     draw_map(game, state);
     let mut updates = StateUpdates::new();
-    let update = show_globals(game, player);
+    let update = show_globals(game, player, state);
     updates.add(update);
     show_resources(game, player_index);
     show_wonders(game, player_index);
 
-    if root_ui().button(vec2(1200., 130.), "Log") {
-        return StateUpdate::OpenDialog(ActiveDialog::Log);
-    };
-    if root_ui().button(vec2(1200., 100.), "Advances") {
-        return StateUpdate::OpenDialog(ActiveDialog::AdvanceMenu);
-    };
-    if features.import_export && player.can_control {
-        if root_ui().button(vec2(1200., 290.), "Import") {
-            return StateUpdate::Import;
+    if !state.has_modal_dialog() {
+        if root_ui().button(vec2(1200., 130.), "Log") {
+            return StateUpdate::OpenDialog(ActiveDialog::Log);
         };
-        if root_ui().button(vec2(1250., 290.), "Export") {
-            return StateUpdate::Export;
+        if root_ui().button(vec2(1200., 100.), "Advances") {
+            return StateUpdate::OpenDialog(ActiveDialog::AdvanceMenu);
         };
+        if features.import_export && player.can_control {
+            if root_ui().button(vec2(1200., 290.), "Import") {
+                return StateUpdate::Import;
+            };
+            if root_ui().button(vec2(1250., 290.), "Export") {
+                return StateUpdate::Export;
+            };
+        }
     }
 
     if player.can_control {

client/src/client_state.rs

@@ -1,4 +1,3 @@
-use macroquad::input::KeyCode::N;
 use macroquad::prelude::*;
 
 use server::action::{Action, CombatAction};
@@ -209,9 +208,7 @@ impl State {
     pub fn has_modal_dialog(&self) -> bool {
         !matches!(
             self.active_dialog,
-            ActiveDialog::None |
-            ActiveDialog::TileMenu(_) |
-            ActiveDialog::Log 
+            ActiveDialog::None | ActiveDialog::TileMenu(_) | ActiveDialog::Log
         )
     }
 

client/src/local_client.rs

@@ -8,6 +8,7 @@ use std::io::BufReader;
 use crate::client::{Features, GameSyncRequest, GameSyncResult};
 use server::city::City;
 use server::game::{Game, GameData};
+use server::leader::Leader;
 use server::map::Terrain;
 use server::position::Position;
 use server::resource_pile::ResourcePile;
@@ -88,6 +89,8 @@ pub fn setup_local_game() -> Game {
     add_unit(&mut game, "C2", player_index1, UnitType::Settler);
     add_unit(&mut game, "C2", player_index1, UnitType::Settler);
     add_unit(&mut game, "C2", player_index1, UnitType::Settler);
+    game.players[player_index1].active_leader =
+        Some(Leader::builder("Alexander", "", "", "", "").build());
 
     add_unit(&mut game, "C1", player_index2, UnitType::Infantry);
     add_unit(&mut game, "C1", player_index2, UnitType::Infantry);

client/src/move_ui.rs

@@ -2,8 +2,8 @@ use macroquad::math::u32;
 
 use crate::select_ui::{ConfirmSelection, SelectionConfirm};
 use server::action::Action;
+use server::game::Game;
 use server::game::GameState::Movement;
-use server::game::{Game, GameState};
 use server::position::Position;
 use server::unit::{MovementAction, Unit};
 
@@ -28,10 +28,7 @@ pub fn move_units_dialog(game: &Game, sel: &MoveSelection, player: &ShownPlayer)
                 panic!("game is not in movement")
             };
 
-            if ui.button(
-                None,
-                "End Move Units",
-            ) {
+            if ui.button(None, "End Move Units") {
                 StateUpdate::execute_with_warning(
                     Action::Movement(MovementAction::Stop),
                     if movement_actions_left > 0 {

client/src/player_ui.rs

@@ -12,7 +12,7 @@ use server::resource_pile::ResourcePile;
 
 use crate::client_state::{ShownPlayer, State, StateUpdate};
 
-pub fn show_globals(game: &Game, shown_player: &ShownPlayer) -> StateUpdate {
+pub fn show_globals(game: &Game, shown_player: &ShownPlayer, state: &State) -> StateUpdate {
     draw_text(&format!("Age {}", game.age), 1400., 60., 20., BLACK);
     draw_text(&format!("Round {}", game.round), 1400., 90., 20., BLACK);
 
@@ -28,16 +28,12 @@ pub fn show_globals(game: &Game, shown_player: &ShownPlayer) -> StateUpdate {
         let player = game.get_player(p);
         let shown = shown_player.index == p;
         let prefix = if shown { "* " } else { "" };
-        let suffix = if p == game.active_player() {
-            &player_suffix(game, player)
-        } else {
-            ""
-        };
+        let suffix = &player_suffix(game, player);
         let name = player.get_name();
         let y = 180. + i as f32 * 50.;
         let x = 1400.;
         let label = format!("{prefix}{name}{suffix}");
-        if shown {
+        if shown || state.has_modal_dialog() {
             draw_text(&label, x, y, 20., BLACK);
         } else if Button::new(label)
             .position(vec2(x, y - 10.))
@@ -53,44 +49,61 @@ fn player_suffix(game: &Game, player: &Player) -> String {
     let actions_left = if game.current_player_index == player.index {
         match &game.state {
             GameState::StatusPhase(_) | GameState::Finished => "",
-            _ => &format!(", {} actions Left", game.actions_left),
+            _ => &format!("{} actions Left", game.actions_left),
         }
     } else {
         ""
     };
+
     let moves_left = if game.current_player_index == player.index {
-        match &game.state {
-            GameState::Movement { movement_actions_left, .. } => {
-                &format!(", {movement_actions_left} moves left")
-            }
-            _ => "",
+        match moves_left(&game.state) {
+            None => "",
+            Some(m) => &format!("{m} moves left"),
         }
     } else {
         ""
     };
 
     let active_player = if player.index == game.active_player() {
         match &game.state {
-            GameState::Playing => String::from("Play Actions"),
-            GameState::StatusPhase(ref p) => format!("Status Phase: {p:?}"),
-            GameState::Movement { .. } => String::from("Movement"),
-            GameState::CulturalInfluenceResolution(_) => {
-                String::from("Cultural Influence Resolution")
-            }
-            GameState::Combat(c) => {
-                format!("Combat Round {} Phase {:?}", c.round, c.phase)
-            }
-            GameState::PlaceSettler { .. } => String::from("Place Settler"),
-            GameState::Finished => String::from("Finished"),
+            GameState::Playing => "Play Actions",
+            GameState::StatusPhase(ref p) => &format!("Status Phase: {p:?}"),
+            GameState::Movement { .. } => "Movement",
+            GameState::CulturalInfluenceResolution(_) => "Cultural Influence Resolution",
+            GameState::Combat(c) => &format!("Combat Round {} Phase {:?}", c.round, c.phase),
+            GameState::PlaceSettler { .. } => "Place Settler",
+            GameState::Finished => "Finished",
         }
     } else {
-        String::new()
+        ""
     };
-    
-    if actions_left.is_empty() && active_player.is_empty() {
+
+    let status = vec![active_player, actions_left, moves_left]
+        .into_iter()
+        .filter(|s| !s.is_empty())
+        .collect::<Vec<_>>()
+        .join(", ");
+
+    if status.is_empty() {
         String::new()
     } else {
-        format!(" ({active_player}{actions_left}{moves_left})")
+        format!(" ({status})")
+    }
+}
+
+fn moves_left(state: &GameState) -> Option<u32> {
+    match state {
+        GameState::Combat(c) => moves_left(&c.initiation),
+        GameState::Movement {
+            movement_actions_left,
+            ..
+        } => Some(*movement_actions_left),
+        GameState::PlaceSettler {
+            player_index: _player_index,
+            movement_actions_left,
+            ..
+        } => Some(*movement_actions_left),
+        _ => None,
     }
 }