Merge branch 'master' of https://www.gitlab.com/veloren/veloren into swilliams/quad_small_health_balance

.gitattributes

@@ -1,4 +1,6 @@
 *.png filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
 *.vox filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text

.gitlab-ci.yml

@@ -13,7 +13,7 @@ variables:
   # https://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
   GIT_DEPTH: 3
   GIT_CLEAN_FLAGS: -f
-  CACHE_IMAGE_TAG: 55629eab
+  CACHE_IMAGE_TAG: c6476744
 
 default:
   # https://docs.gitlab.com/ee/ci/pipelines/settings.html#auto-cancel-pending-pipelines

.gitlab/CI/build.gitlab-ci.yml

@@ -61,7 +61,9 @@ coverage:
   script:
     - ln -s /dockercache/target target
     - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-    - VELOREN_USERDATA_STRATEGY=executable cargo build --release
+    - export VELOREN_USERDATA_STRATEGY=executable
+    - cargo build --release -p veloren-voxygen --no-default-features --features default-publish
+    - cargo build --release -p veloren-server-cli
     - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
     - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
   artifacts:
@@ -79,7 +81,9 @@ coverage:
     - update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
     - ln -s /dockercache/target target
     - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-    - VELOREN_USERDATA_STRATEGY=executable cargo build --target=x86_64-pc-windows-gnu --release
+    - export VELOREN_USERDATA_STRATEGY=executable
+    - cargo build --target=x86_64-pc-windows-gnu --release -p veloren-voxygen --no-default-features --features default-publish
+    - cargo build --target=x86_64-pc-windows-gnu --release -p veloren-server-cli
     - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
     - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
     - cp /usr/lib/gcc/x86_64-w64-mingw32/7.3-posix/libgcc_s_seh-1.dll $CI_PROJECT_DIR
@@ -107,7 +111,9 @@ coverage:
     - export RUSTFLAGS="-D warnings"
   script:
     - export MACOSX_DEPLOYMENT_TARGET="10.13"
-    - VELOREN_USERDATA_STRATEGY=executable cargo build --release
+    - export VELOREN_USERDATA_STRATEGY=executable
+    - cargo build --release -p veloren-voxygen --no-default-features --features default-publish
+    - cargo build --release -p veloren-server-cli
     - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
     - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
   artifacts:

.gitlab/CI/check.gitlab-ci.yml

