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

sorry - swapping from rustfmt to prettier-rust

Browse source
This commit is contained in:
Llywelwyn 2023-08-23 01:22:09 +01:00
parent 281396f9ce
commit c2c7e0bd52
93 changed files with 2797 additions and 2021 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/inventory/collection_system.rs
View file

@ -1,6 +1,16 @@
use crate::{
gamelog, gui::obfuscate_name, Beatitude, Charges, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name,
ObfuscatedName, Position, WantsToPickupItem,
gamelog,
gui::obfuscate_name,
Beatitude,
Charges,
EquipmentChanged,
InBackpack,
MagicItem,
MasterDungeonMap,
Name,
ObfuscatedName,
Position,
WantsToPickupItem,
};
use specs::prelude::*;
@ -45,21 +55,23 @@ impl<'a> System<'a> for ItemCollectionSystem {
.expect("Unable to insert EquipmentChanged.");
if pickup.collected_by == *player_entity {
gamelog::Logger::new()
gamelog::Logger
::new()
.append("You pick up the")
.item_name_n(format!(
"{}",
obfuscate_name(
pickup.item,
&names,
&magic_items,
&obfuscated_names,
&beatitudes,
&dm,
Some(&wands)
.item_name_n(
format!(
"{}",
obfuscate_name(
pickup.item,
&names,
&magic_items,
&obfuscated_names,
&beatitudes,
&dm,
Some(&wands)
).0
)
.0
))
)
.period()
.log();
}

42
src/inventory/drop_system.rs
View file

@ -1,6 +1,16 @@
use crate::{
gamelog, gui::obfuscate_name, Beatitude, Charges, EquipmentChanged, InBackpack, MagicItem, MasterDungeonMap, Name,
ObfuscatedName, Position, WantsToDropItem,
gamelog,
gui::obfuscate_name,
Beatitude,
Charges,
EquipmentChanged,
InBackpack,
MagicItem,
MasterDungeonMap,
Name,
ObfuscatedName,
Position,
WantsToDropItem,
};
use specs::prelude::*;
@ -53,21 +63,23 @@ impl<'a> System<'a> for ItemDropSystem {
backpack.remove(to_drop.item);
if entity == *player_entity {
gamelog::Logger::new()
gamelog::Logger
::new()
.append("You drop the")
.item_name_n(format!(
"{}",
obfuscate_name(
to_drop.item,
&names,
&magic_items,
&obfuscated_names,
&beatitudes,
&dm,
Some(&wands)
.item_name_n(
format!(
"{}",
obfuscate_name(
to_drop.item,
&names,
&magic_items,
&obfuscated_names,
&beatitudes,
&dm,
Some(&wands)
).0
)
.0
))
)
.period()
.log();
}

37
src/inventory/equip_system.rs
View file

@ -1,8 +1,19 @@
use crate::{
gamelog,
gui::{item_colour, obfuscate_name},
Beatitude, EquipmentChanged, Equippable, Equipped, IdentifiedBeatitude, IdentifiedItem, InBackpack, MagicItem,
MasterDungeonMap, Name, ObfuscatedName, WantsToUseItem, BUC,
gui::{ item_colour, obfuscate_name },
Beatitude,
EquipmentChanged,
Equippable,
Equipped,
IdentifiedBeatitude,
IdentifiedItem,
InBackpack,
MagicItem,
MasterDungeonMap,
Name,
ObfuscatedName,
WantsToUseItem,
BUC,
};
use specs::prelude::*;
@ -70,9 +81,8 @@ impl<'a> System<'a> for ItemEquipSystem {
&obfuscated_names,
&beatitudes,
&dm,
None,
)
.0,
None
).0
)
.colour(rltk::WHITE)
.append("!");
@ -96,8 +106,7 @@ impl<'a> System<'a> for ItemEquipSystem {
.append("You remove your")
.colour(item_colour(*item, &beatitudes))
.append_n(
obfuscate_name(*item, &names, &magic_items, &obfuscated_names, &beatitudes, &dm, None)
.0,
obfuscate_name(*item, &names, &magic_items, &obfuscated_names, &beatitudes, &dm, None).0
)
.colour(rltk::WHITE)
.period();
@ -121,18 +130,16 @@ impl<'a> System<'a> for ItemEquipSystem {
&obfuscated_names,
&beatitudes,
&dm,
None,
)
.0,
None
).0
)
.colour(rltk::WHITE)
.period();
logger.log();
identified_items
.insert(
target,
IdentifiedItem { name: names.get(wants_to_use_item.item).unwrap().name.clone() },
)
.insert(target, 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 {})

2
src/inventory/identification_system.rs
View file

@ -1,4 +1,4 @@
use crate::{Beatitude, IdentifiedBeatitude, IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player};
use crate::{ Beatitude, IdentifiedBeatitude, IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player };
use specs::prelude::*;
pub struct ItemIdentificationSystem {}

10
src/inventory/mod.rs
View file

@ -5,7 +5,11 @@ mod identification_system;
mod remove_system;
mod use_system;
pub use {
collection_system::ItemCollectionSystem, drop_system::ItemDropSystem, equip_system::ItemEquipSystem,
identification_system::ItemIdentificationSystem, remove_system::ItemRemoveSystem, use_system::ItemUseSystem,
pub use self::{
collection_system::ItemCollectionSystem,
drop_system::ItemDropSystem,
equip_system::ItemEquipSystem,
identification_system::ItemIdentificationSystem,
remove_system::ItemRemoveSystem,
use_system::ItemUseSystem,
};

28
src/inventory/remove_system.rs
View file

@ -1,7 +1,15 @@
use crate::{
gamelog,
gui::{item_colour, obfuscate_name},
Beatitude, Equipped, InBackpack, MagicItem, MasterDungeonMap, Name, ObfuscatedName, WantsToRemoveItem, BUC,
gui::{ item_colour, obfuscate_name },
Beatitude,
Equipped,
InBackpack,
MagicItem,
MasterDungeonMap,
Name,
ObfuscatedName,
WantsToRemoveItem,
BUC,
};
use rltk::prelude::*;
use specs::prelude::*;
@ -43,7 +51,8 @@ impl<'a> System<'a> for ItemRemoveSystem {
// If cursed, can't remove!
if beatitude.buc == BUC::Cursed {
can_remove = false;
gamelog::Logger::new()
gamelog::Logger
::new()
.append("You can't remove the")
.colour(item_colour(to_remove.item, &beatitudes))
.append_n(
@ -54,9 +63,8 @@ impl<'a> System<'a> for ItemRemoveSystem {
&obfuscated_names,
&beatitudes,
&dm,
None,
)
.0,
None
).0
)
.colour(WHITE)
.append("!")
@ -70,7 +78,8 @@ impl<'a> System<'a> for ItemRemoveSystem {
equipped.remove(to_remove.item);
if let Some(_) = names.get(to_remove.item) {
if entity == *player_entity {
gamelog::Logger::new()
gamelog::Logger
::new()
.append("You unequip the")
.colour(item_colour(to_remove.item, &beatitudes))
.append_n(
@ -81,9 +90,8 @@ impl<'a> System<'a> for ItemRemoveSystem {
&obfuscated_names,
&beatitudes,
&dm,
None,
)
.0,
None
).0
)
.colour(WHITE)
.period()

31
src/inventory/use_system.rs
View file

@ -1,6 +1,11 @@
use crate::{
effects::{add_effect, aoe_tiles, EffectType, Targets},
EquipmentChanged, IdentifiedItem, Map, Name, WantsToUseItem, AOE,
effects::{ add_effect, aoe_tiles, EffectType, Targets },
EquipmentChanged,
IdentifiedItem,
Map,
Name,
WantsToUseItem,
AOE,
};
use specs::prelude::*;
@ -32,20 +37,16 @@ impl<'a> System<'a> for ItemUseSystem {
.expect("Unable to insert");
}
// Call the effects system
add_effect(
Some(entity),
EffectType::ItemUse { item: useitem.item },
match useitem.target {
None => Targets::Entity { target: *player_entity },
Some(target) => {
if let Some(aoe) = aoe.get(useitem.item) {
Targets::TileList { targets: aoe_tiles(&*map, target, aoe.radius) }
} else {
Targets::Tile { target: map.xy_idx(target.x, target.y) }
}
add_effect(Some(entity), EffectType::ItemUse { item: useitem.item }, match useitem.target {
None => Targets::Entity { target: *player_entity },
Some(target) => {
if let Some(aoe) = aoe.get(useitem.item) {
Targets::TileList { targets: aoe_tiles(&*map, target, aoe.radius) }
} else {
Targets::Tile { target: map.xy_idx(target.x, target.y) }
}
},
);
}
});
}
wants_use.clear();
}