diff options
| author | troido <troido@protonmail.com> | 2020-09-23 00:44:16 +0200 |
|---|---|---|
| committer | troido <troido@protonmail.com> | 2020-09-23 00:44:16 +0200 |
| commit | 00a590a42edd7538c61dacbc4224c1adfc1e6414 (patch) | |
| tree | c1fd6eaaaf417f8de62df4d8bab3e12148aa9a36 | |
| parent | 77eed840ceccc58881c06efd4403be86c936b348 (diff) | |
don't escape chat characters
| -rw-r--r-- | content/maps/town.json | 15 | ||||
| -rw-r--r-- | src/gameserver.rs | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/content/maps/town.json b/content/maps/town.json index 98e3de0..c2b0624 100644 --- a/content/maps/town.json +++ b/content/maps/town.json @@ -30,28 +30,28 @@ ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#++++#,...,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#++++#,...,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,#######,,#+####,...,,,,,,,,,,,,,,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,#u++++#,,#++D+#,...,,,,,,,,,,,,,,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,#u++++#,,#++Y+#,...,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,#u++V+#,,#++++#,...,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,#u++++#,,#++++#,...,,,,,,,,,,,,,,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,#####+#,,###+##,...,,,,,,,,,,,,,,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,#####D#,,###D##,...,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,.,,,,,,.,,,...,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,======.....................,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,======.....................,,,,,,,,,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,======.....................,,######,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,#++V+#,,,,,,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,######,.....++++s#,,,,,,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,######,.....D+++s#,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#++++#,...,,#++++#,,,,,,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#t+++#,...,,######,,,,,,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#+++++....,,,,,,,,,,,,,,,,h%", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#++++D....,,,,,,,,,,,,,,,,h%", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,#++++#,....................%", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,######,....................%", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,....................%", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,....................%", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,,,,,,,,,...,,,,,,,,,..,,,,,h%", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#######,...,,,,,####+###,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#######,...,,,,,####D###,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#+++++#,...,,,,,#++++++#,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#4++++#,...,,,,,#++++++#,,,h,", - ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#++++++....,,,,,#++++++#,,,h,", + ",h,,,,,,,,,,,,,,,,,~~~~~~,,,,,,,,,,#+++++D....,,,,,#++++++#,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~~,,,,,,,,,#+V+++#,...,,,,,#++++++#,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~~~~~~,,,,,#+++5+#,...,,,,,#+++S++#,,,h,", ",h,,,,,,,,,,,,,,,,,~~~~~~~~~~~~~~,,#######,...,,,,,#++++++#,,,h,", @@ -84,6 +84,7 @@ "+": "floor", "X": "rock", "^": ["spiketrap", "ground"], + "D": ["floor", "opendoor"], "%": [{ "type": "portal", "kwargs": {"destination": "smallview", "destpos": "towneast"} @@ -96,7 +97,7 @@ "s": ["floor", "sewingtable"], "u": ["floor", "tub"], "V": ["floor", "villager"], - "D": ["floor", "dyetrader"], + "Y": ["floor", "dyetrader"], " ": [] } } diff --git a/src/gameserver.rs b/src/gameserver.rs index 4947c8d..5c20b13 100644 --- a/src/gameserver.rs +++ b/src/gameserver.rs @@ -252,7 +252,7 @@ fn parse_message(msg: &str) -> Result<Message, MessageError> { } "chat" => { let text = arg.as_str().ok_or(merr!(msg, "chat text not a string"))?; - Message::Chat(text.escape_debug().to_string()) + Message::Chat(text.to_string()) } "input" => { Message::Input(arg.clone()) |