remaining base tech (not civ specific) (#159)

Author: zeitlinger

client/src/client.rs

@@ -3,6 +3,7 @@ use macroquad::prelude::clear_background;
 use macroquad::prelude::*;
 
 use server::action::Action;
+use server::content::custom_phase_actions::CustomPhaseEventAction;
 use server::game::Game;
 use server::position::Position;
 
@@ -130,7 +131,7 @@ fn render_active_dialog(rc: &RenderContext) -> StateUpdate {
         ActiveDialog::None
         | ActiveDialog::WaitingForUpdate
         | ActiveDialog::CulturalInfluence(_)
-        | ActiveDialog::PlaceSettler => StateUpdate::None,
+        | ActiveDialog::CustomPhasePositionRequest(_) => StateUpdate::None,
         ActiveDialog::DialogChooser(d) => dialog_chooser(rc, d),
         ActiveDialog::Log => show_log(rc),
 
@@ -230,9 +231,11 @@ fn controlling_player_click(rc: &RenderContext, mouse_pos: Vec2, pos: Position)
             StateUpdate::OpenDialog(ActiveDialog::ReplaceUnits(new.clone()))
         }),
         ActiveDialog::RazeSize1City => raze_city_confirm_dialog(rc, pos),
-        ActiveDialog::PlaceSettler => {
-            if rc.shown_player.get_city(pos).is_some() {
-                StateUpdate::Execute(Action::PlaceSettler(pos))
+        ActiveDialog::CustomPhasePositionRequest(choices) => {
+            if choices.contains(&pos) {
+                StateUpdate::Execute(Action::CustomPhaseEvent(
+                    CustomPhaseEventAction::SelectPosition(pos),
+                ))
             } else {
                 StateUpdate::None
             }

client/src/client_state.rs

@@ -55,7 +55,6 @@ pub enum ActiveDialog {
 
     // combat
     PlayActionCard,
-    PlaceSettler,
     Retreat,
     RemoveCasualties(RemoveCasualtiesSelection),
 
@@ -66,6 +65,7 @@ pub enum ActiveDialog {
     CustomPhaseResourceRewardRequest(Payment),
     CustomPhaseAdvanceRewardRequest(CustomPhaseAdvanceRewardRequest),
     CustomPhasePaymentRequest(Vec<Payment>),
+    CustomPhasePositionRequest(Vec<Position>),
 }
 
 impl ActiveDialog {
@@ -95,7 +95,6 @@ impl ActiveDialog {
             ActiveDialog::ChangeGovernmentType => "change government type",
             ActiveDialog::ChooseAdditionalAdvances(_) => "choose additional advances",
             ActiveDialog::PlayActionCard => "play action card",
-            ActiveDialog::PlaceSettler => "place settler",
             ActiveDialog::Retreat => "retreat",
             ActiveDialog::RemoveCasualties(_) => "remove casualties",
             ActiveDialog::Sports(_) => "sports",
@@ -104,6 +103,7 @@ impl ActiveDialog {
             ActiveDialog::CustomPhaseResourceRewardRequest(_) => "trade route selection",
             ActiveDialog::CustomPhaseAdvanceRewardRequest(_) => "advance selection",
             ActiveDialog::CustomPhasePaymentRequest(_) => "custom phase payment request",
+            ActiveDialog::CustomPhasePositionRequest(_) => "custom phase position request",
         }
     }
 
@@ -162,7 +162,6 @@ impl ActiveDialog {
                 vec!["Click on an advance to choose it".to_string()]
             }
             ActiveDialog::PlayActionCard => vec!["Click on an action card to play it".to_string()],
-            ActiveDialog::PlaceSettler => vec!["Click on a tile to place a settler".to_string()],
             ActiveDialog::Retreat => vec!["Do you want to retreat?".to_string()],
             ActiveDialog::RemoveCasualties(r) => vec![format!(
                 "Remove {} units: click on a unit to remove it",
@@ -184,7 +183,8 @@ impl ActiveDialog {
             }
             ActiveDialog::CustomPhaseResourceRewardRequest(_)
             | ActiveDialog::CustomPhaseAdvanceRewardRequest(_)
-            | ActiveDialog::CustomPhasePaymentRequest(_) => {
+            | ActiveDialog::CustomPhasePaymentRequest(_)
+            | ActiveDialog::CustomPhasePositionRequest(_) => {
                 event_help(rc, &custom_phase_event_origin(rc), true)
             }
         }
@@ -552,6 +552,9 @@ impl State {
                 CustomPhaseRequest::AdvanceReward(r) => {
                     ActiveDialog::CustomPhaseAdvanceRewardRequest(r.clone())
                 }
+                CustomPhaseRequest::SelectPosition(r) => {
+                    ActiveDialog::CustomPhasePositionRequest(r.choices.clone())
+                }
             };
         }
         match &game.state {
@@ -573,7 +576,6 @@ impl State {
                 StatusPhaseState::ChangeGovernmentType => ActiveDialog::ChangeGovernmentType,
                 StatusPhaseState::DetermineFirstPlayer => ActiveDialog::DetermineFirstPlayer,
             },
-            GameState::PlaceSettler { .. } => ActiveDialog::PlaceSettler,
             GameState::Combat(c) => match &c.phase {
                 CombatPhase::PlayActionCard(_) => ActiveDialog::PlayActionCard,
                 CombatPhase::RemoveCasualties(r) => {

client/src/collect_ui.rs

@@ -13,7 +13,7 @@ use macroquad::math::vec2;
 use macroquad::prelude::WHITE;
 use macroquad::shapes::draw_circle;
 use server::action::Action;
-use server::collect::{get_total_collection, possible_resource_collections, CollectOptionsInfo};
+use server::collect::{get_total_collection, possible_resource_collections, CollectInfo};
 use server::content::custom_actions::CustomAction;
 use server::game::Game;
 use server::playing_actions::{Collect, PlayingAction};
@@ -27,15 +27,15 @@ pub struct CollectResources {
     city_position: Position,
     collections: Vec<(Position, ResourcePile)>,
     custom: BaseOrCustomDialog,
-    pub info: CollectOptionsInfo,
+    pub info: CollectInfo,
 }
 
 impl CollectResources {
     pub fn new(
         player_index: usize,
         city_position: Position,
         custom: BaseOrCustomDialog,
-        info: CollectOptionsInfo,
+        info: CollectInfo,
     ) -> CollectResources {
         CollectResources {
             player_index,
@@ -92,7 +92,7 @@ pub fn collect_dialog(rc: &RenderContext, collect: &CollectResources) -> StateUp
     )
     .map_or(
         OkTooltip::Invalid("Too many resources selected".to_string()),
-        |(_, p)| OkTooltip::Valid(format!("Collect {p}")),
+        |i| OkTooltip::Valid(format!("Collect {}", i.total)),
     );
     if ok_button(rc, tooltip) {
         let extra = collect.extra_resources(game);

client/src/event_ui.rs

@@ -2,6 +2,7 @@ use crate::log_ui::break_text;
 use crate::payment_ui::Payment;
 use crate::render_context::RenderContext;
 use server::content::advances::get_advance;
+use server::content::builtin::get_builtin;
 use server::content::wonders::get_wonder;
 use server::events::EventOrigin;
 
@@ -10,6 +11,7 @@ pub fn event_help(rc: &RenderContext, origin: &EventOrigin, do_break: bool) -> V
     let h = match origin {
         EventOrigin::Advance(a) => get_advance(a).description,
         EventOrigin::Wonder(w) => get_wonder(w).description,
+        EventOrigin::Builtin(b) => get_builtin(b).description,
         EventOrigin::Leader(l) => {
             let l = rc.shown_player.get_leader(l).unwrap();
             // todo: leader should have a 2 event sources

client/src/map_ui.rs

@@ -138,6 +138,7 @@ pub fn pan_and_zoom(state: &mut State) {
 fn overlay_color(rc: &RenderContext, pos: Position) -> Color {
     let game = rc.game;
     let state = &rc.state;
+
     match &state.active_dialog {
         ActiveDialog::MoveUnits(s) => {
             if let Some(start) = s.start {
@@ -160,9 +161,7 @@ fn overlay_color(rc: &RenderContext, pos: Position) -> Color {
         ActiveDialog::RazeSize1City => {
             highlight_if(game.players[game.active_player()].can_raze_city(pos))
         }
-        ActiveDialog::PlaceSettler => {
-            highlight_if(game.players[game.active_player()].get_city(pos).is_some())
-        }
+        ActiveDialog::CustomPhasePositionRequest(choices) => highlight_if(choices.contains(&pos)),
         _ => {
             if let Some(p) = state.focused_tile {
                 highlight_if(p == pos)

client/src/player_ui.rs

@@ -254,7 +254,6 @@ fn move_state(state: &GameState) -> Option<&MoveState> {
         GameState::Combat(c) => move_state(&c.initiation),
         GameState::ExploreResolution(r) => Some(&r.move_state),
         GameState::Movement(m) => Some(m),
-        GameState::PlaceSettler(p) => Some(&p.move_state),
         _ => None,
     }
 }

server/src/ability_initializer.rs

@@ -1,10 +1,12 @@
 use crate::content::custom_phase_actions::{
     CurrentCustomPhaseEvent, CustomPhaseAdvanceRewardRequest, CustomPhaseEventAction,
-    CustomPhasePaymentRequest, CustomPhaseRequest, CustomPhaseResourceRewardRequest,
+    CustomPhasePaymentRequest, CustomPhasePositionRequest, CustomPhaseRequest,
+    CustomPhaseResourceRewardRequest,
 };
 use crate::events::{Event, EventOrigin};
 use crate::game::UndoContext;
-use crate::player_events::{CustomPhaseInfo, PlayerCommands};
+use crate::player_events::{CustomPhaseEvent, PlayerCommands};
+use crate::position::Position;
 use crate::resource_pile::ResourcePile;
 use crate::{content::custom_actions::CustomActionType, game::Game, player_events::PlayerEvents};
 use std::collections::HashMap;
@@ -90,7 +92,7 @@ pub(crate) trait AbilityInitializerSetup: Sized {
             + Clone,
     ) -> Self
     where
-        E: Fn(&mut PlayerEvents) -> &mut Event<Game, CustomPhaseInfo, V> + 'static + Clone,
+        E: Fn(&mut PlayerEvents) -> &mut CustomPhaseEvent<V> + 'static + Clone,
     {
         let origin = self.get_key();
         self.add_player_event_listener(
@@ -156,7 +158,7 @@ pub(crate) trait AbilityInitializerSetup: Sized {
         gain_reward: impl Fn(&mut PlayerCommands, &Game, &Vec<ResourcePile>) + 'static + Clone,
     ) -> Self
     where
-        E: Fn(&mut PlayerEvents) -> &mut Event<Game, CustomPhaseInfo, V> + 'static + Clone,
+        E: Fn(&mut PlayerEvents) -> &mut CustomPhaseEvent<V> + 'static + Clone,
     {
         self.add_payment_request_listener(
             event,
@@ -180,7 +182,7 @@ pub(crate) trait AbilityInitializerSetup: Sized {
         gain_reward: impl Fn(&mut Game, usize, &str, &Vec<ResourcePile>) + 'static + Clone,
     ) -> Self
     where
-        E: Fn(&mut PlayerEvents) -> &mut Event<Game, CustomPhaseInfo, V> + 'static + Clone,
+        E: Fn(&mut PlayerEvents) -> &mut CustomPhaseEvent<V> + 'static + Clone,
     {
         self.add_state_change_event_listener(
             event,
@@ -217,7 +219,7 @@ pub(crate) trait AbilityInitializerSetup: Sized {
         gain_reward_log: impl Fn(&Game, usize, &str, &ResourcePile, bool) -> String + 'static + Clone,
     ) -> Self
     where
-        E: Fn(&mut PlayerEvents) -> &mut Event<Game, CustomPhaseInfo, V> + 'static + Clone,
+        E: Fn(&mut PlayerEvents) -> &mut CustomPhaseEvent<V> + 'static + Clone,
     {
         let g = gain_reward_log.clone();
         self.add_state_change_event_listener(
@@ -266,7 +268,7 @@ pub(crate) trait AbilityInitializerSetup: Sized {
         gain_reward: impl Fn(&mut Game, usize, &str, &str, bool) + 'static + Clone,
     ) -> Self
     where
-        E: Fn(&mut PlayerEvents) -> &mut Event<Game, CustomPhaseInfo, V> + 'static + Clone,
+        E: Fn(&mut PlayerEvents) -> &mut CustomPhaseEvent<V> + 'static + Clone,
     {
         let g = gain_reward.clone();
         self.add_state_change_event_listener(
@@ -302,6 +304,47 @@ pub(crate) trait AbilityInitializerSetup: Sized {
         )
     }
 
+    fn add_position_reward_request_listener<E, V>(
+        self,
+        event: E,
+        priority: i32,
+        request: impl Fn(&mut Game, usize, &V) -> Option<CustomPhasePositionRequest> + 'static + Clone,
+        gain_reward: impl Fn(&mut PlayerCommands, &Game, &Position) + 'static + Clone,
+    ) -> Self
+    where
+        E: Fn(&mut PlayerEvents) -> &mut CustomPhaseEvent<V> + 'static + Clone,
+    {
+        let g = gain_reward.clone();
+        self.add_state_change_event_listener(
+            event,
+            priority,
+            move |game, player_index, _player_name, details| {
+                let req = request(game, player_index, details);
+                if let Some(r) = &req {
+                    if r.choices.len() == 1 {
+                        game.with_commands(player_index, |commands, game| {
+                            g(commands, game, &r.choices[0]);
+                        });
+                        return None;
+                    }
+                }
+                req.map(CustomPhaseRequest::SelectPosition)
+            },
+            move |game, player_index, _player_name, action, request| {
+                if let CustomPhaseRequest::SelectPosition(request) = &request {
+                    if let CustomPhaseEventAction::SelectPosition(reward) = action {
+                        assert!(request.choices.contains(&reward), "Invalid position");
+                        game.with_commands(player_index, |commands, game| {
+                            gain_reward(commands, game, &reward);
+                        });
+                        return;
+                    }
+                }
+                panic!("Invalid state");
+            },
+        )
+    }
+
     fn add_custom_action(self, action: CustomActionType) -> Self {
         let deinitializer_action = action.clone();
         let key = self.get_key().clone();

server/src/action.rs

@@ -1,7 +1,6 @@
 use crate::content::custom_phase_actions::CustomPhaseEventAction;
 use crate::map::Rotation;
 use crate::playing_actions::PlayingAction;
-use crate::position::Position;
 use crate::status_phase::StatusPhaseAction;
 use crate::unit::MovementAction;
 use serde::{Deserialize, Serialize};
@@ -13,7 +12,6 @@ pub enum Action {
     Movement(MovementAction),
     CulturalInfluenceResolution(bool),
     Combat(CombatAction),
-    PlaceSettler(Position),
     ExploreResolution(Rotation),
     CustomPhaseEvent(CustomPhaseEventAction),
     Undo,
@@ -75,15 +73,6 @@ impl Action {
         }
     }
 
-    #[must_use]
-    pub fn place_settler(self) -> Option<Position> {
-        if let Self::PlaceSettler(v) = self {
-            Some(v)
-        } else {
-            None
-        }
-    }
-
     #[must_use]
     pub fn explore_resolution(self) -> Option<Rotation> {
         if let Self::ExploreResolution(v) = self {

server/src/city.rs

@@ -96,8 +96,9 @@ impl City {
 
     pub fn undo_activate(&mut self) {
         self.activations -= 1;
-        self.angry_activation = false;
-        if self.is_activated() {
+        if self.angry_activation {
+            self.angry_activation = false;
+        } else if self.is_activated() {
             self.increase_mood_state();
         }
     }