Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen

Browse Source
This commit is contained in:
Joshua Yanovski 2023-04-08 02:59:23 -07:00
commit 14ea19be34
414 changed files with 7827 additions and 2905 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
will only lock the camera zoom while movement and combat inputs are also being pressed. will only lock the camera zoom while movement and combat inputs are also being pressed.
- Custom spots can be added without recompilation (only ron and vox files) - Custom spots can be added without recompilation (only ron and vox files)
- Setting in userdata/server/server_config/settings.ron that controls the length of each day/night cycle. - Setting in userdata/server/server_config/settings.ron that controls the length of each day/night cycle.
- Starting site can now be chosen during character creation
- Durability loss of equipped items on death
### Changed ### Changed
- Bats move slower and use a simple proportional controller to maintain altitude - Bats move slower and use a simple proportional controller to maintain altitude
@ -30,6 +32,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Climbing no longer requires having 10 energy - Climbing no longer requires having 10 energy
- Castles will now be placed close to towns - Castles will now be placed close to towns
- Sword - Sword
- Rescaling of images for the UI is now done when sampling from them on the GPU. Improvements are
particularily noticeable when opening the map screen (which involves rescaling a few large
images) and also when using the voxel minimap view (where a medium size image is updated often).
### Removed ### Removed
@ -43,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added SFX to the new sword abilities - Added SFX to the new sword abilities
- Fixed various issues with showing the correct text hint for interactable blocks. - Fixed various issues with showing the correct text hint for interactable blocks.
- Intert entities like arrows no longer obstruct interacting with nearby entities/blocks. - Intert entities like arrows no longer obstruct interacting with nearby entities/blocks.
- Underwater fall damage
## [0.14.0] - 2023-01-07 ## [0.14.0] - 2023-01-07

385
Cargo.lock generated
View File

