more tech (#152)

Author: zeitlinger

client/src/advance_ui.rs

@@ -89,18 +89,18 @@ pub fn show_advance_menu(
     let state = rc.state;
 
     for pass in 0..2 {
-        for (i, (group_name, advances)) in advances::get_groups().iter().enumerate() {
+        for (i, group) in advances::get_groups().iter().enumerate() {
             let pos =
                 vec2(i.rem(COLUMNS) as f32 * 140., (i / COLUMNS) as f32 * 180.) + vec2(20., 70.);
             if pass == 0 {
                 state.draw_text(
-                    group_name,
-                    pos.x + (140. - state.measure_text(group_name).width) / 2.,
+                    &group.name,
+                    pos.x + (140. - state.measure_text(&group.name).width) / 2.,
                     pos.y - 15.,
                 );
             }
 
-            for (i, a) in advances.iter().enumerate() {
+            for (i, a) in group.advances.iter().enumerate() {
                 let pos = pos + vec2(0., i as f32 * 35.);
                 let name = &a.name;
                 let advance_state = advance_state(a, p);

client/src/client.rs

@@ -165,7 +165,12 @@ fn render_active_dialog(rc: &RenderContext) -> StateUpdate {
         ActiveDialog::CustomPhasePaymentRequest(c) => {
             custom_actions_ui::custom_phase_payment_dialog(rc, c)
         }
-        ActiveDialog::CustomPhaseRewardRequest(p) => custom_actions_ui::reward_dialog(rc, p),
+        ActiveDialog::CustomPhaseResourceRewardRequest(p) => {
+            custom_actions_ui::payment_reward_dialog(rc, p)
+        }
+        ActiveDialog::CustomPhaseAdvanceRewardRequest(r) => {
+            custom_actions_ui::advance_reward_dialog(rc, r, ActiveDialog::event_origin(rc).name())
+        }
     }
 }
 

client/src/client_state.rs

@@ -18,7 +18,7 @@ use server::action::Action;
 use server::city::{City, MoodState};
 use server::combat::{active_attackers, active_defenders, CombatPhase};
 use server::content::advances::{NAVIGATION, ROADS};
-use server::content::custom_phase_actions::CustomPhaseRequest;
+use server::content::custom_phase_actions::{CustomPhaseAdvanceRewardRequest, CustomPhaseRequest};
 use server::game::{CulturalInfluenceResolution, CurrentMove, Game, GameState};
 use server::position::Position;
 use server::status_phase::{StatusPhaseAction, StatusPhaseState};
@@ -59,7 +59,8 @@ pub enum ActiveDialog {
     Retreat,
     RemoveCasualties(RemoveCasualtiesSelection),
 
-    CustomPhaseRewardRequest(Payment),
+    CustomPhaseResourceRewardRequest(Payment),
+    CustomPhaseAdvanceRewardRequest(CustomPhaseAdvanceRewardRequest),
     CustomPhasePaymentRequest(Vec<Payment>),
 }
 
@@ -93,7 +94,8 @@ impl ActiveDialog {
             ActiveDialog::PlaceSettler => "place settler",
             ActiveDialog::Retreat => "retreat",
             ActiveDialog::RemoveCasualties(_) => "remove casualties",
-            ActiveDialog::CustomPhaseRewardRequest(_) => "trade route selection",
+            ActiveDialog::CustomPhaseResourceRewardRequest(_) => "trade route selection",
+            ActiveDialog::CustomPhaseAdvanceRewardRequest(_) => "advance selection",
             ActiveDialog::CustomPhasePaymentRequest(_) => "custom phase payment request",
         }
     }
@@ -185,18 +187,31 @@ impl ActiveDialog {
                 }
             )],
             ActiveDialog::WaitingForUpdate => vec!["Waiting for server update".to_string()],
-            ActiveDialog::CustomPhaseRewardRequest(_) => {
-                vec!["Select trade route reward".to_string()]
-            }
-            ActiveDialog::CustomPhasePaymentRequest(_r) => {
-                match &rc.game.custom_phase_state.current.as_ref().unwrap().origin {
-                    EventOrigin::Advance(a) => advance_help(rc, a),
-                    _ => vec![], // TODO
-                }
-            }
+            ActiveDialog::CustomPhaseResourceRewardRequest(_)
+            | ActiveDialog::CustomPhaseAdvanceRewardRequest(_)
+            | ActiveDialog::CustomPhasePaymentRequest(_) => Self::event_help(rc),
+        }
+    }
+
+    #[must_use]
+    pub fn event_help(rc: &RenderContext) -> Vec<String> {
+        match &Self::event_origin(rc) {
+            EventOrigin::Advance(a) => advance_help(rc, a),
+            _ => vec![], // TODO
         }
     }
 
+    #[must_use]
+    pub fn event_origin(rc: &RenderContext) -> EventOrigin {
+        rc.game
+            .custom_phase_state
+            .current
+            .as_ref()
+            .unwrap()
+            .origin
+            .clone()
+    }
+
     #[must_use]
     pub fn show_for_other_player(&self) -> bool {
         matches!(self, ActiveDialog::Log | ActiveDialog::DetermineFirstPlayer) || self.is_advance()
@@ -221,6 +236,7 @@ impl ActiveDialog {
                 | ActiveDialog::AdvancePayment(_)
                 | ActiveDialog::ChangeGovernmentType
                 | ActiveDialog::ChooseAdditionalAdvances(_)
+                | ActiveDialog::CustomPhaseAdvanceRewardRequest(_)
         )
     }
 }
