Seafearing (#150)

Author: zeitlinger

client/src/client_state.rs

@@ -22,6 +22,7 @@ use server::content::custom_phase_actions::CustomPhaseRequest;
 use server::game::{CulturalInfluenceResolution, CurrentMove, Game, GameState};
 use server::position::Position;
 use server::status_phase::{StatusPhaseAction, StatusPhaseState};
+use server::unit::carried_units;
 
 #[derive(Clone)]
 pub enum ActiveDialog {
@@ -177,7 +178,11 @@ impl ActiveDialog {
             ActiveDialog::Retreat => vec!["Do you want to retreat?".to_string()],
             ActiveDialog::RemoveCasualties(r) => vec![format!(
                 "Remove {} units: click on a unit to remove it",
-                r.needed
+                if r.needed_carried > 0 {
+                    format!("{} ships and {} carried units", r.needed, r.needed_carried)
+                } else {
+                    r.needed.to_string()
+                }
             )],
             ActiveDialog::WaitingForUpdate => vec!["Waiting for server update".to_string()],
             ActiveDialog::CustomPhaseRewardRequest(_) => {
@@ -545,17 +550,22 @@ impl State {
                 StatusPhaseState::DetermineFirstPlayer => ActiveDialog::DetermineFirstPlayer,
             },
             GameState::PlaceSettler { .. } => ActiveDialog::PlaceSettler,
-            GameState::Combat(c) => match c.phase {
+            GameState::Combat(c) => match &c.phase {
                 CombatPhase::PlayActionCard(_) => ActiveDialog::PlayActionCard,
-                CombatPhase::RemoveCasualties {
-                    player, casualties, ..
-                } => {
-                    let (position, selectable) = if player == c.attacker {
+                CombatPhase::RemoveCasualties(r) => {
+                    let (position, selectable) = if r.player == c.attacker {
                         (
                             c.attacker_position,
-                            active_attackers(game, c.attacker, &c.attackers, c.defender_position),
+                            active_attackers(game, c.attacker, &c.attackers, c.defender_position)
+                                .clone()
+                                .into_iter()
+                                .chain(c.attackers.iter().flat_map(|a| {
+                                    let units = carried_units(*a, game.get_player(r.player));
+                                    units
+                                }))
+                                .collect(),
                         )
-                    } else if player == c.defender {
+                    } else if r.player == c.defender {
                         (
                             c.defender_position,
                             active_defenders(game, c.defender, c.defender_position),
@@ -564,7 +574,11 @@ impl State {
                         panic!("player should be either defender or attacker")
                     };
                     ActiveDialog::RemoveCasualties(RemoveCasualtiesSelection::new(
-                        position, casualties, selectable,
+                        r.player,
+                        position,
+                        r.casualties,
+                        r.carried_units_casualties,
+                        selectable,
                     ))
                 }
                 CombatPhase::Retreat => ActiveDialog::Retreat,

client/src/combat_ui.rs

@@ -25,21 +25,36 @@ fn retreat(retreat: bool) -> StateUpdate {
 
 #[derive(Clone)]
 pub struct RemoveCasualtiesSelection {
+    pub player: usize,
     pub position: Position,
     pub needed: u8,
+    pub needed_carried: u8,
     pub selectable: Vec<u32>,
     pub units: Vec<u32>,
 }
 
 impl RemoveCasualtiesSelection {
-    pub fn new(position: Position, needed: u8, selectable: Vec<u32>) -> Self {
+    pub fn new(
+        player: usize,
+        position: Position,
+        needed: u8,
+        needed_carried: u8,
+        selectable: Vec<u32>,
+    ) -> Self {
         RemoveCasualtiesSelection {
+            player,
             position,
             needed,
+            needed_carried,
             units: Vec::new(),
             selectable,
         }
     }
+
+    #[must_use]
+    pub fn total_needed(&self) -> u8 {
+        self.needed + self.needed_carried
+    }
 }
 
 impl UnitSelection for RemoveCasualtiesSelection {
@@ -57,13 +72,19 @@ impl ConfirmSelection for RemoveCasualtiesSelection {
         None
     }
 
-    fn confirm(&self, _game: &Game) -> OkTooltip {
-        if self.needed == self.units.len() as u8 {
+    fn confirm(&self, game: &Game) -> OkTooltip {
+        let units = self
+            .units
+            .iter()
+            .map(|id| game.get_player(self.player).get_unit(*id).unwrap());
+        let carried = units.filter(|u| u.carrier_id.is_some()).count() as u8;
+
+        if carried == self.needed_carried && self.units.len() as u8 == self.total_needed() {
             OkTooltip::Valid("Remove casualties".to_string())
         } else {
             OkTooltip::Invalid(format!(
                 "Need to select {} units",
-                self.needed - self.units.len() as u8
+                self.total_needed() - self.units.len() as u8
             ))
         }
     }

client/src/move_ui.rs

@@ -80,28 +80,18 @@ pub fn possible_destinations(
     res
 }
 
-fn move_destination(
-    dest: &MoveDestination,
-    pos: Position,
-    unit: Option<u32>,
-) -> Option<(Position, Option<u32>, Option<PaymentOptions>)> {
-    match dest {
-        MoveDestination::Tile((p, cost)) if p == &pos => Some((*p, None, Some(cost.clone()))),
-        MoveDestination::Carrier(id) if unit.is_some_and(|u| u == *id) => {
-            Some((pos, Some(*id), None))
-        }
-        _ => None,
-    }
-}
-
 pub fn click(rc: &RenderContext, pos: Position, s: &MoveSelection, mouse_pos: Vec2) -> StateUpdate {
     let game = rc.game;
     let p = game.get_player(s.player_index);
     let carrier = click_unit(rc, pos, mouse_pos, p, false);
-    if let Some((destination, embark_carrier_id, cost)) = s
-        .destinations
-        .iter()
-        .find_map(|d| move_destination(d, pos, carrier))
+    if let Some((destination, embark_carrier_id, cost)) =
+        s.clone().destinations.into_iter().find_map(|d| match d {
+            MoveDestination::Tile((p, cost)) if p == pos => Some((p, None, cost)),
+            MoveDestination::Carrier(id) if carrier.is_some_and(|u| u == id) => {
+                Some((pos, Some(id), PaymentOptions::free()))
+            }
+            _ => None,
+        })
     {
         let units = s.units.clone();
         let action = MovementAction::Move(MoveUnits {
@@ -111,7 +101,7 @@ pub fn click(rc: &RenderContext, pos: Position, s: &MoveSelection, mouse_pos: Ve
             payment: ResourcePile::empty(),
         });
 
-        if let Some(cost) = cost {
+        if !cost.is_free() {
             return StateUpdate::OpenDialog(ActiveDialog::MovePayment(MovePayment {
                 action,
                 payment: rc.new_payment(&cost, "Move units", true),