Payment model (#134)

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::{payment_model_dialog, PaymentModelEntry};
+use crate::payment_ui::{new_payment, payment_model_dialog, Payment};
 use crate::player_ui::player_color;
 use crate::render_context::RenderContext;
 use crate::tooltip::show_tooltip_for_rect;
@@ -13,9 +13,7 @@ use macroquad::prelude::{
 use server::action::Action;
 use server::advance::{Advance, Bonus};
 use server::content::advances;
-use server::game::Game;
 use server::game::GameState;
-use server::payment::PaymentModel;
 use server::player::Player;
 use server::playing_actions::PlayingAction;
 use server::status_phase::StatusPhaseAction;
@@ -30,22 +28,9 @@ pub enum AdvanceState {
     Unavailable,
 }
 
-#[derive(Clone)]
-pub struct AdvancePayment {
-    pub name: String,
-    model: PaymentModel,
-}
-
-impl AdvancePayment {
-    fn new(game: &Game, player_index: usize, name: &str) -> AdvancePayment {
-        let model = game
-            .get_player(player_index)
-            .get_advance_payment_options(name);
-        AdvancePayment {
-            name: name.to_string(),
-            model,
-        }
-    }
+fn new_advance_payment(rc: &RenderContext, name: &str) -> Payment {
+    let p = rc.shown_player;
+    new_payment(&p.advance_cost(name), &p.resources, name, false)
 }
 
 pub fn show_paid_advance_menu(rc: &RenderContext) -> StateUpdate {
@@ -64,9 +49,8 @@ pub fn show_paid_advance_menu(rc: &RenderContext) -> StateUpdate {
             }
         },
         |a| {
-            StateUpdate::OpenDialog(ActiveDialog::AdvancePayment(AdvancePayment::new(
-                game,
-                rc.shown_player.index,
+            StateUpdate::OpenDialog(ActiveDialog::AdvancePayment(new_advance_payment(
+                rc,
                 a.name.as_str(),
             )))
         },
@@ -222,25 +206,16 @@ fn description(p: &Player, a: &Advance) -> Vec<String> {
     parts
 }
 
-pub fn pay_advance_dialog(ap: &AdvancePayment, rc: &RenderContext) -> StateUpdate {
+pub fn pay_advance_dialog(ap: &Payment, rc: &RenderContext) -> StateUpdate {
     let update = show_paid_advance_menu(rc);
     if !matches!(update, StateUpdate::None) {
         // select a different advance
         return update;
     };
     payment_model_dialog(
         rc,
-        &[PaymentModelEntry {
-            name: ap.name.clone(),
-            model: ap.model.clone(),
-            optional: false,
-        }],
-        |p| {
-            ActiveDialog::AdvancePayment(AdvancePayment {
-                name: ap.name.clone(),
-                model: p[0].model.clone(),
-            })
-        },
+        &[ap.clone()],
+        |p| ActiveDialog::AdvancePayment(p[0].clone()),
         true,
         |pile| {
             StateUpdate::Execute(Action::Playing(PlayingAction::Advance {

client/src/client_state.rs

@@ -8,7 +8,6 @@ use server::game::{CulturalInfluenceResolution, CurrentMove, Game, GameState};
 use server::position::Position;
 use server::status_phase::{StatusPhaseAction, StatusPhaseState};
 
-use crate::advance_ui::AdvancePayment;
 use crate::assets::Assets;
 use crate::city_ui::building_name;
 use crate::client::{Features, GameSyncRequest};
@@ -20,6 +19,7 @@ use crate::layout_ui::FONT_SIZE;
 use crate::log_ui::advance_help;
 use crate::map_ui::ExploreResolutionConfig;
 use crate::move_ui::{MoveDestination, MoveIntent, MoveSelection};
+use crate::payment_ui::Payment;
 use crate::recruit_unit_ui::{RecruitAmount, RecruitSelection};
 use crate::render_context::RenderContext;
 use crate::status_phase_ui::ChooseAdditionalAdvances;
@@ -34,7 +34,7 @@ pub enum ActiveDialog {
     // playing actions
     IncreaseHappiness(IncreaseHappinessConfig),
     AdvanceMenu,
-    AdvancePayment(AdvancePayment),
+    AdvancePayment(Payment),
     ConstructionPayment(ConstructionPayment),
     CollectResources(CollectResources),
     RecruitUnitSelection(RecruitAmount),
@@ -106,11 +106,8 @@ impl ActiveDialog {
                     "Click on a city to increase happiness".to_string(),
                 ]
             }
-            ActiveDialog::AdvancePayment(a) => {
-                vec![format!("Click on resources to pay for {}", a.name)]
-            }
-            ActiveDialog::ConstructionPayment(c) => {
-                vec![format!("Click on resources to pay for {}", c.name)]
+            ActiveDialog::AdvancePayment(_) | ActiveDialog::ConstructionPayment(_) => {
+                vec!["Pay resources".to_string()]
             }
             ActiveDialog::CollectResources(collect) => collect.help_text(rc.game),
             ActiveDialog::RecruitUnitSelection(_) => vec!["Click on a unit to recruit".to_string()],

client/src/combat_ui.rs

@@ -1,6 +1,6 @@
 use crate::client_state::{ActiveDialog, StateUpdate};
 use crate::dialog_ui::{cancel_button_with_tooltip, ok_button, OkTooltip};
-use crate::payment_ui::{payment_model_dialog, PaymentModelEntry};
+use crate::payment_ui::{new_payment, payment_model_dialog, Payment};
 use crate::render_context::RenderContext;
 use crate::select_ui::ConfirmSelection;
 use crate::unit_ui;
@@ -10,7 +10,6 @@ use server::content::custom_phase_actions::{
     CustomPhaseAction, SiegecraftPayment, SIEGECRAFT_EXTRA_DIE, SIEGECRAFT_IGNORE_HIT,
 };
 use server::game::Game;
-use server::payment::get_single_resource_payment_model;
 use server::position::Position;
 use server::unit::Unit;
 
@@ -100,44 +99,46 @@ pub fn play_action_card_dialog(rc: &RenderContext) -> StateUpdate {
 
 #[derive(Clone)]
 pub struct SiegecraftPaymentModel {
-    extra_die: PaymentModelEntry,
-    ignore_hit: PaymentModelEntry,
+    extra_die: Payment,
+    ignore_hit: Payment,
 }
 
 impl SiegecraftPaymentModel {
     pub fn new(game: &Game) -> SiegecraftPaymentModel {
         let available = game.get_player(game.active_player()).resources.clone();
         SiegecraftPaymentModel {
-            extra_die: PaymentModelEntry {
-                name: "Cancel fortress extra die in first round of combat".to_string(),
-                model: get_single_resource_payment_model(&available, &SIEGECRAFT_EXTRA_DIE),
-                optional: true,
-            },
-            ignore_hit: PaymentModelEntry {
-                name: "Cancel fortress ignore hit in first round of combat".to_string(),
-                model: get_single_resource_payment_model(&available, &SIEGECRAFT_IGNORE_HIT),
-                optional: true,
-            },
+            extra_die: new_payment(
+                &SIEGECRAFT_EXTRA_DIE,
+                &available,
+                "Cancel fortress extra die in first round of combat",
+                true,
+            ),
+            ignore_hit: new_payment(
+                &SIEGECRAFT_IGNORE_HIT,
+                &available,
+                "Cancel fortress ignore hit in first round of combat",
+                true,
+            ),
         }
     }
 }
 
 pub fn pay_siegecraft_dialog(p: &SiegecraftPaymentModel, rc: &RenderContext) -> StateUpdate {
     payment_model_dialog(
         rc,
-        &vec![p.extra_die.clone(), p.ignore_hit.clone()],
+        &[p.extra_die.clone(), p.ignore_hit.clone()],
         |p| {
             ActiveDialog::SiegecraftPayment(SiegecraftPaymentModel {
                 extra_die: p[0].clone(),
                 ignore_hit: p[1].clone(),
             })
         },
         false,
-        |_| {
+        |p| {
             StateUpdate::Execute(Action::CustomPhase(
                 CustomPhaseAction::SiegecraftPaymentAction(SiegecraftPayment {
-                    extra_die: p.extra_die.model.default().clone(),
-                    ignore_hit: p.ignore_hit.model.default().clone(),
+                    extra_die: p[0].clone(),
+                    ignore_hit: p[1].clone(),
                 }),
             ))
         },