diff --git a/Cargo.lock b/Cargo.lock index 2b32976..dbcd715 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.4.8" @@ -68,9 +74,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -83,33 +89,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -148,24 +154,25 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assets_manager" -version = "0.11.6" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4dde42f7d78f1a1d0149ac8526e21c6c849090ce6aa191ae94b90b0cb2e4aed" +checksum = "eadb8d5c3ec796630a35133c038842b02bcfc2a8a324349fc24fd6db5d679474" dependencies = [ "ahash 0.8.11", "bincode", + "hashbrown 0.14.5", "log", "ron", "serde", @@ -186,13 +193,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -245,15 +252,15 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -287,9 +294,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -334,9 +341,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -345,16 +352,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "bytes" -version = "1.6.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cc" -version = "1.0.98" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "shlex", +] [[package]] name = "cesu8" @@ -380,7 +396,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -408,9 +424,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "combine" @@ -433,9 +449,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -449,15 +465,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -547,14 +563,14 @@ checksum = "1234e1717066d3c71dcf89b75e7b586299e41204d361db56ec51e6ded5014279" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -562,26 +578,26 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -635,7 +651,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -664,9 +680,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elapsed" @@ -683,7 +699,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -704,35 +720,35 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -740,9 +756,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -789,9 +805,9 @@ dependencies = [ [[package]] name = "fixed" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048" +checksum = "85c6e0b89bf864acd20590dbdbad56f69aeb898abfc9443008fd7bd48b2cc85a" dependencies = [ "az", "bytemuck", @@ -802,12 +818,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -828,7 +844,7 @@ dependencies = [ "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -928,7 +944,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -972,11 +988,11 @@ dependencies = [ [[package]] name = "generator" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +checksum = "dbb949699c3e4df3a183b1d2142cb24277057055ed23c68ed58894f76c517223" dependencies = [ - "cc", + "cfg-if", "libc", "log", "rustversion", @@ -1144,9 +1160,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1154,12 +1170,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1167,9 +1183,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "humantime" @@ -1179,9 +1195,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -1216,9 +1232,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -1245,7 +1261,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1285,12 +1301,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "num-traits", "png", "zune-core", @@ -1299,9 +1315,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1352,18 +1368,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1402,18 +1409,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "kiddo" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2f8d9e1bc7c6919ad2cdc83472a9a4b5ed2ea2c5392c9514fdf958a7920f9a" +checksum = "60c5fcd3044b774e2c80a502b2387b75d1baa95e99b2bceeb5db00f2e2d27fe9" dependencies = [ "az", "divrem", @@ -1422,7 +1429,7 @@ dependencies = [ "fixed", "generator", "init_with", - "itertools 0.12.1", + "itertools", "log", "num-traits", "ordered-float", @@ -1434,15 +1441,15 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libredox" @@ -1450,7 +1457,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -1491,7 +1498,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26a280471e5ff9dda51cf34863c338ffde7df78139210f9c819943b29cdb091d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "culpa", "thiserror", @@ -1522,9 +1529,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "minimal-lexical" @@ -1534,23 +1541,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] [[package]] -name = "mio" -version = "0.8.11" +name = "miniz_oxide" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1621,9 +1638,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -1646,7 +1663,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1701,9 +1718,9 @@ dependencies = [ [[package]] name = "object" -version = "0.35.0" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -1722,9 +1739,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "ordered-float" -version = "4.2.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" dependencies = [ "num-traits", ] @@ -1761,7 +1778,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1840,7 +1857,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1865,14 +1882,17 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-hack" @@ -1888,9 +1908,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1917,16 +1937,17 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904e3d3ba178131798c6d9375db2b13b34337d489b089fc5ba0825a2ff1bee73" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", + "socket2", "thiserror", "tokio", "tracing", @@ -1934,14 +1955,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand", "ring", - "rustc-hash", + "rustc-hash 2.0.0", "rustls", "rustls-platform-verifier", "slab", @@ -1952,9 +1973,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f0def2590301f4f667db5a77f9694fb004f82796dc1a8b1508fafa3d0e8b72" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", @@ -1965,9 +1986,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2039,18 +2060,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2059,9 +2080,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2071,9 +2092,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2082,9 +2103,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "resolv-conf" @@ -2118,7 +2139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64 0.21.7", - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_derive", ] @@ -2153,19 +2174,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.4.0" +name = "rustc-hash" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustls" -version = "0.23.9" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a218f0f6d05669de4eabfb24f31ce802035c952429d037507b4a4a39f0e60c5b" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "once_cell", "ring", @@ -2177,9 +2204,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -2190,9 +2217,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -2200,15 +2227,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-platform-verifier" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" dependencies = [ "core-foundation", "core-foundation-sys", @@ -2227,15 +2254,15 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", @@ -2280,11 +2307,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -2294,9 +2321,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -2325,31 +2352,32 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2362,14 +2390,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2394,6 +2422,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "shred" version = "0.16.1" @@ -2515,11 +2549,11 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spin_sleep" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a978649eaf70006b082e79c832bd72556ac1393eaf564d686e919dca2347f" +checksum = "64bd7227d85bfd1b8df51e0d83da36d9baaee85eb75730386ef8e3ab6f2a2ea3" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2547,14 +2581,14 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_type" @@ -2575,9 +2609,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -2592,22 +2626,22 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2640,9 +2674,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2655,30 +2689,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2705,9 +2738,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -2717,18 +2750,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", @@ -2754,15 +2787,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -2784,7 +2817,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2877,7 +2910,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -2939,9 +2972,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -2956,9 +2989,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -2986,7 +3019,7 @@ dependencies = [ [[package]] name = "veloren-client" version = "0.16.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "authc", "byteorder", @@ -3012,7 +3045,7 @@ dependencies = [ [[package]] name = "veloren-client-i18n" version = "0.13.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "deunicode", "fluent", @@ -3030,10 +3063,10 @@ dependencies = [ [[package]] name = "veloren-common" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "approx", - "bitflags 2.5.0", + "bitflags 2.6.0", "chrono", "chrono-tz", "crossbeam-utils", @@ -3042,7 +3075,7 @@ dependencies = [ "fxhash", "hashbrown 0.14.5", "indexmap", - "itertools 0.13.0", + "itertools", "lazy_static", "num-derive", "num-traits", @@ -3070,7 +3103,7 @@ dependencies = [ [[package]] name = "veloren-common-assets" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "assets_manager", "dot_vox", @@ -3085,7 +3118,7 @@ dependencies = [ [[package]] name = "veloren-common-base" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "directories-next", "tracing", @@ -3094,7 +3127,7 @@ dependencies = [ [[package]] name = "veloren-common-ecs" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "specs", "tracing", @@ -3104,7 +3137,7 @@ dependencies = [ [[package]] name = "veloren-common-i18n" version = "0.1.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "hashbrown 0.14.5", "rand", @@ -3114,7 +3147,7 @@ dependencies = [ [[package]] name = "veloren-common-net" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "bincode", "flate2", @@ -3132,7 +3165,7 @@ dependencies = [ [[package]] name = "veloren-common-state" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "async-trait", "bytes", @@ -3154,9 +3187,9 @@ dependencies = [ [[package]] name = "veloren-common-systems" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ - "itertools 0.13.0", + "itertools", "ordered-float", "rand", "rayon", @@ -3172,7 +3205,7 @@ dependencies = [ [[package]] name = "veloren-network" version = "0.3.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "async-channel", "async-trait", @@ -3197,10 +3230,10 @@ dependencies = [ [[package]] name = "veloren-network-protocol" version = "0.6.1" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "hashbrown 0.14.5", "prometheus", @@ -3211,7 +3244,7 @@ dependencies = [ [[package]] name = "veloren-world" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#9452500f169316264f2f71096531e9d9b5e87e19" +source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" dependencies = [ "arr_macro", "bincode", @@ -3222,7 +3255,7 @@ dependencies = [ "fxhash", "hashbrown 0.14.5", "image", - "itertools 0.13.0", + "itertools", "kiddo", "lazy_static", "noise", @@ -3243,9 +3276,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -3274,34 +3307,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3309,22 +3343,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wavefront" @@ -3337,9 +3371,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.2" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -3368,11 +3402,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3383,11 +3417,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-targets 0.48.5", + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -3396,7 +3431,61 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "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.77", +] + +[[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.77", +] + +[[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]] @@ -3414,7 +3503,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -3434,18 +3532,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3456,9 +3554,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3468,9 +3566,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3480,15 +3578,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3498,9 +3596,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3510,9 +3608,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3522,9 +3620,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3534,15 +3632,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -3568,22 +3666,23 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -3600,9 +3699,9 @@ checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/README.md b/README.md index 1f3c424..b33012f 100644 --- a/README.md +++ b/README.md @@ -33,12 +33,13 @@ The bot is able to respond to the following commands, which must be sent via "/t search term. - `admin_access`: Admin-only, prompts the bot to send a trade invite to the sender, after which it will give away and accept any items until the trade ends. -- `announce`: Admin-only, sends the announcement message to "/world". This will reset the +- `announce`: Admin-only, sends the announcement message to "/region". This will reset the announcement timer to 45 minutes. +- `location`: Returns the bot's current town or, if it is not in a town, its current position. - `sort [count (optional)]`: Admin-only, sorts the inventory once or the given number of times. - `pos [x] [y] [z]`: Admin-only, sets the bot's desired position where it will try to stand (must - be close to the bot's current position) -- `ori [0-360]`: Admin-only, sets the bot's desired orientation (or facing direction) + be close to the bot's current position). +- `ori [0-360]`: Admin-only, sets the bot's desired orientation (or facing direction). ## Prerequisites @@ -94,10 +95,8 @@ position = [0, 0, 0] # Its orientation can be changed in-game with the "ori" command. orientation = 0 -# Optional. Announcements are sent every 45 minutes. Use {location} to insert the bot's current -# location. If not set, the bot will not send /world announcements but will still send /region -# announcements with usage instructions. -announcement = "I love cheese! I am at {location}." +# Optional. Announcements are sent every 45 minutes. If not set, the bot will not make announcements. +announcement = "I love cheese!" # The buy_prices and sell_prices tables are required. The keys are item definition IDs and the # values are the price in coins. You may type in-game "/give_item common.items." and press Tab to @@ -143,6 +142,17 @@ podman build . -t trade_bot Then follow the [above](#running) steps with the tag "trade_bot" instead of "git.jeffa.io/jeff/trade_bot". +## Changelog + +- 9/2/2024: + - Added the "location" command. + - Removed the "{location}" feature from the announcement message. Announcements are now sent to + "/region" so this feature is now used by the "location" command. + - Changed announcements to be sent to "/region" instead of "/world". The moderators on the official + server have asked for this, so please don't run an old version to circumvent the change. + - Removed the "Ouch!" and "That hurt!" messages when the bot is attacked. The moderators have also + asked for this. + ## License This project is licensed under the GPL-3.0 license. See the [LICENSE](LICENSE) file for details. diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 2ee9acf..5ba2cff 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -771,8 +771,9 @@ primary: Simple(None, "common.abilities.custom.harvester.scythe"), secondary: Simple(None, "common.abilities.custom.harvester.firebreath"), abilities: [ - Simple(None, "common.abilities.custom.harvester.ensnaringvines"), Simple(None, "common.abilities.custom.harvester.explodingpumpkin"), + Simple(None, "common.abilities.custom.harvester.ensnaringvines_sparse"), + Simple(None, "common.abilities.custom.harvester.ensnaringvines_dense"), ], ), // TODO: Allow ability sets to expand other ability sets diff --git a/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron b/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron new file mode 100644 index 0000000..6c008eb --- /dev/null +++ b/assets/common/abilities/custom/harvester/ensnaringvines_dense.ron @@ -0,0 +1,10 @@ +SpriteSummon( + buildup_duration: 0.9, + cast_duration: 0.6, + recover_duration: 0.5, + sprite: EnsnaringVines, + del_timeout: None, + summon_distance: (0, 25), + sparseness: 0.6, + angle: 360, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron b/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron new file mode 100644 index 0000000..0cf61ff --- /dev/null +++ b/assets/common/abilities/custom/harvester/ensnaringvines_sparse.ron @@ -0,0 +1,10 @@ +SpriteSummon( + buildup_duration: 0.6, + cast_duration: 0.4, + recover_duration: 0.3, + sprite: EnsnaringVines, + del_timeout: None, + summon_distance: (0, 30), + sparseness: 0.8, + angle: 360, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/harvester/explodingpumpkin.ron b/assets/common/abilities/custom/harvester/explodingpumpkin.ron index eb83e29..3af60d0 100644 --- a/assets/common/abilities/custom/harvester/explodingpumpkin.ron +++ b/assets/common/abilities/custom/harvester/explodingpumpkin.ron @@ -1,21 +1,21 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.75, + buildup_duration: 1.0, recover_duration: 1.6, projectile: ( kind: Explosive( - radius: 5, + radius: 7.2, min_falloff: 0.6, reagent: Some(Red), terrain: Some((5, Black)), ), attack: Some(( - damage: 37.5, - knockback: Some(25), + damage: 20, + knockback: Some(22), energy: 0, buff: Some(( kind: Burning, - dur_secs: 5, + dur_secs: 4, strength: DamageFraction(0.2), chance: 1.0, )), diff --git a/assets/common/abilities/custom/harvester/firebreath.ron b/assets/common/abilities/custom/harvester/firebreath.ron index 21659fa..640c87f 100644 --- a/assets/common/abilities/custom/harvester/firebreath.ron +++ b/assets/common/abilities/custom/harvester/firebreath.ron @@ -2,18 +2,18 @@ BasicBeam( buildup_duration: 1.4, recover_duration: 0.9, beam_duration: 1.0, - damage: 9.0, + damage: 5.0, tick_rate: 1.5, range: 20.0, max_angle: 15.0, damage_effect: Some(Buff(( kind: Burning, - dur_secs: 10.0, - strength: DamageFraction(1.0), + dur_secs: 3.0, + strength: DamageFraction(0.8), chance: 1.0, ))), energy_regen: 0, energy_drain: 0, - ori_rate: 0.3, + ori_rate: 0.7, specifier: Flamethrower, ) diff --git a/assets/common/abilities/custom/harvester/scythe.ron b/assets/common/abilities/custom/harvester/scythe.ron index 2a6fd89..64c6871 100644 --- a/assets/common/abilities/custom/harvester/scythe.ron +++ b/assets/common/abilities/custom/harvester/scythe.ron @@ -1,19 +1,19 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.9, - swing_duration: 0.1, + buildup_duration: 1.0, + swing_duration: 0.2, hit_timing: 0.5, - recover_duration: 1.2, + recover_duration: 1.0, melee_constructor: ( kind: Slash( - damage: 21.0, + damage: 15.0, poise: 10.0, knockback: 10.0, energy_regen: 0.0, ), - range: 4.0, - angle: 60.0, + range: 4.5, + angle: 50.0, multi_target: Some(Normal), ), - ori_modifier: 1.0, + ori_modifier: 0.5, ) diff --git a/assets/common/abilities/custom/mandragora/basic.ron b/assets/common/abilities/custom/mandragora/basic.ron index c1b067b..6f32af9 100644 --- a/assets/common/abilities/custom/mandragora/basic.ron +++ b/assets/common/abilities/custom/mandragora/basic.ron @@ -7,7 +7,7 @@ BasicMelee( melee_constructor: ( kind: Bash( damage: 8, - poise: 5, + poise: 10, knockback: 0, energy_regen: 0, ), diff --git a/assets/common/abilities/custom/mandragora/scream.ron b/assets/common/abilities/custom/mandragora/scream.ron index 4b0a4c6..4429282 100644 --- a/assets/common/abilities/custom/mandragora/scream.ron +++ b/assets/common/abilities/custom/mandragora/scream.ron @@ -7,7 +7,7 @@ BasicMelee( melee_constructor: ( kind: SonicWave( damage: 10, - poise: 100, + poise: 75, knockback: 20, energy_regen: 0, ), diff --git a/assets/common/abilities/custom/woodgolem/shockwave.ron b/assets/common/abilities/custom/woodgolem/shockwave.ron index 8ac1c5d..9155a20 100644 --- a/assets/common/abilities/custom/woodgolem/shockwave.ron +++ b/assets/common/abilities/custom/woodgolem/shockwave.ron @@ -1,20 +1,20 @@ Shockwave( energy_cost: 0, - buildup_duration: 3.0, + buildup_duration: 1.2, swing_duration: 0.12, - recover_duration: 2.4, - damage: 60.0, + recover_duration: 1.5, + damage: 22.0, poise_damage: 30, - knockback: (strength: 30.0, direction: TowardsUp), + knockback: (strength: 20.0, direction: TowardsUp), shockwave_angle: 90.0, shockwave_vertical_angle: 90.0, shockwave_speed: 15.0, - shockwave_duration: 2.0, + shockwave_duration: 1.9, dodgeable: Jump, move_efficiency: 0.0, damage_kind: Crushing, specifier: Ground, - ori_rate: 1.0, + ori_rate: 0.9, timing: PostBuildup, emit_outcome: true, ) diff --git a/assets/common/abilities/custom/woodgolem/spin.ron b/assets/common/abilities/custom/woodgolem/spin.ron index 6c31acc..51f8125 100644 --- a/assets/common/abilities/custom/woodgolem/spin.ron +++ b/assets/common/abilities/custom/woodgolem/spin.ron @@ -1,18 +1,18 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.9, + buildup_duration: 1.2, swing_duration: 0.3, hit_timing: 0.6, - recover_duration: 0.6, + recover_duration: 1.2, melee_constructor: ( kind: Bash( - damage: 45, + damage: 18, poise: 30, knockback: 20, energy_regen: 0, ), - range: 7.5, + range: 5.0, angle: 360, ), - ori_modifier: 1.0, + ori_modifier: 0.75, ) diff --git a/assets/common/abilities/custom/woodgolem/strike.ron b/assets/common/abilities/custom/woodgolem/strike.ron index 6ad6159..84437ce 100644 --- a/assets/common/abilities/custom/woodgolem/strike.ron +++ b/assets/common/abilities/custom/woodgolem/strike.ron @@ -1,18 +1,18 @@ BasicMelee( energy_cost: 0, - buildup_duration: 1.6, - swing_duration: 0.1, + buildup_duration: 1.0, + swing_duration: 0.2, hit_timing: 0.6, recover_duration: 1.0, melee_constructor: ( kind: Bash( - damage: 30.0, + damage: 12.0, poise: 25.0, knockback: 15.0, energy_regen: 0.0, ), range: 4.0, - angle: 45.0, + angle: 55.0, ), - ori_modifier: 0.4, + ori_modifier: 0.7, ) diff --git a/assets/common/abilities/gnarling/chieftain/firebarrage.ron b/assets/common/abilities/gnarling/chieftain/firebarrage.ron index 9aa511d..faf8479 100644 --- a/assets/common/abilities/gnarling/chieftain/firebarrage.ron +++ b/assets/common/abilities/gnarling/chieftain/firebarrage.ron @@ -1,28 +1,28 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.825, + buildup_duration: 1.0, recover_duration: 0.6, projectile: ( kind: Explosive( - radius: 2, - min_falloff: 0.5, + radius: 3, + min_falloff: 0.7, reagent: Some(Red), terrain: Some((2, Black)) ), attack: Some(( - damage: 13.5, + damage: 5.5, energy: 10, buff: Some(( kind: Burning, - dur_secs: 5, - strength: DamageFraction(0.1), + dur_secs: 3, + strength: DamageFraction(0.3), chance: 0.1, )), )), ), projectile_body: Object(BoltFire), projectile_speed: 25, - num_projectiles: 8, + num_projectiles: 5, projectile_spread: 0.125, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/gnarling/chieftain/fireshockwave.ron b/assets/common/abilities/gnarling/chieftain/fireshockwave.ron index 26ce3ab..388630e 100644 --- a/assets/common/abilities/gnarling/chieftain/fireshockwave.ron +++ b/assets/common/abilities/gnarling/chieftain/fireshockwave.ron @@ -1,16 +1,16 @@ Shockwave( energy_cost: 0, - buildup_duration: 0.975, + buildup_duration: 1.2, swing_duration: 0.1, - recover_duration: 0.6, - damage: 30, + recover_duration: 0.8, + damage: 16, poise_damage: 0, - knockback: ( strength: 25, direction: Away), + knockback: ( strength: 15, direction: Away), shockwave_angle: 360, shockwave_vertical_angle: 90, - shockwave_speed: 10, - shockwave_duration: 1, - dodgeable: Roll, + shockwave_speed: 12, + shockwave_duration: 1.0, + dodgeable: Jump, move_efficiency: 0, damage_kind: Energy, specifier: Fire, diff --git a/assets/common/abilities/gnarling/chieftain/flamestrike.ron b/assets/common/abilities/gnarling/chieftain/flamestrike.ron index 300e4f5..00982a7 100644 --- a/assets/common/abilities/gnarling/chieftain/flamestrike.ron +++ b/assets/common/abilities/gnarling/chieftain/flamestrike.ron @@ -1,21 +1,21 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.6, - swing_duration: 0.1, + buildup_duration: 0.75, + swing_duration: 0.4, hit_timing: 0.5, - recover_duration: 0.45, + recover_duration: 0.6, melee_constructor: ( kind: Bash( - damage: 12, + damage: 9, poise: 10, knockback: 0, energy_regen: 0, ), - range: 7.5, - angle: 60.0, + range: 3.0, + angle: 40.0, damage_effect: Some(Buff(( kind: Burning, - dur_secs: 10.0, + dur_secs: 4.0, strength: DamageFraction(0.5), chance: 0.5, ))), diff --git a/assets/common/abilities/gnarling/totem/green.ron b/assets/common/abilities/gnarling/totem/green.ron index 90da58c..db583e0 100644 --- a/assets/common/abilities/gnarling/totem/green.ron +++ b/assets/common/abilities/gnarling/totem/green.ron @@ -1,24 +1,24 @@ BasicAura( - buildup_duration: 0.375, - cast_duration: 0.5, - recover_duration: 0.375, + buildup_duration: 0.2, + cast_duration: 0.4, + recover_duration: 0.2, targets: InGroup, auras: [ ( kind: Regeneration, - strength: 7.5, - duration: Some(5), + strength: 1, + duration: Some(1), category: Magical, ), ( kind: ProtectingWard, - strength: 0.75, - duration: Some(5), + strength: 0.5, + duration: Some(1), category: Magical, ), ], - aura_duration: Some(2), - range: 50, + aura_duration: Some(1), + range: 15, energy_cost: 0, scales_with_combo: false, ) diff --git a/assets/common/abilities/gnarling/totem/red.ron b/assets/common/abilities/gnarling/totem/red.ron index 0e58b9d..62e5c99 100644 --- a/assets/common/abilities/gnarling/totem/red.ron +++ b/assets/common/abilities/gnarling/totem/red.ron @@ -1,18 +1,18 @@ BasicAura( - buildup_duration: 0.375, - cast_duration: 0.5, - recover_duration: 0.375, + buildup_duration: 0.2, + cast_duration: 0.4, + recover_duration: 0.2, targets: OutOfGroup, auras: [ ( kind: Burning, - strength: 0.75, - duration: Some(5), + strength: 1.2, + duration: Some(1), category: Magical, ), ], - aura_duration: Some(2), - range: 50, + aura_duration: Some(1), + range: 15, energy_cost: 0, scales_with_combo: false, ) diff --git a/assets/common/abilities/gnarling/totem/white.ron b/assets/common/abilities/gnarling/totem/white.ron index 8b95ed0..3fcde11 100644 --- a/assets/common/abilities/gnarling/totem/white.ron +++ b/assets/common/abilities/gnarling/totem/white.ron @@ -1,18 +1,18 @@ BasicAura( - buildup_duration: 0.375, - cast_duration: 0.5, - recover_duration: 0.375, + buildup_duration: 0.2, + cast_duration: 0.4, + recover_duration: 0.2, targets: InGroup, auras: [ ( kind: Hastened, - strength: 0.75, - duration: Some(5), + strength: 0.4, + duration: Some(1), category: Magical, ), ], - aura_duration: Some(2), - range: 50, + aura_duration: Some(1), + range: 15, energy_cost: 0, scales_with_combo: false, ) diff --git a/assets/common/entity/dungeon/gnarling/chieftain.ron b/assets/common/entity/dungeon/gnarling/chieftain.ron index bca94f2..0a840a4 100644 --- a/assets/common/entity/dungeon/gnarling/chieftain.ron +++ b/assets/common/entity/dungeon/gnarling/chieftain.ron @@ -2,7 +2,7 @@ #![enable(implicit_some)] ( name: Name("Gnarling Chieftain"), - body: RandomWith("gnarling"), + body: RandomWith("gnarling_chieftain"), alignment: Alignment(Enemy), loot: LootTable("common.loot_tables.dungeon.gnarling.chieftain"), inventory: ( diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index bd54911..a1434ee 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -3183,6 +3183,9 @@ Simple( "common.items.consumable.potion_minor", ): "object-potion_minor", + Simple( + "common.items.consumable.potion_freezing", + ): "object-potion_freezing", Simple( "common.items.lantern.black_0", ): "lantern-black", diff --git a/assets/common/items/armor/misc/head/gnarling_mask.ron b/assets/common/items/armor/misc/head/gnarling_mask.ron index f6d1318..00b89d2 100644 --- a/assets/common/items/armor/misc/head/gnarling_mask.ron +++ b/assets/common/items/armor/misc/head/gnarling_mask.ron @@ -6,10 +6,10 @@ ItemDef( stats: Direct(( protection: Some(Normal(3.0)), poise_resilience: Some(Normal(1.0)), - energy_max: Some(14.0), + energy_max: Some(6.0), )), )), - quality: High, + quality: Moderate, tags: [ Gnarling, SalvageInto(Lifecloth, 1), diff --git a/assets/common/items/charms/burning_charm.ron b/assets/common/items/charms/burning_charm.ron index 4f43b35..16a4125 100644 --- a/assets/common/items/charms/burning_charm.ron +++ b/assets/common/items/charms/burning_charm.ron @@ -17,5 +17,5 @@ ItemDef( ]) ), quality: Legendary, - tags: [], + tags: [Charm], ) diff --git a/assets/common/items/charms/frozen_charm.ron b/assets/common/items/charms/frozen_charm.ron index 2608386..6ac1047 100644 --- a/assets/common/items/charms/frozen_charm.ron +++ b/assets/common/items/charms/frozen_charm.ron @@ -17,5 +17,5 @@ ItemDef( ]) ), quality: Legendary, - tags: [], + tags: [Charm], ) diff --git a/assets/common/items/charms/lifesteal_charm.ron b/assets/common/items/charms/lifesteal_charm.ron index ce98571..0c7fbab 100644 --- a/assets/common/items/charms/lifesteal_charm.ron +++ b/assets/common/items/charms/lifesteal_charm.ron @@ -16,5 +16,5 @@ ItemDef( ]) ), quality: Legendary, - tags: [], + tags: [Charm], ) diff --git a/assets/common/items/consumable/potion_combustion.ron b/assets/common/items/consumable/potion_combustion.ron index 42d3af3..a970c53 100644 --- a/assets/common/items/consumable/potion_combustion.ron +++ b/assets/common/items/consumable/potion_combustion.ron @@ -11,7 +11,15 @@ ItemDef( duration: Some(10) ), cat_ids: [Natural], - )) + )), + Buff(( + kind: PotionSickness, + data: ( + strength: 0.15, + duration: Some(30), + ), + cat_ids: [Natural], + )), ]) ), quality: Moderate, diff --git a/assets/common/items/consumable/potion_freezing.ron b/assets/common/items/consumable/potion_freezing.ron new file mode 100644 index 0000000..86117e4 --- /dev/null +++ b/assets/common/items/consumable/potion_freezing.ron @@ -0,0 +1,27 @@ +ItemDef( + legacy_name: "Freezing Potion", + legacy_description: "Freezes the user's brain", + kind: Consumable( + kind: Drink, + effects: All([ + Buff(( + kind: Frozen, + data: ( + strength: 0.1, + duration: Some(30) + ), + cat_ids: [Natural], + )), + Buff(( + kind: PotionSickness, + data: ( + strength: 0.15, + duration: Some(30), + ), + cat_ids: [Natural], + )), + ]) + ), + quality: Moderate, + tags: [Potion], +) diff --git a/assets/common/items/glider/moth.ron b/assets/common/items/glider/moth.ron index 01f245e..38c7687 100644 --- a/assets/common/items/glider/moth.ron +++ b/assets/common/items/glider/moth.ron @@ -2,6 +2,6 @@ ItemDef( legacy_name: "Green Luna", legacy_description: "The delicate wings flutter faintly.", kind: Glider, - quality: High, + quality: Moderate, tags: [], ) diff --git a/assets/common/items/lantern/pumpkin.ron b/assets/common/items/lantern/pumpkin.ron index 2bb0f2d..fc76f45 100644 --- a/assets/common/items/lantern/pumpkin.ron +++ b/assets/common/items/lantern/pumpkin.ron @@ -8,6 +8,6 @@ ItemDef( flicker_thousandths: 600, ), ), - quality: High, + quality: Moderate, tags: [Utility], ) diff --git a/assets/common/items/recipes/potions.ron b/assets/common/items/recipes/potions.ron index ce11966..e072a45 100644 --- a/assets/common/items/recipes/potions.ron +++ b/assets/common/items/recipes/potions.ron @@ -4,6 +4,7 @@ ItemDef( kind: RecipeGroup( recipes: [ "potion_combustion", + "potion_freezing", "potion_agility", "potion_minor", "potion_medium", diff --git a/assets/common/loot_tables/dungeon/gnarling/chieftain.ron b/assets/common/loot_tables/dungeon/gnarling/chieftain.ron index 7d61aa5..7fd0df6 100644 --- a/assets/common/loot_tables/dungeon/gnarling/chieftain.ron +++ b/assets/common/loot_tables/dungeon/gnarling/chieftain.ron @@ -1,12 +1,14 @@ [ - // Weapons - (5.0, LootTable("common.loot_tables.weapons.tier-1")), - // Armor - (5.0, LootTable("common.loot_tables.armor.tier-1")), - // Misc - (3.0, Item("common.items.armor.misc.neck.scratched")), - (2.0, Item("common.items.armor.misc.head.wanderers_hat")), - (3.0, Item("common.items.armor.misc.head.bamboo_twig")), - // Chieftain Mask - (1.0, Item("common.items.armor.misc.head.gnarling_mask")), + (1, All([ + All([ + LootTable("common.loot_tables.armor.tier-1"), + LootTable("common.loot_tables.weapons.tier-1"), + ]), + Lottery([ + (2.0, Nothing), + (1.0, Item("common.items.armor.misc.neck.scratched")), + (1.0, Item("common.items.armor.misc.head.gnarling_mask")), + (1.0, Item("common.items.glider.moth")), + ]), + ])), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/gnarling/harvester.ron b/assets/common/loot_tables/dungeon/gnarling/harvester.ron index 93f8b04..7fb480f 100644 --- a/assets/common/loot_tables/dungeon/gnarling/harvester.ron +++ b/assets/common/loot_tables/dungeon/gnarling/harvester.ron @@ -1,10 +1,13 @@ [ - // Weapons - (5.0, LootTable("common.loot_tables.weapons.tier-3")), - // Armor - (5.0, LootTable("common.loot_tables.armor.tier-3")), - // Misc - (3.0, Item("common.items.armor.misc.neck.scratched")), - (2.0, Item("common.items.lantern.pumpkin")), - (1.0, Item("common.items.glider.moth")), + (1, All([ + All([ + LootTable("common.loot_tables.armor.tier-2"), + LootTable("common.loot_tables.weapons.tier-2"), + ]), + Lottery([ + (3.0, Nothing), + (1.0, Item("common.items.lantern.pumpkin")), + (1.0, Item("common.items.armor.misc.head.wanderers_hat")), + ]), + ])), ] \ No newline at end of file diff --git a/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron b/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron index 0b863b9..58b5a5b 100644 --- a/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron +++ b/assets/common/loot_tables/dungeon/gnarling/woodgolem.ron @@ -1,6 +1,16 @@ [ - // Crafting ingredients - (2.4, MultiDrop(Item("common.items.log.wood"), 5, 10)), - (0.1, MultiDrop(Item("common.items.log.hardwood"), 1, 2)), - (0.5, LootTable("common.loot_tables.weapons.components.secondary.sceptre")), + (1, Lottery([ + (0.7, All([ + MultiDrop(Item("common.items.log.wood"), 3, 4), + MultiDrop(Item("common.items.crafting_ing.twigs"), 1, 2), + Lottery([ + (0.6, MultiDrop(Item("common.items.log.bamboo"), 1, 2)), + (0.4, LootTable("common.loot_tables.weapons.components.secondary.sceptre")), + ]), + ])), + (0.3, All([ + MultiDrop(Item("common.items.log.wood"), 5, 7), + MultiDrop(Item("common.items.crafting_ing.twigs"), 3, 5), + ])), + ])) ] diff --git a/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron b/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron index ec0dba3..83cfb63 100644 --- a/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron +++ b/assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron @@ -4,7 +4,7 @@ // Ingredients (2.0, Item("common.items.crafting_ing.coral_branch")), (0.5, Item("common.items.crafting_ing.pearl")), - (0.25, Item("common.items.recipes.unique.seashell_necklace")), + (0.5, Item("common.items.recipes.armor.brinestone")), (0.25, Item("common.items.recipes.unique.winged_coronet")), (0.25, Item("common.items.recipes.unique.abyssal_ring")), ]), diff --git a/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron b/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron index 5124752..78ae92a 100644 --- a/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron +++ b/assets/common/loot_tables/dungeon/sea_chapel/sea_cleric.ron @@ -1,3 +1,5 @@ [ - (1.0, Item("common.items.recipes.armor.brinestone")), + (1.0, Nothing), + (1.0, LootTable("common.loot_tables.food.prepared")), + (0.5, Item("common.items.recipes.unique.seashell_necklace")), ] diff --git a/assets/common/loot_tables/sprite/chest-buried.ron b/assets/common/loot_tables/sprite/chest-buried.ron index def2f90..5c2a4f5 100644 --- a/assets/common/loot_tables/sprite/chest-buried.ron +++ b/assets/common/loot_tables/sprite/chest-buried.ron @@ -1,5 +1,5 @@ [ - (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), + (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), (1.0, LootTable("common.loot_tables.armor.cloth")), (0.5, Item("common.items.recipes.explosives")), ] diff --git a/assets/common/loot_tables/sprite/chest.ron b/assets/common/loot_tables/sprite/chest.ron index 0c1737a..2b72a0c 100644 --- a/assets/common/loot_tables/sprite/chest.ron +++ b/assets/common/loot_tables/sprite/chest.ron @@ -1,7 +1,16 @@ [ - (1.0, LootTable("common.loot_tables.weapons.components.tier-0")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-1")), - (1.0, LootTable("common.loot_tables.armor.cloth")), + (0.5, LootTable("common.loot_tables.weapons.components.tier-0")), + (0.25, LootTable("common.loot_tables.weapons.tier-0")), + (0.25, LootTable("common.loot_tables.armor.tier-0")), + (0.25, Item("common.items.armor.misc.head.bamboo_twig")), + // Currency + (3.0, MultiDrop(Item("common.items.utility.coins"), 25, 50)), + // Materials + (0.5, MultiDrop(Item("common.items.mineral.ore.veloritefrag"), 5, 10)), + // Consumables + (2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), + // Food + (1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 2)), (0.2, Item("common.items.recipes.explosives")), (0.5, Item("common.items.recipes.instruments")), (0.2, Item("common.items.recipes.charms")), diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index 0202c72..7381a4b 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -1233,6 +1233,10 @@ keyword: "treasure_egg", generic: "Treasure Egg", ), + gnarling_chieftain: ( + keyword: "gnarling_chieftain", + generic: "Gnarling Chieftain" + ), ) ), fish_small: ( diff --git a/assets/common/recipe_book_manifest.ron b/assets/common/recipe_book_manifest.ron index babab7a..ffc604a 100644 --- a/assets/common/recipe_book_manifest.ron +++ b/assets/common/recipe_book_manifest.ron @@ -31,6 +31,15 @@ ], craft_sprite: Some(Anvil), ), + "potion_freezing": ( + output: ("common.items.consumable.potion_freezing", 1), + inputs: [ + (Item("common.items.crafting_ing.empty_vial"), 1, false), + (Item("common.items.crafting_ing.animal_misc.icy_fang"), 3, false), + (Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, false), + ], + craft_sprite: Some(Cauldron), + ), "potion_combustion": ( output: ("common.items.consumable.potion_combustion", 1), inputs: [ diff --git a/assets/common/trading/item_price_calculation.ron b/assets/common/trading/item_price_calculation.ron index 8b1e8d2..1d61152 100644 --- a/assets/common/trading/item_price_calculation.ron +++ b/assets/common/trading/item_price_calculation.ron @@ -24,8 +24,8 @@ loot_tables: [ (20.375, true, "common.trading.food"), // Recipes - (1.0, true, "common.trading.sellable_recipe"), - (1.0, false, "common.trading.unsellable_recipe"), + (1.8, true, "common.trading.sellable_recipe"), + (1.5, false, "common.trading.unsellable_recipe"), // Potions // @@ -50,5 +50,6 @@ good_scaling: [ (Armor, 0.025), // common.items.armor.misc.pants.worker_blue (Tools, 0.015487), // common.items.weapons.staff.starter_staff (Ingredients, 0.034626), // common.items.crafting_ing.leather_scraps + (Wood, 0.034626), // common.items.log.wood (Recipe, 0.01), // common.items.recipes ]) diff --git a/assets/common/trading/item_price_equality.ron b/assets/common/trading/item_price_equality.ron index 7089e28..a8eb56f 100644 --- a/assets/common/trading/item_price_equality.ron +++ b/assets/common/trading/item_price_equality.ron @@ -1,7 +1,50 @@ [ - // Legendary sceptres + // Purple Linen set Set([ - "common.items.weapons.sceptre.root_evil", - "common.items.weapons.sceptre.caduceus", + "common.items.armor.cloth_purple.belt", + "common.items.armor.cloth_purple.chest", + "common.items.armor.cloth_purple.foot", + "common.items.armor.cloth_purple.hand", + "common.items.armor.cloth_purple.pants", + "common.items.armor.cloth_purple.shoulder", + ]), + + // Green Linen set + Set([ + "common.items.armor.cloth_green.belt", + "common.items.armor.cloth_green.chest", + "common.items.armor.cloth_green.foot", + "common.items.armor.cloth_green.hand", + "common.items.armor.cloth_green.pants", + "common.items.armor.cloth_green.shoulder", + ]), + + // Blue Linen set + Set([ + "common.items.armor.cloth_blue.belt", + "common.items.armor.cloth_blue.chest", + "common.items.armor.cloth_blue.foot", + "common.items.armor.cloth_blue.hand", + "common.items.armor.cloth_blue.pants", + "common.items.armor.cloth_blue.shoulder_0", + "common.items.armor.cloth_blue.shoulder_1", + ]), + + // Worker/starter clothing + Set([ + "common.items.armor.misc.chest.worker_green_0", + "common.items.armor.misc.chest.worker_green_1", + "common.items.armor.misc.chest.worker_orange_0", + "common.items.armor.misc.chest.worker_orange_1", + "common.items.armor.misc.chest.worker_purple_0", + "common.items.armor.misc.chest.worker_purple_1", + "common.items.armor.misc.chest.worker_purple_brown", + "common.items.armor.misc.chest.worker_red_0", + "common.items.armor.misc.chest.worker_red_1", + "common.items.armor.misc.chest.worker_yellow_0", + "common.items.armor.misc.chest.worker_yellow_1", + "common.items.armor.misc.pants.worker_blue", + "common.items.armor.misc.pants.worker_brown", + "common.items.armor.misc.foot.sandals", ]), ] diff --git a/assets/common/trading/unsellable_recipe.ron b/assets/common/trading/unsellable_recipe.ron index c2966de..691b054 100644 --- a/assets/common/trading/unsellable_recipe.ron +++ b/assets/common/trading/unsellable_recipe.ron @@ -6,40 +6,40 @@ [ // Recipes // Misc Groups - (1.0, Item("common.items.recipes.charms")), - (1.0, Item("common.items.recipes.explosives")), - (1.0, Item("common.items.recipes.gliders")), - (1.0, Item("common.items.recipes.instruments")), + (1.25, Item("common.items.recipes.charms")), + (1.25, Item("common.items.recipes.explosives")), + (1.25, Item("common.items.recipes.gliders")), + (1.25, Item("common.items.recipes.instruments")), // Equipment (1.0, Item("common.items.recipes.equipment.moderate")), - (0.2, Item("common.items.recipes.equipment.advanced")), + (0.3, Item("common.items.recipes.equipment.advanced")), // Armors - (0.7, Item("common.items.recipes.armor.steel")), - (0.7, Item("common.items.recipes.armor.silken")), - (0.7, Item("common.items.recipes.armor.scale")), - (0.7, Item("common.items.recipes.weapons.steel")), - (0.7, Item("common.items.recipes.weapons.hardwood")), - (0.4, Item("common.items.recipes.armor.cobalt")), - (0.4, Item("common.items.recipes.armor.druid")), - (0.4, Item("common.items.recipes.armor.carapace")), - (0.4, Item("common.items.recipes.weapons.cobalt")), - (0.4, Item("common.items.recipes.weapons.ironwood")), - (0.2, Item("common.items.recipes.armor.bloodsteel")), - (0.2, Item("common.items.recipes.armor.moonweave")), - (0.2, Item("common.items.recipes.armor.primal")), - (0.2, Item("common.items.recipes.weapons.bloodsteel")), - (0.2, Item("common.items.recipes.weapons.frostwood")), - (0.1, Item("common.items.recipes.armor.orichalcum")), - (0.1, Item("common.items.recipes.armor.sunsilk")), - (0.1, Item("common.items.recipes.armor.dragonscale")), - (0.1, Item("common.items.recipes.armor.brinestone")), - (0.1, Item("common.items.recipes.weapons.orichalcum")), - (0.1, Item("common.items.recipes.weapons.eldwood")), + (1.25, Item("common.items.recipes.armor.steel")), + (1.25, Item("common.items.recipes.armor.silken")), + (1.25, Item("common.items.recipes.armor.scale")), + (1.25, Item("common.items.recipes.weapons.steel")), + (1.25, Item("common.items.recipes.weapons.hardwood")), + (0.65, Item("common.items.recipes.armor.cobalt")), + (0.65, Item("common.items.recipes.armor.druid")), + (0.65, Item("common.items.recipes.armor.carapace")), + (0.65, Item("common.items.recipes.weapons.cobalt")), + (0.65, Item("common.items.recipes.weapons.ironwood")), + (0.38, Item("common.items.recipes.armor.bloodsteel")), + (0.38, Item("common.items.recipes.armor.moonweave")), + (0.38, Item("common.items.recipes.armor.primal")), + (0.38, Item("common.items.recipes.weapons.bloodsteel")), + (0.38, Item("common.items.recipes.weapons.frostwood")), + (0.25, Item("common.items.recipes.armor.sunsilk")), + (0.25, Item("common.items.recipes.armor.orichalcum")), + (0.25, Item("common.items.recipes.armor.dragonscale")), + (0.25, Item("common.items.recipes.weapons.orichalcum")), + (0.25, Item("common.items.recipes.weapons.eldwood")), + (0.25, Item("common.items.recipes.armor.brinestone")), // Unique items - (1.0, Item("common.items.recipes.unique.seashell_necklace")), - (0.8, Item("common.items.recipes.unique.winged_coronet")), + (1.25, Item("common.items.recipes.unique.seashell_necklace")), + (0.6, Item("common.items.recipes.unique.winged_coronet")), (0.5, Item("common.items.recipes.unique.troll_hide_pack")), - (0.3, Item("common.items.recipes.unique.abyssal_gorget")), - (0.1, Item("common.items.recipes.unique.mindflayer_spellbag")), + (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")), ] diff --git a/config/config.toml b/config/config.toml index 70e98b7..a4cec65 100644 --- a/config/config.toml +++ b/config/config.toml @@ -1,3 +1,4 @@ +announcement = "Beep Boop!" position = [17720.0, 14951.0, 237.0] orientation = 0 diff --git a/src/bot.rs b/src/bot.rs index 1e5b504..8f4f0a3 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -21,12 +21,11 @@ use veloren_common::{ tool::AbilityMap, ChatType, ControllerInputs, Item, Ori, Pos, }, - outcome::Outcome, time::DayPeriod, trade::{PendingTrade, TradeAction, TradeResult}, uid::Uid, uuid::Uuid, - DamageSource, ViewDistances, + ViewDistances, }; use veloren_common_net::sync::WorldSyncExt; @@ -37,12 +36,10 @@ const COINS: ItemDefinitionId = const CLIENT_TPS: Duration = Duration::from_millis(33); const TRADE_ACTION_DELAY: Duration = Duration::from_millis(300); const ACCOUNCEMENT_DELAY: Duration = Duration::from_mins(45); -const OUCH_DELAY: Duration = Duration::from_secs(2); /// An active connection to the Veloren server that will attempt to run every time the `tick` /// function is called. pub struct Bot { - username: String, position: Pos, orientation: Ori, admins: Vec, @@ -63,7 +60,6 @@ pub struct Bot { previous_trade_receipt: Option, last_trade_action: Instant, last_announcement: Instant, - last_ouch: Instant, sort_count: u8, } @@ -140,7 +136,6 @@ impl Bot { let now = Instant::now(); Ok(Bot { - username, position, orientation, admins, @@ -157,7 +152,6 @@ impl Bot { previous_trade_receipt: None, last_trade_action: now, last_announcement: now, - last_ouch: now, sort_count: 0, announcement, }) @@ -284,6 +278,11 @@ impl Bot { Some(price_correction_message) } } + "location" => { + self.send_location_info(&sender)?; + + None + } "ori" => { if self.is_user_admin(&sender)? { if let Some(new_rotation) = split_content.next() { @@ -366,36 +365,6 @@ impl Bot { ); } } - VelorenEvent::Outcome(Outcome::ProjectileHit { - target: Some(target), - .. - }) => { - if let Some(uid) = self.client.uid() { - if uid == target && self.last_ouch.elapsed() > OUCH_DELAY { - self.client - .send_command("say".to_string(), vec!["Ouch!".to_string()]); - - self.last_ouch = Instant::now(); - } - } - } - VelorenEvent::Outcome(Outcome::HealthChange { info, .. }) => { - if let Some(DamageSource::Buff(_)) = info.cause { - return Ok(true); - } - - if let Some(uid) = self.client.uid() { - if uid == info.target - && info.amount.is_sign_negative() - && self.last_ouch.elapsed() > OUCH_DELAY - { - self.client - .send_command("say".to_string(), vec!["That hurt!".to_string()]); - - self.last_ouch = Instant::now(); - } - } - } VelorenEvent::TradeComplete { result, trade } => { let my_party = trade .which_party(self.client.uid().ok_or("Failed to find uid")?) @@ -439,47 +408,46 @@ impl Bot { Ok(true) } + fn send_location_info(&mut self, target: &Uid) -> Result<(), String> { + let player_name = self + .find_player_alias(target) + .ok_or("Failed to find player alias")? + .to_string(); + let location = self + .client + .sites() + .into_iter() + .find_map(|(_, SiteInfoRich { site, .. })| { + let x_difference = self.position.0[0] - site.wpos[0] as f32; + let y_difference = self.position.0[1] - site.wpos[1] as f32; + + if x_difference.abs() < 100.0 && y_difference.abs() < 100.0 { + site.name.clone() + } else { + None + } + }) + .unwrap_or(format!("{:?}", self.position)); + + self.client.send_command( + "tell".to_string(), + vec![player_name, format!("I am at {location}.")], + ); + + Ok(()) + } + /// Make the bot's trading and help accouncements /// /// Currently, this can make two announcements: one in /region with basic usage instructions /// is always made. If an announcement was provided when the bot was created, it will make it /// in /world. fn handle_announcement(&mut self) -> Result<(), String> { - debug!("Making an announcement"); - - self.client.send_command( - "region".to_string(), - vec![format!( - "I'm a bot. You can trade with me or check prices: '/tell {} price [search_term]'.", - self.username - )], - ); - if let Some(announcement) = &self.announcement { - let announcement = if announcement.contains("{location}") { - let location = self - .client - .sites() - .into_iter() - .find_map(|(_, SiteInfoRich { site, .. })| { - let x_difference = self.position.0[0] - site.wpos[0] as f32; - let y_difference = self.position.0[1] - site.wpos[1] as f32; - - if x_difference.abs() < 100.0 && y_difference.abs() < 100.0 { - site.name.clone() - } else { - None - } - }) - .unwrap_or(format!("{:?}", self.position)); - - announcement.replace("{location}", &location) - } else { - announcement.clone() - }; + debug!("Making an announcement"); self.client - .send_command("world".to_string(), vec![announcement]); + .send_command("region".to_string(), vec![announcement.to_string()]); } Ok(())