@@ -6,7 +6,9 @@ code-quality:
   script:
     - ln -s /dockercache/target target
     - rm -r target/debug/incremental/* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
-    - cargo clippy --all-targets --locked  --features="bin_csv,bin_graphviz,bin_bot,asset_tweak" -- -D warnings
+    - cargo clippy --all-targets --locked --features="bin_csv,bin_graphviz,bin_bot,asset_tweak" -- -D warnings
+    # Ensure that the veloren-voxygen default-publish feature builds as it excludes some default features
+    - cargo clippy -p veloren-voxygen --locked --no-default-features --features="default-publish" -- -D warnings
     - cargo fmt --all -- --check
 
 security:

CHANGELOG.md

@@ -9,6 +9,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added a skill tree for mining, which gains xp from mining ores and gems.
+- Added debug line info to release builds, enhancing the usefulness of panic backtraces
+- NPCs and animals can now make sounds in response to certain events
+- Players can press H to greet others
+- Ability to toggle chat visibility
+- Added gem rings with various stat improvements.
+### Changed
+
+- Entity-entity pushback is no longer applied in forced movement states like rolling and leaping.
+- Updated audio library (rodio 0.13 -> 0.14).
+- Improve entity-terrain physics performance by reducing the number of voxel lookups.
+- Clay Golem uses shockwave only after specific fraction of health and other difficulty adjustments.
+- Made strafing slightly slower
+- Food now has limited regeneration strength but longer duration.
+- Harvester boss now has new abilities and AI
+
+### Removed
+
+- Enemies no more spawn in dungeon boss room
+
+### Fixed
+
+- Crafting Stations aren't exploadable anymore
+- Cases where no audio output could be produced before.
+- Significantly improved the performance of playing sound effects
+
+## [0.10.0] - 2021-06-12
+
+### Added
+
 - New Skills for Climbing: Climbing Speed and Climbing Cost
 - Pickaxes (can be used to collect gems and mine weak rock)
 - You can now jump out of rolls for a slight jump boost
@@ -727,7 +757,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 _0.1.0 was part of the legacy engine_
 
-[unreleased]: https://gitlab.com/veloren/veloren/compare?from=v0.9.0&to=master
+[unreleased]: https://gitlab.com/veloren/veloren/compare?from=v0.10.0&to=master
+[0.9.0]: https://gitlab.com/veloren/veloren/compare?from=v0.9.0&to=v0.10.0
 [0.9.0]: https://gitlab.com/veloren/veloren/compare?from=v0.8.0&to=v0.9.0
 [0.8.0]: https://gitlab.com/veloren/veloren/compare?from=v0.7.0&to=v0.8.0
 [0.7.0]: https://gitlab.com/veloren/veloren/compare?from=v0.6.0&to=v0.7.0

Cargo.lock

@@ -613,15 +613,6 @@ dependencies = [
  "objc_id",
 ]
 
-[[package]]
-name = "clipboard_wayland"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61bcb8cde0387fde807b9b7af66ce8bd1665ef736e46e6e47fda82ea003e6ade"
-dependencies = [
- "smithay-clipboard",
-]
-
 [[package]]
 name = "clipboard_wayland"
 version = "0.2.0"
@@ -631,16 +622,6 @@ dependencies = [
  "smithay-clipboard",
 ]
 
-[[package]]
-name = "clipboard_x11"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40403aa5220e5cd303d32dc4248cac8aa92bf47e3ae31e0e2481081755a63ff1"
-dependencies = [
- "thiserror",
- "x11rb",
-]
-
 [[package]]
 name = "clipboard_x11"
 version = "0.3.1"
@@ -726,6 +707,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "comma"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96677551532ffe910f470bd767a9a7daf9ba53b1f5532e0891dba6c735f692e5"
+
 [[package]]
 name = "concurrent-queue"
 version = "1.2.2"
@@ -931,8 +918,8 @@ dependencies = [
  "lazy_static",
  "libc",
  "mach 0.3.2",
- "ndk 0.3.0",
+ "ndk",
- "ndk-glue 0.3.0",
+ "ndk-glue",
  "nix 0.20.0",
  "oboe",
  "parking_lot 0.11.1",
@@ -1054,6 +1041,20 @@ dependencies = [
  "itertools 0.9.0",
 ]
 
+[[package]]
+name = "crossbeam"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-channel",
+ "crossbeam-deque 0.8.0",
+ "crossbeam-epoch 0.9.5",
+ "crossbeam-queue",
+ "crossbeam-utils 0.8.5",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.1"
@@ -2386,13 +2387,13 @@ dependencies = [
 
 [[package]]
 name = "iced_core"
-version = "0.3.0"
+version = "0.4.0"
-source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
+source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
 
 [[package]]
 name = "iced_futures"
-version = "0.2.0"
+version = "0.3.0"
-source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
+source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
 dependencies = [
  "futures",
  "log",
@@ -2401,8 +2402,8 @@ dependencies = [
 
 [[package]]
 name = "iced_graphics"
-version = "0.1.0"
+version = "0.2.0"
-source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
+source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
 dependencies = [
  "bytemuck",
  "glam",
@@ -2414,8 +2415,8 @@ dependencies = [
 
 [[package]]
 name = "iced_native"
-version = "0.3.0"
+version = "0.4.0"
-source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
+source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -2426,16 +2427,16 @@ dependencies = [
 
 [[package]]
 name = "iced_style"
-version = "0.2.0"
+version = "0.3.0"
-source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
+source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
 dependencies = [
  "iced_core",
 ]
 
 [[package]]
 name = "iced_winit"
-version = "0.2.0"
+version = "0.3.0"
-source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf"
+source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
 dependencies = [
  "iced_futures",
  "iced_graphics",
@@ -2443,7 +2444,7 @@ dependencies = [
  "log",
  "thiserror",
  "winapi 0.3.9",
- "window_clipboard 0.1.4",
+ "window_clipboard",
  "winit",
 ]
 
@@ -2637,7 +2638,7 @@ dependencies = [
 [[package]]
 name = "keyboard-keynames"
 version = "0.1.0"
-source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c#a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c"
+source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc#9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc"
 dependencies = [
  "libc",
  "memmap",
@@ -3028,6 +3029,18 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "mio-misc"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ddf05411bb159cdb5801bb10002afb66cb4572be656044315e363460ce69dc2"
+dependencies = [
+ "crossbeam",
+ "crossbeam-queue",
+ "log",
+ "mio 0.7.11",
+]
+
 [[package]]
 name = "miow"
 version = "0.2.2"
@@ -3097,18 +3110,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "ndk"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
-dependencies = [
- "jni-sys",
- "ndk-sys",
- "num_enum 0.4.3",
- "thiserror",
-]
-
 [[package]]
 name = "ndk"
 version = "0.3.0"
@@ -3117,24 +3118,10 @@ checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
 dependencies = [
  "jni-sys",
  "ndk-sys",
- "num_enum 0.5.1",
+ "num_enum",
  "thiserror",
 ]
 
-[[package]]
-name = "ndk-glue"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "ndk 0.2.1",
- "ndk-macro",
- "ndk-sys",
-]
-
 [[package]]
 name = "ndk-glue"
 version = "0.3.0"
@@ -3144,7 +3131,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "ndk 0.3.0",
+ "ndk",
  "ndk-macro",
  "ndk-sys",
 ]
@@ -3465,16 +3452,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
-dependencies = [
- "derivative",
- "num_enum_derive 0.4.3",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.5.1"
@@ -3482,19 +3459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
 dependencies = [
  "derivative",
- "num_enum_derive 0.5.1",
+ "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.27",
- "quote 1.0.9",
- "syn 1.0.72",
 ]
 
 [[package]]
@@ -3574,8 +3539,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa187b38ae20374617b7ad418034ed3dc90ac980181d211518bd03537ae8f8d"
 dependencies = [
  "jni",
- "ndk 0.3.0",
+ "ndk",
- "ndk-glue 0.3.0",
+ "ndk-glue",
  "num-derive",
  "num-traits",
  "oboe-sys",
@@ -4377,9 +4342,9 @@ dependencies = [
 
 [[package]]
 name = "rodio"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f"
+checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9"
 dependencies = [
  "cpal",
  "lewton",
@@ -5747,13 +5712,12 @@ dependencies = [
 
 [[package]]
 name = "veloren-client"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "async-channel",
  "authc",
  "byteorder",
  "clap",
- "futures-util",
  "hashbrown 0.11.2",
  "image",
  "num 0.4.0",
@@ -5779,7 +5743,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "approx 0.4.0",
  "bitflags",
@@ -5821,7 +5785,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-assets"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "assets_manager",
  "dot_vox",
@@ -5835,7 +5799,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-base"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "directories-next",
  "tracing",
@@ -5844,7 +5808,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-ecs"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "float-cmp",
  "specs",
@@ -5854,7 +5818,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-frontend"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "termcolor",
  "tracing",
@@ -5867,7 +5831,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-net"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "bincode",
  "flate2",
@@ -5885,7 +5849,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-state"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "bincode",
  "hashbrown 0.11.2",
@@ -5908,7 +5872,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-common-systems"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "hashbrown 0.11.2",
  "indexmap",
@@ -5927,7 +5891,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-i18n"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "clap",
  "deunicode",
@@ -6016,7 +5980,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-server"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "atomicwrites",
  "authc",
@@ -6060,7 +6024,7 @@ dependencies = [
 
 [[package]]
 name = "veloren-server-cli"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "ansi-parser",
  "clap",
@@ -6084,12 +6048,13 @@ dependencies = [
 
 [[package]]
 name = "veloren-voxygen"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "backtrace",
  "bincode",
  "bytemuck",
  "chrono",
+ "comma",
  "conrod_core",
  "conrod_winit",
  "copy_dir",
@@ -6147,14 +6112,14 @@ dependencies = [
  "veloren-world",
  "wgpu",
  "wgpu-profiler",
- "window_clipboard 0.2.1",
+ "window_clipboard",
  "winit",
  "winres",
 ]
 
 [[package]]
 name = "veloren-voxygen-anim"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "bytemuck",
  "find_folder",
@@ -6168,14 +6133,14 @@ dependencies = [
 
 [[package]]
 name = "veloren-voxygen-anim-dyn"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "veloren-voxygen-anim",
 ]
 
 [[package]]
 name = "veloren-world"
-version = "0.9.0"
+version = "0.10.0"
 dependencies = [
  "arr_macro",
  "assets_manager",
@@ -6722,7 +6687,7 @@ dependencies = [
 [[package]]
 name = "wgpu"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu-rs.git?rev=7486bdad64bb5d17b709ecccb41e063469efff88#7486bdad64bb5d17b709ecccb41e063469efff88"
+source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
 dependencies = [
  "arrayvec",
  "js-sys",
@@ -6742,7 +6707,7 @@ dependencies = [
 [[package]]
 name = "wgpu-core"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0#53eab747a32414232be45d47cae8a43a369395d0"
+source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
 dependencies = [
  "arrayvec",
  "bitflags",
@@ -6782,7 +6747,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0#53eab747a32414232be45d47cae8a43a369395d0"
+source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
 dependencies = [
  "bitflags",
  "serde",
@@ -6850,19 +6815,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "window_clipboard"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37cf16659e398a96f4ab8deff2b9db2ca0c3c5d6c1b59b1d577b7f888f0f03c6"
-dependencies = [
- "clipboard-win 4.2.1",
- "clipboard_macos",
- "clipboard_wayland 0.1.2",
- "clipboard_x11 0.2.0",
- "raw-window-handle",
-]
-
 [[package]]
 name = "window_clipboard"
 version = "0.2.1"
@@ -6871,15 +6823,16 @@ checksum = "33a4518b538a45ad39d138a8c3bea8f6b4452174aeb38143d1dd643a3a838ccc"
 dependencies = [
  "clipboard-win 4.2.1",
  "clipboard_macos",
- "clipboard_wayland 0.2.0",
+ "clipboard_wayland",
- "clipboard_x11 0.3.1",
+ "clipboard_x11",
  "raw-window-handle",
 ]
 
 [[package]]
 name = "winit"
-version = "0.24.0"
+version = "0.25.0"
-source = "git+https://gitlab.com/veloren/winit.git?branch=macos-test-spiffed#488c511802dfd95ca54f6f76a38547c93c7b02c9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8"
 dependencies = [
  "bitflags",
  "cocoa",
@@ -6891,15 +6844,16 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "mio 0.6.23",
+ "mio 0.7.11",
- "mio-extras",
+ "mio-misc",
- "ndk 0.2.1",
+ "ndk",
- "ndk-glue 0.2.1",
+ "ndk-glue",
  "ndk-sys",
  "objc",
  "parking_lot 0.11.1",
  "percent-encoding",
  "raw-window-handle",
+ "scopeguard",
  "serde",
  "smithay-client-toolkit",
  "wayland-client 0.28.5",

Cargo.toml

@@ -87,6 +87,26 @@ overflow-checks = false
 debug-assertions = false
 lto = true
 debug = false
+panic = "abort" # don't need unwinding so we can skip including the landing pads for that
+# line tables so we can have useful backtraces for in-house crates
+[profile.release.package."veloren-network"]
+debug = 1
+[profile.release.package."veloren-network-protocol"]
+debug = 1
+[profile.release.package."veloren-common"]
+debug = 1
+[profile.release.package."veloren-common-systems"]
+debug = 1
+[profile.release.package."veloren-client"]
+debug = 1
+[profile.release.package."veloren-server"]
+debug = 1
+[profile.release.package."veloren-server-cli"]
+debug = 1
+[profile.release.package."veloren-voxygen"]
+debug = 1
+[profile.release.package."veloren-world"]
+debug = 1
 
 # used for cargo bench
 [profile.bench]
@@ -109,16 +129,10 @@ key = "veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc="
 buildInputs = ["openssl"]
 nativeBuildInputs = ["pkg-config"]
 
-[workspace.metadata.nix.crateOverride.shaderc-sys]
-buildInputs = ["shaderc"]
-nativeBuildInputs = ["cmake", "python3", "gnumake"]
-
 [patch.crates-io]
-# macos CI fix isn't released yet
-winit = { git = "https://gitlab.com/veloren/winit.git", branch = "macos-test-spiffed" }
 vek = { git = "https://gitlab.com/veloren/vek.git", branch = "fix_intrinsics2" }
 # patch wgpu so we can use wgpu-profiler crate
-wgpu = { git = "https://github.com/gfx-rs/wgpu-rs.git", rev = "7486bdad64bb5d17b709ecccb41e063469efff88" }
+wgpu = { git = "https://github.com/gfx-rs/wgpu.git", rev = "a92b8549a8e2cb9dac781bafc5ed32828f3caf46" }
 
 # # use the latest fixes in naga (remove when updates trickle down to wgpu-rs)
 # naga = { git = "https://github.com/gfx-rs/naga.git", rev = "3a0f0144112ff621dd7f731bf455adf6cab19164" }

assets/common/abilities/ability_set_manifest.ron

@@ -34,11 +34,15 @@
         secondary: "common.abilities.custom.husk.triplestrike",
         abilities: [],
     ),
+    Custom("Husk Brute"): (
+        primary: "common.abilities.custom.husk_brute.singlestrike",
+        secondary: "common.abilities.custom.husk_brute.chargedmelee",
+        abilities: [],
+    ),
     Tool(Spear): (
         primary: "common.abilities.spear.doublestrike",
         secondary: "common.abilities.spear.dash",
         abilities: [],
-
     ),
     Custom("Hammer Simple"): (
         primary: "common.abilities.hammersimple.doublestrike",
@@ -53,8 +57,7 @@
     Custom("Sword Simple"): (
         primary: "common.abilities.swordsimple.doublestrike",
         secondary: "common.abilities.swordsimple.dash",
-        abilities: [
+        abilities: [],
-        ],
     ),
     Custom("Staff Simple"): (
         primary: "common.abilities.staffsimple.firebomb",
@@ -149,13 +152,20 @@
         abilities: [],
     ),
     Custom("Basilisk"): (
-        primary: "common.abilities.custom.basilisk.singlestrike",
+        primary: "common.abilities.custom.basilisk.petrify",
         secondary: "common.abilities.custom.basilisk.triplestrike",
+        abilities: [
+            (None, "common.abilities.custom.basilisk.dash"),
+        ],
+    ),
+    Custom("Asp"): (
+        primary: "common.abilities.custom.asp.singlestrike",
+        secondary: "common.abilities.custom.asp.firebomb",
         abilities: [],
     ),
-    Custom("Quad Low Ranged"): (
+    Custom("Maneater"): (
-        primary: "common.abilities.custom.quadlowranged.singlestrike",
+        primary: "common.abilities.custom.maneater.singlestrike",
-        secondary: "common.abilities.custom.quadlowranged.firebomb",
+        secondary: "common.abilities.custom.maneater.poisonball",
         abilities: [],
     ),
     Custom("Quad Low Breathe"): (
@@ -250,6 +260,14 @@
             (None, "common.abilities.custom.yeti.snowball"),
         ],
     ),
+    Custom("Harvester"): (
+        primary: "common.abilities.custom.harvester.scythe",
+        secondary: "common.abilities.custom.harvester.firebreath",
+        abilities: [
+            (None, "common.abilities.custom.harvester.ensnaringvines"),
+            (None, "common.abilities.custom.harvester.explodingpumpkin"),
+        ],
+    ),
     Custom("Bird Large Breathe"): (
         primary: "common.abilities.custom.birdlargebreathe.firebomb",
         secondary: "common.abilities.custom.birdlargebreathe.triplestrike",
@@ -264,6 +282,18 @@
             (None, "common.abilities.custom.birdlargefire.fireshockwave"),
         ],
     ),
+    Custom("Bird Large Basic"): (
+        primary: "common.abilities.custom.birdlargebasic.triplestrike",
+        secondary: "common.abilities.custom.birdlargebasic.summontornadoes",
+        abilities: [
+            (None, "common.abilities.custom.birdlargebasic.dash"),
+        ],
+    ),
+    Custom("Tornado"): (
+        primary: "common.abilities.custom.tornado.spin",
+        secondary: "common.abilities.empty.basic",
+        abilities: [],
+    ),
     Tool(Debug): (
         primary: "common.abilities.debug.forwardboost",
         secondary: "common.abilities.debug.upboost",

assets/common/abilities/axe/doublestrike.ron

@@ -6,11 +6,12 @@ ComboMelee(
             base_poise_damage: 12,
             damage_increase: 10,
             poise_damage_increase: 0,
-            knockback: 8.0,
+            knockback: 5.0,
             range: 3.5,
             angle: 50.0,
             base_buildup_duration: 0.15,
             base_swing_duration: 0.075,
+            hit_timing: 0.6,
             base_recover_duration: 0.35,
             forward_movement: 0.5,
             damage_kind: Slashing,
@@ -21,11 +22,12 @@ ComboMelee(
             base_poise_damage: 20,
             damage_increase: 15,
             poise_damage_increase: 0,
-            knockback: 12.0,
+            knockback: 6.0,
             range: 3.5,
             angle: 30.0,
             base_buildup_duration: 0.2,
             base_swing_duration: 0.1,
+            hit_timing: 0.6,
             base_recover_duration: 0.35,
             forward_movement: 0.25,
             damage_kind: Slashing,

assets/common/abilities/axesimple/doublestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 50.0,
             base_buildup_duration: 0.6,
             base_swing_duration: 0.12,
+            hit_timing: 0.5,
             base_recover_duration: 0.6,
             forward_movement: 3.5,
             damage_kind: Slashing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 15.0,
             base_buildup_duration: 0.5,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 1.2,
             forward_movement: 4.5,
             damage_kind: Slashing,

assets/common/abilities/bow/charged.ron

@@ -1,15 +1,15 @@
 ChargedRanged(
     energy_cost: 0,
     energy_drain: 0,
-    initial_regen: 20,
+    initial_regen: 5,
     scaled_regen: 120,
-    initial_damage: 20,
+    initial_damage: 5,
-    scaled_damage: 100,
+    scaled_damage: 120,
     initial_knockback: 0.0,
     scaled_knockback: 10.0,
     speed: 1.0,
     buildup_duration: 0.2,
-    charge_duration: 1.2,
+    charge_duration: 1.0,
     recover_duration: 0.3,
     projectile_body: Object(Arrow),
     projectile_light: None,

assets/common/abilities/custom/asp/firebomb.ron

@@ -0,0 +1,18 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.8,
+    recover_duration: 0.35,
+    projectile: Fireball(
+        damage: 130.0,
+        radius: 5.0,
+        energy_regen: 0,
+    ),
+    projectile_body: Object(BoltFire),
+    /*projectile_light: Some(LightEmitter {
+        col: (1.0, 0.75, 0.11).into(),
+        ..Default::default()
+    }),*/
+    projectile_speed: 70.0,
+    num_projectiles: 1,
+    projectile_spread: 0.0,
+)

