Compare commits
5 Commits
implement_
...
d6f4fdaa5b
| Author | SHA1 | Date | |
|---|---|---|---|
| d6f4fdaa5b | |||
| 8dfe56a3c2 | |||
| b3d85ac7b3 | |||
| cefb0cc5f2 | |||
| efc4cdd363 |
24
.gitea/workflows/publish.yaml
Normal file
24
.gitea/workflows/publish.yaml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
name: publish package
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Explore-Gitea-Actions:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: run tests
|
||||||
|
run: |
|
||||||
|
cd ${{ gitea.workspace }}
|
||||||
|
cargo test --release
|
||||||
|
- name: build & release package
|
||||||
|
run: |
|
||||||
|
cd ${{ gitea.workspace }}
|
||||||
|
cargo build --release
|
||||||
|
cargo deb
|
||||||
|
ls -al target/debian
|
||||||
|
UPLOAD_FILE=$(ls target/debian/*.deb)
|
||||||
|
curl --user jlusiardi:${{ secrets.UPLOAD_TOKEN }} --upload-file ${UPLOAD_FILE} https://gitea.intern.haus-in-hirschaid.de/api/packages/jlusiardi/debian/pool/bionic/main/upload
|
||||||
356
Cargo.lock
generated
356
Cargo.lock
generated
@@ -20,54 +20,6 @@ version = "0.2.16"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
|
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]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
version = "1.1.0"
|
version = "1.1.0"
|
||||||
@@ -98,6 +50,15 @@ version = "0.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
|
checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "castaway"
|
||||||
|
version = "0.2.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
|
||||||
|
dependencies = [
|
||||||
|
"rustversion",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
@@ -105,62 +66,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap"
|
name = "compact_str"
|
||||||
version = "4.4.18"
|
version = "0.8.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
|
checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap_builder",
|
"castaway",
|
||||||
"clap_derive",
|
"cfg-if",
|
||||||
|
"itoa",
|
||||||
|
"rustversion",
|
||||||
|
"ryu",
|
||||||
|
"static_assertions",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[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]]
|
[[package]]
|
||||||
name = "crossterm"
|
name = "crossterm"
|
||||||
version = "0.27.0"
|
version = "0.28.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
|
checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.4.1",
|
"bitflags 2.4.1",
|
||||||
"crossterm_winapi",
|
"crossterm_winapi",
|
||||||
"libc",
|
|
||||||
"mio",
|
"mio",
|
||||||
"parking_lot",
|
"parking_lot",
|
||||||
|
"rustix",
|
||||||
"signal-hook",
|
"signal-hook",
|
||||||
"signal-hook-mio",
|
"signal-hook-mio",
|
||||||
"winapi",
|
"winapi",
|
||||||
@@ -185,7 +114,6 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
|
|||||||
name = "el_diabolo"
|
name = "el_diabolo"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap",
|
|
||||||
"crossterm",
|
"crossterm",
|
||||||
"petgraph",
|
"petgraph",
|
||||||
"rand",
|
"rand",
|
||||||
@@ -199,6 +127,16 @@ version = "1.0.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
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]]
|
[[package]]
|
||||||
name = "fixedbitset"
|
name = "fixedbitset"
|
||||||
version = "0.4.2"
|
version = "0.4.2"
|
||||||
@@ -228,9 +166,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "heck"
|
name = "heck"
|
||||||
version = "0.4.1"
|
version = "0.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
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]]
|
[[package]]
|
||||||
name = "indexmap"
|
name = "indexmap"
|
||||||
@@ -243,20 +187,30 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "indoc"
|
name = "instability"
|
||||||
version = "2.0.4"
|
version = "0.3.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
|
checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c"
|
||||||
|
dependencies = [
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itertools"
|
name = "itertools"
|
||||||
version = "0.12.0"
|
version = "0.13.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
|
checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"either",
|
"either",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "itoa"
|
||||||
|
version = "1.0.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "js-sys"
|
name = "js-sys"
|
||||||
version = "0.3.66"
|
version = "0.3.66"
|
||||||
@@ -268,9 +222,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.149"
|
version = "0.2.161"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
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]]
|
[[package]]
|
||||||
name = "lock_api"
|
name = "lock_api"
|
||||||
@@ -299,14 +259,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mio"
|
name = "mio"
|
||||||
version = "0.8.9"
|
version = "1.0.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
|
checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"hermit-abi",
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"wasi",
|
"wasi",
|
||||||
"windows-sys 0.48.0",
|
"windows-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -333,7 +294,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"libc",
|
"libc",
|
||||||
"redox_syscall",
|
"redox_syscall 0.4.1",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"windows-targets 0.48.5",
|
"windows-targets 0.48.5",
|
||||||
]
|
]
|
||||||
@@ -346,9 +307,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "petgraph"
|
name = "petgraph"
|
||||||
version = "0.6.4"
|
version = "0.6.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
|
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fixedbitset",
|
"fixedbitset",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
@@ -410,20 +371,22 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ratatui"
|
name = "ratatui"
|
||||||
version = "0.25.0"
|
version = "0.28.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb"
|
checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.4.1",
|
"bitflags 2.4.1",
|
||||||
"cassowary",
|
"cassowary",
|
||||||
|
"compact_str",
|
||||||
"crossterm",
|
"crossterm",
|
||||||
"indoc",
|
"instability",
|
||||||
"itertools",
|
"itertools",
|
||||||
"lru",
|
"lru",
|
||||||
"paste",
|
"paste",
|
||||||
"stability",
|
|
||||||
"strum",
|
"strum",
|
||||||
|
"strum_macros",
|
||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
|
"unicode-truncate",
|
||||||
"unicode-width",
|
"unicode-width",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -436,12 +399,40 @@ dependencies = [
|
|||||||
"bitflags 1.3.2",
|
"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]]
|
[[package]]
|
||||||
name = "rustversion"
|
name = "rustversion"
|
||||||
version = "1.0.14"
|
version = "1.0.14"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
|
checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ryu"
|
||||||
|
version = "1.0.18"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "scopeguard"
|
name = "scopeguard"
|
||||||
version = "1.2.0"
|
version = "1.2.0"
|
||||||
@@ -460,9 +451,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "signal-hook-mio"
|
name = "signal-hook-mio"
|
||||||
version = "0.2.3"
|
version = "0.2.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
|
checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"mio",
|
"mio",
|
||||||
@@ -485,52 +476,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
|
checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "stability"
|
name = "static_assertions"
|
||||||
version = "0.1.1"
|
version = "1.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce"
|
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||||
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]]
|
[[package]]
|
||||||
name = "strum"
|
name = "strum"
|
||||||
version = "0.25.0"
|
version = "0.26.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
|
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"strum_macros",
|
"strum_macros",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "strum_macros"
|
name = "strum_macros"
|
||||||
version = "0.25.3"
|
version = "0.26.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
|
checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck",
|
"heck",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"rustversion",
|
"rustversion",
|
||||||
"syn 2.0.38",
|
"syn",
|
||||||
]
|
|
||||||
|
|
||||||
[[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]]
|
[[package]]
|
||||||
@@ -557,16 +527,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
|
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
|
||||||
|
|
||||||
[[package]]
|
[[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"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
|
checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
|
||||||
|
dependencies = [
|
||||||
|
"itertools",
|
||||||
|
"unicode-segmentation",
|
||||||
|
"unicode-width",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "utf8parse"
|
name = "unicode-width"
|
||||||
version = "0.2.1"
|
version = "0.1.14"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "version_check"
|
name = "version_check"
|
||||||
@@ -580,6 +555,12 @@ version = "0.11.0+wasi-snapshot-preview1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wasite"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "wasm-bindgen"
|
||||||
version = "0.2.89"
|
version = "0.2.89"
|
||||||
@@ -601,7 +582,7 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.38",
|
"syn",
|
||||||
"wasm-bindgen-shared",
|
"wasm-bindgen-shared",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -623,7 +604,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.38",
|
"syn",
|
||||||
"wasm-bindgen-backend",
|
"wasm-bindgen-backend",
|
||||||
"wasm-bindgen-shared",
|
"wasm-bindgen-shared",
|
||||||
]
|
]
|
||||||
@@ -646,11 +627,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "whoami"
|
name = "whoami"
|
||||||
version = "1.4.1"
|
version = "1.5.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
|
checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"wasm-bindgen",
|
"redox_syscall 0.5.7",
|
||||||
|
"wasite",
|
||||||
"web-sys",
|
"web-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -676,22 +658,13 @@ version = "0.4.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows-sys"
|
|
||||||
version = "0.48.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
|
|
||||||
dependencies = [
|
|
||||||
"windows-targets 0.48.5",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-sys"
|
name = "windows-sys"
|
||||||
version = "0.52.0"
|
version = "0.52.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows-targets 0.52.0",
|
"windows-targets 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -711,17 +684,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-targets"
|
name = "windows-targets"
|
||||||
version = "0.52.0"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
|
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"windows_aarch64_gnullvm 0.52.0",
|
"windows_aarch64_gnullvm 0.52.6",
|
||||||
"windows_aarch64_msvc 0.52.0",
|
"windows_aarch64_msvc 0.52.6",
|
||||||
"windows_i686_gnu 0.52.0",
|
"windows_i686_gnu 0.52.6",
|
||||||
"windows_i686_msvc 0.52.0",
|
"windows_i686_gnullvm",
|
||||||
"windows_x86_64_gnu 0.52.0",
|
"windows_i686_msvc 0.52.6",
|
||||||
"windows_x86_64_gnullvm 0.52.0",
|
"windows_x86_64_gnu 0.52.6",
|
||||||
"windows_x86_64_msvc 0.52.0",
|
"windows_x86_64_gnullvm 0.52.6",
|
||||||
|
"windows_x86_64_msvc 0.52.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -732,9 +706,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_gnullvm"
|
name = "windows_aarch64_gnullvm"
|
||||||
version = "0.52.0"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
|
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_msvc"
|
name = "windows_aarch64_msvc"
|
||||||
@@ -744,9 +718,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_aarch64_msvc"
|
name = "windows_aarch64_msvc"
|
||||||
version = "0.52.0"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
|
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_gnu"
|
name = "windows_i686_gnu"
|
||||||
@@ -756,9 +730,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_gnu"
|
name = "windows_i686_gnu"
|
||||||
version = "0.52.0"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
|
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_gnullvm"
|
||||||
|
version = "0.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_msvc"
|
name = "windows_i686_msvc"
|
||||||
@@ -768,9 +748,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_i686_msvc"
|
name = "windows_i686_msvc"
|
||||||
version = "0.52.0"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
|
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnu"
|
name = "windows_x86_64_gnu"
|
||||||
@@ -780,9 +760,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnu"
|
name = "windows_x86_64_gnu"
|
||||||
version = "0.52.0"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
|
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnullvm"
|
name = "windows_x86_64_gnullvm"
|
||||||
@@ -792,9 +772,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_gnullvm"
|
name = "windows_x86_64_gnullvm"
|
||||||
version = "0.52.0"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
|
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_msvc"
|
name = "windows_x86_64_msvc"
|
||||||
@@ -804,9 +784,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows_x86_64_msvc"
|
name = "windows_x86_64_msvc"
|
||||||
version = "0.52.0"
|
version = "0.52.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
|
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zerocopy"
|
name = "zerocopy"
|
||||||
@@ -825,5 +805,5 @@ checksum = "56feebc4664bdb37f39c0b1b8fc8fa2f5648e3ec5f9cf4344978b4b7ca561fff"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.38",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|||||||
20
Cargo.toml
20
Cargo.toml
@@ -6,9 +6,19 @@ edition = "2021"
|
|||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
ratatui = "0.25.0"
|
ratatui = "0.28.1"
|
||||||
crossterm = "0.27.0"
|
crossterm = "0.28.1"
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
petgraph = "0.6.4"
|
petgraph = "0.6.5"
|
||||||
whoami = "1.4.1"
|
whoami = "1.5.2"
|
||||||
clap = { version = "4.4.11", features = ["derive"] }
|
|
||||||
|
[package.metadata.deb]
|
||||||
|
maintainer = "Joachim Lusiardi <joachim@lusiardi.de>"
|
||||||
|
copyright = "2024, Joachim Lusiardi <joachim@lusiardi.de>"
|
||||||
|
extended-description = """Little roguelike game"""
|
||||||
|
depends = "$auto"
|
||||||
|
section = "game"
|
||||||
|
priority = "optional"
|
||||||
|
assets = [
|
||||||
|
["target/release/el_diabolo", "/usr/bin/", "755"],
|
||||||
|
]
|
||||||
5
build.rs
5
build.rs
@@ -1,7 +1,10 @@
|
|||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let output = Command::new("git").args(&["rev-parse", "--short", "HEAD"]).output().unwrap();
|
let output = Command::new("git")
|
||||||
|
.args(["rev-parse", "--short", "HEAD"])
|
||||||
|
.output()
|
||||||
|
.unwrap();
|
||||||
let git_hash = String::from_utf8(output.stdout).unwrap();
|
let git_hash = String::from_utf8(output.stdout).unwrap();
|
||||||
println!("cargo:rustc-env=GIT_HASH={}", git_hash);
|
println!("cargo:rustc-env=GIT_HASH={}", git_hash);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
use rand::Rng;
|
||||||
use ratatui::style::Color;
|
use ratatui::style::Color;
|
||||||
|
|
||||||
use crate::player::Player;
|
use crate::player::Player;
|
||||||
@@ -22,11 +23,11 @@ pub struct Chest {
|
|||||||
|
|
||||||
impl Chest {
|
impl Chest {
|
||||||
pub fn new(position: Position) -> Self {
|
pub fn new(position: Position) -> Self {
|
||||||
let level = position.get_level();
|
let min_gold = 10 * (position.get_level()+1);
|
||||||
|
let max_gold = min_gold + 10*position.get_level();
|
||||||
Self {
|
Self {
|
||||||
position,
|
position,
|
||||||
// TODO maybe randomize this?
|
gold: rand::thread_rng().gen_range(min_gold..=max_gold),
|
||||||
gold: (level + 1) * 10,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -36,10 +37,15 @@ impl Artifact for Chest {
|
|||||||
("C", Color::Blue)
|
("C", Color::Blue)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_immutable_position(&self) -> &Position { &self.position }
|
fn get_immutable_position(&self) -> &Position {
|
||||||
|
&self.position
|
||||||
|
}
|
||||||
fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>) {
|
fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>) {
|
||||||
player.retrieve_gold(self.gold);
|
player.retrieve_gold(self.gold);
|
||||||
messages.insert(0, format!("opened chest and collected {} gold.", self.gold).to_string());
|
messages.insert(
|
||||||
|
0,
|
||||||
|
format!("opened chest and collected {} gold.", self.gold).to_string(),
|
||||||
|
);
|
||||||
self.gold = 0;
|
self.gold = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,9 +62,11 @@ pub struct Potion {
|
|||||||
|
|
||||||
impl Potion {
|
impl Potion {
|
||||||
pub fn new(position: Position) -> Self {
|
pub fn new(position: Position) -> Self {
|
||||||
|
let min_health_gain = 5 + position.get_level();
|
||||||
|
let max_health_gain = min_health_gain + 3 * position.get_level();
|
||||||
Self {
|
Self {
|
||||||
position,
|
position,
|
||||||
health: 5,
|
health: rand::thread_rng().gen_range(min_health_gain..=max_health_gain),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -67,21 +75,29 @@ impl Artifact for Potion {
|
|||||||
fn get_representation(&self) -> (&str, Color) {
|
fn get_representation(&self) -> (&str, Color) {
|
||||||
("P", Color::Green)
|
("P", Color::Green)
|
||||||
}
|
}
|
||||||
fn get_immutable_position(&self) -> &Position { &self.position }
|
fn get_immutable_position(&self) -> &Position {
|
||||||
|
&self.position
|
||||||
|
}
|
||||||
fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>) {
|
fn collect(&mut self, player: &mut Player, messages: &mut Vec<String>) {
|
||||||
// only consume potion of the player can gain at least one health point
|
// only consume potion of the player can gain at least one health point
|
||||||
if !player.is_healthy() {
|
if !player.is_healthy() {
|
||||||
let old = player.get_life();
|
let old = player.get_life();
|
||||||
player.increase_life(self.health.try_into().unwrap());
|
player.change_life(self.health.try_into().unwrap());
|
||||||
let new = player.get_life();
|
let new = player.get_life();
|
||||||
messages.insert(0, format!("picked up potion and gained {} hp.", new - old).to_string());
|
messages.insert(
|
||||||
|
0,
|
||||||
|
format!("picked up potion and gained {} health.", new - old).to_string(),
|
||||||
|
);
|
||||||
self.health = 0;
|
self.health = 0;
|
||||||
} else {
|
} else {
|
||||||
messages.insert(0, "not using the potion because you're healthy.".to_string());
|
messages.insert(
|
||||||
|
0,
|
||||||
|
"not using the potion because you're healthy.".to_string(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn was_collected(&self) -> bool {
|
fn was_collected(&self) -> bool {
|
||||||
self.health == 0
|
self.health == 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,150 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
198
src/game.rs
198
src/game.rs
@@ -1,6 +1,3 @@
|
|||||||
use crate::dungeon_slayer::do_challenge;
|
|
||||||
#[cfg(test)]
|
|
||||||
use crate::dungeon_slayer::PlayerStats;
|
|
||||||
use crate::level::{Level, StructureElement};
|
use crate::level::{Level, StructureElement};
|
||||||
use crate::level_generator::LevelGenerator;
|
use crate::level_generator::LevelGenerator;
|
||||||
use crate::player::Player;
|
use crate::player::Player;
|
||||||
@@ -12,14 +9,13 @@ pub const LEVELS: usize = 10;
|
|||||||
/// represents a state of a game
|
/// represents a state of a game
|
||||||
pub enum GameState {
|
pub enum GameState {
|
||||||
/// the game is ongoing (neither won or lost)
|
/// the game is ongoing (neither won or lost)
|
||||||
RUNNING,
|
Running,
|
||||||
/// the player died
|
/// the player died
|
||||||
LOST,
|
Lost,
|
||||||
/// the player reached the Ω
|
/// the player reached the Ω
|
||||||
WON,
|
Won,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// the main structure to hold all information about the ongoing game
|
/// the main structure to hold all information about the ongoing game
|
||||||
pub struct Game {
|
pub struct Game {
|
||||||
/// the player
|
/// the player
|
||||||
@@ -27,7 +23,6 @@ pub struct Game {
|
|||||||
/// the levels of the game
|
/// the levels of the game
|
||||||
levels: Vec<Level>,
|
levels: Vec<Level>,
|
||||||
pub messages: Vec<String>,
|
pub messages: Vec<String>,
|
||||||
use_fog_of_war: bool,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Game {
|
impl Game {
|
||||||
@@ -40,13 +35,13 @@ impl Game {
|
|||||||
player: p,
|
player: p,
|
||||||
levels: v,
|
levels: v,
|
||||||
messages: Vec::with_capacity(10),
|
messages: Vec::with_capacity(10),
|
||||||
use_fog_of_war: true,
|
|
||||||
};
|
};
|
||||||
let start = {
|
let start = { g.get_level(0).start };
|
||||||
g.get_level(0).start
|
g.get_mutable_player()
|
||||||
};
|
.get_position()
|
||||||
g.get_mutable_player().get_position().set(0, start.0, start.1);
|
.set(0, start.0, start.1);
|
||||||
g.get_mutable_level(0).discover(&Position::new(0, start.0, start.1));
|
g.get_mutable_level(0)
|
||||||
|
.discover(&Position::new(0, start.0, start.1));
|
||||||
g
|
g
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,9 +50,8 @@ impl Game {
|
|||||||
match self.next_element(0, 0) {
|
match self.next_element(0, 0) {
|
||||||
None => {}
|
None => {}
|
||||||
Some(a) => {
|
Some(a) => {
|
||||||
match a {
|
if a == StructureElement::End {
|
||||||
StructureElement::End => { return true; }
|
return true;
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -66,23 +60,25 @@ impl Game {
|
|||||||
/// returns the state of the game (depending on player's life and position)
|
/// returns the state of the game (depending on player's life and position)
|
||||||
pub fn get_game_state(&mut self) -> GameState {
|
pub fn get_game_state(&mut self) -> GameState {
|
||||||
if self.player.is_dead() {
|
if self.player.is_dead() {
|
||||||
return GameState::LOST;
|
return GameState::Lost;
|
||||||
}
|
}
|
||||||
if self.player_reached_goal() {
|
if self.player_reached_goal() {
|
||||||
return GameState::WON;
|
return GameState::Won;
|
||||||
}
|
}
|
||||||
GameState::RUNNING
|
GameState::Running
|
||||||
}
|
}
|
||||||
pub fn get_player(&self) -> &Player {
|
pub fn get_player(&self) -> &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 {
|
pub fn get_mutable_player(&mut self) -> &mut Player {
|
||||||
&mut self.player
|
&mut self.player
|
||||||
}
|
}
|
||||||
pub fn get_level(&self, level: usize) -> &Level { &self.levels[level] }
|
pub fn get_level(&self, level: usize) -> &Level {
|
||||||
pub fn get_mutable_level(&mut self, level: usize) -> &mut Level { &mut self.levels[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
|
/// check if the player can move in the given direction. This only checks for structure element
|
||||||
/// limitation as walls.
|
/// limitation as walls.
|
||||||
fn can_move(&mut self, dx: i16, dy: i16) -> bool {
|
fn can_move(&mut self, dx: i16, dy: i16) -> bool {
|
||||||
@@ -109,7 +105,7 @@ impl Game {
|
|||||||
let new_y: i16 = player_pos.get_y() as i16 + dy;
|
let new_y: i16 = player_pos.get_y() as i16 + dy;
|
||||||
let player_level = player_pos.get_level();
|
let player_level = player_pos.get_level();
|
||||||
let level = &mut self.levels[player_level];
|
let level = &mut self.levels[player_level];
|
||||||
level.get_element(new_x, new_y, self.use_fog_of_war).0
|
level.get_element(new_x, new_y).0
|
||||||
}
|
}
|
||||||
|
|
||||||
/// move the game's player into the given direction. If on the target field there is a stair,
|
/// move the game's player into the given direction. If on the target field there is a stair,
|
||||||
@@ -127,59 +123,73 @@ impl Game {
|
|||||||
let structure = self.next_element(dx, dy);
|
let structure = self.next_element(dx, dy);
|
||||||
|
|
||||||
// use stairs if walked onto one
|
// use stairs if walked onto one
|
||||||
match structure {
|
if let Some(e) = structure {
|
||||||
Some(e) => {
|
match e {
|
||||||
match e {
|
StructureElement::StairDown => {
|
||||||
StructureElement::StairDown => {
|
(dx, dy) = (0, 0);
|
||||||
(dx, dy) = (0, 0);
|
let (next_level, x, y) = self.next_start();
|
||||||
let (next_level, x, y) = self.next_start();
|
player_level = next_level;
|
||||||
player_level = next_level;
|
self.messages
|
||||||
self.messages.insert(0, format!("You climb down to level {}.", next_level));
|
.insert(0, format!("you climb down to level {}.", next_level));
|
||||||
self.get_mutable_player().get_position().set(next_level, x, y);
|
self.get_mutable_player()
|
||||||
}
|
.get_position()
|
||||||
StructureElement::StairUp => {
|
.set(next_level, x, y);
|
||||||
(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);
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
|
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
|
// update position and discover area on new position
|
||||||
let (new_x, new_y) = self.get_mutable_player().get_position().change(dx, dy);
|
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));
|
self.get_mutable_level(player_level)
|
||||||
|
.discover(&Position::new(player_level, new_x, new_y));
|
||||||
(-dx, -dy)
|
(-dx, -dy)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn player_fights_monster(&mut self) -> bool {
|
pub fn player_fights_monster(&mut self) -> bool {
|
||||||
let player_pos = &self.player.get_immutable_position();
|
let player_pos = &self.player.get_immutable_position();
|
||||||
let player_level = player_pos.get_level();
|
let player_level = player_pos.get_level();
|
||||||
let level = &mut self.levels[player_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);
|
let (_, m, _) = level.get_element(player_pos.get_x() as i16, player_pos.get_y() as i16);
|
||||||
match m {
|
match m {
|
||||||
None => {}
|
None => {}
|
||||||
Some(m) => {
|
Some(m) => {
|
||||||
// Player attacks monster
|
let player_dmg = self.player.damage();
|
||||||
let attack = do_challenge(self.player.player_stats.get_hit());
|
m.decrease_life(player_dmg);
|
||||||
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() {
|
if m.is_dead() {
|
||||||
self.player.gain_experience(m.get_experience_gain());
|
self.player.gain_experience(m.get_experience_gain());
|
||||||
self.messages.insert(0, format!("You killed the {}.", m.get_name()).to_string());
|
self.messages.insert(
|
||||||
|
0,
|
||||||
|
format!(
|
||||||
|
"you hit {} for {} damage and kill it.",
|
||||||
|
m.get_name(),
|
||||||
|
player_dmg
|
||||||
|
)
|
||||||
|
.to_string(),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
self.messages.insert(
|
||||||
|
0,
|
||||||
|
format!("you hit {} for {} damage.", m.get_name(), player_dmg).to_string(),
|
||||||
|
);
|
||||||
|
let monster_dmg = m.damage() as i16;
|
||||||
|
self.player.change_life(-monster_dmg);
|
||||||
|
|
||||||
|
self.messages.insert(
|
||||||
|
0,
|
||||||
|
format!("{} hits you for {} damage.", m.get_name(), monster_dmg)
|
||||||
|
.to_string(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
return m.is_dead();
|
return m.is_dead();
|
||||||
}
|
}
|
||||||
@@ -190,7 +200,7 @@ impl Game {
|
|||||||
let player_pos = &self.player.get_immutable_position();
|
let player_pos = &self.player.get_immutable_position();
|
||||||
let player_level = player_pos.get_level();
|
let player_level = player_pos.get_level();
|
||||||
let level = &mut self.levels[player_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);
|
let (_, _, a) = level.get_element(player_pos.get_x() as i16, player_pos.get_y() as i16);
|
||||||
match a {
|
match a {
|
||||||
None => {}
|
None => {}
|
||||||
Some(a) => {
|
Some(a) => {
|
||||||
@@ -199,48 +209,24 @@ impl Game {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// updates the player's current level. This will remove collected artifacts and dead monsters.
|
/// 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
|
pub fn update_level(&mut self, ticks: u128) {
|
||||||
/// 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_pos = &self.player.get_immutable_position();
|
||||||
let player_level = player_pos.get_level();
|
let player_level = player_pos.get_level();
|
||||||
let level = &mut self.levels[player_level];
|
let level = &mut self.levels[player_level];
|
||||||
level.update(ticks, player_moved, &mut self.player, &mut self.messages);
|
level.update(ticks, &mut self.player, &mut self.messages);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn game_has_correct_number_of_levels() {
|
fn game_has_correct_number_of_levels() {
|
||||||
let player_stats = PlayerStats {
|
let p = Player::new("foo", 42);
|
||||||
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);
|
let g = Game::new(p);
|
||||||
assert_eq!(g.levels.len(), LEVELS);
|
assert_eq!(g.levels.len(), LEVELS);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn game_has_player() {
|
fn game_has_player() {
|
||||||
let player_stats = PlayerStats {
|
let p = Player::new("foo", 42);
|
||||||
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);
|
let g = Game::new(p);
|
||||||
assert_eq!(g.get_player().get_name(), "foo");
|
assert_eq!(g.get_player().get_name(), "foo");
|
||||||
assert_eq!(g.get_player().get_immutable_position().get_level(), 0);
|
assert_eq!(g.get_player().get_immutable_position().get_level(), 0);
|
||||||
@@ -248,38 +234,16 @@ fn game_has_player() {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn game_has_mutable_player() {
|
fn game_has_mutable_player() {
|
||||||
let player_stats = PlayerStats {
|
let p = Player::new("foo", 42);
|
||||||
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);
|
let mut g = Game::new(p);
|
||||||
assert_eq!(g.get_player().get_name(), "foo");
|
assert_eq!(g.get_player().get_name(), "foo");
|
||||||
g.get_mutable_player().decrease_life(1);
|
g.get_mutable_player().change_life(-1);
|
||||||
assert_eq!(g.get_player().get_life(), 20);
|
assert_eq!(g.get_player().get_life(), 41);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn game_get_level() {
|
fn game_get_level() {
|
||||||
let player_stats = PlayerStats {
|
let p = Player::new("foo", 42);
|
||||||
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);
|
let mut g = Game::new(p);
|
||||||
g.get_level(0);
|
g.get_level(0);
|
||||||
assert_ne!(g.get_level(0).start, (0, 0));
|
assert_ne!(g.get_level(0).start, (0, 0));
|
||||||
|
|||||||
148
src/level.rs
148
src/level.rs
@@ -1,12 +1,14 @@
|
|||||||
use std::cmp::{max, min};
|
use std::cmp::{max, min};
|
||||||
|
|
||||||
|
use rand::rngs::ThreadRng;
|
||||||
|
use rand::Rng;
|
||||||
|
|
||||||
|
use crate::artifacts::Artifact;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
use crate::artifacts::{Chest, Potion};
|
use crate::artifacts::{Chest, Potion};
|
||||||
use crate::artifacts::Artifact;
|
use crate::monster::Monster;
|
||||||
use crate::dungeon_slayer::do_challenge;
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
use crate::monster::{Orc, Rat};
|
use crate::monster::{Orc, Rat};
|
||||||
use crate::monster::Monster;
|
|
||||||
use crate::player::Player;
|
use crate::player::Player;
|
||||||
use crate::position::HasPosition;
|
use crate::position::HasPosition;
|
||||||
use crate::position::Position;
|
use crate::position::Position;
|
||||||
@@ -25,6 +27,9 @@ pub enum StructureElement {
|
|||||||
Unknown,
|
Unknown,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type PossibleArtifact<'a> = Option<&'a mut Box<(dyn Artifact + 'static)>>;
|
||||||
|
type PossibleMonster<'a> = Option<&'a mut Box<(dyn Monster + 'static)>>;
|
||||||
|
|
||||||
pub struct Level {
|
pub struct Level {
|
||||||
pub(crate) level: usize,
|
pub(crate) level: usize,
|
||||||
pub(crate) structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
|
pub(crate) structure: [[StructureElement; LEVEL_HEIGHT]; LEVEL_WIDTH],
|
||||||
@@ -35,10 +40,15 @@ pub struct Level {
|
|||||||
pub(crate) start: (usize, usize),
|
pub(crate) start: (usize, usize),
|
||||||
/// the position of the end in the level (either stair down or end point)
|
/// the position of the end in the level (either stair down or end point)
|
||||||
pub(crate) end: (usize, usize),
|
pub(crate) end: (usize, usize),
|
||||||
|
pub(crate) rng: ThreadRng,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Level {
|
impl Level {
|
||||||
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)>>) {
|
pub fn get_element(
|
||||||
|
&mut self,
|
||||||
|
x: i16,
|
||||||
|
y: i16,
|
||||||
|
) -> (Option<StructureElement>, PossibleMonster, PossibleArtifact) {
|
||||||
if x < 0 || y < 0 {
|
if x < 0 || y < 0 {
|
||||||
return (None, None, None);
|
return (None, None, None);
|
||||||
}
|
}
|
||||||
@@ -47,7 +57,7 @@ impl Level {
|
|||||||
if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
|
if x >= LEVEL_WIDTH || y >= LEVEL_HEIGHT {
|
||||||
return (None, None, None);
|
return (None, None, None);
|
||||||
}
|
}
|
||||||
if use_fog_of_war && !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);
|
let search_pos = &Position::new(self.level, x, y);
|
||||||
@@ -109,7 +119,7 @@ impl Level {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn update(&mut self, ticks: u128, player_moved: bool, player: &mut Player, messages: &mut Vec<String>) {
|
pub fn update(&mut self, ticks: u128, player: &mut Player, messages: &mut Vec<String>) {
|
||||||
for (index, a) in &mut self.artifacts.iter().enumerate() {
|
for (index, a) in &mut self.artifacts.iter().enumerate() {
|
||||||
if a.was_collected() {
|
if a.was_collected() {
|
||||||
self.artifacts.remove(index);
|
self.artifacts.remove(index);
|
||||||
@@ -120,35 +130,60 @@ impl Level {
|
|||||||
if self.monsters[index].is_dead() {
|
if self.monsters[index].is_dead() {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// if the player moved, the monsters move as well all the time
|
if ticks % self.monsters[index].get_ticks_between_steps() != 0 {
|
||||||
if !player_moved && ticks % self.monsters[index].get_ticks_between_steps() != 0 {
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
loop {
|
loop {
|
||||||
// calculate the direction the monster will try to walk
|
// calculate the direction the monster will try to walk
|
||||||
let (dx, dy) = self.monsters[index].get_next_move(&self, player.get_immutable_position());
|
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) {
|
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);
|
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 {
|
if player.get_immutable_position().get_x() == new_x
|
||||||
// TODO monster attacks
|
&& player.get_immutable_position().get_y() == new_y
|
||||||
let attack = do_challenge(self.monsters[index].get_hit());
|
{
|
||||||
if attack.0 {
|
let monster_dmg = self.monsters[index].damage() as i16;
|
||||||
let mut damage = attack.1;
|
player.change_life(-monster_dmg);
|
||||||
let defense = do_challenge(player.player_stats.get_defense());
|
messages.insert(
|
||||||
if defense.0 {
|
0,
|
||||||
damage = damage.saturating_sub(defense.1);
|
format!(
|
||||||
}
|
"{} hits you for {} damage.",
|
||||||
player.decrease_life(damage);
|
self.monsters[index].get_name(),
|
||||||
if player.is_dead() {
|
monster_dmg
|
||||||
messages.insert(0, format!("Attack from {} killed you.", self.monsters[index].get_name()).to_string());
|
)
|
||||||
} else {
|
.to_string(),
|
||||||
messages.insert(0, format!("Attack from {} successful with {} damage.", self.monsters[index].get_name(), damage).to_string());
|
);
|
||||||
}
|
|
||||||
} else {
|
let player_dmg = player.damage();
|
||||||
messages.insert(0, format!("Attack from {} failed.", self.monsters[index].get_name()).to_string());
|
self.monsters[index].decrease_life(player_dmg);
|
||||||
}
|
|
||||||
|
// if the attack did not kill the opponent, back down
|
||||||
if !player.is_dead() {
|
if !player.is_dead() {
|
||||||
|
messages.insert(
|
||||||
|
0,
|
||||||
|
format!(
|
||||||
|
"you hit {} for {} damage and kill it.",
|
||||||
|
self.monsters[index].get_name(),
|
||||||
|
player_dmg
|
||||||
|
)
|
||||||
|
.to_string(),
|
||||||
|
);
|
||||||
self.monsters[index].get_position().change(-dx, -dy);
|
self.monsters[index].get_position().change(-dx, -dy);
|
||||||
|
} else {
|
||||||
|
messages.insert(
|
||||||
|
0,
|
||||||
|
format!(
|
||||||
|
"you hit {} for {} damage.",
|
||||||
|
self.monsters[index].get_name(),
|
||||||
|
player_dmg
|
||||||
|
)
|
||||||
|
.to_string(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -175,7 +210,9 @@ impl Level {
|
|||||||
|
|
||||||
for index in 0..self.monsters.len() {
|
for index in 0..self.monsters.len() {
|
||||||
let pos = self.monsters[index].get_immutable_position();
|
let pos = self.monsters[index].get_immutable_position();
|
||||||
if pos.get_x() == new_x && pos.get_y() == new_y { return false; }
|
if pos.get_x() == new_x && pos.get_y() == new_y {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
self.structure[new_x][new_y] != StructureElement::Wall
|
self.structure[new_x][new_y] != StructureElement::Wall
|
||||||
}
|
}
|
||||||
@@ -207,6 +244,7 @@ impl Level {
|
|||||||
artifacts: Vec::with_capacity(10),
|
artifacts: Vec::with_capacity(10),
|
||||||
start: (0, 0),
|
start: (0, 0),
|
||||||
end: (0, 0),
|
end: (0, 0),
|
||||||
|
rng: rand::thread_rng(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -240,23 +278,31 @@ impl Level {
|
|||||||
#[test]
|
#[test]
|
||||||
fn test_get_element() {
|
fn test_get_element() {
|
||||||
let mut l = Level::new(0);
|
let mut l = Level::new(0);
|
||||||
assert_eq!(l.get_element(-1, -1, true).0, None);
|
assert_eq!(l.get_element(-1, -1).0, None);
|
||||||
assert_eq!(l.get_element(0, 0, true).0.unwrap(), StructureElement::Unknown);
|
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, true).0.unwrap(), StructureElement::Unknown);
|
assert_eq!(
|
||||||
assert_eq!(l.get_element(LEVEL_WIDTH as i16, LEVEL_HEIGHT as i16, true).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]
|
#[test]
|
||||||
fn test_discover_get_element() {
|
fn test_discover_get_element() {
|
||||||
let mut l = Level::new(0);
|
let mut l = Level::new(0);
|
||||||
assert_eq!(l.get_element(10, 10, true).0.unwrap(), StructureElement::Unknown);
|
assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Unknown);
|
||||||
let p = Position::new(0, 10, 10);
|
let p = Position::new(0, 10, 10);
|
||||||
l.discover(&p);
|
l.discover(&p);
|
||||||
assert_eq!(l.get_element(10, 10, true).0.unwrap(), StructureElement::Floor);
|
assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
|
||||||
assert_eq!(l.get_element(9, 10, true).0.unwrap(), StructureElement::Floor);
|
assert_eq!(l.get_element(9, 10).0.unwrap(), StructureElement::Floor);
|
||||||
assert_eq!(l.get_element(10, 9, true).0.unwrap(), StructureElement::Floor);
|
assert_eq!(l.get_element(10, 9).0.unwrap(), StructureElement::Floor);
|
||||||
assert_eq!(l.get_element(11, 10, true).0.unwrap(), StructureElement::Floor);
|
assert_eq!(l.get_element(11, 10).0.unwrap(), StructureElement::Floor);
|
||||||
assert_eq!(l.get_element(10, 11, true).0.unwrap(), StructureElement::Floor);
|
assert_eq!(l.get_element(10, 11).0.unwrap(), StructureElement::Floor);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -297,20 +343,20 @@ fn test_discover_get_monster() {
|
|||||||
let mut l = Level::new(0);
|
let mut l = Level::new(0);
|
||||||
let p = Position::new(0, 10, 10);
|
let p = Position::new(0, 10, 10);
|
||||||
l.discover(&p);
|
l.discover(&p);
|
||||||
assert_eq!(l.get_element(10, 10, true).0.unwrap(), StructureElement::Floor);
|
assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
|
||||||
assert!(l.get_element(10, 10, true).1.is_none());
|
assert!(l.get_element(10, 10).1.is_none());
|
||||||
|
|
||||||
let m = Rat::new_with_position(Position::new(0, 10, 10));
|
let m = Rat::new_with_position(Position::new(0, 10, 10));
|
||||||
assert_eq!(l.add_monster(m), Ok(()));
|
assert_eq!(l.add_monster(m), Ok(()));
|
||||||
|
|
||||||
let elem = l.get_element(10, 10, true);
|
let elem = l.get_element(10, 10);
|
||||||
assert_eq!(elem.0.unwrap(), StructureElement::Floor);
|
assert_eq!(elem.0.unwrap(), StructureElement::Floor);
|
||||||
assert!(elem.1.is_some());
|
assert!(elem.1.is_some());
|
||||||
let m = elem.1.unwrap();
|
let m = elem.1.unwrap();
|
||||||
assert_eq!(m.get_life(), 3);
|
assert_eq!(m.get_life(), 2);
|
||||||
|
|
||||||
m.decrease_life(3);
|
m.decrease_life(2);
|
||||||
assert_eq!(l.get_element(10, 10, true).1.unwrap().get_life(), 0);
|
assert_eq!(l.get_element(10, 10).1.unwrap().get_life(), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -318,13 +364,13 @@ fn test_discover_get_artifact() {
|
|||||||
let mut l = Level::new(0);
|
let mut l = Level::new(0);
|
||||||
let p = Position::new(0, 10, 10);
|
let p = Position::new(0, 10, 10);
|
||||||
l.discover(&p);
|
l.discover(&p);
|
||||||
assert_eq!(l.get_element(10, 10, true).0.unwrap(), StructureElement::Floor);
|
assert_eq!(l.get_element(10, 10).0.unwrap(), StructureElement::Floor);
|
||||||
assert!(l.get_element(10, 10, true).2.is_none());
|
assert!(l.get_element(10, 10).2.is_none());
|
||||||
|
|
||||||
let a = Chest::new(Position::new(0, 10, 10));
|
let a = Chest::new(Position::new(0, 10, 10));
|
||||||
assert_eq!(l.add_artifact(a), Ok(()));
|
assert_eq!(l.add_artifact(a), Ok(()));
|
||||||
|
|
||||||
let elem = l.get_element(10, 10, true);
|
let elem = l.get_element(10, 10);
|
||||||
assert_eq!(elem.0.unwrap(), StructureElement::Floor);
|
assert_eq!(elem.0.unwrap(), StructureElement::Floor);
|
||||||
assert!(elem.2.is_some());
|
assert!(elem.2.is_some());
|
||||||
}
|
}
|
||||||
@@ -338,12 +384,12 @@ fn test_discover_get_monster_can_move() {
|
|||||||
let m = Rat::new_with_position(Position::new(0, 10, 10));
|
let m = Rat::new_with_position(Position::new(0, 10, 10));
|
||||||
l.add_monster(m).expect("Panic because of");
|
l.add_monster(m).expect("Panic because of");
|
||||||
|
|
||||||
let m = l.get_element(10, 10, true).1.unwrap();
|
let m = l.get_element(10, 10).1.unwrap();
|
||||||
m.get_position().change(1, 1);
|
m.get_position().change(1, 1);
|
||||||
|
|
||||||
let m = l.get_element(10, 10, true).1;
|
let m = l.get_element(10, 10).1;
|
||||||
assert!(m.is_none());
|
assert!(m.is_none());
|
||||||
let m = l.get_element(11, 11, true).1;
|
let m = l.get_element(11, 11).1;
|
||||||
assert!(m.is_some());
|
assert!(m.is_some());
|
||||||
assert_eq!(m.unwrap().get_life(), 3);
|
assert_eq!(m.unwrap().get_life(), 2);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,12 +6,12 @@ use petgraph::data::*;
|
|||||||
use petgraph::graph::Graph;
|
use petgraph::graph::Graph;
|
||||||
use petgraph::graph::UnGraph;
|
use petgraph::graph::UnGraph;
|
||||||
use rand::prelude::SliceRandom;
|
use rand::prelude::SliceRandom;
|
||||||
use rand::Rng;
|
|
||||||
use rand::rngs::ThreadRng;
|
use rand::rngs::ThreadRng;
|
||||||
|
use rand::Rng;
|
||||||
|
|
||||||
use crate::artifacts::{Artifact, Chest, Potion};
|
use crate::artifacts::{Artifact, Chest, Potion};
|
||||||
use crate::level::{Level, StructureElement};
|
use crate::level::{Level, StructureElement};
|
||||||
use crate::monster::{LowerDaemon, Monster, Rat};
|
use crate::monster::{Monster, Orc, Rat, Snake};
|
||||||
use crate::position::Position;
|
use crate::position::Position;
|
||||||
|
|
||||||
const ROOMS_VERTICAL: usize = 7;
|
const ROOMS_VERTICAL: usize = 7;
|
||||||
@@ -93,7 +93,8 @@ impl LevelGenerator {
|
|||||||
rooms[0][0].kind = RoomType::BasicRoom;
|
rooms[0][0].kind = RoomType::BasicRoom;
|
||||||
|
|
||||||
while !LevelGenerator::rooms_connectable(&rooms) {
|
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
|
// level 0 contains a start room, all others contain a stair up
|
||||||
if first {
|
if first {
|
||||||
room_types.push(RoomType::Start);
|
room_types.push(RoomType::Start);
|
||||||
@@ -112,21 +113,21 @@ impl LevelGenerator {
|
|||||||
for _ in room_types.len()..ROOMS_HORIZONTAL * ROOMS_VERTICAL {
|
for _ in room_types.len()..ROOMS_HORIZONTAL * ROOMS_VERTICAL {
|
||||||
match rng.gen_range(1..=100) {
|
match rng.gen_range(1..=100) {
|
||||||
// TODO tune room type distribution
|
// 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);
|
room_types.shuffle(&mut rng);
|
||||||
|
|
||||||
graph.clear();
|
graph.clear();
|
||||||
// place the rooms in the array an add nodes to the graph for every non empty room
|
// 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));
|
graph.add_node((c, r));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -142,15 +143,21 @@ impl LevelGenerator {
|
|||||||
let src_index = graph.node_indices().find(|i| graph[*i] == (c, r)).unwrap();
|
let src_index = graph.node_indices().find(|i| graph[*i] == (c, r)).unwrap();
|
||||||
for r_1 in r + 1..ROOMS_HORIZONTAL {
|
for r_1 in r + 1..ROOMS_HORIZONTAL {
|
||||||
if rooms[c][r_1].kind != RoomType::EmptyRoom {
|
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
|
// todo use random weight for edge
|
||||||
graph.add_edge(src_index, tgt_index, 1);
|
graph.add_edge(src_index, tgt_index, 1);
|
||||||
break;
|
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
|
// todo use random weight for edge
|
||||||
graph.add_edge(src_index, tgt_index, 1);
|
graph.add_edge(src_index, tgt_index, 1);
|
||||||
break;
|
break;
|
||||||
@@ -160,7 +167,8 @@ impl LevelGenerator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// calculate a minimum spanning tree
|
// 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() {
|
for edge in mst.raw_edges() {
|
||||||
let src = mst[edge.source()];
|
let src = mst[edge.source()];
|
||||||
let tgt = mst[edge.target()];
|
let tgt = mst[edge.target()];
|
||||||
@@ -170,24 +178,31 @@ impl LevelGenerator {
|
|||||||
|
|
||||||
// cols are the same, either up or down
|
// cols are the same, either up or down
|
||||||
if src.0 == tgt.0 {
|
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 {
|
} else {
|
||||||
position = rng.gen_range(range);
|
rng.gen_range(range)
|
||||||
}
|
};
|
||||||
if src.1 < tgt.1 {
|
if src.1 < tgt.1 {
|
||||||
// src to tgt
|
// 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 {
|
} else {
|
||||||
// tgt to src
|
// 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
|
// rows are the same, either left or right
|
||||||
if src.1 == tgt.1 {
|
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;
|
let mut position: usize;
|
||||||
if range.is_empty() {
|
if range.is_empty() {
|
||||||
position = range.start;
|
position = range.start;
|
||||||
@@ -199,18 +214,21 @@ impl LevelGenerator {
|
|||||||
}
|
}
|
||||||
if src.0 < tgt.0 {
|
if src.0 < tgt.0 {
|
||||||
// src to tgt
|
// 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 {
|
} else {
|
||||||
// tgt to src
|
// 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,
|
|
||||||
level,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn range_overlap(r1: Range<usize>, r2: Range<usize>) -> Range<usize> {
|
fn range_overlap(r1: Range<usize>, r2: Range<usize>) -> Range<usize> {
|
||||||
@@ -224,8 +242,8 @@ impl LevelGenerator {
|
|||||||
for r in 0..ROOMS_HORIZONTAL {
|
for r in 0..ROOMS_HORIZONTAL {
|
||||||
if rooms[c][r].kind != RoomType::EmptyRoom {
|
if rooms[c][r].kind != RoomType::EmptyRoom {
|
||||||
let mut connected = 0;
|
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;
|
connected += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -240,11 +258,12 @@ impl LevelGenerator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
true
|
||||||
}
|
}
|
||||||
pub fn render(&self) -> Level {
|
pub fn render(&self) -> Level {
|
||||||
let mut rng = rand::thread_rng();
|
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];
|
||||||
|
1 + ROOMS_VERTICAL * ROOM_WIDTH];
|
||||||
let mut artifacts: Vec<Box<dyn Artifact>> = Vec::with_capacity(10);
|
let mut artifacts: Vec<Box<dyn Artifact>> = Vec::with_capacity(10);
|
||||||
let mut enemies: Vec<Box<dyn Monster>> = Vec::with_capacity(10);
|
let mut enemies: Vec<Box<dyn Monster>> = Vec::with_capacity(10);
|
||||||
let mut start_x: usize = 0;
|
let mut start_x: usize = 0;
|
||||||
@@ -258,7 +277,8 @@ impl LevelGenerator {
|
|||||||
let room = self.rooms[c][r];
|
let room = self.rooms[c][r];
|
||||||
for x in 0..room.width {
|
for x in 0..room.width {
|
||||||
for y in 0..room.height {
|
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 {
|
if room.kind == RoomType::TreasureRoom {
|
||||||
@@ -266,8 +286,14 @@ impl LevelGenerator {
|
|||||||
let t_y = top + room.offset_y + rng.gen_range(0..room.height);
|
let t_y = top + room.offset_y + rng.gen_range(0..room.height);
|
||||||
// TODO randomize artifacts
|
// TODO randomize artifacts
|
||||||
match rng.gen_range(1..=100) {
|
match rng.gen_range(1..=100) {
|
||||||
1..=50 => { artifacts.push(Box::new(Chest::new(Position::new(self.level, t_x, t_y)))); }
|
1..=50 => {
|
||||||
_ => { artifacts.push(Box::new(Potion::new(Position::new(self.level, t_x, t_y)))); }
|
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 {
|
if room.kind == RoomType::MonsterRoom {
|
||||||
@@ -275,11 +301,20 @@ impl LevelGenerator {
|
|||||||
let t_y = top + room.offset_y + rng.gen_range(0..room.height);
|
let t_y = top + room.offset_y + rng.gen_range(0..room.height);
|
||||||
// TODO randomize enemies here
|
// TODO randomize enemies here
|
||||||
match rng.gen_range(1..=100) {
|
match rng.gen_range(1..=100) {
|
||||||
1..=50 => {
|
1..=30 => {
|
||||||
enemies.push(Box::new(LowerDaemon::new_with_position(Position::new(self.level, t_x, t_y))));
|
enemies.push(Box::new(Orc::new_with_position(Position::new(
|
||||||
|
self.level, t_x, t_y,
|
||||||
|
))));
|
||||||
|
}
|
||||||
|
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))));
|
enemies.push(Box::new(Rat::new_with_position(Position::new(
|
||||||
|
self.level, t_x, t_y,
|
||||||
|
))));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -315,7 +350,10 @@ impl LevelGenerator {
|
|||||||
let tgt_room = self.rooms[c][r + x_conn.distance];
|
let tgt_room = self.rooms[c][r + x_conn.distance];
|
||||||
let top = 1 + r * ROOM_HEIGHT + src_room.offset_y;
|
let top = 1 + r * ROOM_HEIGHT + src_room.offset_y;
|
||||||
let left = 1 + c * ROOM_WIDTH + x_conn.offset;
|
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 {
|
for i in top..bottom {
|
||||||
if structure[left][i] == StructureElement::Wall {
|
if structure[left][i] == StructureElement::Wall {
|
||||||
structure[left][i] = StructureElement::Floor;
|
structure[left][i] = StructureElement::Floor;
|
||||||
@@ -327,10 +365,11 @@ impl LevelGenerator {
|
|||||||
|
|
||||||
let top = 1 + r * ROOM_HEIGHT + src_room.offset_y + y_conn.offset - 1;
|
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 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -339,11 +378,13 @@ impl LevelGenerator {
|
|||||||
Level {
|
Level {
|
||||||
level: self.level,
|
level: self.level,
|
||||||
structure,
|
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,
|
monsters: enemies,
|
||||||
artifacts,
|
artifacts,
|
||||||
start: (start_x, start_y),
|
start: (start_x, start_y),
|
||||||
end: (end_x, end_y),
|
end: (end_x, end_y),
|
||||||
|
rng: rand::thread_rng(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,22 +9,11 @@ use crate::position::HasPosition;
|
|||||||
|
|
||||||
const FG_BROWN: Color = Color::Rgb(186, 74, 0);
|
const FG_BROWN: Color = Color::Rgb(186, 74, 0);
|
||||||
|
|
||||||
pub struct LevelWidget {
|
pub struct LevelWidget {}
|
||||||
use_fog_of_war: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl LevelWidget {
|
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) {
|
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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,7 +35,7 @@ impl StatefulWidget for LevelWidget {
|
|||||||
let level = state.get_mutable_level(player_level);
|
let level = state.get_mutable_level(player_level);
|
||||||
let level_x = (x - al) as i16;
|
let level_x = (x - al) as i16;
|
||||||
let level_y = (y - at) as i16;
|
let level_y = (y - at) as i16;
|
||||||
match level.get_element(level_x, level_y, self.use_fog_of_war) {
|
match level.get_element(level_x, level_y) {
|
||||||
(Some(structure_element), None, None) => {
|
(Some(structure_element), None, None) => {
|
||||||
match structure_element {
|
match structure_element {
|
||||||
StructureElement::Start => {
|
StructureElement::Start => {
|
||||||
@@ -56,7 +45,7 @@ impl StatefulWidget for LevelWidget {
|
|||||||
self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
|
self.set_cell(buf, x, y, "Ω", Color::Black, Color::Gray);
|
||||||
}
|
}
|
||||||
StructureElement::Wall => {
|
StructureElement::Wall => {
|
||||||
// TODO add fancy walls
|
// TODO add fancy walls with https://en.wikipedia.org/wiki/Box-drawing_characters
|
||||||
self.set_cell(buf, x, y, "#", FG_BROWN, Color::Gray);
|
self.set_cell(buf, x, y, "#", FG_BROWN, Color::Gray);
|
||||||
}
|
}
|
||||||
StructureElement::Floor => {
|
StructureElement::Floor => {
|
||||||
|
|||||||
210
src/main.rs
210
src/main.rs
@@ -1,80 +1,56 @@
|
|||||||
use std::cmp::min;
|
|
||||||
use std::io::{Result, Stdout};
|
|
||||||
use std::io::stdout;
|
use std::io::stdout;
|
||||||
use std::string::ToString;
|
use std::io::Result;
|
||||||
use std::time::Instant;
|
use std::time::Instant;
|
||||||
|
|
||||||
use clap::Parser;
|
|
||||||
use crossterm::{
|
use crossterm::{
|
||||||
event::{self, KeyCode, KeyEventKind},
|
event::{self, KeyCode, KeyEventKind},
|
||||||
ExecutableCommand,
|
|
||||||
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
||||||
|
ExecutableCommand,
|
||||||
};
|
};
|
||||||
|
use ratatui::prelude::*;
|
||||||
|
use ratatui::widgets::block::{Position, Title};
|
||||||
|
use ratatui::widgets::{Block, BorderType, Borders, Wrap};
|
||||||
use ratatui::{
|
use ratatui::{
|
||||||
prelude::{CrosstermBackend, Terminal},
|
prelude::{CrosstermBackend, Terminal},
|
||||||
widgets::Paragraph,
|
widgets::Paragraph,
|
||||||
};
|
};
|
||||||
use ratatui::prelude::*;
|
|
||||||
use ratatui::widgets::{Block, Borders, BorderType, Wrap};
|
|
||||||
use ratatui::widgets::block::{Position, Title};
|
|
||||||
use whoami::realname;
|
use whoami::realname;
|
||||||
|
|
||||||
use crate::dungeon_slayer::PlayerStats;
|
|
||||||
use crate::game::{Game, GameState};
|
use crate::game::{Game, GameState};
|
||||||
use crate::level_widget::LevelWidget;
|
use crate::level_widget::LevelWidget;
|
||||||
use crate::player::Player;
|
use crate::player::Player;
|
||||||
use crate::position::HasPosition;
|
use crate::position::HasPosition;
|
||||||
|
|
||||||
mod game;
|
|
||||||
mod player;
|
|
||||||
mod level;
|
|
||||||
mod position;
|
|
||||||
mod level_widget;
|
|
||||||
mod level_generator;
|
|
||||||
mod artifacts;
|
mod artifacts;
|
||||||
|
mod game;
|
||||||
|
mod level;
|
||||||
|
mod level_generator;
|
||||||
|
mod level_widget;
|
||||||
mod monster;
|
mod monster;
|
||||||
mod dungeon_slayer;
|
mod player;
|
||||||
|
mod position;
|
||||||
|
|
||||||
/// length of a game frame in ms
|
/// length of a game frame in ms
|
||||||
pub const FRAME_LENGTH: u64 = 100;
|
pub const FRAME_LENGTH: u64 = 100;
|
||||||
|
|
||||||
#[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<()> {
|
fn main() -> Result<()> {
|
||||||
let cli_options = CliOptions::parse();
|
let mut game = Game::new(Player::new(realname().as_str(), 30));
|
||||||
|
|
||||||
stdout().execute(EnterAlternateScreen)?;
|
stdout().execute(EnterAlternateScreen)?;
|
||||||
enable_raw_mode()?;
|
enable_raw_mode()?;
|
||||||
let mut terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
|
let mut terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
|
||||||
terminal.clear()?;
|
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 start_time = Instant::now();
|
||||||
let mut ticks = 0;
|
let mut ticks = 0;
|
||||||
loop {
|
loop {
|
||||||
terminal.draw(|frame| {
|
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)
|
// 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.
|
// to prevent the read drawing code from crashing the game.
|
||||||
@@ -107,7 +83,7 @@ fn play_game(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
|
|||||||
width: level::LEVEL_WIDTH as u16,
|
width: level::LEVEL_WIDTH as u16,
|
||||||
height: level::LEVEL_HEIGHT as u16,
|
height: level::LEVEL_HEIGHT as u16,
|
||||||
};
|
};
|
||||||
frame.render_stateful_widget(LevelWidget::new(game.uses_fog_of_war()), map_area, &mut game);
|
frame.render_stateful_widget(LevelWidget {}, map_area, &mut game);
|
||||||
|
|
||||||
let stats_area = Rect {
|
let stats_area = Rect {
|
||||||
x: area.x + 50,
|
x: area.x + 50,
|
||||||
@@ -117,23 +93,25 @@ fn play_game(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
|
|||||||
};
|
};
|
||||||
let block = Block::default()
|
let block = Block::default()
|
||||||
.title(
|
.title(
|
||||||
Title::from(
|
Title::from(format!(" {} ", game.get_player().get_name()))
|
||||||
format!(" {} ", game.get_player().get_name()))
|
|
||||||
.alignment(Alignment::Center)
|
.alignment(Alignment::Center)
|
||||||
.position(Position::Top)
|
.position(Position::Top),
|
||||||
)
|
)
|
||||||
.borders(Borders::TOP)
|
.borders(Borders::TOP)
|
||||||
.border_style(Style::default().fg(Color::White))
|
.border_style(Style::default().fg(Color::White))
|
||||||
.border_type(BorderType::Rounded)
|
.border_type(BorderType::Rounded)
|
||||||
.style(Style::default().bg(Color::Blue));
|
.style(Style::default().bg(Color::Blue));
|
||||||
frame.render_widget(
|
frame.render_widget(
|
||||||
Paragraph::new(format!("Health: {}/{}\nExp: {}\nGold: {}\nLevel: {}",
|
Paragraph::new(format!(
|
||||||
game.get_player().get_life(),
|
"Health: {}/{}\nExp: {}\nGold: {}\nLevel: {}",
|
||||||
game.get_player().get_max_life(),
|
game.get_player().get_life(),
|
||||||
game.get_player().get_experience(),
|
game.get_player().get_max_life(),
|
||||||
game.get_player().get_gold(),
|
game.get_player().get_experience(),
|
||||||
game.get_player().get_immutable_position().get_level()))
|
game.get_player().get_gold(),
|
||||||
.block(block).wrap(Wrap { trim: true }),
|
game.get_player().get_immutable_position().get_level() + 1
|
||||||
|
))
|
||||||
|
.block(block)
|
||||||
|
.wrap(Wrap { trim: true }),
|
||||||
stats_area,
|
stats_area,
|
||||||
);
|
);
|
||||||
let messages_area = Rect {
|
let messages_area = Rect {
|
||||||
@@ -144,53 +122,46 @@ fn play_game(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
|
|||||||
};
|
};
|
||||||
// Display the latest messages from the game to the user
|
// Display the latest messages from the game to the user
|
||||||
let block = Block::default()
|
let block = Block::default()
|
||||||
.title(Title::from(" messages ").alignment(Alignment::Center).position(Position::Top))
|
.title(
|
||||||
|
Title::from(" messages ")
|
||||||
|
.alignment(Alignment::Center)
|
||||||
|
.position(Position::Top),
|
||||||
|
)
|
||||||
.borders(Borders::TOP)
|
.borders(Borders::TOP)
|
||||||
.border_style(Style::default().fg(Color::White))
|
.border_style(Style::default().fg(Color::White))
|
||||||
.border_type(BorderType::Rounded)
|
.border_type(BorderType::Rounded)
|
||||||
.style(Style::default().bg(Color::Blue));
|
.style(Style::default().bg(Color::Blue));
|
||||||
|
|
||||||
let paragraph1 = if game.messages.is_empty() { "".to_string() } else { format!("> {}", game.messages.join("\n> ")) };
|
let paragraph1 = if game.messages.is_empty() {
|
||||||
|
"".to_string()
|
||||||
|
} else {
|
||||||
|
format!("> {}", game.messages.join("\n> "))
|
||||||
|
};
|
||||||
frame.render_widget(
|
frame.render_widget(
|
||||||
Paragraph::new(paragraph1).block(block).wrap(Wrap { trim: true }),
|
Paragraph::new(paragraph1)
|
||||||
|
.block(block)
|
||||||
|
.wrap(Wrap { trim: true }),
|
||||||
messages_area,
|
messages_area,
|
||||||
);
|
);
|
||||||
})?;
|
})?;
|
||||||
let mut player_moved = false;
|
|
||||||
if event::poll(std::time::Duration::from_millis(FRAME_LENGTH))? {
|
if event::poll(std::time::Duration::from_millis(FRAME_LENGTH))? {
|
||||||
if let event::Event::Key(key) = event::read()? {
|
if let event::Event::Key(key) = event::read()? {
|
||||||
if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('v') {
|
if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('v') {
|
||||||
game.messages.insert(0, format!("You are playing version '{}'.", env!("GIT_HASH")).to_string());
|
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') {
|
if key.kind == KeyEventKind::Press && key.code == KeyCode::Char('q') {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if key.kind == KeyEventKind::Press {
|
if key.kind == KeyEventKind::Press {
|
||||||
let new_pos = match key.code {
|
let new_pos = match key.code {
|
||||||
KeyCode::Left => {
|
KeyCode::Left => game.move_player(-1, 0),
|
||||||
player_moved = true;
|
KeyCode::Right => game.move_player(1, 0),
|
||||||
game.move_player(-1, 0)
|
KeyCode::Up => game.move_player(0, -1),
|
||||||
}
|
KeyCode::Down => game.move_player(0, 1),
|
||||||
KeyCode::Right => {
|
_ => (0, 0),
|
||||||
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() {
|
if !game.player_fights_monster() {
|
||||||
// player attacked monster but did not kill it
|
// player attacked monster but did not kill it
|
||||||
@@ -200,8 +171,8 @@ fn play_game(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
game.update_level(ticks, player_moved);
|
game.update_level(ticks);
|
||||||
if game.get_game_state() != GameState::RUNNING {
|
if game.get_game_state() != GameState::Running {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ticks += 1;
|
ticks += 1;
|
||||||
@@ -209,7 +180,7 @@ fn play_game(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
|
|||||||
let playtime = start_time.elapsed();
|
let playtime = start_time.elapsed();
|
||||||
loop {
|
loop {
|
||||||
let _ = terminal.draw(|frame| {
|
let _ = terminal.draw(|frame| {
|
||||||
let mut area = frame.size();
|
let mut area = frame.area();
|
||||||
let w = area.width / 2;
|
let w = area.width / 2;
|
||||||
let h = area.height / 2;
|
let h = area.height / 2;
|
||||||
area.x += w - 20;
|
area.x += w - 20;
|
||||||
@@ -217,24 +188,33 @@ fn play_game(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
|
|||||||
area.width = 40;
|
area.width = 40;
|
||||||
area.height = 20;
|
area.height = 20;
|
||||||
let block = Block::default()
|
let block = Block::default()
|
||||||
.title(Title::from(" Game ended ").alignment(Alignment::Center).position(Position::Top))
|
.title(
|
||||||
|
Title::from(" Game ended ")
|
||||||
|
.alignment(Alignment::Center)
|
||||||
|
.position(Position::Top),
|
||||||
|
)
|
||||||
.title(Title::from("Press `q` to quit!").position(Position::Bottom))
|
.title(Title::from("Press `q` to quit!").position(Position::Bottom))
|
||||||
.borders(Borders::ALL)
|
.borders(Borders::ALL)
|
||||||
.border_style(Style::default().fg(Color::White))
|
.border_style(Style::default().fg(Color::White))
|
||||||
.border_type(BorderType::Rounded)
|
.border_type(BorderType::Rounded)
|
||||||
.style(Style::default().bg(Color::Black));
|
.style(Style::default().bg(Color::Black));
|
||||||
let mut text = match game.get_game_state() {
|
let mut text = match game.get_game_state() {
|
||||||
GameState::RUNNING => {
|
GameState::Running => {
|
||||||
"Quitting is for cowards! You'll better try again!".to_string()
|
"Quitting is for cowards! You'll better try again!".to_string()
|
||||||
}
|
}
|
||||||
GameState::LOST => {
|
GameState::Lost => {
|
||||||
format!("Sorry, you died in the dungeon. Better luck next time!\nLast message:\n{}", game.messages[0]).to_string()
|
"Sorry, you died in the dungeon. Better luck next time!".to_string()
|
||||||
}
|
}
|
||||||
GameState::WON => {
|
GameState::Won => {
|
||||||
"Congratulation! You mastered your way through the dungeon and won the game.".to_string()
|
"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 gained {} experience.",
|
||||||
|
game.get_player().get_experience()
|
||||||
|
)
|
||||||
|
.as_str();
|
||||||
text += format!("\nYou collected {} gold.", game.get_player().get_gold()).as_str();
|
text += format!("\nYou collected {} gold.", game.get_player().get_gold()).as_str();
|
||||||
text += format!("\nYou played {} seconds.", playtime.as_secs()).as_str();
|
text += format!("\nYou played {} seconds.", playtime.as_secs()).as_str();
|
||||||
let paragraph = Paragraph::new(text).block(block).wrap(Wrap { trim: true });
|
let paragraph = Paragraph::new(text).block(block).wrap(Wrap { trim: true });
|
||||||
@@ -248,51 +228,7 @@ fn play_game(terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
stdout().execute(LeaveAlternateScreen)?;
|
||||||
|
disable_raw_mode()?;
|
||||||
Ok(())
|
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
227
src/monster.rs
227
src/monster.rs
@@ -1,10 +1,9 @@
|
|||||||
|
use std::ops::RangeInclusive;
|
||||||
|
|
||||||
|
use rand::Rng;
|
||||||
use ratatui::prelude::Color;
|
use ratatui::prelude::Color;
|
||||||
|
|
||||||
use crate::dungeon_slayer::MonsterStats;
|
|
||||||
use crate::level::Level;
|
|
||||||
use crate::position::{HasPosition, Position};
|
use crate::position::{HasPosition, Position};
|
||||||
use rand::Rng;
|
|
||||||
|
|
||||||
|
|
||||||
pub trait Monster: HasPosition {
|
pub trait Monster: HasPosition {
|
||||||
fn get_name(&self) -> &str;
|
fn get_name(&self) -> &str;
|
||||||
@@ -14,15 +13,23 @@ pub trait Monster: HasPosition {
|
|||||||
// fn get_immutable_position(&self) -> &Position;
|
// fn get_immutable_position(&self) -> &Position;
|
||||||
fn get_experience_gain(&self) -> usize;
|
fn get_experience_gain(&self) -> usize;
|
||||||
fn get_ticks_between_steps(&self) -> u128;
|
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)]
|
#[cfg(test)]
|
||||||
fn get_life(&self) -> usize;
|
fn get_life(&self) -> usize;
|
||||||
|
fn damage(&self) -> usize;
|
||||||
}
|
}
|
||||||
|
|
||||||
macro_rules! default_monster {
|
macro_rules! create_monster {
|
||||||
($($t:ty),+ $(,)?) => ($(
|
($($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 {
|
impl Monster for $t {
|
||||||
fn get_name(&self) -> &str { &self.name }
|
fn get_name(&self) -> &str { &self.name }
|
||||||
fn is_dead(&self) -> bool { self.life <= 0 }
|
fn is_dead(&self) -> bool { self.life <= 0 }
|
||||||
@@ -32,11 +39,8 @@ macro_rules! default_monster {
|
|||||||
self.life = self.life.saturating_sub(by);
|
self.life = self.life.saturating_sub(by);
|
||||||
}
|
}
|
||||||
fn get_ticks_between_steps(&self) -> u128 { self.ticks_between_steps }
|
fn get_ticks_between_steps(&self) -> u128 { self.ticks_between_steps }
|
||||||
fn get_defense(&self) -> u8 { self.monster_stats.defense }
|
fn damage(&self) -> usize { rand::thread_rng().gen_range(self.damage_range.clone()) }
|
||||||
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)]
|
#[cfg(test)]
|
||||||
fn get_life(&self) -> usize { self.life }
|
fn get_life(&self) -> usize { self.life }
|
||||||
}
|
}
|
||||||
@@ -51,186 +55,53 @@ macro_rules! default_monster {
|
|||||||
)+)
|
)+)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 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 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,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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 {
|
impl Rat {
|
||||||
pub fn new_with_position(position: Position) -> Self {
|
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 {
|
Self {
|
||||||
name: "rat".to_string(),
|
name: "rat".to_string(),
|
||||||
life: monster_stats.max_life as usize,
|
life: 2,
|
||||||
position,
|
position,
|
||||||
symbol: String::from("R"),
|
symbol: String::from("R"),
|
||||||
color: Color::Black,
|
color: Color::Black,
|
||||||
experience_gain: 26,
|
experience_gain: 5,
|
||||||
ticks_between_steps: 25,
|
ticks_between_steps: 5,
|
||||||
monster_stats,
|
damage_range: 1..=2,
|
||||||
}
|
|
||||||
}
|
|
||||||
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);
|
create_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 {
|
impl Orc {
|
||||||
pub fn new_with_position(position: Position) -> Self {
|
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 {
|
Self {
|
||||||
name: "orc".to_string(),
|
name: "orc".to_string(),
|
||||||
life: monster_stats.max_life as usize,
|
life: 4,
|
||||||
position,
|
position,
|
||||||
symbol: String::from("O"),
|
symbol: String::from("O"),
|
||||||
color: Color::DarkGray,
|
color: Color::DarkGray,
|
||||||
experience_gain: 63,
|
experience_gain: 10,
|
||||||
ticks_between_steps: 50,
|
ticks_between_steps: 10,
|
||||||
monster_stats,
|
damage_range: 2..=3,
|
||||||
}
|
|
||||||
}
|
|
||||||
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) }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
create_monster!(Orc);
|
||||||
|
|
||||||
default_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]
|
#[test]
|
||||||
fn monsters_can_move() {
|
fn monsters_can_move() {
|
||||||
@@ -248,17 +119,11 @@ fn monsters_can_move() {
|
|||||||
#[test]
|
#[test]
|
||||||
fn monsters_can_die() {
|
fn monsters_can_die() {
|
||||||
let mut m = Rat::new_with_position(Position::new(0, 0, 0));
|
let mut m = Rat::new_with_position(Position::new(0, 0, 0));
|
||||||
assert_eq!(m.get_life(), 3);
|
assert_eq!(m.get_life(), 2);
|
||||||
assert_eq!(m.is_dead(), false);
|
assert_eq!(m.is_dead(), false);
|
||||||
m.decrease_life(1);
|
m.decrease_life(1);
|
||||||
assert_eq!(m.get_life(), 2);
|
assert_eq!(m.get_life(), 1);
|
||||||
m.decrease_life(3);
|
m.decrease_life(2);
|
||||||
assert_eq!(m.get_life(), 0);
|
assert_eq!(m.get_life(), 0);
|
||||||
assert_eq!(m.is_dead(), true);
|
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);
|
|
||||||
}
|
|
||||||
117
src/player.rs
117
src/player.rs
@@ -1,57 +1,70 @@
|
|||||||
|
use rand::Rng;
|
||||||
use std::cmp::{max, min};
|
use std::cmp::{max, min};
|
||||||
|
|
||||||
use crate::dungeon_slayer::PlayerStats;
|
|
||||||
use crate::position::{HasPosition, Position};
|
use crate::position::{HasPosition, Position};
|
||||||
|
|
||||||
pub struct Player {
|
pub struct Player {
|
||||||
name: String,
|
name: String,
|
||||||
position: Position,
|
position: Position,
|
||||||
life: i16,
|
life: i16,
|
||||||
|
max_life: i16,
|
||||||
gold: usize,
|
gold: usize,
|
||||||
experience: usize,
|
experience: usize,
|
||||||
pub(crate) player_stats: PlayerStats,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Player {
|
impl Player {
|
||||||
pub fn new(name: &str, player_stats: PlayerStats) -> Player {
|
pub fn new(name: &str, max_life: i16) -> Player {
|
||||||
Player {
|
Player {
|
||||||
name: name.to_string(),
|
name: name.to_string(),
|
||||||
position: Position::new(0, 0, 0),
|
position: Position::new(0, 0, 0),
|
||||||
life: player_stats.get_max_life() as i16,
|
life: max_life,
|
||||||
|
max_life,
|
||||||
gold: 0,
|
gold: 0,
|
||||||
experience: 0,
|
experience: 0,
|
||||||
player_stats,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub fn get_name(&self) -> String {
|
pub fn get_name(&self) -> String {
|
||||||
return self.name.clone();
|
self.name.clone()
|
||||||
}
|
}
|
||||||
pub fn decrease_life(&mut self, by: u8) {
|
pub fn change_life(&mut self, by: i16) {
|
||||||
self.life = max(0, self.life.saturating_sub(by as i16));
|
self.life = max(0, min(self.max_life, self.life + by));
|
||||||
}
|
|
||||||
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 {
|
pub fn get_life(&self) -> i16 {
|
||||||
self.life
|
self.life
|
||||||
}
|
}
|
||||||
/// returns true if the player is dead (life <= 0)
|
/// returns true if the player is dead (life <= 0)
|
||||||
pub fn is_dead(&self) -> bool { self.life <= 0 }
|
pub fn is_dead(&self) -> bool {
|
||||||
|
self.life <= 0
|
||||||
|
}
|
||||||
/// returns true if the player's life is at maximum
|
/// returns true if the player's life is at maximum
|
||||||
pub fn is_healthy(&self) -> bool { self.life == self.get_max_life() }
|
pub fn is_healthy(&self) -> bool {
|
||||||
|
self.life == self.max_life
|
||||||
|
}
|
||||||
pub fn get_max_life(&self) -> i16 {
|
pub fn get_max_life(&self) -> i16 {
|
||||||
self.player_stats.get_max_life() as i16
|
self.max_life
|
||||||
}
|
}
|
||||||
|
|
||||||
/// add the given amount to the players gold stash
|
/// add the given amount to the players gold stash
|
||||||
pub fn retrieve_gold(&mut self, amount: usize) { self.gold += amount }
|
pub fn retrieve_gold(&mut self, amount: usize) {
|
||||||
|
self.gold += amount
|
||||||
|
}
|
||||||
|
|
||||||
/// return the size of the players gold stash
|
/// return the size of the players gold stash
|
||||||
pub fn get_gold(&self) -> usize { self.gold }
|
pub fn get_gold(&self) -> usize {
|
||||||
|
self.gold
|
||||||
|
}
|
||||||
|
|
||||||
pub fn gain_experience(&mut self, amount: usize) { self.experience += amount }
|
pub fn gain_experience(&mut self, amount: usize) {
|
||||||
|
self.experience += amount
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_experience(&self) -> usize { self.experience }
|
pub fn get_experience(&self) -> usize {
|
||||||
|
self.experience
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn damage(&self) -> usize {
|
||||||
|
rand::thread_rng().gen_range(1..4)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl HasPosition for Player {
|
impl HasPosition for Player {
|
||||||
@@ -69,37 +82,16 @@ fn test_get_name() {
|
|||||||
name: "Teddy Tester".to_string(),
|
name: "Teddy Tester".to_string(),
|
||||||
position: Position::new(0, 1, 1),
|
position: Position::new(0, 1, 1),
|
||||||
life: 5,
|
life: 5,
|
||||||
|
max_life: 10,
|
||||||
gold: 0,
|
gold: 0,
|
||||||
experience: 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");
|
assert_eq!(p.get_name(), "Teddy Tester");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_can_receive_gold() {
|
fn test_can_receive_gold() {
|
||||||
let player_stats = PlayerStats {
|
let mut p = Player::new("Teddy Tester", 10);
|
||||||
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);
|
assert_eq!(p.get_gold(), 0);
|
||||||
|
|
||||||
p.retrieve_gold(13);
|
p.retrieve_gold(13);
|
||||||
@@ -113,43 +105,22 @@ fn test_change_life() {
|
|||||||
name: "Teddy Tester".to_string(),
|
name: "Teddy Tester".to_string(),
|
||||||
position: Position::new(0, 1, 1),
|
position: Position::new(0, 1, 1),
|
||||||
life: 5,
|
life: 5,
|
||||||
|
max_life: 10,
|
||||||
gold: 0,
|
gold: 0,
|
||||||
experience: 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_life(), 5);
|
assert_eq!(p.get_life(), 5);
|
||||||
p.decrease_life(2);
|
p.change_life(-2);
|
||||||
assert_eq!(p.get_life(), 3);
|
assert_eq!(p.get_life(), 3);
|
||||||
p.increase_life(10);
|
p.change_life(10);
|
||||||
assert_eq!(p.get_life(), 10);
|
assert_eq!(p.get_life(), 10);
|
||||||
p.decrease_life(12);
|
p.change_life(-12);
|
||||||
assert_eq!(p.get_life(), 0);
|
assert_eq!(p.get_life(), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn player_can_move() {
|
fn player_can_move() {
|
||||||
let player_stats = PlayerStats {
|
let mut p = Player::new("Teddy Tester", 10);
|
||||||
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));
|
assert_eq!(p.get_position(), &Position::new(0, 0, 0));
|
||||||
p.get_position().change(1, 2);
|
p.get_position().change(1, 2);
|
||||||
assert_eq!(p.get_position(), &Position::new(0, 1, 2));
|
assert_eq!(p.get_position(), &Position::new(0, 1, 2));
|
||||||
@@ -167,19 +138,9 @@ fn test_max_life() {
|
|||||||
name: "Teddy Tester".to_string(),
|
name: "Teddy Tester".to_string(),
|
||||||
position: Position::new(0, 1, 1),
|
position: Position::new(0, 1, 1),
|
||||||
life: 5,
|
life: 5,
|
||||||
|
max_life: 10,
|
||||||
gold: 0,
|
gold: 0,
|
||||||
experience: 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);
|
assert_eq!(p.get_max_life(), 10);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use std::cmp::{max, min};
|
use std::cmp::max;
|
||||||
|
|
||||||
/// describes an character (PC or NPC) in the dungeon that has a position.
|
/// describes an character (PC or NPC) in the dungeon that has a position.
|
||||||
pub trait HasPosition {
|
pub trait HasPosition {
|
||||||
@@ -8,7 +8,7 @@ pub trait HasPosition {
|
|||||||
fn get_immutable_position(&self) -> &Position;
|
fn get_immutable_position(&self) -> &Position;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(PartialEq, Debug)]
|
#[derive(PartialEq, Debug, Clone, Copy)]
|
||||||
pub struct Position {
|
pub struct Position {
|
||||||
level: usize,
|
level: usize,
|
||||||
x: usize,
|
x: usize,
|
||||||
@@ -17,11 +17,7 @@ pub struct Position {
|
|||||||
|
|
||||||
impl Position {
|
impl Position {
|
||||||
pub fn new(level: usize, x: usize, y: usize) -> Self {
|
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) {
|
pub fn change(&mut self, dx: i16, dy: i16) -> (usize, usize) {
|
||||||
self.x = max((self.x as i16) + dx, 0) as usize;
|
self.x = max((self.x as i16) + dx, 0) as usize;
|
||||||
@@ -42,29 +38,9 @@ impl Position {
|
|||||||
self.x
|
self.x
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_y(&self) -> usize { self.y }
|
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]
|
#[test]
|
||||||
@@ -95,4 +71,4 @@ fn test_position_set() {
|
|||||||
assert_eq!(p.get_level(), 1);
|
assert_eq!(p.get_level(), 1);
|
||||||
assert_eq!(p.get_x(), 2);
|
assert_eq!(p.get_x(), 2);
|
||||||
assert_eq!(p.get_y(), 3);
|
assert_eq!(p.get_y(), 3);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user