diff --git a/Cargo.lock b/Cargo.lock index b52b220..ce58f07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "atomic_refcell" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681b971236e0f76b20fcafca0236b8718c9186ee778d67cd78bd5f28fd85427f" +checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d" [[package]] name = "autocfg" @@ -49,9 +49,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "build_const" @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "console_engine" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2806f9623af3ee69d6d96e68b42167d738f5ead1dc2330cce55e84643fca1f71" +checksum = "c7370400018b62d806bb0e1d390177b8517c55930e345e6d3d7db11781921d8b" dependencies = [ "crossterm", "unicode-width", @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.20.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" +checksum = "c85525306c4291d1b73ce93c8acf9c339f9b213aef6c1d85c3830cbf1c16325c" dependencies = [ "bitflags", "crossterm_winapi", @@ -166,9 +166,9 @@ dependencies = [ [[package]] name = "crossterm_winapi" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" +checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" dependencies = [ "winapi", ] @@ -225,9 +225,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", ] @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "laminar" @@ -305,15 +305,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.98" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" dependencies = [ "scopeguard", ] @@ -329,9 +329,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" @@ -344,9 +344,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -404,9 +404,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", @@ -415,9 +415,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "cfg-if", "instant", @@ -429,30 +429,30 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] @@ -533,9 +533,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -557,6 +557,12 @@ version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +[[package]] +name = "rustversion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" + [[package]] name = "rustyhack_client" version = "0.2.0" @@ -579,6 +585,7 @@ name = "rustyhack_lib" version = "0.2.0" dependencies = [ "console_engine", + "crossterm", "log", "serde", "simplelog", @@ -626,18 +633,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -646,9 +653,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.66" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" +checksum = "063bf466a64011ac24040a49009724ee60a57da1b437617ceb32e53ad61bfb19" dependencies = [ "itoa", "ryu", @@ -657,9 +664,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "470c5a6397076fae0094aaf06a08e6ba6f37acb77d3b1b91ea92b4d6c8650c39" +checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" dependencies = [ "libc", "signal-hook-registry", @@ -687,9 +694,9 @@ dependencies = [ [[package]] name = "simplelog" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d0fe306a0ced1c88a58042dc22fc2ddd000982c26d75f6aa09a394547c41e0" +checksum = "8baa24de25f3092d9697c76f94cf09f67fca13db2ea11ce80c2f055c1aaf0795" dependencies = [ "chrono", "log", @@ -698,33 +705,34 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "strum" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" +checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" [[package]] name = "strum_macros" -version = "0.21.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" dependencies = [ "heck", "proc-macro2", "quote", + "rustversion", "syn", ] [[package]] name = "syn" -version = "1.0.74" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", @@ -742,18 +750,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", @@ -779,9 +787,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" diff --git a/assets/monsters/Rat.json b/assets/monsters/Rat.json index 5503f62..9fb32fe 100644 --- a/assets/monsters/Rat.json +++ b/assets/monsters/Rat.json @@ -14,7 +14,7 @@ }, "display_details": { "icon": "r", - "colour": "Grey", + "colour": "grey", "visible": true, "collidable": true }, diff --git a/assets/monsters/Snake.json b/assets/monsters/Snake.json index 2c00907..cb5a580 100644 --- a/assets/monsters/Snake.json +++ b/assets/monsters/Snake.json @@ -14,7 +14,7 @@ }, "display_details": { "icon": "s", - "colour": "DarkGreen", + "colour": "dark_green", "visible": true, "collidable": true }, diff --git a/assets/monsters/Zombie.json b/assets/monsters/Zombie.json index 0073bbf..7ab40dd 100644 --- a/assets/monsters/Zombie.json +++ b/assets/monsters/Zombie.json @@ -14,7 +14,7 @@ }, "display_details": { "icon": "z", - "colour": "Grey", + "colour": "grey", "visible": true, "collidable": true }, diff --git a/rustyhack_client/Cargo.toml b/rustyhack_client/Cargo.toml index c253538..0028035 100644 --- a/rustyhack_client/Cargo.toml +++ b/rustyhack_client/Cargo.toml @@ -11,12 +11,12 @@ license = "AGPL-3.0" [dependencies] rustyhack_lib = { path = "../rustyhack_lib" } log = "0.4.14" -simplelog = "0.10.0" -console_engine = "2.0.1" -crossterm = { version = "0.20.0", features = ["serde"] } +simplelog = "0.11.0" +console_engine = "2.2.0" +crossterm = { version = "0.22.1", features = ["serde"] } laminar = "0.5.0" crossbeam-channel = "0.5.1" -serde = { version = "1.0.125", features = ["derive"] } +serde = { version = "1.0.130", features = ["derive"] } bincode = "1.3.1" regex = "1.4.5" chrono = "0.4.19" \ No newline at end of file diff --git a/rustyhack_lib/Cargo.toml b/rustyhack_lib/Cargo.toml index bd776ee..7fcef15 100644 --- a/rustyhack_lib/Cargo.toml +++ b/rustyhack_lib/Cargo.toml @@ -10,9 +10,10 @@ license = "AGPL-3.0" [dependencies] log = "0.4.14" -simplelog = "0.10.0" -serde = { version = "1.0.125", features = ["derive"] } -console_engine = "2.0.1" +simplelog = "0.11.0" +serde = { version = "1.0.130", features = ["derive"] } +console_engine = "2.2.0" +crossterm = { version = "0.22.1", features = ["serde"] } uuid = { version = "0.8.2", features = ["serde", "v4"] } -strum = "0.21.0" -strum_macros = "0.21.1" \ No newline at end of file +strum = "0.23.0" +strum_macros = "0.23.1" \ No newline at end of file diff --git a/rustyhack_lib/src/consts.rs b/rustyhack_lib/src/consts.rs index f30ba73..b7be6ca 100644 --- a/rustyhack_lib/src/consts.rs +++ b/rustyhack_lib/src/consts.rs @@ -1,4 +1,4 @@ -use console_engine::Color; +use crossterm::style::Color; pub const DEFAULT_MAP: &str = "Home"; pub const DEFAULT_PLAYER_ICON: char = '@'; diff --git a/rustyhack_lib/src/ecs/components.rs b/rustyhack_lib/src/ecs/components.rs index a832907..c97e21e 100644 --- a/rustyhack_lib/src/ecs/components.rs +++ b/rustyhack_lib/src/ecs/components.rs @@ -1,7 +1,7 @@ use crate::consts::{DEFAULT_PLAYER_COLOUR, DEFAULT_PLAYER_ICON}; use crate::ecs::monster::Monster; use crate::ecs::player::Player; -use console_engine::Color; +use crossterm::style::Color; use serde::{Deserialize, Serialize}; use uuid::Uuid; diff --git a/rustyhack_server/Cargo.toml b/rustyhack_server/Cargo.toml index 6d4c052..13af061 100644 --- a/rustyhack_server/Cargo.toml +++ b/rustyhack_server/Cargo.toml @@ -11,14 +11,14 @@ license = "AGPL-3.0" [dependencies] rustyhack_lib = { path = "../rustyhack_lib" } log = "0.4.14" -simplelog = "0.10.0" -console_engine = "2.0.1" -crossterm = { version = "0.20.0", features = ["serde"] } +simplelog = "0.11.0" +console_engine = "2.2.0" +crossterm = { version = "0.22.1", features = ["serde"] } legion = "0.4.0" laminar = "0.5.0" crossbeam-channel = "0.5.1" -serde = { version = "1.0.125", features = ["derive"] } -serde_json = "1.0.64" +serde = { version = "1.0.130", features = ["derive"] } +serde_json = "1.0.71" bincode = "1.3.1" rand = "0.8.3" uuid = { version = "0.8.2", features = ["serde", "v4"] } \ No newline at end of file