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

beatitude identification

Browse source
This commit is contained in:
Llywelwyn 2023-08-22 11:55:09 +01:00
parent 113d26cf41
commit f55f4504db
7 changed files with 59 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/inventory/equip_system.rs
View file

@ -1,8 +1,8 @@
use crate::{
gamelog,
gui::{item_colour, obfuscate_name},
Beatitude, EquipmentChanged, Equippable, Equipped, IdentifiedItem, InBackpack, MagicItem, MasterDungeonMap, Name,
ObfuscatedName, WantsToUseItem, BUC,
Beatitude, EquipmentChanged, Equippable, Equipped, IdentifiedBeatitude, IdentifiedItem, InBackpack, MagicItem,
MasterDungeonMap, Name, ObfuscatedName, WantsToUseItem, BUC,
};
use specs::prelude::*;
@ -23,6 +23,7 @@ impl<'a> System<'a> for ItemEquipSystem {
ReadStorage<'a, MagicItem>,
ReadStorage<'a, ObfuscatedName>,
ReadStorage<'a, Beatitude>,
WriteStorage<'a, IdentifiedBeatitude>,
ReadExpect<'a, MasterDungeonMap>,
);
@ -41,6 +42,7 @@ impl<'a> System<'a> for ItemEquipSystem {
magic_items,
obfuscated_names,
beatitudes,
mut identified_beatitude,
dm,
) = data;
let mut remove: Vec<Entity> = Vec::new();
@ -74,6 +76,9 @@ impl<'a> System<'a> for ItemEquipSystem {
)
.colour(rltk::WHITE)
.append("!");
identified_beatitude
.insert(item_entity, IdentifiedBeatitude {})
.expect("Unable to push");
}
}
to_unequip.push(item_entity);
@ -129,6 +134,9 @@ impl<'a> System<'a> for ItemEquipSystem {
IdentifiedItem { name: names.get(wants_to_use_item.item).unwrap().name.clone() },
)
.expect("Unable to insert IdentifiedItem");
identified_beatitude
.insert(wants_to_use_item.item, IdentifiedBeatitude {})
.expect("Unable to push");
}
remove.push(target);
}

21
src/inventory/identification_system.rs
View file

@ -1,4 +1,4 @@
use crate::{Beatitude, IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player};
use crate::{Beatitude, IdentifiedBeatitude, IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player};
use specs::prelude::*;
pub struct ItemIdentificationSystem {}
@ -9,6 +9,7 @@ impl<'a> System<'a> for ItemIdentificationSystem {
ReadStorage<'a, Player>,
WriteStorage<'a, IdentifiedItem>,
WriteStorage<'a, Beatitude>,
WriteStorage<'a, IdentifiedBeatitude>,
WriteExpect<'a, MasterDungeonMap>,
ReadStorage<'a, Item>,
ReadStorage<'a, Name>,
@ -17,7 +18,17 @@ impl<'a> System<'a> for ItemIdentificationSystem {
);
fn run(&mut self, data: Self::SystemData) {
let (player, mut identified, mut beatitudes, mut dm, items, names, mut obfuscated_names, entities) = data;
let (
player,
mut identified,
mut beatitudes,
mut identified_beatitudes,
mut dm,
items,
names,
mut obfuscated_names,
entities,
) = data;
for (_p, id) in (&player, &identified).join() {
let tag = crate::raws::get_id_from_name(id.name.clone());
if !dm.identified_items.contains(&id.name) && crate::raws::is_tag_magic(&tag) {
@ -29,7 +40,13 @@ impl<'a> System<'a> for ItemIdentificationSystem {
}
}
}
for (e, _id) in (&entities, &identified_beatitudes).join() {
if let Some(beatitude) = beatitudes.get_mut(e) {
beatitude.known = true;
}
}
// Clean up
identified.clear();
identified_beatitudes.clear();
}
}