cleans up imports

src/inventory/collection_system.rs

@@ -1,8 +1,7 @@
-use super::{
-    gamelog, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, Position, Wand,
-    WantsToPickupItem,
+use crate::{
+    gamelog, gui::obfuscate_name, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
+    Position, Wand, WantsToPickupItem,
 };
-use crate::gui::obfuscate_name;
 use specs::prelude::*;
 
 pub struct ItemCollectionSystem {}

src/inventory/drop_system.rs

@@ -1,8 +1,7 @@
-use super::{
-    gamelog, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, Position, Wand,
-    WantsToDropItem,
+use crate::{
+    gamelog, gui::obfuscate_name, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
+    Position, Wand, WantsToDropItem,
 };
-use crate::gui::obfuscate_name;
 use specs::prelude::*;
 
 pub struct ItemDropSystem {}

src/inventory/equip_system.rs

@@ -1,8 +1,9 @@
-use super::{
-    gamelog, EquipmentChanged, Equippable, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
+use crate::{
+    gamelog,
+    gui::{item_colour, obfuscate_name},
+    EquipmentChanged, Equippable, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
     WantsToUseItem,
 };
-use crate::gui::{item_colour, obfuscate_name};
 use specs::prelude::*;
 
 pub struct ItemEquipSystem {}

src/inventory/identification_system.rs

@@ -1,5 +1,4 @@
-use super::{IdentifiedItem, MasterDungeonMap, Name, ObfuscatedName};
-use crate::{Item, Player};
+use crate::{IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player};
 use specs::prelude::*;
 
 pub struct ItemIdentificationSystem {}

src/inventory/mod.rs

@@ -1,11 +1,3 @@
-use super::{
-    gamelog, Confusion, Consumable, Cursed, Destructible, Digger, EquipmentChanged, Equippable, Equipped, HungerClock,
-    HungerState, IdentifiedItem, InBackpack, InflictsDamage, MagicItem, MagicMapper, Map, MasterDungeonMap, Name,
-    ObfuscatedName, ParticleBuilder, Point, Pools, Position, ProvidesHealing, ProvidesNutrition, RandomNumberGenerator,
-    RunState, TileType, Viewshed, Wand, WantsToDropItem, WantsToPickupItem, WantsToRemoveItem, WantsToUseItem, AOE,
-    DEFAULT_PARTICLE_LIFETIME, LONG_PARTICLE_LIFETIME,
-};
-
 mod collection_system;
 mod drop_system;
 mod equip_system;

src/inventory/remove_system.rs

@@ -1,5 +1,8 @@
-use super::{gamelog, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem};
-use crate::gui::{item_colour, obfuscate_name};
+use crate::{
+    gamelog,
+    gui::{item_colour, obfuscate_name},
+    Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem,
+};
 use specs::prelude::*;
 
 pub struct ItemRemoveSystem {}

src/inventory/use_system.rs

@@ -1,5 +1,7 @@
-use super::{EquipmentChanged, IdentifiedItem, Map, Name, WantsToUseItem, AOE};
-use crate::effects::*;
+use crate::{
+    effects::{add_effect, aoe_tiles, EffectType, Targets},
+    EquipmentChanged, IdentifiedItem, Map, Name, WantsToUseItem, AOE,
+};
 use specs::prelude::*;
 
 pub struct ItemUseSystem {}