Trade routes (#141)

Author: zeitlinger

client/src/advance_ui.rs

@@ -1,7 +1,7 @@
 use crate::client_state::{ActiveDialog, StateUpdate};
 use crate::layout_ui::{left_mouse_button_pressed_in_rect, top_centered_text};
 use crate::log_ui::break_text;
-use crate::payment_ui::{new_payment, payment_dialog, Payment};
+use crate::payment_ui::{payment_dialog, Payment};
 use crate::player_ui::player_color;
 use crate::render_context::RenderContext;
 use crate::tooltip::show_tooltip_for_rect;
@@ -30,7 +30,9 @@ pub enum AdvanceState {
 
 fn new_advance_payment(rc: &RenderContext, name: &str) -> Payment {
     let p = rc.shown_player;
-    new_payment(&p.advance_cost(name), &p.resources, name, false)
+    let model = &p.advance_cost(name);
+    let available = &p.resources;
+    Payment::new(model, available, name, false)
 }
 
 pub fn show_paid_advance_menu(rc: &RenderContext) -> StateUpdate {
@@ -212,7 +214,7 @@ pub fn pay_advance_dialog(ap: &Payment, rc: &RenderContext) -> StateUpdate {
         // select a different advance
         return update;
     };
-    payment_dialog(rc, ap, ActiveDialog::AdvancePayment, true, |payment| {
+    payment_dialog(rc, ap, ActiveDialog::AdvancePayment, |payment| {
         StateUpdate::Execute(Action::Playing(PlayingAction::Advance {
             advance: ap.name.to_string(),
             payment,

client/src/client.rs

@@ -23,7 +23,8 @@ use crate::render_context::RenderContext;
 use crate::status_phase_ui::raze_city_confirm_dialog;
 use crate::unit_ui::unit_selection_click;
 use crate::{
-    combat_ui, dialog_ui, influence_ui, map_ui, move_ui, recruit_unit_ui, status_phase_ui, tooltip,
+    combat_ui, custom_actions_ui, dialog_ui, influence_ui, map_ui, move_ui, recruit_unit_ui,
+    status_phase_ui, tooltip,
 };
 
 fn render_with_mutable_state(game: &Game, state: &mut State, features: &Features) -> StateUpdate {
@@ -155,6 +156,9 @@ fn render_active_dialog(rc: &RenderContext) -> StateUpdate {
             status_phase_ui::choose_additional_advances_dialog(rc, a)
         }
         ActiveDialog::DetermineFirstPlayer => status_phase_ui::determine_first_player_dialog(rc),
+        ActiveDialog::TradeRouteSelection(p) => {
+            custom_actions_ui::trade_route_selection_dialog(rc, p)
+        }
 
         //combat
         ActiveDialog::PlayActionCard => combat_ui::play_action_card_dialog(rc),

client/src/client_state.rs

@@ -1,9 +1,9 @@
 use macroquad::prelude::*;
 use server::action::Action;
 use server::city::{City, MoodState};
-use server::combat::{active_attackers, active_defenders, Combat, CombatPhase};
+use server::combat::{active_attackers, active_defenders, CombatPhase};
 use server::content::advances::{NAVIGATION, ROADS, SIEGECRAFT, STEEL_WEAPONS};
-use server::content::custom_phase_actions::{steel_weapons_cost, CustomPhaseState};
+use server::content::custom_phase_actions::CustomPhaseState;
 use server::game::{CulturalInfluenceResolution, CurrentMove, Game, GameState};
 use server::position::Position;
 use server::status_phase::{StatusPhaseAction, StatusPhaseState};
@@ -12,14 +12,17 @@ use crate::assets::Assets;
 use crate::city_ui::building_name;
 use crate::client::{Features, GameSyncRequest};
 use crate::collect_ui::CollectResources;
-use crate::combat_ui::{RemoveCasualtiesSelection, SiegecraftPaymentDialog, SteelWeaponDialog};
+use crate::combat_ui::{
+    steel_weapons_dialog, RemoveCasualtiesSelection, SiegecraftPaymentDialog, SteelWeaponDialog,
+};
 use crate::construct_ui::ConstructionPayment;
+use crate::custom_actions_ui::trade_route_dialog;
 use crate::happiness_ui::IncreaseHappinessConfig;
 use crate::layout_ui::FONT_SIZE;
 use crate::log_ui::{add_advance_help, advance_help};
 use crate::map_ui::ExploreResolutionConfig;
 use crate::move_ui::{MoveDestination, MoveIntent, MoveSelection};
-use crate::payment_ui::{new_payment, Payment};
+use crate::payment_ui::Payment;
 use crate::recruit_unit_ui::{RecruitAmount, RecruitSelection};
 use crate::render_context::RenderContext;
 use crate::status_phase_ui::ChooseAdditionalAdvances;
@@ -59,6 +62,7 @@ pub enum ActiveDialog {
     RemoveCasualties(RemoveCasualtiesSelection),
     SiegecraftPayment(SiegecraftPaymentDialog),
     SteelWeaponPayment(SteelWeaponDialog),
+    TradeRouteSelection(Payment), // it's actually a gain
 }
 
 impl ActiveDialog {
@@ -92,6 +96,7 @@ impl ActiveDialog {
             ActiveDialog::RemoveCasualties(_) => "remove casualties",
             ActiveDialog::SiegecraftPayment(_) => "siegecraft payment",
             ActiveDialog::SteelWeaponPayment(_) => "steel weapon payment",
+            ActiveDialog::TradeRouteSelection(_) => "trade route selection",
         }
     }
 
@@ -185,6 +190,7 @@ impl ActiveDialog {
                 add_advance_help(rc, &mut result, STEEL_WEAPONS);
                 result
             }
+            ActiveDialog::TradeRouteSelection(_) => vec!["Select trade route reward".to_string()],
         }
     }
 
@@ -557,29 +563,16 @@ impl State {
                     ActiveDialog::SiegecraftPayment(SiegecraftPaymentDialog::new(game))
                 }
                 CustomPhaseState::SteelWeaponsAttacker(c) => {
-                    Self::steel_weapons_dialog(game, c, c.attacker)
+                    steel_weapons_dialog(game, c, c.attacker)
                 }
                 CustomPhaseState::SteelWeaponsDefender(c) => {
-                    Self::steel_weapons_dialog(game, c, c.defender)
+                    steel_weapons_dialog(game, c, c.defender)
                 }
+                CustomPhaseState::TradeRouteSelection => trade_route_dialog(game),
             },
         }
     }
 
-    fn steel_weapons_dialog(game: &Game, c: &Combat, player_index: usize) -> ActiveDialog {
-        let payment = new_payment(
-            &steel_weapons_cost(game, c, player_index),
-            &game.get_player(player_index).resources,
-            "Use steel weapons",
-            true,
-        );
-        ActiveDialog::SteelWeaponPayment(SteelWeaponDialog {
-            attacker: player_index == c.attacker,
-            payment,
-            combat: c.clone(),
-        })
-    }
-
     #[must_use]
     pub fn measure_text(&self, text: &str) -> TextDimensions {
         measure_text(text, Some(&self.assets.font), FONT_SIZE, 1.0)

client/src/combat_ui.rs

@@ -1,14 +1,15 @@
 use crate::client_state::{ActiveDialog, StateUpdate};
 use crate::dialog_ui::{cancel_button_with_tooltip, ok_button, OkTooltip};
-use crate::payment_ui::{multi_payment_dialog, new_payment, payment_dialog, Payment};
+use crate::payment_ui::{multi_payment_dialog, payment_dialog, Payment};
 use crate::render_context::RenderContext;
 use crate::select_ui::ConfirmSelection;
 use crate::unit_ui;
 use crate::unit_ui::UnitSelection;
 use server::action::{Action, CombatAction, PlayActionCard};
 use server::combat::Combat;
 use server::content::custom_phase_actions::{
-    CustomPhaseAction, SiegecraftPayment, SIEGECRAFT_EXTRA_DIE, SIEGECRAFT_IGNORE_HIT,
+    steel_weapons_cost, CustomPhaseAction, SiegecraftPayment, SIEGECRAFT_EXTRA_DIE,
+    SIEGECRAFT_IGNORE_HIT,
 };
 use server::game::Game;
 use server::position::Position;
@@ -108,13 +109,13 @@ impl SiegecraftPaymentDialog {
     pub fn new(game: &Game) -> SiegecraftPaymentDialog {
         let available = game.get_player(game.active_player()).resources.clone();
         SiegecraftPaymentDialog {
-            extra_die: new_payment(
+            extra_die: Payment::new(
                 &SIEGECRAFT_EXTRA_DIE,
                 &available,
                 "Cancel fortress extra die in first round of combat",
                 true,
             ),
-            ignore_hit: new_payment(
+            ignore_hit: Payment::new(
                 &SIEGECRAFT_IGNORE_HIT,
                 &available,
                 "Cancel fortress ignore hit in first round of combat",
@@ -153,6 +154,17 @@ pub struct SteelWeaponDialog {
     pub combat: Combat,
 }
 
+pub fn steel_weapons_dialog(game: &Game, c: &Combat, player_index: usize) -> ActiveDialog {
+    let model = &steel_weapons_cost(game, c, player_index);
+    let available = &game.get_player(player_index).resources;
+    let payment = Payment::new(model, available, "Use steel weapons", true);
+    ActiveDialog::SteelWeaponPayment(SteelWeaponDialog {
+        attacker: player_index == c.attacker,
+        payment,
+        combat: c.clone(),
+    })
+}
+
 pub(crate) fn pay_steel_weapons_dialog(
     rc: &RenderContext,
     dialog: &SteelWeaponDialog,
@@ -167,7 +179,6 @@ pub(crate) fn pay_steel_weapons_dialog(
             n.payment = p;
             ActiveDialog::SteelWeaponPayment(n)
         },
-        false,
         |p| {
             if attacker {
                 StateUpdate::Execute(Action::CustomPhase(

client/src/construct_ui.rs

@@ -1,5 +1,5 @@
 use crate::client_state::{ActiveDialog, StateUpdate};
-use crate::payment_ui::{new_payment, payment_dialog, Payment};
+use crate::payment_ui::{payment_dialog, Payment};
 use crate::recruit_unit_ui::RecruitSelection;
 use crate::render_context::RenderContext;
 use server::action::Action;
@@ -45,7 +45,6 @@ pub fn pay_construction_dialog(rc: &RenderContext, cp: &ConstructionPayment) ->
             new.payment = p;
             ActiveDialog::ConstructionPayment(new)
         },
-        true,
         |payment| match &cp.project {
             ConstructionProject::Building(b, pos) => StateUpdate::execute_activation(
                 Action::Playing(PlayingAction::Construct(Construct {
@@ -125,7 +124,8 @@ impl ConstructionPayment {
             ),
         };
 
-        let payment = new_payment(&cost, &rc.shown_player.resources, name, false);
+        let available = &rc.shown_player.resources;
+        let payment = Payment::new(&cost, available, name, false);
 
         ConstructionPayment {
             player_index: city.player_index,

client/src/custom_actions_ui.rs

@@ -0,0 +1,25 @@
+use crate::client_state::{ActiveDialog, StateUpdate};
+use crate::payment_ui::{payment_dialog, Payment};
+use crate::render_context::RenderContext;
+use server::action::Action;
+use server::content::custom_phase_actions::CustomPhaseAction;
+use server::content::trade_routes::trade_route_reward;
+use server::game::Game;
+
+pub fn trade_route_dialog(game: &Game) -> ActiveDialog {
+    let model = trade_route_reward(game).unwrap().0;
+    ActiveDialog::TradeRouteSelection(Payment::new_gain(model, "Select trade route reward"))
+}
+
+pub fn trade_route_selection_dialog(rc: &RenderContext, payment: &Payment) -> StateUpdate {
+    payment_dialog(
+        rc,
+        payment,
+        |p| ActiveDialog::TradeRouteSelection(p.clone()),
+        |p| {
+            StateUpdate::Execute(Action::CustomPhase(
+                CustomPhaseAction::TradeRouteSelectionAction(p),
+            ))
+        },
+    )
+}

client/src/happiness_ui.rs

@@ -1,7 +1,7 @@
 use crate::action_buttons::{base_or_custom_action, base_or_custom_available};
 use crate::client_state::{ActiveDialog, StateUpdate};
 use crate::dialog_ui::{BaseOrCustomAction, BaseOrCustomDialog};
-use crate::payment_ui::{new_payment, payment_dialog, Payment};
+use crate::payment_ui::{payment_dialog, Payment};
 use crate::render_context::RenderContext;
 use server::action::Action;
 use server::city::City;
@@ -37,7 +37,8 @@ impl IncreaseHappinessConfig {
             .reduce(|a, b| a + b)
             .unwrap();
 
-        new_payment(&payment, &p.resources, "Increase happiness", false)
+        let available = &p.resources;
+        Payment::new(&payment, available, "Increase happiness", false)
     }
 }
 
@@ -135,7 +136,6 @@ pub fn increase_happiness_menu(rc: &RenderContext, h: &IncreaseHappinessConfig)
                 custom: h.custom.clone(),
             })
         },
-        true,
         |payment| {
             let i = IncreaseHappiness {
                 happiness_increases: h.steps.clone(),

client/src/lib.rs

@@ -18,6 +18,7 @@ pub mod client_state;
 mod collect_ui;
 mod combat_ui;
 mod construct_ui;
+mod custom_actions_ui;
 mod dialog_ui;
 mod happiness_ui;
 mod hex_ui;