@ -24,7 +24,7 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
dependencies = [ dependencies = [
"gimli 0.26.2", "gimli",
] ]
[[package]] [[package]]
@ -62,7 +62,7 @@ checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [ dependencies = [
"getrandom 0.2.7", "getrandom 0.2.7",
"once_cell", "once_cell",
"version_check 0.9.4", "version_check",
] ]
[[package]] [[package]]
@ -74,7 +74,7 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"getrandom 0.2.7", "getrandom 0.2.7",
"once_cell", "once_cell",
"version_check 0.9.4", "version_check",
] ]
[[package]] [[package]]
@ -130,16 +130,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "ansi-parser"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcb2392079bf27198570d6af79ecbd9ec7d8f16d3ec6b60933922fdb66287127"
dependencies = [
"heapless 0.5.6",
"nom 4.2.3",
]
[[package]] [[package]]
name = "ansi_term" name = "ansi_term"
version = "0.12.1" version = "0.12.1"
@ -241,18 +231,6 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
name = "as-slice"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45403b49e3954a4b8428a0ac21a4b7afadccf92bfd96273f1a58cd4812496ae0"
dependencies = [
"generic-array 0.12.4",
"generic-array 0.13.3",
"generic-array 0.14.6",
"stable_deref_trait",
]
[[package]] [[package]]
name = "ash" name = "ash"
version = "0.32.1" version = "0.32.1"
@ -515,7 +493,7 @@ version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
dependencies = [ dependencies = [
"generic-array 0.14.6", "generic-array",
] ]
[[package]] [[package]]
@ -605,6 +583,12 @@ dependencies = [
"nix 0.18.0", "nix 0.18.0",
] ]
[[package]]
name = "cansi"
version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bdcae87153686017415ce77e48c53e6818a0a058f0e21b56640d1e944967ef8"
[[package]] [[package]]
name = "cassowary" name = "cassowary"
version = "0.3.0" version = "0.3.0"
@ -656,7 +640,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
dependencies = [ dependencies = [
"nom 7.1.1", "nom",
] ]
[[package]] [[package]]
@ -838,7 +822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921"
dependencies = [ dependencies = [
"thiserror", "thiserror",
"x11rb", "x11rb 0.9.0",
] ]
[[package]] [[package]]
@ -928,7 +912,7 @@ dependencies = [
[[package]] [[package]]
name = "conrod_core" name = "conrod_core"
version = "0.63.0" version = "0.63.0"
source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d" source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986"
dependencies = [ dependencies = [
"conrod_derive", "conrod_derive",
"copypasta", "copypasta",
@ -943,7 +927,7 @@ dependencies = [
[[package]] [[package]]
name = "conrod_derive" name = "conrod_derive"
version = "0.63.0" version = "0.63.0"
source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d" source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986"
dependencies = [ dependencies = [
"proc-macro2 0.4.30", "proc-macro2 0.4.30",
"quote 0.6.13", "quote 0.6.13",
@ -953,7 +937,7 @@ dependencies = [
[[package]] [[package]]
name = "conrod_winit" name = "conrod_winit"
version = "0.63.0" version = "0.63.0"
source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#ca9fd429ca7db854e018acc6dcb2cd8abd9e070d" source = "git+https://gitlab.com/veloren/conrod.git?branch=copypasta_0.7#59fddc617696e68d28a75c2137a08c2572efb986"
[[package]] [[package]]
name = "const-random" name = "const-random"
@ -1000,9 +984,9 @@ checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"
[[package]] [[package]]
name = "copypasta" name = "copypasta"
version = "0.7.1" version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4423d79fed83ebd9ab81ec21fa97144300a961782158287dc9bf7eddac37ff0b" checksum = "133fc8675ee3a4ec9aa513584deda9aa0faeda3586b87f7f0f2ba082c66fb172"
dependencies = [ dependencies = [
"clipboard-win 3.1.1", "clipboard-win 3.1.1",
"objc", "objc",
@ -1125,6 +1109,19 @@ dependencies = [
"bindgen", "bindgen",
] ]
[[package]]
name = "corosensei"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9847f90f32a50b0dcbd68bc23ff242798b13080b97b0569f6ed96a45ce4cf2cd"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"libc",
"scopeguard",
"windows-sys 0.33.0",
]
[[package]] [[package]]
name = "cortex-m" name = "cortex-m"
version = "0.7.6" version = "0.7.6"
@ -1198,24 +1195,24 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-bforest" name = "cranelift-bforest"
version = "0.76.0" version = "0.82.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e6bea67967505247f54fa2c85cf4f6e0e31c4e5692c9b70e4ae58e339067333" checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75"
dependencies = [ dependencies = [
"cranelift-entity", "cranelift-entity",
] ]
[[package]] [[package]]
name = "cranelift-codegen" name = "cranelift-codegen"
version = "0.76.0" version = "0.82.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48194035d2752bdd5bdae429e3ab88676e95f52a2b1355a5d4e809f9e39b1d74" checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b"
dependencies = [ dependencies = [
"cranelift-bforest", "cranelift-bforest",
"cranelift-codegen-meta", "cranelift-codegen-meta",
"cranelift-codegen-shared", "cranelift-codegen-shared",
"cranelift-entity", "cranelift-entity",
"gimli 0.25.0", "gimli",
"log", "log",
"regalloc", "regalloc",
"smallvec", "smallvec",
@ -1224,31 +1221,30 @@ dependencies = [
[[package]] [[package]]
name = "cranelift-codegen-meta" name = "cranelift-codegen-meta"
version = "0.76.0" version = "0.82.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "976efb22fcab4f2cd6bd4e9913764616a54d895c1a23530128d04e03633c555f" checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24"
dependencies = [ dependencies = [
"cranelift-codegen-shared", "cranelift-codegen-shared",
"cranelift-entity",
] ]
[[package]] [[package]]
name = "cranelift-codegen-shared" name = "cranelift-codegen-shared"
version = "0.76.0" version = "0.82.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dabb5fe66e04d4652e434195b45ae65b5c8172d520247b8f66d8df42b2b45dc" checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc"
[[package]] [[package]]
name = "cranelift-entity" name = "cranelift-entity"
version = "0.76.0" version = "0.82.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3329733e4d4b8e91c809efcaa4faee80bf66f20164e3dd16d707346bd3494799" checksum = "9e3bfe172b83167604601faf9dc60453e0d0a93415b57a9c4d1a7ae6849185cf"
[[package]] [[package]]
name = "cranelift-frontend" name = "cranelift-frontend"
version = "0.76.0" version = "0.82.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "279afcc0d3e651b773f94837c3d581177b348c8d69e928104b2e9fccb226f921" checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce"
dependencies = [ dependencies = [
"cranelift-codegen", "cranelift-codegen",
"log", "log",
@ -1483,7 +1479,7 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [ dependencies = [
"generic-array 0.14.6", "generic-array",
"typenum", "typenum",
] ]
@ -1754,7 +1750,7 @@ dependencies = [
"ahash 0.8.0", "ahash 0.8.0",
"lazy_static", "lazy_static",
"log", "log",
"nom 7.1.1", "nom",
] ]
[[package]] [[package]]
@ -2295,24 +2291,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "generic-array"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
dependencies = [
"typenum",
]
[[package]]
name = "generic-array"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
dependencies = [
"typenum",
]
[[package]] [[package]]
name = "generic-array" name = "generic-array"
version = "0.14.6" version = "0.14.6"
@ -2320,7 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
dependencies = [ dependencies = [
"typenum", "typenum",
"version_check 0.9.4", "version_check",
] ]
[[package]] [[package]]
@ -2536,28 +2514,22 @@ dependencies = [
[[package]] [[package]]
name = "gimli" name = "gimli"
version = "0.25.0" version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
dependencies = [ dependencies = [
"fallible-iterator", "fallible-iterator",
"indexmap", "indexmap",
"stable_deref_trait", "stable_deref_trait",
] ]
[[package]]
name = "gimli"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
[[package]] [[package]]
name = "glam" name = "glam"
version = "0.10.2" version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15" checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15"
dependencies = [ dependencies = [
"version_check 0.9.4", "version_check",
] ]
[[package]] [[package]]
@ -2691,15 +2663,6 @@ version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
[[package]]
name = "hash32"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc"
dependencies = [
"byteorder",
]
[[package]] [[package]]
name = "hash32" name = "hash32"
version = "0.2.1" version = "0.2.1"
@ -2747,18 +2710,6 @@ dependencies = [
"hashbrown 0.9.1", "hashbrown 0.9.1",
] ]
[[package]]
name = "heapless"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1"
dependencies = [
"as-slice",
"generic-array 0.13.3",
"hash32 0.1.1",
"stable_deref_trait",
]
[[package]] [[package]]
name = "heapless" name = "heapless"
version = "0.7.16" version = "0.7.16"
@ -2766,7 +2717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
dependencies = [ dependencies = [
"atomic-polyfill", "atomic-polyfill",
"hash32 0.2.1", "hash32",
"rustc_version 0.4.0", "rustc_version 0.4.0",
"spin 0.9.4", "spin 0.9.4",
"stable_deref_trait", "stable_deref_trait",
@ -3179,7 +3130,7 @@ dependencies = [
"wayland-client 0.29.5", "wayland-client 0.29.5",
"winapi 0.3.9", "winapi 0.3.9",
"winit", "winit",
"xcb 1.2.0", "xcb",
"xkbcommon", "xkbcommon",
] ]
@ -3917,29 +3868,9 @@ dependencies = [
[[package]] [[package]]
name = "nom" name = "nom"
version = "4.2.3" version = "7.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
dependencies = [
"memchr",
"version_check 0.1.5",
]
[[package]]
name = "nom"
version = "5.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
dependencies = [
"memchr",
"version_check 0.9.4",
]
[[package]]
name = "nom"
version = "7.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
dependencies = [ dependencies = [
"memchr", "memchr",
"minimal-lexical", "minimal-lexical",
@ -4642,7 +4573,7 @@ dependencies = [
"proc-macro2 1.0.43", "proc-macro2 1.0.43",
"quote 1.0.21", "quote 1.0.21",
"syn 1.0.100", "syn 1.0.100",
"version_check 0.9.4", "version_check",
] ]
[[package]] [[package]]
@ -4653,7 +4584,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [ dependencies = [
"proc-macro2 1.0.43", "proc-macro2 1.0.43",
"quote 1.0.21", "quote 1.0.21",
"version_check 0.9.4", "version_check",
] ]
[[package]] [[package]]
@ -5076,9 +5007,9 @@ dependencies = [
[[package]] [[package]]
name = "regalloc" name = "regalloc"
version = "0.0.31" version = "0.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5" checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02"
dependencies = [ dependencies = [
"log", "log",
"rustc-hash", "rustc-hash",
@ -5281,7 +5212,7 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b40f1bfe5acdab44bc63e6699c28b74f75ec43afb59f3eda01e145aff86a25fa" checksum = "b40f1bfe5acdab44bc63e6699c28b74f75ec43afb59f3eda01e145aff86a25fa"
dependencies = [ dependencies = [
"heapless 0.7.16", "heapless",
"num-traits", "num-traits",
"smallvec", "smallvec",
] ]
@ -5870,7 +5801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
dependencies = [ dependencies = [
"serde", "serde",
"version_check 0.9.4", "version_check",
] ]
[[package]] [[package]]
@ -6597,11 +6528,11 @@ dependencies = [
[[package]] [[package]]
name = "tynm" name = "tynm"
version = "0.1.6" version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4df2caa2dc9c3d1f7641ba981f4cd40ab229775aa7aeb834c9ab2850d50623d" checksum = "cd59ecde1e694c0495c8b92bdd0f9a70e3b489cd8180fc6a18f6ea1c1026f3b2"
dependencies = [ dependencies = [
"nom 5.1.2", "nom",
] ]
[[package]] [[package]]
@ -6625,7 +6556,7 @@ version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
dependencies = [ dependencies = [
"version_check 0.9.4", "version_check",
] ]
[[package]] [[package]]
@ -7025,7 +6956,7 @@ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"futures-core", "futures-core",
"futures-util", "futures-util",
"hashbrown 0.12.3", "hashbrown 0.11.2",
"lazy_static", "lazy_static",
"lz-fear", "lz-fear",
"prometheus", "prometheus",
@ -7161,7 +7092,7 @@ dependencies = [
name = "veloren-server-cli" name = "veloren-server-cli"
version = "0.14.0" version = "0.14.0"
dependencies = [ dependencies = [
"ansi-parser", "cansi",
"clap 3.2.22", "clap 3.2.22",
"crossterm 0.25.0", "crossterm 0.25.0",
"lazy_static", "lazy_static",
@ -7361,12 +7292,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
[[package]]
name = "version_check"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
[[package]] [[package]]
name = "version_check" name = "version_check"
version = "0.9.4" version = "0.9.4"
@ -7514,9 +7439,9 @@ dependencies = [
[[package]] [[package]]
name = "wasmer" name = "wasmer"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f727a39e7161f7438ddb8eafe571b67c576a8c2fb459f666d9053b5bba4afdea" checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"indexmap", "indexmap",
@ -7526,6 +7451,7 @@ dependencies = [
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
"wasm-bindgen", "wasm-bindgen",
"wasmer-artifact",
"wasmer-compiler", "wasmer-compiler",
"wasmer-compiler-cranelift", "wasmer-compiler-cranelift",
"wasmer-derive", "wasmer-derive",
@ -7539,10 +7465,23 @@ dependencies = [
] ]
[[package]] [[package]]
name = "wasmer-compiler" name = "wasmer-artifact"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e9951599222eb12bd13d4d91bcded0a880e4c22c2dfdabdf5dc7e5e803b7bf3" checksum = "7aaf9428c29c1d8ad2ac0e45889ba8a568a835e33fd058964e5e500f2f7ce325"
dependencies = [
"enumset",
"loupe",
"thiserror",
"wasmer-compiler",
"wasmer-types",
]
[[package]]
name = "wasmer-compiler"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e67a6cd866aed456656db2cfea96c18baabbd33f676578482b85c51e1ee19d2c"
dependencies = [ dependencies = [
"enumset", "enumset",
"loupe", "loupe",
@ -7553,20 +7492,19 @@ dependencies = [
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
"wasmer-types", "wasmer-types",
"wasmer-vm",
"wasmparser", "wasmparser",
] ]
[[package]] [[package]]
name = "wasmer-compiler-cranelift" name = "wasmer-compiler-cranelift"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44c83273bce44e668f3a2b9ccb7f1193db918b1d6806f64acc5ff71f6ece5f20" checksum = "48be2f9f6495f08649e4f8b946a2cbbe119faf5a654aa1457f9504a99d23dae0"
dependencies = [ dependencies = [
"cranelift-codegen", "cranelift-codegen",
"cranelift-entity", "cranelift-entity",
"cranelift-frontend", "cranelift-frontend",
"gimli 0.25.0", "gimli",
"loupe", "loupe",
"more-asserts", "more-asserts",
"rayon", "rayon",
@ -7575,14 +7513,13 @@ dependencies = [
"tracing", "tracing",
"wasmer-compiler", "wasmer-compiler",
"wasmer-types", "wasmer-types",
"wasmer-vm",
] ]
[[package]] [[package]]
name = "wasmer-derive" name = "wasmer-derive"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "458dbd9718a837e6dbc52003aef84487d79eedef5fa28c7d28b6784be98ac08e" checksum = "00e50405cc2a2f74ff574584710a5f2c1d5c93744acce2ca0866084739284b51"
dependencies = [ dependencies = [
"proc-macro-error", "proc-macro-error",
"proc-macro2 1.0.43", "proc-macro2 1.0.43",
@ -7592,9 +7529,9 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-engine" name = "wasmer-engine"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ed603a6d037ebbb14014d7f739ae996a78455a4b86c41cfa4e81c590a1253b9" checksum = "3f98f010978c244db431b392aeab0661df7ea0822343334f8f2a920763548e45"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"enumset", "enumset",
@ -7607,6 +7544,7 @@ dependencies = [
"serde_bytes", "serde_bytes",
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
"wasmer-artifact",
"wasmer-compiler", "wasmer-compiler",
"wasmer-types", "wasmer-types",
"wasmer-vm", "wasmer-vm",
@ -7614,9 +7552,9 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-engine-dylib" name = "wasmer-engine-dylib"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccd7fdc60e252a795c849b3f78a81a134783051407e7e279c10b7019139ef8dc" checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"enum-iterator 0.7.0", "enum-iterator 0.7.0",
@ -7629,6 +7567,7 @@ dependencies = [
"serde", "serde",
"tempfile", "tempfile",
"tracing", "tracing",
"wasmer-artifact",
"wasmer-compiler", "wasmer-compiler",
"wasmer-engine", "wasmer-engine",
"wasmer-object", "wasmer-object",
@ -7639,12 +7578,11 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-engine-universal" name = "wasmer-engine-universal"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcff0cd2c01a8de6009fd863b14ea883132a468a24f2d2ee59dc34453d3a31b5" checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"enum-iterator 0.7.0",
"enumset", "enumset",
"leb128", "leb128",
"loupe", "loupe",
@ -7652,16 +7590,33 @@ dependencies = [
"rkyv", "rkyv",
"wasmer-compiler", "wasmer-compiler",
"wasmer-engine", "wasmer-engine",
"wasmer-engine-universal-artifact",
"wasmer-types", "wasmer-types",
"wasmer-vm", "wasmer-vm",
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]] [[package]]
name = "wasmer-object" name = "wasmer-engine-universal-artifact"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24ce18ac2877050e59580d27ee1a88f3192d7a31e77fbba0852abc7888d6e0b5" checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41"
dependencies = [
"enum-iterator 0.7.0",
"enumset",
"loupe",
"rkyv",
"thiserror",
"wasmer-artifact",
"wasmer-compiler",
"wasmer-types",
]
[[package]]
name = "wasmer-object"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b"
dependencies = [ dependencies = [
"object 0.28.4", "object 0.28.4",
"thiserror", "thiserror",
@ -7671,12 +7626,15 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-types" name = "wasmer-types"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "659fa3dd6c76f62630deff4ac8c7657b07f0b1e4d7e0f8243a552b9d9b448e24" checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f"
dependencies = [ dependencies = [
"backtrace",
"enum-iterator 0.7.0",
"indexmap", "indexmap",
"loupe", "loupe",
"more-asserts",
"rkyv", "rkyv",
"serde", "serde",
"thiserror", "thiserror",
@ -7684,32 +7642,37 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-vm" name = "wasmer-vm"
version = "2.2.1" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afdc46158517c2769f9938bc222a7d41b3bb330824196279d8aa2d667cd40641" checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"cc", "cc",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"corosensei",
"enum-iterator 0.7.0", "enum-iterator 0.7.0",
"indexmap", "indexmap",
"lazy_static",
"libc", "libc",
"loupe", "loupe",
"mach",
"memoffset 0.6.5", "memoffset 0.6.5",
"more-asserts", "more-asserts",
"region", "region",
"rkyv", "rkyv",
"scopeguard",
"serde", "serde",
"thiserror", "thiserror",
"wasmer-artifact",
"wasmer-types", "wasmer-types",
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]] [[package]]
name = "wasmparser" name = "wasmparser"
version = "0.78.2" version = "0.83.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a"
[[package]] [[package]]
name = "wast" name = "wast"
@ -8115,6 +8078,19 @@ dependencies = [
"windows_x86_64_msvc 0.30.0", "windows_x86_64_msvc 0.30.0",
] ]
[[package]]
name = "windows-sys"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75"
dependencies = [
"windows_aarch64_msvc 0.33.0",
"windows_i686_gnu 0.33.0",
"windows_i686_msvc 0.33.0",
"windows_x86_64_gnu 0.33.0",
"windows_x86_64_msvc 0.33.0",
]
[[package]] [[package]]
name = "windows-sys" name = "windows-sys"
version = "0.34.0" version = "0.34.0"
@ -8140,6 +8116,12 @@ version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca"
[[package]]
name = "windows_aarch64_msvc"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807"
[[package]] [[package]]
name = "windows_aarch64_msvc" name = "windows_aarch64_msvc"
version = "0.34.0" version = "0.34.0"
@ -8164,6 +8146,12 @@ version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8"
[[package]]
name = "windows_i686_gnu"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e"
[[package]] [[package]]
name = "windows_i686_gnu" name = "windows_i686_gnu"
version = "0.34.0" version = "0.34.0"
@ -8188,6 +8176,12 @@ version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6"
[[package]]
name = "windows_i686_msvc"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0"
[[package]] [[package]]
name = "windows_i686_msvc" name = "windows_i686_msvc"
version = "0.34.0" version = "0.34.0"
@ -8212,6 +8206,12 @@ version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a"
[[package]]
name = "windows_x86_64_gnu"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784"
[[package]] [[package]]
name = "windows_x86_64_gnu" name = "windows_x86_64_gnu"
version = "0.34.0" version = "0.34.0"
@ -8242,6 +8242,12 @@ version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1"
[[package]]
name = "windows_x86_64_msvc"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa"
[[package]] [[package]]
name = "windows_x86_64_msvc" name = "windows_x86_64_msvc"
version = "0.34.0" version = "0.34.0"
@ -8331,11 +8337,11 @@ dependencies = [
[[package]] [[package]]
name = "x11-clipboard" name = "x11-clipboard"
version = "0.5.3" version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "473068b7b80ac86a18328824f1054e5e007898c47b5bbc281bd7abe32bc3653c" checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464"
dependencies = [ dependencies = [
"xcb 0.10.1", "x11rb 0.10.1",
] ]
[[package]] [[package]]
@ -8361,6 +8367,28 @@ dependencies = [
"winapi-wsapoll", "winapi-wsapoll",
] ]
[[package]]
name = "x11rb"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
dependencies = [
"gethostname",
"nix 0.24.2",
"winapi 0.3.9",
"winapi-wsapoll",
"x11rb-protocol",
]
[[package]]
name = "x11rb-protocol"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
dependencies = [
"nix 0.24.2",
]
[[package]] [[package]]
name = "xattr" name = "xattr"
version = "0.2.3" version = "0.2.3"
@ -8370,17 +8398,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "xcb"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "771e2b996df720cd1c6dd9ff90f62d91698fd3610cc078388d0564bdd6622a9c"
dependencies = [
"libc",
"log",
"quick-xml",
]
[[package]] [[package]]
name = "xcb" name = "xcb"
version = "1.2.0" version = "1.2.0"
@ -8398,7 +8415,7 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7"
dependencies = [ dependencies = [
"nom 7.1.1", "nom",
] ]
[[package]] [[package]]
@ -8424,7 +8441,7 @@ checksum = "acbee136714379ab22da0280207fdb7f47e0bb940adea97731b65598b8c7a92e"
dependencies = [ dependencies = [
"libc", "libc",
"memmap2 0.5.7", "memmap2 0.5.7",
"xcb 1.2.0", "xcb",
] ]
[[package]] [[package]]

4
assets/common/abilities/ability_set_manifest.ron
View File

@ -20,7 +20,7 @@
None: (None, "common.abilities.sword.basic_thrust"), None: (None, "common.abilities.sword.basic_thrust"),
Stance(Sword(Heavy)): (None, "common.abilities.sword.heavy_slam"), Stance(Sword(Heavy)): (None, "common.abilities.sword.heavy_slam"),
Stance(Sword(Agile)): (None, "common.abilities.sword.agile_perforate"), Stance(Sword(Agile)): (None, "common.abilities.sword.agile_perforate"),
Stance(Sword(Defensive)): (None, "common.abilities.sword.defensive_parry"), Stance(Sword(Defensive)): (None, "common.abilities.sword.defensive_vital_jab"),
Stance(Sword(Crippling)): (None, "common.abilities.sword.crippling_deep_rend"), Stance(Sword(Crippling)): (None, "common.abilities.sword.crippling_deep_rend"),
Stance(Sword(Cleaving)): (None, "common.abilities.sword.cleaving_spiral_slash"), Stance(Sword(Cleaving)): (None, "common.abilities.sword.cleaving_spiral_slash"),
}, },
@ -92,7 +92,7 @@
Stance(Sword(Cleaving)): (Sword(Finisher), "common.abilities.sword.cleaving_bladestorm"), Stance(Sword(Cleaving)): (Sword(Finisher), "common.abilities.sword.cleaving_bladestorm"),
}, },
), ),
Simple(Sword(HeavyWindmillSlash), "common.abilities.sword.heavy_windmill_slash"), Simple(Sword(HeavySweep), "common.abilities.sword.heavy_sweep"),
Simple(Sword(HeavyPommelStrike), "common.abilities.sword.heavy_pommel_strike"), Simple(Sword(HeavyPommelStrike), "common.abilities.sword.heavy_pommel_strike"),
Simple(Sword(AgileQuickDraw), "common.abilities.sword.agile_quick_draw"), Simple(Sword(AgileQuickDraw), "common.abilities.sword.agile_quick_draw"),
Simple(Sword(AgileFeint), "common.abilities.sword.agile_feint"), Simple(Sword(AgileFeint), "common.abilities.sword.agile_feint"),

4
assets/common/abilities/custom/minotaur/cleave.ron
View File

@ -10,7 +10,7 @@ ChargedMelee(
), ),
scaled: Some(Slash( scaled: Some(Slash(
damage: 45.0, damage: 45.0,
poise: 150.0, poise: 105.0,
knockback: 0.0, knockback: 0.0,
energy_regen: 0.0, energy_regen: 0.0,
)), )),
@ -18,7 +18,7 @@ ChargedMelee(
angle: 45.0, angle: 45.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
charge_duration: 4.5, charge_duration: 3.0,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.8, hit_timing: 0.8,
recover_duration: 1.0, recover_duration: 1.0,

4
assets/common/abilities/custom/woodgolem/shockwave.ron
View File

@ -1,8 +1,8 @@
Shockwave( Shockwave(
energy_cost: 0, energy_cost: 0,
buildup_duration: 4.5, buildup_duration: 3.0,
swing_duration: 0.12, swing_duration: 0.12,
recover_duration: 3.6, recover_duration: 2.4,
damage: 60.0, damage: 60.0,
poise_damage: 30, poise_damage: 30,
knockback: (strength: 30.0, direction: TowardsUp), knockback: (strength: 30.0, direction: TowardsUp),

2
assets/common/abilities/custom/woodgolem/spin.ron
View File

@ -1,5 +1,5 @@
SpinMelee( SpinMelee(
buildup_duration: 1.05, buildup_duration: 0.9,
swing_duration: 0.3, swing_duration: 0.3,
recover_duration: 0.6, recover_duration: 0.6,
melee_constructor: ( melee_constructor: (

4
assets/common/abilities/custom/woodgolem/strike.ron
View File

@ -1,8 +1,8 @@
BasicMelee( BasicMelee(
energy_cost: 0, energy_cost: 0,
buildup_duration: 2.4, buildup_duration: 1.6,
swing_duration: 0.1, swing_duration: 0.1,
recover_duration: 1.5, recover_duration: 1.0,
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 30.0, damage: 30.0,

2
assets/common/abilities/sceptre/lifestealbeam.ron
View File

@ -3,7 +3,7 @@ BasicBeam(
recover_duration: 0.20, recover_duration: 0.20,
beam_duration: 1.0, beam_duration: 1.0,
damage: 4, damage: 4,
tick_rate: 4, tick_rate: 3,
range: 25.0, range: 25.0,
max_angle: 1.0, max_angle: 1.0,
damage_effect: Some(Lifesteal(0.05)), damage_effect: Some(Lifesteal(0.05)),

6
assets/common/abilities/sword/agile_cascade.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 16, damage: 12,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -12,11 +12,11 @@ ComboMelee2(
angle: 15.0, angle: 15.0,
), ),
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.05,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.1,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

8
assets/common/abilities/sword/agile_crescent_slash.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 12, damage: 8,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -11,12 +11,12 @@ ComboMelee2(
range: 3.0, range: 3.0,
angle: 60.0, angle: 60.0,
), ),
buildup_duration: 0.05, buildup_duration: 0.1,
swing_duration: 0.1, swing_duration: 0.05,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.1,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

42
assets/common/abilities/sword/agile_cross_cut.ron
View File

@ -3,30 +3,13 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 6, damage: 5,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
),
buildup_duration: 0.1,
swing_duration: 0.05,
hit_timing: 0.5,
recover_duration: 0.2,
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 6,
poise: 3,
knockback: 0,
energy_regen: 0,
),
range: 3.5,
angle: 50.0,
), ),
buildup_duration: 0.1, buildup_duration: 0.1,
swing_duration: 0.05, swing_duration: 0.05,
@ -34,7 +17,24 @@ ComboMelee2(
recover_duration: 0.1, recover_duration: 0.1,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
(
melee_constructor: (
kind: Slash(
damage: 7,
poise: 5,
knockback: 0,
energy_regen: 0,
),
range: 3.5,
angle: 90.0,
),
buildup_duration: 0.1,
swing_duration: 0.05,
hit_timing: 0.5,
recover_duration: 0.05,
ori_modifier: 0.6,
),
], ],
energy_cost_per_strike: 7.5, energy_cost_per_strike: 2.5,
auto_progress: true, auto_progress: true,
) )

4
assets/common/abilities/sword/agile_dancing_edge.ron
View File

@ -4,8 +4,8 @@ SelfBuff(
recover_duration: 0.3, recover_duration: 0.3,
buff_kind: Hastened, buff_kind: Hastened,
buff_strength: 0.25, buff_strength: 0.25,
buff_duration: Some(30.0), buff_duration: Some(20.0),
energy_cost: 30, energy_cost: 20,
meta: ( meta: (
requirements: (stance: Some(Sword(Agile))), requirements: (stance: Some(Sword(Agile))),
), ),

16
assets/common/abilities/sword/agile_double_slash.ron
View File

@ -3,32 +3,32 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 3, damage: 2,
poise: 2, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 5,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
), ),
buildup_duration: 0.1, buildup_duration: 0.05,
swing_duration: 0.05, swing_duration: 0.05,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.05,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 6, damage: 3,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 10,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
), ),
buildup_duration: 0.1, buildup_duration: 0.05,
swing_duration: 0.05, swing_duration: 0.05,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.1,

4
assets/common/abilities/sword/agile_feint.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 12, damage: 8,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -23,7 +23,7 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 0,
meta: ( meta: (
init_event: Some(EnterStance(Sword(Agile))), init_event: Some(EnterStance(Sword(Agile))),
), ),

6
assets/common/abilities/sword/agile_fell_strike.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 16, damage: 10,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -14,9 +14,9 @@ ComboMelee2(
buildup_duration: 0.05, buildup_duration: 0.05,
swing_duration: 0.05, swing_duration: 0.05,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.45, recover_duration: 0.3,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 5,
) )

4
assets/common/abilities/sword/agile_flurry.ron
View File

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.1, recover_duration: 0.1,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 8, damage: 10,
poise: 3, poise: 3,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -12,7 +12,7 @@ RapidMelee(
range: 6.0, range: 6.0,
angle: 10.0, angle: 10.0,
), ),
energy_cost: 10, energy_cost: 5,
max_strikes: Some(3), max_strikes: Some(3),
move_modifier: 0.35, move_modifier: 0.35,
ori_modifier: 0.25, ori_modifier: 0.25,

6
assets/common/abilities/sword/agile_hundred_cuts.ron
View File

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.1, recover_duration: 0.1,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 2, damage: 4,
poise: 0, poise: 0,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -12,9 +12,9 @@ RapidMelee(
range: 3.0, range: 3.0,
angle: 10.0, angle: 10.0,
), ),
energy_cost: 2, energy_cost: 1,
max_strikes: Some(20), max_strikes: Some(20),
move_modifier: 0.6, move_modifier: 0.6,
ori_modifier: 0.4, ori_modifier: 0.4,
minimum_combo: 20, minimum_combo: 10,
) )

2
assets/common/abilities/sword/agile_perforate.ron
View File

@ -1,6 +1,6 @@
RapidMelee( RapidMelee(
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.15, swing_duration: 0.2,
recover_duration: 0.3, recover_duration: 0.3,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(

12
assets/common/abilities/sword/agile_quick_draw.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 8, damage: 12,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -11,19 +11,19 @@ ComboMelee2(
range: 5.0, range: 5.0,
angle: 20.0, angle: 20.0,
), ),
buildup_duration: 0.2, buildup_duration: 0.15,
swing_duration: 0.05, swing_duration: 0.05,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.05, recover_duration: 0.1,
movement: ( movement: (
buildup: None, buildup: Some(Forward(1.0)),
swing: Some(Forward(3.0)), swing: Some(Forward(3.0)),
recover: Some(Forward(2.0)), recover: Some(Forward(1.0)),
), ),
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
meta: ( meta: (
init_event: Some(EnterStance(Sword(Agile))), init_event: Some(EnterStance(Sword(Agile))),
), ),

8
assets/common/abilities/sword/agile_skewer.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Stab(
damage: 12, damage: 9,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -14,14 +14,14 @@ ComboMelee2(
buildup_duration: 0.1, buildup_duration: 0.1,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.25, recover_duration: 0.2,
ori_modifier: 0.6, ori_modifier: 0.6,
movement: ( movement: (
buildup: Some(Forward(2.0)), buildup: Some(Forward(3.0)),
swing: Some(Forward(2.0)), swing: Some(Forward(2.0)),
recover: None, recover: None,
), ),
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

4
assets/common/abilities/sword/basic_cascade.ron
View File

@ -11,12 +11,12 @@ ComboMelee2(
range: 4.0, range: 4.0,
angle: 15.0, angle: 15.0,
), ),
buildup_duration: 0.35, buildup_duration: 0.4,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

6
assets/common/abilities/sword/basic_crescent_slash.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 18, damage: 16,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -11,12 +11,12 @@ ComboMelee2(
range: 3.0, range: 3.0,
angle: 60.0, angle: 60.0,
), ),
buildup_duration: 0.1, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

12
assets/common/abilities/sword/basic_cross_cut.ron
View File

@ -4,12 +4,12 @@ ComboMelee2(
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 10,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.1,
@ -20,13 +20,13 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 14,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.1,
@ -35,6 +35,6 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 7.5, energy_cost_per_strike: 2.5,
auto_progress: true, auto_progress: true,
) )

4
assets/common/abilities/sword/basic_double_slash.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 5, damage: 4,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 5,
@ -20,7 +20,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 7,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 10, energy_regen: 10,

4
assets/common/abilities/sword/basic_fell_strike.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 24, damage: 20,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -18,5 +18,5 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 5,
) )

2
assets/common/abilities/sword/basic_skewer.ron
View File

@ -23,5 +23,5 @@ ComboMelee2(
), ),
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

6
assets/common/abilities/sword/basic_thrust.ron
View File

@ -9,10 +9,10 @@ ChargedMelee(
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Stab( scaled: Some(Stab(
damage: 20, damage: 15,
poise: 10, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 20, energy_regen: 15,
)), )),
range: 4.5, range: 4.5,
angle: 10.0, angle: 10.0,

4
assets/common/abilities/sword/cleaving_blade_fever.ron
View File

@ -4,8 +4,8 @@ SelfBuff(
recover_duration: 0.3, recover_duration: 0.3,
buff_kind: Reckless, buff_kind: Reckless,
buff_strength: 0.25, buff_strength: 0.25,
buff_duration: Some(30.0), buff_duration: Some(20.0),
energy_cost: 30, energy_cost: 20,
meta: ( meta: (
requirements: (stance: Some(Sword(Cleaving))), requirements: (stance: Some(Sword(Cleaving))),
), ),

2
assets/common/abilities/sword/cleaving_bladestorm.ron
View File

@ -13,7 +13,7 @@ RapidMelee(
angle: 360.0, angle: 360.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
energy_cost: 5, energy_cost: 3.33,
max_strikes: Some(6), max_strikes: Some(6),
move_modifier: 0.8, move_modifier: 0.8,
ori_modifier: 1.0, ori_modifier: 1.0,

12
assets/common/abilities/sword/cleaving_cascade.ron
View File

@ -3,21 +3,21 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 19, damage: 24,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 4.0, range: 4.0,
angle: 25.0, angle: 15.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.35, buildup_duration: 0.5,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.25,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

12
assets/common/abilities/sword/cleaving_crescent_slash.ron
View File

@ -3,21 +3,21 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 16,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.0, range: 3.0,
angle: 75.0, angle: 60.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.1, buildup_duration: 0.25,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.25,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

24
assets/common/abilities/sword/cleaving_cross_cut.ron
View File

@ -4,39 +4,39 @@ ComboMelee2(
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 10,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 60.0, angle: 90.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.15, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.25,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 14,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 60.0, angle: 90.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.15, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.15,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 7.5, energy_cost_per_strike: 2.5,
auto_progress: true, auto_progress: true,
) )

12
assets/common/abilities/sword/cleaving_double_slash.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 5, damage: 4,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 5,
@ -13,25 +13,25 @@ ComboMelee2(
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.05, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.15,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 7,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 10,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.25, recover_duration: 0.25,
ori_modifier: 0.6, ori_modifier: 0.6,

12
assets/common/abilities/sword/cleaving_earth_splitter.ron
View File

@ -1,5 +1,5 @@
DiveMelee( DiveMelee(
energy_cost: 15, energy_cost: 5,
vertical_speed: 5, vertical_speed: 5,
buildup_duration: Some(0.1), buildup_duration: Some(0.1),
movement_duration: 5, movement_duration: 5,
@ -7,22 +7,22 @@ DiveMelee(
recover_duration: 0.3, recover_duration: 0.3,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 5, damage: 10,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Slash( scaled: Some(Slash(
damage: 10, damage: 15,
poise: 10, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
)), )),
range: 6.0, range: 4.0,
angle: 15.0, angle: 360.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
max_scaling: 10.0, max_scaling: 6.0,
meta: ( meta: (
init_event: Some(EnterStance(Sword(Cleaving))), init_event: Some(EnterStance(Sword(Cleaving))),
), ),

12
assets/common/abilities/sword/cleaving_fell_strike.ron
View File

@ -3,21 +3,21 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 24, damage: 20,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 30.0, angle: 20.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.05, buildup_duration: 0.1,
swing_duration: 0.05, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.7, recover_duration: 0.8,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 5,
) )

16
assets/common/abilities/sword/cleaving_skewer.ron
View File

@ -3,26 +3,26 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Stab(
damage: 14, damage: 18,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 5.0, range: 5.0,
angle: 7.5, angle: 5.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.15, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.5,
ori_modifier: 0.6, ori_modifier: 0.6,
movement: ( movement: (
buildup: Some(Forward(2.0)), buildup: Some(Forward(1.5)),
swing: Some(Forward(2.0)), swing: Some(Forward(1.5)),
recover: None, recover: None,
), ),
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

2
assets/common/abilities/sword/cleaving_sky_splitter.ron
View File

@ -20,7 +20,7 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 40, energy_cost_per_strike: 25,
meta: ( meta: (
requirements: (stance: Some(Sword(Cleaving))), requirements: (stance: Some(Sword(Cleaving))),
), ),

2
assets/common/abilities/sword/cleaving_spiral_slash.ron
View File

@ -9,7 +9,7 @@ ChargedMelee(
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Slash( scaled: Some(Slash(
damage: 12, damage: 10,
poise: 10, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 10, energy_regen: 10,

4
assets/common/abilities/sword/cleaving_whirlwind_slice.ron
View File

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.4, recover_duration: 0.4,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 12, damage: 14,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -13,7 +13,7 @@ RapidMelee(
angle: 360.0, angle: 360.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
energy_cost: 10, energy_cost: 5,
max_strikes: Some(2), max_strikes: Some(2),
ori_modifier: 1.0, ori_modifier: 1.0,
move_modifier: 1.0, move_modifier: 1.0,

10
assets/common/abilities/sword/crippling_bloody_gash.ron
View File

@ -3,23 +3,23 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 16,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 5,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
damage_effect: Some(BuffsVulnerable(1.0, Bleeding)), damage_effect: Some(BuffsVulnerable(0.7, Bleeding)),
), ),
buildup_duration: 0.15, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.15, recover_duration: 0.2,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 20, energy_cost_per_strike: 12,
meta: ( meta: (
requirements: (stance: Some(Sword(Crippling))), requirements: (stance: Some(Sword(Crippling))),
), ),

8
assets/common/abilities/sword/crippling_cascade.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 18, damage: 20,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -14,15 +14,15 @@ ComboMelee2(
kind: Bleeding, kind: Bleeding,
dur_secs: 8.0, dur_secs: 8.0,
strength: DamageFraction(0.25), strength: DamageFraction(0.25),
chance: 0.25, chance: 1.0,
))), ))),
), ),
buildup_duration: 0.35, buildup_duration: 0.4,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

8
assets/common/abilities/sword/crippling_crescent_slash.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 14, damage: 13,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -14,15 +14,15 @@ ComboMelee2(
kind: Bleeding, kind: Bleeding,
dur_secs: 8.0, dur_secs: 8.0,
strength: DamageFraction(0.25), strength: DamageFraction(0.25),
chance: 0.25, chance: 1.0,
))), ))),
), ),
buildup_duration: 0.1, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

16
assets/common/abilities/sword/crippling_cross_cut.ron
View File

@ -4,17 +4,17 @@ ComboMelee2(
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 7, damage: 7,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
damage_effect: Some(Buff(( damage_effect: Some(Buff((
kind: Bleeding, kind: Bleeding,
dur_secs: 8.0, dur_secs: 8.0,
strength: DamageFraction(0.25), strength: DamageFraction(0.25),
chance: 0.25, chance: 1.0,
))), ))),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
@ -26,18 +26,18 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 7, damage: 11,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
damage_effect: Some(Buff(( damage_effect: Some(Buff((
kind: Bleeding, kind: Bleeding,
dur_secs: 8.0, dur_secs: 8.0,
strength: DamageFraction(0.25), strength: DamageFraction(0.25),
chance: 0.25, chance: 1.0,
))), ))),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
@ -47,6 +47,6 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 7.5, energy_cost_per_strike: 2.5,
auto_progress: true, auto_progress: true,
) )

4
assets/common/abilities/sword/crippling_deep_rend.ron
View File

@ -9,10 +9,10 @@ ChargedMelee(
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Slash( scaled: Some(Slash(
damage: 12, damage: 15,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 15, energy_regen: 10,
)), )),
damage_effect: Some(BuffsVulnerable(0.5, Bleeding)), damage_effect: Some(BuffsVulnerable(0.5, Bleeding)),
range: 4.5, range: 4.5,

4
assets/common/abilities/sword/crippling_double_slash.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 5, damage: 4,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 5,
@ -21,7 +21,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 7,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 10, energy_regen: 10,

6
assets/common/abilities/sword/crippling_eviscerate.ron
View File

@ -3,14 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 19,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
damage_effect: Some(BuffsVulnerable(2.0, Crippled)), damage_effect: Some(BuffsVulnerable(0.825, Crippled)),
), ),
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.15, swing_duration: 0.15,
@ -19,7 +19,7 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 25, energy_cost_per_strike: 17,
meta: ( meta: (
requirements: (stance: Some(Sword(Crippling))), requirements: (stance: Some(Sword(Crippling))),
), ),

6
assets/common/abilities/sword/crippling_fell_strike.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 18, damage: 17,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -14,7 +14,7 @@ ComboMelee2(
kind: Bleeding, kind: Bleeding,
dur_secs: 8.0, dur_secs: 8.0,
strength: DamageFraction(0.25), strength: DamageFraction(0.25),
chance: 0.25, chance: 1.0,
))), ))),
), ),
buildup_duration: 0.05, buildup_duration: 0.05,
@ -24,5 +24,5 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 5,
) )

