diff --git a/Cargo.lock b/Cargo.lock index f6947ee..c005692 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -107,11 +107,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] @@ -187,9 +188,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.85" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", @@ -282,9 +283,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" dependencies = [ "serde", ] @@ -323,9 +324,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytemuck" @@ -353,9 +354,9 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.2.9" +version = "1.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" +checksum = "e4730490333d58093109dc02c23174c3f4d490998c3fed3cc8e82d57afedb9cf" dependencies = [ "shlex", ] @@ -395,9 +396,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6" +checksum = "9c6ac4f2c0bf0f44e9161aec9675e1050aa4a530663c4a9e37e108fa948bca9f" dependencies = [ "chrono", "chrono-tz-build", @@ -474,9 +475,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -535,9 +536,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "crypto-common" @@ -605,9 +606,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" [[package]] name = "deunicode" @@ -997,11 +998,11 @@ dependencies = [ [[package]] name = "generator" -version = "0.8.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ - "cfg-if", + "cc", "libc", "log", "rustversion", @@ -1187,9 +1188,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "humantime" @@ -1199,9 +1200,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", @@ -1264,7 +1265,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.52.0", + "windows-core", ] [[package]] @@ -1437,9 +1438,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown 0.15.1", @@ -1484,9 +1485,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "is_terminal_polyfill" @@ -1496,9 +1497,18 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" -version = "0.13.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -1541,9 +1551,9 @@ dependencies = [ [[package]] name = "kiddo" -version = "4.2.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60c5fcd3044b774e2c80a502b2387b75d1baa95e99b2bceeb5db00f2e2d27fe9" +checksum = "9d2f8d9e1bc7c6919ad2cdc83472a9a4b5ed2ea2c5392c9514fdf958a7920f9a" dependencies = [ "az", "divrem", @@ -1552,7 +1562,7 @@ dependencies = [ "fixed", "generator", "init_with", - "itertools", + "itertools 0.12.1", "log", "num-traits", "ordered-float", @@ -1580,7 +1590,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "libc", ] @@ -1608,9 +1618,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "lru-cache" @@ -1627,7 +1637,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "byteorder", "culpa", "thiserror 1.0.69", @@ -1670,9 +1680,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", "simd-adler32", @@ -1858,9 +1868,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "ordered-float" @@ -2173,7 +2183,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", ] [[package]] @@ -2248,7 +2258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 2.7.0", + "bitflags 2.8.0", "serde", "serde_derive", ] @@ -2299,9 +2309,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.21" +version = "0.23.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" dependencies = [ "once_cell", "ring", @@ -2347,9 +2357,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" dependencies = [ "web-time", ] @@ -2400,9 +2410,9 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "same-file" @@ -2434,7 +2444,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "core-foundation 0.9.4", "core-foundation-sys", "libc", @@ -2448,7 +2458,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ - "bitflags 2.7.0", + "bitflags 2.8.0", "core-foundation 0.10.0", "core-foundation-sys", "libc", @@ -2482,9 +2492,9 @@ checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" [[package]] name = "semver" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" @@ -2508,9 +2518,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -2645,9 +2655,9 @@ dependencies = [ [[package]] name = "sorted-vec" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f64b077cc81ab5f1209bb44c6530a3277261aeaa5405111d48326897306918b" +checksum = "d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d" [[package]] name = "specs" @@ -2932,9 +2942,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ "indexmap", "serde", @@ -3097,9 +3107,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "untrusted" @@ -3138,9 +3148,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" +checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" dependencies = [ "getrandom", "serde", @@ -3148,9 +3158,9 @@ dependencies = [ [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vek" @@ -3169,7 +3179,7 @@ dependencies = [ [[package]] name = "veloren-client" version = "0.17.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "authc", "byteorder", @@ -3195,7 +3205,7 @@ dependencies = [ [[package]] name = "veloren-client-i18n" version = "0.13.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "deunicode", "fluent", @@ -3213,10 +3223,10 @@ dependencies = [ [[package]] name = "veloren-common" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "approx", - "bitflags 2.7.0", + "bitflags 2.8.0", "chrono", "chrono-tz", "crossbeam-utils", @@ -3225,7 +3235,7 @@ dependencies = [ "fxhash", "hashbrown 0.15.1", "indexmap", - "itertools", + "itertools 0.14.0", "lazy_static", "num-derive", "num-traits", @@ -3253,7 +3263,7 @@ dependencies = [ [[package]] name = "veloren-common-assets" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "assets_manager", "dot_vox", @@ -3268,7 +3278,7 @@ dependencies = [ [[package]] name = "veloren-common-base" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "directories-next", "tracing", @@ -3277,7 +3287,7 @@ dependencies = [ [[package]] name = "veloren-common-ecs" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "specs", "tracing", @@ -3287,7 +3297,7 @@ dependencies = [ [[package]] name = "veloren-common-i18n" version = "0.1.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "hashbrown 0.15.1", "rand", @@ -3297,7 +3307,7 @@ dependencies = [ [[package]] name = "veloren-common-net" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "bincode", "flate2", @@ -3315,7 +3325,7 @@ dependencies = [ [[package]] name = "veloren-common-state" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "async-trait", "bytes", @@ -3337,9 +3347,9 @@ dependencies = [ [[package]] name = "veloren-common-systems" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ - "itertools", + "itertools 0.14.0", "ordered-float", "rand", "rayon", @@ -3355,7 +3365,7 @@ dependencies = [ [[package]] name = "veloren-network" version = "0.3.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "async-channel", "async-trait", @@ -3380,10 +3390,10 @@ dependencies = [ [[package]] name = "veloren-network-protocol" version = "0.6.1" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "async-trait", - "bitflags 2.7.0", + "bitflags 2.8.0", "bytes", "hashbrown 0.15.1", "prometheus", @@ -3394,7 +3404,7 @@ dependencies = [ [[package]] name = "veloren-world" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?tag=weekly#26a3a190eb31f8eb6bbd539776eef1da1f3126ef" +source = "git+https://gitlab.com/veloren/veloren?tag=weekly#00a878a3fa841e3c0f0d22306742a52bd424fc34" dependencies = [ "arr_macro", "bincode", @@ -3405,7 +3415,7 @@ dependencies = [ "fxhash", "hashbrown 0.15.1", "image", - "itertools", + "itertools 0.14.0", "kiddo", "lazy_static", "noise", @@ -3534,9 +3544,9 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "0.26.7" +version = "0.26.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd5da49bdf1f30054cfe0b8ce2958b8fbeb67c4d82c8967a598af481bef255c" +checksum = "09aed61f5e8d2c18344b3faa33a4c837855fe56642757754775548fee21386c4" dependencies = [ "rustls-pki-types", ] @@ -3580,12 +3590,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.58.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -3597,60 +3606,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result", - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -3801,9 +3756,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.24" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" +checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index ad5285e..3250a07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,9 +16,9 @@ toml = "0.8.14" serde = { version = "1.0.203", features = ["derive"] } log = "0.4.22" env_logger = "0.11.3" -vek = { version = "0.17.0", features = ["repr_simd"] } +vek = { version = "0.17.0" } hashbrown = { version = "0.15.1", features = ["equivalent"] } [patch.crates-io] specs = { git = "https://github.com/amethyst/specs.git", rev = "4e2da1df29ee840baa9b936593c45592b7c9ae27" } -hashbrown = { git = "https://github.com/rust-lang/hashbrown.git", rev = "458e44532a65cf850bde3c22bd5d30a1ce2ed6af"} +hashbrown = { git = "https://github.com/rust-lang/hashbrown.git", rev = "458e44532a65cf850bde3c22bd5d30a1ce2ed6af" } diff --git a/README.md b/README.md index e5c0666..01971e8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # Veloren Trading Bot +> [!CAUTION] +> As of February 2025, bots such as this one are no longer allowed on the official Veloren server. + A bot that buys, sells and trades with players. The bot is containerized and can be run without compiling or building anything. Alternatively, you diff --git a/assets/common/abilities/sword/agile_dancing_edge.ron b/assets/common/abilities/sword/agile_dancing_edge.ron index 0583b7a..5a8f045 100644 --- a/assets/common/abilities/sword/agile_dancing_edge.ron +++ b/assets/common/abilities/sword/agile_dancing_edge.ron @@ -3,7 +3,7 @@ SelfBuff( cast_duration: 0.3, recover_duration: 0.3, buff_kind: Hastened, - buff_strength: 0.25, + buff_strength: 0.2, buff_duration: Some(20.0), energy_cost: 20, meta: ( diff --git a/assets/common/abilities/sword/agile_double_slash.ron b/assets/common/abilities/sword/agile_double_slash.ron index 29bb2ae..5b1a389 100644 --- a/assets/common/abilities/sword/agile_double_slash.ron +++ b/assets/common/abilities/sword/agile_double_slash.ron @@ -3,10 +3,10 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 2, + damage: 3, poise: 5, knockback: 0, - energy_regen: 9, + energy_regen: 8, ), range: 3.0, angle: 45.0, @@ -20,10 +20,10 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 3, + damage: 4, poise: 5, knockback: 0, - energy_regen: 13, + energy_regen: 12, ), range: 3.0, angle: 45.0, diff --git a/assets/common/abilities/sword/agile_dual_perforate.ron b/assets/common/abilities/sword/agile_dual_perforate.ron index 3034c30..6fdac90 100644 --- a/assets/common/abilities/sword/agile_dual_perforate.ron +++ b/assets/common/abilities/sword/agile_dual_perforate.ron @@ -3,11 +3,11 @@ RapidMelee( swing_duration: 0.14, recover_duration: 0.3, melee_constructor: ( - kind: Slash( - damage: 2, + kind: Stab( + damage: 3, poise: 1, knockback: 0, - energy_regen: 2, + energy_regen: 4, ), range: 4.0, angle: 5.0, diff --git a/assets/common/abilities/sword/agile_fell_strike.ron b/assets/common/abilities/sword/agile_fell_strike.ron index a029cdf..aa139bc 100644 --- a/assets/common/abilities/sword/agile_fell_strike.ron +++ b/assets/common/abilities/sword/agile_fell_strike.ron @@ -14,7 +14,7 @@ ComboMelee2( buildup_duration: 0.05, swing_duration: 0.05, hit_timing: 0.5, - recover_duration: 0.3, + recover_duration: 0.25, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/agile_perforate.ron b/assets/common/abilities/sword/agile_perforate.ron index 1e9bea9..c81d404 100644 --- a/assets/common/abilities/sword/agile_perforate.ron +++ b/assets/common/abilities/sword/agile_perforate.ron @@ -3,8 +3,8 @@ RapidMelee( swing_duration: 0.2, recover_duration: 0.3, melee_constructor: ( - kind: Slash( - damage: 2, + kind: Stab( + damage: 3, poise: 1, knockback: 0, energy_regen: 4, diff --git a/assets/common/abilities/sword/agile_quick_draw.ron b/assets/common/abilities/sword/agile_quick_draw.ron index 68f63e0..964527a 100644 --- a/assets/common/abilities/sword/agile_quick_draw.ron +++ b/assets/common/abilities/sword/agile_quick_draw.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 12, + damage: 10, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/agile_skewer.ron b/assets/common/abilities/sword/agile_skewer.ron index f1f3e18..9d5c092 100644 --- a/assets/common/abilities/sword/agile_skewer.ron +++ b/assets/common/abilities/sword/agile_skewer.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Stab( - damage: 12, + damage: 8, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/basic_crescent_slash.ron b/assets/common/abilities/sword/basic_crescent_slash.ron index 2cc73bb..09694c5 100644 --- a/assets/common/abilities/sword/basic_crescent_slash.ron +++ b/assets/common/abilities/sword/basic_crescent_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 13, + damage: 14, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/basic_double_slash.ron b/assets/common/abilities/sword/basic_double_slash.ron index 1aa9930..61ae127 100644 --- a/assets/common/abilities/sword/basic_double_slash.ron +++ b/assets/common/abilities/sword/basic_double_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 4, + damage: 5, poise: 5, knockback: 0, energy_regen: 10, diff --git a/assets/common/abilities/sword/basic_fell_strike.ron b/assets/common/abilities/sword/basic_fell_strike.ron index 79956e3..f386578 100644 --- a/assets/common/abilities/sword/basic_fell_strike.ron +++ b/assets/common/abilities/sword/basic_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 15, + damage: 16, poise: 5, knockback: 0, energy_regen: 0, @@ -14,7 +14,7 @@ ComboMelee2( buildup_duration: 0.05, swing_duration: 0.05, hit_timing: 0.5, - recover_duration: 0.7, + recover_duration: 0.6, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/basic_mighty_strike.ron b/assets/common/abilities/sword/basic_mighty_strike.ron index 2002662..230e529 100644 --- a/assets/common/abilities/sword/basic_mighty_strike.ron +++ b/assets/common/abilities/sword/basic_mighty_strike.ron @@ -1,11 +1,11 @@ FinisherMelee( - energy_cost: 30, + energy_cost: 20, buildup_duration: 0.2, swing_duration: 0.1, recover_duration: 0.4, melee_constructor: ( kind: Slash( - damage: 40, + damage: 50, poise: 10, knockback: 0, energy_regen: 0, @@ -13,5 +13,5 @@ FinisherMelee( range: 3.0, angle: 15.0, ), - minimum_combo: 15, + minimum_combo: 10, ) \ No newline at end of file diff --git a/assets/common/abilities/sword/basic_skewer.ron b/assets/common/abilities/sword/basic_skewer.ron index af1a945..50538d5 100644 --- a/assets/common/abilities/sword/basic_skewer.ron +++ b/assets/common/abilities/sword/basic_skewer.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Stab( - damage: 15, + damage: 14, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/cleaving_cross_cut.ron b/assets/common/abilities/sword/cleaving_cross_cut.ron index 28242a0..8312c08 100644 --- a/assets/common/abilities/sword/cleaving_cross_cut.ron +++ b/assets/common/abilities/sword/cleaving_cross_cut.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 8, + damage: 7, poise: 5, knockback: 0, energy_regen: 0, @@ -21,7 +21,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 13, + damage: 12, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/cleaving_double_slash.ron b/assets/common/abilities/sword/cleaving_double_slash.ron index 0fb39cc..0577414 100644 --- a/assets/common/abilities/sword/cleaving_double_slash.ron +++ b/assets/common/abilities/sword/cleaving_double_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 4, + damage: 6, poise: 5, knockback: 0, energy_regen: 8, @@ -21,7 +21,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 7, + damage: 8, poise: 5, knockback: 0, energy_regen: 12, diff --git a/assets/common/abilities/sword/cleaving_dual_whirlwind_slice.ron b/assets/common/abilities/sword/cleaving_dual_whirlwind_slice.ron index aa1d2cf..278a5a0 100644 --- a/assets/common/abilities/sword/cleaving_dual_whirlwind_slice.ron +++ b/assets/common/abilities/sword/cleaving_dual_whirlwind_slice.ron @@ -4,7 +4,7 @@ RapidMelee( recover_duration: 0.4, melee_constructor: ( kind: Slash( - damage: 8, + damage: 6, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/cleaving_fell_strike.ron b/assets/common/abilities/sword/cleaving_fell_strike.ron index 10909a9..2635bd6 100644 --- a/assets/common/abilities/sword/cleaving_fell_strike.ron +++ b/assets/common/abilities/sword/cleaving_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 18, + damage: 16, poise: 5, knockback: 0, energy_regen: 0, @@ -15,7 +15,7 @@ ComboMelee2( buildup_duration: 0.1, swing_duration: 0.1, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 0.7, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/cleaving_skewer.ron b/assets/common/abilities/sword/cleaving_skewer.ron index 01cdb65..157bd0b 100644 --- a/assets/common/abilities/sword/cleaving_skewer.ron +++ b/assets/common/abilities/sword/cleaving_skewer.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Stab( - damage: 15, + damage: 14, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/cleaving_sky_splitter.ron b/assets/common/abilities/sword/cleaving_sky_splitter.ron index d901588..ca5b8ad 100644 --- a/assets/common/abilities/sword/cleaving_sky_splitter.ron +++ b/assets/common/abilities/sword/cleaving_sky_splitter.ron @@ -4,7 +4,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 23, + damage: 22, poise: 20, knockback: 15, energy_regen: 0, @@ -20,7 +20,7 @@ ComboMelee2( ori_modifier: 0.6, ), ], - energy_cost_per_strike: 18, + energy_cost_per_strike: 15, meta: ( requirements: (stance: Some(Sword(Cleaving))), ), diff --git a/assets/common/abilities/sword/crippling_bloody_gash.ron b/assets/common/abilities/sword/crippling_bloody_gash.ron index 5db5a4c..cad52d6 100644 --- a/assets/common/abilities/sword/crippling_bloody_gash.ron +++ b/assets/common/abilities/sword/crippling_bloody_gash.ron @@ -6,7 +6,7 @@ ComboMelee2( damage: 12, poise: 5, knockback: 0, - energy_regen: 7, + energy_regen: 4, ), range: 3.0, angle: 45.0, @@ -19,7 +19,7 @@ ComboMelee2( ori_modifier: 0.6, ), ], - energy_cost_per_strike: 15, + energy_cost_per_strike: 12, meta: ( requirements: (stance: Some(Sword(Crippling))), ), diff --git a/assets/common/abilities/sword/crippling_cascade.ron b/assets/common/abilities/sword/crippling_cascade.ron index 4244d40..fd129a4 100644 --- a/assets/common/abilities/sword/crippling_cascade.ron +++ b/assets/common/abilities/sword/crippling_cascade.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 15, + damage: 16, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/crippling_cross_cut.ron b/assets/common/abilities/sword/crippling_cross_cut.ron index 8f9fe6c..857368e 100644 --- a/assets/common/abilities/sword/crippling_cross_cut.ron +++ b/assets/common/abilities/sword/crippling_cross_cut.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 7, + damage: 6, poise: 5, knockback: 0, energy_regen: 0, @@ -26,7 +26,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 11, + damage: 10, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/crippling_double_slash.ron b/assets/common/abilities/sword/crippling_double_slash.ron index 021dd44..6d5ccb2 100644 --- a/assets/common/abilities/sword/crippling_double_slash.ron +++ b/assets/common/abilities/sword/crippling_double_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 4, + damage: 5, poise: 5, knockback: 0, energy_regen: 10, diff --git a/assets/common/abilities/sword/crippling_dual_cross_cut.ron b/assets/common/abilities/sword/crippling_dual_cross_cut.ron index 7fbb7c0..3cf61db 100644 --- a/assets/common/abilities/sword/crippling_dual_cross_cut.ron +++ b/assets/common/abilities/sword/crippling_dual_cross_cut.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 9, + damage: 7.5, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/crippling_eviscerate.ron b/assets/common/abilities/sword/crippling_eviscerate.ron index 75612fb..2558131 100644 --- a/assets/common/abilities/sword/crippling_eviscerate.ron +++ b/assets/common/abilities/sword/crippling_eviscerate.ron @@ -10,7 +10,7 @@ ComboMelee2( ), range: 3.0, angle: 45.0, - damage_effect: Some(BuffsVulnerable(0.825, Crippled)), + damage_effect: Some(BuffsVulnerable(0.8, Crippled)), ), buildup_duration: 0.2, swing_duration: 0.15, @@ -19,7 +19,7 @@ ComboMelee2( ori_modifier: 0.6, ), ], - energy_cost_per_strike: 10, + energy_cost_per_strike: 12, meta: ( requirements: (stance: Some(Sword(Crippling))), ), diff --git a/assets/common/abilities/sword/crippling_fell_strike.ron b/assets/common/abilities/sword/crippling_fell_strike.ron index 995eb7e..04518af 100644 --- a/assets/common/abilities/sword/crippling_fell_strike.ron +++ b/assets/common/abilities/sword/crippling_fell_strike.ron @@ -20,7 +20,7 @@ ComboMelee2( buildup_duration: 0.05, swing_duration: 0.05, hit_timing: 0.5, - recover_duration: 0.7, + recover_duration: 0.6, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/crippling_mutilate.ron b/assets/common/abilities/sword/crippling_mutilate.ron index 7973c1f..fe29ac8 100644 --- a/assets/common/abilities/sword/crippling_mutilate.ron +++ b/assets/common/abilities/sword/crippling_mutilate.ron @@ -11,11 +11,11 @@ RapidMelee( ), range: 4.0, angle: 15.0, - damage_effect: Some(BuffsVulnerable(1.0, Bleeding)), + damage_effect: Some(BuffsVulnerable(0.875, Bleeding)), ), energy_cost: 5, max_strikes: Some(4), move_modifier: 0.7, ori_modifier: 0.2, - minimum_combo: 12, + minimum_combo: 10, ) diff --git a/assets/common/abilities/sword/crippling_skewer.ron b/assets/common/abilities/sword/crippling_skewer.ron index c2e7506..ce48d70 100644 --- a/assets/common/abilities/sword/crippling_skewer.ron +++ b/assets/common/abilities/sword/crippling_skewer.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Stab( - damage: 14, + damage: 12, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/defensive_cascade.ron b/assets/common/abilities/sword/defensive_cascade.ron index 53c0ca6..4fb72aa 100644 --- a/assets/common/abilities/sword/defensive_cascade.ron +++ b/assets/common/abilities/sword/defensive_cascade.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 16, + damage: 13, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/defensive_counter.ron b/assets/common/abilities/sword/defensive_counter.ron index 6478d05..f208b4e 100644 --- a/assets/common/abilities/sword/defensive_counter.ron +++ b/assets/common/abilities/sword/defensive_counter.ron @@ -5,14 +5,14 @@ FinisherMelee( recover_duration: 0.6, melee_constructor: ( kind: Slash( - damage: 30, + damage: 25, poise: 10, knockback: 0, energy_regen: 0, ), range: 3.0, angle: 15.0, - damage_effect: Some(BuffsVulnerable(2.0, Parried)), + damage_effect: Some(BuffsVulnerable(1.5, Parried)), ), - minimum_combo: 15, + minimum_combo: 10, ) \ No newline at end of file diff --git a/assets/common/abilities/sword/defensive_crescent_slash.ron b/assets/common/abilities/sword/defensive_crescent_slash.ron index c726def..8bc4d03 100644 --- a/assets/common/abilities/sword/defensive_crescent_slash.ron +++ b/assets/common/abilities/sword/defensive_crescent_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 11, + damage: 10, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/defensive_double_slash.ron b/assets/common/abilities/sword/defensive_double_slash.ron index 611d271..f9d89d7 100644 --- a/assets/common/abilities/sword/defensive_double_slash.ron +++ b/assets/common/abilities/sword/defensive_double_slash.ron @@ -20,7 +20,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 7, + damage: 6, poise: 5, knockback: 0, energy_regen: 15, diff --git a/assets/common/abilities/sword/defensive_fell_strike.ron b/assets/common/abilities/sword/defensive_fell_strike.ron index 5912b74..2b44f95 100644 --- a/assets/common/abilities/sword/defensive_fell_strike.ron +++ b/assets/common/abilities/sword/defensive_fell_strike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 15, + damage: 11, poise: 5, knockback: 0, energy_regen: 0, @@ -15,7 +15,7 @@ ComboMelee2( buildup_duration: 0.05, swing_duration: 0.05, hit_timing: 0.5, - recover_duration: 0.7, + recover_duration: 0.6, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/defensive_riposte.ron b/assets/common/abilities/sword/defensive_riposte.ron index 52ed70a..376e9dd 100644 --- a/assets/common/abilities/sword/defensive_riposte.ron +++ b/assets/common/abilities/sword/defensive_riposte.ron @@ -7,7 +7,7 @@ RiposteMelee( block_strength: 2.1, melee_constructor: ( kind: Slash( - damage: 18, + damage: 13, poise: 5, knockback: 0, energy_regen: 5, diff --git a/assets/common/abilities/sword/defensive_skewer.ron b/assets/common/abilities/sword/defensive_skewer.ron index 6829d71..2978f1b 100644 --- a/assets/common/abilities/sword/defensive_skewer.ron +++ b/assets/common/abilities/sword/defensive_skewer.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Stab( - damage: 13, + damage: 10, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/defensive_stalwart_sword.ron b/assets/common/abilities/sword/defensive_stalwart_sword.ron index 9f18bdc..968466a 100644 --- a/assets/common/abilities/sword/defensive_stalwart_sword.ron +++ b/assets/common/abilities/sword/defensive_stalwart_sword.ron @@ -3,7 +3,7 @@ SelfBuff( cast_duration: 0.3, recover_duration: 0.25, buff_kind: ProtectingWard, - buff_strength: 0.4, + buff_strength: 0.35, buff_duration: Some(20.0), energy_cost: 20, meta: ( diff --git a/assets/common/abilities/sword/defensive_vital_jab.ron b/assets/common/abilities/sword/defensive_vital_jab.ron index 718d7a2..2ea6b55 100644 --- a/assets/common/abilities/sword/defensive_vital_jab.ron +++ b/assets/common/abilities/sword/defensive_vital_jab.ron @@ -10,7 +10,7 @@ ChargedMelee( ), scaled: Some(( kind: Stab( - damage: 12, + damage: 10, poise: 5, knockback: 0, energy_regen: 25, diff --git a/assets/common/abilities/sword/heavy_cascade.ron b/assets/common/abilities/sword/heavy_cascade.ron index d4a4112..768aa03 100644 --- a/assets/common/abilities/sword/heavy_cascade.ron +++ b/assets/common/abilities/sword/heavy_cascade.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 25, + damage: 24, poise: 15, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/heavy_cross_cut.ron b/assets/common/abilities/sword/heavy_cross_cut.ron index cb0fd8f..9c0752a 100644 --- a/assets/common/abilities/sword/heavy_cross_cut.ron +++ b/assets/common/abilities/sword/heavy_cross_cut.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 11, + damage: 9, poise: 5, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/heavy_double_slash.ron b/assets/common/abilities/sword/heavy_double_slash.ron index 8ff15d0..2597144 100644 --- a/assets/common/abilities/sword/heavy_double_slash.ron +++ b/assets/common/abilities/sword/heavy_double_slash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 5, + damage: 8, poise: 10, knockback: 0, energy_regen: 10, @@ -20,7 +20,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 9, + damage: 11, poise: 15, knockback: 0, energy_regen: 15, diff --git a/assets/common/abilities/sword/heavy_fell_strike.ron b/assets/common/abilities/sword/heavy_fell_strike.ron index e193241..6c61b7b 100644 --- a/assets/common/abilities/sword/heavy_fell_strike.ron +++ b/assets/common/abilities/sword/heavy_fell_strike.ron @@ -15,7 +15,7 @@ ComboMelee2( buildup_duration: 0.1, swing_duration: 0.1, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 0.7, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/heavy_pillar_thrust.ron b/assets/common/abilities/sword/heavy_pillar_thrust.ron index 3f3b916..b984ad3 100644 --- a/assets/common/abilities/sword/heavy_pillar_thrust.ron +++ b/assets/common/abilities/sword/heavy_pillar_thrust.ron @@ -15,7 +15,7 @@ DiveMelee( scaled: Some(( kind: Slash( damage: 8, - poise: 11, + poise: 12, knockback: 0, energy_regen: 0, ))), diff --git a/assets/common/abilities/sword/heavy_pommel_strike.ron b/assets/common/abilities/sword/heavy_pommel_strike.ron index c7c4f8e..3047434 100644 --- a/assets/common/abilities/sword/heavy_pommel_strike.ron +++ b/assets/common/abilities/sword/heavy_pommel_strike.ron @@ -4,12 +4,13 @@ ComboMelee2( melee_constructor: ( kind: Bash( damage: 12, - poise: 19, + poise: 20, knockback: 0, energy_regen: 0, ), range: 1.5, angle: 45.0, + attack_effect: Some((Poise(30), TargetBlocking)), ), buildup_duration: 0.3, swing_duration: 0.15, @@ -18,7 +19,7 @@ ComboMelee2( ori_modifier: 0.6, ), ], - energy_cost_per_strike: 9, + energy_cost_per_strike: 8, meta: ( init_event: Some(EnterStance(Sword(Heavy))), ), diff --git a/assets/common/abilities/sword/heavy_skewer.ron b/assets/common/abilities/sword/heavy_skewer.ron index 14bff76..b21efb1 100644 --- a/assets/common/abilities/sword/heavy_skewer.ron +++ b/assets/common/abilities/sword/heavy_skewer.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Stab( - damage: 18, + damage: 19, poise: 15, knockback: 0, energy_regen: 0, diff --git a/assets/common/abilities/sword/heavy_sweep.ron b/assets/common/abilities/sword/heavy_sweep.ron index e1e6be1..6a6fe59 100644 --- a/assets/common/abilities/sword/heavy_sweep.ron +++ b/assets/common/abilities/sword/heavy_sweep.ron @@ -3,8 +3,8 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 21, - poise: 22, + damage: 20, + poise: 20, knockback: 0, energy_regen: 0, ), @@ -19,7 +19,7 @@ ComboMelee2( ori_modifier: 0.6, ), ], - energy_cost_per_strike: 13, + energy_cost_per_strike: 12, meta: ( init_event: Some(EnterStance(Sword(Heavy))), ), diff --git a/assets/common/entity/dungeon/vampire/bloodservant.ron b/assets/common/entity/dungeon/vampire/bloodservant.ron index 9dcde79..f2dac52 100644 --- a/assets/common/entity/dungeon/vampire/bloodservant.ron +++ b/assets/common/entity/dungeon/vampire/bloodservant.ron @@ -3,7 +3,7 @@ name: Name("Bloodservant"), body: RandomWith("bloodservant"), alignment: Alignment(Enemy), - loot: Nothing, + loot: LootTable("common.loot_tables.dungeon.vampire.bloodservant"), inventory: ( loadout: Inline(( active_hands: InHands((Item("common.items.npc_weapons.biped_small.vampire.bloodservant_axe"), None)), diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index 9e90de1..5b2d3d5 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -1803,6 +1803,30 @@ Simple( "common.items.armor.golemite.helmet", ): "armor-golemite-helmet", + Simple( + "common.items.armor.ashen.back", + ): "armor-ashen-back", + Simple( + "common.items.armor.ashen.belt", + ): "armor-ashen-belt", + Simple( + "common.items.armor.ashen.chest", + ): "armor-ashen-chest", + Simple( + "common.items.armor.ashen.foot", + ): "armor-ashen-foot", + Simple( + "common.items.armor.ashen.hand", + ): "armor-ashen-hand", + Simple( + "common.items.armor.ashen.pants", + ): "armor-ashen-pants", + Simple( + "common.items.armor.ashen.shoulder", + ): "armor-ashen-shoulder", + Simple( + "common.items.armor.ashen.helmet", + ): "armor-ashen-helmet", Simple( "common.items.armor.mail.steel.back", ): "armor-mail-steel-back", @@ -3319,8 +3343,11 @@ "common.items.crafting_ing.dwarven_battery", ): "sprite-crafting_ing-dwarven_battery", Simple( - "common.items.crafting_ing.dwarven_battery", - ): "sprite-crafting_ing-dwarven_battery", + "common.items.crafting_ing.bloody_tear", + ): "sprite-crafting_ing-bloody_tear", + Simple( + "common.items.crafting_ing.molten_core", + ): "sprite-crafting_ing-molten_core", Simple( "common.items.crafting_ing.stones", ): "sprite-rocks-rock-0", @@ -3486,6 +3513,12 @@ Simple( "common.items.lantern.red_0", ): "lantern-red", + Simple( + "common.items.lantern.bloodmoon_relic", + ): "lantern-bloodmoon_relic", + Simple( + "common.items.lantern.crux", + ): "lantern-crux", Simple( "common.items.charms.burning_charm", ): "object-burning_charm", @@ -7377,6 +7410,8 @@ Simple("common.items.recipes.unique.abyssal_ring"): "recipe-unique-abyssal_ring", Simple("common.items.recipes.unique.mindflayer_spellbag"): "recipe-unique-mindflayer_spellbag", Simple("common.items.recipes.unique.polaris"): "recipe-unique-polaris", + Simple("common.items.recipes.unique.bloodmoon_relic"): "recipe-unique-bloodmoon_relic", + Simple("common.items.recipes.unique.crux"): "recipe-unique-crux", Simple("common.items.recipes.unique.seashell_necklace"): "recipe-unique-seashell_necklace", Simple("common.items.recipes.unique.troll_hide_pack"): "recipe-unique-troll_hide_pack", Simple("common.items.recipes.unique.winged_coronet"): "recipe-unique-winged_coronet", diff --git a/assets/common/items/armor/ashen/back.ron b/assets/common/items/armor/ashen/back.ron new file mode 100644 index 0000000..8966bc9 --- /dev/null +++ b/assets/common/items/armor/ashen/back.ron @@ -0,0 +1,10 @@ +ItemDef( + legacy_name: "Ashen Cloak", + legacy_description: "The scorched remains of a cloak made out of obsidian feathers.", + kind: Armor(( + kind: Back, + stats: FromSet("Ashen"), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/ashen/belt.ron b/assets/common/items/armor/ashen/belt.ron new file mode 100644 index 0000000..ac9a7ea --- /dev/null +++ b/assets/common/items/armor/ashen/belt.ron @@ -0,0 +1,10 @@ +ItemDef( + legacy_name: "Ashen Belt Rope", + legacy_description: "The ashen thread seals the volcanic heat emitting from within the robe.", + kind: Armor(( + kind: Belt, + stats: FromSet("Ashen"), + )), + quality: Legendary, + tags: [], +) diff --git a/assets/common/items/armor/ashen/chest.ron b/assets/common/items/armor/ashen/chest.ron new file mode 100644 index 0000000..f15bd0f --- /dev/null +++ b/assets/common/items/armor/ashen/chest.ron @@ -0,0 +1,10 @@ +ItemDef( + legacy_name: "Ashen Robes", + legacy_description: "Your heart burns with the passion for the one true Gigas!", + kind: Armor(( + kind: Chest, + stats: FromSet("Ashen"), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/ashen/foot.ron b/assets/common/items/armor/ashen/foot.ron new file mode 100644 index 0000000..1d6ca9f --- /dev/null +++ b/assets/common/items/armor/ashen/foot.ron @@ -0,0 +1,10 @@ +ItemDef( + legacy_name: "Ashen Sollerets", + legacy_description: "Scorch the earth in your wake.", + kind: Armor(( + kind: Foot, + stats: FromSet("Ashen"), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/ashen/hand.ron b/assets/common/items/armor/ashen/hand.ron new file mode 100644 index 0000000..8b8f573 --- /dev/null +++ b/assets/common/items/armor/ashen/hand.ron @@ -0,0 +1,10 @@ +ItemDef( + legacy_name: "Ashen Bracers", + legacy_description: "It feels as though magma runs through your veins.", + kind: Armor(( + kind: Hand, + stats: FromSet("Ashen"), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/ashen/helmet.ron b/assets/common/items/armor/ashen/helmet.ron new file mode 100644 index 0000000..a469bdc --- /dev/null +++ b/assets/common/items/armor/ashen/helmet.ron @@ -0,0 +1,15 @@ +ItemDef( + legacy_name: "Ashen Cowl", + legacy_description: "Equipment constructed from Ash.", + kind: Armor(( + kind: Head, + stats: Direct(( + energy_max: Some(8.1), + energy_reward: Some(0.081), + precision_power: Some(0.0432), + stealth: Some(0.16875), + )), + )), + quality: Legendary, + tags: [], +) diff --git a/assets/common/items/armor/ashen/pants.ron b/assets/common/items/armor/ashen/pants.ron new file mode 100644 index 0000000..9b91d99 --- /dev/null +++ b/assets/common/items/armor/ashen/pants.ron @@ -0,0 +1,10 @@ +ItemDef( + legacy_name: "Ashen Brales", + legacy_description: "Staves off the soot and ash throughout your travels.", + kind: Armor(( + kind: Pants, + stats: FromSet("Ashen"), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/armor/ashen/shoulder.ron b/assets/common/items/armor/ashen/shoulder.ron new file mode 100644 index 0000000..e36133a --- /dev/null +++ b/assets/common/items/armor/ashen/shoulder.ron @@ -0,0 +1,10 @@ +ItemDef( + legacy_name: "Ashen Mantle", + legacy_description: "The once soft raven feathers hardened in layers of volcanic materials.", + kind: Armor(( + kind: Shoulder, + stats: FromSet("Ashen"), + )), + quality: Legendary, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/crafting_ing/bloody_tear.ron b/assets/common/items/crafting_ing/bloody_tear.ron new file mode 100644 index 0000000..cbd9c1d --- /dev/null +++ b/assets/common/items/crafting_ing/bloody_tear.ron @@ -0,0 +1,9 @@ +ItemDef( + legacy_name: "Bloody Tear", + legacy_description: "The hardened, concentrated blood of the beasts' countless victims.", + kind: Ingredient( + // Descriptor not needed + descriptor: "", ), + quality: Epic, + tags: [], +) diff --git a/assets/common/items/crafting_ing/molten_core.ron b/assets/common/items/crafting_ing/molten_core.ron new file mode 100644 index 0000000..155d262 --- /dev/null +++ b/assets/common/items/crafting_ing/molten_core.ron @@ -0,0 +1,9 @@ +ItemDef( + legacy_name: "Molten Core", + legacy_description: "Compacted liquid-sword forged in the great furnace of the earth.", + kind: Ingredient( + // Descriptor not needed + descriptor: "", ), + quality: Legendary, + tags: [], +) diff --git a/assets/common/items/lantern/bloodmoon_relic.ron b/assets/common/items/lantern/bloodmoon_relic.ron new file mode 100644 index 0000000..f773217 --- /dev/null +++ b/assets/common/items/lantern/bloodmoon_relic.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Bloodmoon Relic", + legacy_description: "The alluring scent of blood acts as both a trap and a light-source to hunt down creatures of the night.", + kind: Lantern( + ( + color: (r: 220, g: 20, b: 40), + strength_thousandths: 8000, + flicker_thousandths: 600, + ), + ), + quality: Epic, + tags: [Utility], +) \ No newline at end of file diff --git a/assets/common/items/lantern/crux.ron b/assets/common/items/lantern/crux.ron new file mode 100644 index 0000000..8bbe439 --- /dev/null +++ b/assets/common/items/lantern/crux.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Crux", + legacy_description: "The scalding heat is but a mere sample of the embers of the Gigas' unforgiving origin.", + kind: Lantern( + ( + color: (r: 178, g: 34, b: 34), + strength_thousandths: 8000, + flicker_thousandths: 600, + ), + ), + quality: Legendary, + tags: [Utility], +) \ No newline at end of file diff --git a/assets/common/items/recipes/unique/bloodmoon_relic.ron b/assets/common/items/recipes/unique/bloodmoon_relic.ron new file mode 100644 index 0000000..b35a948 --- /dev/null +++ b/assets/common/items/recipes/unique/bloodmoon_relic.ron @@ -0,0 +1,11 @@ +ItemDef( + legacy_name: "", + legacy_description: "", + kind: RecipeGroup( + recipes: [ + "bloodmoon_relic", + ], + ), + quality: Common, + tags: [], +) diff --git a/assets/common/items/recipes/unique/crux.ron b/assets/common/items/recipes/unique/crux.ron new file mode 100644 index 0000000..9a8d3f0 --- /dev/null +++ b/assets/common/items/recipes/unique/crux.ron @@ -0,0 +1,11 @@ +ItemDef( + legacy_name: "", + legacy_description: "", + kind: RecipeGroup( + recipes: [ + "crux", + ], + ), + quality: Common, + tags: [], +) diff --git a/assets/common/loot_tables/dungeon/vampire/bloodmoon_heiress.ron b/assets/common/loot_tables/dungeon/vampire/bloodmoon_heiress.ron index 387bdc2..7f7dc06 100644 --- a/assets/common/loot_tables/dungeon/vampire/bloodmoon_heiress.ron +++ b/assets/common/loot_tables/dungeon/vampire/bloodmoon_heiress.ron @@ -6,6 +6,8 @@ (4.0, LootTable("common.loot_tables.weapons.tier-4")), // Armor (4.0, LootTable("common.loot_tables.armor.tier-4")), + // Misc + (0.75, Item("common.items.crafting_ing.bloody_tear")), ]), ], )), diff --git a/assets/common/loot_tables/dungeon/vampire/bloodservant.ron b/assets/common/loot_tables/dungeon/vampire/bloodservant.ron new file mode 100644 index 0000000..56904ba --- /dev/null +++ b/assets/common/loot_tables/dungeon/vampire/bloodservant.ron @@ -0,0 +1,4 @@ +[ + (0.9, Nothing), + (0.1, Item("common.items.recipes.unique.bloodmoon_relic")), +] diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index 5f18c40..068f434 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -332,5 +332,11 @@ energy_max: Some(63.0), energy_reward: Some(-0.45), ), + "Ashen": ( + energy_max: Some(72.9), + energy_reward: Some(0.729), + precision_power: Some(0.388), + stealth: Some(1.51875), + ), }, ) diff --git a/assets/common/recipe_book_manifest.ron b/assets/common/recipe_book_manifest.ron index 17a674d..4952a67 100644 --- a/assets/common/recipe_book_manifest.ron +++ b/assets/common/recipe_book_manifest.ron @@ -2154,6 +2154,29 @@ craft_sprite: Some(CraftingBench), is_recycling: false, ), + "bloodmoon_relic": ( + output: ("common.items.lantern.bloodmoon_relic", 1), + inputs: [ + (Item("common.items.crafting_ing.bloody_tear"), 1, false), + (Item("common.items.mineral.ingot.bloodsteel"), 2, false), + (Item("common.items.mineral.ingot.steel"), 6, false), + (Item("common.items.crafting_ing.living_embers"), 2, false), + (Item("common.items.tool.craftsman_hammer"), 0, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), + "crux": ( + output: ("common.items.lantern.crux", 1), + inputs: [ + (Item("common.items.crafting_ing.molten_core"), 3, false), + (Item("common.items.crafting_ing.living_embers"), 16, false), + (Item("common.items.crafting_ing.cursed_bead"), 1, false), + (Item("common.items.tool.craftsman_hammer"), 0, false), + ], + craft_sprite: Some(CraftingBench), + is_recycling: false, + ), /// MODULAR WEAPONS/SWORDS/SECONDARY COMPONENTS "short_hilt": ( output: ("common.items.modular.weapon.secondary.sword.short", 1), diff --git a/assets/common/trading/unsellable_recipe.ron b/assets/common/trading/unsellable_recipe.ron index 691b054..a244db0 100644 --- a/assets/common/trading/unsellable_recipe.ron +++ b/assets/common/trading/unsellable_recipe.ron @@ -42,4 +42,6 @@ (0.2, Item("common.items.recipes.unique.abyssal_gorget")), (0.15, Item("common.items.recipes.unique.mindflayer_spellbag")), (0.1, Item("common.items.recipes.unique.polaris")), + (0.1, Item("common.items.recipes.unique.bloodmoon_relic")), + (0.1, Item("common.items.recipes.unique.crux")), ] diff --git a/rust-toolchain b/rust-toolchain index e936f91..8912579 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2024-07-07 +nightly-2025-01-19