Custom event phase (#146)

Author: zeitlinger

client/src/client.rs

@@ -164,8 +164,10 @@ fn render_active_dialog(rc: &RenderContext) -> StateUpdate {
         ActiveDialog::PlayActionCard => combat_ui::play_action_card_dialog(rc),
         ActiveDialog::Retreat => combat_ui::retreat_dialog(rc),
         ActiveDialog::RemoveCasualties(s) => combat_ui::remove_casualties_dialog(rc, s),
-        ActiveDialog::SiegecraftPayment(p) => combat_ui::pay_siegecraft_dialog(p, rc),
-        ActiveDialog::SteelWeaponPayment(p) => combat_ui::pay_steel_weapons_dialog(rc, p),
+
+        ActiveDialog::CustomPhasePaymentRequest(c) => {
+            custom_actions_ui::custom_phase_payment_dialog(rc, c)
+        }
     }
 }
 

client/src/client_state.rs

@@ -1,19 +1,18 @@
 use macroquad::prelude::*;
+use server::ability_initializer::EventOrigin;
 use server::action::Action;
 use server::city::{City, MoodState};
 use server::combat::{active_attackers, active_defenders, CombatPhase};
-use server::content::advances::{NAVIGATION, ROADS, SIEGECRAFT, STEEL_WEAPONS};
-use server::content::custom_phase_actions::CustomPhaseState;
+use server::content::advances::{NAVIGATION, ROADS};
+use server::content::custom_phase_actions::{CustomPhaseRequest, CustomPhaseState};
 use server::game::{CulturalInfluenceResolution, CurrentMove, Game, GameState};
 use server::position::Position;
 use server::status_phase::{StatusPhaseAction, StatusPhaseState};
 
 use crate::assets::Assets;
 use crate::client::{Features, GameSyncRequest};
 use crate::collect_ui::CollectResources;
-use crate::combat_ui::{
-    steel_weapons_dialog, RemoveCasualtiesSelection, SiegecraftPaymentDialog, SteelWeaponDialog,
-};
+use crate::combat_ui::RemoveCasualtiesSelection;
 use crate::construct_ui::ConstructionPayment;
 use crate::custom_actions_ui::trade_route_dialog;
 use crate::happiness_ui::IncreaseHappinessConfig;
@@ -59,9 +58,9 @@ pub enum ActiveDialog {
     PlaceSettler,
     Retreat,
     RemoveCasualties(RemoveCasualtiesSelection),
-    SiegecraftPayment(SiegecraftPaymentDialog),
-    SteelWeaponPayment(SteelWeaponDialog),
     TradeRouteSelection(Payment), // it's actually a gain
+
+    CustomPhasePaymentRequest(Vec<Payment>),
 }
 
 impl ActiveDialog {
@@ -93,9 +92,8 @@ impl ActiveDialog {
             ActiveDialog::PlaceSettler => "place settler",
             ActiveDialog::Retreat => "retreat",
             ActiveDialog::RemoveCasualties(_) => "remove casualties",
-            ActiveDialog::SiegecraftPayment(_) => "siegecraft payment",
-            ActiveDialog::SteelWeaponPayment(_) => "steel weapon payment",
             ActiveDialog::TradeRouteSelection(_) => "trade route selection",
+            ActiveDialog::CustomPhasePaymentRequest(_) => "custom phase payment request",
         }
     }
 
@@ -180,16 +178,13 @@ impl ActiveDialog {
                 r.needed
             )],
             ActiveDialog::WaitingForUpdate => vec!["Waiting for server update".to_string()],
-            ActiveDialog::SiegecraftPayment(_) => advance_help(rc, SIEGECRAFT),
-            ActiveDialog::SteelWeaponPayment(p) => {
-                let mut result = vec![format!(
-                    "{}: ",
-                    if p.attacker { "Attacker" } else { "Defender" },
-                )];
-                add_advance_help(rc, &mut result, STEEL_WEAPONS);
-                result
-            }
             ActiveDialog::TradeRouteSelection(_) => 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
+                }
+            }
         }
     }
 
