43 Commits

Author SHA1 Message Date
1c6e5d26d0 Show manual
extract playing the game and the manual from main
2024-01-23 09:56:31 +01:00
4a31994ac9 add a basic manual 2024-01-22 20:47:35 +01:00
a7195b9c3d adjust monster speed 2024-01-19 10:39:15 +01:00
970904c411 Monsters move after the player moved
this allows direct counter attack or fleeing
2024-01-19 10:39:05 +01:00
32fffd492d Fog of War can be disabled in dev builds 2024-01-19 10:10:52 +01:00
119a3d314a clean up some warnings 2024-01-14 13:31:40 +01:00
5265682c53 Show last message on death 2024-01-14 13:21:20 +01:00
efe531f6ce movement depends on monster class now 2024-01-10 16:40:46 +01:00
0b08cb41c2 more work on dungeon slayer 2024-01-10 11:00:23 +01:00
cad08bd300 Player and monster attacks follow the dungeon slayer rules 2024-01-06 13:02:31 +01:00
0431d872e4 using character and monster sheets 2024-01-06 10:38:34 +01:00
1f02ffc36e update ratatui 2024-01-06 10:35:37 +01:00
210d590e38 prevent player from leaving the field 2024-01-03 09:12:00 +01:00
e4018d9cce remove unused import 2024-01-01 15:34:52 +01:00
f6bb0a9297 version can be displayed as message 2023-12-31 18:10:09 +01:00
b6d61e4bd1 Merge remote-tracking branch 'origin/include_git_hash' into add_messages 2023-12-31 17:45:42 +01:00
85496e3200 make git commit hash available at compile time 2023-12-31 17:41:59 +01:00
4770a21abe for changes to add messages 2023-12-31 15:59:52 +01:00
a69e89c806 Only consume potions if they have an effect 2023-12-30 16:44:23 +01:00
b3d64f7438 Monsters can attack player now 2023-12-30 16:31:27 +01:00
b88bc67c50 monsters move and attack the player 2023-12-26 19:11:41 +01:00
2098bedabe make monsters more like players 2023-12-26 11:38:23 +01:00
c0d51f501f extract has_position trait 2023-12-25 13:47:15 +01:00
bb8a24aa91 clean up monsters 2023-12-25 13:26:45 +01:00
67faae44b1 Prevent crashes when terminal is too small 2023-12-25 08:44:44 +01:00
de5ea76913 step to xp 2023-12-22 20:10:30 +01:00
6082a740e9 make chest's gold depend on level 2023-12-22 09:52:50 +01:00
db96dc5c8a Add gold to the result message 2023-12-21 23:13:13 +01:00
2a86201c3e add 3 distinct outcomes for the game 2023-12-21 23:02:06 +01:00
6b6206370b Make enemies randomized 2023-12-18 17:04:48 +01:00
73315a7636 monsters as trait 2023-12-18 16:11:19 +01:00
7ac3b76e6c add some documentation 2023-12-17 22:00:42 +01:00
f87712e8d2 clean up code 2023-12-17 19:48:58 +01:00
8b21e179c2 fight monsters, collect artifacts 2023-12-17 16:14:17 +01:00
User Jlusiardi
643f3b76f9 More work 2023-12-09 22:43:06 +01:00
206a49fb08 reworked level widget to stateful widget 2023-12-09 20:16:03 +01:00
6e2441aad1 give different artifacts differen looks 2023-12-09 20:05:39 +01:00
4a024a47d9 randomize artifact generation 2023-12-09 17:39:26 +01:00
e47036bd8d more tests 2023-12-09 08:43:41 +01:00
7b0eaf6640 add test & fix bug 2023-12-06 21:02:40 +01:00
6aee9d974f Move works again 2023-12-06 03:18:59 +01:00
21a292b7ad make stuff public 2023-12-05 17:13:39 +01:00
aa3fa6efb1 Work on levelgenerator 2023-12-04 18:41:21 +01:00
13 changed files with 2198 additions and 217 deletions

400
Cargo.lock generated
View File