assets/common/abilities/custom/asp/singlestrike.ron

@@ -2,17 +2,18 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 80,
+            base_damage: 140,
             damage_increase: 0,
             base_poise_damage: 28,
             poise_damage_increase: 0,
             knockback: 3.0,
             range: 3.5,
             angle: 60.0,
-            base_buildup_duration: 0.4,
+            base_buildup_duration: 0.6,
             base_swing_duration: 0.1,
-            base_recover_duration: 0.4,
+            hit_timing: 0.5,
-            forward_movement: 3.0,
+            base_recover_duration: 0.2,
+            forward_movement: 2.0,
             damage_kind: Crushing,
         ),
     ],

assets/common/abilities/custom/basilisk/dash.ron

@@ -0,0 +1,20 @@
+DashMelee(
+    energy_cost: 0,
+    base_damage: 120,
+    scaled_damage: 180,
+    base_poise_damage: 25,
+    scaled_poise_damage: 0,
+    base_knockback: 4.0,
+    scaled_knockback: 17.0,
+    range: 2.5,
+    angle: 45.0,
+    energy_drain: 0,
+    forward_speed: 4.0,
+    buildup_duration: 0.8,
+    charge_duration: 1.0,
+    swing_duration: 0.1,
+    recover_duration: 1.0,
+    charge_through: true,
+    is_interruptible: false,
+    damage_kind: Crushing,
+)

assets/common/abilities/custom/basilisk/petrify.ron

@@ -0,0 +1,20 @@
+BasicBeam(
+    buildup_duration: 0.9,
+    recover_duration: 1.0,
+    beam_duration: 1.0,
+    damage: 420,
+    tick_rate: 0.5,
+    range: 22.0,
+    max_angle: 5.0,
+    damage_effect: Some(Buff((
+        kind: Frozen,
+        dur_secs: 0.8,
+        strength: Value(5.0),
+        chance: 1.0,
+    ))),
+    energy_regen: 0,
+    energy_drain: 0,
+    orientation_behavior: Normal,
+    ori_rate: 0.6,
+    specifier: Cultist,
+)

assets/common/abilities/custom/basilisk/triplestrike.ron

@@ -2,45 +2,48 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 100,
+            base_damage: 180,
             damage_increase: 0,
             base_poise_damage: 15,
             poise_damage_increase: 0,
-            knockback: 7.0,
+            knockback: 3.0,
             range: 2.8,
             angle: 30.0,