8
assets/common/abilities/sword/crippling_gouge.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 8, damage: 16,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -12,8 +12,8 @@ ComboMelee2(
angle: 45.0, angle: 45.0,
damage_effect: Some(Buff(( damage_effect: Some(Buff((
kind: Bleeding, kind: Bleeding,
dur_secs: 8.0, dur_secs: 4.0,
strength: DamageFraction(0.35), strength: DamageFraction(0.4),
chance: 1.0, chance: 1.0,
))), ))),
), ),
@ -24,7 +24,7 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 5,
meta: ( meta: (
init_event: Some(EnterStance(Sword(Crippling))), init_event: Some(EnterStance(Sword(Crippling))),
), ),

4
assets/common/abilities/sword/crippling_hamstring.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 16,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -24,7 +24,7 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 10,
meta: ( meta: (
init_event: Some(EnterStance(Sword(Crippling))), init_event: Some(EnterStance(Sword(Crippling))),
), ),

2
assets/common/abilities/sword/crippling_mutilate.ron
View File

@ -13,7 +13,7 @@ RapidMelee(
angle: 15.0, angle: 15.0,
damage_effect: Some(BuffsVulnerable(1.0, Bleeding)), damage_effect: Some(BuffsVulnerable(1.0, Bleeding)),
), ),
energy_cost: 7.5, energy_cost: 5,
max_strikes: Some(4), max_strikes: Some(4),
move_modifier: 0.7, move_modifier: 0.7,
ori_modifier: 0.2, ori_modifier: 0.2,