@@ -507,6 +502,22 @@ impl State {
 
     #[must_use]
     pub fn game_state_dialog(&self, game: &Game) -> ActiveDialog {
+        if let Some(e) = &game.custom_phase_state.current {
+            return match &e.request {
+                CustomPhaseRequest::Payment(r) => ActiveDialog::CustomPhasePaymentRequest(
+                    r.iter()
+                        .map(|p| {
+                            Payment::new(
+                                &p.model,
+                                &game.get_player(game.active_player()).resources,
+                                &p.name,
+                                p.optional,
+                            )
+                        })
+                        .collect(),
+                ),
+            };
+        }
         match &game.state {
             GameState::Playing | GameState::Finished => ActiveDialog::None,
             GameState::Movement(move_state) => ActiveDialog::MoveUnits(MoveSelection::new(
@@ -558,15 +569,6 @@ impl State {
                 })
             }
             GameState::CustomPhase(c) => match c {
-                CustomPhaseState::SiegecraftPayment(_) => {
-                    ActiveDialog::SiegecraftPayment(SiegecraftPaymentDialog::new(game))
-                }
-                CustomPhaseState::SteelWeaponsAttacker(c) => {
-                    steel_weapons_dialog(game, c, c.attacker)
-                }
-                CustomPhaseState::SteelWeaponsDefender(c) => {
-                    steel_weapons_dialog(game, c, c.defender)
-                }
                 CustomPhaseState::TradeRouteSelection => trade_route_dialog(game),
             },
         }

client/src/combat_ui.rs

@@ -1,16 +1,10 @@
-use crate::client_state::{ActiveDialog, StateUpdate};
+use crate::client_state::StateUpdate;
 use crate::dialog_ui::{cancel_button_with_tooltip, ok_button, OkTooltip};
-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::{
-    steel_weapons_cost, CustomPhaseAction, SiegecraftPayment, SIEGECRAFT_EXTRA_DIE,
-    SIEGECRAFT_IGNORE_HIT,
-};
 use server::game::Game;
 use server::position::Position;
 use server::unit::Unit;
@@ -98,97 +92,3 @@ pub fn play_action_card_dialog(rc: &RenderContext) -> StateUpdate {
     }
     StateUpdate::None
 }
-
-#[derive(Clone)]
-pub struct SiegecraftPaymentDialog {
-    extra_die: Payment,
-    ignore_hit: Payment,
-}
-
-impl SiegecraftPaymentDialog {
-    pub fn new(game: &Game) -> SiegecraftPaymentDialog {
-        let available = game.get_player(game.active_player()).resources.clone();
-        SiegecraftPaymentDialog {
-            extra_die: Payment::new(
-                &SIEGECRAFT_EXTRA_DIE,
-                &available,
-                "Cancel fortress extra die in first round of combat",
-                true,
-            ),
-            ignore_hit: Payment::new(
-                &SIEGECRAFT_IGNORE_HIT,
-                &available,
-                "Cancel fortress ignore hit in first round of combat",
-                true,
-            ),
-        }
-    }
-}
-
-pub fn pay_siegecraft_dialog(p: &SiegecraftPaymentDialog, rc: &RenderContext) -> StateUpdate {
-    multi_payment_dialog(
-        rc,
-        &[p.extra_die.clone(), p.ignore_hit.clone()],
-        |p| {
-            ActiveDialog::SiegecraftPayment(SiegecraftPaymentDialog {
-                extra_die: p[0].clone(),
-                ignore_hit: p[1].clone(),
-            })
-        },
-        false,
-        |p| {
-            StateUpdate::Execute(Action::CustomPhase(
-                CustomPhaseAction::SiegecraftPaymentAction(SiegecraftPayment {
-                    extra_die: p[0].clone(),
-                    ignore_hit: p[1].clone(),
-                }),
-            ))
-        },
-    )
-}
-
-#[derive(Clone)]
-pub struct SteelWeaponDialog {
-    pub attacker: bool,
-    pub payment: Payment,
-    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,
-) -> StateUpdate {
-    let attacker = dialog.attacker;
-
-    payment_dialog(
-        rc,
-        &dialog.payment.clone(),
-        |p| {
-            let mut n = dialog.clone();
-            n.payment = p;
-            ActiveDialog::SteelWeaponPayment(n)
-        },
-        |p| {
-            if attacker {
-                StateUpdate::Execute(Action::CustomPhase(
-                    CustomPhaseAction::SteelWeaponsAttackerAction(p),
-                ))
-            } else {
-                StateUpdate::Execute(Action::CustomPhase(
-                    CustomPhaseAction::SteelWeaponsDefenderAction(p),
-                ))
-            }
-        },
-    )
-}

client/src/custom_actions_ui.rs

@@ -1,8 +1,8 @@
 use crate::client_state::{ActiveDialog, StateUpdate};
-use crate::payment_ui::{payment_dialog, Payment};
+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::CustomPhaseAction;
+use server::content::custom_phase_actions::{CustomPhaseAction, CustomPhaseEventAction};
 use server::content::trade_routes::trade_route_reward;
 use server::game::Game;
 
@@ -23,3 +23,17 @@ pub fn trade_route_selection_dialog(rc: &RenderContext, payment: &Payment) -> St
         },
     )
 }
+
+pub fn custom_phase_payment_dialog(rc: &RenderContext, payments: &[Payment]) -> StateUpdate {
+    multi_payment_dialog(
+        rc,
+        payments,
+        |p| ActiveDialog::CustomPhasePaymentRequest(p.clone()),
+        false,
+        |p| {
+            StateUpdate::Execute(Action::CustomPhaseEvent(CustomPhaseEventAction::Payment(
+                p.clone(),
+            )))
+        },
+    )
+}

client/src/payment_ui.rs

@@ -307,7 +307,7 @@ fn resource_payment(options: &PaymentOptions) -> Vec<ResourcePayment> {
 #[must_use]
 pub fn show_types(model: &PaymentModel) -> Vec<ResourceType> {
     match model {
-        PaymentModel::Sum(options) => options.types_by_preference.to_vec(),
+        PaymentModel::Sum(options) => options.types_by_preference.clone(),
         PaymentModel::Resources(options) => options.cost.types(),
     }
 }