@@ -20,6 +20,54 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
[[package]]
name = "anstream"
version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
[[package]]
name = "anstyle-parse"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
]
[[package]]
name = "autocfg"
version = "1.1.0"
@@ -38,6 +86,12 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]]
name = "bumpalo"
version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]]
name = "cassowary"
version = "0.3.0"
@@ -50,6 +104,52 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "4.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
dependencies = [
"clap_builder",
"clap_derive",
]
[[package]]
name = "clap_builder"
version = "4.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
]
[[package]]
name = "clap_derive"
version = "4.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.38",
]
[[package]]
name = "clap_lex"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "crossterm"
version = "0.27.0"
@@ -85,8 +185,35 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
name = "el_diabolo"
version = "0.1.0"
dependencies = [
"clap",
"crossterm",
"petgraph",
"rand",
"ratatui",
"whoami",
]
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "fixedbitset"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "getrandom"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
dependencies = [
"cfg-if",
"libc",
"wasi",
]
[[package]]
@@ -105,6 +232,16 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "indexmap"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
dependencies = [
"equivalent",
"hashbrown",
]
[[package]]
name = "indoc"
version = "2.0.4"
@@ -113,13 +250,22 @@ checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
[[package]]
name = "itertools"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
dependencies = [
"either",
]
[[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"
@@ -160,7 +306,7 @@ dependencies = [
"libc",
"log",
"wasi",
"windows-sys",
"windows-sys 0.48.0",
]
[[package]]
@@ -189,7 +335,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
"windows-targets",
"windows-targets 0.48.5",
]
[[package]]
@@ -198,6 +344,22 @@ version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "petgraph"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
"indexmap",
]
[[package]]
name = "ppv-lite86"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "proc-macro2"
version = "1.0.69"
@@ -217,10 +379,40 @@ dependencies = [
]
[[package]]
name = "ratatui"
version = "0.24.0"
name = "rand"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha",
"rand_core",
]
[[package]]
name = "rand_chacha"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom",
]
[[package]]
name = "ratatui"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb"
dependencies = [
"bitflags 2.4.1",
"cassowary",
@@ -229,6 +421,7 @@ dependencies = [
"itertools",
"lru",
"paste",
"stability",
"strum",
"unicode-segmentation",
"unicode-width",
@@ -291,6 +484,22 @@ version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
[[package]]
name = "stability"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce"
dependencies = [
"quote",
"syn 1.0.109",
]
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strum"
version = "0.25.0"
@@ -310,7 +519,18 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn",
"syn 2.0.38",
]
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
@@ -342,6 +562,12 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "version_check"
version = "0.9.4"
@@ -354,6 +580,80 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[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",
]
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.38",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
]
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
[[package]]
name = "web-sys"
version = "0.3.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "whoami"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
dependencies = [
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "winapi"
version = "0.3.9"
@@ -382,7 +682,16 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets",
"windows-targets 0.48.5",
]
[[package]]
name = "windows-sys"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
"windows-targets 0.52.0",
]
[[package]]
@@ -391,13 +700,28 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc",
"windows_aarch64_gnullvm 0.48.5",
"windows_aarch64_msvc 0.48.5",
"windows_i686_gnu 0.48.5",
"windows_i686_msvc 0.48.5",
"windows_x86_64_gnu 0.48.5",
"windows_x86_64_gnullvm 0.48.5",
"windows_x86_64_msvc 0.48.5",
]
[[package]]
name = "windows-targets"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
dependencies = [
"windows_aarch64_gnullvm 0.52.0",
"windows_aarch64_msvc 0.52.0",
"windows_i686_gnu 0.52.0",
"windows_i686_msvc 0.52.0",
"windows_x86_64_gnu 0.52.0",
"windows_x86_64_gnullvm 0.52.0",
"windows_x86_64_msvc 0.52.0",
]
[[package]]
@@ -406,42 +730,84 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
[[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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
[[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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
[[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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
[[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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
[[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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
[[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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "zerocopy"
version = "0.7.19"
@@ -459,5 +825,5 @@ checksum = "56feebc4664bdb37f39c0b1b8fc8fa2f5648e3ec5f9cf4344978b4b7ca561fff"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn 2.0.38",
]

View File

@@ -6,5 +6,9 @@ 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.25.0"
crossterm = "0.27.0"
rand = "0.8.5"
petgraph = "0.6.4"
whoami = "1.4.1"
clap = { version = "4.4.11", features = ["derive"] }

7
build.rs Normal file
View File

@@ -0,0 +1,7 @@
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);
}

View File

@@ -1,12 +1,17 @@
use crate::position::Position;
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);
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 {
@@ -17,19 +22,30 @@ pub struct Chest {
impl Chest {
pub fn new(position: Position) -> Self {
let level = position.get_level();
Self {
position,
gold: 10,
// 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) {
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 {
@@ -48,9 +64,24 @@ impl Potion {
}
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) {
player.change_life(self.health.try_into().unwrap());
self.health = 0;
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.increase_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
}
}

150
src/dungeon_slayer.rs Normal file
View File

@@ -0,0 +1,150 @@
use rand::Rng;
pub fn do_challenge(stat: u8) -> (bool, u8) {
if stat <= 20 {
let mut rng = rand::thread_rng();
let dice_roll = rng.gen_range(1..21);
return match dice_roll {
20 => { (false, 0) }
1 => { (true, dice_roll) }
_ => {
if dice_roll <= stat {
(true, stat - dice_roll)
} else {
(false, 0)
}
}
};
}
(false, 0)
}
#[allow(dead_code)]
pub struct PlayerStats {
// dungeon slayer attributes
pub(crate) body: u8,
pub(crate) agility: u8,
pub(crate) mind: u8,
// dungeon slayer properties
// for body
pub(crate) strength: u8,
pub(crate) toughness: u8,
// for agility
pub(crate) movement: u8,
pub(crate) dexterity: u8,
// for mind
pub(crate) wisdom: u8,
// TODO maybe the wrong translation of Verstand
pub(crate) aura: u8,
}
impl PlayerStats {
/// create random values for the 3 attributes of the dungeon slayer character
/// Each attribute is between 4 and 8, not over 20 in sum.
fn create_random_attributes() -> (u8, u8, u8) {
let mut values: [u8; 3] = [8, 8, 8];
let mut rng = rand::thread_rng();
while values[0] + values[1] + values[2] > 20 {
let i = rng.gen_range(0..3);
values[i] = values[i].saturating_sub(1);
}
(values[0], values[1], values[2])
}
/// create random values for the 6 properties of the dungeon slayer character
/// Each property is between 0 and 4, not over 8 in sum.
fn create_random_properties() -> (u8, u8, u8, u8, u8, u8) {
let mut values: [u8; 6] = [4, 4, 4, 4, 4, 4];
let mut rng = rand::thread_rng();
while values[0] + values[1] + values[2] + values[3] + values[4] + values[5] > 8 {
let i = rng.gen_range(0..6);
values[i] = values[i].saturating_sub(1);
}
(values[0], values[1], values[2], values[3], values[4], values[5])
}
/// create a set of player stats containing attributes and properties according to the
/// dungeon slayer rules.
pub fn create_random() -> PlayerStats {
let attributes = PlayerStats::create_random_attributes();
let properties = PlayerStats::create_random_properties();
PlayerStats {
body: attributes.0,
agility: attributes.1,
mind: attributes.2,
strength: properties.0,
toughness: properties.1,
movement: properties.2,
dexterity: properties.3,
wisdom: properties.4,
aura: properties.5,
}
}
/// calculate the max life based on this player stats.
pub fn get_max_life(&self) -> u8 {
self.body + self.toughness + 10
}
pub fn get_defense(&self) -> u8 {
self.body + self.toughness // TODO + self.armor
}
pub fn get_hit(&self) -> u8 {
self.body + self.strength // TODO + self.weapon
}
}
#[allow(dead_code)]
pub struct MonsterStats {
// dungeon slayer attributes
pub(crate) body: u8,
pub(crate) agility: u8,
pub(crate) mind: u8,
// dungeon slayer properties
// for body
pub(crate) strength: u8,
pub(crate) toughness: u8,
// for agility
pub(crate) movement: u8,
pub(crate) dexterity: u8,
// for mind
pub(crate) wisdom: u8,
// TODO maybe the wrong translation of Verstand
pub(crate) aura: u8,
pub(crate) max_life: u8,
pub(crate) defense: u8,
pub(crate) initiative: u8,
pub(crate) walk: u8,
pub(crate) hit: u8,
pub(crate) shoot: u8,
pub(crate) cast: u8,
pub(crate) targeted_cast: u8,
}
#[test]
fn test_create_random_attributes() {
for _ in 0..1000 {
let attributes = PlayerStats::create_random_attributes();
assert!(attributes.0 <= 8);
assert!(attributes.1 <= 8);
assert!(attributes.2 <= 8);
assert_eq!(attributes.0 + attributes.1 + attributes.2, 20);
}
}
#[test]
fn test_create_random_properties() {
for _ in 0..1000 {
let properties = PlayerStats::create_random_properties();
assert!(properties.0 <= 4);
assert!(properties.1 <= 4);
assert!(properties.2 <= 4);
assert!(properties.3 <= 4);
assert!(properties.4 <= 4);
assert!(properties.5 <= 4);
assert_eq!(properties.0 + properties.1 + properties.2 + properties.3 + properties.4 + properties.5, 8);
}
}

View File

@@ -1,23 +1,287 @@
use crate::level::Level;
use crate::dungeon_slayer::do_challenge;
#[cfg(test)]
use crate::dungeon_slayer::PlayerStats;
use crate::level::{Level, StructureElement};
use crate::level_generator::LevelGenerator;
use crate::player::Player;
use crate::position::{HasPosition, Position};
pub const LEVELS: usize = 2;
pub const LEVELS: usize = 10;
pub struct Game<'game> {
pub player: &'game mut Player,
pub levels: Vec<Level>,
#[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,
}
impl Game<'_> {
pub fn new(p: &mut Player) -> Game {
/// the main structure to hold all information about the ongoing game
pub struct Game {
/// the player
player: Player,
/// the levels of the game
levels: Vec<Level>,
pub messages: Vec<String>,
use_fog_of_war: bool,
}
impl Game {
pub fn new(p: Player) -> Game {
let mut v: Vec<Level> = Vec::with_capacity(LEVELS);
for d in 0..LEVELS {
let l = Level::new(d);
v.push(l);
v.push(LevelGenerator::generate(d, d == 0, d == LEVELS - 1).render());
}
Game {
let mut g = Game {
player: p,
levels: v,
messages: Vec::with_capacity(10),
use_fog_of_war: true,
};
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) => {
match 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 toggle_fog_of_war(&mut self) { self.use_fog_of_war = !self.use_fog_of_war; }
pub fn uses_fog_of_war(&self) -> bool { self.use_fog_of_war }
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 player_level = player_pos.get_level();
let level = &mut self.levels[player_level];
level.get_element(new_x, new_y, self.use_fog_of_war).0
}
/// move the game's player into the given direction. If on the target field there is a stair,
/// the player follows the stair up/down to the next level.
/// 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();
let mut player_level = player_pos.get_level();
let structure = self.next_element(dx, dy);
// use stairs if walked onto one
match structure {
Some(e) => {
match e {
StructureElement::StairDown => {
(dx, dy) = (0, 0);
let (next_level, x, y) = self.next_start();
player_level = next_level;
self.messages.insert(0, format!("You climb down to level {}.", next_level));
self.get_mutable_player().get_position().set(next_level, x, y);
}
StructureElement::StairUp => {
(dx, dy) = (0, 0);
let (next_level, x, y) = self.prev_end();
player_level = next_level;
self.messages.insert(0, format!("You climb up to level {}.", next_level));
self.get_mutable_player().get_position().set(next_level, x, y);
}
_ => {}
}
}
_ => {}
}
// update position and discover area on new position
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, true);
match m {
None => {}
Some(m) => {
// Player attacks monster
let attack = do_challenge(self.player.player_stats.get_hit());
if attack.0 {
let mut damage = attack.1;
let defense = do_challenge(m.get_defense());
if defense.0 {
damage = damage.saturating_sub(defense.1);
}
self.messages.insert(0, format!("Attack on {} successful with {} damage.", m.get_name(), damage).to_string());
m.decrease_life(damage as usize);
} else {
self.messages.insert(0, format!("Attack on {} failed.", m.get_name()).to_string());
}
// monster died, player gains experience
if m.is_dead() {
self.player.gain_experience(m.get_experience_gain());
self.messages.insert(0, format!("You killed the {}.", m.get_name()).to_string());
}
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, true);
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.
/// ticks is measuring the progress of the game even if the player is not moving, player_moved
/// indicates the player moved
pub fn update_level(&mut self, ticks: u128, player_moved: bool) {
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, player_moved, &mut self.player, &mut self.messages);
}
}
#[test]
fn game_has_correct_number_of_levels() {
let player_stats = PlayerStats {
body: 8,
agility: 8,
mind: 4,
strength: 3,
toughness: 3,
movement: 1,
dexterity: 1,
wisdom: 0,
aura: 0,
};
let p = Player::new("foo", player_stats);
let g = Game::new(p);
assert_eq!(g.levels.len(), LEVELS);
}
#[test]
fn game_has_player() {
let player_stats = PlayerStats {
body: 8,
agility: 8,
mind: 4,
strength: 3,
toughness: 3,
movement: 1,
dexterity: 1,
wisdom: 0,
aura: 0,
};
let p = Player::new("foo", player_stats);
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 player_stats = PlayerStats {
body: 8,
agility: 8,
mind: 4,
strength: 3,
toughness: 3,
movement: 1,
dexterity: 1,
wisdom: 0,
aura: 0,
};
let p = Player::new("foo", player_stats);
let mut g = Game::new(p);
assert_eq!(g.get_player().get_name(), "foo");
g.get_mutable_player().decrease_life(1);
assert_eq!(g.get_player().get_life(), 20);
}
#[test]
fn game_get_level() {
let player_stats = PlayerStats {
body: 8,
agility: 8,
mind: 4,
strength: 3,
toughness: 3,
movement: 1,
dexterity: 1,
wisdom: 0,
aura: 0,
};
let p = Player::new("foo", player_stats);
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));
}

View File

@@ -1,6 +1,14 @@
use std::cmp::{max, min};
use crate::artifacts::{Artifact, Chest, Potion};
#[cfg(test)]
use crate::artifacts::{Chest, Potion};
use crate::artifacts::Artifact;
use crate::dungeon_slayer::do_challenge;
#[cfg(test)]
use crate::monster::{Orc, Rat};
use crate::monster::Monster;
use crate::player::Player;
use crate::position::HasPosition;
use crate::position::Position;
pub const LEVEL_WIDTH: usize = 50;
@@ -8,6 +16,8 @@ pub const LEVEL_HEIGHT: usize = 25;
#[derive(Copy, Clone, Debug, PartialEq)]
pub enum StructureElement {
Start,
End,
Wall,
Floor,
StairDown,
@@ -16,30 +26,19 @@ pub enum StructureElement {
}
pub struct Level {
level: usize,
structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
monsters: Vec<Monster>,
artifacts: Vec<Box<dyn Artifact>>,
pub(crate) level: usize,
pub(crate) structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
pub(crate) discovered: [[bool; LEVEL_HEIGHT]; LEVEL_WIDTH],
pub(crate) monsters: Vec<Box<dyn Monster>>,
pub(crate) artifacts: Vec<Box<dyn Artifact>>,
/// the position of the start in the level (either stair up or start point)
pub(crate) start: (usize, usize),
/// the position of the end in the level (either stair down or end point)
pub(crate) end: (usize, usize),
}
impl Level {
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),
}
}
pub fn get_element(&mut self, x: i16, y: i16) -> (Option<StructureElement>, Option<&mut Monster>, Option<&mut Box<(dyn Artifact + 'static)>>) {
pub fn get_element(&mut self, x: i16, y: i16, use_fog_of_war: bool) -> (Option<StructureElement>, Option<&mut Box<(dyn Monster + 'static)>>, Option<&mut Box<(dyn Artifact + 'static)>>) {
if x < 0 || y < 0 {
return (None, None, None);
}
@@ -48,11 +47,11 @@ impl Level {
if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
return (None, None, None);
}
if !self.discovered[x][y] {
if use_fog_of_war && !self.discovered[x][y] {
return (Some(StructureElement::Unknown), None, None);
}
let search_pos = &Position::new(self.level, x, y);
let mut res_m: Option<&mut Monster> = None;
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);
@@ -66,58 +65,6 @@ impl Level {
}
(Some(self.structure[x][y]), res_m, res_a)
}
pub fn add_monster(&mut self, mut monster: Monster) -> 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(monster);
Ok(())
}
pub fn remove_dead_monster(&mut self, position: &Position) -> Result<(), String> {
if self.level != position.get_level() {
return Err("Wrong Level".to_string());
}
for (index, m) in &mut self.monsters.iter().enumerate() {
if m.get_immutable_position() == position {
if !m.is_dead() {
return Err("Monster not dead".to_string());
}
self.monsters.remove(index);
break;
}
}
Ok(())
}
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(())
}
pub fn remove_artifact(&mut self, position: &Position) -> Result<(), String> {
if self.level != position.get_level() {
return Err("Wrong Level".to_string());
}
for (index, a) in &mut self.artifacts.iter().enumerate() {
if a.get_immutable_position() == position {
self.monsters.remove(index);
break;
}
}
Ok(())
}
/// discover the area with in the level around the given position
pub fn discover(&mut self, pos: &Position) {
let x = pos.get_x();
@@ -162,47 +109,170 @@ impl Level {
}
}
}
pub fn update(&mut self, ticks: u128, player_moved: bool, 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 the player moved, the monsters move as well all the time
if !player_moved && ticks % self.monsters[index].get_ticks_between_steps() != 0 {
continue;
}
loop {
// calculate the direction the monster will try to walk
let (dx, dy) = self.monsters[index].get_next_move(&self, player.get_immutable_position());
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 monster attacks
let attack = do_challenge(self.monsters[index].get_hit());
if attack.0 {
let mut damage = attack.1;
let defense = do_challenge(player.player_stats.get_defense());
if defense.0 {
damage = damage.saturating_sub(defense.1);
}
player.decrease_life(damage);
if player.is_dead() {
messages.insert(0, format!("Attack from {} killed you.", self.monsters[index].get_name()).to_string());
} else {
messages.insert(0, format!("Attack from {} successful with {} damage.", self.monsters[index].get_name(), damage).to_string());
}
} else {
messages.insert(0, format!("Attack from {} failed.", self.monsters[index].get_name()).to_string());
}
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),
}
}
#[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 mut l = Level::new(0);
assert_eq!(l.get_element(-1, -1).0, None);
assert_eq!(l.get_element(0, 0).0.unwrap(), StructureElement::Unknown);
assert_eq!(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);
assert_eq!(l.get_element(-1, -1, true).0, None);
assert_eq!(l.get_element(0, 0, true).0.unwrap(), StructureElement::Unknown);
assert_eq!(l.get_element(LEVEL_WIDTH as i16 - 1, LEVEL_HEIGHT as i16 - 1, true).0.unwrap(), StructureElement::Unknown);
assert_eq!(l.get_element(LEVEL_WIDTH as i16, LEVEL_HEIGHT as i16, true).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);
assert_eq!(l.get_element(10, 10, true).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);
assert_eq!(l.get_element(10, 10, true).0.unwrap(), StructureElement::Floor);
assert_eq!(l.get_element(9, 10, true).0.unwrap(), StructureElement::Floor);
assert_eq!(l.get_element(10, 9, true).0.unwrap(), StructureElement::Floor);
assert_eq!(l.get_element(11, 10, true).0.unwrap(), StructureElement::Floor);
assert_eq!(l.get_element(10, 11, true).0.unwrap(), StructureElement::Floor);
}
#[test]
fn test_discover_can_add_monster() {
let mut l = Level::new(0);
let mut m = Monster::new(2);
m.get_position().set(1, 2, 3);
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 = Monster::new(2);
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 mut m = Monster::new(2);
m.get_position().set(0, 2, 3);
let m = Rat::new_with_position(Position::new(0, 2, 3));
assert_eq!(l.add_monster(m), Err("Position already used".to_string()));
let mut m = Monster::new(2);
m.get_position().set(0, 2, 4);
let m = Rat::new_with_position(Position::new(0, 2, 4));
assert_eq!(l.add_monster(m), Ok(()));
}
@@ -227,21 +297,20 @@ 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());
assert_eq!(l.get_element(10, 10, true).0.unwrap(), StructureElement::Floor);
assert!(l.get_element(10, 10, true).1.is_none());
let mut m = Monster::new(23);
m.get_position().set(0, 10, 10);
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);
let elem = l.get_element(10, 10, true);
assert_eq!(elem.0.unwrap(), StructureElement::Floor);
assert!(elem.1.is_some());
let m = elem.1.unwrap();
assert_eq!(m.get_life(), 23);
assert_eq!(m.get_life(), 3);
m.decrease_life(2);
assert_eq!(l.get_element(10, 10).1.unwrap().get_life(), 21);
m.decrease_life(3);
assert_eq!(l.get_element(10, 10, true).1.unwrap().get_life(), 0);
}
#[test]
@@ -249,13 +318,13 @@ 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());
assert_eq!(l.get_element(10, 10, true).0.unwrap(), StructureElement::Floor);
assert!(l.get_element(10, 10, true).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);
let elem = l.get_element(10, 10, true);
assert_eq!(elem.0.unwrap(), StructureElement::Floor);
assert!(elem.2.is_some());
}
@@ -266,33 +335,15 @@ fn test_discover_get_monster_can_move() {
let p = Position::new(0, 10, 10);
l.discover(&p);
let mut m = Monster::new(23);
m.get_position().set(0, 10, 10);
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();
let m = l.get_element(10, 10, true).1.unwrap();
m.get_position().change(1, 1);
let m = l.get_element(10, 10).1;
let m = l.get_element(10, 10, true).1;
assert!(m.is_none());
let m = l.get_element(11, 11).1;
let m = l.get_element(11, 11, true).1;
assert!(m.is_some());
assert_eq!(m.unwrap().get_life(), 23);
}
#[test]
fn test_monster_can_be_removed() {
let mut level = Level::new(0);
level.discover(&Position::new(0, 10, 10));
let mut m = Monster::new(2);
m.get_position().set(0, 10, 10);
level.add_monster(m).expect("Panic because of");
let m = level.get_element(10, 10).1.unwrap();
m.decrease_life(3);
assert_eq!(level.remove_dead_monster(&Position::new(0, 10, 10)), Ok(()));
assert!(level.get_element(10, 10).1.is_none());
assert_eq!(m.unwrap().get_life(), 3);
}

360
src/level_generator.rs Normal file
View File

@@ -0,0 +1,360 @@
use std::cmp::{max, min};
use std::ops::Range;
use petgraph::algo::min_spanning_tree;
use petgraph::data::*;
use petgraph::graph::Graph;
use petgraph::graph::UnGraph;
use rand::prelude::SliceRandom;
use rand::Rng;
use rand::rngs::ThreadRng;
use crate::artifacts::{Artifact, Chest, Potion};
use crate::level::{Level, StructureElement};
use crate::monster::{LowerDaemon, Monster, Rat};
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(PartialEq, Copy, Clone)]
enum RoomType {
Start,
End,
StairUp,
StairDown,
BasicRoom,
TreasureRoom,
MonsterRoom,
EmptyRoom,
}
#[derive(Copy, Clone)]
struct ConnectionInfo {
offset: usize,
distance: usize,
}
#[derive(Copy, Clone)]
struct Room {
pub kind: RoomType,
pub offset_x: usize,
pub offset_y: usize,
pub width: usize,
pub height: usize,
pub connection_down: Option<ConnectionInfo>,
pub connection_right: Option<ConnectionInfo>,
}
impl Room {
fn new() -> Self {
Self {
kind: RoomType::EmptyRoom,
offset_x: 0,
offset_y: 0,
width: 0,
height: 0,
connection_down: None,
connection_right: None,
}
}
/// change the size and position of a room randomly within its bounds
fn random(&mut self, rng: &mut ThreadRng) {
let width = rng.gen_range(3..6);
let height = rng.gen_range(3..5);
self.width = width;
self.height = height;
self.offset_x = rng.gen_range(0..(ROOM_WIDTH - width));
self.offset_y = rng.gen_range(0..(ROOM_HEIGHT - height));
}
fn get_x_range(&self) -> Range<usize> {
self.offset_x..self.offset_x + self.width
}
fn get_y_range(&self) -> Range<usize> {
self.offset_y..self.offset_y + self.height
}
}
pub struct LevelGenerator {
rooms: [[Room; ROOMS_HORIZONTAL]; ROOMS_VERTICAL],
level: usize,
}
impl LevelGenerator {
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();
// trick the room_connectable function into failing on the first iteration
rooms[0][0].kind = RoomType::BasicRoom;
while !LevelGenerator::rooms_connectable(&rooms) {
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 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 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) }
34..=66 => { room_types.push(RoomType::TreasureRoom) }
67..=90 => { room_types.push(RoomType::MonsterRoom) }
_ => { 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 r in 0..ROOMS_HORIZONTAL {
rooms[c][r].kind = room_types.pop().unwrap();
if rooms[c][r].kind != RoomType::EmptyRoom {
rooms[c][r].random(&mut rng);
graph.add_node((c, r));
}
}
}
}
// add edges to the graph connecting each room to all of its neighbours (max 4 of them)
for c in 0..ROOMS_VERTICAL {
for r in 0..ROOMS_HORIZONTAL {
if rooms[c][r].kind == RoomType::EmptyRoom {
continue;
}
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();
// todo use random weight for edge
graph.add_edge(src_index, tgt_index, 1);
break;
}
}
for c_1 in c + 1..ROOMS_VERTICAL {
if rooms[c_1][r].kind != RoomType::EmptyRoom {
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;
}
}
}
}
// calculate a minimum spanning tree
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()];
let src_room = rooms[src.0][src.1];
let mut tgt_room = rooms[tgt.0][tgt.1];
// 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 position: usize;
if range.is_empty() {
position = range.start;
} else {
position = 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 });
} else {
// tgt to src
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 mut position: usize;
if range.is_empty() {
position = range.start;
} else {
position = rng.gen_range(range);
}
if src.1 == 0 && position == 0 {
position = 1;
}
if src.0 < tgt.0 {
// src to tgt
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 });
}
}
}
LevelGenerator {
rooms,
level,
}
}
fn range_overlap(r1: Range<usize>, r2: Range<usize>) -> Range<usize> {
max(r1.start, r2.start)..min(r1.end, r2.end)
}
/// Verifies that for a given matrix of rooms each room has at least one other room in the
/// same row or column.
fn rooms_connectable(rooms: &[[Room; ROOMS_HORIZONTAL]; ROOMS_VERTICAL]) -> bool {
for c in 0..ROOMS_VERTICAL {
for r in 0..ROOMS_HORIZONTAL {
if rooms[c][r].kind != RoomType::EmptyRoom {
let mut connected = 0;
for c1 in 0..ROOMS_VERTICAL {
if rooms[c1][r].kind != RoomType::EmptyRoom {
connected += 1;
}
}
for r1 in 0..ROOMS_HORIZONTAL {
if rooms[c][r1].kind != RoomType::EmptyRoom {
connected += 1;
}
}
if connected <= 2 {
return false;
}
}
}
}
return 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 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;
let mut end_y: usize = 0;
for c in 0..ROOMS_VERTICAL {
for r in 0..ROOMS_HORIZONTAL {
let top = 1 + r * ROOM_HEIGHT;
let left = 1 + c * ROOM_WIDTH;
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;
}
}
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);
// 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
match rng.gen_range(1..=100) {
1..=50 => {
enemies.push(Box::new(LowerDaemon::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);
}
if room.kind == RoomType::StairDown {
structure[end_x][end_y] = StructureElement::StairDown;
}
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);
}
if room.kind == RoomType::StairUp {
structure[start_x][start_y] = StructureElement::StairUp;
}
if room.kind == RoomType::Start {
structure[start_x][start_y] = StructureElement::Start;
}
}
}
//
for c in 0..ROOMS_VERTICAL {
for r in 0..ROOMS_HORIZONTAL {
let src_room = self.rooms[c][r];
if let Some(x_conn) = src_room.connection_down {
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;
for i in top..bottom {
if structure[left][i] == StructureElement::Wall {
structure[left][i] = StructureElement::Floor;
}
}
}
if let Some(y_conn) = src_room.connection_right {
let tgt_room = self.rooms[c + y_conn.distance][r];
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;
for i in left..right {
if structure[i][top] == StructureElement::Wall {
structure[i][top] = StructureElement::Floor;
}
}
}
}
}
Level {
level: self.level,
structure,
discovered: [[false; 1 + ROOMS_HORIZONTAL * ROOM_HEIGHT]; 1 + ROOMS_VERTICAL * ROOM_WIDTH],
monsters: enemies,
artifacts,
start: (start_x, start_y),
end: (end_x, end_y),
}
}
}
#[test]
fn test_level_gen() {
let level = LevelGenerator::generate(23, false, false).render();
assert_eq!(level.level, 23);
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);
}

