update to v0.4.3; more work on searching with similar names; opt king…

…slayer cmdline use

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kingslayer"
-version = "0.4.2"
+version = "0.4.3"
 authors = ["Maxwell Anderson <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -13,7 +13,7 @@ exclude = ["*.yml"]
 
 [dependencies]
 rand = { version = "0.7", features = ["wasm-bindgen"] }
-rayon = "1.0"
+rayon = "1.2"
 serde = { version = "1.0", features = ["derive"] }
 ron = "0.5"
 serde_json = "1.0"

data/test_world.ron

@@ -24,10 +24,15 @@ rooms: {
         ),
         "door": Pathway(
             target: "Closet",
-            desc: "The door leads back into the room.",
+            desc: "There is a door off to the side.",
             inspect: "The door is plain and wooden.",
             opening: Some(Closed)
         ),
+        "s": Pathway(
+            target: "Bedroom",
+            desc: "There is a doorway to the south.",
+            inspect: "The doorway is plain and wooden.",
+        ),
     },
     items: [
         Thing(Thing(
@@ -61,6 +66,32 @@ rooms: {
             damage: 6   
         )),
     ]
-)
+),
+"Bedroom": Room(
+    name: "Bedroom",
+    desc: "You are in a small bedroom.",
+    paths: {
+        "n": Pathway(
+            target: "Central Room",
+            desc: "There is a doorway to the north.",
+            inspect: "The doorway is plain and wooden."
+        ),
+    },
+    items: [
+        Container(Container(
+            name: "large capsule",
+            desc: "There is a large capsule here.",
+            inspect: "The capsule appears to be able to hold things.",
+            opening: Open,
+            contents: [
+                Thing(Thing(
+                    name: "red block",
+                    desc: "There is a red block.",
+                    inspect: "It is a red cube."
+                )),
+            ]
+        )),
+    ]
+),
 }
 )

src/cli/mod.rs

@@ -7,8 +7,6 @@ use std::{
 
 use rayon::prelude::*;
 
-use serde::{Deserialize, Serialize};
-
 use crate::{
     entity::Entity,
     input::{read_line, Lexer, Parser},
@@ -18,7 +16,7 @@ use crate::{
 };
 
 /// The Cli type provides a simple way to interface into the mechanics of Kingslayer with custom worlds
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug)]
 pub struct Cli {
     lexer: Lexer,
     player: RefCell<Box<Player>>,

src/entity/ally.rs

@@ -1,8 +1,8 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use super::Entity;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Ally {
     name: String,
     desc: String,

src/entity/closeable.rs

@@ -1,8 +1,8 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use crate::types::CmdResult;
 
-#[derive(Copy, Clone, Debug, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, Deserialize)]
 pub enum Opening {
     Open,
     Closed,

src/entity/enemy.rs

@@ -1,11 +1,11 @@
 use rand::Rng;
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use super::Entity;
 use crate::types::Items;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Enemy {
     name: String,
     desc: String,

src/entity/item/armor.rs

@@ -1,9 +1,9 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use crate::entity::Entity;
 
 // An object to be interacted with by the user
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Armor {
     name: String,
     desc: String,

src/entity/item/container.rs

@@ -1,6 +1,6 @@
 use rayon::prelude::*;
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use super::Item;
 use crate::{
@@ -9,7 +9,7 @@ use crate::{
 };
 
 // An object to be interacted with by the user
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Container {
     name: String,
     desc: String,

src/entity/item/mod.rs

@@ -1,4 +1,4 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use crate::entity::Entity;
 
@@ -12,7 +12,7 @@ pub use container::Container;
 pub use thing::Thing;
 pub use weapon::Weapon;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub enum Item {
     Armor(Armor),
     Container(Container),

src/entity/item/thing.rs

@@ -1,9 +1,9 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use crate::entity::Entity;
 
 // An object to be interacted with by the user
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Thing {
     name: String,
     desc: String,

src/entity/item/weapon.rs

@@ -1,11 +1,11 @@
 use rand::Rng;
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use crate::entity::Entity;
 
 // An object to be interacted with by the user
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Weapon {
     name: String,
     desc: String,

src/entity/pathway.rs

@@ -1,9 +1,9 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use super::{Closeable, Entity, Opening};
 use crate::types::{Action, CmdResult};
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Pathway {
     target: String,
     #[serde(default)]

src/entity/room.rs

@@ -1,6 +1,6 @@
 use rayon::prelude::*;
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use super::{
     Closeable, Entity,
@@ -9,7 +9,7 @@ use super::{
 use crate::types::{Action, Allies, CmdResult, Enemies, Items, PathMap};
 
 // A section of the world connected by paths
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Room {
     name: String,
     desc: String,
@@ -130,8 +130,7 @@ impl Room {
     pub fn open(&mut self, name: &str) -> CmdResult {
         if let Some(path) = self.paths.get_mut(name) {
             if path.is_closed() {
-                path.open();
-                CmdResult::new(Action::Active, "Opened.".to_owned())
+                path.open()
             } else {
                 CmdResult::already_opened(name)
             }
@@ -141,6 +140,16 @@ impl Room {
             } else {
                 CmdResult::not_container(name)
             }
+        } else if let Some(item) = self.find_similar_item(name) {
+            if let Some(item) = self.items.get_mut(item) {
+                if let Container(ref mut item) = **item {
+                    item.open()
+                } else {
+                    CmdResult::not_container(name)
+                }
+            } else {
+                CmdResult::no_item_here(name)
+            }
         } else {
             CmdResult::no_item_here(name)
         }
@@ -155,11 +164,21 @@ impl Room {
                 CmdResult::new(Action::Active, "Closed.".to_owned())
             }
         } else if let Some(item) = self.items.par_iter_mut().find_any(|x| x.name() == name) {
-            if let Container(ref mut container) = **item {
-                container.close()
+            if let Container(ref mut item) = **item {
+                item.close()
             } else {
                 CmdResult::not_container(name)
             }
+        } else if let Some(item) = self.find_similar_item(name) {
+            if let Some(item) = self.items.get_mut(item) {
+                if let Container(ref mut item) = **item {
+                    item.close()
+                } else {
+                    CmdResult::not_container(name)
+                }
+            } else {
+                CmdResult::no_item_here(name)
+            }
         } else {
             CmdResult::no_item_here(name)
         }

src/input/lexer.rs

@@ -1,10 +1,10 @@
 use rayon::prelude::*;
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use crate::types::CmdTokens;
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Lexer {
     filter_out: Vec<String>,
 }

src/input/parser.rs

@@ -1,4 +1,4 @@
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use crate::{
     cli::Cli,
@@ -8,7 +8,7 @@ use crate::{
     world::World,
 };
 
-#[derive(Serialize, Deserialize)]
+#[derive(Deserialize)]
 pub struct Parser;
 
 impl Parser {

src/inventory/mod.rs

@@ -1,6 +1,6 @@
 use rayon::prelude::*;
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 
 use crate::{
     entity::{
@@ -10,7 +10,7 @@ use crate::{
     types::{Action, CmdResult, Items},
 };
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct Inventory {
     items: Items,
 }