From 97a532772a76c795a49f5177a008990d7e52e35a Mon Sep 17 00:00:00 2001 From: Jeff Date: Thu, 19 Sep 2024 04:18:42 -0400 Subject: [PATCH] Update Veloren --- Cargo.lock | 177 +++++++++--------- .../common/abilities/ability_set_manifest.ron | 10 + assets/common/abilities/adlet/elder/trap.ron | 4 +- .../common/abilities/adlet/hunter/throw.ron | 2 +- .../common/abilities/adlet/tracker/arrow.ron | 2 +- .../common/abilities/adlet/tracker/trap.ron | 4 +- assets/common/abilities/bow/shotgun.ron | 2 +- assets/common/abilities/bowsimple/basic.ron | 2 +- .../abilities/custom/ancienteffigy/blast.ron | 4 +- .../arthropods/blackwidow/poisonball.ron | 4 +- .../custom/arthropods/weevil/threadshot.ron | 4 +- .../common/abilities/custom/asp/firebomb.ron | 2 +- .../custom/biped_large_cultist/bow/basic.ron | 2 +- .../biped_large_cultist/staff/firebomb.ron | 2 +- .../custom/birdlargebreathe/firebomb.ron | 2 +- .../custom/boreal_warrior/bow/shotgun.ron | 4 +- .../custom/cloudwyvern/lightningbomb.ron | 2 +- .../custom/cursekeeper/poisonbomb.ron | 2 +- .../abilities/custom/cyclops/optic_blast.ron | 2 +- .../abilities/custom/dagon/dagonbombs.ron | 2 +- .../custom/dullahan/fierce_darts.ron | 2 +- .../abilities/custom/dullahan/knife_rain.ron | 4 +- .../custom/dwarves/flamekeeper/mines.ron | 4 +- .../dwarves/forgemaster/lava_mortar.ron | 4 +- .../custom/dwarves/snaretongue/bombs.ron | 2 +- .../abilities/custom/flamewyvern/firebomb.ron | 4 +- .../custom/frostwyvern/frostbomb.ron | 2 +- .../custom/gigas_frost/ice_volley.ron | 4 +- .../abilities/custom/gravewarden/rocket.ron | 2 +- .../custom/harvester/explodingpumpkin.ron | 2 +- .../abilities/custom/hydra/growhead.ron | 7 + .../abilities/custom/hydra/multi_bite.ron | 65 +++++++ .../common/abilities/custom/hydra/poison.ron | 26 +++ .../abilities/custom/hydra/poison_ball.ron | 21 +++ .../abilities/custom/hydra/poison_wave.ron | 26 +++ .../abilities/custom/hydra/tail_swipe.ron | 27 +++ .../abilities/custom/icedrake/icebombs.ron | 2 +- .../custom/irongolemfist/iron_pike_bomb.ron | 2 +- .../abilities/custom/irrwurz/magicball.ron | 2 +- .../abilities/custom/maneater/poisonball.ron | 6 +- .../custom/mindflayer/necroticsphere.ron | 2 +- .../custom/quadlowranged/firebomb.ron | 2 +- .../abilities/custom/seawyvern/inkbomb.ron | 4 +- .../custom/terracotta_besieger/multishot.ron | 2 +- .../custom/terracotta_demolisher/drop.ron | 2 +- .../custom/terracotta_demolisher/throw.ron | 2 +- .../custom/terracotta_statue/blast.ron | 2 +- .../common/abilities/custom/turret/arrows.ron | 2 +- .../custom/wealdwyvern/poisonbomb.ron | 2 +- .../custom/wendigomagic/frostbomb.ron | 2 +- .../common/abilities/custom/yeti/snowball.ron | 2 +- assets/common/abilities/debug/possess.ron | 4 +- .../abilities/gnarling/blowgun/dart.ron | 2 +- .../gnarling/chieftain/firebarrage.ron | 2 +- .../common/abilities/haniwa/archer/arrow.ron | 2 +- .../abilities/haniwa/archer/explosive.ron | 2 +- assets/common/abilities/staff/firebomb.ron | 2 +- .../common/abilities/staffsimple/firebomb.ron | 2 +- .../common/entity/wild/aggressive/hydra.ron | 11 ++ assets/common/item_i18n_manifest.ron | 3 + .../unique/quadruped_low/hydra.ron | 20 ++ .../loot_tables/creature/quad_low/hydra.ron | 8 + assets/common/npc_names.ron | 4 + 63 files changed, 385 insertions(+), 150 deletions(-) create mode 100644 assets/common/abilities/custom/hydra/growhead.ron create mode 100644 assets/common/abilities/custom/hydra/multi_bite.ron create mode 100644 assets/common/abilities/custom/hydra/poison.ron create mode 100644 assets/common/abilities/custom/hydra/poison_ball.ron create mode 100644 assets/common/abilities/custom/hydra/poison_wave.ron create mode 100644 assets/common/abilities/custom/hydra/tail_swipe.ron create mode 100644 assets/common/entity/wild/aggressive/hydra.ron create mode 100644 assets/common/items/npc_weapons/unique/quadruped_low/hydra.ron create mode 100644 assets/common/loot_tables/creature/quad_low/hydra.ron diff --git a/Cargo.lock b/Cargo.lock index 150d112..c82c059 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -252,17 +252,17 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -341,9 +341,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -359,15 +359,15 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cc" -version = "1.1.15" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "shlex", ] @@ -471,9 +471,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -692,11 +692,11 @@ checksum = "6f4e5af126dafd0741c2ad62d47f68b28602550102e5f0dd45c8a97fc8b49c29" [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "syn 2.0.77", @@ -1022,9 +1022,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "half" @@ -1058,12 +1058,6 @@ dependencies = [ "serde", ] -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - [[package]] name = "heck" version = "0.5.0" @@ -1214,16 +1208,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http", "hyper", "hyper-util", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1232,9 +1226,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -1252,9 +1246,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1362,9 +1356,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is_terminal_polyfill" @@ -1754,9 +1748,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -1937,9 +1931,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", @@ -1955,9 +1949,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", @@ -1973,15 +1967,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2060,9 +2054,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -2190,9 +2184,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "ring", @@ -2215,6 +2209,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "2.1.3" @@ -2243,7 +2250,7 @@ dependencies = [ "log", "once_cell", "rustls", - "rustls-native-certs", + "rustls-native-certs 0.7.3", "rustls-platform-verifier-android", "rustls-webpki", "security-framework", @@ -2260,9 +2267,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.102.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -2292,11 +2299,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2352,18 +2359,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2372,9 +2379,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -2577,7 +2584,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", @@ -2727,9 +2734,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -2759,9 +2766,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", @@ -2951,15 +2958,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -3019,7 +3026,7 @@ dependencies = [ [[package]] name = "veloren-client" version = "0.16.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "authc", "byteorder", @@ -3045,7 +3052,7 @@ dependencies = [ [[package]] name = "veloren-client-i18n" version = "0.13.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "deunicode", "fluent", @@ -3063,7 +3070,7 @@ dependencies = [ [[package]] name = "veloren-common" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "approx", "bitflags 2.6.0", @@ -3103,7 +3110,7 @@ dependencies = [ [[package]] name = "veloren-common-assets" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "assets_manager", "dot_vox", @@ -3118,7 +3125,7 @@ dependencies = [ [[package]] name = "veloren-common-base" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "directories-next", "tracing", @@ -3127,7 +3134,7 @@ dependencies = [ [[package]] name = "veloren-common-ecs" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "specs", "tracing", @@ -3137,7 +3144,7 @@ dependencies = [ [[package]] name = "veloren-common-i18n" version = "0.1.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "hashbrown 0.14.5", "rand", @@ -3147,7 +3154,7 @@ dependencies = [ [[package]] name = "veloren-common-net" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "bincode", "flate2", @@ -3165,7 +3172,7 @@ dependencies = [ [[package]] name = "veloren-common-state" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "async-trait", "bytes", @@ -3187,7 +3194,7 @@ dependencies = [ [[package]] name = "veloren-common-systems" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "itertools", "ordered-float", @@ -3205,7 +3212,7 @@ dependencies = [ [[package]] name = "veloren-network" version = "0.3.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "async-channel", "async-trait", @@ -3230,7 +3237,7 @@ dependencies = [ [[package]] name = "veloren-network-protocol" version = "0.6.1" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "async-trait", "bitflags 2.6.0", @@ -3244,7 +3251,7 @@ dependencies = [ [[package]] name = "veloren-world" version = "0.10.0" -source = "git+https://gitlab.com/veloren/veloren?branch=master#2c1a141fd83ad572553e06a8bf4248d4c7fbedbc" +source = "git+https://gitlab.com/veloren/veloren?branch=master#9d8a98d840dfe5a17c0627be4007139730ff5faf" dependencies = [ "arr_macro", "bincode", @@ -3371,9 +3378,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 5ba2cff..9d1d1f7 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -503,6 +503,16 @@ Simple(None, "common.abilities.custom.basilisk.dash"), ], ), + Custom("Hydra"): ( + primary: Simple(None, "common.abilities.custom.hydra.multi_bite"), + secondary: Simple(None, "common.abilities.custom.hydra.poison"), + abilities: [ + Simple(None, "common.abilities.custom.hydra.poison_wave"), + Simple(None, "common.abilities.custom.hydra.poison_ball"), + Simple(None, "common.abilities.custom.hydra.growhead"), + Simple(None, "common.abilities.custom.hydra.tail_swipe"), + ], + ), Custom("Asp"): ( primary: Simple(None, "common.abilities.custom.asp.singlestrike"), secondary: Simple(None, "common.abilities.custom.asp.firebomb"), diff --git a/assets/common/abilities/adlet/elder/trap.ron b/assets/common/abilities/adlet/elder/trap.ron index fe54d51..5195c28 100644 --- a/assets/common/abilities/adlet/elder/trap.ron +++ b/assets/common/abilities/adlet/elder/trap.ron @@ -15,7 +15,7 @@ BasicRanged( projectile_body: Object(AdletTrap), projectile_light: None, projectile_speed: 20.0, - num_projectiles: 6, + num_projectiles: Value(6), projectile_spread: 0.3, move_efficiency: 0.8, -) \ No newline at end of file +) diff --git a/assets/common/abilities/adlet/hunter/throw.ron b/assets/common/abilities/adlet/hunter/throw.ron index 87fb6b8..b40c78d 100644 --- a/assets/common/abilities/adlet/hunter/throw.ron +++ b/assets/common/abilities/adlet/hunter/throw.ron @@ -19,7 +19,7 @@ BasicRanged( projectile_body: Object(AdletSpear), projectile_light: None, projectile_speed: 40.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 1.0, ) diff --git a/assets/common/abilities/adlet/tracker/arrow.ron b/assets/common/abilities/adlet/tracker/arrow.ron index 0fc72fc..4446ee0 100644 --- a/assets/common/abilities/adlet/tracker/arrow.ron +++ b/assets/common/abilities/adlet/tracker/arrow.ron @@ -18,7 +18,7 @@ BasicRanged( projectile_body: Object(Arrow), projectile_light: None, projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/adlet/tracker/trap.ron b/assets/common/abilities/adlet/tracker/trap.ron index a9516cc..26fb914 100644 --- a/assets/common/abilities/adlet/tracker/trap.ron +++ b/assets/common/abilities/adlet/tracker/trap.ron @@ -15,7 +15,7 @@ BasicRanged( projectile_body: Object(AdletTrap), projectile_light: None, projectile_speed: 10.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.2, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/bow/shotgun.ron b/assets/common/abilities/bow/shotgun.ron index 6268be7..f15c49a 100644 --- a/assets/common/abilities/bow/shotgun.ron +++ b/assets/common/abilities/bow/shotgun.ron @@ -20,6 +20,6 @@ BasicRanged( projectile_body: Object(Arrow), projectile_light: None, projectile_speed: 80.0, - num_projectiles: 5, + num_projectiles: Value(5), move_efficiency: 0.3, ) diff --git a/assets/common/abilities/bowsimple/basic.ron b/assets/common/abilities/bowsimple/basic.ron index d682354..7eec20d 100644 --- a/assets/common/abilities/bowsimple/basic.ron +++ b/assets/common/abilities/bowsimple/basic.ron @@ -19,7 +19,7 @@ BasicRanged( projectile_body: Object(Arrow), projectile_light: None, projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/ancienteffigy/blast.ron b/assets/common/abilities/custom/ancienteffigy/blast.ron index 3c213aa..6d8ecb2 100644 --- a/assets/common/abilities/custom/ancienteffigy/blast.ron +++ b/assets/common/abilities/custom/ancienteffigy/blast.ron @@ -17,7 +17,7 @@ BasicRanged( ), projectile_body: Object(FireRainDrop), projectile_speed: 0.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron index 998bcfe..e8ab561 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron @@ -23,7 +23,7 @@ BasicRanged( ), projectile_body: Object(SpitPoison), projectile_speed: 25.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.3, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/arthropods/weevil/threadshot.ron b/assets/common/abilities/custom/arthropods/weevil/threadshot.ron index d618eee..874946e 100644 --- a/assets/common/abilities/custom/arthropods/weevil/threadshot.ron +++ b/assets/common/abilities/custom/arthropods/weevil/threadshot.ron @@ -13,7 +13,7 @@ BasicRanged( projectile_body: Object(Pebble), projectile_light: None, projectile_speed: 70.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/asp/firebomb.ron b/assets/common/abilities/custom/asp/firebomb.ron index 34bd1e9..45dc361 100644 --- a/assets/common/abilities/custom/asp/firebomb.ron +++ b/assets/common/abilities/custom/asp/firebomb.ron @@ -22,7 +22,7 @@ BasicRanged( ), projectile_body: Object(BoltFire), projectile_speed: 70.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/biped_large_cultist/bow/basic.ron b/assets/common/abilities/custom/biped_large_cultist/bow/basic.ron index 364d710..4da05e4 100644 --- a/assets/common/abilities/custom/biped_large_cultist/bow/basic.ron +++ b/assets/common/abilities/custom/biped_large_cultist/bow/basic.ron @@ -19,7 +19,7 @@ BasicRanged( projectile_body: Object(Arrow), projectile_light: None, projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/biped_large_cultist/staff/firebomb.ron b/assets/common/abilities/custom/biped_large_cultist/staff/firebomb.ron index a90d92d..708f8d7 100644 --- a/assets/common/abilities/custom/biped_large_cultist/staff/firebomb.ron +++ b/assets/common/abilities/custom/biped_large_cultist/staff/firebomb.ron @@ -22,7 +22,7 @@ BasicRanged( ), projectile_body: Object(BoltFire), projectile_speed: 60.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/birdlargebreathe/firebomb.ron b/assets/common/abilities/custom/birdlargebreathe/firebomb.ron index cc123d1..546fe4b 100644 --- a/assets/common/abilities/custom/birdlargebreathe/firebomb.ron +++ b/assets/common/abilities/custom/birdlargebreathe/firebomb.ron @@ -22,7 +22,7 @@ BasicRanged( ), projectile_body: Object(BoltFire), projectile_speed: 60.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/boreal_warrior/bow/shotgun.ron b/assets/common/abilities/custom/boreal_warrior/bow/shotgun.ron index 988caef..f76c59b 100644 --- a/assets/common/abilities/custom/boreal_warrior/bow/shotgun.ron +++ b/assets/common/abilities/custom/boreal_warrior/bow/shotgun.ron @@ -20,7 +20,7 @@ BasicRanged( projectile_body: Object(Arrow), projectile_light: None, projectile_speed: 80.0, - num_projectiles: 5, + num_projectiles: Value(5), damage_effect: Some(Buff(( kind: Frozen, dur_secs: 2.0, @@ -28,4 +28,4 @@ BasicRanged( chance: 1.0, ))), move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/cloudwyvern/lightningbomb.ron b/assets/common/abilities/custom/cloudwyvern/lightningbomb.ron index e2a9e23..b86e413 100644 --- a/assets/common/abilities/custom/cloudwyvern/lightningbomb.ron +++ b/assets/common/abilities/custom/cloudwyvern/lightningbomb.ron @@ -18,7 +18,7 @@ BasicRanged( projectile_body: Object(LightningBolt), projectile_light: None, projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/cursekeeper/poisonbomb.ron b/assets/common/abilities/custom/cursekeeper/poisonbomb.ron index a7b0b22..679aa81 100644 --- a/assets/common/abilities/custom/cursekeeper/poisonbomb.ron +++ b/assets/common/abilities/custom/cursekeeper/poisonbomb.ron @@ -24,7 +24,7 @@ BasicRanged( projectile_body: Object(SpitPoison), projectile_light: None, projectile_speed: 25.0, - num_projectiles: 2, + num_projectiles: Value(2), projectile_spread: 0.1, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/cyclops/optic_blast.ron b/assets/common/abilities/custom/cyclops/optic_blast.ron index 2e89b63..1aed822 100644 --- a/assets/common/abilities/custom/cyclops/optic_blast.ron +++ b/assets/common/abilities/custom/cyclops/optic_blast.ron @@ -17,7 +17,7 @@ BasicRanged( ), projectile_body: Object(LaserBeam), projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/dagon/dagonbombs.ron b/assets/common/abilities/custom/dagon/dagonbombs.ron index c3fa74b..471d7ff 100644 --- a/assets/common/abilities/custom/dagon/dagonbombs.ron +++ b/assets/common/abilities/custom/dagon/dagonbombs.ron @@ -24,7 +24,7 @@ BasicRanged( projectile_body: Object(DagonBomb), projectile_light: None, projectile_speed: 20.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/dullahan/fierce_darts.ron b/assets/common/abilities/custom/dullahan/fierce_darts.ron index 4d1a03d..5f78b70 100644 --- a/assets/common/abilities/custom/dullahan/fierce_darts.ron +++ b/assets/common/abilities/custom/dullahan/fierce_darts.ron @@ -18,7 +18,7 @@ BasicRanged( ), projectile_body: Object(SpectralSwordLarge), projectile_speed: 120.0, - num_projectiles: 3, + num_projectiles: Value(3), projectile_spread: 0.075, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/dullahan/knife_rain.ron b/assets/common/abilities/custom/dullahan/knife_rain.ron index d1b9e77..37f4cc0 100644 --- a/assets/common/abilities/custom/dullahan/knife_rain.ron +++ b/assets/common/abilities/custom/dullahan/knife_rain.ron @@ -18,7 +18,7 @@ BasicRanged( ), projectile_body: Object(SpectralSwordSmall), projectile_speed: 20.0, - num_projectiles: 12, + num_projectiles: Value(12), projectile_spread: 0.4, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/dwarves/flamekeeper/mines.ron b/assets/common/abilities/custom/dwarves/flamekeeper/mines.ron index defcc1d..4496a2f 100644 --- a/assets/common/abilities/custom/dwarves/flamekeeper/mines.ron +++ b/assets/common/abilities/custom/dwarves/flamekeeper/mines.ron @@ -18,7 +18,7 @@ BasicRanged( projectile_body: Object(Mine), projectile_light: None, projectile_speed: 30.0, - num_projectiles: 12, + num_projectiles: Value(12), projectile_spread: 0.6, move_efficiency: 0.8, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/dwarves/forgemaster/lava_mortar.ron b/assets/common/abilities/custom/dwarves/forgemaster/lava_mortar.ron index 9ab4ebd..999c3a1 100644 --- a/assets/common/abilities/custom/dwarves/forgemaster/lava_mortar.ron +++ b/assets/common/abilities/custom/dwarves/forgemaster/lava_mortar.ron @@ -17,7 +17,7 @@ BasicRanged( ), projectile_body: Object(Mine), projectile_speed: 50.0, - num_projectiles: 2, + num_projectiles: Value(2), projectile_spread: 0.1, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/dwarves/snaretongue/bombs.ron b/assets/common/abilities/custom/dwarves/snaretongue/bombs.ron index e777acd..3b01909 100644 --- a/assets/common/abilities/custom/dwarves/snaretongue/bombs.ron +++ b/assets/common/abilities/custom/dwarves/snaretongue/bombs.ron @@ -24,7 +24,7 @@ BasicRanged( projectile_body: Object(BubbleBomb), projectile_light: None, projectile_speed: 40.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/flamewyvern/firebomb.ron b/assets/common/abilities/custom/flamewyvern/firebomb.ron index 2120ee1..cb433be 100644 --- a/assets/common/abilities/custom/flamewyvern/firebomb.ron +++ b/assets/common/abilities/custom/flamewyvern/firebomb.ron @@ -23,7 +23,7 @@ BasicRanged( projectile_body: Object(BoltFire), projectile_light: None, projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/frostwyvern/frostbomb.ron b/assets/common/abilities/custom/frostwyvern/frostbomb.ron index f34077c..a8554cb 100644 --- a/assets/common/abilities/custom/frostwyvern/frostbomb.ron +++ b/assets/common/abilities/custom/frostwyvern/frostbomb.ron @@ -16,7 +16,7 @@ BasicRanged( projectile_body: Object(SpearIcicle), projectile_light: None, projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/gigas_frost/ice_volley.ron b/assets/common/abilities/custom/gigas_frost/ice_volley.ron index d6da136..4c3def5 100644 --- a/assets/common/abilities/custom/gigas_frost/ice_volley.ron +++ b/assets/common/abilities/custom/gigas_frost/ice_volley.ron @@ -24,7 +24,7 @@ BasicRanged( ), projectile_body: Object(IceBomb), projectile_speed: 40.0, - num_projectiles: 5, + num_projectiles: Value(5), projectile_spread: 0.05, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/gravewarden/rocket.ron b/assets/common/abilities/custom/gravewarden/rocket.ron index 197e486..08d0159 100644 --- a/assets/common/abilities/custom/gravewarden/rocket.ron +++ b/assets/common/abilities/custom/gravewarden/rocket.ron @@ -18,7 +18,7 @@ BasicRanged( projectile_body: Object(ClayRocket), projectile_light: None, projectile_speed: 30.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/harvester/explodingpumpkin.ron b/assets/common/abilities/custom/harvester/explodingpumpkin.ron index 3af60d0..70fe03f 100644 --- a/assets/common/abilities/custom/harvester/explodingpumpkin.ron +++ b/assets/common/abilities/custom/harvester/explodingpumpkin.ron @@ -24,7 +24,7 @@ BasicRanged( projectile_body: Object(Pumpkin), projectile_light: None, projectile_speed: 30.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/hydra/growhead.ron b/assets/common/abilities/custom/hydra/growhead.ron new file mode 100644 index 0000000..1c95105 --- /dev/null +++ b/assets/common/abilities/custom/hydra/growhead.ron @@ -0,0 +1,7 @@ +#![enable(implicit_some)] +RegrowHead( + buildup_duration: 0.5, + recover_duration: 0.4, + energy_cost: 0.0, + specifier: Hydra, +) diff --git a/assets/common/abilities/custom/hydra/multi_bite.ron b/assets/common/abilities/custom/hydra/multi_bite.ron new file mode 100644 index 0000000..ce160e1 --- /dev/null +++ b/assets/common/abilities/custom/hydra/multi_bite.ron @@ -0,0 +1,65 @@ +ComboMelee2( + strikes: [ + ( + melee_constructor: ( + kind: Slash( + damage: 15, + poise: 9, + knockback: 1, + energy_regen: 0, + ), + range: 3.2, + angle: 100.0, + ), + buildup_duration: 0.7, + swing_duration: 0.3, + hit_timing: 0.5, + recover_duration: 0.6, + movement: ( + swing: Some(Forward(0.15)), + ), + ori_modifier: 0.65, + ), + ( + melee_constructor: ( + kind: Slash( + damage: 16, + poise: 11, + knockback: 7, + energy_regen: 0, + ), + range: 3.2, + angle: 200.0, + ), + buildup_duration: 0.5, + swing_duration: 0.3, + hit_timing: 0.5, + recover_duration: 0.6, + movement: ( + swing: Some(Forward(0.1)), + ), + ori_modifier: 0.65, + ), + ( + melee_constructor: ( + kind: Bash( + damage: 40, + poise: 31, + knockback: 4, + energy_regen: 0, + ), + range: 4.2, + angle: 360.0, + ), + buildup_duration: 1.3, + swing_duration: 0.4, + hit_timing: 0.5, + recover_duration: 0.8, + movement: ( + swing: Some(Forward(0.5)), + ), + ori_modifier: 0.65, + ), + ], + energy_cost_per_strike: 0, +) diff --git a/assets/common/abilities/custom/hydra/poison.ron b/assets/common/abilities/custom/hydra/poison.ron new file mode 100644 index 0000000..bb24dbd --- /dev/null +++ b/assets/common/abilities/custom/hydra/poison.ron @@ -0,0 +1,26 @@ +Shockwave( + energy_cost: 0, + buildup_duration: 0.6, + swing_duration: 0.3, + recover_duration: 0.3, + damage: 30.0, + poise_damage: 0, + knockback: (strength: 0.0, direction: Away), + shockwave_angle: 140.0, + shockwave_vertical_angle: 360.0, + shockwave_speed: 3.0, + shockwave_duration: 7.0, + dodgeable: No, + move_efficiency: 0.0, + damage_kind: Crushing, + specifier: AcidCloud, + ori_rate: 1.0, + damage_effect: Some(Buff(( + kind: Poisoned, + dur_secs: 5.0, + strength: Value(25.0), + chance: 1.0, + ))), + timing: PostBuildup, + emit_outcome: true, +) diff --git a/assets/common/abilities/custom/hydra/poison_ball.ron b/assets/common/abilities/custom/hydra/poison_ball.ron new file mode 100644 index 0000000..8f62d28 --- /dev/null +++ b/assets/common/abilities/custom/hydra/poison_ball.ron @@ -0,0 +1,21 @@ +BasicRanged( + energy_cost: 0, + buildup_duration: 1.6, + recover_duration: 0.7, + projectile: ( + kind: Explosive( + radius: 6, + min_falloff: 0.5, + reagent: Some(Green), + ), + attack: Some(( + damage: 30, + energy: 5, + )), + ), + projectile_body: Object(PoisonBall), + projectile_speed: 150.0, + num_projectiles: PerHead(1), + projectile_spread: 0.5, + move_efficiency: 0.3, +) diff --git a/assets/common/abilities/custom/hydra/poison_wave.ron b/assets/common/abilities/custom/hydra/poison_wave.ron new file mode 100644 index 0000000..7b75c6d --- /dev/null +++ b/assets/common/abilities/custom/hydra/poison_wave.ron @@ -0,0 +1,26 @@ +Shockwave( + energy_cost: 0, + buildup_duration: 0.3, + swing_duration: 0.3, + recover_duration: 2.0, + damage: 30.0, + poise_damage: 10, + knockback: (strength: 14.0, direction: Away), + shockwave_angle: 360.0, + shockwave_vertical_angle: 90.0, + shockwave_speed: 15.0, + shockwave_duration: 3.0, + dodgeable: Jump, + move_efficiency: 0.0, + damage_kind: Crushing, + specifier: Poison, + ori_rate: 1.0, + damage_effect: Some(Buff(( + kind: Poisoned, + dur_secs: 20.0, + strength: Value(10.0), + chance: 1.0, + ))), + timing: PostBuildup, + emit_outcome: true, +) diff --git a/assets/common/abilities/custom/hydra/tail_swipe.ron b/assets/common/abilities/custom/hydra/tail_swipe.ron new file mode 100644 index 0000000..495a4ef --- /dev/null +++ b/assets/common/abilities/custom/hydra/tail_swipe.ron @@ -0,0 +1,27 @@ +ChargedMelee( + energy_cost: 0, + energy_drain: 0, + melee_constructor: ( + kind: Bash( + damage: 8.0, + poise: 5.0, + knockback: 10.0, + energy_regen: 0.0, + ), + scaled: Some(( + kind: Bash( + damage: 35.0, + poise: 35.0, + knockback: 35.0, + energy_regen: 0.0, + ))), + dodgeable: Jump, + range: 5.5, + angle: 360.0, + multi_target: Some(Normal), + ), + charge_duration: 1.5, + swing_duration: 0.8, + hit_timing: 0.2, + recover_duration: 0.2, +) diff --git a/assets/common/abilities/custom/icedrake/icebombs.ron b/assets/common/abilities/custom/icedrake/icebombs.ron index 995fd61..92722f4 100644 --- a/assets/common/abilities/custom/icedrake/icebombs.ron +++ b/assets/common/abilities/custom/icedrake/icebombs.ron @@ -15,7 +15,7 @@ BasicRanged( ), projectile_body: Object(IceBomb), projectile_speed: 25.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/irongolemfist/iron_pike_bomb.ron b/assets/common/abilities/custom/irongolemfist/iron_pike_bomb.ron index 40d0be1..0a06193 100644 --- a/assets/common/abilities/custom/irongolemfist/iron_pike_bomb.ron +++ b/assets/common/abilities/custom/irongolemfist/iron_pike_bomb.ron @@ -18,7 +18,7 @@ BasicRanged( projectile_body: Object(IronPikeBomb), projectile_light: None, projectile_speed: 500.0, - num_projectiles: 3, + num_projectiles: Value(3), projectile_spread: 0.3, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/irrwurz/magicball.ron b/assets/common/abilities/custom/irrwurz/magicball.ron index c061520..c5d3600 100644 --- a/assets/common/abilities/custom/irrwurz/magicball.ron +++ b/assets/common/abilities/custom/irrwurz/magicball.ron @@ -21,7 +21,7 @@ BasicRanged( ), projectile_body: Object(FireworkGreen), projectile_speed: 25.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/maneater/poisonball.ron b/assets/common/abilities/custom/maneater/poisonball.ron index 30a8fab..550ba8a 100644 --- a/assets/common/abilities/custom/maneater/poisonball.ron +++ b/assets/common/abilities/custom/maneater/poisonball.ron @@ -6,16 +6,16 @@ BasicRanged( kind: Explosive( radius: 3, min_falloff: 0.5, - reagent: Some(Purple), + reagent: Some(Green), ), attack: Some(( damage: 26, energy: 0, )), ), - projectile_body: Object(FireworkPurple), + projectile_body: Object(PoisonBall), projectile_speed: 70.0, - num_projectiles: 3, + num_projectiles: Value(3), projectile_spread: 0.2, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/mindflayer/necroticsphere.ron b/assets/common/abilities/custom/mindflayer/necroticsphere.ron index 915a14d..efac5d8 100644 --- a/assets/common/abilities/custom/mindflayer/necroticsphere.ron +++ b/assets/common/abilities/custom/mindflayer/necroticsphere.ron @@ -15,7 +15,7 @@ BasicRanged( ), projectile_body: Object(FireworkPurple), projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/quadlowranged/firebomb.ron b/assets/common/abilities/custom/quadlowranged/firebomb.ron index bf7aff6..1b5aa3a 100644 --- a/assets/common/abilities/custom/quadlowranged/firebomb.ron +++ b/assets/common/abilities/custom/quadlowranged/firebomb.ron @@ -15,7 +15,7 @@ BasicRanged( ), projectile_body: Object(FireworkPurple), projectile_speed: 70.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/seawyvern/inkbomb.ron b/assets/common/abilities/custom/seawyvern/inkbomb.ron index 2bc3271..66066a4 100644 --- a/assets/common/abilities/custom/seawyvern/inkbomb.ron +++ b/assets/common/abilities/custom/seawyvern/inkbomb.ron @@ -23,7 +23,7 @@ BasicRanged( projectile_body: Object(SpitPoison), projectile_light: None, projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/custom/terracotta_besieger/multishot.ron b/assets/common/abilities/custom/terracotta_besieger/multishot.ron index 65c5d12..9c75cb2 100644 --- a/assets/common/abilities/custom/terracotta_besieger/multishot.ron +++ b/assets/common/abilities/custom/terracotta_besieger/multishot.ron @@ -19,7 +19,7 @@ BasicRanged( projectile_body: Object(BoltBesieger), projectile_light: None, projectile_speed: 60.0, - num_projectiles: 4, + num_projectiles: Value(4), projectile_spread: 0.05, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/terracotta_demolisher/drop.ron b/assets/common/abilities/custom/terracotta_demolisher/drop.ron index 1199eee..d4f8bbe 100644 --- a/assets/common/abilities/custom/terracotta_demolisher/drop.ron +++ b/assets/common/abilities/custom/terracotta_demolisher/drop.ron @@ -23,7 +23,7 @@ BasicRanged( projectile_body: Object(TerracottaDemolisherBomb), projectile_light: None, projectile_speed: 0.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/terracotta_demolisher/throw.ron b/assets/common/abilities/custom/terracotta_demolisher/throw.ron index a0d9f95..834f77e 100644 --- a/assets/common/abilities/custom/terracotta_demolisher/throw.ron +++ b/assets/common/abilities/custom/terracotta_demolisher/throw.ron @@ -23,7 +23,7 @@ BasicRanged( projectile_body: Object(TerracottaDemolisherBomb), projectile_light: None, projectile_speed: 20.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/terracotta_statue/blast.ron b/assets/common/abilities/custom/terracotta_statue/blast.ron index 8a3da7a..f3307cc 100644 --- a/assets/common/abilities/custom/terracotta_statue/blast.ron +++ b/assets/common/abilities/custom/terracotta_statue/blast.ron @@ -17,7 +17,7 @@ BasicRanged( ), projectile_body: Object(LaserBeamSmall), projectile_speed: 45.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/turret/arrows.ron b/assets/common/abilities/custom/turret/arrows.ron index d831925..5c9aa10 100644 --- a/assets/common/abilities/custom/turret/arrows.ron +++ b/assets/common/abilities/custom/turret/arrows.ron @@ -19,7 +19,7 @@ BasicRanged( projectile_body: Object(ArrowTurret), projectile_light: None, projectile_speed: 130.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/wealdwyvern/poisonbomb.ron b/assets/common/abilities/custom/wealdwyvern/poisonbomb.ron index 8b3364a..715a6d9 100644 --- a/assets/common/abilities/custom/wealdwyvern/poisonbomb.ron +++ b/assets/common/abilities/custom/wealdwyvern/poisonbomb.ron @@ -24,7 +24,7 @@ BasicRanged( projectile_body: Object(SpitPoison), projectile_light: None, projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/wendigomagic/frostbomb.ron b/assets/common/abilities/custom/wendigomagic/frostbomb.ron index daea7b0..aec5ff7 100644 --- a/assets/common/abilities/custom/wendigomagic/frostbomb.ron +++ b/assets/common/abilities/custom/wendigomagic/frostbomb.ron @@ -15,7 +15,7 @@ BasicRanged( ), projectile_body: Object(BoltIcicle), projectile_speed: 60.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/yeti/snowball.ron b/assets/common/abilities/custom/yeti/snowball.ron index f1a0fcd..d931469 100644 --- a/assets/common/abilities/custom/yeti/snowball.ron +++ b/assets/common/abilities/custom/yeti/snowball.ron @@ -17,7 +17,7 @@ BasicRanged( ), projectile_body: Object(Snowball), projectile_speed: 60.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/debug/possess.ron b/assets/common/abilities/debug/possess.ron index d0b66c4..690a046 100644 --- a/assets/common/abilities/debug/possess.ron +++ b/assets/common/abilities/debug/possess.ron @@ -7,7 +7,7 @@ BasicRanged( ), projectile_body: Object(ArrowSnake), projectile_speed: 100.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, -) \ No newline at end of file +) diff --git a/assets/common/abilities/gnarling/blowgun/dart.ron b/assets/common/abilities/gnarling/blowgun/dart.ron index dc36f40..af52e50 100644 --- a/assets/common/abilities/gnarling/blowgun/dart.ron +++ b/assets/common/abilities/gnarling/blowgun/dart.ron @@ -18,7 +18,7 @@ BasicRanged( projectile_body: Object(Dart), projectile_light: None, projectile_speed: 80.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/gnarling/chieftain/firebarrage.ron b/assets/common/abilities/gnarling/chieftain/firebarrage.ron index faf8479..00cc54f 100644 --- a/assets/common/abilities/gnarling/chieftain/firebarrage.ron +++ b/assets/common/abilities/gnarling/chieftain/firebarrage.ron @@ -22,7 +22,7 @@ BasicRanged( ), projectile_body: Object(BoltFire), projectile_speed: 25, - num_projectiles: 5, + num_projectiles: Value(5), projectile_spread: 0.125, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/haniwa/archer/arrow.ron b/assets/common/abilities/haniwa/archer/arrow.ron index 14489b4..6214ee2 100644 --- a/assets/common/abilities/haniwa/archer/arrow.ron +++ b/assets/common/abilities/haniwa/archer/arrow.ron @@ -19,7 +19,7 @@ BasicRanged( projectile_body: Object(ArrowClay), projectile_light: None, projectile_speed: 75.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.2, ) diff --git a/assets/common/abilities/haniwa/archer/explosive.ron b/assets/common/abilities/haniwa/archer/explosive.ron index 266ebf9..a05492d 100644 --- a/assets/common/abilities/haniwa/archer/explosive.ron +++ b/assets/common/abilities/haniwa/archer/explosive.ron @@ -18,7 +18,7 @@ BasicRanged( projectile_body: Object(GrenadeClay), projectile_light: None, projectile_speed: 50.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.5, ) diff --git a/assets/common/abilities/staff/firebomb.ron b/assets/common/abilities/staff/firebomb.ron index b539f2a..104a68d 100644 --- a/assets/common/abilities/staff/firebomb.ron +++ b/assets/common/abilities/staff/firebomb.ron @@ -22,7 +22,7 @@ BasicRanged( ), projectile_body: Object(BoltFire), projectile_speed: 60.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/abilities/staffsimple/firebomb.ron b/assets/common/abilities/staffsimple/firebomb.ron index bd8df87..50fb828 100644 --- a/assets/common/abilities/staffsimple/firebomb.ron +++ b/assets/common/abilities/staffsimple/firebomb.ron @@ -22,7 +22,7 @@ BasicRanged( ), projectile_body: Object(BoltFire), projectile_speed: 60.0, - num_projectiles: 1, + num_projectiles: Value(1), projectile_spread: 0.0, move_efficiency: 0.3, ) diff --git a/assets/common/entity/wild/aggressive/hydra.ron b/assets/common/entity/wild/aggressive/hydra.ron new file mode 100644 index 0000000..95c5d75 --- /dev/null +++ b/assets/common/entity/wild/aggressive/hydra.ron @@ -0,0 +1,11 @@ +#![enable(implicit_some)] +( + name: Automatic, + body: RandomWith("hydra"), + alignment: Alignment(Enemy), + loot: LootTable("common.loot_tables.creature.quad_low.hydra"), + inventory: ( + loadout: FromBody, + ), + meta: [], +) diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index a1434ee..426ea58 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -2625,6 +2625,9 @@ Simple( "common.items.npc_weapons.unique.quadruped_low.maneater", ): "common-items-npc_weapons-unique-quadruped_low-maneater", + Simple( + "common.items.npc_weapons.unique.quadruped_low.hydra", + ): "common-items-npc_weapons-unique-quadruped_low-hydra", Simple( "common.items.npc_weapons.unique.quadruped_small.boar", ): "common-items-npc_weapons-unique-quadruped_small-boar", diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/hydra.ron b/assets/common/items/npc_weapons/unique/quadruped_low/hydra.ron new file mode 100644 index 0000000..19a6724 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_low/hydra.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Hydra", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 1.0, + effect_power: 1.0, + speed: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Epic, + tags: [], + ability_spec: Some(Custom("Hydra")), +) diff --git a/assets/common/loot_tables/creature/quad_low/hydra.ron b/assets/common/loot_tables/creature/quad_low/hydra.ron new file mode 100644 index 0000000..cd21fb1 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_low/hydra.ron @@ -0,0 +1,8 @@ +[ + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 5, 8), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 6, 10), + MultiDrop(Item("common.items.crafting_ing.animal_misc.grim_eyeball"), 2, 2), + ], + )), +] diff --git a/assets/common/npc_names.ron b/assets/common/npc_names.ron index 7381a4b..12c0b4f 100644 --- a/assets/common/npc_names.ron +++ b/assets/common/npc_names.ron @@ -1417,6 +1417,10 @@ keyword: "driggle", generic: "Driggle" ), + hydra: ( + keyword: "hydra", + generic: "Hydra" + ), ) ), arthropod: (