6
assets/common/abilities/sword/crippling_skewer.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Stab(
damage: 14, damage: 15,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -14,7 +14,7 @@ ComboMelee2(
kind: Bleeding, kind: Bleeding,
dur_secs: 8.0, dur_secs: 8.0,
strength: DamageFraction(0.25), strength: DamageFraction(0.25),
chance: 0.25, chance: 1.0,
))), ))),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
@ -29,5 +29,5 @@ ComboMelee2(
), ),
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

7
assets/common/abilities/sword/defensive_cascade.ron
View File

@ -10,18 +10,19 @@ ComboMelee2(
), ),
range: 4.0, range: 4.0,
angle: 15.0, angle: 15.0,
damage_effect: Some(BuffsVulnerable(0.5, Parried)),
), ),
buildup_duration: 0.35, buildup_duration: 0.4,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
meta: ( meta: (
capabilities: ( capabilities: (
// When in buildup, attack can get cancelled into parry // The ability will parry melee attacks in the buildup portion
bits: 0b00100000, bits: 0b00100000,
), ),
), ),

2
assets/common/abilities/sword/defensive_counter.ron
View File

@ -1,5 +1,5 @@
FinisherMelee( FinisherMelee(
energy_cost: 30, energy_cost: 20,
buildup_duration: 0.05, buildup_duration: 0.05,
swing_duration: 0.1, swing_duration: 0.1,
recover_duration: 0.6, recover_duration: 0.6,

9
assets/common/abilities/sword/defensive_crescent_slash.ron
View File

@ -3,25 +3,26 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 11,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.0, range: 3.0,
angle: 60.0, angle: 60.0,
damage_effect: Some(BuffsVulnerable(0.5, Parried)),
), ),
buildup_duration: 0.1, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
meta: ( meta: (
capabilities: ( capabilities: (
// When in buildup, attack can get cancelled into parry // The ability will parry melee attacks in the buildup portion
bits: 0b00100000, bits: 0b00100000,
), ),
), ),

