improve combat system

fixed clippy remarks

.idea/el_diabolo.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="EMPTY_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

Cargo.lock

@@ -50,6 +50,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
 
+[[package]]
+name = "castaway"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -57,16 +66,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "crossterm"
+name = "compact_str"
-version = "0.27.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
+checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644"
+dependencies = [
+ "castaway",
+ "cfg-if",
+ "itoa",
+ "rustversion",
+ "ryu",
+ "static_assertions",
+]
+
+[[package]]
+name = "crossterm"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
  "bitflags 2.4.1",
  "crossterm_winapi",
- "libc",
  "mio",
  "parking_lot",
+ "rustix",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -104,6 +127,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -133,9 +166,15 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "indexmap"
@@ -148,34 +187,50 @@ dependencies = [
 ]
 
 [[package]]
-name = "indoc"
+name = "instability"
-version = "2.0.4"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
+checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c"
+dependencies = [
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
 
 [[package]]
-name = "js-sys"
+name = "itoa"
-version = "0.3.65"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
@@ -204,10 +259,11 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi",
  "libc",
  "log",
  "wasi",
@@ -238,9 +294,9 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.4.1",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -251,9 +307,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -315,19 +371,22 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.24.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425"
+checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d"
 dependencies = [
  "bitflags 2.4.1",
  "cassowary",
+ "compact_str",
  "crossterm",
- "indoc",
+ "instability",
  "itertools",
  "lru",
  "paste",
  "strum",
+ "strum_macros",
  "unicode-segmentation",
+ "unicode-truncate",
  "unicode-width",
 ]
 
@@ -340,12 +399,40 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.4.1",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+dependencies = [
+ "bitflags 2.4.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -364,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
  "mio",
@@ -389,19 +476,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
-name = "strum"
+name = "static_assertions"
-version = "0.25.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.25.3"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -434,10 +527,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
-name = "unicode-width"
+name = "unicode-truncate"
-version = "0.1.11"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
+dependencies = [
+ "itertools",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "version_check"
@@ -452,10 +556,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasm-bindgen"
+name = "wasite"
-version = "0.2.88"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -463,9 +573,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
 dependencies = [
  "bumpalo",
  "log",
@@ -478,9 +588,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -488,9 +598,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -501,15 +611,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.88"
+version = "0.2.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"
+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "web-sys"
-version = "0.3.65"
+version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85"
+checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -517,11 +627,12 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.4.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "wasm-bindgen",
+ "redox_syscall 0.5.7",
+ "wasite",
  "web-sys",
 ]
 
@@ -549,11 +660,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -562,13 +673,29 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
+ "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc",
+ "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu",
+ "windows_i686_gnu 0.48.5",
- "windows_i686_msvc",
+ "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu",
+ "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm",
+ "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -577,42 +704,90 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
 [[package]]
 name = "zerocopy"
 version = "0.7.19"

Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ratatui = "0.24.0"
+ratatui = "0.28.1"
-crossterm = "0.27.0"
+crossterm = "0.28.1"
 rand = "0.8.5"
-petgraph = "0.6.4"
+petgraph = "0.6.5"
-whoami = "1.4.1"
+whoami = "1.5.2"

build.rs

@@ -0,0 +1,10 @@
+use std::process::Command;
+
+fn main() {
+    let output = Command::new("git")
+        .args(["rev-parse", "--short", "HEAD"])
+        .output()
+        .unwrap();
+    let git_hash = String::from_utf8(output.stdout).unwrap();
+    println!("cargo:rustc-env=GIT_HASH={}", git_hash);
+}

src/artifacts.rs

@@ -0,0 +1,100 @@
+use ratatui::style::Color;
+
+use crate::player::Player;
+use crate::position::Position;
+
+pub trait Artifact {
+    //! An artifact that can be collected by the player
+    fn get_representation(&self) -> (&str, Color);
+    /// get the position of the artifact in the level
+    fn get_immutable_position(&self) -> &Position;
+    /// call to apply the effects of the artifact to the player
+    fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>);
+    /// returns if the artifact was collected and can be removed from the level
+    fn was_collected(&self) -> bool;
+}
+
+pub struct Chest {
+    /// a chest that contains some gold
+    position: Position,
+    gold: usize,
+}
+
+impl Chest {
+    pub fn new(position: Position) -> Self {
+        let level = position.get_level();
+        Self {
+            position,
+            // TODO maybe randomize this?
+            gold: (level + 1) * 10,
+        }
+    }
+}
+
+impl Artifact for Chest {
+    fn get_representation(&self) -> (&str, Color) {
+        ("C", Color::Blue)
+    }
+
+    fn get_immutable_position(&self) -> &Position {
+        &self.position
+    }
+    fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>) {
+        player.retrieve_gold(self.gold);
+        messages.insert(
+            0,
+            format!("opened chest and collected {} gold.", self.gold).to_string(),
+        );
+        self.gold = 0;
+    }
+
+    fn was_collected(&self) -> bool {
+        self.gold == 0
+    }
+}
+
+pub struct Potion {
+    /// a potion that restores some health
+    position: Position,
+    health: usize,
+}
+
+impl Potion {
+    pub fn new(position: Position) -> Self {
+        Self {
+            position,
+            health: 5,
+        }
+    }
+}
+
+impl Artifact for Potion {
+    fn get_representation(&self) -> (&str, Color) {
+        ("P", Color::Green)
+    }
+    fn get_immutable_position(&self) -> &Position {
+        &self.position
+    }
+    fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>) {
+        // only consume potion of the player can gain at least one health point
+        if !player.is_healthy() {
+            let old = player.get_life();
+            player.change_life(self.health.try_into().unwrap());
+            let new = player.get_life();
+            messages.insert(
+                0,
+                format!("picked up potion and gained {} hp.", new - old).to_string(),
+            );
+            self.health = 0;
+        } else {
+            messages.insert(
+                0,
+                "not using the potion because you're healthy.".to_string(),
+            );
+        }
+    }
+
+    fn was_collected(&self) -> bool {
+        self.health == 0
+    }
+}

src/game.rs

@@ -1,66 +1,244 @@
-use crate::level::{Artifact, Level, StructureElement};
+use crate::level::{Level, StructureElement};
+use crate::level_generator::LevelGenerator;
 use crate::player::Player;
+use crate::position::{HasPosition, Position};
 
