cleanup player commands

Author: zeitlinger

server/src/ability_initializer.rs

@@ -4,7 +4,7 @@ use crate::content::custom_phase_actions::{
     StructuresRequest, UnitTypeRequest, UnitsRequest,
 };
 use crate::events::{Event, EventOrigin};
-use crate::player_events::{CurrentEvent};
+use crate::player_events::CurrentEvent;
 use crate::position::Position;
 use crate::resource_pile::ResourcePile;
 use crate::unit::UnitType;

server/src/action.rs

@@ -11,8 +11,7 @@ use crate::incident::trigger_incident;
 use crate::log;
 use crate::map::Terrain::Unexplored;
 use crate::movement::{
-    has_movable_units, move_units_destinations,  take_move_state, CurrentMove,
-    MoveState,
+    has_movable_units, move_units_destinations, take_move_state, CurrentMove, MoveState,
 };
 use crate::playing_actions::PlayingAction;
 use crate::recruit::on_recruit;

server/src/collect.rs

@@ -61,7 +61,12 @@ pub(crate) fn collect(game: &mut Game, player_index: usize, c: &Collect) {
     let city = game.players[player_index].get_city_mut(c.city_position);
     assert!(city.can_activate(), "Illegal action");
     city.activate();
-    let _ = game.get_player(player_index).events.on_collect.get().trigger(&mut i, game, &());
+    let _ = game
+        .get_player(player_index)
+        .events
+        .on_collect
+        .get()
+        .trigger(&mut i, game, &());
     i.info.execute(game);
     game.players[player_index].gain_resources(i.total.clone());
 }

server/src/combat.rs

@@ -188,7 +188,7 @@ pub fn initiate_combat(
 pub(crate) fn start_combat(game: &mut Game) {
     game.lock_undo(); // combat should not be undoable
     stop_current_move(game);
-    
+
     let combat = get_combat(game);
     let attacker = combat.attacker;
     let defender = combat.defender;

server/src/content/advances_education.rs

@@ -34,11 +34,13 @@ fn public_education() -> AdvanceBuilder {
     .add_once_per_turn_listener(
         |event| &mut event.on_collect,
         |e| &mut e.info.info,
-        |i, game, _| {
+        |i, game, ()| {
             let player = game.get_player(game.active_player());
             if player.get_city(i.city).pieces.academy.is_some() {
                 i.total += ResourcePile::ideas(1);
-                i.info.log.push("Public Education gained 1 idea".to_string());
+                i.info
+                    .log
+                    .push("Public Education gained 1 idea".to_string());
             }
         },
         0,
@@ -107,9 +109,8 @@ fn philosophy() -> AdvanceBuilder {
                 .any(|a| a.name == advance.name)
             {
                 let player = game.get_player_mut(player_index);
-                    player.gain_resources(ResourcePile::ideas(1));
-                    game
-                        .add_info_log_item(&format!("{player_name} gained 1 idea from Philosophy"));
+                player.gain_resources(ResourcePile::ideas(1));
+                game.add_info_log_item(&format!("{player_name} gained 1 idea from Philosophy"));
             }
         },
     )

server/src/content/advances_seafearing.rs

@@ -57,7 +57,7 @@ fn cartography() -> AdvanceBuilder {
         .add_player_event_listener(
             |event| &mut event.before_move,
             0,
-            |game,  i, _| {
+            |game,  i, ()| {
                 // info is the action that we last used this ability for
                 let key = game.actions_left.to_string();
                 if game.get_player(i.player).event_info.get("Cartography").is_some_and(|info| info == &key) {

server/src/explore.rs

@@ -29,7 +29,7 @@ pub(crate) fn move_to_unexplored_tile(
 ) -> bool {
     game.lock_undo(); // tile is revealed, so we can't undo the move
     stop_current_move(game);
-    
+
     for b in &game.map.unexplored_blocks.clone() {
         for (position, _tile) in b.block.tiles(&b.position, b.position.rotation) {
             if position == destination {

server/src/game.rs

@@ -10,9 +10,7 @@ use crate::events::{Event, EventOrigin};
 use crate::incident::PermanentIncidentEffect;
 use crate::movement::{CurrentMove, MoveState};
 use crate::pirates::get_pirates_player;
-use crate::player_events::{
-    CurrentEvent, CurrentEventInfo, PlayerEvents,
-};
+use crate::player_events::{CurrentEvent, CurrentEventInfo, PlayerEvents};
 use crate::resource::check_for_waste;
 use crate::status_phase::enter_status_phase;
 use crate::unit::UnitType;

server/src/movement.rs

@@ -94,7 +94,7 @@ pub(crate) fn move_units(
     let p = game.get_player(player_index);
     let from = p.get_unit(units[0]).position;
     let info = MoveInfo::new(player_index, units.to_vec(), from, to);
-    game.trigger_event_with_game_value(player_index, |e| &mut e.before_move,  &info, &());
+    game.trigger_event_with_game_value(player_index, |e| &mut e.before_move, &info, &());
 
     for unit_id in units {
         move_unit(game, player_index, *unit_id, to, embark_carrier_id);

server/src/player_events.rs

@@ -8,7 +8,7 @@ use crate::game::Game;
 use crate::map::Terrain;
 use crate::payment::PaymentOptions;
 use crate::playing_actions::{PlayingActionType, Recruit};
-use crate::unit::Units;                          
+use crate::unit::Units;
 use crate::{
     city::City, city_pieces::Building, player::Player, position::Position,
     resource_pile::ResourcePile, wonder::Wonder,
@@ -220,4 +220,3 @@ impl InfluenceCultureInfo {
         self.possible = InfluenceCulturePossible::NoBoost;
     }
 }
-

server/src/undo.rs

@@ -4,7 +4,6 @@ use crate::resource::check_for_waste;
 use json_patch::{patch, PatchOperation};
 use serde_json::Value;
 
-
 const IGNORE_PATHS: [&str; 3] = ["/action_log/", "/action_log_index", "/log/"];
 
 pub(crate) fn clean_patch(mut patch: Vec<PatchOperation>) -> Vec<PatchOperation> {