18
assets/common/abilities/sword/defensive_cross_cut.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 8, damage: 6,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
damage_effect: Some(BuffsVulnerable(0.5, Parried)),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.1,
@ -20,13 +21,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 8, damage: 9,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
damage_effect: Some(BuffsVulnerable(0.5, Parried)),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.1,
@ -35,11 +37,11 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 7.5, energy_cost_per_strike: 2.5,
auto_progress: true, auto_progress: true,
meta: ( meta: (
capabilities: ( capabilities: (
// When in buildup, attack can get cancelled into parry // The ability will parry melee attacks in the buildup portion
bits: 0b00100000, bits: 0b00100000,
), ),
), ),

2
assets/common/abilities/sword/defensive_deflect.ron
View File

@ -7,7 +7,7 @@ BasicBlock(
buildup: true, buildup: true,
recover: true, recover: true,
), ),
energy_cost: 10, energy_cost: 0,
can_hold: false, can_hold: false,
blocked_attacks: ( blocked_attacks: (
melee: true, melee: true,

4
assets/common/abilities/sword/defensive_disengage.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 16, damage: 10,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -23,7 +23,7 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 0,
meta: ( meta: (
init_event: Some(EnterStance(Sword(Defensive))), init_event: Some(EnterStance(Sword(Defensive))),
), ),

2
assets/common/abilities/sword/defensive_double_slash.ron
View File

@ -20,7 +20,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 8, damage: 7,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 10, energy_regen: 10,

7
assets/common/abilities/sword/defensive_fell_strike.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 20, damage: 15,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 20.0, angle: 20.0,
damage_effect: Some(BuffsVulnerable(0.5, Parried)),
), ),
buildup_duration: 0.05, buildup_duration: 0.05,
swing_duration: 0.05, swing_duration: 0.05,
@ -18,10 +19,10 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 5,
meta: ( meta: (
capabilities: ( capabilities: (
// When in buildup, attack can get cancelled into parry // The ability will parry melee attacks in the buildup portion
bits: 0b00100000, bits: 0b00100000,
), ),
), ),

