lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

beatitudes

Browse source
This commit is contained in:
Llywelwyn 2023-08-21 13:08:12 +01:00
parent 831720ce37
commit d0416b2563
7 changed files with 42 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/inventory/equip_system.rs
View file

@ -65,7 +65,7 @@ impl<'a> System<'a> for ItemEquipSystem {
obfuscate_name(*item, &names, &magic_items, &obfuscated_names, &beatitudes, &dm, None)
.0,
)
.colour(item_colour(*item, &names, &magic_items, &dm))
.colour(item_colour(*item, &beatitudes, &dm))
.period();
}
}
@ -90,7 +90,7 @@ impl<'a> System<'a> for ItemEquipSystem {
)
.0,
)
.colour(item_colour(wants_to_use_item.item, &names, &magic_items, &dm))
.colour(item_colour(wants_to_use_item.item, &beatitudes, &dm))
.period();
logger.log();
}

7
src/inventory/identification_system.rs
View file

@ -1,4 +1,4 @@
use crate::{IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player};
use crate::{Beatitude, IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player};
use specs::prelude::*;
pub struct ItemIdentificationSystem {}
@ -8,6 +8,7 @@ impl<'a> System<'a> for ItemIdentificationSystem {
type SystemData = (
ReadStorage<'a, Player>,
WriteStorage<'a, IdentifiedItem>,
WriteStorage<'a, Beatitude>,
WriteExpect<'a, MasterDungeonMap>,
ReadStorage<'a, Item>,
ReadStorage<'a, Name>,
@ -16,13 +17,11 @@ impl<'a> System<'a> for ItemIdentificationSystem {
);
fn run(&mut self, data: Self::SystemData) {
let (player, mut identified, mut dm, items, names, mut obfuscated_names, entities) = data;
let (player, mut identified, mut beatitudes, mut dm, items, names, mut obfuscated_names, entities) = data;
for (_p, id) in (&player, &identified).join() {
rltk::console::log(id.name.clone());
let tag = crate::raws::get_id_from_name(id.name.clone());
if !dm.identified_items.contains(&id.name) && crate::raws::is_tag_magic(&tag) {
dm.identified_items.insert(id.name.clone());
for (entity, _item, name) in (&entities, &items, &names).join() {
if name.name == id.name {
obfuscated_names.remove(entity);

2
src/inventory/remove_system.rs
View file

@ -54,7 +54,7 @@ impl<'a> System<'a> for ItemRemoveSystem {
)
.0,
)
.colour(item_colour(to_remove.item, &names, &magic_items, &dm))
.colour(item_colour(to_remove.item, &beatitudes, &dm))
.period()
.log();
}