-            base_buildup_duration: 0.65,
+            base_buildup_duration: 0.7,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 2.0,
             damage_kind: Crushing,
         ),
         (
             stage: 2,
-            base_damage: 100,
+            base_damage: 180,
             damage_increase: 0,
             base_poise_damage: 18,
             poise_damage_increase: 0,
-            knockback: 7.0,
+            knockback: 3.0,
             range: 2.8,
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Crushing,
         ),
         (
             stage: 3,
-            base_damage: 100,
+            base_damage: 180,
             damage_increase: 0,
             base_poise_damage: 20,
             poise_damage_increase: 0,
-            knockback: 7.0,
+            knockback: 3.0,
             range: 2.8,
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Crushing,

assets/common/abilities/custom/birdlargebasic/dash.ron

@@ -0,0 +1,20 @@
+DashMelee(
+    energy_cost: 0,
+    base_damage: 80,
+    scaled_damage: 150,
+    base_poise_damage: 50,
+    scaled_poise_damage: 100,
+    base_knockback: 6.0,
+    scaled_knockback: 12.0,
+    range: 2.0,
+    angle: 20.0,
+    energy_drain: 0,
+    forward_speed: 1.9,
+    buildup_duration: 0.5,
+    charge_duration: 3.0,
+    swing_duration: 0.1,
+    recover_duration: 0.7,
+    charge_through: false,
+    is_interruptible: false,
+    damage_kind: Crushing,
+)

assets/common/abilities/custom/birdlargebasic/summontornadoes.ron

@@ -0,0 +1,18 @@
+BasicSummon(
+    buildup_duration: 0.5,
+    cast_duration: 0.2,
+    recover_duration: 0.2,
+    summon_amount: 12,
+    summon_distance: (4, 9),
+    summon_info: (
+        body: Object(Tornado),
+        scale: None,
+        health_scaling: None,
+        loadout_config: None,
+        skillset_config: None,
+    ),
+    duration: Some((
+        secs: 10,
+        nanos: 0,
+    )),
+)

assets/common/abilities/custom/birdlargebasic/triplestrike.ron

@@ -0,0 +1,60 @@
+ComboMelee(
+    stage_data: [
+        (
+            stage: 1,
+            base_damage: 110,
+            damage_increase: 0,
+            base_poise_damage: 0,
+            poise_damage_increase: 0,
+            knockback: 5.0,
+            range: 4.5,
+            angle: 30.0,
+            base_buildup_duration: 0.4,
+            base_swing_duration: 0.1,
+            hit_timing: 0.5,
+            base_recover_duration: 0.3,
+            forward_movement: 3.0,
+            damage_kind: Crushing,
+        ),
+        (
+            stage: 2,
+            base_damage: 90,
+            damage_increase: 0,
+            base_poise_damage: 0,
+            poise_damage_increase: 0,
+            knockback: 5.0,
+            range: 3.5,
+            angle: 30.0,
+            base_buildup_duration: 0.4,
+            base_swing_duration: 0.1,
+            hit_timing: 0.5,
+            base_recover_duration: 0.3,
+            forward_movement: 3.0,
+            damage_kind: Crushing,
+        ),
+        (
+            stage: 3,
+            base_damage: 140,
+            damage_increase: 0,
+            base_poise_damage: 0,
+            poise_damage_increase: 0,
+            knockback: 10.0,
+            range: 3.5,
+            angle: 30.0,
+            base_buildup_duration: 0.65,
+            base_swing_duration: 0.1,
+            hit_timing: 0.5,
+            base_recover_duration: 0.3,
+            forward_movement: 3.5,
+            damage_kind: Crushing,
+        ),
+    ],
+    initial_energy_gain: 0,
+    max_energy_gain: 0,
+    energy_increase: 0,
+    speed_increase: 0.0,
+    max_speed_increase: 0.0,
+    scales_from_combo: 0,
+    is_interruptible: false,
+    ori_modifier: 0.7,
+)

assets/common/abilities/custom/birdlargebreathe/flamethrower.ron

@@ -6,9 +6,15 @@ BasicBeam(
     tick_rate: 3.0,
     range: 15.0,
     max_angle: 22.5,
-    damage_effect: None,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 10.0,
+        strength: DamageFraction(0.5),
+        chance: 0.25,
+    ))),
     energy_regen: 0,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: Flamethrower,
-)
+)

assets/common/abilities/custom/birdlargebreathe/triplestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 2.0,
             damage_kind: Slashing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Slashing,
@@ -41,6 +43,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.65,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Slashing,

assets/common/abilities/custom/birdlargefire/flamethrower.ron

@@ -6,9 +6,15 @@ BasicBeam(
     tick_rate: 3.0,
     range: 15.0,
     max_angle: 22.5,
-    damage_effect: None,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 10.0,
+        strength: DamageFraction(0.5),
+        chance: 0.25,
+    ))),
     energy_regen: 0,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: Flamethrower,
-)
+)

assets/common/abilities/custom/birdlargefire/triplestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 2.0,
             damage_kind: Slashing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Slashing,
@@ -41,6 +43,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.65,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Slashing,

assets/common/abilities/custom/claygolem/laser.ron

@@ -2,13 +2,19 @@ BasicBeam(
     buildup_duration: 0.5,
     recover_duration: 0.4,
     beam_duration: 0.25,
-    damage: 100,
+    damage: 70,
     tick_rate: 2.0,
     range: 40.0,
     max_angle: 1.0,
-    damage_effect: None,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 5.0,
+        strength: DamageFraction(0.75),
+        chance: 0.75,
+    ))),
     energy_regen: 50,
     energy_drain: 0,
     orientation_behavior: FromOri,
+    ori_rate: 0.07,
     specifier: ClayGolem,
-)
+)

assets/common/abilities/custom/claygolem/rocket.ron

@@ -1,11 +1,11 @@
 BasicRanged(
     energy_cost: 0,
-    buildup_duration: 0.5,
+    buildup_duration: 0.8,
-    recover_duration: 0.8,
+    recover_duration: 0.5,
     projectile: ClayRocket(
         damage: 500.0,
         knockback: 25.0,
-        radius: 10.0,
+        radius: 5.0,
     ),
     projectile_body: Object(ClayRocket),
     projectile_light: None,

assets/common/abilities/custom/claygolem/shockwave.ron

@@ -1,6 +1,6 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 0.6,
+    buildup_duration: 1.5,
     swing_duration: 0.12,
     recover_duration: 1.2,
     damage: 500,
@@ -9,9 +9,9 @@ Shockwave(
     shockwave_angle: 180.0,
     shockwave_vertical_angle: 90.0,
     shockwave_speed: 15.0,
-    shockwave_duration: 2.5,
+    shockwave_duration: 3.5,
     requires_ground: true,
     move_efficiency: 0.0,
     damage_kind: Crushing,
     specifier: Ground,
-)
+)

assets/common/abilities/custom/claygolem/strike.ron

@@ -1,7 +1,7 @@
 BasicMelee(
     energy_cost: 0,
     buildup_duration: 0.8,
-    swing_duration: 0.2,
+    swing_duration: 0.1,
     recover_duration: 0.5,
     base_damage: 200,
     base_poise_damage: 50,

assets/common/abilities/custom/harvester/ensnaringvines.ron

@@ -0,0 +1,8 @@
+SpriteSummon(
+    buildup_duration: 0.6,
+    cast_duration: 0.4,
+    recover_duration: 0.3,
+    sprite: EnsnaringVines,
+    summon_distance: (0, 25),
+    sparseness: 0.67,
+)

assets/common/abilities/custom/harvester/explodingpumpkin.ron

@@ -0,0 +1,15 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.5,
+    recover_duration: 0.8,
+    projectile: ExplodingPumpkin(
+        damage: 200.0,
+        knockback: 25.0,
+        radius: 5.0,
+    ),
+    projectile_body: Object(Pumpkin),
+    projectile_light: None,
+    projectile_speed: 30.0,
+    num_projectiles: 1,
+    projectile_spread: 0.0,
+)

assets/common/abilities/custom/harvester/firebreath.ron

@@ -0,0 +1,20 @@
+BasicBeam(
+    buildup_duration: 0.5,
+    recover_duration: 0.5,
+    beam_duration: 1.0,
+    damage: 40,
+    tick_rate: 1.5,
+    range: 20.0,
+    max_angle: 15.0,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 10.0,
+        strength: DamageFraction(0.5),
+        chance: 0.25,
+    ))),
+    energy_regen: 0,
+    energy_drain: 0,
+    orientation_behavior: Normal,
+    ori_rate: 0.2,
+    specifier: Flamethrower,
+)

assets/common/abilities/custom/harvester/scythe.ron

@@ -0,0 +1,13 @@
+BasicMelee(
+    energy_cost: 0,
+    buildup_duration: 0.7,
+    swing_duration: 0.1,
+    recover_duration: 0.6,
+    base_damage: 70,
+    base_poise_damage: 10,
+    knockback: ( strength: 10.0, direction: Away),
+    range: 4.0,
+    max_angle: 60.0,
+    damage_effect: None,
+    damage_kind: Slashing,
+)

assets/common/abilities/custom/husk/singlestrike.ron

@@ -2,15 +2,16 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 90,
+            base_damage: 160,
             damage_increase: 0,
             base_poise_damage: 12,
             poise_damage_increase: 0,
             knockback: 5.0,
-            range: 3.5,
+            range: 2.5,
             angle: 60.0,
             base_buildup_duration: 0.25,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.25,
             forward_movement: 0.5,
             damage_kind: Crushing,

assets/common/abilities/custom/husk/triplestrike.ron

@@ -2,45 +2,48 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 120,
+            base_damage: 160,
             damage_increase: 0,
-            base_poise_damage: 8,
+            base_poise_damage: 6,
             poise_damage_increase: 0,