20
assets/common/abilities/sword/defensive_parry.ron
View File

@ -1,20 +0,0 @@
BasicBlock(
buildup_duration: 0.2,
recover_duration: 0.1,
max_angle: 45.0,
block_strength: 0.75,
parry_window: (
buildup: true,
recover: false,
),
energy_cost: 0,
can_hold: true,
blocked_attacks: (
melee: true,
projectiles: false,
beams: false,
ground_shockwaves: false,
air_shockwaves: false,
explosions: false,
),
)

8
assets/common/abilities/sword/defensive_riposte.ron
View File

@ -1,11 +1,11 @@
RiposteMelee( RiposteMelee(
energy_cost: 20, energy_cost: 5,
buildup_duration: 0.3, buildup_duration: 0.3,
swing_duration: 0.2, swing_duration: 0.1,
recover_duration: 0.3, recover_duration: 0.2,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 25, damage: 18,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 5,

7
assets/common/abilities/sword/defensive_skewer.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Stab(
damage: 15, damage: 13,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 5.0, range: 5.0,
angle: 5.0, angle: 5.0,
damage_effect: Some(BuffsVulnerable(0.5, Parried)),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.1,
@ -23,10 +24,10 @@ ComboMelee2(
), ),
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
meta: ( meta: (
capabilities: ( capabilities: (
// When in buildup, attack can get cancelled into parry // The ability will parry melee attacks in the buildup portion
bits: 0b00100000, bits: 0b00100000,
), ),
), ),

4
assets/common/abilities/sword/defensive_stalwart_sword.ron
View File

@ -4,8 +4,8 @@ SelfBuff(
recover_duration: 0.25, recover_duration: 0.25,
buff_kind: ProtectingWard, buff_kind: ProtectingWard,
buff_strength: 0.4, buff_strength: 0.4,
buff_duration: Some(30.0), buff_duration: Some(20.0),
energy_cost: 30, energy_cost: 20,
meta: ( meta: (
requirements: (stance: Some(Sword(Defensive))), requirements: (stance: Some(Sword(Defensive))),
), ),

25
assets/common/abilities/sword/defensive_vital_jab.ron Normal file
View File

@ -0,0 +1,25 @@
ChargedMelee(
energy_cost: 0,
energy_drain: 0,
melee_constructor: (
kind: Stab(
damage: 0,
poise: 0,
knockback: 0,
energy_regen: 0,
),
scaled: Some(Stab(
damage: 10,
poise: 5,
knockback: 0,
energy_regen: 15,
)),
range: 4.5,
angle: 10.0,
damage_effect: Some(BuffsVulnerable(0.75, Parried)),
),
charge_duration: 0.3,
swing_duration: 0.1,
hit_timing: 0.2,
recover_duration: 0.1,
)

8
assets/common/abilities/sword/heavy_cascade.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 26, damage: 30,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -13,11 +13,11 @@ ComboMelee2(
damage_effect: Some(StunnedVulnerable(0.5)), damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.5, buildup_duration: 0.5,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.3, recover_duration: 0.25,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

10
assets/common/abilities/sword/heavy_crescent_slash.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 19, damage: 20,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -12,12 +12,12 @@ ComboMelee2(
angle: 60.0, angle: 60.0,
damage_effect: Some(StunnedVulnerable(0.5)), damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.3, buildup_duration: 0.25,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.25,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

22
assets/common/abilities/sword/heavy_cross_cut.ron
View File

@ -3,40 +3,40 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 11, damage: 12,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
damage_effect: Some(StunnedVulnerable(0.5)), damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.25,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 11, damage: 18,
poise: 3, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 90.0,
damage_effect: Some(StunnedVulnerable(0.5)), damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.15,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 7.5, energy_cost_per_strike: 2.5,
auto_progress: true, auto_progress: true,
) )

20
assets/common/abilities/sword/heavy_double_slash.ron
View File

@ -3,19 +3,18 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 6, damage: 5,
poise: 10, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 10, energy_regen: 5,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.3, buildup_duration: 0.2,
swing_duration: 0.05, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.15,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
( (
@ -24,16 +23,15 @@ ComboMelee2(
damage: 9, damage: 9,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 15, energy_regen: 10,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.2, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.25,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],

8
assets/common/abilities/sword/heavy_fell_strike.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 28, damage: 25,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -12,12 +12,12 @@ ComboMelee2(
angle: 20.0, angle: 20.0,
damage_effect: Some(StunnedVulnerable(0.5)), damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.15, buildup_duration: 0.1,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.9, recover_duration: 0.8,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 5,
) )

4
assets/common/abilities/sword/heavy_fortitude.ron
View File

@ -4,8 +4,8 @@ SelfBuff(
recover_duration: 0.6, recover_duration: 0.6,
buff_kind: Fortitude, buff_kind: Fortitude,
buff_strength: 1.0, buff_strength: 1.0,
buff_duration: Some(30.0), buff_duration: Some(20.0),
energy_cost: 25, energy_cost: 15,
meta: ( meta: (
requirements: (stance: Some(Sword(Heavy))), requirements: (stance: Some(Sword(Heavy))),
), ),

2
assets/common/abilities/sword/heavy_guillotine.ron
View File

@ -1,5 +1,5 @@
FinisherMelee( FinisherMelee(
energy_cost: 30, energy_cost: 20,
buildup_duration: 0.4, buildup_duration: 0.4,
swing_duration: 0.1, swing_duration: 0.1,
recover_duration: 0.6, recover_duration: 0.6,

8
assets/common/abilities/sword/heavy_pillar_thrust.ron
View File

@ -1,5 +1,5 @@
DiveMelee( DiveMelee(
energy_cost: 25, energy_cost: 15,
vertical_speed: 5, vertical_speed: 5,
buildup_duration: Some(0.1), buildup_duration: Some(0.1),
movement_duration: 5, movement_duration: 5,
@ -7,13 +7,13 @@ DiveMelee(
recover_duration: 0.3, recover_duration: 0.3,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 20, damage: 30,
poise: 40, poise: 40,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Slash( scaled: Some(Slash(
damage: 5, damage: 10,
poise: 10, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -23,7 +23,7 @@ DiveMelee(
multi_target: Some(Normal), multi_target: Some(Normal),
damage_effect: Some(StunnedVulnerable(0.5)), damage_effect: Some(StunnedVulnerable(0.5)),
), ),
max_scaling: 6, max_scaling: 3,
meta: ( meta: (
requirements: (stance: Some(Sword(Heavy))), requirements: (stance: Some(Sword(Heavy))),
), ),

4
assets/common/abilities/sword/heavy_pommel_strike.ron
View File

@ -4,7 +4,7 @@ ComboMelee2(
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 12, damage: 12,
poise: 60, poise: 50,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
@ -19,7 +19,7 @@ ComboMelee2(
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 15, energy_cost_per_strike: 5,
meta: ( meta: (
init_event: Some(EnterStance(Sword(Heavy))), init_event: Some(EnterStance(Sword(Heavy))),
), ),

13
assets/common/abilities/sword/heavy_skewer.ron
View File

@ -3,26 +3,25 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Stab(
damage: 21, damage: 23,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 5.0, range: 5.0,
angle: 5.0, angle: 5.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.3, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.5, recover_duration: 0.5,
ori_modifier: 0.6, ori_modifier: 0.6,
movement: ( movement: (
buildup: Some(Forward(2.0)), buildup: Some(Forward(1.5)),
swing: Some(Forward(2.0)), swing: Some(Forward(1.5)),
recover: None, recover: None,
), ),
), ),
], ],
energy_cost_per_strike: 10, energy_cost_per_strike: 5,
) )

4
assets/common/abilities/sword/heavy_slam.ron
View File

@ -18,8 +18,8 @@ ChargedMelee(
angle: 10.0, angle: 10.0,
damage_effect: Some(StunnedVulnerable(0.5)), damage_effect: Some(StunnedVulnerable(0.5)),
), ),
charge_duration: 0.8, charge_duration: 1.0,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.2, hit_timing: 0.2,
recover_duration: 0.4, recover_duration: 0.5,
) )

26
assets/common/abilities/sword/heavy_sweep.ron Normal file
View File

@ -0,0 +1,26 @@
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Slash(
damage: 27,
poise: 30,
knockback: 0,
energy_regen: 0,
),
range: 4.0,
angle: 90.0,
damage_effect: Some(StunnedVulnerable(0.5)),
),
buildup_duration: 0.2,
swing_duration: 0.2,
hit_timing: 0.5,
recover_duration: 0.3,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 5,
meta: (
init_event: Some(EnterStance(Sword(Heavy))),
),
)

45
assets/common/abilities/sword/heavy_windmill_slash.ron
View File

@ -1,45 +0,0 @@
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Slash(
damage: 11,
poise: 15,
knockback: 0,
energy_regen: 0,
),
range: 4.0,
angle: 30.0,
damage_effect: Some(StunnedVulnerable(0.5)),
),
buildup_duration: 0.3,
swing_duration: 0.15,
hit_timing: 0.5,
recover_duration: 0.1,
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 17,
poise: 30,
knockback: 0,
energy_regen: 0,
),
range: 4.0,
angle: 30.0,
damage_effect: Some(StunnedVulnerable(0.5)),
),
buildup_duration: 0.25,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.25,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 10,
auto_progress: true,
meta: (
init_event: Some(EnterStance(Sword(Heavy))),
),
)

