chore: Clean up with cargo fmt

yngtdd · Apr 10, 2022 · b8c6e88 · b8c6e88
1 parent 1e8db34
commit b8c6e88
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 34 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -177,7 +177,12 @@ impl State {
             map_builder.map.tiles[exit_idx] = TileType::Exit;
         }
 
-        spawn_level(&mut self.ecs, &mut rng, map_level as usize, &map_builder.monster_spawns);
+        spawn_level(
+            &mut self.ecs,
+            &mut rng,
+            map_level as usize,
+            &map_builder.monster_spawns,
+        );
 
         self.resources.insert(map_builder.map);
         self.resources.insert(Camera::new(map_builder.player_start));

diff --git a/src/spawner/mod.rs b/src/spawner/mod.rs
@@ -37,7 +37,7 @@ pub fn spawn_level(
     ecs: &mut World,
     rng: &mut RandomNumberGenerator,
     level: usize,
-    spawn_points: &[Point]
+    spawn_points: &[Point],
 ) {
     let template = Templates::load();
     template.spawn_entities(ecs, rng, level, spawn_points);

diff --git a/src/spawner/template.rs b/src/spawner/template.rs
@@ -1,9 +1,9 @@
 use crate::prelude::*;
-use std::fs::File;
-use std::collections::HashSet;
-use serde::Deserialize;
-use ron::de::from_reader;
 use legion::systems::CommandBuffer;
+use ron::de::from_reader;
+use serde::Deserialize;
+use std::collections::HashSet;
+use std::fs::File;
 
 #[derive(Clone, Deserialize, Debug)]
 pub struct Template {
@@ -30,8 +30,7 @@ pub struct Templates {
 
 impl Templates {
     pub fn load() -> Self {
-        let file = File::open("resources/template.ron")
-            .expect("Failed opening template.ron");
+        let file = File::open("resources/template.ron").expect("Failed opening template.ron");
 
         from_reader(file).expect("Unable to load templates")
     }
@@ -41,7 +40,7 @@ impl Templates {
         ecs: &mut World,
         rng: &mut RandomNumberGenerator,
         level: usize,
-        spawn_points: &[Point]
+        spawn_points: &[Point],
     ) {
         let mut available_entities = Vec::new();
 
@@ -69,51 +68,49 @@ impl Templates {
         &self,
         pt: &Point,
         template: &Template,
-        commands: &mut legion::systems::CommandBuffer
+        commands: &mut legion::systems::CommandBuffer,
     ) {
         let entity = commands.push((
             pt.clone(),
-            Render{
+            Render {
                 color: ColorPair::new(WHITE, BLACK),
-                glyph: to_cp437(template.glyph)
+                glyph: to_cp437(template.glyph),
             },
-            Name(template.name.clone())
+            Name(template.name.clone()),
         ));
 
         match template.entity_type {
-            EntityType::Item => commands.add_component(entity, Item{}),
+            EntityType::Item => commands.add_component(entity, Item {}),
             EntityType::Enemy => {
-                commands.add_component(entity, Enemy{});
+                commands.add_component(entity, Enemy {});
                 commands.add_component(entity, FieldOfView::new(6));
-                commands.add_component(entity, ChasingPlayer{});
-                commands.add_component(entity, Health{
-                    current: template.hp.unwrap(),
-                    max: template.hp.unwrap()
-                });
+                commands.add_component(entity, ChasingPlayer {});
+                commands.add_component(
+                    entity,
+                    Health {
+                        current: template.hp.unwrap(),
+                        max: template.hp.unwrap(),
+                    },
+                );
             }
         }
 
         if let Some(effects) = &template.provides {
-            effects.iter().for_each(|(provides, n)| {
-                match provides.as_str() {
-                    "Healing" => {
-                        commands.add_component(entity, ProvidesHealing{amount: *n})
-                    },
-                    "MagicMap" => {
-                        commands.add_component(entity, ProvidesDungeonMap{})
-                    }
-                    _ => println!("Warning, we don't know how to provide {}", provides)
-                }
-            });
+            effects
+                .iter()
+                .for_each(|(provides, n)| match provides.as_str() {
+                    "Healing" => commands.add_component(entity, ProvidesHealing { amount: *n }),
+                    "MagicMap" => commands.add_component(entity, ProvidesDungeonMap {}),
+                    _ => println!("Warning, we don't know how to provide {}", provides),
+                });
         }
 
         if let Some(damage) = &template.base_damage {
             commands.add_component(entity, Damage(*damage));
 
             if template.entity_type == EntityType::Item {
-                commands.add_component(entity, Weapon{});
+                commands.add_component(entity, Weapon {});
             }
         }
     }
 }
-
diff --git a/src/systems/combat.rs b/src/systems/combat.rs
@@ -31,7 +31,8 @@ pub fn combat(ecs: &mut SubWorld, commands: &mut CommandBuffer) {
             0
         };
 
-        let weapon_damage: i32 = <(&Carried, &Damage)>::query().iter(ecs)
+        let weapon_damage: i32 = <(&Carried, &Damage)>::query()
+            .iter(ecs)
             .filter(|(carried, _)| carried.0 == *attacker)
             .map(|(_, dmg)| dmg.0)
             .sum();