From bd1da23cf18960b36f8683c09899044d64b4bd83 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 21 May 2020 12:25:36 +0200 Subject: made Talk its own component/system instead of part of interact --- src/systems/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/systems') diff --git a/src/systems/mod.rs b/src/systems/mod.rs index 7323dee..56606e7 100644 --- a/src/systems/mod.rs +++ b/src/systems/mod.rs @@ -24,6 +24,7 @@ mod building; mod deduplicate; mod spawntrigger; mod replace; +mod talk; pub use self::{ controlinput::ControlInput, @@ -50,5 +51,6 @@ pub use self::{ building::Building, deduplicate::Deduplicate, spawntrigger::SpawnTrigger, - replace::Replace + replace::Replace, + talk::Talk }; -- cgit From f47034bdf86e7ddc831ecb8f50689b9b07a0f6ca Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 21 May 2020 12:45:44 +0200 Subject: actually added talk system and removed reply interaction --- src/systems/interact.rs | 6 ------ src/systems/talk.rs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 src/systems/talk.rs (limited to 'src/systems') diff --git a/src/systems/interact.rs b/src/systems/interact.rs index b377a7a..2090f6f 100644 --- a/src/systems/interact.rs +++ b/src/systems/interact.rs @@ -82,12 +82,6 @@ impl <'a> System<'a> for Interact { Interactable::Trigger(trigger) => { TriggerBox::add_message(&mut triggerbox, ent, *trigger); } - Interactable::Say(text) => { - say(ear, text.clone(), name); - } - Interactable::Reply(text) => { - say(ear, text.replace("{}", &arg.unwrap()), name); - } Interactable::Exchange(prefix, exchanges) => { if let Some(txt) = arg { if let (Some(inventory), Some(action)) = (inventories.get_mut(actor), strip_prefix(&txt, prefix)) { diff --git a/src/systems/talk.rs b/src/systems/talk.rs new file mode 100644 index 0000000..4bb898a --- /dev/null +++ b/src/systems/talk.rs @@ -0,0 +1,56 @@ + +use std::collections::HashSet; + +use specs::{ + ReadStorage, + WriteStorage, + System, + Join, + Read +}; + +use crate::{ + components::{ + Controller, + Position, + Talkable, + Notification, + Ear, + Visible + }, + controls::{Control}, + resources::{Ground}, +}; + +pub struct Talk; +impl <'a> System<'a> for Talk { + type SystemData = ( + ReadStorage<'a, Controller>, + ReadStorage<'a, Position>, + Read<'a, Ground>, + ReadStorage<'a, Talkable>, + WriteStorage<'a, Ear>, + ReadStorage<'a, Visible> + ); + + fn run(&mut self, (controllers, positions, ground, talkables, mut ears, visibles): Self::SystemData) { + for (controller, position, ear) in (&controllers, &positions, &mut ears).join(){ + match &controller.control { + Control::Interact(directions, None) => { + 'targets: for direction in directions { + let pos = position.pos + direction.to_position(); + for ent in ground.cells.get(&pos).unwrap_or(&HashSet::new()) { + if let Some(Talkable{text}) = talkables.get(*ent) { + let name = visibles.get(*ent).map(|v| v.name.clone()); + ear.sounds.push(Notification::Sound{text: text.clone(), source: name}); + break 'targets; + } + } + } + } + _ => {} + } + } + } +} + -- cgit From 1899b27b791734a6b72e28cfb1420536c6035ee4 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 21 May 2020 15:26:12 +0200 Subject: added exchanger as seperate component/system; refactored other interactions; parameter parsing returns result instead of option --- src/systems/exchange.rs | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ src/systems/interact.rs | 39 ++++------------------- src/systems/mod.rs | 4 ++- src/systems/talk.rs | 14 +++------ 4 files changed, 95 insertions(+), 44 deletions(-) create mode 100644 src/systems/exchange.rs (limited to 'src/systems') diff --git a/src/systems/exchange.rs b/src/systems/exchange.rs new file mode 100644 index 0000000..9931bdd --- /dev/null +++ b/src/systems/exchange.rs @@ -0,0 +1,82 @@ + +use specs::{ + Entities, + ReadStorage, + WriteStorage, + System, + Join, + Read, + Write +}; + +use crate::{ + components::{ + Controller, + Position, + Exchanger, + Notification, + Ear, + Inventory, + Visible + }, + controls::{Control}, + resources::{Ground, NewEntities}, + util::strip_prefix +}; + +pub struct Exchange; +impl <'a> System<'a> for Exchange { + type SystemData = ( + Entities<'a>, + ReadStorage<'a, Controller>, + ReadStorage<'a, Position>, + Read<'a, Ground>, + ReadStorage<'a, Exchanger>, + Write<'a, NewEntities>, + WriteStorage<'a, Ear>, + WriteStorage<'a, Inventory>, + ReadStorage<'a, Visible> + ); + + fn run(&mut self, (entities, controllers, positions, ground, exchangers, new, mut ears, mut inventories, visibles): Self::SystemData) { + for (actor, controller, position) in (&entities, &controllers, &positions).join(){ + let ear = ears.get_mut(actor); + match &controller.control { + Control::Interact(directions, arg) => { + for (ent, exchanger) in ground.components_near(position.pos, directions, &exchangers) { + let prefix = exchanger.prefix.as_str(); + let name = visibles.get(ent).map(|v| v.name.as_str()); + if let Some(txt) = arg { + if let (Some(inventory), Some(action)) = (inventories.get_mut(actor), strip_prefix(&txt, prefix)) { + if let Some(exchange) = exchanger.exchanges.get(action) { + if exchange.can_trade(inventory){ + exchange.trade(inventory, &new.encyclopedia); + say(ear, format!("Success! '{}' ({})", txt, exchange.show()), name); + } else { + say(ear, format!("You do not have the required items or inventory space for '{}' ({})", txt, exchange.show()), name); + } + } else { + say(ear, format!("Invalid option: {}", action), name); + } + break; + } + } else if let Some(ear) = ear { + ear.sounds.push(Notification::Options{ + description: "".to_string(), + options: exchanger.exchanges.iter().map(|(id, exchange)| (format!("{}{}", prefix, id), exchange.show())).collect() + }); + break; + } + } + } + _ => {} + } + } + } +} + +fn say(maybe_ear: Option<&mut Ear>, text: String, source: Option<&str>){ + if let Some(ear) = maybe_ear { + ear.sounds.push(Notification::Sound{text, source: source.map(|s| s.to_string())}); + } +} diff --git a/src/systems/interact.rs b/src/systems/interact.rs index 2090f6f..bce2afc 100644 --- a/src/systems/interact.rs +++ b/src/systems/interact.rs @@ -28,7 +28,7 @@ use crate::{ Minable }, controls::{Control}, - resources::{Ground, NewEntities, Emigration}, + resources::{Ground, Emigration}, hashmap, playerstate::RoomPos, PlayerId, @@ -45,7 +45,6 @@ impl <'a> System<'a> for Interact { WriteStorage<'a, ControlCooldown>, ReadStorage<'a, Interactable>, WriteStorage<'a, TriggerBox>, - Write<'a, NewEntities>, WriteStorage<'a, Ear>, WriteStorage<'a, Inventory>, ReadStorage<'a, Visible>, @@ -55,21 +54,16 @@ impl <'a> System<'a> for Interact { WriteStorage<'a, Minable> ); - fn run(&mut self, (entities, controllers, positions, ground, mut cooldowns, interactables, mut triggerbox, new, mut ears, mut inventories, visibles, players, mut emigration, mut whitelists, mut minables): Self::SystemData) { + fn run(&mut self, (entities, controllers, positions, ground, mut cooldowns, interactables, mut triggerbox, mut ears, inventories, visibles, players, mut emigration, mut whitelists, mut minables): Self::SystemData) { for (actor, controller, position) in (&entities, &controllers, &positions).join(){ let mut target = None; let ear = ears.get_mut(actor); match &controller.control { Control::Interact(directions, arg) => { - 'targets: for direction in directions { - let pos = position.pos + direction.to_position(); - for ent in ground.cells.get(&pos).unwrap_or(&HashSet::new()) { - if let Some(interactable) = interactables.get(*ent) { - if interactable.accepts_arg(arg){ - target = Some((*ent, interactable, arg.clone())); - break 'targets; - } - } + for (ent, interactable) in ground.components_near(position.pos, directions, &interactables) { + if interactable.accepts_arg(arg){ + target = Some((ent, interactable, arg.clone())); + break; } } } @@ -82,27 +76,6 @@ impl <'a> System<'a> for Interact { Interactable::Trigger(trigger) => { TriggerBox::add_message(&mut triggerbox, ent, *trigger); } - Interactable::Exchange(prefix, exchanges) => { - if let Some(txt) = arg { - if let (Some(inventory), Some(action)) = (inventories.get_mut(actor), strip_prefix(&txt, prefix)) { - if let Some(exchange) = exchanges.get(action) { - if exchange.can_trade(inventory){ - exchange.trade(inventory, &new.encyclopedia); - say(ear, format!("Success! '{}' ({})", txt, exchange.show()), name); - } else { - say(ear, format!("You do not have the required items or inventory space for '{}' ({})", txt, exchange.show()), name); - } - } else { - say(ear, format!("Invalid option: {}", action), name); - } - } - } else if let Some(ear) = ear { - ear.sounds.push(Notification::Options{ - description: "".to_string(), - options: exchanges.iter().map(|(id, exchange)| (format!("{}{}", prefix, id), exchange.show())).collect() - }) - } - } Interactable::Visit(dest) => { if let Some(argument) = arg { if let (Some(player), Some(whitelist)) = (players.get(actor), whitelists.get_mut(ent)){ diff --git a/src/systems/mod.rs b/src/systems/mod.rs index 56606e7..76e39ce 100644 --- a/src/systems/mod.rs +++ b/src/systems/mod.rs @@ -25,6 +25,7 @@ mod deduplicate; mod spawntrigger; mod replace; mod talk; +mod exchange; pub use self::{ controlinput::ControlInput, @@ -52,5 +53,6 @@ pub use self::{ deduplicate::Deduplicate, spawntrigger::SpawnTrigger, replace::Replace, - talk::Talk + talk::Talk, + exchange::Exchange }; diff --git a/src/systems/talk.rs b/src/systems/talk.rs index 4bb898a..50e491f 100644 --- a/src/systems/talk.rs +++ b/src/systems/talk.rs @@ -1,5 +1,4 @@ -use std::collections::HashSet; use specs::{ ReadStorage, @@ -37,15 +36,10 @@ impl <'a> System<'a> for Talk { for (controller, position, ear) in (&controllers, &positions, &mut ears).join(){ match &controller.control { Control::Interact(directions, None) => { - 'targets: for direction in directions { - let pos = position.pos + direction.to_position(); - for ent in ground.cells.get(&pos).unwrap_or(&HashSet::new()) { - if let Some(Talkable{text}) = talkables.get(*ent) { - let name = visibles.get(*ent).map(|v| v.name.clone()); - ear.sounds.push(Notification::Sound{text: text.clone(), source: name}); - break 'targets; - } - } + for (ent, Talkable{text}) in ground.components_near(position.pos, directions, &talkables) { + let name = visibles.get(ent).map(|v| v.name.clone()); + ear.sounds.push(Notification::Sound{text: text.clone(), source: name}); + break; } } _ => {} -- cgit From 92e437e50498f7705e33a556535ba39a2b918f9d Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 21 Sep 2020 00:59:38 +0200 Subject: made talk and reply a form of interact again --- src/systems/interact.rs | 6 ++++++ src/systems/mod.rs | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/systems') diff --git a/src/systems/interact.rs b/src/systems/interact.rs index bce2afc..35c30b6 100644 --- a/src/systems/interact.rs +++ b/src/systems/interact.rs @@ -73,6 +73,12 @@ impl <'a> System<'a> for Interact { let mut cooldown = 2; let name = visibles.get(ent).map(|v| v.name.as_str()); match interactable { + Interactable::Say(text) => { + say(ear, text.clone(), name); + } + Interactable::Reply(text) => { + say(ear, text.replace("{}", &arg.unwrap()), name); + } Interactable::Trigger(trigger) => { TriggerBox::add_message(&mut triggerbox, ent, *trigger); } diff --git a/src/systems/mod.rs b/src/systems/mod.rs index 76e39ce..963cfa6 100644 --- a/src/systems/mod.rs +++ b/src/systems/mod.rs @@ -24,7 +24,6 @@ mod building; mod deduplicate; mod spawntrigger; mod replace; -mod talk; mod exchange; pub use self::{ @@ -53,6 +52,5 @@ pub use self::{ deduplicate::Deduplicate, spawntrigger::SpawnTrigger, replace::Replace, - talk::Talk, exchange::Exchange }; -- cgit From e2281d8c6293b311ccc187e3503093a1120e6215 Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 21 Sep 2020 02:32:22 +0200 Subject: exchange is now an interaction again --- src/systems/interact.rs | 28 +++++++++++++++++++++++++--- src/systems/mod.rs | 2 -- 2 files changed, 25 insertions(+), 5 deletions(-) (limited to 'src/systems') diff --git a/src/systems/interact.rs b/src/systems/interact.rs index 35c30b6..1eb4589 100644 --- a/src/systems/interact.rs +++ b/src/systems/interact.rs @@ -28,7 +28,7 @@ use crate::{ Minable }, controls::{Control}, - resources::{Ground, Emigration}, + resources::{Ground, Emigration, NewEntities}, hashmap, playerstate::RoomPos, PlayerId, @@ -51,10 +51,11 @@ impl <'a> System<'a> for Interact { ReadStorage<'a, Player>, Write<'a, Emigration>, WriteStorage<'a, Whitelist>, - WriteStorage<'a, Minable> + WriteStorage<'a, Minable>, + Read<'a, NewEntities> ); - fn run(&mut self, (entities, controllers, positions, ground, mut cooldowns, interactables, mut triggerbox, mut ears, inventories, visibles, players, mut emigration, mut whitelists, mut minables): Self::SystemData) { + fn run(&mut self, (entities, controllers, positions, ground, mut cooldowns, interactables, mut triggerbox, mut ears, mut inventories, visibles, players, mut emigration, mut whitelists, mut minables, new): Self::SystemData) { for (actor, controller, position) in (&entities, &controllers, &positions).join(){ let mut target = None; let ear = ears.get_mut(actor); @@ -136,6 +137,27 @@ impl <'a> System<'a> for Interact { } } } + Interactable::Exchange(prefix, exchanges) => { + if let Some(txt) = arg { + if let (Some(inventory), Some(action)) = (inventories.get_mut(actor), strip_prefix(&txt, prefix)) { + if let Some(exchange) = exchanges.get(action) { + if exchange.can_trade(inventory){ + exchange.trade(inventory, &new.encyclopedia); + say(ear, format!("Success! '{}' ({})", txt, exchange.show()), name); + } else { + say(ear, format!("You do not have the required items or inventory space for '{}' ({})", txt, exchange.show()), name); + } + } else { + say(ear, format!("Invalid option: {}", action), name); + } + } + } else if let Some(ear) = ear { + ear.sounds.push(Notification::Options{ + description: "".to_string(), + options: exchanges.iter().map(|(id, exchange)| (format!("{}{}", prefix, id), exchange.show())).collect() + }) + } + } } cooldowns.insert(actor, ControlCooldown{amount: cooldown}).unwrap(); } diff --git a/src/systems/mod.rs b/src/systems/mod.rs index 963cfa6..7f93bb9 100644 --- a/src/systems/mod.rs +++ b/src/systems/mod.rs @@ -24,7 +24,6 @@ mod building; mod deduplicate; mod spawntrigger; mod replace; -mod exchange; pub use self::{ controlinput::ControlInput, @@ -52,5 +51,4 @@ pub use self::{ deduplicate::Deduplicate, spawntrigger::SpawnTrigger, replace::Replace, - exchange::Exchange }; -- cgit From 455867294cc849bff2c0829a7464e71e79a0dcae Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 21 Sep 2020 02:33:09 +0200 Subject: removed unused systems for talk and exchange --- src/systems/exchange.rs | 82 ------------------------------------------------- src/systems/talk.rs | 50 ------------------------------ 2 files changed, 132 deletions(-) delete mode 100644 src/systems/exchange.rs delete mode 100644 src/systems/talk.rs (limited to 'src/systems') diff --git a/src/systems/exchange.rs b/src/systems/exchange.rs deleted file mode 100644 index 9931bdd..0000000 --- a/src/systems/exchange.rs +++ /dev/null @@ -1,82 +0,0 @@ - -use specs::{ - Entities, - ReadStorage, - WriteStorage, - System, - Join, - Read, - Write -}; - -use crate::{ - components::{ - Controller, - Position, - Exchanger, - Notification, - Ear, - Inventory, - Visible - }, - controls::{Control}, - resources::{Ground, NewEntities}, - util::strip_prefix -}; - -pub struct Exchange; -impl <'a> System<'a> for Exchange { - type SystemData = ( - Entities<'a>, - ReadStorage<'a, Controller>, - ReadStorage<'a, Position>, - Read<'a, Ground>, - ReadStorage<'a, Exchanger>, - Write<'a, NewEntities>, - WriteStorage<'a, Ear>, - WriteStorage<'a, Inventory>, - ReadStorage<'a, Visible> - ); - - fn run(&mut self, (entities, controllers, positions, ground, exchangers, new, mut ears, mut inventories, visibles): Self::SystemData) { - for (actor, controller, position) in (&entities, &controllers, &positions).join(){ - let ear = ears.get_mut(actor); - match &controller.control { - Control::Interact(directions, arg) => { - for (ent, exchanger) in ground.components_near(position.pos, directions, &exchangers) { - let prefix = exchanger.prefix.as_str(); - let name = visibles.get(ent).map(|v| v.name.as_str()); - if let Some(txt) = arg { - if let (Some(inventory), Some(action)) = (inventories.get_mut(actor), strip_prefix(&txt, prefix)) { - if let Some(exchange) = exchanger.exchanges.get(action) { - if exchange.can_trade(inventory){ - exchange.trade(inventory, &new.encyclopedia); - say(ear, format!("Success! '{}' ({})", txt, exchange.show()), name); - } else { - say(ear, format!("You do not have the required items or inventory space for '{}' ({})", txt, exchange.show()), name); - } - } else { - say(ear, format!("Invalid option: {}", action), name); - } - break; - } - } else if let Some(ear) = ear { - ear.sounds.push(Notification::Options{ - description: "".to_string(), - options: exchanger.exchanges.iter().map(|(id, exchange)| (format!("{}{}", prefix, id), exchange.show())).collect() - }); - break; - } - } - } - _ => {} - } - } - } -} - -fn say(maybe_ear: Option<&mut Ear>, text: String, source: Option<&str>){ - if let Some(ear) = maybe_ear { - ear.sounds.push(Notification::Sound{text, source: source.map(|s| s.to_string())}); - } -} diff --git a/src/systems/talk.rs b/src/systems/talk.rs deleted file mode 100644 index 50e491f..0000000 --- a/src/systems/talk.rs +++ /dev/null @@ -1,50 +0,0 @@ - - -use specs::{ - ReadStorage, - WriteStorage, - System, - Join, - Read -}; - -use crate::{ - components::{ - Controller, - Position, - Talkable, - Notification, - Ear, - Visible - }, - controls::{Control}, - resources::{Ground}, -}; - -pub struct Talk; -impl <'a> System<'a> for Talk { - type SystemData = ( - ReadStorage<'a, Controller>, - ReadStorage<'a, Position>, - Read<'a, Ground>, - ReadStorage<'a, Talkable>, - WriteStorage<'a, Ear>, - ReadStorage<'a, Visible> - ); - - fn run(&mut self, (controllers, positions, ground, talkables, mut ears, visibles): Self::SystemData) { - for (controller, position, ear) in (&controllers, &positions, &mut ears).join(){ - match &controller.control { - Control::Interact(directions, None) => { - for (ent, Talkable{text}) in ground.components_near(position.pos, directions, &talkables) { - let name = visibles.get(ent).map(|v| v.name.clone()); - ear.sounds.push(Notification::Sound{text: text.clone(), source: name}); - break; - } - } - _ => {} - } - } - } -} - -- cgit