@@ -525,8 +541,13 @@ impl State {
                         })
                         .collect(),
                 ),
-                CustomPhaseRequest::Reward(r) => {
-                    ActiveDialog::CustomPhaseRewardRequest(Payment::new_gain(&r.reward, &r.name))
+                CustomPhaseRequest::ResourceReward(r) => {
+                    ActiveDialog::CustomPhaseResourceRewardRequest(Payment::new_gain(
+                        &r.reward, &r.name,
+                    ))
+                }
+                CustomPhaseRequest::AdvanceReward(r) => {
+                    ActiveDialog::CustomPhaseAdvanceRewardRequest(r.clone())
                 }
             };
         }

client/src/construct_ui.rs

@@ -51,7 +51,6 @@ pub fn pay_construction_dialog(rc: &RenderContext, cp: &ConstructionPayment) ->
                     city_piece: *b,
                     payment,
                     port_position: *pos,
-                    temple_bonus: None,
                 })),
                 vec![],
                 city,

client/src/custom_actions_ui.rs

@@ -1,19 +1,22 @@
+use crate::advance_ui::{show_advance_menu, AdvanceState};
 use crate::client_state::{ActiveDialog, StateUpdate};
 use crate::payment_ui::{multi_payment_dialog, payment_dialog, Payment};
 use crate::render_context::RenderContext;
 use server::action::Action;
-use server::content::custom_phase_actions::CustomPhaseEventAction;
+use server::content::custom_phase_actions::{
+    CustomPhaseAdvanceRewardRequest, CustomPhaseEventAction,
+};
 
-pub fn reward_dialog(rc: &RenderContext, payment: &Payment) -> StateUpdate {
+pub fn payment_reward_dialog(rc: &RenderContext, payment: &Payment) -> StateUpdate {
     payment_dialog(
         rc,
         payment,
         false,
-        |p| ActiveDialog::CustomPhaseRewardRequest(p.clone()),
+        |p| ActiveDialog::CustomPhaseResourceRewardRequest(p.clone()),
         |p| {
-            StateUpdate::Execute(Action::CustomPhaseEvent(CustomPhaseEventAction::Reward(
-                p.clone(),
-            )))
+            StateUpdate::Execute(Action::CustomPhaseEvent(
+                CustomPhaseEventAction::ResourceReward(p.clone()),
+            ))
         },
     )
 }
@@ -31,3 +34,27 @@ pub fn custom_phase_payment_dialog(rc: &RenderContext, payments: &[Payment]) ->
         },
     )
 }
+
+pub fn advance_reward_dialog(
+    rc: &RenderContext,
+    r: &CustomPhaseAdvanceRewardRequest,
+    name: &str,
+) -> StateUpdate {
+    let possible = &r.choices;
+    show_advance_menu(
+        rc,
+        &format!("Select advance for {name}"),
+        |a, _| {
+            if possible.contains(&a.name) {
+                AdvanceState::Available
+            } else {
+                AdvanceState::Unavailable
+            }
+        },
+        |a| {
+            StateUpdate::Execute(Action::CustomPhaseEvent(
+                CustomPhaseEventAction::AdvanceReward(a.name.clone()),
+            ))
+        },
+    )
+}

client/src/local_client/bin/main.rs

@@ -240,9 +240,9 @@ pub fn setup_local_game() -> Game {
         .pieces
         .market = Some(1);
 
-    game.advance("Voting", player_index1);
-    game.advance("Free Economy", player_index1);
-    game.advance("Storage", player_index1);
+    game.advance("Voting", player_index1, ResourcePile::empty());
+    game.advance("Free Economy", player_index1, ResourcePile::empty());
+    game.advance("Storage", player_index1, ResourcePile::empty());
     game.players[player_index1].gain_resources(ResourcePile::food(5));
 
     game

client/src/payment_ui.rs

@@ -196,7 +196,7 @@ fn ok_tooltip(payments: &[Payment], mut available: ResourcePile) -> OkTooltip {
         let name = &payment.name;
         let tooltip = if payment.optional && pile.is_empty() {
             OkTooltip::Valid(format!("Pay nothing for {name}"))
-        } else if available.has_at_least(&pile, 1) && cost.is_valid_payment(&pile) {
+        } else if available.has_at_least(&pile) && cost.is_valid_payment(&pile) {
             // make sure that we can afford all the payments
             available -= payment.to_resource_pile();
             OkTooltip::Valid(format!("Pay {pile} for {name}"))