24
assets/common/entity/calendar/april_fools/aggressive/trickster.ron Normal file
View File

@ -0,0 +1,24 @@
#![enable(implicit_some)]
(
name: Name("Trickster"),
body: RandomWith("draugr"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.calendar.april_fools.trickster"),
inventory: (
loadout: Inline((
inherit: Asset("common.loadout.calendar.halloween.trickster"),
active_hands: InHands((Choice([
(1, Item("common.items.tool.instruments.double_bass")),
(1, Item("common.items.tool.instruments.flute")),
(1, Item("common.items.tool.instruments.lyre")),
(1, Item("common.items.tool.instruments.kalimba")),
(1, Item("common.items.tool.instruments.sitar")),
(1, Item("common.items.tool.instruments.washboard")),
(1, Item("common.items.tool.instruments.lute")),
(1, Item("common.items.tool.instruments.guitar")),
(1, Item("common.items.tool.instruments.melodica")),
]), None)),
)),
),
meta: [],
)

4
assets/common/items/boss_drops/potions.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "A potent healing potion.", description: "A potent healing potion.",
kind: Consumable( kind: Consumable(
kind: Drink, kind: Drink,
effects: [ effects: All([
Buff(( Buff((
kind: Potion, kind: Potion,
data: ( data: (
@ -21,7 +21,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] ])
), ),
quality: High, quality: High,
tags: [Potion], tags: [Potion],

67
assets/common/items/consumable/curious_potion.ron Normal file
View File

@ -0,0 +1,67 @@
ItemDef(
name: "Curious Potion",
description: "Wonder what this does...",
kind: Consumable(
kind: Drink,
effects: Any([
Buff((
kind: Polymorphed(QuadrupedSmall(( species: Frog, body_type: Female ))),
data: (
strength: 0.0,
duration: Some(60),
),
cat_ids: [Natural],
)),
Buff((
kind: Polymorphed(QuadrupedSmall(( species: Rabbit, body_type: Female ))),
data: (
strength: 0.0,
duration: Some(60),
),
cat_ids: [Natural],
)),
Buff((
kind: Polymorphed(QuadrupedSmall(( species: Rat, body_type: Female ))),
data: (
strength: 0.0,
duration: Some(60),
),
cat_ids: [Natural],
)),
Buff((
kind: Polymorphed(QuadrupedSmall(( species: Squirrel, body_type: Female ))),
data: (
strength: 0.0,
duration: Some(60),
),
cat_ids: [Natural],
)),
Buff((
kind: Polymorphed(QuadrupedSmall(( species: Cat, body_type: Female ))),
data: (
strength: 0.0,
duration: Some(60),
),
cat_ids: [Natural],
)),
Buff((
kind: Polymorphed(QuadrupedSmall(( species: Fungome, body_type: Female ))),
data: (
strength: 0.0,
duration: Some(60),
),
cat_ids: [Natural],
)),
Buff((
kind: Polymorphed(QuadrupedSmall(( species: Pig, body_type: Female ))),
data: (
strength: 0.0,
duration: Some(60),
),
cat_ids: [Natural],
)),
])
),
quality: Common,
tags: [Potion],
)

4
assets/common/items/consumable/potion_big.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Precious medicine, it makes for the largest rejuvenative flask yet.", description: "Precious medicine, it makes for the largest rejuvenative flask yet.",
kind: Consumable( kind: Consumable(
kind: Drink, kind: Drink,
effects: [ effects: All([
Buff(( Buff((
kind: Potion, kind: Potion,
data: ( data: (
@ -20,7 +20,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] ])
), ),
quality: Common, quality: Common,
tags: [Potion], tags: [Potion],

4
assets/common/items/consumable/potion_med.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "An innovative invention from an apothecary, better than its smaller precursors.", description: "An innovative invention from an apothecary, better than its smaller precursors.",
kind: Consumable( kind: Consumable(
kind: Drink, kind: Drink,
effects: [ effects: All([
Buff(( Buff((
kind: Potion, kind: Potion,
data: ( data: (
@ -20,7 +20,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] ])
), ),
quality: Common, quality: Common,
tags: [Potion], tags: [Potion],

4
assets/common/items/consumable/potion_minor.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "A small potion concocted from apples and honey.", description: "A small potion concocted from apples and honey.",
kind: Consumable( kind: Consumable(
kind: Drink, kind: Drink,
effects: [ effects: All([
Buff(( Buff((
kind: Potion, kind: Potion,
data: ( data: (
@ -20,7 +20,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] ])
), ),
quality: Common, quality: Common,
tags: [Potion], tags: [Potion],

4
assets/common/items/debug/golden_cheese.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "They say gods eat it to get eternal youth.", description: "They say gods eat it to get eternal youth.",
kind: Consumable( kind: Consumable(
kind: Drink, kind: Drink,
effects: [ effects: All([
Buff(( Buff((
kind: Regeneration, kind: Regeneration,
data: ( data: (
@ -36,7 +36,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] ])
), ),
quality: Debug, quality: Debug,
tags: [Food], tags: [Food],

4
assets/common/items/food/apple.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Red and juicy", description: "Red and juicy",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/apple_mushroom_curry.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Who could say no to that?", description: "Who could say no to that?",
kind: Consumable( kind: Consumable(
kind: ComplexFood, kind: ComplexFood,
effects: [ effects: All([
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -20,7 +20,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] ])
), ),
quality: Moderate, quality: Moderate,
tags: [Food], tags: [Food],

4
assets/common/items/food/apple_stick.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "The stick makes it easier to carry!", description: "The stick makes it easier to carry!",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/blue_cheese.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Pungent and filling", description: "Pungent and filling",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: High, quality: High,
tags: [Food], tags: [Food],

4
assets/common/items/food/cactus_colada.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Giving you that special prickle.", description: "Giving you that special prickle.",
kind: Consumable( kind: Consumable(
kind: Drink, kind: Drink,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Moderate, quality: Moderate,
tags: [Food], tags: [Food],

4
assets/common/items/food/carrot.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "An orange root vegetable. They say it'll improve your vision!", description: "An orange root vegetable. They say it'll improve your vision!",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/cheese.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Made from goat milk from the finest dwarven produce. Aromatic and nutritious!", description: "Made from goat milk from the finest dwarven produce. Aromatic and nutritious!",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/coconut.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Reliable source of water and fat. Can often be found growing on palm trees.", description: "Reliable source of water and fat. Can often be found growing on palm trees.",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/coltsfoot.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "A daisy-like flower often used in herbal teas.", description: "A daisy-like flower often used in herbal teas.",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/dandelion.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "A small, yellow flower. Uses the wind to spread its seeds.", description: "A small, yellow flower. Uses the wind to spread its seeds.",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/garlic.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Make sure to brush your teeth after eating.", description: "Make sure to brush your teeth after eating.",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/honeycorn.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Sweeet", description: "Sweeet",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/lettuce.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "A vibrant green leafy vegetable. Lettuce make some salads!", description: "A vibrant green leafy vegetable. Lettuce make some salads!",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/meat.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Meat. The lifeblood of mankind.", description: "Meat. The lifeblood of mankind.",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/meat/beast_large_cooked.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Medium Rare.", description: "Medium Rare.",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

4
assets/common/items/food/meat/beast_large_raw.ron
View File

@ -3,7 +3,7 @@ ItemDef(
description: "Chunk of beastly animal meat, best after cooking.", description: "Chunk of beastly animal meat, best after cooking.",
kind: Consumable( kind: Consumable(
kind: Food, kind: Food,
effects: [ effects: One(
Buff(( Buff((
kind: Saturation, kind: Saturation,
data: ( data: (
@ -12,7 +12,7 @@ ItemDef(
), ),
cat_ids: [Natural], cat_ids: [Natural],
)), )),
] )
), ),
quality: Common, quality: Common,
tags: [Food], tags: [Food],

Some files were not shown because too many files have changed in this diff Show More