-            knockback: 5.0,
+            knockback: 3.0,
-            range: 3.5,
+            range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.2,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 1.0,
             damage_kind: Crushing,
         ),
         (
             stage: 2,
-            base_damage: 120,
+            base_damage: 160,
             damage_increase: 0,
-            base_poise_damage: 10,
+            base_poise_damage: 8,
             poise_damage_increase: 0,
-            knockback: 5.0,
+            knockback: 3.0,
-            range: 3.5,
+            range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.22,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 0.0,
             damage_kind: Crushing,
         ),
         (
             stage: 3,
-            base_damage: 120,
+            base_damage: 160,
             damage_increase: 0,
-            base_poise_damage: 12,
+            base_poise_damage: 10,
             poise_damage_increase: 0,
-            knockback: 5.0,
+            knockback: 3.0,
-            range: 3.5,
+            range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.2,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 1.0,
             damage_kind: Crushing,

assets/common/abilities/custom/husk_brute/chargedmelee.ron

@@ -0,0 +1,18 @@
+ChargedMelee(
+    energy_cost: 0,
+    energy_drain: 0,
+    initial_damage: 50,
+    scaled_damage: 450,
+    initial_poise_damage: 50,
+    scaled_poise_damage: 150,
+    initial_knockback: 0.0,
+    scaled_knockback: 0.0,
+    range: 3.5,
+    max_angle: 45.0,
+    speed: 1.0,
+    charge_duration: 1.5,
+    swing_duration: 0.1,
+    hit_timing: 0.8,
+    recover_duration: 0.5,
+    damage_kind: Crushing,
+)

assets/common/abilities/custom/husk_brute/singlestrike.ron

@@ -0,0 +1,28 @@
+ComboMelee(
+    stage_data: [
+        (
+            stage: 1,
+            base_damage: 160,
+            damage_increase: 0,
+            base_poise_damage: 12,
+            poise_damage_increase: 0,
+            knockback: 5.0,
+            range: 3.5,
+            angle: 60.0,
+            base_buildup_duration: 0.25,
+            base_swing_duration: 0.07,
+            hit_timing: 0.5,
+            base_recover_duration: 0.25,
+            forward_movement: 0.5,
+            damage_kind: Crushing,
+        ),
+    ],
+    initial_energy_gain: 0,
+    max_energy_gain: 0,
+    energy_increase: 0,
+    speed_increase: 0.0,
+    max_speed_increase: 0.0,
+    scales_from_combo: 0,
+    is_interruptible: false,
+    ori_modifier: 0.6,
+)

assets/common/abilities/custom/maneater/poisonball.ron

@@ -0,0 +1,18 @@
+BasicRanged(
+    energy_cost: 0,
+    buildup_duration: 0.8,
+    recover_duration: 0.35,
+    projectile: NecroticSphere(
+        damage: 260.0,
+        radius: 5.0,
+        energy_regen: 0,
+    ),
+    projectile_body: Object(FireworkPurple),
+    /*projectile_light: Some(LightEmitter {
+        col: (1.0, 0.75, 0.11).into(),
+        ..Default::default()
+    }),*/
+    projectile_speed: 70.0,
+    num_projectiles: 3,
+    projectile_spread: 0.2,
+)

assets/common/abilities/custom/maneater/singlestrike.ron

@@ -2,17 +2,18 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 130,
+            base_damage: 200,
             damage_increase: 0,
             base_poise_damage: 28,
             poise_damage_increase: 0,
             knockback: 3.0,
-            range: 3.0,
+            range: 3.5,
             angle: 60.0,
-            base_buildup_duration: 0.4,
+            base_buildup_duration: 0.5,
-            base_swing_duration: 0.07,
+            base_swing_duration: 0.075,
-            base_recover_duration: 0.4,
+            hit_timing: 0.5,
-            forward_movement: 3.0,
+            base_recover_duration: 0.2,
+            forward_movement: 2.0,
             damage_kind: Crushing,
         ),
     ],
@@ -23,5 +24,5 @@ ComboMelee(
     max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
-    ori_modifier: 0.6,
+    ori_modifier: 0.65,
 )

assets/common/abilities/custom/mindflayer/cursedflames.ron

@@ -15,5 +15,6 @@ BasicBeam(
     energy_regen: 0,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: Cultist,
-)
+)

assets/common/abilities/custom/mindflayer/necroticsphere.ron

@@ -3,7 +3,7 @@ BasicRanged(
     buildup_duration: 0.75,
     recover_duration: 0.4,
     projectile: NecroticSphere(
-        damage: 300.0,
+        damage: 450.0,
         radius: 5.0,
     ),
     projectile_body: Object(FireworkPurple),

assets/common/abilities/custom/mindflayer/necroticvortex.ron

@@ -1,12 +1,12 @@
 SpinMelee(
-    buildup_duration: 0.5,
+    buildup_duration: 0.8,
     swing_duration: 0.2,
     recover_duration: 0.6,
     base_damage: 80.0,
     base_poise_damage: 1.0,
     knockback: ( strength: 7.0, direction: Towards),
     range: 16.0,
-    damage_effect: Some(Lifesteal(1.0)),
+    damage_effect: Some(Lifesteal(2.0)),
     energy_cost: 0.0,
     is_infinite: true,
     movement_behavior: Stationary,

assets/common/abilities/custom/mindflayer/summonminions.ron

@@ -3,14 +3,16 @@ BasicSummon(
     cast_duration: 1.0,
     recover_duration: 0.5,
     summon_amount: 6,
+    summon_distance: (3, 3),
     summon_info: (
         body: BipedSmall((
             species: Husk,
             body_type: Male,
         )),
         scale: None,
-        health_scaling: 80,
+        health_scaling: Some(80),
-        loadout_config: Some(Husk),
+        loadout_config: Some(HuskSummon),
         skillset_config: None,
     ),
-)
+    duration: None,
+)

assets/common/abilities/custom/minotaur/cleave.ron

@@ -1,8 +1,8 @@
 ChargedMelee(
     energy_cost: 0,
     energy_drain: 0,
-    initial_damage: 0,
+    initial_damage: 50,
-    scaled_damage: 500,
+    scaled_damage: 450,
     initial_poise_damage: 50,
     scaled_poise_damage: 150,
     initial_knockback: 0.0,

assets/common/abilities/custom/quadlowbasic/singlestrike.ron

@@ -2,15 +2,16 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 100,
+            base_damage: 200,
             damage_increase: 0,
             base_poise_damage: 28,
             poise_damage_increase: 0,
             knockback: 3.0,
             range: 2.0,
             angle: 60.0,
-            base_buildup_duration: 0.4,
+            base_buildup_duration: 0.6,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.4,
             forward_movement: 3.0,
             damage_kind: Crushing,

assets/common/abilities/custom/quadlowbasic/triplestrike.ron

@@ -2,45 +2,48 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 80,
+            base_damage: 140,
             damage_increase: 0,
             base_poise_damage: 15,
             poise_damage_increase: 0,
-            knockback: 7.0,
+            knockback: 3.0,
             range: 2.2,
             angle: 30.0,
             base_buildup_duration: 0.65,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 2.0,
             damage_kind: Crushing,
         ),
         (
             stage: 2,
-            base_damage: 80,
+            base_damage: 140,
             damage_increase: 0,
             base_poise_damage: 18,
             poise_damage_increase: 0,
-            knockback: 7.0,
+            knockback: 3.0,
             range: 2.2,
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Crushing,
         ),
         (
             stage: 3,
-            base_damage: 80,
+            base_damage: 140,
             damage_increase: 0,
             base_poise_damage: 20,
             poise_damage_increase: 0,
-            knockback: 7.0,
+            knockback: 3.0,
             range: 2.2,
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Crushing,

assets/common/abilities/custom/quadlowbeam/healingbeam.ron

@@ -10,5 +10,6 @@ BasicBeam(
     energy_regen: 25,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: HealingBeam,
-)
+)

assets/common/abilities/custom/quadlowbreathe/dash.ron

@@ -1,7 +1,7 @@
 DashMelee(
     energy_cost: 0,
-    base_damage: 50,
+    base_damage: 80,
-    scaled_damage: 100,
+    scaled_damage: 150,
     base_poise_damage: 25,
     scaled_poise_damage: 0,
     base_knockback: 4.0,
@@ -13,7 +13,7 @@ DashMelee(
     buildup_duration: 0.5,
     charge_duration: 1.0,
     swing_duration: 0.1,
-    recover_duration: 0.8,
+    recover_duration: 1.0,
     charge_through: true,
     is_interruptible: false,
     damage_kind: Crushing,

assets/common/abilities/custom/quadlowbreathe/flamethrower.ron

@@ -2,13 +2,19 @@ BasicBeam(
     buildup_duration: 0.4,
     recover_duration: 0.25,
     beam_duration: 0.5,
-    damage: 40,
+    damage: 70,
     tick_rate: 3.0,
     range: 15.0,
     max_angle: 22.5,
-    damage_effect: None,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 10.0,
+        strength: DamageFraction(0.5),
+        chance: 0.25,
+    ))),
     energy_regen: 0,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: Flamethrower,
-)
+)

