fix warns, bump ver

This commit is contained in:
Llywelwyn 2024-06-15 20:40:51 +01:00
parent c5106a63b5
commit ba5d120fef
6 changed files with 6 additions and 30 deletions

View file

@ -1,6 +1,6 @@
[package] [package]
name = "rust-rl" name = "rust-rl"
version = "0.1.1" version = "0.1.2"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -5,11 +5,8 @@ use super::{
print_options, print_options,
unique_ecs, unique_ecs,
check_key, check_key,
renderable_colour,
letter_to_option, letter_to_option,
ItemMenuResult, ItemMenuResult,
UniqueInventoryItem,
BUC,
}; };
use crate::{ use crate::{
gamelog, gamelog,
@ -99,7 +96,7 @@ pub fn identify(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Option<Enti
return (ItemMenuResult::Selected, Some(build_identify_iterator().nth(0).unwrap().0)); return (ItemMenuResult::Selected, Some(build_identify_iterator().nth(0).unwrap().0));
} }
let mut player_inventory: super::PlayerInventory = HashMap::new(); let mut player_inventory: super::PlayerInventory = HashMap::new();
for (entity, _i, renderable, name, key) in build_identify_iterator() { for (entity, _i, _r, _n, key) in build_identify_iterator() {
let unique_item = unique_ecs(&gs.ecs, entity); let unique_item = unique_ecs(&gs.ecs, entity);
player_inventory player_inventory
.entry(unique_item) .entry(unique_item)

View file

@ -46,7 +46,7 @@ use crate::data::visuals::{
}; };
use bracket_lib::prelude::*; use bracket_lib::prelude::*;
use specs::prelude::*; use specs::prelude::*;
use std::collections::{ HashMap, HashSet }; use std::collections::HashMap;
use crate::invkeys::check_key; use crate::invkeys::check_key;
mod character_creation; mod character_creation;
@ -485,7 +485,7 @@ pub enum ItemMenuResult {
} }
pub fn print_options( pub fn print_options(
ecs: &World, _ecs: &World,
inventory: &PlayerInventory, inventory: &PlayerInventory,
mut x: i32, mut x: i32,
mut y: i32, mut y: i32,

View file

@ -4,11 +4,9 @@ use super::{
obfuscate_name_ecs, obfuscate_name_ecs,
print_options, print_options,
unique_ecs, unique_ecs,
renderable_colour,
check_key, check_key,
letter_to_option, letter_to_option,
ItemMenuResult, ItemMenuResult,
UniqueInventoryItem,
InventorySlot, InventorySlot,
}; };
use crate::{ use crate::{
@ -93,19 +91,7 @@ pub fn remove_curse(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Option<
return (ItemMenuResult::Selected, Some(item)); return (ItemMenuResult::Selected, Some(item));
} }
let mut player_inventory: super::PlayerInventory = HashMap::new(); let mut player_inventory: super::PlayerInventory = HashMap::new();
for (entity, _i, _b, renderable, name, key) in build_cursed_iterator() { for (entity, _i, _b, _r, _n, key) in build_cursed_iterator() {
let (singular, plural) = obfuscate_name_ecs(&gs.ecs, entity);
let beatitude_status = if
let Some(beatitude) = gs.ecs.read_storage::<Beatitude>().get(entity)
{
match beatitude.buc {
BUC::Blessed => 1,
BUC::Uncursed => 2,
BUC::Cursed => 3,
}
} else {
0
};
let unique_item = unique_ecs(&gs.ecs, entity); let unique_item = unique_ecs(&gs.ecs, entity);
player_inventory player_inventory
.entry(unique_item) .entry(unique_item)

View file

@ -13,8 +13,6 @@ use crate::{
Position, Position,
WantsToPickupItem, WantsToPickupItem,
WantsToAssignKey, WantsToAssignKey,
Renderable,
Stackable,
}; };
use specs::prelude::*; use specs::prelude::*;
use crate::data::messages; use crate::data::messages;
@ -33,12 +31,10 @@ impl<'a> System<'a> for ItemCollectionSystem {
WriteStorage<'a, EquipmentChanged>, WriteStorage<'a, EquipmentChanged>,
ReadStorage<'a, MagicItem>, ReadStorage<'a, MagicItem>,
ReadStorage<'a, ObfuscatedName>, ReadStorage<'a, ObfuscatedName>,
ReadStorage<'a, Renderable>,
ReadStorage<'a, Beatitude>, ReadStorage<'a, Beatitude>,
ReadExpect<'a, MasterDungeonMap>, ReadExpect<'a, MasterDungeonMap>,
ReadStorage<'a, Charges>, ReadStorage<'a, Charges>,
ReadStorage<'a, WantsToAssignKey>, ReadStorage<'a, WantsToAssignKey>,
ReadStorage<'a, Stackable>,
); );
fn run(&mut self, data: Self::SystemData) { fn run(&mut self, data: Self::SystemData) {
@ -51,12 +47,10 @@ impl<'a> System<'a> for ItemCollectionSystem {
mut equipment_changed, mut equipment_changed,
magic_items, magic_items,
obfuscated_names, obfuscated_names,
renderables,
beatitudes, beatitudes,
dm, dm,
wands, wands,
wants_key, wants_key,
stackable,
) = data; ) = data;
let mut to_remove: Vec<Entity> = Vec::new(); let mut to_remove: Vec<Entity> = Vec::new();
// For every item that wants to be picked up that *isn't* waiting on a key assignment. // For every item that wants to be picked up that *isn't* waiting on a key assignment.

View file

@ -1,6 +1,5 @@
use std::sync::Mutex; use std::sync::Mutex;
use std::collections::{ HashMap }; use std::collections::HashMap;
use specs::prelude::*;
use crate::gui::UniqueInventoryItem; use crate::gui::UniqueInventoryItem;
lazy_static! { lazy_static! {