refactor state change events

Author: zeitlinger

client/src/client_state.rs

@@ -180,14 +180,7 @@ impl ActiveDialog {
             ActiveDialog::WaitingForUpdate => vec!["Waiting for server update".to_string()],
             ActiveDialog::TradeRouteSelection(_) => vec!["Select trade route reward".to_string()],
             ActiveDialog::CustomPhasePaymentRequest(_r) => {
-                match &rc
-                    .game
-                    .custom_phase_state
-                    .current
-                    .as_ref()
-                    .unwrap()
-                    .origin
-                {
+                match &rc.game.custom_phase_state.current.as_ref().unwrap().origin {
                     EventOrigin::Advance(a) => advance_help(rc, a),
                     _ => vec![], // TODO
                 }
@@ -511,21 +504,19 @@ impl State {
     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(),
-                    )
-                }
-            }
+                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,

client/src/combat_ui.rs

@@ -92,4 +92,3 @@ pub fn play_action_card_dialog(rc: &RenderContext) -> StateUpdate {
     }
     StateUpdate::None
 }
-

server/src/ability_initializer.rs

@@ -1,7 +1,7 @@
 use crate::action::Action;
 use crate::content::custom_phase_actions::{
-    CustomPhaseEvent, CustomPhaseEventAction, CustomPhaseEventType,
-    CustomPhasePaymentRequest, CustomPhaseRequest,
+    CustomPhaseEvent, CustomPhaseEventAction, CustomPhaseEventType, CustomPhasePaymentRequest,
+    CustomPhaseRequest,
 };
 use crate::resource_pile::ResourcePile;
 use crate::{
@@ -90,7 +90,9 @@ pub(crate) trait AbilityInitializerSetup: Sized {
             + Clone,
     ) -> Self
     where
-        E: Fn(&mut PlayerEvents) -> &mut EventMut<Game, usize, CustomPhaseEventType> + 'static + Clone,
+        E: Fn(&mut PlayerEvents) -> &mut EventMut<Game, usize, CustomPhaseEventType>
+            + 'static
+            + Clone,
     {
         let origin = self.get_key();
         self.add_player_event_listener(
@@ -138,7 +140,7 @@ pub(crate) trait AbilityInitializerSetup: Sized {
         )
     }
 
-    #[allow(irrefutable_let_patterns)] 
+    #[allow(irrefutable_let_patterns)]
     fn add_payment_request_listener<E>(
         self,
         event: E,
@@ -147,7 +149,9 @@ pub(crate) trait AbilityInitializerSetup: Sized {
         gain_reward: impl Fn(&mut Game, usize, &str, &Vec<ResourcePile>) + 'static + Clone,
     ) -> Self
     where
-        E: Fn(&mut PlayerEvents) -> &mut EventMut<Game, usize, CustomPhaseEventType> + 'static + Clone,
+        E: Fn(&mut PlayerEvents) -> &mut EventMut<Game, usize, CustomPhaseEventType>
+            + 'static
+            + Clone,
     {
         self.add_state_change_event_listener(
             event,

server/src/combat.rs

@@ -155,10 +155,7 @@ pub fn initiate_combat(
     start_combat(game, combat);
 }
 
-pub(crate) fn start_combat(
-    game: &mut Game,
-    combat: Combat,
-) {
+pub(crate) fn start_combat(game: &mut Game, combat: Combat) {
     game.lock_undo();
     let attacker = combat.attacker;
     let defender = combat.defender;
@@ -171,16 +168,14 @@ pub(crate) fn start_combat(
         attacker,
         |events| &events.on_combat_start,
         CustomPhaseEventType::StartCombatAttacker,
-    )    {
+    ) {
         return;
     }
-    if
-        game.trigger_custom_phase_event(
-            defender,
-            |events| &events.on_combat_start,
-            CustomPhaseEventType::StartCombatDefender,
-        )
-    {
+    if game.trigger_custom_phase_event(
+        defender,
+        |events| &events.on_combat_start,
+        CustomPhaseEventType::StartCombatDefender,
+    ) {
         return;
     }
 

server/src/content/advances.rs

@@ -5,7 +5,7 @@ use crate::city_pieces::Building::{Academy, Fortress, Market, Obelisk, Observato
 use crate::collect::CollectContext;
 use crate::combat::CombatModifier::*;
 use crate::combat::{Combat, CombatModifier, CombatStrength};
-use crate::content::custom_phase_actions::{CustomPhaseEventType, CustomPhasePaymentRequest};
+use crate::content::custom_phase_actions::CustomPhasePaymentRequest;
 use crate::content::trade_routes::collect_trade_routes_for_current_player;
 use crate::game::GameState;
 use crate::payment::PaymentModel;

server/src/content/custom_phase_actions.rs

@@ -22,7 +22,7 @@ pub enum CustomPhaseEventType {
 impl CustomPhaseEventType {
     #[must_use]
     pub fn is_last_type_for_event(&self) -> bool {
-        #[allow(clippy::match_like_matches_macro)]
+        #[allow(clippy::match_like_matches_macro, clippy::match_wildcard_for_single_variants)]
         match self {
             CustomPhaseEventType::StartCombatAttacker => false,
             _ => true,
@@ -94,14 +94,13 @@ impl CustomPhaseAction {
         match &game.state {
             GameState::CustomPhase(state) => match state {
                 CustomPhaseState::TradeRouteSelection => {
+                    #[allow(irrefutable_let_patterns)]
                     if let CustomPhaseAction::TradeRouteSelectionAction(p) = self {
                         let (reward, routes) =
                             trade_route_reward(game).expect("No trade route reward");
                         assert!(reward.is_valid_payment(&p), "Invalid payment"); // it's a gain
                         gain_trade_route_reward(game, player_index, &routes, &p);
                         game.state = GameState::Playing;
-                    } else {
-                        panic!("Need to pass TradeRouteSelectionAction to execute");
                     }
                 }
             },

server/src/game.rs

@@ -8,7 +8,7 @@ use crate::advance::Advance;
 use crate::combat::{self, start_combat, Combat, CombatDieRoll, CombatPhase, COMBAT_DIE_SIDES};
 use crate::consts::{ACTIONS, MOVEMENT_ACTIONS};
 use crate::content::custom_phase_actions::{
-    CustomPhaseEvent, CustomPhaseEventAction, CustomPhaseEventState, CustomPhaseEventType,
+    CustomPhaseEventState, CustomPhaseEventType,
     CustomPhaseState,
 };
 use crate::events::EventMut;
@@ -1869,6 +1869,7 @@ pub mod tests {
     use std::collections::HashMap;
 
     use super::{Game, GameState::Playing};
+    use crate::content::custom_phase_actions::CustomPhaseEventState;
     use crate::payment::PaymentModel;
     use crate::utils::tests::FloatEq;
     use crate::{
@@ -1881,7 +1882,6 @@ pub mod tests {
         utils::Rng,
         wonder::Wonder,
     };
-    use crate::content::custom_phase_actions::CustomPhaseEventState;
 
     #[must_use]
     pub fn test_game() -> Game {
@@ -1912,7 +1912,6 @@ pub mod tests {
             wonders_left: Vec::new(),
             wonder_amount_left: 0,
             undo_context_stack: Vec::new(),
-
         }
     }
 

server/src/player_events.rs

@@ -1,6 +1,7 @@
 use crate::action::Action;
 use crate::collect::CollectContext;
 use crate::combat::{Combat, CombatStrength};
+use crate::content::custom_phase_actions::CustomPhaseEventType;
 use crate::game::Game;
 use crate::map::Terrain;
 use crate::payment::PaymentModel;
@@ -10,7 +11,6 @@ use crate::{
     resource_pile::ResourcePile, wonder::Wonder,
 };
 use std::collections::{HashMap, HashSet};
-use crate::content::custom_phase_actions::CustomPhaseEventType;
 
 #[derive(Default)]
 pub(crate) struct PlayerEvents {