Command (#151)

Author: zeitlinger

client/src/action_buttons.rs

@@ -7,6 +7,7 @@ use crate::render_context::RenderContext;
 use server::action::Action;
 use server::content::advances::get_advance_by_name;
 use server::content::custom_actions::{CustomAction, CustomActionType};
+use server::game::GameState;
 use server::playing_actions::{PlayingAction, PlayingActionType};
 use server::resource::ResourceType;
 
@@ -80,7 +81,7 @@ fn global_move(rc: &RenderContext) -> StateUpdate {
 fn custom_action_tooltip(custom_action_type: &CustomActionType) -> String {
     match custom_action_type {
         CustomActionType::ConstructWonder => "Construct a wonder".to_string(),
-        CustomActionType::ForcedLabor => get_advance_by_name("Absolute Power").description,
+        CustomActionType::AbsolutePower => get_advance_by_name("Absolute Power").description,
         CustomActionType::VotingIncreaseHappiness => get_advance_by_name("Voting").description,
         CustomActionType::FreeEconomyCollect => get_advance_by_name("Free Economy").description,
     }
@@ -94,7 +95,7 @@ fn generic_custom_action(custom_action_type: &CustomActionType) -> Option<Custom
             // handled explicitly
             None
         }
-        CustomActionType::ForcedLabor => Some(CustomAction::ForcedLabor),
+        CustomActionType::AbsolutePower => Some(CustomAction::ForcedLabor),
     }
 }
 
@@ -104,10 +105,11 @@ pub fn base_or_custom_available(
     custom: &CustomActionType,
 ) -> bool {
     rc.can_play_action(action)
-        || rc
-            .game
-            .get_available_custom_actions(rc.shown_player.index)
-            .contains(custom)
+        || (rc.game.state == GameState::Playing
+            && rc
+                .game
+                .get_available_custom_actions(rc.shown_player.index)
+                .contains(custom))
 }
 
 pub fn base_or_custom_action(

client/src/assets.rs

@@ -217,7 +217,7 @@ impl Assets {
 
     fn custom_actions() -> HashMap<CustomActionType, Texture2D> {
         [(
-            CustomActionType::ForcedLabor,
+            CustomActionType::AbsolutePower,
             load_png(include_bytes!("../assets/slavery-whip-svgrepo-com.png")),
         )]
         .iter()

server/src/ability_initializer.rs

@@ -157,8 +157,7 @@ pub(crate) trait AbilityInitializerSetup: Sized {
                 let player_name = game.players[player_index].get_name();
                 let mut ctx = game.custom_phase_state.clone();
                 ctx.current.as_mut().expect("current missing").response = None;
-                game.undo_context_stack
-                    .push(UndoContext::CustomPhaseEvent(ctx));
+                game.push_undo_context(UndoContext::CustomPhaseEvent(ctx));
                 let r = state.request.clone();
                 let a = action.clone();
                 game.custom_phase_state = CustomPhaseEventState::new();

server/src/content/advances.rs

@@ -249,24 +249,30 @@ fn cartography() -> AdvanceBuilder {
         .with_advance_bonus(CultureToken)
         .add_player_event_listener(
             |event| &mut event.before_move,
-            |player, units, destination| {
-                //todo only for first move
-                //todo undo
+            |player, g, i| {
+                // info is the action that we last used this ability for
+                let key = g.actions_left.to_string();
+                if player.info.get("Cartography").is_some_and(|info| info == &key) {
+                    return;
+                }
                 let mut ship = false;
                 let mut navigation = false;
-                for id in units {
-                    let unit = player.get_unit(*id).expect("unit should exist");
+                for id in &i.units {
+                    let unit = g.get_player(i.player).get_unit(*id).expect("unit should exist");
                     if unit.unit_type.is_ship() {
                         ship = true;
-                        if !unit.position.is_neighbor(*destination) {
+                        if !unit.position.is_neighbor(i.to) {
                             navigation = true;
                         }
                     }
                 }
                 if ship {
+                    player.info.insert("Cartography".to_string(), key);
                     player.gain_resources(ResourcePile::ideas(1));
+                    player.add_to_last_log_item(". Cartography gained 1 idea");
                     if navigation {
                         player.gain_resources(ResourcePile::culture_tokens(1));
+                        player.add_to_last_log_item(" and 1 culture token (for using navigation)");
                     }
                 }
             },
@@ -706,7 +712,7 @@ fn autocracy() -> Vec<Advance> {
                 .leading_government_advance("Autocracy")
                 .with_contradicting_advance(&["Voting", "Dogma"])
             , Advance::builder("Absolute Power", "Once per turn, as a free action, you may spend 2 mood tokens to get an additional action")
-                .add_custom_action(ForcedLabor)
+                .add_custom_action(AbsolutePower)
             , ],
     )
 }

server/src/content/custom_actions.rs

@@ -27,7 +27,7 @@ pub enum CustomAction {
 #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Hash)]
 pub enum CustomActionType {
     ConstructWonder,
-    ForcedLabor,
+    AbsolutePower,
     VotingIncreaseHappiness,
     FreeEconomyCollect,
 }
@@ -61,7 +61,7 @@ impl CustomAction {
     pub fn custom_action_type(&self) -> CustomActionType {
         match self {
             CustomAction::ConstructWonder { .. } => CustomActionType::ConstructWonder,
-            CustomAction::ForcedLabor => CustomActionType::ForcedLabor,
+            CustomAction::ForcedLabor => CustomActionType::AbsolutePower,
             CustomAction::VotingIncreaseHappiness(_) => CustomActionType::VotingIncreaseHappiness,
             CustomAction::FreeEconomyCollect(_) => CustomActionType::FreeEconomyCollect,
         }
@@ -114,7 +114,7 @@ impl CustomActionType {
     pub fn action_type(&self) -> ActionType {
         match self {
             CustomActionType::ConstructWonder => ActionType::default(),
-            CustomActionType::ForcedLabor => {
+            CustomActionType::AbsolutePower => {
                 ActionType::free_and_once_per_turn(ResourcePile::mood_tokens(2))
             }
             CustomActionType::VotingIncreaseHappiness => {
@@ -131,7 +131,7 @@ impl CustomActionType {
         match self {
             CustomActionType::FreeEconomyCollect => !current_turn_log(game)
                 .iter()
-                .any(|action| matches!(action, Action::Playing(PlayingAction::Collect(_)))),
+                .any(|item| matches!(item.action, Action::Playing(PlayingAction::Collect(_)))),
             _ => true,
         }
     }

server/src/content/custom_phase_actions.rs

@@ -85,7 +85,7 @@ impl CustomPhaseEventAction {
                 player.loose_resources(r);
             }
         }
-        let Some(UndoContext::CustomPhaseEvent(e)) = game.undo_context_stack.pop() else {
+        let Some(UndoContext::CustomPhaseEvent(e)) = game.pop_undo_context() else {
             panic!("when undoing custom phase event, the undo context stack should have a custom phase event")
         };
         game.custom_phase_state = e;

server/src/explore.rs

@@ -284,7 +284,7 @@ pub(crate) fn explore_resolution(game: &mut Game, r: &ExploreResolutionState, ro
 }
 
 pub(crate) fn undo_explore_resolution(game: &mut Game, player_index: usize) {
-    let Some(UndoContext::ExploreResolution(s)) = game.undo_context_stack.pop() else {
+    let Some(UndoContext::ExploreResolution(s)) = game.pop_undo_context() else {
         panic!("when undoing explore resolution, the undo context stack should have an explore resolution")
     };