From 30de2cd7cebede1083853c080fcf21386dcc1626 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Thu, 3 Feb 2022 15:16:41 -0500 Subject: [PATCH] Use rltk prelude import instead of full paths --- src/colors.rs | 2 +- src/components.rs | 2 +- src/effects.rs | 2 +- src/effects/triggers.rs | 4 +--- src/gamelog.rs | 2 +- src/gui/cheat_menu.rs | 1 - src/gui/drop_item_menu.rs | 1 - src/gui/hud.rs | 1 - src/gui/identify_menu.rs | 1 - src/gui/inventory_menu.rs | 1 - src/gui/item_render.rs | 2 +- src/gui/ranged_target.rs | 1 - src/gui/remove_curse_menu.rs | 1 - src/gui/remove_item_menu.rs | 1 - src/main.rs | 4 +--- src/map.rs | 2 +- src/map/camera.rs | 1 - src/map/themes.rs | 2 +- src/map_builders/area_ending_point.rs | 2 +- src/map_builders/dwarf_fort.rs | 2 +- src/map_builders/voronoi_spawning.rs | 2 +- src/player.rs | 4 ++-- src/raws.rs | 2 +- src/raws/rawmaster.rs | 2 +- src/rex_assets.rs | 2 +- src/state.rs | 2 +- src/systems/ai/approach_ai_system.rs | 2 +- src/systems/ai/chase_ai_system.rs | 3 +-- src/systems/ai/flee_ai_system.rs | 2 +- src/systems/lighting_system.rs | 3 +-- src/systems/particle_system.rs | 2 +- 31 files changed, 23 insertions(+), 38 deletions(-) diff --git a/src/colors.rs b/src/colors.rs index 126e734..85d6168 100644 --- a/src/colors.rs +++ b/src/colors.rs @@ -1,6 +1,6 @@ //! Color constants to replace more verbose methods of defining colors in the game. //! These constants replace the `::rltk::RGB` constructor functions -use ::rltk::RGB; +use ::rltk::prelude::*; const fn new(r: f32, g: f32, b: f32) -> RGB { RGB { r, g, b } diff --git a/src/components.rs b/src/components.rs index 53803b2..c1805e5 100644 --- a/src/components.rs +++ b/src/components.rs @@ -5,7 +5,7 @@ mod tags; use std::collections::HashMap; -use ::rltk::{FontCharType, Point, RGB}; +use ::rltk::prelude::*; use ::serde::{Deserialize, Serialize}; use ::specs::error::NoError; use ::specs::prelude::*; diff --git a/src/effects.rs b/src/effects.rs index e41d8e6..7a682f0 100644 --- a/src/effects.rs +++ b/src/effects.rs @@ -9,7 +9,7 @@ mod triggers; use std::collections::{HashSet, VecDeque}; use std::sync::Mutex; -use ::rltk::{FontCharType, Point, RGB}; +use ::rltk::prelude::*; use ::specs::prelude::*; pub use targeting::*; diff --git a/src/effects/triggers.rs b/src/effects/triggers.rs index 2d3d893..750eee5 100644 --- a/src/effects/triggers.rs +++ b/src/effects/triggers.rs @@ -1,4 +1,4 @@ -use ::rltk::Point; +use ::rltk::prelude::*; use ::specs::prelude::*; use super::{add_effect, EffectType, Targets}; @@ -349,8 +349,6 @@ fn event_trigger( } fn spawn_line_particles(ecs: &World, start: i32, end: i32, part: &SpawnParticleLine) { - use ::rltk::LineAlg; - let map = ecs.fetch::(); let start_pt = Point::new(start % map.width, end / map.width); let end_pt = Point::new(end % map.width, end / map.width); diff --git a/src/gamelog.rs b/src/gamelog.rs index 6d4c897..8e77350 100644 --- a/src/gamelog.rs +++ b/src/gamelog.rs @@ -5,7 +5,7 @@ mod builder; mod events; mod logstore; -use ::rltk::RGB; +use ::rltk::prelude::*; use ::serde::{Deserialize, Serialize}; pub use builder::*; pub use events::*; diff --git a/src/gui/cheat_menu.rs b/src/gui/cheat_menu.rs index 8d7d710..0685e84 100644 --- a/src/gui/cheat_menu.rs +++ b/src/gui/cheat_menu.rs @@ -1,5 +1,4 @@ use ::rltk::prelude::*; -use ::rltk::{Rltk, VirtualKeyCode}; use super::{menu_box, menu_option}; use crate::{colors, State}; diff --git a/src/gui/drop_item_menu.rs b/src/gui/drop_item_menu.rs index c7cf2e9..04f0f9e 100644 --- a/src/gui/drop_item_menu.rs +++ b/src/gui/drop_item_menu.rs @@ -1,5 +1,4 @@ use ::rltk::prelude::*; -use ::rltk::Rltk; use ::specs::prelude::*; use super::{get_item_display_name, item_result_menu, ItemMenuResult}; diff --git a/src/gui/hud.rs b/src/gui/hud.rs index f02d89f..dcdb044 100644 --- a/src/gui/hud.rs +++ b/src/gui/hud.rs @@ -1,7 +1,6 @@ use std::cmp::Ordering; use ::rltk::prelude::*; -use ::rltk::{Point, Rltk}; use ::specs::prelude::*; use super::{draw_tooltips, get_item_color, get_item_display_name}; diff --git a/src/gui/identify_menu.rs b/src/gui/identify_menu.rs index 37197a1..2e07126 100644 --- a/src/gui/identify_menu.rs +++ b/src/gui/identify_menu.rs @@ -1,5 +1,4 @@ use ::rltk::prelude::*; -use ::rltk::Rltk; use ::specs::prelude::*; use super::{get_item_display_name, item_result_menu, ItemMenuResult}; diff --git a/src/gui/inventory_menu.rs b/src/gui/inventory_menu.rs index d8f9dca..3fed6b6 100644 --- a/src/gui/inventory_menu.rs +++ b/src/gui/inventory_menu.rs @@ -1,5 +1,4 @@ use ::rltk::prelude::*; -use ::rltk::Rltk; use ::specs::prelude::*; use super::{get_item_display_name, item_result_menu, ItemMenuResult}; diff --git a/src/gui/item_render.rs b/src/gui/item_render.rs index 7edd100..0098cc4 100644 --- a/src/gui/item_render.rs +++ b/src/gui/item_render.rs @@ -1,4 +1,4 @@ -use ::rltk::RGB; +use ::rltk::prelude::*; use ::specs::prelude::*; use crate::components::{Consumable, CursedItem, MagicItem, MagicItemClass, Name, ObfuscatedName}; diff --git a/src/gui/ranged_target.rs b/src/gui/ranged_target.rs index fb6adcc..3f68415 100644 --- a/src/gui/ranged_target.rs +++ b/src/gui/ranged_target.rs @@ -1,5 +1,4 @@ use ::rltk::prelude::*; -use ::rltk::{DistanceAlg, Point, Rltk}; use ::specs::prelude::*; use super::ItemMenuResult; diff --git a/src/gui/remove_curse_menu.rs b/src/gui/remove_curse_menu.rs index fd38687..36a069c 100644 --- a/src/gui/remove_curse_menu.rs +++ b/src/gui/remove_curse_menu.rs @@ -1,5 +1,4 @@ use ::rltk::prelude::*; -use ::rltk::Rltk; use ::specs::prelude::*; use super::{get_item_display_name, item_result_menu, ItemMenuResult}; diff --git a/src/gui/remove_item_menu.rs b/src/gui/remove_item_menu.rs index 8fd446c..110ab6c 100644 --- a/src/gui/remove_item_menu.rs +++ b/src/gui/remove_item_menu.rs @@ -1,5 +1,4 @@ use ::rltk::prelude::*; -use ::rltk::Rltk; use ::specs::prelude::*; use super::{get_item_display_name, item_result_menu, ItemMenuResult}; diff --git a/src/main.rs b/src/main.rs index 0ee6452..24e67a2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,6 +25,7 @@ mod spawner; mod state; mod systems; +use ::rltk::prelude::*; use ::specs::prelude::*; use ::specs::saveload::{SimpleMarker, SimpleMarkerAllocator}; use components::*; @@ -154,7 +155,6 @@ fn register_components(state: &mut State) { /// * Creates the [`Player`](crate::spawner::player) /// * Generates the first [`map`](crate::state::State::generate_world_map) fn init_state() -> State { - use ::rltk::Point; use systems::particle_system::ParticleBuilder; let mut state = State::new(); @@ -185,8 +185,6 @@ fn init_state() -> State { /// The entry point fn main() -> ::rltk::BError { - use ::rltk::{main_loop, RltkBuilder}; - let context = RltkBuilder::simple(80, 60) .unwrap() .with_title("Roguelike Tutorial") diff --git a/src/map.rs b/src/map.rs index 7a09a69..62a300d 100644 --- a/src/map.rs +++ b/src/map.rs @@ -6,7 +6,7 @@ mod tiletype; use std::collections::HashSet; -use ::rltk::{Algorithm2D, BaseMap, Point, SmallVec, RGB}; +use ::rltk::prelude::*; use ::serde::{Deserialize, Serialize}; pub use dungeon::*; pub use themes::*; diff --git a/src/map/camera.rs b/src/map/camera.rs index 06b0720..36ed22a 100644 --- a/src/map/camera.rs +++ b/src/map/camera.rs @@ -1,6 +1,5 @@ //! Handle rendering of the viewport use ::rltk::prelude::*; -use ::rltk::{Point, Rltk}; use ::specs::prelude::*; use crate::components::{Hidden, Position, Renderable, Target, TileSize}; diff --git a/src/map/themes.rs b/src/map/themes.rs index fdde2ae..f5bd8ef 100644 --- a/src/map/themes.rs +++ b/src/map/themes.rs @@ -1,5 +1,5 @@ //! Different looks for the same set of [`TileType`]s -use ::rltk::{to_cp437, FontCharType, RGB}; +use ::rltk::prelude::*; use super::{Map, TileType}; use crate::colors; diff --git a/src/map_builders/area_ending_point.rs b/src/map_builders/area_ending_point.rs index 4d039f9..347b807 100644 --- a/src/map_builders/area_ending_point.rs +++ b/src/map_builders/area_ending_point.rs @@ -1,4 +1,4 @@ -use ::rltk::{DistanceAlg, Point}; +use ::rltk::prelude::*; use super::{BuilderMap, MetaMapBuilder}; use crate::{map, TileType}; diff --git a/src/map_builders/dwarf_fort.rs b/src/map_builders/dwarf_fort.rs index e31c1c7..65cfd21 100644 --- a/src/map_builders/dwarf_fort.rs +++ b/src/map_builders/dwarf_fort.rs @@ -1,4 +1,4 @@ -use ::rltk::{DistanceAlg, Point}; +use ::rltk::prelude::*; use super::{ AreaEndingPosition, AreaStartingPosition, BspCorridors, BspDungeonBuilder, BuilderChain, diff --git a/src/map_builders/voronoi_spawning.rs b/src/map_builders/voronoi_spawning.rs index 5af1cb4..332eeb7 100644 --- a/src/map_builders/voronoi_spawning.rs +++ b/src/map_builders/voronoi_spawning.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use ::rltk::{CellularDistanceFunction, FastNoise, NoiseType}; +use ::rltk::prelude::*; use crate::map_builders::{BuilderMap, MetaMapBuilder}; use crate::rng::roll_dice; diff --git a/src/player.rs b/src/player.rs index 240ec92..f581b99 100644 --- a/src/player.rs +++ b/src/player.rs @@ -1,8 +1,8 @@ //! Player-related functionality use std::cmp::{max, min}; -use rltk::{DistanceAlg, Point, Rltk, VirtualKeyCode}; -use specs::prelude::*; +use ::rltk::prelude::*; +use ::specs::prelude::*; use crate::components::{ Attributes, BlocksTile, BlocksVisibility, Door, EntityMoved, Equipped, Faction, HungerClock, diff --git a/src/raws.rs b/src/raws.rs index cfce031..dd9916f 100644 --- a/src/raws.rs +++ b/src/raws.rs @@ -11,7 +11,7 @@ mod weapon_traits; use std::sync::Mutex; -use ::rltk::{embedded_resource, link_resource}; +use ::rltk::prelude::*; use ::serde::Deserialize; pub use faction_structs::*; use item_structs::*; diff --git a/src/raws/rawmaster.rs b/src/raws/rawmaster.rs index b99c5b4..b61e23d 100644 --- a/src/raws/rawmaster.rs +++ b/src/raws/rawmaster.rs @@ -1,7 +1,7 @@ use std::collections::{HashMap, HashSet}; use ::regex::Regex; -use ::rltk::{console, RGB}; +use ::rltk::prelude::*; use ::specs::prelude::*; use ::specs::saveload::{MarkedBuilder, SimpleMarker}; diff --git a/src/rex_assets.rs b/src/rex_assets.rs index 1a5a06b..d1d1702 100644 --- a/src/rex_assets.rs +++ b/src/rex_assets.rs @@ -1,5 +1,5 @@ +use ::rltk::prelude::*; use ::rltk::rex::XpFile; -use ::rltk::{embedded_resource, link_resource}; embedded_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp"); embedded_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp"); diff --git a/src/state.rs b/src/state.rs index a7c1aa4..274e855 100644 --- a/src/state.rs +++ b/src/state.rs @@ -1,5 +1,5 @@ //! Game state -use ::rltk::{GameState, Point, Rltk}; +use ::rltk::prelude::*; use ::specs::prelude::*; use crate::components::*; diff --git a/src/systems/ai/approach_ai_system.rs b/src/systems/ai/approach_ai_system.rs index 42281b7..b57f2d4 100644 --- a/src/systems/ai/approach_ai_system.rs +++ b/src/systems/ai/approach_ai_system.rs @@ -1,4 +1,4 @@ -use ::rltk::a_star_search; +use ::rltk::prelude::*; use ::specs::prelude::*; use crate::components::{ApplyMove, MyTurn, Position, WantsToApproach}; diff --git a/src/systems/ai/chase_ai_system.rs b/src/systems/ai/chase_ai_system.rs index feef03e..752a157 100644 --- a/src/systems/ai/chase_ai_system.rs +++ b/src/systems/ai/chase_ai_system.rs @@ -1,5 +1,6 @@ use std::collections::HashMap; +use ::rltk::prelude::*; use ::specs::prelude::*; use crate::components::{ApplyMove, Chasing, MyTurn, Position, TileSize}; @@ -20,8 +21,6 @@ impl<'a> System<'a> for ChaseAI { ); fn run(&mut self, data: Self::SystemData) { - use ::rltk::a_star_search; - let (mut turns, mut chasing, positions, map, entities, mut apply_move, sizes) = data; let mut targets: HashMap = HashMap::new(); diff --git a/src/systems/ai/flee_ai_system.rs b/src/systems/ai/flee_ai_system.rs index 21899ff..f655509 100644 --- a/src/systems/ai/flee_ai_system.rs +++ b/src/systems/ai/flee_ai_system.rs @@ -1,4 +1,4 @@ -use ::rltk::DijkstraMap; +use ::rltk::prelude::*; use ::specs::prelude::*; use crate::components::{ApplyMove, MyTurn, Position, WantsToFlee}; diff --git a/src/systems/lighting_system.rs b/src/systems/lighting_system.rs index 610a2d1..8f3daf6 100644 --- a/src/systems/lighting_system.rs +++ b/src/systems/lighting_system.rs @@ -1,6 +1,5 @@ -use ::rltk::Point; +use ::rltk::prelude::*; use ::specs::prelude::*; -use rltk::DistanceAlg; use crate::components::{LightSource, Position, Viewshed}; use crate::{colors, Map}; diff --git a/src/systems/particle_system.rs b/src/systems/particle_system.rs index f34f14e..6c07fab 100644 --- a/src/systems/particle_system.rs +++ b/src/systems/particle_system.rs @@ -1,4 +1,4 @@ -use ::rltk::{Rltk, RGB}; +use ::rltk::prelude::*; use ::specs::prelude::*; use crate::components::{ParticleLifetime, Position, Renderable};