101
src/level_widget.rs Normal file
View File

@@ -0,0 +1,101 @@
use ratatui::buffer::Buffer;
use ratatui::layout::Rect;
use ratatui::style::Color;
use ratatui::widgets::{StatefulWidget, Widget};
use crate::game::Game;
use crate::level::StructureElement;
use crate::position::HasPosition;
const FG_BROWN: Color = Color::Rgb(186, 74, 0);
pub struct LevelWidget {
use_fog_of_war: bool,
}
impl LevelWidget {
pub fn new(use_fog_of_war: bool) -> Self {
LevelWidget {
use_fog_of_war
}
}
fn set_cell(&self, buf: &mut Buffer, x: u16, y: u16, symbol: &str, fg: Color, bg: Color) {
buf.
get_mut(x, y).
set_symbol(symbol).
set_bg(bg).
set_fg(fg);
}
}
impl StatefulWidget for LevelWidget {
type State = Game;
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, self.use_fog_of_war) {
(Some(structure_element), None, None) => {
match structure_element {
StructureElement::Start => {
self.set_cell(buf, x, y, "α", Color::Black, Color::Gray);
}
StructureElement::End => {
self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
}
StructureElement::Wall => {
// TODO add fancy walls
self.set_cell(buf, x, y, "#", FG_BROWN, Color::Gray);
}
StructureElement::Floor => {
self.set_cell(buf, x, y, " ", FG_BROWN, Color::Gray);
}
StructureElement::StairDown => {
self.set_cell(buf, x, y, ">", Color::Black, Color::Gray);
}
StructureElement::StairUp => {
self.set_cell(buf, x, y, "<", Color::Black, Color::Gray);
}
StructureElement::Unknown => {
self.set_cell(buf, x, y, "", Color::DarkGray, 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();
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);
}
}
}
impl Widget for LevelWidget {
fn render(self, _area: Rect, _buf: &mut Buffer) {}
}

View File

@@ -1,19 +1,298 @@
use crate::game::Game;
use std::cmp::min;
use std::io::{Result, Stdout};
use std::io::stdout;
use std::string::ToString;
use std::time::Instant;
use clap::Parser;
use crossterm::{
event::{self, KeyCode, KeyEventKind},
ExecutableCommand,
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
};
use ratatui::{
prelude::{CrosstermBackend, Terminal},
widgets::Paragraph,
};
use ratatui::prelude::*;
use ratatui::widgets::{Block, Borders, BorderType, Wrap};
use ratatui::widgets::block::{Position, Title};
use whoami::realname;
use crate::dungeon_slayer::PlayerStats;
use crate::game::{Game, GameState};
use crate::level_widget::LevelWidget;
use crate::player::Player;
use crate::position::HasPosition;
mod game;
mod player;
mod level;
mod position;
mod monster;
mod level_widget;
mod level_generator;
mod artifacts;
mod monster;
mod dungeon_slayer;
fn main() {
let mut p = Player::new("Teddy Tester", 10);
let g = Game::new(&mut p);
/// length of a game frame in ms
pub const FRAME_LENGTH: u64 = 100;
println!("{}",g.player.get_name());
println!("{}",g.player.get_life());
g.player.change_life(-1);
println!("{}",g.player.get_life());
#[derive(Parser)]
#[command(author, version, about = "A small game in the tradition of rogue.", long_about = None)]
struct CliOptions {
#[arg(short, long, action)]
manual: bool,
}
//
fn main() -> Result<()> {
let cli_options = CliOptions::parse();
stdout().execute(EnterAlternateScreen)?;
enable_raw_mode()?;
let mut terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
terminal.clear()?;
if cli_options.manual {
show_manual(&mut terminal);
} else {
play_game(&mut terminal)?;
}
stdout().execute(LeaveAlternateScreen)?;
disable_raw_mode()?;
Ok(())
}
/// play the game ;)
fn play_game(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
let player_stats = PlayerStats::create_random();
let mut game = Game::new(Player::new(realname().as_str(), player_stats));
let start_time = Instant::now();
let mut ticks = 0;
loop {
terminal.draw(|frame| {
let mut area = frame.size();
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;
area.width = 80;
}
if area.height > 25 {
area.y = (area.height - 25) / 2;
area.height = 25;
}
let map_area = Rect {
x: area.x,
y: area.y,
width: level::LEVEL_WIDTH as u16,
height: level::LEVEL_HEIGHT as u16,
};
frame.render_stateful_widget(LevelWidget::new(game.uses_fog_of_war()), map_area, &mut game);
let stats_area = Rect {
x: area.x + 50,
y: area.y,
width: 30,
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!("Health: {}/{}\nExp: {}\nGold: {}\nLevel: {}",
game.get_player().get_life(),
game.get_player().get_max_life(),
game.get_player().get_experience(),
game.get_player().get_gold(),
game.get_player().get_immutable_position().get_level()))
.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,
);
})?;
let mut player_moved = false;
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());
}
// disabling the d key (disable fog of war) in release builds!
#[cfg(debug_assertions)]
if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('d') {
game.messages.insert(0, "toggle fog of war!".to_string());
game.toggle_fog_of_war();
}
if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') {
break;
}
if key.kind == KeyEventKind::Press {
let new_pos = match key.code {
KeyCode::Left => {
player_moved = true;
game.move_player(-1, 0)
}
KeyCode::Right => {
player_moved = true;
game.move_player(1, 0)
}
KeyCode::Up => {
player_moved = true;
game.move_player(0, -1)
}
KeyCode::Down => {
player_moved = true;
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, player_moved);
if game.get_game_state() != GameState::RUNNING {
break;
}
ticks += 1;
}
let playtime = start_time.elapsed();
loop {
let _ = terminal.draw(|frame| {
let mut area = frame.size();
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 => {
format!("Sorry, you died in the dungeon. Better luck next time!\nLast message:\n{}", game.messages[0]).to_string()
}
GameState::WON => {
"Congratulation! You mastered your way through the dungeon and won the game.".to_string()
}
};
text += format!("\n\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;
}
}
}
}
Ok(())
}
/// this function shows some manual text
fn show_manual(terminal: &mut Terminal<CrosstermBackend<Stdout>>) {
let mut page = 0;
let pages = [
"Background story\n\n\
You are a traveller and on your journey....
".to_string(),
"To control your character (depicted by the 8) you can use the cursor keys (←, ↑, →, ↓). \n\n\
To interact simply walk into the entity to interact with. Possible entities are creates \
(depicted by C), potions (depicted by P) or enemies.".to_string(),
];
loop {
let _ = terminal.draw(|frame| {
let mut area = frame.size();
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(format!(" Manual ({}/{})", page + 1, pages.len())).alignment(Alignment::Center).position(Position::Top))
.title(Title::from("`q` to quit, `↑` and `↓` to scroll.").position(Position::Bottom))
.borders(Borders::ALL)
.border_style(Style::default().fg(Color::White))
.border_type(BorderType::Rounded)
.style(Style::default().bg(Color::Black));
let paragraph = Paragraph::new(pages[page].as_str()).block(block).wrap(Wrap { trim: true });
frame.render_widget(paragraph, area);
});
if event::poll(std::time::Duration::from_millis(16)).unwrap_or(false) {
if let event::Event::Key(key) = event::read().unwrap() {
if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') {
break;
}
if key.kind == KeyEventKind::Press && key.code == KeyCode::Up {
page = page.saturating_sub(1);
}
if key.kind == KeyEventKind::Press && key.code == KeyCode::Down {
page = min(pages.len() - 1, page + 1);
}
}
}
}
}

