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

refactors beatitude, and prepping readme for week 7

Browse source
This commit is contained in:
Llywelwyn 2023-08-21 12:50:30 +01:00
parent 469d83994e
commit 831720ce37
14 changed files with 172 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/inventory/collection_system.rs
View file

@ -1,5 +1,5 @@
use crate::{
gamelog, gui::obfuscate_name, Charges, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name,
gamelog, gui::obfuscate_name, Beatitude, Charges, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name,
ObfuscatedName, Position, WantsToPickupItem,
};
use specs::prelude::*;
@ -17,6 +17,7 @@ impl<'a> System<'a> for ItemCollectionSystem {
WriteStorage<'a, EquipmentChanged>,
ReadStorage<'a, MagicItem>,
ReadStorage<'a, ObfuscatedName>,
ReadStorage<'a, Beatitude>,
ReadExpect<'a, MasterDungeonMap>,
ReadStorage<'a, Charges>,
);
@ -31,6 +32,7 @@ impl<'a> System<'a> for ItemCollectionSystem {
mut equipment_changed,
magic_items,
obfuscated_names,
beatitudes,
dm,
wands,
) = data;
@ -47,7 +49,16 @@ impl<'a> System<'a> for ItemCollectionSystem {
.append("You pick up the")
.item_name_n(format!(
"{}",
obfuscate_name(pickup.item, &names, &magic_items, &obfuscated_names, &dm, Some(&wands)).0
obfuscate_name(
pickup.item,
&names,
&magic_items,
&obfuscated_names,
&beatitudes,
&dm,
Some(&wands)
)
.0
))
.period()
.log();

15
src/inventory/drop_system.rs
View file

@ -1,5 +1,5 @@
use crate::{
gamelog, gui::obfuscate_name, Charges, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name,
gamelog, gui::obfuscate_name, Beatitude, Charges, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name,
ObfuscatedName, Position, WantsToDropItem,
};
use specs::prelude::*;
@ -17,6 +17,7 @@ impl<'a> System<'a> for ItemDropSystem {
WriteStorage<'a, InBackpack>,
WriteStorage<'a, EquipmentChanged>,
ReadStorage<'a, MagicItem>,
ReadStorage<'a, Beatitude>,
ReadStorage<'a, ObfuscatedName>,
ReadExpect<'a, MasterDungeonMap>,
ReadStorage<'a, Charges>,
@ -32,6 +33,7 @@ impl<'a> System<'a> for ItemDropSystem {
mut backpack,
mut equipment_changed,
magic_items,
beatitudes,
obfuscated_names,
dm,
wands,
@ -55,7 +57,16 @@ impl<'a> System<'a> for ItemDropSystem {
.append("You drop the")
.item_name_n(format!(
"{}",
obfuscate_name(to_drop.item, &names, &magic_items, &obfuscated_names, &dm, Some(&wands)).0
obfuscate_name(
to_drop.item,
&names,
&magic_items,
&obfuscated_names,
&beatitudes,
&dm,
Some(&wands)
)
.0
))
.period()
.log();

21
src/inventory/equip_system.rs
View file

@ -1,7 +1,7 @@
use crate::{
gamelog,
gui::{item_colour, obfuscate_name},
EquipmentChanged, Equippable, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
Beatitude, EquipmentChanged, Equippable, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName,
WantsToUseItem,
};
use specs::prelude::*;
@ -21,6 +21,7 @@ impl<'a> System<'a> for ItemEquipSystem {
WriteStorage<'a, EquipmentChanged>,
ReadStorage<'a, MagicItem>,
ReadStorage<'a, ObfuscatedName>,
ReadStorage<'a, Beatitude>,
ReadExpect<'a, MasterDungeonMap>,
);
@ -37,6 +38,7 @@ impl<'a> System<'a> for ItemEquipSystem {
mut dirty,
magic_items,
obfuscated_names,
beatitudes,
dm,
) = data;
let mut remove: Vec<Entity> = Vec::new();
@ -59,7 +61,10 @@ impl<'a> System<'a> for ItemEquipSystem {
if target == *player_entity {
logger = logger
.append("You remove your")
.append_n(obfuscate_name(*item, &names, &magic_items, &obfuscated_names, &dm, None).0)
.append_n(
obfuscate_name(*item, &names, &magic_items, &obfuscated_names, &beatitudes, &dm, None)
.0,
)
.colour(item_colour(*item, &names, &magic_items, &dm))
.period();
}
@ -74,8 +79,16 @@ impl<'a> System<'a> for ItemEquipSystem {
logger = logger
.append("You equip the")
.append_n(
obfuscate_name(wants_to_use_item.item, &names, &magic_items, &obfuscated_names, &dm, None)
.0,
obfuscate_name(
wants_to_use_item.item,
&names,
&magic_items,
&obfuscated_names,
&beatitudes,
&dm,
None,
)
.0,
)
.colour(item_colour(wants_to_use_item.item, &names, &magic_items, &dm))
.period();

17
src/inventory/remove_system.rs
View file

@ -1,7 +1,7 @@
use crate::{
gamelog,
gui::{item_colour, obfuscate_name},
Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem,
Beatitude, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem,
};
use specs::prelude::*;
@ -18,6 +18,7 @@ impl<'a> System<'a> for ItemRemoveSystem {
WriteStorage<'a, InBackpack>,
ReadStorage<'a, MagicItem>,
ReadStorage<'a, ObfuscatedName>,
ReadStorage<'a, Beatitude>,
ReadExpect<'a, MasterDungeonMap>,
);
@ -31,6 +32,7 @@ impl<'a> System<'a> for ItemRemoveSystem {
mut backpack,
magic_items,
obfuscated_names,
beatitudes,
dm,
) = data;
@ -40,7 +42,18 @@ impl<'a> System<'a> for ItemRemoveSystem {
if entity == *player_entity {
gamelog::Logger::new()
.append("You unequip the")
.append_n(obfuscate_name(to_remove.item, &names, &magic_items, &obfuscated_names, &dm, None).0)
.append_n(
obfuscate_name(
to_remove.item,
&names,
&magic_items,
&obfuscated_names,
&beatitudes,
&dm,
None,
)
.0,
)
.colour(item_colour(to_remove.item, &names, &magic_items, &dm))
.period()
.log();