assets/common/abilities/custom/quadlowbreathe/triplestrike.ron

@@ -2,45 +2,48 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 75,
+            base_damage: 220,
             damage_increase: 0,
-            base_poise_damage: 0,
+            base_poise_damage: 20,
             poise_damage_increase: 0,
-            knockback: 10.0,
+            knockback: 3.0,
             range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.65,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 2.0,
             damage_kind: Crushing,
         ),
         (
             stage: 2,
-            base_damage: 75,
+            base_damage: 220,
             damage_increase: 0,
-            base_poise_damage: 0,
+            base_poise_damage: 20,
             poise_damage_increase: 0,
-            knockback: 10.0,
+            knockback: 3.0,
             range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Crushing,
         ),
         (
             stage: 3,
-            base_damage: 75,
+            base_damage: 220,
             damage_increase: 0,
-            base_poise_damage: 0,
+            base_poise_damage: 20,
             poise_damage_increase: 0,
-            knockback: 10.0,
+            knockback: 3.0,
             range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Crushing,

assets/common/abilities/custom/quadlowquick/dash.ron

@@ -13,7 +13,7 @@ DashMelee(
     buildup_duration: 0.5,
     charge_duration: 0.8,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 1.0,
     charge_through: true,
     is_interruptible: false,
     damage_kind: Crushing,

assets/common/abilities/custom/quadlowquick/quadstrike.ron

@@ -6,11 +6,12 @@ ComboMelee(
             damage_increase: 0,
             base_poise_damage: 15,
             poise_damage_increase: 0,
-            knockback: 2.0,
+            knockback: 1.0,
             range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.6,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.1,
             forward_movement: 1.5,
             damage_kind: Crushing,
@@ -21,11 +22,12 @@ ComboMelee(
             damage_increase: 0,
             base_poise_damage: 15,
             poise_damage_increase: 0,
-            knockback: 2.0,
+            knockback: 1.0,
             range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.15,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.1,
             forward_movement: 0.8,
             damage_kind: Crushing,
@@ -36,11 +38,12 @@ ComboMelee(
             damage_increase: 0,
             base_poise_damage: 15,
             poise_damage_increase: 0,
-            knockback: 2.0,
+            knockback: 1.0,
             range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.2,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.1,
             forward_movement: 0.8,
             damage_kind: Crushing,
@@ -56,6 +59,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.2,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.1,
             forward_movement: 0.8,
             damage_kind: Crushing,

assets/common/abilities/custom/quadlowranged/firebomb.ron

@@ -2,12 +2,12 @@ BasicRanged(
     energy_cost: 0,
     buildup_duration: 0.8,
     recover_duration: 0.35,
-    projectile: Fireball(
+    projectile: NecroticSphere(
-        damage: 80.0,
+        damage: 130.0,
         radius: 5.0,
         energy_regen: 0,
     ),
-    projectile_body: Object(BoltFire),
+    projectile_body: Object(FireworkPurple),
     /*projectile_light: Some(LightEmitter {
         col: (1.0, 0.75, 0.11).into(),
         ..Default::default()

assets/common/abilities/custom/quadlowtail/charged.ron

@@ -13,6 +13,6 @@ ChargedMelee(
     charge_duration: 0.8,
     swing_duration: 0.7,
     hit_timing: 0.9,
-    recover_duration: 1.2,
+    recover_duration: 0.7,
     damage_kind: Crushing,
 )

assets/common/abilities/custom/quadlowtail/triplestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.65,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 2.0,
             damage_kind: Crushing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.2,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 1.0,
             damage_kind: Crushing,
@@ -41,6 +43,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.2,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 1.0,
             damage_kind: Crushing,

assets/common/abilities/custom/quadmedbasic/singlestrike.ron

@@ -6,11 +6,12 @@ ComboMelee(
             damage_increase: 0,
             base_poise_damage: 28,
             poise_damage_increase: 0,
-            knockback: 5.0,
+            knockback: 3.0,
             range: 2.7,
             angle: 60.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.4,
             forward_movement: 1.0,
             damage_kind: Crushing,

assets/common/abilities/custom/quadmedbasic/triplestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.45,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 1.0,
             damage_kind: Crushing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 0.0,
             damage_kind: Crushing,
@@ -41,6 +43,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.07,
+            hit_timing: 0.5,
             base_recover_duration: 0.2,
             forward_movement: 1.0,
             damage_kind: Crushing,

assets/common/abilities/custom/quadmedcharge/doublestrike.ron

@@ -6,11 +6,12 @@ ComboMelee(
             damage_increase: 0,
             base_poise_damage: 22,
             poise_damage_increase: 0,
-            knockback: 10.0,
+            knockback: 4.0,
             range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.65,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.0,
             damage_kind: Crushing,
@@ -21,11 +22,12 @@ ComboMelee(
             damage_increase: 0,
             base_poise_damage: 0,
             poise_damage_increase: 22,
-            knockback: 10.0,
+            knockback: 4.0,
             range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 0.5,
             damage_kind: Crushing,

assets/common/abilities/custom/quadmedhoof/basic.ron

@@ -1,12 +1,12 @@
 BasicMelee(
     energy_cost: 0,
-    buildup_duration: 0.45,
+    buildup_duration: 0.65,
-    swing_duration: 0.5,
+    swing_duration: 0.3,
     recover_duration: 0.35,
     base_damage: 100,
     base_poise_damage: 28,
     knockback: ( strength: 25.0, direction: Away),
-    range: 1.2,
+    range: 0.8,
     max_angle: 50.0,
     damage_effect: None,
     damage_kind: Crushing,

assets/common/abilities/custom/quadmedjump/doublestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.65,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.0,
             damage_kind: Crushing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.5,
             damage_kind: Crushing,

assets/common/abilities/custom/quadmedquick/dash.ron

@@ -13,7 +13,7 @@ DashMelee(
     buildup_duration: 1.2,
     charge_duration: 1.0,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 1.0,
     charge_through: true,
     is_interruptible: false,
     damage_kind: Crushing,

assets/common/abilities/custom/quadmedquick/triplestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 40.0,
             base_buildup_duration: 0.6,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.4,
             forward_movement: 0.3,
             damage_kind: Crushing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 40.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 0.5,
             damage_kind: Crushing,
@@ -41,6 +43,7 @@ ComboMelee(
             angle: 40.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 0.5,
             damage_kind: Crushing,

assets/common/abilities/custom/quadsmallbasic/singlestrike.ron

@@ -6,11 +6,12 @@ ComboMelee(
             damage_increase: 0,
             base_poise_damage: 10,
             poise_damage_increase: 0,
-            knockback: 3.0,
+            knockback: 1.0,
             range: 1.5,
             angle: 50.0,
             base_buildup_duration: 0.3,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.0,
             damage_kind: Crushing,

assets/common/abilities/custom/stonegolemfist/singlestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 60.0,
             base_buildup_duration: 0.9,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.9,
             forward_movement: 3.0,
             damage_kind: Crushing,

assets/common/abilities/custom/theropodbasic/singlestrike.ron

@@ -2,15 +2,16 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 130,
+            base_damage: 270,
             damage_increase: 0,
             base_poise_damage: 40,
             poise_damage_increase: 0,
             knockback: 4.0,
             range: 7.5,
             angle: 60.0,
-            base_buildup_duration: 0.5,
+            base_buildup_duration: 0.4,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.4,
             forward_movement: 3.0,
             damage_kind: Crushing,

assets/common/abilities/custom/theropodbasic/triplestrike.ron

@@ -2,45 +2,48 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 140,
+            base_damage: 300,
             damage_increase: 0,
             base_poise_damage: 35,
             poise_damage_increase: 0,
-            knockback: 5.0,
+            knockback: 3.0,
             range: 7.5,
             angle: 30.0,
-            base_buildup_duration: 0.9,
+            base_buildup_duration: 0.7,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.0,
             damage_kind: Crushing,
         ),
         (
             stage: 2,
-            base_damage: 160,
+            base_damage: 340,
             damage_increase: 0,
             base_poise_damage: 35,
             poise_damage_increase: 0,
-            knockback: 5.0,
+            knockback: 3.0,
             range: 5.5,
             angle: 30.0,
-            base_buildup_duration: 0.5,
+            base_buildup_duration: 0.4,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.15,
             forward_movement: 1.0,
             damage_kind: Crushing,
         ),
         (
             stage: 3,
-            base_damage: 200,
+            base_damage: 400,
             damage_increase: 0,
             base_poise_damage: 35,
             poise_damage_increase: 0,
-            knockback: 5.0,
+            knockback: 25.0,
             range: 5.5,
             angle: 30.0,
-            base_buildup_duration: 0.35,
+            base_buildup_duration: 0.3,
             base_swing_duration: 0.125,
+            hit_timing: 0.5,
             base_recover_duration: 0.9,
             forward_movement: 1.0,
             damage_kind: Crushing,

assets/common/abilities/custom/theropodbird/singlestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 15.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.4,
             forward_movement: 3.0,
             damage_kind: Crushing,

assets/common/abilities/custom/theropodbird/triplestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 15.0,
             base_buildup_duration: 0.65,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 1.0,
             damage_kind: Crushing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 15.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.15,
+            hit_timing: 0.5,
             base_recover_duration: 0.15,
             forward_movement: 1.0,
             damage_kind: Crushing,
@@ -41,6 +43,7 @@ ComboMelee(
             angle: 15.0,
             base_buildup_duration: 0.35,
             base_swing_duration: 0.125,
+            hit_timing: 0.5,
             base_recover_duration: 0.9,
             forward_movement: 1.0,
             damage_kind: Crushing,

assets/common/abilities/custom/tidalwarrior/bubbles.ron

@@ -2,18 +2,19 @@ BasicBeam(
     buildup_duration: 0.5,
     recover_duration: 0.5,
     beam_duration: 2.5,
-    damage: 100,
+    damage: 50,
     tick_rate: 2.0,
     range: 25.0,
     max_angle: 15.0,
     damage_effect: Some(Buff((
         kind: Wet,
-        dur_secs: 15.0,
+        dur_secs: 5.0,
-        strength: Value(4.5),
+        strength: Value(2.5),
         chance: 1.0,
     ))),
     energy_regen: 0,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: Bubbles,
 )

assets/common/abilities/custom/tidalwarrior/totem.ron

@@ -3,11 +3,13 @@ BasicSummon(
     cast_duration: 1.0,
     recover_duration: 0.5,
     summon_amount: 1,
+    summon_distance: (1, 1),
     summon_info: (
         body: Object(SeaLantern),
         scale: None,
-        health_scaling: 0,
+        health_scaling: Some(0),
         loadout_config: None,
         skillset_config: None,
     ),
-)
+    duration: None,
+)

assets/common/abilities/custom/tidalwarrior/totem_wave.ron

@@ -1,11 +1,11 @@
 Shockwave(
     energy_cost: 0,
-    buildup_duration: 1.4,
+    buildup_duration: 0.4,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 3.5,
     damage: 10,
     poise_damage: 0,
-    knockback: ( strength: 100.0, direction: Up),
+    knockback: ( strength: 25.0, direction: Away),
     shockwave_angle: 360.0,
     shockwave_vertical_angle: 30.0,
     shockwave_speed: 10.0,

assets/common/abilities/custom/tornado/spin.ron

@@ -0,0 +1,19 @@
+SpinMelee(
+    buildup_duration: 0.0,
+    swing_duration: 0.5,
+    recover_duration: 0.0,
+    base_damage: 400,
+    base_poise_damage: 0,
+    knockback: ( strength: 50.0, direction: Away),
+    range: 3.5,
+    damage_effect: None,
+    energy_cost: 0,
+    is_infinite: true,
+    movement_behavior: ForwardGround,
+    is_interruptible: false,
+    forward_speed: 0.0,
+    num_spins: 1,
+    specifier: None,
+    target: Some(OutOfGroup),
+    damage_kind: Slashing,
+)

assets/common/abilities/custom/turret/flamethrower.ron

@@ -15,5 +15,6 @@ BasicBeam(
     energy_regen: 0,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.3,
     specifier: Flamethrower,
-)
+)

assets/common/abilities/custom/wendigomagic/frostbomb.ron

@@ -3,7 +3,7 @@ BasicRanged(
     buildup_duration: 0.5,
     recover_duration: 0.35,
     projectile: Frostball(
-        damage: 80.0,
+        damage: 120.0,
         radius: 5.0,
     ),
     projectile_body: Object(BoltFire), // TODO: Get ice projectile model

assets/common/abilities/custom/wendigomagic/singlestrike.ron

@@ -2,15 +2,16 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 120,
+            base_damage: 180,
             damage_increase: 0,
             base_poise_damage: 40,
             poise_damage_increase: 0,
             knockback: 3.0,
-            range: 3.5,
+            range: 2.5,
             angle: 30.0,
             base_buildup_duration: 0.6,
             base_swing_duration: 0.2,
+            hit_timing: 0.5,
             base_recover_duration: 0.4,
             forward_movement: 5.0,
             damage_kind: Crushing,

assets/common/abilities/custom/yeti/frostbreath.ron

@@ -15,5 +15,6 @@ BasicBeam(
     energy_regen: 0,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: Frost,
-)
+)

assets/common/abilities/hammer/singlestrike.ron

@@ -3,13 +3,14 @@ ComboMelee(
         stage: 1,
         base_damage: 150,
         damage_increase: 10,
-        base_poise_damage: 25,
+        base_poise_damage: 20,
         poise_damage_increase: 0,
-        knockback: 5.0,
+        knockback: 3.5,
         range: 4.5,
         angle: 50.0,
         base_buildup_duration: 0.2,
         base_swing_duration: 0.1,
+        hit_timing: 0.5,
         base_recover_duration: 0.45,
         forward_movement: 0.0,
         damage_kind: Crushing,

assets/common/abilities/hammersimple/doublestrike.ron

@@ -2,30 +2,32 @@ ComboMelee(
     stage_data: [
         (
             stage: 1,
-            base_damage: 90,
+            base_damage: 240,
             damage_increase: 10,
-            base_poise_damage: 30,
+            base_poise_damage: 40,
             poise_damage_increase: 0,
             knockback: 4.0,
-            range: 3.5,
+            range: 4.5,
             angle: 50.0,
             base_buildup_duration: 0.6,
             base_swing_duration: 0.08,
+            hit_timing: 0.5,
             base_recover_duration: 0.6,
             forward_movement: 3.5,
             damage_kind: Crushing,
         ),
         (
             stage: 2,
-            base_damage: 130,
+            base_damage: 320,
             damage_increase: 15,
-            base_poise_damage: 30,
+            base_poise_damage: 40,
             poise_damage_increase: 0,
             knockback: 16.0,
-            range: 1.5,
+            range: 2.5,
             angle: 30.0,
-            base_buildup_duration: 0.5,
+            base_buildup_duration: 0.6,
             base_swing_duration: 0.25,
+            hit_timing: 0.5,
             base_recover_duration: 1.2,
             forward_movement: 2.0,
             damage_kind: Crushing,
@@ -38,5 +40,5 @@ ComboMelee(
     max_speed_increase: 0.0,
     scales_from_combo: 0,
     is_interruptible: false,
-    ori_modifier: 0.6,
+    ori_modifier: 0.65,
 )

assets/common/abilities/sceptre/lifestealbeam.ron

@@ -10,5 +10,6 @@ BasicBeam(
     energy_regen: 50,
     energy_drain: 0,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: LifestealBeam
-)
+)

assets/common/abilities/spear/dash.ron

@@ -1,9 +1,9 @@
 DashMelee(
     energy_cost: 100,
-    base_damage: 60,
+    base_damage: 10,
-    scaled_damage: 100,
+    scaled_damage: 80,
-    base_poise_damage: 45,
+    base_poise_damage: 0,
-    scaled_poise_damage: 0,
+    scaled_poise_damage: 25,
     base_knockback: 8.0,
     scaled_knockback: 7.0,
     range: 3.0,
@@ -13,7 +13,7 @@ DashMelee(
     buildup_duration: 0.5,
     charge_duration: 1.0,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 0.8,
     charge_through: true,
     is_interruptible: true,
     damage_kind: Piercing,

assets/common/abilities/spear/doublestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 15.0,
             base_buildup_duration: 0.35,
             base_swing_duration: 0.075,
+            hit_timing: 0.5,
             base_recover_duration: 0.4,
             forward_movement: 0.7,
             damage_kind: Piercing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 15.0,
             base_buildup_duration: 0.5,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.5,
             forward_movement: 0.7,
             damage_kind: Piercing,

assets/common/abilities/staff/firebomb.ron

@@ -5,7 +5,7 @@ BasicRanged(
     projectile: Fireball(
         damage: 90.0,
         radius: 4.0,
-        energy_regen: 50,
+        energy_regen: 60,
     ),
     projectile_body: Object(BoltFire),
     projectile_speed: 60.0,

assets/common/abilities/staff/flamethrower.ron

@@ -15,5 +15,6 @@ BasicBeam(
     energy_regen: 0,
     energy_drain: 350,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: Flamethrower,
-)
+)

assets/common/abilities/staffsimple/flamethrower.ron

@@ -6,9 +6,15 @@ BasicBeam(
     tick_rate: 3.0,
     range: 20.0,
     max_angle: 15.0,
-    damage_effect: None,
+    damage_effect: Some(Buff((
+        kind: Burning,
+        dur_secs: 10.0,
+        strength: DamageFraction(0.5),
+        chance: 0.25,
+    ))),
     energy_regen: 0,
     energy_drain: 350,
     orientation_behavior: Normal,
+    ori_rate: 0.6,
     specifier: Flamethrower,
 )

assets/common/abilities/sword/spin.ron

@@ -3,7 +3,7 @@ SpinMelee(
     swing_duration: 0.4,
     recover_duration: 0.5,
     base_damage: 160,
-    base_poise_damage: 25,
+    base_poise_damage: 13,
     knockback: ( strength: 10.0, direction: Away),
     range: 3.5,
     damage_effect: None,

assets/common/abilities/sword/triplestrike.ron

@@ -6,11 +6,12 @@ ComboMelee(
             damage_increase: 10,
             base_poise_damage: 10,
             poise_damage_increase: 0,
-            knockback: 1.0,
+            knockback: 0.0,
             range: 4.0,
             angle: 30.0,
-            base_buildup_duration: 0.15,
+            base_buildup_duration: 0.1,
             base_swing_duration: 0.075,
+            hit_timing: 0.5,
             base_recover_duration: 0.15,
             forward_movement: 0.5,
             damage_kind: Slashing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 40.0,
             base_buildup_duration: 0.1,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.3,
             forward_movement: 0.0,
             damage_kind: Slashing,
@@ -36,11 +38,12 @@ ComboMelee(
             damage_increase: 20,
             base_poise_damage: 15,
             poise_damage_increase: 0,
-            knockback: 4.0,
+            knockback: 2.0,
             range: 6.0,
             angle: 10.0,
             base_buildup_duration: 0.15,
             base_swing_duration: 0.1,
+            hit_timing: 0.2,
             base_recover_duration: 0.35,
             forward_movement: 1.2,
             damage_kind: Piercing,

assets/common/abilities/swordsimple/doublestrike.ron

@@ -11,6 +11,7 @@ ComboMelee(
             angle: 50.0,
             base_buildup_duration: 0.4,
             base_swing_duration: 0.08,
+            hit_timing: 0.5,
             base_recover_duration: 0.5,
             forward_movement: 2.5,
             damage_kind: Slashing,
@@ -26,6 +27,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.7,
             base_swing_duration: 0.1,
+            hit_timing: 0.5,
             base_recover_duration: 0.7,
             forward_movement: 2.0,
             damage_kind: Slashing,

assets/common/cave_scatter/dark_floor.ron

@@ -1,10 +1,11 @@
 [
-    (20, Velorite),
+    (50, Velorite),
-    (30, VeloriteFrag),
+    (60, VeloriteFrag),
-    (5, CaveMushroom),
+    (40, CaveMushroom),
     (16, SapphireSmall),
     (12, EmeraldSmall),
     (15, Cobalt),
+    (30, Bloodstone),
     (40, Coal),
     (10, RubySmall),
 ]

assets/common/cave_scatter/deep_floor.ron

@@ -1,14 +1,14 @@
 [
-    (30, Velorite),
+    (40, Velorite),
     (40, VeloriteFrag),
-    (10, CaveMushroom),
+    (30, CaveMushroom),
     (30, Mushroom),
-    (10, AmethystSmall),
+    (30, AmethystSmall),
-    (10, TopazSmall),
+    (30, TopazSmall),
     (16, SapphireSmall),
-    (60, CrystalLow),
+    (100, CrystalLow),
     (12, EmeraldSmall),
-    (5, Cobalt),
+    (15, Cobalt),
     (40, Coal),
     (70, Iron),
     (10, RubySmall),

assets/common/cave_scatter/shallow_floor.ron

@@ -1,10 +1,10 @@
 [
     (110, Stones),
-    (150, ShortGrass),
+    (250, ShortGrass),
     (50, CaveMushroom),
     (50, Mushroom),
-    (30, AmethystSmall),
+    (5, AmethystSmall),
-    (15, TopazSmall),
+    (5, TopazSmall),
     (15, Tin),
     (12, Copper),
     (15, Iron),

assets/common/entity/dungeon/fallback/boss.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Crazy Sheep"),
+    body: Some(RandomWith("sheep")),
+
+    loot: Some(LootTable("common.loot_tables.fallback")),
+
+    main_tool: None,
+    second_tool: None,
+
+    loadout_asset: None,
+    skillset_asset: None,
+)

assets/common/entity/dungeon/fallback/enemy.ron

@@ -0,0 +1,20 @@
+EntityConfig (
+    name: Some("Yan Hus"),
+    body: Some(RandomWith("humanoid")),
+
+    loot: Some(LootTable("common.loot_tables.fallback")),
+
+    main_tool: Some(Choice([
+        (1.0, Some(Item("common.items.weapons.tool.broom"))),
+        (1.0, Some(Item("common.items.weapons.tool.hoe"))),
+        (1.0, Some(Item("common.items.weapons.tool.pickaxe"))),
+        (1.0, Some(Item("common.items.weapons.tool.rake"))),
+        (1.0, Some(Item("common.items.weapons.tool.shovel-0"))),
+        (1.0, Some(Item("common.items.weapons.tool.shovel-1"))),
+        (1.0, Some(Item("common.items.weapons.bow.bone-1"))),
+    ])),
+    second_tool: None,
+
+    loadout_asset: None,
+    skillset_asset: None,
+)

assets/common/entity/dungeon/fallback/miniboss.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Big Goose"),
+    body: Some(RandomWith("goose")),
+
+    loot: Some(LootTable("common.loot_tables.fallback")),
+
+    main_tool: None,
+    second_tool: None,
+
+    loadout_asset: None,
+    skillset_asset: None,
+)

assets/common/entity/dungeon/tier-0/boss.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Harvester"),
+    body: Some(RandomWith("harvester")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.boss")),
+
+    main_tool: None,
+    second_tool: None,
+
+    loadout_asset: None,
+    skillset_asset: None,
+)

assets/common/entity/dungeon/tier-0/bow.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Gnarling Stalker"),
+    body: Some(RandomWith("gnarling")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.enemy")),
+
+    main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.adlet_bow")),
+    second_tool: None,
+
+    loadout_asset: Some("common.loadout.dungeon.tier-0.gnarling"),
+    skillset_asset: Some("common.skillset.dungeon.tier-0.bow"),
+)

assets/common/entity/dungeon/tier-0/miniboss.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Deadwood"),
+    body: Some(RandomWith("deadwood")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.miniboss")),
+
+    main_tool: None,
+    second_tool: None,
+
+    loadout_asset: None,
+    skillset_asset: None,
+)

assets/common/entity/dungeon/tier-0/spear.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Gnarling Mugger"),
+    body: Some(RandomWith("gnarling")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.enemy")),
+
+    main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.wooden_spear")),
+    second_tool: None,
+
+    loadout_asset: Some("common.loadout.dungeon.tier-0.gnarling"),
+    skillset_asset: None,
+)

assets/common/entity/dungeon/tier-0/staff.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Gnarling Shaman"),
+    body: Some(RandomWith("gnarling")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-0.enemy")),
+
+    main_tool: Some(Item("common.items.npc_weapons.biped_small.gnarling.gnoll_staff")),
+    second_tool: None,
+
+    loadout_asset: Some("common.loadout.dungeon.tier-0.gnarling"),
+    skillset_asset: None,
+)

assets/common/entity/dungeon/tier-1/boss.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Yeti"),
+    body: Some(RandomWith("yeti")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-1.boss")),
+
+    main_tool: None,
+    second_tool: None,
+
+    loadout_asset: None,
+    skillset_asset: None,
+)

assets/common/entity/dungeon/tier-1/bow.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Adlet Tracker"),
+    body: Some(RandomWith("adlet")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-1.enemy")),
+
+    main_tool: Some(Item("common.items.npc_weapons.biped_small.adlet.adlet_bow")),
+    second_tool: None,
+
+    loadout_asset: Some("common.loadout.dungeon.tier-1.adlet_bow"),
+    skillset_asset: Some("common.skillset.dungeon.tier-1.bow"),
+)

assets/common/entity/dungeon/tier-1/rat.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Rat"),
+    body: Some(RandomWith("rat")),
+
+    loot: Some(LootTable("common.loot_tables.creature.quad_small.generic")),
+
+    main_tool: None,
+    second_tool: None,
+
+    loadout_asset: None,
+    skillset_asset: None,
+)

assets/common/entity/dungeon/tier-1/spear.ron

@@ -0,0 +1,12 @@
+EntityConfig (
+    name: Some("Adlet Hunter"),
+    body: Some(RandomWith("adlet")),
+
+    loot: Some(LootTable("common.loot_tables.dungeon.tier-1.enemy")),
+
+    main_tool: Some(Item("common.items.npc_weapons.biped_small.adlet.wooden_spear")),
+    second_tool: None,
+
+    loadout_asset: Some("common.loadout.dungeon.tier-1.adlet_spear"),
+    skillset_asset: None,
+)