+pub const LEVELS: usize = 10;
+
+#[derive(PartialEq)]
+/// represents a state of a game
+pub enum GameState {
+    /// the game is ongoing (neither won or lost)
+    Running,
+    /// the player died
+    Lost,
+    /// the player reached the Ω
+    Won,
+}
+
+/// the main structure to hold all information about the ongoing game
 pub struct Game {
-    pub player: Player,
+    /// the player
-    pub levels: [Level; 25],
+    player: Player,
+    /// the levels of the game
+    levels: Vec<Level>,
+    pub messages: Vec<String>,
 }
 
 impl Game {
-    pub fn move_player(&mut self, dx: i16, dy: i16) {
+    pub fn new(p: Player) -> Game {
-        // check if move is allowed first
+        let mut v: Vec<Level> = Vec::with_capacity(LEVELS);
-        let player_pos = self.player.get_position();
+        for d in 0..LEVELS {
-        let level = &self.levels[player_pos.get_level()];
+            v.push(LevelGenerator::generate(d, d == 0, d == LEVELS - 1).render());
+        }
+        let mut g = Game {
+            player: p,
+            levels: v,
+            messages: Vec::with_capacity(10),
+        };
+        let start = { g.get_level(0).start };
+        g.get_mutable_player()
+            .get_position()
+            .set(0, start.0, start.1);
+        g.get_mutable_level(0)
+            .discover(&Position::new(0, start.0, start.1));
+        g
+    }
+
+    /// returns true if the player is standing on the End element
+    fn player_reached_goal(&mut self) -> bool {
+        match self.next_element(0, 0) {
+            None => {}
+            Some(a) => {
+                if a == StructureElement::End {
+                    return true;
+                }
+            }
+        };
+        false
+    }
+    /// returns the state of the game (depending on player's life and position)
+    pub fn get_game_state(&mut self) -> GameState {
+        if self.player.is_dead() {
+            return GameState::Lost;
+        }
+        if self.player_reached_goal() {
+            return GameState::Won;
+        }
+        GameState::Running
+    }
+    pub fn get_player(&self) -> &Player {
+        &self.player
+    }
+    pub fn get_mutable_player(&mut self) -> &mut Player {
+        &mut self.player
+    }
+    pub fn get_level(&self, level: usize) -> &Level {
+        &self.levels[level]
+    }
+    pub fn get_mutable_level(&mut self, level: usize) -> &mut Level {
+        &mut self.levels[level]
+    }
+    /// check if the player can move in the given direction. This only checks for structure element
+    /// limitation as walls.
+    fn can_move(&mut self, dx: i16, dy: i16) -> bool {
+        let player_pos = &self.player.get_position();
+        let level = &mut self.levels[player_pos.get_level()];
+        level.can_player_move(&self.player, dx, dy)
+    }
+    /// returns the position (as tuple) of the next level's start point.
+    fn next_start(&self) -> (usize, usize, usize) {
+        let level = self.player.get_immutable_position().get_level() + 1;
+        let (x, y) = self.levels[level].start;
+        (level, x, y)
+    }
+    /// returns the position (as tuple) of the previous level's end point.
+    fn prev_end(&self) -> (usize, usize, usize) {
+        let level = self.player.get_immutable_position().get_level() - 1;
+        let (x, y) = self.levels[level].end;
+        (level, x, y)
+    }
+    /// get the next structure element sen from the player's position into the given direction.
+    fn next_element(&mut self, dx: i16, dy: i16) -> Option<StructureElement> {
+        let player_pos = &self.player.get_position();
         let new_x: i16 = player_pos.get_x() as i16 + dx;
         let new_y: i16 = player_pos.get_y() as i16 + dy;
-        let can_go: bool = match level.get_element(new_x, new_y) {
+        let player_level = player_pos.get_level();
-            (None, _, _) => { false }
+        let level = &mut self.levels[player_level];
-            (_, _, Some(e)) => {
+        level.get_element(new_x, new_y).0
-                self.levels[player_pos.get_level()].attack(new_x, new_y, &mut self.player)
     }
-            (Some(t), _, _) => {
+
-                match t {
+    /// move the game's player into the given direction. If on the target field there is a stair,
-                    StructureElement::Wall => { false }
+    /// the player follows the stair up/down to the next level.
-                    _ => { true }
+    /// Discovery is performed on the new location of the player.
+    /// The returned value is the direction that will bring the player back to his original field.
+    pub fn move_player(&mut self, mut dx: i16, mut dy: i16) -> (i16, i16) {
+        // verify the player can do the move
+        if !self.can_move(dx, dy) {
+            return (-dx, -dy);
         }
-            }
+
-        };
+        let player_pos = &self.player.get_position();
-        if can_go {
+        let mut player_level = player_pos.get_level();
-            let tmp = level.get_element(new_x, new_y);
+        let structure = self.next_element(dx, dy);
-            match tmp.0.unwrap() {
+
+        // use stairs if walked onto one
+        if let Some(e) = structure {
+            match e {
                 StructureElement::StairDown => {
-                    let next_level = player_pos.get_level() + 1;
+                    (dx, dy) = (0, 0);
-                    let start_x: usize = self.levels[next_level].start_x;
+                    let (next_level, x, y) = self.next_start();
-                    let start_y: usize = self.levels[next_level].start_y;
+                    player_level = next_level;
-                    self.player.set_position(next_level, start_x, start_y);
+                    self.messages
-                    self.levels[next_level].discover(self.player.get_position());
+                        .insert(0, format!("you climb down to level {}.", next_level));
+                    self.get_mutable_player()
+                        .get_position()
+                        .set(next_level, x, y);
                 }
                 StructureElement::StairUp => {
-                    self.player.set_position(
+                    (dx, dy) = (0, 0);
-                        player_pos.get_level() - 1,
+                    let (next_level, x, y) = self.prev_end();
-                        self.levels[player_pos.get_level() - 1].end_x,
+                    player_level = next_level;
-                        self.levels[player_pos.get_level() - 1].end_y,
+                    self.messages
-                    );
+                        .insert(0, format!("you climb up to level {}.", next_level));
-                }
+                    self.get_mutable_player()
-                _ => {
+                        .get_position()
-                    self.player.change_position(dx, dy);
+                        .set(next_level, x, y);
-                    self.levels[player_pos.get_level()].discover(self.player.get_position());
-                }
-            };
-            match tmp.1 {
-                Some(Artifact::Chest {gold}) => {
-                    self.levels[player_pos.get_level()].remove_artifact(new_x, new_y);
-                    self.player.add_gold(gold);
                 }
                 _ => {}
             }
-            // match tmp.2 {
+        };
-            //     Some(enemy) => {
+
-            //         // todo!("implement fighting!");
+        // update position and discover area on new position
-            //         self.levels[player_pos.get_level()].attack(new_x, new_y, &mut self.player);
+        let (new_x, new_y) = self.get_mutable_player().get_position().change(dx, dy);
-            //     }
+        self.get_mutable_level(player_level)
-            //     _ => {}
+            .discover(&Position::new(player_level, new_x, new_y));
-            // }
+        (-dx, -dy)
     }
+
+    pub fn player_fights_monster(&mut self) -> bool {
+        let player_pos = &self.player.get_immutable_position();
+        let player_level = player_pos.get_level();
+        let level = &mut self.levels[player_level];
+        let (_, m, _) = level.get_element(player_pos.get_x() as i16, player_pos.get_y() as i16);
+        match m {
+            None => {}
+            Some(m) => {
+                // TODO fight the monster
+
+                let monster_dmg = m.damage() as i16;
+                let player_dmg = self.player.damage();
+                self.player.change_life(-monster_dmg);
+                m.decrease_life(player_dmg);
+
+                // inform player
+                self.messages.insert(
+                    0,
+                    format!("{} hits you for {} damage.", m.get_name(), monster_dmg).to_string(),
+                );
+                self.messages.insert(
+                    0,
+                    format!("you hit {} for {} damage.", m.get_name(), player_dmg).to_string(),
+                );
+                // monster died, player gains experience
+                if m.is_dead() {
+                    self.player.gain_experience(m.get_experience_gain());
+                }
+                return m.is_dead();
+            }
+        };
+        true
+    }
+    pub fn player_collects_artifact(&mut self) {
+        let player_pos = &self.player.get_immutable_position();
+        let player_level = player_pos.get_level();
+        let level = &mut self.levels[player_level];
+        let (_, _, a) = level.get_element(player_pos.get_x() as i16, player_pos.get_y() as i16);
+        match a {
+            None => {}
+            Some(a) => {
+                a.collect(&mut self.player, &mut self.messages);
+            }
+        }
+    }
+    /// updates the player's current level. This will remove collected artifacts and dead monsters.
+    pub fn update_level(&mut self, ticks: u128) {
+        let player_pos = &self.player.get_immutable_position();
+        let player_level = player_pos.get_level();
+        let level = &mut self.levels[player_level];
+        level.update(ticks, &mut self.player, &mut self.messages);
     }
 }
+
+#[test]
+fn game_has_correct_number_of_levels() {
+    let p = Player::new("foo", 42);
+    let g = Game::new(p);
+    assert_eq!(g.levels.len(), LEVELS);
+}
+
+#[test]
+fn game_has_player() {
+    let p = Player::new("foo", 42);
+    let g = Game::new(p);
+    assert_eq!(g.get_player().get_name(), "foo");
+    assert_eq!(g.get_player().get_immutable_position().get_level(), 0);
+}
+
+#[test]
+fn game_has_mutable_player() {
+    let p = Player::new("foo", 42);
+    let mut g = Game::new(p);
+    assert_eq!(g.get_player().get_name(), "foo");
+    g.get_mutable_player().change_life(-1);
+    assert_eq!(g.get_player().get_life(), 41);
+}
+
+#[test]
+fn game_get_level() {
+    let p = Player::new("foo", 42);
+    let mut g = Game::new(p);
+    g.get_level(0);
+    assert_ne!(g.get_level(0).start, (0, 0));
+    g.get_mutable_level(0).discover(&Position::new(0, 1, 1));
+}

src/level.rs

@@ -1,6 +1,16 @@
 use std::cmp::{max, min};
+
+use rand::rngs::ThreadRng;
+use rand::Rng;
+
+use crate::artifacts::Artifact;
+#[cfg(test)]
+use crate::artifacts::{Chest, Potion};
 use crate::monster::Monster;
+#[cfg(test)]
+use crate::monster::{Orc, Rat};
 use crate::player::Player;
+use crate::position::HasPosition;
 use crate::position::Position;
 
 pub const LEVEL_WIDTH: usize = 50;
@@ -8,79 +18,37 @@ pub const LEVEL_HEIGHT: usize = 25;
 
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum StructureElement {
+    Start,
+    End,
     Wall,
     Floor,
     StairDown,
     StairUp,
-    Start,
-    End,
     Unknown,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+type PossibleArtifact<'a> = Option<&'a mut Box<(dyn Artifact + 'static)>>;
-pub enum Artifact {
+type PossibleMonster<'a> = Option<&'a mut Box<(dyn Monster + 'static)>>;
-    Chest { gold: usize },
-}
 
-#[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Level {
+    pub(crate) level: usize,
     pub(crate) structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
     pub(crate) discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
-    pub(crate) artifacts: [[Option<Artifact>; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    pub(crate) monsters: Vec<Box<dyn Monster>>,
-    pub(crate) enemies: [[Option<Monster>; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    pub(crate) artifacts: Vec<Box<dyn Artifact>>,
-    pub(crate) start_x: usize,
+    /// the position of the start in the level (either stair up or start point)
-    pub(crate) start_y: usize,
+    pub(crate) start: (usize, usize),
-    pub(crate) end_x: usize,
+    /// the position of the end in the level (either stair down or end point)
-    pub(crate) end_y: usize,
+    pub(crate) end: (usize, usize),
+    pub(crate) rng: ThreadRng,
 }
 
 impl Level {
-    pub fn new() -> Level {
+    pub fn get_element(
-        let s = [[StructureElement::Wall; LEVEL_HEIGHT]; LEVEL_WIDTH];
+        &mut self,
-        Level {
+        x: i16,
-            structure: s,
+        y: i16,
-            discovered: [[false; LEVEL_HEIGHT]; LEVEL_WIDTH],
+    ) -> (Option<StructureElement>, PossibleMonster, PossibleArtifact) {
-            artifacts: [[None; LEVEL_HEIGHT]; LEVEL_WIDTH],
-            enemies: [[None; LEVEL_HEIGHT]; LEVEL_WIDTH],
-            start_x: 1,
-            start_y: 1,
-            end_x: 1,
-            end_y: 1,
-        }
-    }
-    pub(crate) fn attack(&self, x: i16, y: i16, player: &mut Player) -> bool {
-        if x < 0 || y < 0 {
-            return false;
-        }
-        let x = x as usize;
-        let y = y as usize;
-        if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
-            return false;
-        }
-
-        match &self.enemies[x][y] {
-            Some(mut enemy) => {
-                player.change_life(-1);
-                enemy.decrease_life(1);
-                println!("{}",enemy.get_life());
-                return enemy.get_life() == 0
-            }
-            _ => {}
-        }
-        false
-    }
-    pub fn remove_artifact(&mut self, x: i16, y: i16) {
-        if x < 0 || y < 0 {
-            return;
-        }
-        let x = x as usize;
-        let y = y as usize;
-        if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
-            return;
-        }
-        self.artifacts[x][y] = None;
-    }
-    pub fn get_element(&self, x: i16, y: i16) -> (Option<StructureElement>, Option<Artifact>, Option<Monster>) {
         if x < 0 || y < 0 {
             return (None, None, None);
         }
@@ -89,14 +57,26 @@ impl Level {
         if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
             return (None, None, None);
         }
-        // if !self.discovered[x][y] {
+        if !self.discovered[x][y] {
-        // if !self.discovered[x][y] {
+            return (Some(StructureElement::Unknown), None, None);
-        //     return (Some(StructureElement::Unknown), None, None);
+        }
-        // }
+        let search_pos = &Position::new(self.level, x, y);
-        return (Some(self.structure[x][y]), self.artifacts[x][y], self.enemies[x][y]);
+        let mut res_m: Option<&mut Box<dyn Monster>> = None;
+        for m in &mut self.monsters {
+            if m.get_immutable_position() == search_pos {
+                res_m = Some(m);
+            }
+        }
+        let mut res_a: Option<&mut Box<dyn Artifact>> = None;
+        for a in &mut self.artifacts {
+            if a.get_immutable_position() == search_pos {
+                res_a = Some(a);
+            }
+        }
+        (Some(self.structure[x][y]), res_m, res_a)
     }
     /// discover the area with in the level around the given position
-    pub fn discover(&mut self, pos: Position) {
+    pub fn discover(&mut self, pos: &Position) {
         let x = pos.get_x();
         let y = pos.get_y();
 
@@ -139,13 +119,267 @@ impl Level {
             }
         }
     }
+    pub fn update(&mut self, ticks: u128, player: &mut Player, messages: &mut Vec<String>) {
+        for (index, a) in &mut self.artifacts.iter().enumerate() {
+            if a.was_collected() {
+                self.artifacts.remove(index);
+                break;
+            }
+        }
+        for index in 0..self.monsters.len() {
+            if self.monsters[index].is_dead() {
+                continue;
+            }
+            if ticks % self.monsters[index].get_ticks_between_steps() != 0 {
+                continue;
+            }
+            loop {
+                // calculate the direction the monster will try to walk
+                let (dx, dy) = match self.rng.gen_range(0..5) {
+                    1 => (1, 0),
+                    2 => (-1, 0),
+                    3 => (0, 1),
+                    4 => (0, -1),
+                    _ => (0, 0),
+                };
+                if self.can_monster_move(self.monsters[index].as_ref(), dx, dy) {
+                    let (new_x, new_y) = self.monsters[index].get_position().change(dx, dy);
+                    if player.get_immutable_position().get_x() == new_x
+                        && player.get_immutable_position().get_y() == new_y
+                    {
+                        // TODO handle fight between monster and player
+                        let monster_dmg = self.monsters[index].damage() as i16;
+                        let player_dmg = player.damage();
+                        self.monsters[index].decrease_life(player_dmg);
+                        player.change_life(-monster_dmg);
+
+                        messages.insert(
+                            0,
+                            format!(
+                                "{} hits you for {} damage.",
+                                self.monsters[index].get_name(),
+                                monster_dmg
+                            )
+                            .to_string(),
+                        );
+                        messages.insert(
+                            0,
+                            format!(
+                                "you hit {} for {} damage.",
+                                self.monsters[index].get_name(),
+                                player_dmg
+                            )
+                            .to_string(),
+                        );
+                        // if the attack did not kill the opponent, back down
+                        if !player.is_dead() {
+                            self.monsters[index].get_position().change(-dx, -dy);
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+        for (index, m) in &mut self.monsters.iter().enumerate() {
+            if m.is_dead() {
+                self.monsters.remove(index);
+                break;
+            }
+        }
+    }
+
+    pub fn can_monster_move(&self, agent: &dyn Monster, dx: i16, dy: i16) -> bool {
+        let agent_pos = agent.get_immutable_position();
+        let new_x: usize = (agent_pos.get_x() as i16 + dx) as usize;
+        let new_y: usize = (agent_pos.get_y() as i16 + dy) as usize;
+
+        // verify we cannot leave the playing field
+        if new_x >= LEVEL_WIDTH || new_y >= LEVEL_HEIGHT {
+            return false;
+        }
+
+        for index in 0..self.monsters.len() {
+            let pos = self.monsters[index].get_immutable_position();
+            if pos.get_x() == new_x && pos.get_y() == new_y {
+                return false;
+            }
+        }
+        self.structure[new_x][new_y] != StructureElement::Wall
+    }
+    pub fn can_player_move(&self, agent: &Player, dx: i16, dy: i16) -> bool {
+        let agent_pos = agent.get_immutable_position();
+        let new_x: usize = (agent_pos.get_x() as i16 + dx) as usize;
+        let new_y: usize = (agent_pos.get_y() as i16 + dy) as usize;
+
+        // verify we cannot leave the playing field
+        if new_x >= LEVEL_WIDTH || new_y >= LEVEL_HEIGHT {
+            return false;
+        }
+
+        self.structure[new_x][new_y] != StructureElement::Wall
+    }
+    #[cfg(test)]
+    pub fn new(level: usize) -> Level {
+        let mut s = [[StructureElement::Wall; LEVEL_HEIGHT]; LEVEL_WIDTH];
+        for x in 2..LEVEL_WIDTH - 2 {
+            for y in 2..LEVEL_HEIGHT - 2 {
+                s[x][y] = StructureElement::Floor;
+            }
+        }
+        Level {
+            level,
+            structure: s,
+            discovered: [[false; LEVEL_HEIGHT]; LEVEL_WIDTH],
+            monsters: Vec::with_capacity(10),
+            artifacts: Vec::with_capacity(10),
+            start: (0, 0),
+            end: (0, 0),
+            rng: rand::thread_rng(),
+        }
+    }
+    #[cfg(test)]
+    pub fn add_monster(&mut self, mut monster: impl Monster + 'static) -> Result<(), String> {
+        if self.level != monster.get_position().get_level() {
+            return Err("Wrong Level".to_string());
+        }
+        for m in &mut self.monsters {
+            if m.get_position() == monster.get_position() {
+                return Err("Position already used".to_string());
+            }
+        }
+        self.monsters.push(Box::new(monster));
+        Ok(())
+    }
+    #[cfg(test)]
+    pub fn add_artifact(&mut self, artifact: impl Artifact + 'static) -> Result<(), String> {
+        if self.level != artifact.get_immutable_position().get_level() {
+            return Err("Wrong Level".to_string());
+        }
+        for a in &mut self.artifacts {
+            if a.get_immutable_position() == artifact.get_immutable_position() {
+                return Err("Position already used".to_string());
+            }
+        }
+        self.artifacts.push(Box::new(artifact));
+        Ok(())
+    }
 }
 
 #[test]
 fn test_get_element() {
-    let l = Level::new();
+    let mut l = Level::new(0);
-    assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Wall);
+    assert_eq!(l.get_element(-1, -1).0, None);
-    assert_eq!(l.get_element(4, 4).0.unwrap(), StructureElement::StairDown);
+    assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Unknown);
-    assert_eq!(l.get_element(49, 24).0.unwrap(), StructureElement::Wall);
+    assert_eq!(
-    assert_eq!(l.get_element(50, 25).0, None);
+        l.get_element(LEVEL_WIDTH as i16 - 1, LEVEL_HEIGHT as i16 - 1)
+            .0
+            .unwrap(),
+        StructureElement::Unknown
+    );
+    assert_eq!(
+        l.get_element(LEVEL_WIDTH as i16, LEVEL_HEIGHT as i16).0,
+        None
+    );
+}
+
+#[test]
+fn test_discover_get_element() {
+    let mut l = Level::new(0);
+    assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Unknown);
+    let p = Position::new(0, 10, 10);
+    l.discover(&p);
+    assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
+    assert_eq!(l.get_element(9, 10).0.unwrap(), StructureElement::Floor);
+    assert_eq!(l.get_element(10, 9).0.unwrap(), StructureElement::Floor);
+    assert_eq!(l.get_element(11, 10).0.unwrap(), StructureElement::Floor);
+    assert_eq!(l.get_element(10, 11).0.unwrap(), StructureElement::Floor);
+}
+
+#[test]
+fn test_discover_can_add_monster() {
+    let mut l = Level::new(0);
+    let m = Rat::new_with_position(Position::new(1, 2, 3));
+    assert_eq!(l.add_monster(m), Err("Wrong Level".to_string()));
+
+    let mut m = Orc::new_with_position(Position::new(0, 2, 3));
+    m.get_position().set(0, 2, 3);
+    assert_eq!(l.add_monster(m), Ok(()));
+
+    let m = Rat::new_with_position(Position::new(0, 2, 3));
+    assert_eq!(l.add_monster(m), Err("Position already used".to_string()));
+
+    let m = Rat::new_with_position(Position::new(0, 2, 4));
+    assert_eq!(l.add_monster(m), Ok(()));
+}
+
+#[test]
+fn test_discover_can_add_artifact() {
+    let mut l = Level::new(0);
+    let a = Chest::new(Position::new(1, 2, 3));
+    assert_eq!(l.add_artifact(a), Err("Wrong Level".to_string()));
+
+    let a = Chest::new(Position::new(0, 2, 3));
+    assert_eq!(l.add_artifact(a), Ok(()));
+
+    let a = Potion::new(Position::new(0, 2, 3));
+    assert_eq!(l.add_artifact(a), Err("Position already used".to_string()));
+
+    let a = Chest::new(Position::new(0, 1, 3));
+    assert_eq!(l.add_artifact(a), Ok(()));
+}
+
+#[test]
+fn test_discover_get_monster() {
+    let mut l = Level::new(0);
+    let p = Position::new(0, 10, 10);
+    l.discover(&p);
+    assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
+    assert!(l.get_element(10, 10).1.is_none());
+
+    let m = Rat::new_with_position(Position::new(0, 10, 10));
+    assert_eq!(l.add_monster(m), Ok(()));
+
+    let elem = l.get_element(10, 10);
+    assert_eq!(elem.0.unwrap(), StructureElement::Floor);
+    assert!(elem.1.is_some());
+    let m = elem.1.unwrap();
+    assert_eq!(m.get_life(), 2);
+
+    m.decrease_life(2);
+    assert_eq!(l.get_element(10, 10).1.unwrap().get_life(), 0);
+}
+
+#[test]
+fn test_discover_get_artifact() {
+    let mut l = Level::new(0);
+    let p = Position::new(0, 10, 10);
+    l.discover(&p);
+    assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
+    assert!(l.get_element(10, 10).2.is_none());
+
+    let a = Chest::new(Position::new(0, 10, 10));
+    assert_eq!(l.add_artifact(a), Ok(()));
+
+    let elem = l.get_element(10, 10);
+    assert_eq!(elem.0.unwrap(), StructureElement::Floor);
+    assert!(elem.2.is_some());
+}
+
+#[test]
+fn test_discover_get_monster_can_move() {
+    let mut l = Level::new(0);
+    let p = Position::new(0, 10, 10);
+    l.discover(&p);
+
+    let m = Rat::new_with_position(Position::new(0, 10, 10));
+    l.add_monster(m).expect("Panic because of");
+
+    let m = l.get_element(10, 10).1.unwrap();
+    m.get_position().change(1, 1);
+
+    let m = l.get_element(10, 10).1;
+    assert!(m.is_none());
+    let m = l.get_element(11, 11).1;
+    assert!(m.is_some());
+    assert_eq!(m.unwrap().get_life(), 2);
 }

src/level_generator.rs

@@ -6,19 +6,22 @@ use petgraph::data::*;
 use petgraph::graph::Graph;
 use petgraph::graph::UnGraph;
 use rand::prelude::SliceRandom;
-use rand::Rng;
 use rand::rngs::ThreadRng;
+use rand::Rng;
 
-use crate::level::{Artifact, Level, StructureElement};
+use crate::artifacts::{Artifact, Chest, Potion};
-use crate::monster::Monster;
+use crate::level::{Level, StructureElement};
+use crate::monster::{Monster, Orc, Rat, Snake};
+use crate::position::Position;
 
 const ROOMS_VERTICAL: usize = 7;
 const ROOMS_HORIZONTAL: usize = 4;
+
 const ROOM_WIDTH: usize = 7;
 const ROOM_HEIGHT: usize = 6;
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(PartialEq, Copy, Clone)]
-pub enum RoomType {
+enum RoomType {
     Start,
     End,
     StairUp,
@@ -29,13 +32,13 @@ pub enum RoomType {
     EmptyRoom,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone)]
 struct ConnectionInfo {
     offset: usize,
     distance: usize,
 }
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone)]
 struct Room {
     pub kind: RoomType,
     pub offset_x: usize,
@@ -44,7 +47,6 @@ struct Room {
     pub height: usize,
     pub connection_down: Option<ConnectionInfo>,
     pub connection_right: Option<ConnectionInfo>,
-    // pub connected: bool,
 }
 
 impl Room {
@@ -76,13 +78,13 @@ impl Room {
     }
 }
 
-#[derive(Debug)]
 pub struct LevelGenerator {
     rooms: [[Room; ROOMS_HORIZONTAL]; ROOMS_VERTICAL],
+    level: usize,
 }
 
 impl LevelGenerator {
-    pub fn generate(level: usize) -> Self {
+    pub fn generate(level: usize, first: bool, last: bool) -> Self {
         let mut rng = rand::thread_rng();
         let mut rooms = [[Room::new(); ROOMS_HORIZONTAL]; ROOMS_VERTICAL];
         let mut graph = UnGraph::<(usize, usize), u16>::default();
@@ -91,39 +93,41 @@ impl LevelGenerator {
         rooms[0][0].kind = RoomType::BasicRoom;
 
         while !LevelGenerator::rooms_connectable(&rooms) {
-            let mut room_types: Vec<RoomType> = Vec::with_capacity(ROOMS_HORIZONTAL * ROOMS_VERTICAL);
+            let mut room_types: Vec<RoomType> =
+                Vec::with_capacity(ROOMS_HORIZONTAL * ROOMS_VERTICAL);
             // level 0 contains a start room, all others contain a stair up
-            if level == 0 {
+            if first {
                 room_types.push(RoomType::Start);
             } else {
                 room_types.push(RoomType::StairUp);
             }
             // level 24 (the last) contains an end room, all others a stair down
-            if level == 24 {
+            if last {
                 room_types.push(RoomType::End);
             } else {
                 room_types.push(RoomType::StairDown);
             }
             room_types.push(RoomType::MonsterRoom);
+            room_types.push(RoomType::TreasureRoom);
             // generate a random set of rooms and shuffle them
             for _ in room_types.len()..ROOMS_HORIZONTAL * ROOMS_VERTICAL {
                 match rng.gen_range(1..=100) {
                     // TODO tune room type distribution
-                    1..=33 => { room_types.push(RoomType::EmptyRoom) }
+                    1..=33 => room_types.push(RoomType::EmptyRoom),
-                    34..=66 => { room_types.push(RoomType::TreasureRoom) }
+                    34..=66 => room_types.push(RoomType::TreasureRoom),
-                    67..=90 => { room_types.push(RoomType::MonsterRoom) }
+                    67..=90 => room_types.push(RoomType::MonsterRoom),
-                    _ => { room_types.push(RoomType::BasicRoom) }
+                    _ => room_types.push(RoomType::BasicRoom),
                 }
             }
             room_types.shuffle(&mut rng);
 
             graph.clear();
             // place the rooms in the array an add nodes to the graph for every non empty room
-            for c in 0..ROOMS_VERTICAL {
+            for (c, rs) in rooms.iter_mut().enumerate().take(ROOMS_VERTICAL) {
-                for r in 0..ROOMS_HORIZONTAL {
+                for (r, room) in rs.iter_mut().enumerate().take(ROOMS_HORIZONTAL) {
-                    rooms[c][r].kind = room_types.pop().unwrap();
+                    room.kind = room_types.pop().unwrap();
-                    if rooms[c][r].kind != RoomType::EmptyRoom {
+                    if room.kind != RoomType::EmptyRoom {
-                        rooms[c][r].random(&mut rng);
+                        room.random(&mut rng);
                         graph.add_node((c, r));
                     }
                 }
@@ -139,15 +143,21 @@ impl LevelGenerator {
                 let src_index = graph.node_indices().find(|i| graph[*i] == (c, r)).unwrap();
                 for r_1 in r + 1..ROOMS_HORIZONTAL {
                     if rooms[c][r_1].kind != RoomType::EmptyRoom {
-                        let tgt_index = graph.node_indices().find(|i| graph[*i] == (c, r_1)).unwrap();
+                        let tgt_index = graph
+                            .node_indices()
+                            .find(|i| graph[*i] == (c, r_1))
+                            .unwrap();
                         // todo use random weight for edge
                         graph.add_edge(src_index, tgt_index, 1);
                         break;
                     }
                 }
-                for c_1 in c + 1..ROOMS_VERTICAL {
+                for (c_1, rs) in rooms.iter().enumerate().take(ROOMS_VERTICAL).skip(c + 1) {
-                    if rooms[c_1][r].kind != RoomType::EmptyRoom {
+                    if rs[r].kind != RoomType::EmptyRoom {
-                        let tgt_index = graph.node_indices().find(|i| graph[*i] == (c_1, r)).unwrap();
+                        let tgt_index = graph
+                            .node_indices()
+                            .find(|i| graph[*i] == (c_1, r))
+                            .unwrap();
                         // todo use random weight for edge
                         graph.add_edge(src_index, tgt_index, 1);
                         break;
@@ -157,7 +167,8 @@ impl LevelGenerator {
         }
 
         // calculate a minimum spanning tree
-        let mst: Graph<(usize, usize), u16, petgraph::Undirected> = Graph::from_elements(min_spanning_tree(&graph));
+        let mst: Graph<(usize, usize), u16, petgraph::Undirected> =
+            Graph::from_elements(min_spanning_tree(&graph));
         for edge in mst.raw_edges() {
             let src = mst[edge.source()];
             let tgt = mst[edge.target()];
@@ -167,24 +178,31 @@ impl LevelGenerator {
 
             // cols are the same, either up or down
             if src.0 == tgt.0 {
-                let range = LevelGenerator::range_overlap(src_room.get_x_range(), tgt_room.get_x_range());
+                let range =
-                let position: usize;
+                    LevelGenerator::range_overlap(src_room.get_x_range(), tgt_room.get_x_range());
-                if range.is_empty() {
+                let position: usize = if range.is_empty() {
-                    position = range.start;
+                    range.start
                 } else {
-                    position = rng.gen_range(range);
+                    rng.gen_range(range)
-                }
+                };
                 if src.1 < tgt.1 {
                     // src to tgt
-                    rooms[src.0][src.1].connection_down = Some(ConnectionInfo { offset: position, distance: tgt.1 - src.1 });
+                    rooms[src.0][src.1].connection_down = Some(ConnectionInfo {
+                        offset: position,
+                        distance: tgt.1 - src.1,
+                    });
                 } else {
                     // tgt to src
-                    tgt_room.connection_down = Some(ConnectionInfo { offset: position, distance: src.1 - tgt.1 });
+                    tgt_room.connection_down = Some(ConnectionInfo {
+                        offset: position,
+                        distance: src.1 - tgt.1,
+                    });
                 }
             }
             // rows are the same, either left or right
             if src.1 == tgt.1 {
-                let range = LevelGenerator::range_overlap(src_room.get_y_range(), tgt_room.get_y_range());
+                let range =
+                    LevelGenerator::range_overlap(src_room.get_y_range(), tgt_room.get_y_range());
                 let mut position: usize;
                 if range.is_empty() {
                     position = range.start;
@@ -196,17 +214,21 @@ impl LevelGenerator {
                 }
                 if src.0 < tgt.0 {
                     // src to tgt
-                    rooms[src.0][src.1].connection_right = Some(ConnectionInfo { offset: position, distance: tgt.0 - src.0 });
+                    rooms[src.0][src.1].connection_right = Some(ConnectionInfo {
+                        offset: position,
+                        distance: tgt.0 - src.0,
+                    });
                 } else {
                     // tgt to src
-                    tgt_room.connection_right = Some(ConnectionInfo { offset: position, distance: src.1 - tgt.1 });
+                    tgt_room.connection_right = Some(ConnectionInfo {
+                        offset: position,
+                        distance: src.1 - tgt.1,
+                    });
                 }
             }
         }
 
-        LevelGenerator {
+        LevelGenerator { rooms, level }
-            rooms
-        }
     }
 
     fn range_overlap(r1: Range<usize>, r2: Range<usize>) -> Range<usize> {
@@ -220,8 +242,8 @@ impl LevelGenerator {
             for r in 0..ROOMS_HORIZONTAL {
                 if rooms[c][r].kind != RoomType::EmptyRoom {
                     let mut connected = 0;
-                    for c1 in 0..ROOMS_VERTICAL {
+                    for room in rooms.iter().take(ROOMS_VERTICAL) {
-                        if rooms[c1][r].kind != RoomType::EmptyRoom {
+                        if room[r].kind != RoomType::EmptyRoom {
                             connected += 1;
                         }
                     }
@@ -236,13 +258,14 @@ impl LevelGenerator {
                 }
             }
         }
-        return true;
+        true
     }
     pub fn render(&self) -> Level {
         let mut rng = rand::thread_rng();
-        let mut structure = [[StructureElement::Wall; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
+        let mut structure = [[StructureElement::Wall; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT];
-        let mut artifacts = [[None; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
+            1 + ROOMS_VERTICAL * ROOM_WIDTH];
-        let mut enemies = [[None; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH];
+        let mut artifacts: Vec<Box<dyn Artifact>> = Vec::with_capacity(10);
+        let mut enemies: Vec<Box<dyn Monster>> = Vec::with_capacity(10);
         let mut start_x: usize = 0;
         let mut start_y: usize = 0;
         let mut end_x: usize = 0;
@@ -254,21 +277,49 @@ impl LevelGenerator {
                 let room = self.rooms[c][r];
                 for x in 0..room.width {
                     for y in 0..room.height {
-                        structure[left + room.offset_x + x][top + room.offset_y + y] = StructureElement::Floor;
+                        structure[left + room.offset_x + x][top + room.offset_y + y] =
+                            StructureElement::Floor;
                     }
                 }
                 if room.kind == RoomType::TreasureRoom {
                     let t_x = left + room.offset_x + rng.gen_range(0..room.width);
                     let t_y = top + room.offset_y + rng.gen_range(0..room.height);
-                    artifacts[t_x][t_y] = Some(Artifact::Chest { gold: rng.gen_range(2..30) });
+                    // TODO randomize artifacts
+                    match rng.gen_range(1..=100) {
+                        1..=50 => {
+                            artifacts
+                                .push(Box::new(Chest::new(Position::new(self.level, t_x, t_y))));
+                        }
+                        _ => {
+                            artifacts
+                                .push(Box::new(Potion::new(Position::new(self.level, t_x, t_y))));
+                        }
+                    };
                 }
                 if room.kind == RoomType::MonsterRoom {
                     let t_x = left + room.offset_x + rng.gen_range(0..room.width);
                     let t_y = top + room.offset_y + rng.gen_range(0..room.height);
                     // TODO randomize enemies here
-                    enemies[t_x][t_y] = Some(Monster::new(2));
+                    match rng.gen_range(1..=100) {
+                        1..=30 => {
+                            enemies.push(Box::new(Orc::new_with_position(Position::new(
+                                self.level, t_x, t_y,
+                            ))));
                         }
-                if room.kind == RoomType::StairDown {
+                        31..=60 => {
+                            enemies.push(Box::new(Snake::new_with_position(Position::new(
+                                self.level, t_x, t_y,
+                            ))));
+                        }
+                        _ => {
+                            enemies.push(Box::new(Rat::new_with_position(Position::new(
+                                self.level, t_x, t_y,
+                            ))));
+                        }
+                    };
+                }
+
+                if room.kind == RoomType::End || room.kind == RoomType::StairDown {
                     end_x = left + room.offset_x + rng.gen_range(0..room.width);
                     end_y = top + room.offset_y + rng.gen_range(0..room.height);
                 }
@@ -278,6 +329,7 @@ impl LevelGenerator {
                 if room.kind == RoomType::End {
                     structure[end_x][end_y] = StructureElement::End;
                 }
+
                 if room.kind == RoomType::Start || room.kind == RoomType::StairUp {
                     start_x = left + room.offset_x + rng.gen_range(0..room.width);
                     start_y = top + room.offset_y + rng.gen_range(0..room.height);
@@ -298,7 +350,10 @@ impl LevelGenerator {
                     let tgt_room = self.rooms[c][r + x_conn.distance];
                     let top = 1 + r * ROOM_HEIGHT + src_room.offset_y;
                     let left = 1 + c * ROOM_WIDTH + x_conn.offset;
-                    let bottom = 1 + (r + x_conn.distance) * ROOM_HEIGHT + tgt_room.offset_y + tgt_room.height;
+                    let bottom = 1
+                        + (r + x_conn.distance) * ROOM_HEIGHT
+                        + tgt_room.offset_y
+                        + tgt_room.height;
                     for i in top..bottom {
                         if structure[left][i] == StructureElement::Wall {
                             structure[left][i] = StructureElement::Floor;
@@ -310,31 +365,37 @@ impl LevelGenerator {
 
                     let top = 1 + r * ROOM_HEIGHT + src_room.offset_y + y_conn.offset - 1;
                     let left = 1 + c * ROOM_WIDTH + src_room.offset_x;
-                    let right = 1 + (c + y_conn.distance) * ROOM_WIDTH + tgt_room.offset_x + tgt_room.width;
+                    let right =
-                    for i in left..right {
+                        1 + (c + y_conn.distance) * ROOM_WIDTH + tgt_room.offset_x + tgt_room.width;
-                        if structure[i][top] == StructureElement::Wall {
+                    for room in structure.iter_mut().take(right).skip(left) {
-                            structure[i][top] = StructureElement::Floor;
+                        if room[top] == StructureElement::Wall {
+                            room[top] = StructureElement::Floor;
                         }
                     }
                 }
             }
         }
         Level {
+            level: self.level,
             structure,
-            discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH],
+            discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT];
+                1 + ROOMS_VERTICAL * ROOM_WIDTH],
+            monsters: enemies,
             artifacts,
-            enemies,
+            start: (start_x, start_y),
-            start_x,
+            end: (end_x, end_y),
-            start_y,
+            rng: rand::thread_rng(),
-            end_x,
-            end_y,
         }
     }
 }
 
 #[test]
 fn test_level_gen() {
-    let level = LevelGenerator::generate(0);
+    let level = LevelGenerator::generate(23, false, false).render();
-    println!("{:?}", level);
+    assert_eq!(level.level, 23);
-    assert_eq!(1, 2);
+    assert_ne!(level.start, (0, 0));
+    assert_ne!(level.end, (0, 0));
+    assert_ne!(level.start, level.end);
+    assert_ne!(level.monsters.len(), 0);
+    assert_ne!(level.artifacts.len(), 0);
 }

src/level_widget.rs

@@ -1,111 +1,52 @@
-use ratatui::prelude::*;
+use ratatui::buffer::Buffer;
-use ratatui::widgets::Widget;
+use ratatui::layout::Rect;
+use ratatui::style::Color;
+use ratatui::widgets::{StatefulWidget, Widget};
 
 use crate::game::Game;
-use crate::level::{Artifact, Level, StructureElement};
+use crate::level::StructureElement;
+use crate::position::HasPosition;
 
 const FG_BROWN: Color = Color::Rgb(186, 74, 0);
 
-//⌂ α Ω
+pub struct LevelWidget {}
-pub struct LevelWidget<'a> {
-    pub game: &'a Game,
-}
 
-impl<'a> LevelWidget<'a> {
+impl LevelWidget {
     fn set_cell(&self, buf: &mut Buffer, x: u16, y: u16, symbol: &str, fg: Color, bg: Color) {
-        buf.
+        buf[(x, y)].set_symbol(symbol).set_bg(bg).set_fg(fg);
-            get_mut(x, y).
-            set_symbol(symbol).
-            set_bg(bg).
-            set_fg(fg);
-    }
-
-    fn calculate_wall(top: Option<StructureElement>, right: Option<StructureElement>, bottom: Option<StructureElement>, left: Option<StructureElement>) -> String {
-        let mut val = 0;
-        val += match top {
-            Some(n) => {
-                match n {
-                    StructureElement::Wall => 1,
-                    _ => 0
-                }
-            }
-            None => 0
-        };
-        val += match right {
-            Some(n) => {
-                match n {
-                    StructureElement::Wall => 2,
-                    _ => 0
-                }
-            }
-            None => 0
-        };
-        val += match bottom {
-            Some(n) => {
-                match n {
-                    StructureElement::Wall => 4,
-                    _ => 0
-                }
-            }
-            None => 0
-        };
-        val += match left {
-            Some(n) => {
-                match n {
-                    StructureElement::Wall => 8,
-                    _ => 0
-                }
-            }
-            None => 0
-        };
-        [
-            "╋", "┃", "━", "┗",
-            "┃", "┃", "┏", "┣",
-            "━", "┛", "━", "┻",
-            "┓", "┫", "┳", "╋",
-        ][val].to_string()
     }
 }
 
-impl<'a> Widget for LevelWidget<'a> {
+impl StatefulWidget for LevelWidget {
-    fn render(self, area: Rect, buf: &mut Buffer) {
+    type State = Game;
-        let player = &self.game.player;
-        let player_pos = player.get_position();
-        let level: &Level = &self.game.levels[player_pos.get_level()];
 
+    fn render(self, area: Rect, buf: &mut Buffer, state: &mut Self::State) {
         let al: u16 = area.left();
         let at: u16 = area.top();
 
+        {
+            let player = state.get_mutable_player();
+            let player_pos = player.get_immutable_position();
+            let player_level = player_pos.get_level();
+
             // draw the level elements
             for x in al..area.right() {
                 for y in at..area.bottom() {
+                    let level = state.get_mutable_level(player_level);
                     let level_x = (x - al) as i16;
                     let level_y = (y - at) as i16;
                     match level.get_element(level_x, level_y) {
-                    (None, _, _) => {}
+                        (Some(structure_element), None, None) => {
-                    (_, Some(e), _) => {
+                            match structure_element {
-                        match e {
+                                StructureElement::Start => {
-                            Artifact::Chest { gold: _ } => {
+                                    self.set_cell(buf, x, y, "α", Color::Black, Color::Gray);
-                                self.set_cell(buf, x, y, "⌂", Color::Black, Color::Gray);
                                 }
+                                StructureElement::End => {
+                                    self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
                                 }
-                    }
-                    (_, _, Some(e)) => {
-                        match e {
-                            Ene => {
-                                self.set_cell(buf, x, y, "R", Color::Black, Color::Gray);
-                            }
-                        }
-                    }
-                    (Some(e), _, _) => {
-                        match e {
                                 StructureElement::Wall => {
-                                let top = level.get_element(level_x, level_y - 1).0;
+                                    // TODO add fancy walls
-                                let right = level.get_element(level_x + 1, level_y).0;
+                                    self.set_cell(buf, x, y, "#", FG_BROWN, Color::Gray);
-                                let bottom = level.get_element(level_x, level_y + 1).0;
-                                let left = level.get_element(level_x - 1, level_y).0;
-                                let symbol = LevelWidget::calculate_wall(top, right, bottom, left);
-                                self.set_cell(buf, x, y, symbol.as_str(), FG_BROWN, Color::Gray);
                                 }
                                 StructureElement::Floor => {
                                     self.set_cell(buf, x, y, " ", FG_BROWN, Color::Gray);
@@ -119,63 +60,31 @@ impl<'a> Widget for LevelWidget<'a> {
                                 StructureElement::Unknown => {
                                     self.set_cell(buf, x, y, "▒", Color::DarkGray, Color::Gray);
                                 }
-                            StructureElement::Start => {
-                                self.set_cell(buf, x, y, "α", Color::Black, Color::Gray);
                             }
-                            StructureElement::End => {
+                        }
-                                self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
+                        (_, Some(m), _) => {
+                            let (s, c) = m.get_representation();
+                            self.set_cell(buf, x, y, s, c, Color::Gray);
+                        }
+                        (_, _, Some(t)) => {
+                            let (s, c) = t.get_representation();
+                            self.set_cell(buf, x, y, s, c, Color::Gray);
+                        }
+                        (None, None, None) => {}
+                    };
                 }
             }
         }
-                }
+        {
-            }
+            let player = state.get_mutable_player();
-        }
+            let player_pos = player.get_immutable_position();
-
-        // draw player
             let player_x = al + player_pos.get_x() as u16;
             let player_y = at + player_pos.get_y() as u16;
             self.set_cell(buf, player_x, player_y, "8", Color::Red, Color::Gray);
         }
+    }
 }
 
-#[test]
+impl Widget for LevelWidget {
-fn test_get_wall_symbol() {
+    fn render(self, _area: Rect, _buf: &mut Buffer) {}
-    let wall = Some(StructureElement::Wall);
-    // 0
-    let s = LevelWidget::calculate_wall(None, None, None, None);
-    assert_eq!(s, "╋");
-    // 15
-    let s = LevelWidget::calculate_wall(wall, wall, wall, wall);
-    assert_eq!(s, "╋");
-
-    // 1
-    let s = LevelWidget::calculate_wall(wall, None, None, None);
-    assert_eq!(s, "┃");
-    // 5
-    let s = LevelWidget::calculate_wall(wall, None, wall, None);
-    assert_eq!(s, "┃");
-    // 4
-    let s = LevelWidget::calculate_wall(None, None, wall, None);
-    assert_eq!(s, "┃");
-
-    // 2
-    let s = LevelWidget::calculate_wall(None, wall, None, None);
-    assert_eq!(s, "━");
-    // 10
-    let s = LevelWidget::calculate_wall(None, wall, None, wall);
-    assert_eq!(s, "━");
-
-    // 9
-    let s = LevelWidget::calculate_wall(wall, None, None, wall);
-    assert_eq!(s, "┛");
-    // 3
-    let s = LevelWidget::calculate_wall(wall, wall, None, None);
-    assert_eq!(s, "┗");
-    // 6
-    let s = LevelWidget::calculate_wall(None, wall, wall, None);
-    assert_eq!(s, "┏");
-    // 12
-    let s = LevelWidget::calculate_wall(None, None, wall, wall);
-    assert_eq!(s, "┓");
 }
-

src/main.rs

@@ -1,53 +1,72 @@
-use std::io::{Result, stdout};
+use std::io::stdout;
+use std::io::Result;
+use std::time::Instant;
 
 use crossterm::{
     event::{self, KeyCode, KeyEventKind},
-    ExecutableCommand,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
-};
+    ExecutableCommand,
-use ratatui::{
-    prelude::{CrosstermBackend, Stylize, Terminal},
-    widgets::Paragraph,
 };
 use ratatui::prelude::*;
-use ratatui::widgets::Block;
+use ratatui::widgets::block::{Position, Title};
+use ratatui::widgets::{Block, BorderType, Borders, Wrap};
+use ratatui::{
+    prelude::{CrosstermBackend, Terminal},
+    widgets::Paragraph,
+};
 use whoami::realname;
 
-use crate::game::Game;
+use crate::game::{Game, GameState};
-use crate::level::Level;
-use crate::level_generator::LevelGenerator;
 use crate::level_widget::LevelWidget;
 use crate::player::Player;
+use crate::position::HasPosition;
 
+mod artifacts;
 mod game;
-mod player;
 mod level;
-mod position;
-mod level_widget;
 mod level_generator;
+mod level_widget;
 mod monster;
+mod player;
+mod position;
 
+/// length of a game frame in ms
+pub const FRAME_LENGTH: u64 = 100;
+
+//
 fn main() -> Result<()> {
-    let mut levels: [Level; 25] = [Level::new(); 25];
+    let mut game = Game::new(Player::new(realname().as_str(), 30));
-    for l in 0..25 {
-        levels[l] = LevelGenerator::generate(l).render();
-    }
-    let mut g = Game {
-        player: Player::new(realname().as_str(), 10),
-        levels,
-    };
-
-    g.move_player(levels[0].start_x as i16, levels[0].start_y as i16);
 
     stdout().execute(EnterAlternateScreen)?;
     enable_raw_mode()?;
     let mut terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
     terminal.clear()?;
 
+    let start_time = Instant::now();
+    let mut ticks = 0;
     loop {
         terminal.draw(|frame| {
-            let mut area = frame.size();
+            let mut area = frame.area();
-            frame.render_widget(Block::default().style(Style::default().bg(Color::Green)), area);
+            frame.render_widget(
+                Block::default().style(Style::default().bg(Color::Green)),
+                area,
+            );
+
+            // don't draw stuff except an info box if the terminal is too small (less than 80x25)
+            // to prevent the read drawing code from crashing the game.
+            if area.width < 80 || area.height < 25 {
+                let block = Block::default()
+                    .title("Info")
+                    .borders(Borders::ALL)
+                    .border_style(Style::default().fg(Color::White))
+                    .border_type(BorderType::Rounded)
+                    .style(Style::default().bg(Color::Black));
+                let paragraph = Paragraph::new("Terminal needs to be at leas 80x25!")
+                    .block(block)
+                    .wrap(Wrap { trim: true });
+                frame.render_widget(paragraph, area);
+                return;
+            }
 
             if area.width > 80 {
                 area.x = (area.width - 80) / 2;
@@ -64,50 +83,151 @@ fn main() -> Result<()> {
                 width: level::LEVEL_WIDTH as u16,
                 height: level::LEVEL_HEIGHT as u16,
             };
-            frame.render_widget(LevelWidget { game: &g }, map_area);
+            frame.render_stateful_widget(LevelWidget {}, map_area, &mut game);
 
             let stats_area = Rect {
                 x: area.x + 50,
                 y: area.y,
                 width: 30,
-                height: 25,
+                height: 15,
             };
+            let block = Block::default()
+                .title(
+                    Title::from(format!(" {} ", game.get_player().get_name()))
+                        .alignment(Alignment::Center)
+                        .position(Position::Top),
+                )
+                .borders(Borders::TOP)
+                .border_style(Style::default().fg(Color::White))
+                .border_type(BorderType::Rounded)
+                .style(Style::default().bg(Color::Blue));
             frame.render_widget(
-                Paragraph::new(format!("{}\nHealth: {}/{}\nGold: {}\nLevel: {}",
+                Paragraph::new(format!(
-                                       g.player.get_name(),
+                    "Health: {}/{}\nExp: {}\nGold: {}\nLevel: {}",
-                                       g.player.get_life(),
+                    game.get_player().get_life(),
-                                       g.player.get_max_life(),
+                    game.get_player().get_max_life(),
-                                       g.player.get_gold(),
+                    game.get_player().get_experience(),
-                                       g.player.get_position().get_level()))
+                    game.get_player().get_gold(),
-                    .white()
+                    game.get_player().get_immutable_position().get_level()+1
-                    .on_blue(),
+                ))
+                .block(block)
+                .wrap(Wrap { trim: true }),
                 stats_area,
             );
+            let messages_area = Rect {
+                x: area.x + 50,
+                y: area.y + 15,
+                width: 30,
+                height: 10,
+            };
+            // Display the latest messages from the game to the user
+            let block = Block::default()
+                .title(
+                    Title::from(" messages ")
+                        .alignment(Alignment::Center)
+                        .position(Position::Top),
+                )
+                .borders(Borders::TOP)
+                .border_style(Style::default().fg(Color::White))
+                .border_type(BorderType::Rounded)
+                .style(Style::default().bg(Color::Blue));
+
+            let paragraph1 = if game.messages.is_empty() {
+                "".to_string()
+            } else {
+                format!("> {}", game.messages.join("\n> "))
+            };
+            frame.render_widget(
+                Paragraph::new(paragraph1)
+                    .block(block)
+                    .wrap(Wrap { trim: true }),
+                messages_area,
+            );
         })?;
+        if event::poll(std::time::Duration::from_millis(FRAME_LENGTH))? {
+            if let event::Event::Key(key) = event::read()? {
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('v') {
+                    game.messages.insert(
+                        0,
+                        format!("You are playing version '{}'.", env!("GIT_HASH")).to_string(),
+                    );
+                }
+                if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') {
+                    break;
+                }
+                if key.kind == KeyEventKind::Press {
+                    let new_pos = match key.code {
+                        KeyCode::Left => game.move_player(-1, 0),
+                        KeyCode::Right => game.move_player(1, 0),
+                        KeyCode::Up => game.move_player(0, -1),
+                        KeyCode::Down => game.move_player(0, 1),
+                        _ => (0, 0),
+                    };
+                    if !game.player_fights_monster() {
+                        // player attacked monster but did not kill it
+                        game.move_player(new_pos.0, new_pos.1);
+                    }
+                    game.player_collects_artifact();
+                }
+            }
+        }
+        game.update_level(ticks);
+        if game.get_game_state() != GameState::Running {
+            break;
+        }
+        ticks += 1;
+    }
+    let playtime = start_time.elapsed();
+    loop {
+        let _ = terminal.draw(|frame| {
+            let mut area = frame.area();
+            let w = area.width / 2;
+            let h = area.height / 2;
+            area.x += w - 20;
+            area.y += h - 10;
+            area.width = 40;
+            area.height = 20;
+            let block = Block::default()
+                .title(
+                    Title::from(" Game ended ")
+                        .alignment(Alignment::Center)
+                        .position(Position::Top),
+                )
+                .title(Title::from("Press `q` to quit!").position(Position::Bottom))
+                .borders(Borders::ALL)
+                .border_style(Style::default().fg(Color::White))
+                .border_type(BorderType::Rounded)
+                .style(Style::default().bg(Color::Black));
+            let mut text = match game.get_game_state() {
+                GameState::Running => {
+                    "Quitting is for cowards! You'll better try again!".to_string()
+                }
+                GameState::Lost => {
+                    "Sorry, you died in the dungeon. Better luck next time!".to_string()
+                }
+                GameState::Won => {
+                    "Congratulation! You mastered your way through the dungeon and won the game."
+                        .to_string()
+                }
+            };
+            text += format!(
+                "\nYou gained {} experience.",
+                game.get_player().get_experience()
+            )
+            .as_str();
+            text += format!("\nYou collected {} gold.", game.get_player().get_gold()).as_str();
+            text += format!("\nYou played {} seconds.", playtime.as_secs()).as_str();
+            let paragraph = Paragraph::new(text).block(block).wrap(Wrap { trim: true });
+            frame.render_widget(paragraph, area);
+        });
         if event::poll(std::time::Duration::from_millis(16))? {
             if let event::Event::Key(key) = event::read()? {
                 if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') {
                     break;
                 }
-                if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('d') {
-                    ;
-                }
-                if key.kind == KeyEventKind::Press && key.code == KeyCode::Left {
-                    g.move_player(-1, 0);
-                }
-                if key.kind == KeyEventKind::Press && key.code == KeyCode::Right {
-                    g.move_player(1, 0);
-                }
-                if key.kind == KeyEventKind::Press && key.code == KeyCode::Up {
-                    g.move_player(0, -1);
-                }
-                if key.kind == KeyEventKind::Press && key.code == KeyCode::Down {
-                    g.move_player(0, 1);
             }
         }
     }
-    }
-
     stdout().execute(LeaveAlternateScreen)?;
     disable_raw_mode()?;
     Ok(())

src/monster.rs

@@ -1,20 +1,129 @@
-use std::cmp::{max, min};
+use std::ops::RangeInclusive;
 
-use crate::position::Position;
+use rand::Rng;
+use ratatui::prelude::Color;
 
-#[derive(Copy, Clone, Debug, PartialEq)]
+use crate::position::{HasPosition, Position};
-pub struct Monster {
+
+pub trait Monster: HasPosition {
+    fn get_name(&self) -> &str;
+    fn is_dead(&self) -> bool;
+    fn get_representation(&self) -> (&str, Color);
+    fn decrease_life(&mut self, by: usize);
+    // fn get_immutable_position(&self) -> &Position;
+    fn get_experience_gain(&self) -> usize;
+    fn get_ticks_between_steps(&self) -> u128;
+    #[cfg(test)]
+    fn get_life(&self) -> usize;
+    fn damage(&self) -> usize;
+}
+
+macro_rules! create_monster {
+    ($($t:ident),+ $(,)?) => ($(
+        pub struct $t {
+            name: String,
             life: usize,
+            position: Position,
+            symbol: String,
+            color: Color,
+            experience_gain: usize,
+            ticks_between_steps: u128,
+            damage_range: RangeInclusive<usize>,
+        }
+        impl Monster for $t {
+            fn get_name(&self) -> &str { &self.name }
+            fn is_dead(&self) -> bool { self.life <= 0 }
+            fn get_experience_gain(&self) -> usize { self.experience_gain }
+            fn get_representation(&self) -> (&str, Color) { (&self.symbol, self.color) }
+            fn decrease_life(&mut self, by: usize) {
+                self.life = self.life.saturating_sub(by);
+            }
+            fn get_ticks_between_steps(&self) -> u128 { self.ticks_between_steps }
+            fn damage(&self) -> usize { rand::thread_rng().gen_range(self.damage_range.clone()) }
+
+            #[cfg(test)]
+            fn get_life(&self) -> usize { self.life }
+        }
+        impl HasPosition for $t {
+            fn get_position(&mut self) -> &mut Position {
+                &mut self.position
+            }
+            fn get_immutable_position(&self) -> &Position {
+                &self.position
+            }
+        }
+    )+)
 }
 
-impl Monster {
+impl Rat {
-    pub fn new(life: usize) -> Monster {
+    pub fn new_with_position(position: Position) -> Self {
-        Monster {
+        Self {
-            life,
+            name: "rat".to_string(),
+            life: 2,
+            position,
+            symbol: String::from("R"),
+            color: Color::Black,
+            experience_gain: 5,
+            ticks_between_steps: 5,
+            damage_range: 1..=2,
         }
     }
-    pub fn get_life(&self) -> usize { self.life }
+}
-    pub fn decrease_life(&mut self, by: i16) {
+create_monster!(Rat);
-        self.life = max(0, (self.life as i16 - by) as usize);
+
-    }
+impl Orc {
+    pub fn new_with_position(position: Position) -> Self {
+        Self {
+            name: "orc".to_string(),
+            life: 4,
+            position,
+            symbol: String::from("O"),
+            color: Color::DarkGray,
+            experience_gain: 10,
+            ticks_between_steps: 10,
+            damage_range: 2..=3,
+        }
+    }
+}
+create_monster!(Orc);
+
+impl Snake {
+    pub fn new_with_position(position: Position) -> Self {
+        Self {
+            name: "snake".to_string(),
+            life: 3,
+            position,
+            symbol: String::from("S"),
+            color: Color::DarkGray,
+            experience_gain: 10,
+            ticks_between_steps: 20,
+            damage_range: 1..=4,
+        }
+    }
+}
+create_monster!(Snake);
+
+#[test]
+fn monsters_can_move() {
+    let mut m = Rat::new_with_position(Position::new(0, 0, 0));
+    assert_eq!(m.get_position(), &Position::new(0, 0, 0));
+    m.get_position().change(1, 2);
+    assert_eq!(m.get_position(), &Position::new(0, 1, 2));
+    m.get_position().change(2, 1);
+    assert_eq!(m.get_position(), &Position::new(0, 3, 3));
+    m.get_position().set(1, 2, 3);
+    m.get_position().change(2, 1);
+    assert_eq!(m.get_position(), &Position::new(1, 4, 4));
+}
+
+#[test]
+fn monsters_can_die() {
+    let mut m = Rat::new_with_position(Position::new(0, 0, 0));
+    assert_eq!(m.get_life(), 2);
+    assert_eq!(m.is_dead(), false);
+    m.decrease_life(1);
+    assert_eq!(m.get_life(), 1);
+    m.decrease_life(2);
+    assert_eq!(m.get_life(), 0);
+    assert_eq!(m.is_dead(), true);
 }

src/player.rs

@@ -1,48 +1,78 @@
+use rand::Rng;
 use std::cmp::{max, min};
 
-use crate::position::Position;
+use crate::position::{HasPosition, Position};
 
 pub struct Player {
     name: String,
     position: Position,
+    life: i16,
+    max_life: i16,
     gold: usize,
-    life: usize,
+    experience: usize,
-    max_life: usize,
 }
 
 impl Player {
-    pub fn new(name: &str, max_life: usize) -> Player {
+    pub fn new(name: &str, max_life: i16) -> Player {
         Player {
             name: name.to_string(),
             position: Position::new(0, 0, 0),
-            gold: 0,
             life: max_life,
             max_life,
+            gold: 0,
+            experience: 0,
         }
     }
     pub fn get_name(&self) -> String {
-        return self.name.clone();
+        self.name.clone()
     }
-    pub fn get_life(&self) -> usize { self.life }
-    pub fn get_max_life(&self) -> usize { self.max_life }
-    pub fn get_gold(&self) -> usize { self.gold }
-    pub fn add_gold(&mut self, amount: usize) { self.gold += amount; }
     pub fn change_life(&mut self, by: i16) {
-        self.life = max(0,
+        self.life = max(0, min(self.max_life, self.life + by));
-                        min(self.max_life,
-                            (self.life as i16 + by) as usize,
-                        ),
-        );
     }
-    pub fn get_position(&self) -> Position {
+    pub fn get_life(&self) -> i16 {
-        self.position
+        self.life
     }
-    pub fn change_position(&mut self, dx: i16, dy: i16) {
+    /// returns true if the player is dead (life <= 0)
-        self.position.change(dx, dy);
+    pub fn is_dead(&self) -> bool {
+        self.life <= 0
+    }
+    /// returns true if the player's life is at maximum
+    pub fn is_healthy(&self) -> bool {
+        self.life == self.max_life
+    }
+    pub fn get_max_life(&self) -> i16 {
+        self.max_life
     }
 
-    pub fn set_position(&mut self, level: usize, x: usize, y: usize) {
+    /// add the given amount to the players gold stash
-        self.position.set(level, x, y);
+    pub fn retrieve_gold(&mut self, amount: usize) {
+        self.gold += amount
+    }
+
+    /// return the size of the players gold stash
+    pub fn get_gold(&self) -> usize {
+        self.gold
+    }
+
+    pub fn gain_experience(&mut self, amount: usize) {
+        self.experience += amount
+    }
+
+    pub fn get_experience(&self) -> usize {
+        self.experience
+    }
+
+    pub fn damage(&self) -> usize {
+        rand::thread_rng().gen_range(1..4)
+    }
+}
+
+impl HasPosition for Player {
+    fn get_position(&mut self) -> &mut Position {
+        &mut self.position
+    }
+    fn get_immutable_position(&self) -> &Position {
+        &self.position
     }
 }
 
@@ -51,27 +81,66 @@ fn test_get_name() {
     let p = Player {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
-        gold: 0,
         life: 5,
         max_life: 10,
+        gold: 0,
+        experience: 0,
     };
     assert_eq!(p.get_name(), "Teddy Tester");
 }
 
+#[test]
+fn test_can_receive_gold() {
+    let mut p = Player::new("Teddy Tester", 10);
+    assert_eq!(p.get_gold(), 0);
+
+    p.retrieve_gold(13);
+    p.retrieve_gold(10);
+    assert_eq!(p.get_gold(), 23);
+}
+
 #[test]
 fn test_change_life() {
     let mut p = Player {
         name: "Teddy Tester".to_string(),
         position: Position::new(0, 1, 1),
-        gold: 0,
         life: 5,
         max_life: 10,
+        gold: 0,
+        experience: 0,
     };
-    assert_eq!(p.life, 5);
+    assert_eq!(p.get_life(), 5);
     p.change_life(-2);
-    assert_eq!(p.life, 3);
+    assert_eq!(p.get_life(), 3);
     p.change_life(10);
-    assert_eq!(p.life, 10);
+    assert_eq!(p.get_life(), 10);
     p.change_life(-12);
-    assert_eq!(p.life, 0);
+    assert_eq!(p.get_life(), 0);
+}
+
+#[test]
+fn player_can_move() {
+    let mut p = Player::new("Teddy Tester", 10);
+    assert_eq!(p.get_position(), &Position::new(0, 0, 0));
+    p.get_position().change(1, 2);
+    assert_eq!(p.get_position(), &Position::new(0, 1, 2));
+    p.get_position().change(2, 1);
+    assert_eq!(p.get_position(), &Position::new(0, 3, 3));
+    p.get_position().set(1, 2, 3);
+    p.get_position().change(2, 1);
+    assert_eq!(p.get_position(), &Position::new(1, 4, 4));
+    assert_eq!(p.get_immutable_position(), &Position::new(1, 4, 4));
+}
+
+#[test]
+fn test_max_life() {
+    let p = Player {
+        name: "Teddy Tester".to_string(),
+        position: Position::new(0, 1, 1),
+        life: 5,
+        max_life: 10,
+        gold: 0,
+        experience: 0,
+    };
+    assert_eq!(p.get_max_life(), 10);
 }

src/position.rs

@@ -1,4 +1,14 @@
-#[derive(Copy, Clone, Debug, PartialEq)]
+use std::cmp::max;
+
+/// describes an character (PC or NPC) in the dungeon that has a position.
+pub trait HasPosition {
+    /// returns a mutable position
+    fn get_position(&mut self) -> &mut Position;
+    /// returns an immutable position
+    fn get_immutable_position(&self) -> &Position;
+}
+
+#[derive(PartialEq, Debug)]
 pub struct Position {
     level: usize,
     x: usize,
@@ -7,13 +17,20 @@ pub struct Position {
 
 impl Position {
     pub fn new(level: usize, x: usize, y: usize) -> Self {
-        Self {
+        Self { level, x, y }
-            level,
-            x,
-            y,
     }
+    pub fn change(&mut self, dx: i16, dy: i16) -> (usize, usize) {
+        self.x = max((self.x as i16) + dx, 0) as usize;
+        self.y = max((self.y as i16) + dy, 0) as usize;
+        (self.x, self.y)
     }
-    pub fn get_level(&self) -> usize{
+    pub fn set(&mut self, level: usize, x: usize, y: usize) {
+        self.level = level;
+        self.x = x;
+        self.y = y;
+    }
+
+    pub fn get_level(&self) -> usize {
         self.level
     }
 
@@ -24,14 +41,34 @@ impl Position {
     pub fn get_y(&self) -> usize {
         self.y
     }
-
+}
-    pub fn change(&mut self, dx: i16, dy: i16) {
+
-        self.x = ((self.x as i16) + dx) as usize;
+#[test]
-        self.y = ((self.y as i16) + dy) as usize;
+fn test_position_change() {
-    }
+    let mut p = Position::new(0, 10, 10);
-    pub fn set(&mut self, level: usize, x: usize, y:usize) {
+
-        self.level = level;
+    let res = p.change(-1, 1);
-        self.x = x;
+    assert_eq!(res, (9, 11));
-        self.y = y;
+    assert_eq!(p.get_x(), 9);
-    }
+    assert_eq!(p.get_y(), 11);
+
+    let res = p.change(-9, 1);
+    assert_eq!(res, (0, 12));
+    assert_eq!(p.get_x(), 0);
+    assert_eq!(p.get_y(), 12);
+
+    let res = p.change(-1, -13);
+    assert_eq!(res, (0, 0));
+    assert_eq!(p.get_x(), 0);
+    assert_eq!(p.get_y(), 0);
+}
+
+#[test]
+fn test_position_set() {
+    let mut p = Position::new(0, 10, 10);
+
+    p.set(1, 2, 3);
+    assert_eq!(p.get_level(), 1);
+    assert_eq!(p.get_x(), 2);
+    assert_eq!(p.get_y(), 3);
 }