cargo fmt --all to pass lints

src/abilities/nuke.rs

@@ -0,0 +1 @@
+

src/actions/mod.rs

@@ -95,23 +95,22 @@ pub fn ended_controls(
     if keyboard_input.just_pressed(KeyCode::Space) {
         next_state.set(GameState::Menu);
 
-        for entity in tiles.iter(){
+        for entity in tiles.iter() {
             commands.entity(entity).despawn();
         }
-        for entity in objects.iter(){
+        for entity in objects.iter() {
             commands.entity(entity).despawn();
         }
-        for entity in players.iter(){
+        for entity in players.iter() {
             commands.entity(entity).despawn();
         }
-        for entity in player_marker.iter(){
+        for entity in player_marker.iter() {
             commands.entity(entity).despawn();
         }
-        
+
         commands.remove_resource::<Game>();
         commands.init_resource::<GameBuildSettings>();
     }
-
 }
 
 pub fn update_actions(

src/ai/mod.rs

@@ -1,4 +1,4 @@
-use crate::actions::Actions;
+use crate::actions::Actions;
 use crate::color_system::ColorConflicts;
 use crate::game::GameData;
 use crate::player::PlayerPoints;
@@ -33,7 +33,7 @@ pub fn run_ai(
         if player_points.building_points < 50 && player_points.ability_points < 50 {
             continue;
         }
-        
+
         let mut sorted_highest_conflicts: Vec<(TilePos, usize)> = vec![];
         for (tile_pos, player_id_vec) in color_conflicts.conflicts.iter().filter(|value| {
             let tile_entity = tile_storage.get(&value.0).unwrap();

src/audio.rs

@@ -22,7 +22,7 @@ impl Plugin for InternalAudioPlugin {
 #[derive(Resource)]
 struct FlyingAudio(Handle<AudioInstance>);
 
-fn start_audio(mut commands: Commands, audio_assets: Res<AudioAssets>, audio: Res<Audio>) { 
+fn start_audio(mut commands: Commands, audio_assets: Res<AudioAssets>, audio: Res<Audio>) {
     /*
     audio.pause();
     let handle = audio
@@ -31,7 +31,7 @@ fn start_audio(mut commands: Commands, audio_assets: Res<AudioAssets>, audio: Re
         .with_volume(0.3)
         .handle();
     commands.insert_resource(FlyingAudio(handle));
-    
+
      */
 }
 

src/buildings/mod.rs

@@ -1,4 +1,4 @@
-pub mod line;
+pub mod line;
 pub mod pulser;
 pub mod scatter;
 
@@ -26,7 +26,6 @@ pub fn destroy_buildings(
             &BuildingMarker,
         ),
         With<Object>,
-
     >,
     mut tiles: Query<(Entity, &PlayerMarker), (Without<Object>, With<Tile>)>,
     mut tile_storage_query: Query<(&MapId, &TileStorage)>,

src/color_system.rs

@@ -1,4 +1,4 @@
-use crate::buildings::Building;
+use crate::buildings::Building;
 use crate::player::PlayerPoints;
 use bevy::app::{App, Plugin};
 use bevy::prelude::{
@@ -155,7 +155,6 @@ pub fn handle_color_conflicts(
                         if let TileColorStrength::Five = tile_color.tile_color_strength {
                             //id_hashmap.remove(&highest.0);
                             handle_conflicts = false;
-
                         } else {
                             tile_color.strengthen();
                             commands.entity(entity).insert(Changed::default());

src/game/end_game.rs

@@ -1,9 +1,9 @@
-use bevy::prelude::{Commands, Mut, NextState, Query, Res, ResMut, Resource, With};
+use crate::GameState;
+use bevy::prelude::{Commands, Mut, NextState, Query, Res, ResMut, Resource, With};
 use bevy::utils::HashMap;
 use bevy_ggf::game_core::Game;
 use bevy_ggf::mapping::tiles::Tile;
 use bevy_ggf::player::PlayerMarker;
-use crate::GameState;
 
 #[derive(Default, Resource)]
 pub struct GameEnded {

src/main.rs

@@ -5,9 +5,9 @@ use bevy::prelude::*;
 use bevy::window::{PrimaryWindow, WindowMode};
 use bevy::winit::WinitWindows;
 use bevy::DefaultPlugins;
+use bevy_ascii_terminal::TerminalPlugin;
 use clrs::GamePlugin;
 use std::io::Cursor;
-use bevy_ascii_terminal::TerminalPlugin;
 use winit::window::Icon;
 
 fn main() {

src/map.rs

@@ -1,13 +1,15 @@
-use bevy::ecs::system::SystemState;
+use crate::color_system::TileColorStrength;
+use bevy::ecs::system::SystemState;
 use bevy::prelude::{Commands, Entity, Mut, Query, Reflect, World};
 use bevy_ecs_tilemap::prelude::*;
 use bevy_ggf::game_core::command::{GameCommand, GameCommands};
-use bevy_ggf::mapping::{Map, MapDeSpawned, MapId, MapIdProvider, MapSpawned, SpawnRandomMap};
 use bevy_ggf::mapping::terrain::{TerrainType, TileTerrainInfo};
-use bevy_ggf::mapping::tiles::{BggfTileBundle, BggfTileObjectBundle, Tile, TileObjects, TileObjectStacks};
+use bevy_ggf::mapping::tiles::{
+    BggfTileBundle, BggfTileObjectBundle, Tile, TileObjectStacks, TileObjects,
+};
+use bevy_ggf::mapping::{Map, MapDeSpawned, MapId, MapIdProvider, MapSpawned, SpawnRandomMap};
 use bevy_ggf::movement::TerrainMovementCosts;
 use bevy_ggf::player::PlayerList;
-use crate::color_system::TileColorStrength;
 
 pub trait MapCommandsExt {
     fn spawn_testing_map(
@@ -64,8 +66,6 @@ impl GameCommand for SpawnTestingMap {
         let mut tile_storage = TileStorage::empty(map_size);
         let tilemap_type = self.tilemap_type;
         let tilemap_entity = world.spawn_empty().id();
-
-
 
         world.resource_scope(|world, terrain_movement_costs: Mut<TerrainMovementCosts>| {
             for x in 0..map_size.x {

src/player.rs

@@ -16,7 +16,6 @@ pub struct PlayerPlugin;
 pub struct PlayerPoints {
     pub building_points: u32,
     pub ability_points: u32,
-
 }
 
 /// This plugin handles player related stuff like movement