imports to lib.rs, creating unit tests
This commit is contained in:
Llywelwyn
parent
568df55795
commit
3464e9447c
13 changed files with 697 additions and 639 deletions
|
|
@ -19,7 +19,7 @@ use crate::{
|
||||||
Name,
|
Name,
|
||||||
ObfuscatedName,
|
ObfuscatedName,
|
||||||
Renderable,
|
Renderable,
|
||||||
State,
|
states::state::*,
|
||||||
};
|
};
|
||||||
use rltk::prelude::*;
|
use rltk::prelude::*;
|
||||||
use specs::prelude::*;
|
use specs::prelude::*;
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,12 @@ use super::{
|
||||||
Prop,
|
Prop,
|
||||||
Renderable,
|
Renderable,
|
||||||
RunState,
|
RunState,
|
||||||
|
states::state::*,
|
||||||
Skill,
|
Skill,
|
||||||
Skills,
|
Skills,
|
||||||
State,
|
|
||||||
Viewshed,
|
Viewshed,
|
||||||
BUC,
|
BUC,
|
||||||
get_local_col,
|
data::ids::get_local_col,
|
||||||
};
|
};
|
||||||
use crate::data::entity::CARRY_CAPACITY_PER_STRENGTH;
|
use crate::data::entity::CARRY_CAPACITY_PER_STRENGTH;
|
||||||
use crate::data::visuals::{ TARGETING_LINE_COL, TARGETING_CURSOR_COL, TARGETING_AOE_COL, TARGETING_VALID_COL };
|
use crate::data::visuals::{ TARGETING_LINE_COL, TARGETING_CURSOR_COL, TARGETING_AOE_COL, TARGETING_VALID_COL };
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ use super::{
|
||||||
ItemMenuResult,
|
ItemMenuResult,
|
||||||
UniqueInventoryItem,
|
UniqueInventoryItem,
|
||||||
};
|
};
|
||||||
use crate::{ gamelog, Beatitude, Entity, Equipped, InBackpack, Item, Name, Renderable, State, BUC };
|
use crate::{ gamelog, Beatitude, Entity, Equipped, InBackpack, Item, Name, Renderable, states::state::*, BUC };
|
||||||
use rltk::prelude::*;
|
use rltk::prelude::*;
|
||||||
use specs::prelude::*;
|
use specs::prelude::*;
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
|
||||||
45
src/lib.rs
Normal file
45
src/lib.rs
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
// src/lib.rs
|
||||||
|
// 31-Aug-2023
|
||||||
|
|
||||||
|
use rltk::prelude::*;
|
||||||
|
use specs::prelude::*;
|
||||||
|
extern crate serde;
|
||||||
|
|
||||||
|
#[macro_use]
|
||||||
|
extern crate lazy_static;
|
||||||
|
|
||||||
|
pub mod camera;
|
||||||
|
pub mod components;
|
||||||
|
pub mod raws;
|
||||||
|
pub mod map;
|
||||||
|
pub mod player;
|
||||||
|
pub mod rect;
|
||||||
|
pub mod gamelog;
|
||||||
|
pub mod gui;
|
||||||
|
pub mod map_builders;
|
||||||
|
pub mod saveload_system;
|
||||||
|
pub mod spawner;
|
||||||
|
pub mod visibility_system;
|
||||||
|
pub mod damage_system;
|
||||||
|
pub mod hunger_system;
|
||||||
|
pub mod melee_combat_system;
|
||||||
|
pub mod trigger_system;
|
||||||
|
pub mod inventory;
|
||||||
|
pub mod particle_system;
|
||||||
|
pub mod ai;
|
||||||
|
pub mod data;
|
||||||
|
pub mod config;
|
||||||
|
pub mod effects;
|
||||||
|
pub mod gamesystem;
|
||||||
|
pub mod random_table;
|
||||||
|
pub mod rex_assets;
|
||||||
|
pub mod spatial;
|
||||||
|
pub mod morgue;
|
||||||
|
pub mod states;
|
||||||
|
|
||||||
|
pub use components::*;
|
||||||
|
use particle_system::ParticleBuilder;
|
||||||
|
pub use rect::Rect;
|
||||||
|
pub use map::*;
|
||||||
|
pub use states::runstate::RunState;
|
||||||
|
pub use states::state::State;
|
||||||
635
src/main.rs
635
src/main.rs
|
|
@ -1,635 +1,7 @@
|
||||||
use rltk::{ GameState, Point, RandomNumberGenerator, Rltk };
|
use rust_rl::*;
|
||||||
use specs::prelude::*;
|
use specs::prelude::*;
|
||||||
use specs::saveload::{ SimpleMarker, SimpleMarkerAllocator };
|
use specs::saveload::{ SimpleMarker, SimpleMarkerAllocator };
|
||||||
use crate::data::ids::*;
|
use rltk::prelude::*;
|
||||||
extern crate serde;
|
|
||||||
|
|
||||||
pub mod camera;
|
|
||||||
mod components;
|
|
||||||
pub mod raws;
|
|
||||||
pub use components::*;
|
|
||||||
mod map;
|
|
||||||
pub use map::*;
|
|
||||||
mod player;
|
|
||||||
use player::*;
|
|
||||||
mod rect;
|
|
||||||
pub use rect::Rect;
|
|
||||||
mod gamelog;
|
|
||||||
mod gui;
|
|
||||||
pub mod map_builders;
|
|
||||||
mod saveload_system;
|
|
||||||
mod spawner;
|
|
||||||
mod visibility_system;
|
|
||||||
use visibility_system::VisibilitySystem;
|
|
||||||
mod damage_system;
|
|
||||||
mod hunger_system;
|
|
||||||
mod melee_combat_system;
|
|
||||||
mod trigger_system;
|
|
||||||
use melee_combat_system::MeleeCombatSystem;
|
|
||||||
mod inventory;
|
|
||||||
mod particle_system;
|
|
||||||
use particle_system::ParticleBuilder;
|
|
||||||
mod ai;
|
|
||||||
mod data;
|
|
||||||
mod config;
|
|
||||||
mod effects;
|
|
||||||
mod gamesystem;
|
|
||||||
mod random_table;
|
|
||||||
mod rex_assets;
|
|
||||||
mod spatial;
|
|
||||||
mod morgue;
|
|
||||||
use data::events::*;
|
|
||||||
|
|
||||||
#[macro_use]
|
|
||||||
extern crate lazy_static;
|
|
||||||
|
|
||||||
#[derive(PartialEq, Copy, Clone)]
|
|
||||||
pub enum RunState {
|
|
||||||
AwaitingInput, // Player's turn
|
|
||||||
PreRun,
|
|
||||||
Ticking, // Tick systems
|
|
||||||
ShowCheatMenu, // Teleport, godmode, etc. - for debugging
|
|
||||||
ShowInventory,
|
|
||||||
ShowDropItem,
|
|
||||||
ShowRemoveItem,
|
|
||||||
ShowTargeting {
|
|
||||||
x: i32,
|
|
||||||
y: i32,
|
|
||||||
range: i32,
|
|
||||||
item: Entity,
|
|
||||||
aoe: i32,
|
|
||||||
},
|
|
||||||
ShowRemoveCurse,
|
|
||||||
ShowIdentify,
|
|
||||||
ActionWithDirection {
|
|
||||||
function: fn(i: i32, j: i32, ecs: &mut World) -> RunState,
|
|
||||||
},
|
|
||||||
MainMenu {
|
|
||||||
menu_selection: gui::MainMenuSelection,
|
|
||||||
},
|
|
||||||
CharacterCreation {
|
|
||||||
ancestry: gui::Ancestry,
|
|
||||||
class: gui::Class,
|
|
||||||
},
|
|
||||||
SaveGame,
|
|
||||||
GameOver,
|
|
||||||
GoToLevel(i32, TileType),
|
|
||||||
HelpScreen,
|
|
||||||
MagicMapReveal {
|
|
||||||
row: i32,
|
|
||||||
cursed: bool,
|
|
||||||
}, // Animates magic mapping effect
|
|
||||||
MapGeneration,
|
|
||||||
Farlook {
|
|
||||||
x: i32,
|
|
||||||
y: i32,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct State {
|
|
||||||
pub ecs: World,
|
|
||||||
mapgen_next_state: Option<RunState>,
|
|
||||||
mapgen_history: Vec<Map>,
|
|
||||||
mapgen_index: usize,
|
|
||||||
mapgen_timer: f32,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl State {
|
|
||||||
fn generate_world_map(&mut self, new_id: i32, dest_tile: TileType) {
|
|
||||||
// Visualisation stuff
|
|
||||||
self.mapgen_index = 0;
|
|
||||||
self.mapgen_timer = 0.0;
|
|
||||||
self.mapgen_history.clear();
|
|
||||||
let map_building_info = map::level_transition(&mut self.ecs, new_id, dest_tile);
|
|
||||||
if let Some(history) = map_building_info {
|
|
||||||
self.mapgen_history = history;
|
|
||||||
} else {
|
|
||||||
map::dungeon::thaw_entities(&mut self.ecs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_systems(&mut self) {
|
|
||||||
let mut hunger_clock = hunger_system::HungerSystem {};
|
|
||||||
let mut particle_system = particle_system::ParticleSpawnSystem {};
|
|
||||||
|
|
||||||
// Order is *very* important here, to ensure effects take place in the right order,
|
|
||||||
// and that the player/AI are making decisions based on the most up-to-date info.
|
|
||||||
|
|
||||||
self.resolve_entity_decisions(); // Push Player messages of intent to effects queue, and run it.
|
|
||||||
self.refresh_indexes(); // Get up-to-date map and viewsheds prior to AI turn.
|
|
||||||
self.run_ai(); // Get AI decision-making.
|
|
||||||
self.resolve_entity_decisions(); // Push AI messages of intent to effects queue, and run it.
|
|
||||||
hunger_clock.run_now(&self.ecs); // Tick the hunger clock (on the turn clock's turn)
|
|
||||||
particle_system.run_now(&self.ecs); // Spawn/delete particles (turn independent)
|
|
||||||
self.ecs.maintain();
|
|
||||||
}
|
|
||||||
|
|
||||||
fn resolve_entity_decisions(&mut self) {
|
|
||||||
let mut trigger_system = trigger_system::TriggerSystem {};
|
|
||||||
let mut inventory_system = inventory::ItemCollectionSystem {};
|
|
||||||
let mut item_equip_system = inventory::ItemEquipSystem {};
|
|
||||||
let mut item_use_system = inventory::ItemUseSystem {};
|
|
||||||
let mut item_drop_system = inventory::ItemDropSystem {};
|
|
||||||
let mut item_remove_system = inventory::ItemRemoveSystem {};
|
|
||||||
let mut item_id_system = inventory::ItemIdentificationSystem {};
|
|
||||||
let mut melee_system = MeleeCombatSystem {};
|
|
||||||
trigger_system.run_now(&self.ecs);
|
|
||||||
inventory_system.run_now(&self.ecs);
|
|
||||||
item_equip_system.run_now(&self.ecs);
|
|
||||||
item_use_system.run_now(&self.ecs);
|
|
||||||
item_drop_system.run_now(&self.ecs);
|
|
||||||
item_remove_system.run_now(&self.ecs);
|
|
||||||
item_id_system.run_now(&self.ecs);
|
|
||||||
melee_system.run_now(&self.ecs);
|
|
||||||
|
|
||||||
effects::run_effects_queue(&mut self.ecs);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn refresh_indexes(&mut self) {
|
|
||||||
let mut mapindex = spatial::MapIndexingSystem {};
|
|
||||||
let mut vis = VisibilitySystem {};
|
|
||||||
mapindex.run_now(&self.ecs);
|
|
||||||
vis.run_now(&self.ecs);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_ai(&mut self) {
|
|
||||||
let mut encumbrance_system = ai::EncumbranceSystem {}; // Must run first, as it affects energy regen.
|
|
||||||
let mut energy = ai::EnergySystem {}; // Figures out who deserves a turn.
|
|
||||||
let mut regen_system = ai::RegenSystem {}; // Restores HP on appropriate clock ticks.
|
|
||||||
let mut turn_status_system = ai::TurnStatusSystem {}; // Ticks stasuses. Should anyone now lose their turn? i.e. confusion
|
|
||||||
let mut quip_system = ai::QuipSystem {}; // Quipping is "free". It doesn't use up a turn.
|
|
||||||
let mut adjacent_ai = ai::AdjacentAI {}; // AdjacentAI -> DefaultAI are all exclusive. If one acts, the entity's turn is over.
|
|
||||||
let mut visible_ai = ai::VisibleAI {};
|
|
||||||
let mut approach_ai = ai::ApproachAI {};
|
|
||||||
let mut flee_ai = ai::FleeAI {};
|
|
||||||
let mut chase_ai = ai::ChaseAI {};
|
|
||||||
let mut default_move_ai = ai::DefaultAI {};
|
|
||||||
encumbrance_system.run_now(&self.ecs);
|
|
||||||
energy.run_now(&self.ecs);
|
|
||||||
regen_system.run_now(&self.ecs);
|
|
||||||
turn_status_system.run_now(&self.ecs);
|
|
||||||
quip_system.run_now(&self.ecs);
|
|
||||||
adjacent_ai.run_now(&self.ecs);
|
|
||||||
visible_ai.run_now(&self.ecs);
|
|
||||||
approach_ai.run_now(&self.ecs);
|
|
||||||
flee_ai.run_now(&self.ecs);
|
|
||||||
chase_ai.run_now(&self.ecs);
|
|
||||||
default_move_ai.run_now(&self.ecs);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn goto_id(&mut self, id: i32, dest_tile: TileType) {
|
|
||||||
// Freeze curr level
|
|
||||||
map::dungeon::freeze_entities(&mut self.ecs);
|
|
||||||
self.generate_world_map(id, dest_tile);
|
|
||||||
let mapname = self.ecs.fetch::<Map>().name.clone();
|
|
||||||
gamelog::Logger
|
|
||||||
::new()
|
|
||||||
.append("You head to")
|
|
||||||
.colour(rgb_to_u8(get_local_col(id)))
|
|
||||||
.append_n(&mapname)
|
|
||||||
.colour(rltk::WHITE)
|
|
||||||
.period()
|
|
||||||
.log();
|
|
||||||
gamelog::record_event(EVENT::CHANGED_FLOOR(mapname));
|
|
||||||
}
|
|
||||||
|
|
||||||
fn game_over_cleanup(&mut self) {
|
|
||||||
// Delete everything
|
|
||||||
let mut to_delete = Vec::new();
|
|
||||||
for e in self.ecs.entities().join() {
|
|
||||||
to_delete.push(e);
|
|
||||||
}
|
|
||||||
for del in to_delete.iter() {
|
|
||||||
self.ecs.delete_entity(*del).expect("Deletion failed");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Spawn a new player and build new map
|
|
||||||
{
|
|
||||||
let player_entity = spawner::player(&mut self.ecs, 0, 0);
|
|
||||||
let mut player_entity_writer = self.ecs.write_resource::<Entity>();
|
|
||||||
*player_entity_writer = player_entity;
|
|
||||||
}
|
|
||||||
// Replace map list
|
|
||||||
self.ecs.insert(map::dungeon::MasterDungeonMap::new());
|
|
||||||
self.generate_world_map(1, TileType::Floor);
|
|
||||||
|
|
||||||
gamelog::setup_log();
|
|
||||||
gamelog::record_event(EVENT::LEVEL(1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl GameState for State {
|
|
||||||
fn tick(&mut self, ctx: &mut Rltk) {
|
|
||||||
let mut new_runstate;
|
|
||||||
{
|
|
||||||
let runstate = self.ecs.fetch::<RunState>();
|
|
||||||
new_runstate = *runstate;
|
|
||||||
}
|
|
||||||
// Clear screen
|
|
||||||
ctx.cls();
|
|
||||||
particle_system::particle_ticker(&mut self.ecs, ctx);
|
|
||||||
|
|
||||||
match new_runstate {
|
|
||||||
RunState::MainMenu { .. } => {}
|
|
||||||
RunState::CharacterCreation { .. } => {}
|
|
||||||
_ => {
|
|
||||||
// Draw map and ui
|
|
||||||
camera::render_camera(&self.ecs, ctx);
|
|
||||||
gui::draw_ui(&self.ecs, ctx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
match new_runstate {
|
|
||||||
RunState::PreRun => {
|
|
||||||
self.run_systems();
|
|
||||||
self.ecs.maintain();
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
RunState::AwaitingInput => {
|
|
||||||
// We refresh the index, and run anything that might
|
|
||||||
// still be in the queue, just to make 100% sure that
|
|
||||||
// there are no lingering effects from the last tick.
|
|
||||||
self.refresh_indexes();
|
|
||||||
effects::run_effects_queue(&mut self.ecs);
|
|
||||||
// Sanity-checking that the player actually *should*
|
|
||||||
// be taking a turn before giving them one. If they
|
|
||||||
// don't have a turn component, go back to ticking.
|
|
||||||
let mut can_act = false;
|
|
||||||
{
|
|
||||||
let player_entity = self.ecs.fetch::<Entity>();
|
|
||||||
let turns = self.ecs.read_storage::<TakingTurn>();
|
|
||||||
if let Some(_) = turns.get(*player_entity) {
|
|
||||||
can_act = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if can_act {
|
|
||||||
let on_overmap = self.ecs.fetch::<Map>().overmap;
|
|
||||||
new_runstate = player_input(self, ctx, on_overmap);
|
|
||||||
} else {
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::Ticking => {
|
|
||||||
while new_runstate == RunState::Ticking && particle_system::check_queue(&self.ecs) {
|
|
||||||
self.run_systems();
|
|
||||||
self.ecs.maintain();
|
|
||||||
try_spawn_interval(&mut self.ecs);
|
|
||||||
maybe_map_message(&mut self.ecs);
|
|
||||||
match *self.ecs.fetch::<RunState>() {
|
|
||||||
RunState::AwaitingInput => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
RunState::MagicMapReveal { row, cursed } => {
|
|
||||||
new_runstate = RunState::MagicMapReveal { row: row, cursed: cursed };
|
|
||||||
}
|
|
||||||
RunState::ShowRemoveCurse => {
|
|
||||||
new_runstate = RunState::ShowRemoveCurse;
|
|
||||||
}
|
|
||||||
RunState::ShowIdentify => {
|
|
||||||
new_runstate = RunState::ShowIdentify;
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::Farlook { .. } => {
|
|
||||||
let result = gui::show_farlook(self, ctx);
|
|
||||||
match result {
|
|
||||||
gui::FarlookResult::NoResponse { x, y } => {
|
|
||||||
new_runstate = RunState::Farlook { x, y };
|
|
||||||
}
|
|
||||||
gui::FarlookResult::Cancel => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::ShowCheatMenu => {
|
|
||||||
let result = gui::show_cheat_menu(self, ctx);
|
|
||||||
match result {
|
|
||||||
gui::CheatMenuResult::Cancel => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::CheatMenuResult::NoResponse => {}
|
|
||||||
gui::CheatMenuResult::Ascend => {
|
|
||||||
let id = self.ecs.fetch::<Map>().id - 1;
|
|
||||||
self.goto_id(id, TileType::DownStair);
|
|
||||||
self.mapgen_next_state = Some(RunState::PreRun);
|
|
||||||
new_runstate = RunState::MapGeneration;
|
|
||||||
}
|
|
||||||
gui::CheatMenuResult::Descend => {
|
|
||||||
let id = self.ecs.fetch::<Map>().id + 1;
|
|
||||||
self.goto_id(id, TileType::UpStair);
|
|
||||||
self.mapgen_next_state = Some(RunState::PreRun);
|
|
||||||
new_runstate = RunState::MapGeneration;
|
|
||||||
}
|
|
||||||
gui::CheatMenuResult::Heal => {
|
|
||||||
let player = self.ecs.fetch::<Entity>();
|
|
||||||
let mut pools = self.ecs.write_storage::<Pools>();
|
|
||||||
let mut player_pools = pools.get_mut(*player).unwrap();
|
|
||||||
player_pools.hit_points.current = player_pools.hit_points.max;
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::CheatMenuResult::MagicMap => {
|
|
||||||
let mut map = self.ecs.fetch_mut::<Map>();
|
|
||||||
for v in map.revealed_tiles.iter_mut() {
|
|
||||||
*v = true;
|
|
||||||
}
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::CheatMenuResult::GodMode => {
|
|
||||||
let player = self.ecs.fetch::<Entity>();
|
|
||||||
let mut pools = self.ecs.write_storage::<Pools>();
|
|
||||||
let mut player_pools = pools.get_mut(*player).unwrap();
|
|
||||||
gamelog::Logger::new().append("TOGGLED GOD MODE!").log();
|
|
||||||
player_pools.god = !player_pools.god;
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::ShowInventory => {
|
|
||||||
let result = gui::show_inventory(self, ctx);
|
|
||||||
match result.0 {
|
|
||||||
gui::ItemMenuResult::Cancel => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::ItemMenuResult::NoResponse => {}
|
|
||||||
gui::ItemMenuResult::Selected => {
|
|
||||||
let item_entity = result.1.unwrap();
|
|
||||||
let is_ranged = self.ecs.read_storage::<Ranged>();
|
|
||||||
let ranged_item = is_ranged.get(item_entity);
|
|
||||||
if let Some(ranged_item) = ranged_item {
|
|
||||||
let is_aoe = self.ecs.read_storage::<AOE>();
|
|
||||||
let aoe_item = is_aoe.get(item_entity);
|
|
||||||
let (min_x, _max_x, min_y, _max_y, x_offset, y_offset) = camera::get_screen_bounds(
|
|
||||||
&self.ecs,
|
|
||||||
ctx
|
|
||||||
);
|
|
||||||
let ppos = self.ecs.fetch::<Point>();
|
|
||||||
if let Some(aoe_item) = aoe_item {
|
|
||||||
new_runstate = RunState::ShowTargeting {
|
|
||||||
x: ppos.x + x_offset - min_x,
|
|
||||||
y: ppos.y + y_offset - min_y,
|
|
||||||
range: ranged_item.range,
|
|
||||||
item: item_entity,
|
|
||||||
aoe: aoe_item.radius,
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
new_runstate = RunState::ShowTargeting {
|
|
||||||
x: ppos.x + x_offset - min_x,
|
|
||||||
y: ppos.y + y_offset - min_y,
|
|
||||||
range: ranged_item.range,
|
|
||||||
item: item_entity,
|
|
||||||
aoe: 0,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
let mut intent = self.ecs.write_storage::<WantsToUseItem>();
|
|
||||||
intent
|
|
||||||
.insert(*self.ecs.fetch::<Entity>(), WantsToUseItem { item: item_entity, target: None })
|
|
||||||
.expect("Unable to insert intent.");
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::ShowDropItem => {
|
|
||||||
let result = gui::drop_item_menu(self, ctx);
|
|
||||||
match result.0 {
|
|
||||||
gui::ItemMenuResult::Cancel => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::ItemMenuResult::NoResponse => {}
|
|
||||||
gui::ItemMenuResult::Selected => {
|
|
||||||
let item_entity = result.1.unwrap();
|
|
||||||
let mut intent = self.ecs.write_storage::<WantsToDropItem>();
|
|
||||||
intent
|
|
||||||
.insert(*self.ecs.fetch::<Entity>(), WantsToDropItem { item: item_entity })
|
|
||||||
.expect("Unable to insert intent");
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::ShowRemoveItem => {
|
|
||||||
let result = gui::remove_item_menu(self, ctx);
|
|
||||||
match result.0 {
|
|
||||||
gui::ItemMenuResult::Cancel => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::ItemMenuResult::NoResponse => {}
|
|
||||||
gui::ItemMenuResult::Selected => {
|
|
||||||
let item_entity = result.1.unwrap();
|
|
||||||
let mut intent = self.ecs.write_storage::<WantsToRemoveItem>();
|
|
||||||
intent
|
|
||||||
.insert(*self.ecs.fetch::<Entity>(), WantsToRemoveItem { item: item_entity })
|
|
||||||
.expect("Unable to insert intent");
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::ShowTargeting { x, y, range, item, aoe } => {
|
|
||||||
let result = gui::ranged_target(self, ctx, x, y, range, aoe);
|
|
||||||
match result.0 {
|
|
||||||
gui::TargetResult::Cancel => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::TargetResult::NoResponse { x, y } => {
|
|
||||||
new_runstate = RunState::ShowTargeting { x, y, range, item, aoe };
|
|
||||||
}
|
|
||||||
gui::TargetResult::Selected => {
|
|
||||||
let mut intent = self.ecs.write_storage::<WantsToUseItem>();
|
|
||||||
intent
|
|
||||||
.insert(*self.ecs.fetch::<Entity>(), WantsToUseItem { item, target: result.1 })
|
|
||||||
.expect("Unable to insert intent.");
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::ShowRemoveCurse => {
|
|
||||||
let result = gui::remove_curse(self, ctx);
|
|
||||||
match result.0 {
|
|
||||||
gui::ItemMenuResult::Cancel => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::ItemMenuResult::NoResponse => {}
|
|
||||||
gui::ItemMenuResult::Selected => {
|
|
||||||
let item_entity = result.1.unwrap();
|
|
||||||
self.ecs
|
|
||||||
.write_storage::<Beatitude>()
|
|
||||||
.insert(item_entity, Beatitude { buc: BUC::Uncursed, known: true })
|
|
||||||
.expect("Unable to insert beatitude");
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::ShowIdentify => {
|
|
||||||
let result = gui::identify(self, ctx);
|
|
||||||
match result.0 {
|
|
||||||
gui::ItemMenuResult::Cancel => {
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
gui::ItemMenuResult::NoResponse => {}
|
|
||||||
gui::ItemMenuResult::Selected => {
|
|
||||||
let item_entity = result.1.unwrap();
|
|
||||||
if let Some(name) = self.ecs.read_storage::<Name>().get(item_entity) {
|
|
||||||
let mut dm = self.ecs.fetch_mut::<MasterDungeonMap>();
|
|
||||||
dm.identified_items.insert(name.name.clone());
|
|
||||||
}
|
|
||||||
if let Some(beatitude) = self.ecs.write_storage::<Beatitude>().get_mut(item_entity) {
|
|
||||||
beatitude.known = true;
|
|
||||||
}
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::ActionWithDirection { function } => {
|
|
||||||
new_runstate = gui::get_input_direction(&mut self.ecs, ctx, function);
|
|
||||||
}
|
|
||||||
RunState::MainMenu { .. } => {
|
|
||||||
let result = gui::main_menu(self, ctx);
|
|
||||||
match result {
|
|
||||||
gui::MainMenuResult::NoSelection { selected } => {
|
|
||||||
new_runstate = RunState::MainMenu { menu_selection: selected };
|
|
||||||
}
|
|
||||||
gui::MainMenuResult::Selected { selected } =>
|
|
||||||
match selected {
|
|
||||||
gui::MainMenuSelection::NewGame => {
|
|
||||||
new_runstate = RunState::CharacterCreation {
|
|
||||||
ancestry: gui::Ancestry::Human,
|
|
||||||
class: gui::Class::Fighter,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
gui::MainMenuSelection::LoadGame => {
|
|
||||||
saveload_system::load_game(&mut self.ecs);
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
saveload_system::delete_save();
|
|
||||||
}
|
|
||||||
gui::MainMenuSelection::Quit => {
|
|
||||||
::std::process::exit(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::CharacterCreation { .. } => {
|
|
||||||
let result = gui::character_creation(self, ctx);
|
|
||||||
match result {
|
|
||||||
gui::CharCreateResult::NoSelection { ancestry, class } => {
|
|
||||||
new_runstate = RunState::CharacterCreation { ancestry, class };
|
|
||||||
}
|
|
||||||
gui::CharCreateResult::Selected { ancestry, class } => {
|
|
||||||
if ancestry == gui::Ancestry::NULL {
|
|
||||||
new_runstate = RunState::MainMenu { menu_selection: gui::MainMenuSelection::NewGame };
|
|
||||||
} else {
|
|
||||||
gui::setup_player_ancestry(&mut self.ecs, ancestry);
|
|
||||||
gui::setup_player_class(&mut self.ecs, class, ancestry);
|
|
||||||
new_runstate = RunState::PreRun;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::SaveGame => {
|
|
||||||
saveload_system::save_game(&mut self.ecs);
|
|
||||||
new_runstate = RunState::MainMenu { menu_selection: gui::MainMenuSelection::LoadGame };
|
|
||||||
}
|
|
||||||
RunState::GameOver => {
|
|
||||||
let result = gui::game_over(ctx);
|
|
||||||
let write_to_morgue: Option<bool> = match result {
|
|
||||||
gui::YesNoResult::NoSelection => None,
|
|
||||||
gui::YesNoResult::No => Some(false),
|
|
||||||
gui::YesNoResult::Yes => Some(true),
|
|
||||||
};
|
|
||||||
if let Some(response) = write_to_morgue {
|
|
||||||
if response {
|
|
||||||
morgue::create_morgue_file(&self.ecs);
|
|
||||||
}
|
|
||||||
self.game_over_cleanup();
|
|
||||||
new_runstate = RunState::MapGeneration;
|
|
||||||
self.mapgen_next_state = Some(RunState::MainMenu {
|
|
||||||
menu_selection: gui::MainMenuSelection::NewGame,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::GoToLevel(id, dest_tile) => {
|
|
||||||
self.goto_id(id, dest_tile);
|
|
||||||
self.mapgen_next_state = Some(RunState::PreRun);
|
|
||||||
new_runstate = RunState::MapGeneration;
|
|
||||||
}
|
|
||||||
RunState::HelpScreen => {
|
|
||||||
let result = gui::show_help(ctx);
|
|
||||||
match result {
|
|
||||||
gui::YesNoResult::Yes => {
|
|
||||||
gamelog::record_event(EVENT::LOOKED_FOR_HELP(1));
|
|
||||||
new_runstate = RunState::AwaitingInput;
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::MagicMapReveal { row, cursed } => {
|
|
||||||
let mut map = self.ecs.fetch_mut::<Map>();
|
|
||||||
|
|
||||||
// Could probably toss this into a function somewhere, and/or
|
|
||||||
// have multiple simple animations for it.
|
|
||||||
for x in 0..map.width {
|
|
||||||
let idx;
|
|
||||||
if x % 2 == 0 {
|
|
||||||
idx = map.xy_idx(x as i32, row);
|
|
||||||
} else {
|
|
||||||
idx = map.xy_idx(x as i32, (map.height as i32) - 1 - row);
|
|
||||||
}
|
|
||||||
if !cursed {
|
|
||||||
map.revealed_tiles[idx] = true;
|
|
||||||
} else {
|
|
||||||
map.revealed_tiles[idx] = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dirtify viewshed only if cursed, so our currently visible tiles aren't removed too
|
|
||||||
if cursed {
|
|
||||||
let player_entity = self.ecs.fetch::<Entity>();
|
|
||||||
let mut viewshed_components = self.ecs.write_storage::<Viewshed>();
|
|
||||||
let viewshed = viewshed_components.get_mut(*player_entity);
|
|
||||||
if let Some(viewshed) = viewshed {
|
|
||||||
viewshed.dirty = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (row as usize) == (map.height as usize) - 1 {
|
|
||||||
new_runstate = RunState::Ticking;
|
|
||||||
} else {
|
|
||||||
new_runstate = RunState::MagicMapReveal { row: row + 1, cursed: cursed };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
RunState::MapGeneration => {
|
|
||||||
if !config::CONFIG.logging.show_mapgen {
|
|
||||||
new_runstate = self.mapgen_next_state.unwrap();
|
|
||||||
}
|
|
||||||
if self.mapgen_history.len() != 0 {
|
|
||||||
ctx.cls();
|
|
||||||
camera::render_debug_map(&self.mapgen_history[self.mapgen_index], ctx);
|
|
||||||
|
|
||||||
self.mapgen_timer += ctx.frame_time_ms;
|
|
||||||
if self.mapgen_timer > 300.0 {
|
|
||||||
self.mapgen_timer = 0.0;
|
|
||||||
self.mapgen_index += 1;
|
|
||||||
if self.mapgen_index >= self.mapgen_history.len() {
|
|
||||||
new_runstate = self.mapgen_next_state.unwrap();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
let mut runwriter = self.ecs.write_resource::<RunState>();
|
|
||||||
*runwriter = new_runstate;
|
|
||||||
}
|
|
||||||
|
|
||||||
damage_system::delete_the_dead(&mut self.ecs);
|
|
||||||
|
|
||||||
let _ = rltk::render_draw_buffer(ctx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const DISPLAYWIDTH: i32 = 105;
|
const DISPLAYWIDTH: i32 = 105;
|
||||||
const DISPLAYHEIGHT: i32 = 56;
|
const DISPLAYHEIGHT: i32 = 56;
|
||||||
|
|
@ -641,7 +13,6 @@ fn main() -> rltk::BError {
|
||||||
|
|
||||||
//rltk::link_resource!(CURSES14X16, "../resources/curses_14x16.png");
|
//rltk::link_resource!(CURSES14X16, "../resources/curses_14x16.png");
|
||||||
|
|
||||||
use rltk::RltkBuilder;
|
|
||||||
let mut context = RltkBuilder::new()
|
let mut context = RltkBuilder::new()
|
||||||
.with_title("rust-rl")
|
.with_title("rust-rl")
|
||||||
.with_dimensions(DISPLAYWIDTH, DISPLAYHEIGHT)
|
.with_dimensions(DISPLAYWIDTH, DISPLAYHEIGHT)
|
||||||
|
|
@ -756,7 +127,7 @@ fn main() -> rltk::BError {
|
||||||
gs.ecs.insert(rex_assets::RexAssets::new());
|
gs.ecs.insert(rex_assets::RexAssets::new());
|
||||||
|
|
||||||
gamelog::setup_log();
|
gamelog::setup_log();
|
||||||
gamelog::record_event(EVENT::LEVEL(1));
|
gamelog::record_event(data::events::EVENT::LEVEL(1));
|
||||||
gs.generate_world_map(1, TileType::Floor);
|
gs.generate_world_map(1, TileType::Floor);
|
||||||
|
|
||||||
rltk::main_loop(context, gs)
|
rltk::main_loop(context, gs)
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ pub use interval_spawning_system::{ maybe_map_message, try_spawn_interval };
|
||||||
pub mod dungeon;
|
pub mod dungeon;
|
||||||
pub use dungeon::{ level_transition, MasterDungeonMap };
|
pub use dungeon::{ level_transition, MasterDungeonMap };
|
||||||
pub mod themes;
|
pub mod themes;
|
||||||
use crate::data::visuals::{ BRIGHTEN_FG_COLOUR_BY, GLOBAL_OFFSET_MIN_CLAMP, GLOBAL_OFFSET_MAX_CLAMP };
|
use super::data::visuals::{ BRIGHTEN_FG_COLOUR_BY, GLOBAL_OFFSET_MIN_CLAMP, GLOBAL_OFFSET_MAX_CLAMP };
|
||||||
|
|
||||||
// FIXME: If the map size gets too small, entities stop being rendered starting from the right.
|
// FIXME: If the map size gets too small, entities stop being rendered starting from the right.
|
||||||
// i.e. on a map size of 40*40, only entities to the left of the player are rendered.
|
// i.e. on a map size of 40*40, only entities to the left of the player are rendered.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use serde::{ Deserialize, Serialize };
|
use serde::{ Deserialize, Serialize };
|
||||||
|
|
||||||
#[derive(PartialEq, Eq, Hash, Copy, Clone, Serialize, Deserialize)]
|
#[derive(PartialEq, Eq, Hash, Copy, Clone, Serialize, Deserialize, Debug)]
|
||||||
pub enum TileType {
|
pub enum TileType {
|
||||||
// Walls (opaque)
|
// Walls (opaque)
|
||||||
ImpassableMountain,
|
ImpassableMountain,
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ use super::{
|
||||||
Position,
|
Position,
|
||||||
Renderable,
|
Renderable,
|
||||||
RunState,
|
RunState,
|
||||||
State,
|
states::state::*,
|
||||||
Telepath,
|
Telepath,
|
||||||
TileType,
|
TileType,
|
||||||
Viewshed,
|
Viewshed,
|
||||||
|
|
|
||||||
2
src/states/mod.rs
Normal file
2
src/states/mod.rs
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
pub mod runstate;
|
||||||
|
pub mod state;
|
||||||
46
src/states/runstate.rs
Normal file
46
src/states/runstate.rs
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
use specs::prelude::*;
|
||||||
|
use crate::gui;
|
||||||
|
use crate::map::TileType;
|
||||||
|
|
||||||
|
#[derive(PartialEq, Copy, Clone)]
|
||||||
|
pub enum RunState {
|
||||||
|
AwaitingInput, // Player's turn
|
||||||
|
PreRun,
|
||||||
|
Ticking, // Tick systems
|
||||||
|
ShowCheatMenu, // Teleport, godmode, etc. - for debugging
|
||||||
|
ShowInventory,
|
||||||
|
ShowDropItem,
|
||||||
|
ShowRemoveItem,
|
||||||
|
ShowTargeting {
|
||||||
|
x: i32,
|
||||||
|
y: i32,
|
||||||
|
range: i32,
|
||||||
|
item: Entity,
|
||||||
|
aoe: i32,
|
||||||
|
},
|
||||||
|
ShowRemoveCurse,
|
||||||
|
ShowIdentify,
|
||||||
|
ActionWithDirection {
|
||||||
|
function: fn(i: i32, j: i32, ecs: &mut World) -> RunState,
|
||||||
|
},
|
||||||
|
MainMenu {
|
||||||
|
menu_selection: gui::MainMenuSelection,
|
||||||
|
},
|
||||||
|
CharacterCreation {
|
||||||
|
ancestry: gui::Ancestry,
|
||||||
|
class: gui::Class,
|
||||||
|
},
|
||||||
|
SaveGame,
|
||||||
|
GameOver,
|
||||||
|
GoToLevel(i32, TileType),
|
||||||
|
HelpScreen,
|
||||||
|
MagicMapReveal {
|
||||||
|
row: i32,
|
||||||
|
cursed: bool,
|
||||||
|
}, // Animates magic mapping effect
|
||||||
|
MapGeneration,
|
||||||
|
Farlook {
|
||||||
|
x: i32,
|
||||||
|
y: i32,
|
||||||
|
},
|
||||||
|
}
|
||||||
570
src/states/state.rs
Normal file
570
src/states/state.rs
Normal file
|
|
@ -0,0 +1,570 @@
|
||||||
|
use specs::prelude::*;
|
||||||
|
use rltk::prelude::*;
|
||||||
|
use super::runstate::RunState;
|
||||||
|
use crate::map::*;
|
||||||
|
use crate::hunger_system;
|
||||||
|
use crate::particle_system;
|
||||||
|
use crate::trigger_system;
|
||||||
|
use crate::inventory;
|
||||||
|
use crate::melee_combat_system::MeleeCombatSystem;
|
||||||
|
use crate::spatial;
|
||||||
|
use crate::effects;
|
||||||
|
use crate::visibility_system::VisibilitySystem;
|
||||||
|
use crate::ai;
|
||||||
|
use crate::gamelog;
|
||||||
|
use crate::spawner;
|
||||||
|
use crate::data::ids::*;
|
||||||
|
use crate::data::events::*;
|
||||||
|
use crate::components::*;
|
||||||
|
use crate::player::*;
|
||||||
|
use crate::gui;
|
||||||
|
use crate::config;
|
||||||
|
use crate::camera;
|
||||||
|
use crate::saveload_system;
|
||||||
|
use crate::morgue;
|
||||||
|
use crate::damage_system;
|
||||||
|
|
||||||
|
pub struct State {
|
||||||
|
pub ecs: World,
|
||||||
|
pub mapgen_next_state: Option<RunState>,
|
||||||
|
pub mapgen_history: Vec<Map>,
|
||||||
|
pub mapgen_index: usize,
|
||||||
|
pub mapgen_timer: f32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl State {
|
||||||
|
pub fn generate_world_map(&mut self, new_id: i32, dest_tile: TileType) {
|
||||||
|
// Visualisation stuff
|
||||||
|
self.mapgen_index = 0;
|
||||||
|
self.mapgen_timer = 0.0;
|
||||||
|
self.mapgen_history.clear();
|
||||||
|
let map_building_info = level_transition(&mut self.ecs, new_id, dest_tile);
|
||||||
|
if let Some(history) = map_building_info {
|
||||||
|
self.mapgen_history = history;
|
||||||
|
} else {
|
||||||
|
dungeon::thaw_entities(&mut self.ecs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_systems(&mut self) {
|
||||||
|
let mut hunger_clock = hunger_system::HungerSystem {};
|
||||||
|
let mut particle_system = particle_system::ParticleSpawnSystem {};
|
||||||
|
|
||||||
|
// Order is *very* important here, to ensure effects take place in the right order,
|
||||||
|
// and that the player/AI are making decisions based on the most up-to-date info.
|
||||||
|
|
||||||
|
self.resolve_entity_decisions(); // Push Player messages of intent to effects queue, and run it.
|
||||||
|
self.refresh_indexes(); // Get up-to-date map and viewsheds prior to AI turn.
|
||||||
|
self.run_ai(); // Get AI decision-making.
|
||||||
|
self.resolve_entity_decisions(); // Push AI messages of intent to effects queue, and run it.
|
||||||
|
hunger_clock.run_now(&self.ecs); // Tick the hunger clock (on the turn clock's turn)
|
||||||
|
particle_system.run_now(&self.ecs); // Spawn/delete particles (turn independent)
|
||||||
|
self.ecs.maintain();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resolve_entity_decisions(&mut self) {
|
||||||
|
let mut trigger_system = trigger_system::TriggerSystem {};
|
||||||
|
let mut inventory_system = inventory::ItemCollectionSystem {};
|
||||||
|
let mut item_equip_system = inventory::ItemEquipSystem {};
|
||||||
|
let mut item_use_system = inventory::ItemUseSystem {};
|
||||||
|
let mut item_drop_system = inventory::ItemDropSystem {};
|
||||||
|
let mut item_remove_system = inventory::ItemRemoveSystem {};
|
||||||
|
let mut item_id_system = inventory::ItemIdentificationSystem {};
|
||||||
|
let mut melee_system = MeleeCombatSystem {};
|
||||||
|
trigger_system.run_now(&self.ecs);
|
||||||
|
inventory_system.run_now(&self.ecs);
|
||||||
|
item_equip_system.run_now(&self.ecs);
|
||||||
|
item_use_system.run_now(&self.ecs);
|
||||||
|
item_drop_system.run_now(&self.ecs);
|
||||||
|
item_remove_system.run_now(&self.ecs);
|
||||||
|
item_id_system.run_now(&self.ecs);
|
||||||
|
melee_system.run_now(&self.ecs);
|
||||||
|
|
||||||
|
effects::run_effects_queue(&mut self.ecs);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn refresh_indexes(&mut self) {
|
||||||
|
let mut mapindex = spatial::MapIndexingSystem {};
|
||||||
|
let mut vis = VisibilitySystem {};
|
||||||
|
mapindex.run_now(&self.ecs);
|
||||||
|
vis.run_now(&self.ecs);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_ai(&mut self) {
|
||||||
|
let mut encumbrance_system = ai::EncumbranceSystem {}; // Must run first, as it affects energy regen.
|
||||||
|
let mut energy = ai::EnergySystem {}; // Figures out who deserves a turn.
|
||||||
|
let mut regen_system = ai::RegenSystem {}; // Restores HP on appropriate clock ticks.
|
||||||
|
let mut turn_status_system = ai::TurnStatusSystem {}; // Ticks stasuses. Should anyone now lose their turn? i.e. confusion
|
||||||
|
let mut quip_system = ai::QuipSystem {}; // Quipping is "free". It doesn't use up a turn.
|
||||||
|
let mut adjacent_ai = ai::AdjacentAI {}; // AdjacentAI -> DefaultAI are all exclusive. If one acts, the entity's turn is over.
|
||||||
|
let mut visible_ai = ai::VisibleAI {};
|
||||||
|
let mut approach_ai = ai::ApproachAI {};
|
||||||
|
let mut flee_ai = ai::FleeAI {};
|
||||||
|
let mut chase_ai = ai::ChaseAI {};
|
||||||
|
let mut default_move_ai = ai::DefaultAI {};
|
||||||
|
encumbrance_system.run_now(&self.ecs);
|
||||||
|
energy.run_now(&self.ecs);
|
||||||
|
regen_system.run_now(&self.ecs);
|
||||||
|
turn_status_system.run_now(&self.ecs);
|
||||||
|
quip_system.run_now(&self.ecs);
|
||||||
|
adjacent_ai.run_now(&self.ecs);
|
||||||
|
visible_ai.run_now(&self.ecs);
|
||||||
|
approach_ai.run_now(&self.ecs);
|
||||||
|
flee_ai.run_now(&self.ecs);
|
||||||
|
chase_ai.run_now(&self.ecs);
|
||||||
|
default_move_ai.run_now(&self.ecs);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn goto_id(&mut self, id: i32, dest_tile: TileType) {
|
||||||
|
// Freeze curr level
|
||||||
|
dungeon::freeze_entities(&mut self.ecs);
|
||||||
|
self.generate_world_map(id, dest_tile);
|
||||||
|
let mapname = self.ecs.fetch::<Map>().name.clone();
|
||||||
|
gamelog::Logger
|
||||||
|
::new()
|
||||||
|
.append("You head to")
|
||||||
|
.colour(rgb_to_u8(get_local_col(id)))
|
||||||
|
.append_n(&mapname)
|
||||||
|
.colour(rltk::WHITE)
|
||||||
|
.period()
|
||||||
|
.log();
|
||||||
|
gamelog::record_event(EVENT::CHANGED_FLOOR(mapname));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn game_over_cleanup(&mut self) {
|
||||||
|
// Delete everything
|
||||||
|
let mut to_delete = Vec::new();
|
||||||
|
for e in self.ecs.entities().join() {
|
||||||
|
to_delete.push(e);
|
||||||
|
}
|
||||||
|
for del in to_delete.iter() {
|
||||||
|
self.ecs.delete_entity(*del).expect("Deletion failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spawn a new player and build new map
|
||||||
|
{
|
||||||
|
let player_entity = spawner::player(&mut self.ecs, 0, 0);
|
||||||
|
let mut player_entity_writer = self.ecs.write_resource::<Entity>();
|
||||||
|
*player_entity_writer = player_entity;
|
||||||
|
}
|
||||||
|
// Replace map list
|
||||||
|
self.ecs.insert(dungeon::MasterDungeonMap::new());
|
||||||
|
self.generate_world_map(1, TileType::Floor);
|
||||||
|
|
||||||
|
gamelog::setup_log();
|
||||||
|
gamelog::record_event(EVENT::LEVEL(1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl GameState for State {
|
||||||
|
fn tick(&mut self, ctx: &mut Rltk) {
|
||||||
|
let mut new_runstate;
|
||||||
|
{
|
||||||
|
let runstate = self.ecs.fetch::<RunState>();
|
||||||
|
new_runstate = *runstate;
|
||||||
|
}
|
||||||
|
// Clear screen
|
||||||
|
ctx.cls();
|
||||||
|
particle_system::particle_ticker(&mut self.ecs, ctx);
|
||||||
|
|
||||||
|
match new_runstate {
|
||||||
|
RunState::MainMenu { .. } => {}
|
||||||
|
RunState::CharacterCreation { .. } => {}
|
||||||
|
_ => {
|
||||||
|
// Draw map and ui
|
||||||
|
camera::render_camera(&self.ecs, ctx);
|
||||||
|
gui::draw_ui(&self.ecs, ctx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
match new_runstate {
|
||||||
|
RunState::PreRun => {
|
||||||
|
self.run_systems();
|
||||||
|
self.ecs.maintain();
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
RunState::AwaitingInput => {
|
||||||
|
// We refresh the index, and run anything that might
|
||||||
|
// still be in the queue, just to make 100% sure that
|
||||||
|
// there are no lingering effects from the last tick.
|
||||||
|
self.refresh_indexes();
|
||||||
|
effects::run_effects_queue(&mut self.ecs);
|
||||||
|
// Sanity-checking that the player actually *should*
|
||||||
|
// be taking a turn before giving them one. If they
|
||||||
|
// don't have a turn component, go back to ticking.
|
||||||
|
let mut can_act = false;
|
||||||
|
{
|
||||||
|
let player_entity = self.ecs.fetch::<Entity>();
|
||||||
|
let turns = self.ecs.read_storage::<TakingTurn>();
|
||||||
|
if let Some(_) = turns.get(*player_entity) {
|
||||||
|
can_act = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if can_act {
|
||||||
|
let on_overmap = self.ecs.fetch::<Map>().overmap;
|
||||||
|
new_runstate = player_input(self, ctx, on_overmap);
|
||||||
|
} else {
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::Ticking => {
|
||||||
|
while new_runstate == RunState::Ticking && particle_system::check_queue(&self.ecs) {
|
||||||
|
self.run_systems();
|
||||||
|
self.ecs.maintain();
|
||||||
|
try_spawn_interval(&mut self.ecs);
|
||||||
|
maybe_map_message(&mut self.ecs);
|
||||||
|
match *self.ecs.fetch::<RunState>() {
|
||||||
|
RunState::AwaitingInput => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
RunState::MagicMapReveal { row, cursed } => {
|
||||||
|
new_runstate = RunState::MagicMapReveal { row: row, cursed: cursed };
|
||||||
|
}
|
||||||
|
RunState::ShowRemoveCurse => {
|
||||||
|
new_runstate = RunState::ShowRemoveCurse;
|
||||||
|
}
|
||||||
|
RunState::ShowIdentify => {
|
||||||
|
new_runstate = RunState::ShowIdentify;
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::Farlook { .. } => {
|
||||||
|
let result = gui::show_farlook(self, ctx);
|
||||||
|
match result {
|
||||||
|
gui::FarlookResult::NoResponse { x, y } => {
|
||||||
|
new_runstate = RunState::Farlook { x, y };
|
||||||
|
}
|
||||||
|
gui::FarlookResult::Cancel => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::ShowCheatMenu => {
|
||||||
|
let result = gui::show_cheat_menu(self, ctx);
|
||||||
|
match result {
|
||||||
|
gui::CheatMenuResult::Cancel => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::CheatMenuResult::NoResponse => {}
|
||||||
|
gui::CheatMenuResult::Ascend => {
|
||||||
|
let id = self.ecs.fetch::<Map>().id - 1;
|
||||||
|
self.goto_id(id, TileType::DownStair);
|
||||||
|
self.mapgen_next_state = Some(RunState::PreRun);
|
||||||
|
new_runstate = RunState::MapGeneration;
|
||||||
|
}
|
||||||
|
gui::CheatMenuResult::Descend => {
|
||||||
|
let id = self.ecs.fetch::<Map>().id + 1;
|
||||||
|
self.goto_id(id, TileType::UpStair);
|
||||||
|
self.mapgen_next_state = Some(RunState::PreRun);
|
||||||
|
new_runstate = RunState::MapGeneration;
|
||||||
|
}
|
||||||
|
gui::CheatMenuResult::Heal => {
|
||||||
|
let player = self.ecs.fetch::<Entity>();
|
||||||
|
let mut pools = self.ecs.write_storage::<Pools>();
|
||||||
|
let mut player_pools = pools.get_mut(*player).unwrap();
|
||||||
|
player_pools.hit_points.current = player_pools.hit_points.max;
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::CheatMenuResult::MagicMap => {
|
||||||
|
let mut map = self.ecs.fetch_mut::<Map>();
|
||||||
|
for v in map.revealed_tiles.iter_mut() {
|
||||||
|
*v = true;
|
||||||
|
}
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::CheatMenuResult::GodMode => {
|
||||||
|
let player = self.ecs.fetch::<Entity>();
|
||||||
|
let mut pools = self.ecs.write_storage::<Pools>();
|
||||||
|
let mut player_pools = pools.get_mut(*player).unwrap();
|
||||||
|
gamelog::Logger::new().append("TOGGLED GOD MODE!").log();
|
||||||
|
player_pools.god = !player_pools.god;
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::ShowInventory => {
|
||||||
|
let result = gui::show_inventory(self, ctx);
|
||||||
|
match result.0 {
|
||||||
|
gui::ItemMenuResult::Cancel => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::ItemMenuResult::NoResponse => {}
|
||||||
|
gui::ItemMenuResult::Selected => {
|
||||||
|
let item_entity = result.1.unwrap();
|
||||||
|
let is_ranged = self.ecs.read_storage::<Ranged>();
|
||||||
|
let ranged_item = is_ranged.get(item_entity);
|
||||||
|
if let Some(ranged_item) = ranged_item {
|
||||||
|
let is_aoe = self.ecs.read_storage::<AOE>();
|
||||||
|
let aoe_item = is_aoe.get(item_entity);
|
||||||
|
let (min_x, _max_x, min_y, _max_y, x_offset, y_offset) = camera::get_screen_bounds(
|
||||||
|
&self.ecs,
|
||||||
|
ctx
|
||||||
|
);
|
||||||
|
let ppos = self.ecs.fetch::<Point>();
|
||||||
|
if let Some(aoe_item) = aoe_item {
|
||||||
|
new_runstate = RunState::ShowTargeting {
|
||||||
|
x: ppos.x + x_offset - min_x,
|
||||||
|
y: ppos.y + y_offset - min_y,
|
||||||
|
range: ranged_item.range,
|
||||||
|
item: item_entity,
|
||||||
|
aoe: aoe_item.radius,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
new_runstate = RunState::ShowTargeting {
|
||||||
|
x: ppos.x + x_offset - min_x,
|
||||||
|
y: ppos.y + y_offset - min_y,
|
||||||
|
range: ranged_item.range,
|
||||||
|
item: item_entity,
|
||||||
|
aoe: 0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
let mut intent = self.ecs.write_storage::<WantsToUseItem>();
|
||||||
|
intent
|
||||||
|
.insert(*self.ecs.fetch::<Entity>(), WantsToUseItem { item: item_entity, target: None })
|
||||||
|
.expect("Unable to insert intent.");
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::ShowDropItem => {
|
||||||
|
let result = gui::drop_item_menu(self, ctx);
|
||||||
|
match result.0 {
|
||||||
|
gui::ItemMenuResult::Cancel => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::ItemMenuResult::NoResponse => {}
|
||||||
|
gui::ItemMenuResult::Selected => {
|
||||||
|
let item_entity = result.1.unwrap();
|
||||||
|
let mut intent = self.ecs.write_storage::<WantsToDropItem>();
|
||||||
|
intent
|
||||||
|
.insert(*self.ecs.fetch::<Entity>(), WantsToDropItem { item: item_entity })
|
||||||
|
.expect("Unable to insert intent");
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::ShowRemoveItem => {
|
||||||
|
let result = gui::remove_item_menu(self, ctx);
|
||||||
|
match result.0 {
|
||||||
|
gui::ItemMenuResult::Cancel => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::ItemMenuResult::NoResponse => {}
|
||||||
|
gui::ItemMenuResult::Selected => {
|
||||||
|
let item_entity = result.1.unwrap();
|
||||||
|
let mut intent = self.ecs.write_storage::<WantsToRemoveItem>();
|
||||||
|
intent
|
||||||
|
.insert(*self.ecs.fetch::<Entity>(), WantsToRemoveItem { item: item_entity })
|
||||||
|
.expect("Unable to insert intent");
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::ShowTargeting { x, y, range, item, aoe } => {
|
||||||
|
let result = gui::ranged_target(self, ctx, x, y, range, aoe);
|
||||||
|
match result.0 {
|
||||||
|
gui::TargetResult::Cancel => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::TargetResult::NoResponse { x, y } => {
|
||||||
|
new_runstate = RunState::ShowTargeting { x, y, range, item, aoe };
|
||||||
|
}
|
||||||
|
gui::TargetResult::Selected => {
|
||||||
|
let mut intent = self.ecs.write_storage::<WantsToUseItem>();
|
||||||
|
intent
|
||||||
|
.insert(*self.ecs.fetch::<Entity>(), WantsToUseItem { item, target: result.1 })
|
||||||
|
.expect("Unable to insert intent.");
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::ShowRemoveCurse => {
|
||||||
|
let result = gui::remove_curse(self, ctx);
|
||||||
|
match result.0 {
|
||||||
|
gui::ItemMenuResult::Cancel => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::ItemMenuResult::NoResponse => {}
|
||||||
|
gui::ItemMenuResult::Selected => {
|
||||||
|
let item_entity = result.1.unwrap();
|
||||||
|
self.ecs
|
||||||
|
.write_storage::<Beatitude>()
|
||||||
|
.insert(item_entity, Beatitude { buc: BUC::Uncursed, known: true })
|
||||||
|
.expect("Unable to insert beatitude");
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::ShowIdentify => {
|
||||||
|
let result = gui::identify(self, ctx);
|
||||||
|
match result.0 {
|
||||||
|
gui::ItemMenuResult::Cancel => {
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
gui::ItemMenuResult::NoResponse => {}
|
||||||
|
gui::ItemMenuResult::Selected => {
|
||||||
|
let item_entity = result.1.unwrap();
|
||||||
|
if let Some(name) = self.ecs.read_storage::<Name>().get(item_entity) {
|
||||||
|
let mut dm = self.ecs.fetch_mut::<MasterDungeonMap>();
|
||||||
|
dm.identified_items.insert(name.name.clone());
|
||||||
|
}
|
||||||
|
if let Some(beatitude) = self.ecs.write_storage::<Beatitude>().get_mut(item_entity) {
|
||||||
|
beatitude.known = true;
|
||||||
|
}
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::ActionWithDirection { function } => {
|
||||||
|
new_runstate = gui::get_input_direction(&mut self.ecs, ctx, function);
|
||||||
|
}
|
||||||
|
RunState::MainMenu { .. } => {
|
||||||
|
let result = gui::main_menu(self, ctx);
|
||||||
|
match result {
|
||||||
|
gui::MainMenuResult::NoSelection { selected } => {
|
||||||
|
new_runstate = RunState::MainMenu { menu_selection: selected };
|
||||||
|
}
|
||||||
|
gui::MainMenuResult::Selected { selected } =>
|
||||||
|
match selected {
|
||||||
|
gui::MainMenuSelection::NewGame => {
|
||||||
|
new_runstate = RunState::CharacterCreation {
|
||||||
|
ancestry: gui::Ancestry::Human,
|
||||||
|
class: gui::Class::Fighter,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
gui::MainMenuSelection::LoadGame => {
|
||||||
|
saveload_system::load_game(&mut self.ecs);
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
saveload_system::delete_save();
|
||||||
|
}
|
||||||
|
gui::MainMenuSelection::Quit => {
|
||||||
|
::std::process::exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::CharacterCreation { .. } => {
|
||||||
|
let result = gui::character_creation(self, ctx);
|
||||||
|
match result {
|
||||||
|
gui::CharCreateResult::NoSelection { ancestry, class } => {
|
||||||
|
new_runstate = RunState::CharacterCreation { ancestry, class };
|
||||||
|
}
|
||||||
|
gui::CharCreateResult::Selected { ancestry, class } => {
|
||||||
|
if ancestry == gui::Ancestry::NULL {
|
||||||
|
new_runstate = RunState::MainMenu { menu_selection: gui::MainMenuSelection::NewGame };
|
||||||
|
} else {
|
||||||
|
gui::setup_player_ancestry(&mut self.ecs, ancestry);
|
||||||
|
gui::setup_player_class(&mut self.ecs, class, ancestry);
|
||||||
|
new_runstate = RunState::PreRun;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::SaveGame => {
|
||||||
|
saveload_system::save_game(&mut self.ecs);
|
||||||
|
new_runstate = RunState::MainMenu { menu_selection: gui::MainMenuSelection::LoadGame };
|
||||||
|
}
|
||||||
|
RunState::GameOver => {
|
||||||
|
let result = gui::game_over(ctx);
|
||||||
|
let write_to_morgue: Option<bool> = match result {
|
||||||
|
gui::YesNoResult::NoSelection => None,
|
||||||
|
gui::YesNoResult::No => Some(false),
|
||||||
|
gui::YesNoResult::Yes => Some(true),
|
||||||
|
};
|
||||||
|
if let Some(response) = write_to_morgue {
|
||||||
|
if response {
|
||||||
|
morgue::create_morgue_file(&self.ecs);
|
||||||
|
}
|
||||||
|
self.game_over_cleanup();
|
||||||
|
new_runstate = RunState::MapGeneration;
|
||||||
|
self.mapgen_next_state = Some(RunState::MainMenu {
|
||||||
|
menu_selection: gui::MainMenuSelection::NewGame,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::GoToLevel(id, dest_tile) => {
|
||||||
|
self.goto_id(id, dest_tile);
|
||||||
|
self.mapgen_next_state = Some(RunState::PreRun);
|
||||||
|
new_runstate = RunState::MapGeneration;
|
||||||
|
}
|
||||||
|
RunState::HelpScreen => {
|
||||||
|
let result = gui::show_help(ctx);
|
||||||
|
match result {
|
||||||
|
gui::YesNoResult::Yes => {
|
||||||
|
gamelog::record_event(EVENT::LOOKED_FOR_HELP(1));
|
||||||
|
new_runstate = RunState::AwaitingInput;
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::MagicMapReveal { row, cursed } => {
|
||||||
|
let mut map = self.ecs.fetch_mut::<Map>();
|
||||||
|
|
||||||
|
// Could probably toss this into a function somewhere, and/or
|
||||||
|
// have multiple simple animations for it.
|
||||||
|
for x in 0..map.width {
|
||||||
|
let idx;
|
||||||
|
if x % 2 == 0 {
|
||||||
|
idx = map.xy_idx(x as i32, row);
|
||||||
|
} else {
|
||||||
|
idx = map.xy_idx(x as i32, (map.height as i32) - 1 - row);
|
||||||
|
}
|
||||||
|
if !cursed {
|
||||||
|
map.revealed_tiles[idx] = true;
|
||||||
|
} else {
|
||||||
|
map.revealed_tiles[idx] = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dirtify viewshed only if cursed, so our currently visible tiles aren't removed too
|
||||||
|
if cursed {
|
||||||
|
let player_entity = self.ecs.fetch::<Entity>();
|
||||||
|
let mut viewshed_components = self.ecs.write_storage::<Viewshed>();
|
||||||
|
let viewshed = viewshed_components.get_mut(*player_entity);
|
||||||
|
if let Some(viewshed) = viewshed {
|
||||||
|
viewshed.dirty = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (row as usize) == (map.height as usize) - 1 {
|
||||||
|
new_runstate = RunState::Ticking;
|
||||||
|
} else {
|
||||||
|
new_runstate = RunState::MagicMapReveal { row: row + 1, cursed: cursed };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RunState::MapGeneration => {
|
||||||
|
if !config::CONFIG.logging.show_mapgen {
|
||||||
|
new_runstate = self.mapgen_next_state.unwrap();
|
||||||
|
}
|
||||||
|
if self.mapgen_history.len() != 0 {
|
||||||
|
ctx.cls();
|
||||||
|
camera::render_debug_map(&self.mapgen_history[self.mapgen_index], ctx);
|
||||||
|
|
||||||
|
self.mapgen_timer += ctx.frame_time_ms;
|
||||||
|
if self.mapgen_timer > 300.0 {
|
||||||
|
self.mapgen_timer = 0.0;
|
||||||
|
self.mapgen_index += 1;
|
||||||
|
if self.mapgen_index >= self.mapgen_history.len() {
|
||||||
|
new_runstate = self.mapgen_next_state.unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
let mut runwriter = self.ecs.write_resource::<RunState>();
|
||||||
|
*runwriter = new_runstate;
|
||||||
|
}
|
||||||
|
|
||||||
|
damage_system::delete_the_dead(&mut self.ecs);
|
||||||
|
|
||||||
|
let _ = rltk::render_draw_buffer(ctx);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
tests/map_test.rs
Normal file
22
tests/map_test.rs
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
// tests/map_test.rs
|
||||||
|
use rust_rl::map::TileType;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn tiletype_equality() {
|
||||||
|
let tile1 = TileType::ImpassableMountain;
|
||||||
|
let tile2 = TileType::ImpassableMountain;
|
||||||
|
assert_eq!(tile1, tile2);
|
||||||
|
|
||||||
|
let tile3 = TileType::Floor;
|
||||||
|
assert_ne!(tile1, tile3);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn tiletype_with_var_equality() {
|
||||||
|
let tile1 = TileType::ToLocal(5);
|
||||||
|
let tile2 = TileType::ToLocal(3);
|
||||||
|
assert_ne!(tile1, tile2);
|
||||||
|
|
||||||
|
let tile3 = TileType::ToLocal(3);
|
||||||
|
assert_eq!(tile2, tile3);
|
||||||
|
}
|
||||||
2
tests/mod.rs
Normal file
2
tests/mod.rs
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
// tests/mod.rs
|
||||||
|
mod map_test;
|
||||||
Loading…
Add table
Add a link
Reference in a new issue