View File

@@ -1,33 +1,240 @@
use crate::position::Position;
use ratatui::prelude::Color;
pub struct Monster {
use crate::dungeon_slayer::MonsterStats;
use crate::level::Level;
use crate::position::{HasPosition, Position};
use rand::Rng;
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;
fn get_defense(&self) -> u8;
fn get_hit(&self) -> u8;
fn get_next_move(&self, level: &Level, player_pos: &Position) -> (i16, i16);
#[cfg(test)]
fn get_life(&self) -> usize;
}
macro_rules! default_monster {
($($t:ty),+ $(,)?) => ($(
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 get_defense(&self) -> u8 { self.monster_stats.defense }
fn get_hit(&self) -> u8 { self.monster_stats.hit }
fn get_next_move(&self, level: &Level, player_pos: &Position) -> (i16, i16) {
self.calc_move(level, player_pos)
}
#[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
}
}
)+)
}
/// Lower Daemon
/// Page: 107
/// GH: 1
pub struct LowerDaemon {
name: String,
life: usize,
position: Position,
symbol: String,
color: Color,
experience_gain: usize,
ticks_between_steps: u128,
monster_stats: MonsterStats,
}
impl Monster {
pub fn new(life: usize) -> Self {
Monster {
life,
position: Position::new(0, 0, 0),
impl crate::monster::LowerDaemon {
pub fn new_with_position(position: Position) -> Self {
let monster_stats = MonsterStats {
body: 5,
agility: 5,
mind: 5,
strength: 2,
toughness: 2,
movement: 2,
dexterity: 2,
wisdom: 2,
aura: 2,
max_life: 9,
defense: 9,
initiative: 7,
walk: 3,
hit: 8,
shoot: 0,
cast: 0,
targeted_cast: 0,
};
Self {
name: "lower daemon".to_string(),
life: monster_stats.max_life as usize,
position,
symbol: String::from("d"),
color: Color::Black,
experience_gain: 104,
ticks_between_steps: 30,
monster_stats,
}
}
pub fn get_life(&self) -> usize { self.life }
pub fn is_dead(&self) -> bool { self.life <= 0 }
pub fn decrease_life(&mut self, by: usize) {
self.life = self.life.saturating_sub(by);
}
pub fn get_position(&mut self) -> &mut Position {
&mut self.position
}
pub fn get_immutable_position(&self) -> &Position {
&self.position
fn calc_move(&self, _level: &Level, player_pos: &Position) -> (i16, i16) {
let d = self.position.distance(player_pos);
if d == 1 {
return self.position.get_direction(player_pos);
}
match rand::thread_rng().gen_range(0..5) {
1 => { (1, 0) }
2 => { (-1, 0) }
3 => { (0, 1) }
4 => { (0, -1) }
_ => { (0, 0) }
}
}
}
default_monster!(LowerDaemon);
/// Rat
/// Page: 119
/// GH: 1
pub struct Rat {
name: String,
life: usize,
position: Position,
symbol: String,
color: Color,
experience_gain: usize,
ticks_between_steps: u128,
monster_stats: MonsterStats,
}
impl Rat {
pub fn new_with_position(position: Position) -> Self {
let monster_stats = MonsterStats {
body: 2,
agility: 4,
mind: 1,
strength: 1,
toughness: 0,
movement: 2,
dexterity: 0,
wisdom: 0,
aura: 0,
max_life: 3,
defense: 2,
initiative: 6,
walk: 3,
hit: 4,
shoot: 0,
cast: 0,
targeted_cast: 0,
};
Self {
name: "rat".to_string(),
life: monster_stats.max_life as usize,
position,
symbol: String::from("R"),
color: Color::Black,
experience_gain: 26,
ticks_between_steps: 25,
monster_stats,
}
}
fn calc_move(&self, _level: &Level, _player_pos: &Position) -> (i16, i16) {
match rand::thread_rng().gen_range(0..5) {
1 => { (1, 0) }
2 => { (-1, 0) }
3 => { (0, 1) }
4 => { (0, -1) }
_ => { (0, 0) }
}
}
}
default_monster!(Rat);
/// Orc
/// Page: 118
/// GH: 2
pub struct Orc {
name: String,
life: usize,
position: Position,
symbol: String,
color: Color,
experience_gain: usize,
ticks_between_steps: u128,
monster_stats: MonsterStats,
}
impl Orc {
pub fn new_with_position(position: Position) -> Self {
let monster_stats = MonsterStats {
body: 10,
agility: 6,
mind: 2,
strength: 2,
toughness: 3,
movement: 0,
dexterity: 3,
wisdom: 1,
aura: 0,
max_life: 23,
defense: 14,
initiative: 1,
walk: 4,
hit: 13,
shoot: 10,
cast: 0,
targeted_cast: 0,
};
Self {
name: "orc".to_string(),
life: monster_stats.max_life as usize,
position,
symbol: String::from("O"),
color: Color::DarkGray,
experience_gain: 63,
ticks_between_steps: 50,
monster_stats,
}
}
fn calc_move(&self, _level: &Level, _player_pos: &Position) -> (i16, i16) {
match rand::thread_rng().gen_range(0..5) {
1 => { (1, 0) }
2 => { (-1, 0) }
3 => { (0, 1) }
4 => { (0, -1) }
_ => { (0, 0) }
}
}
}
default_monster!(Orc);
#[test]
fn monsters_can_move() {
let mut m = Monster::new(2);
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));
@@ -40,12 +247,18 @@ fn monsters_can_move() {
#[test]
fn monsters_can_die() {
let mut m = Monster::new(2);
assert_eq!(m.get_life(), 2);
let mut m = Rat::new_with_position(Position::new(0, 0, 0));
assert_eq!(m.get_life(), 3);
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(), 2);
m.decrease_life(3);
assert_eq!(m.get_life(), 0);
assert_eq!(m.is_dead(), true);
}
#[test]
fn test_rat_values() {
let m = Rat::new_with_position(Position::new(0, 0, 0));
assert_eq!(m.monster_stats.max_life, 3);
}

View File

@@ -1,35 +1,46 @@
use std::cmp::{max, min};
use crate::position::Position;
use crate::dungeon_slayer::PlayerStats;
use crate::position::{HasPosition, Position};
pub struct Player {
name: String,
position: Position,
life: i16,
max_life: i16,
gold: usize,
experience: usize,
pub(crate) player_stats: PlayerStats,
}
impl Player {
pub fn new(name: &str, max_life: i16) -> Player {
pub fn new(name: &str, player_stats: PlayerStats) -> Player {
Player {
name: name.to_string(),
position: Position::new(0, 0, 0),
life: max_life,
max_life,
life: player_stats.get_max_life() as i16,
gold: 0,
experience: 0,
player_stats,
}
}
pub fn get_name(&self) -> String {
return self.name.clone();
}
pub fn change_life(&mut self, by: i16) {
self.life = max(0, min(self.max_life, self.life + by));
pub fn decrease_life(&mut self, by: u8) {
self.life = max(0, self.life.saturating_sub(by as i16));
}
pub fn increase_life(&mut self, by: u8) {
self.life = min(self.life.saturating_add(by as i16), self.get_max_life());
}
pub fn get_life(&self) -> i16 {
self.life
}
pub fn get_position(&mut self) -> &mut Position {
&mut self.position
/// returns true if the player is dead (life <= 0)
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.get_max_life() }
pub fn get_max_life(&self) -> i16 {
self.player_stats.get_max_life() as i16
}
/// add the given amount to the players gold stash
@@ -37,6 +48,19 @@ impl Player {
/// 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 }
}
impl HasPosition for Player {
fn get_position(&mut self) -> &mut Position {
&mut self.position
}
fn get_immutable_position(&self) -> &Position {
&self.position
}
}
#[test]
@@ -45,15 +69,37 @@ fn test_get_name() {
name: "Teddy Tester".to_string(),
position: Position::new(0, 1, 1),
life: 5,
max_life: 10,
gold: 0,
experience: 0,
player_stats: PlayerStats {
body: 0,
agility: 0,
mind: 0,
strength: 0,
toughness: 0,
movement: 0,
dexterity: 0,
wisdom: 0,
aura: 0,
},
};
assert_eq!(p.get_name(), "Teddy Tester");
}
#[test]
fn test_can_receive_gold() {
let mut p = Player::new("Teddy Tester", 10);
let player_stats = PlayerStats {
body: 8,
agility: 8,
mind: 4,
strength: 3,
toughness: 3,
movement: 1,
dexterity: 1,
wisdom: 0,
aura: 0,
};
let mut p = Player::new("Teddy Tester", player_stats);
assert_eq!(p.get_gold(), 0);
p.retrieve_gold(13);
@@ -67,21 +113,43 @@ fn test_change_life() {
name: "Teddy Tester".to_string(),
position: Position::new(0, 1, 1),
life: 5,
max_life: 10,
gold: 0,
experience: 0,
player_stats: PlayerStats {
body: 0,
agility: 0,
mind: 0,
strength: 0,
toughness: 0,
movement: 0,
dexterity: 0,
wisdom: 0,
aura: 0,
},
};
assert_eq!(p.life, 5);
p.change_life(-2);
assert_eq!(p.life, 3);
p.change_life(10);
assert_eq!(p.life, 10);
p.change_life(-12);
assert_eq!(p.life, 0);
assert_eq!(p.get_life(), 5);
p.decrease_life(2);
assert_eq!(p.get_life(), 3);
p.increase_life(10);
assert_eq!(p.get_life(), 10);
p.decrease_life(12);
assert_eq!(p.get_life(), 0);
}
#[test]
fn player_can_move() {
let mut p = Player::new("Teddy Tester", 10);
let player_stats = PlayerStats {
body: 8,
agility: 8,
mind: 4,
strength: 3,
toughness: 3,
movement: 1,
dexterity: 1,
wisdom: 0,
aura: 0,
};
let mut p = Player::new("Teddy Tester", player_stats);
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));
@@ -90,4 +158,28 @@ fn player_can_move() {
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,
gold: 0,
experience: 0,
player_stats: PlayerStats {
body: 0,
agility: 0,
mind: 0,
strength: 0,
toughness: 0,
movement: 0,
dexterity: 0,
wisdom: 0,
aura: 0,
},
};
assert_eq!(p.get_max_life(), 10);
}

View File

@@ -1,3 +1,13 @@
use std::cmp::{max, min};
/// 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,
@@ -13,9 +23,10 @@ impl Position {
y,
}
}
pub fn change(&mut self, dx: i16, dy: i16) {
self.x = ((self.x as i16) + dx) as usize;
self.y = ((self.y as i16) + dy) as usize;
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 set(&mut self, level: usize, x: usize, y: usize) {
self.level = level;
@@ -32,4 +43,56 @@ impl Position {
}
pub fn get_y(&self) -> usize { self.y }
/// calculate the distance to the other position using the manhattan metric
pub fn distance(&self, other: &Self) -> usize {
self.x.abs_diff(other.x) + self.y.abs_diff(other.y)
}
/// get the direction (step size 1) towards the other position
pub fn get_direction(&self, other: &Self) -> (i16, i16) {
(
max(min(other.x as i16 - self.x as i16, 1), -1),
max(min(other.y as i16 - self.y as i16, 1), -1)
)
}
}
#[test]
fn test_get_direction() {
let p1 = Position::new(0, 10, 10);
let p2 = Position::new(0, 8, 8);
assert_eq!(p1.get_direction(&p2), (-1, -1));
let p2 = Position::new(0, 11, 10);
assert_eq!(p1.get_direction(&p2), (1, 0));
}
#[test]
fn test_position_change() {
let mut p = Position::new(0, 10, 10);
let res = p.change(-1, 1);
assert_eq!(res, (9, 11));
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);
}