mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge remote-tracking branch 'origin/master' into sharp/zoomy-worldgen
This commit is contained in:
Joshua Yanovski
commit
6eb26ba6d8
@ -11,13 +11,14 @@ csv-import = "run --manifest-path common/Cargo.toml --features=bin_csv --bin csv
|
|||||||
# server-cli
|
# server-cli
|
||||||
server = "run --bin veloren-server-cli"
|
server = "run --bin veloren-server-cli"
|
||||||
test-server = "run --bin veloren-server-cli --no-default-features --features simd"
|
test-server = "run --bin veloren-server-cli --no-default-features --features simd"
|
||||||
tracy-server = "run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow"
|
tracy-server = "run --bin veloren-server-cli --features tracy,simd --profile no_overflow"
|
||||||
tracy-world-server = "run --bin veloren-server-cli --features tracy,simd --profile no_overflow"
|
tracy-server-debuginfo = "run --bin veloren-server-cli --features tracy,simd --profile no_overflow_debuginfo"
|
||||||
tracy-world-server-debuginfo = "run --bin veloren-server-cli --features tracy,simd --profile no_overflow_debuginfo"
|
tracy-server-releasedebuginfo = "run --bin veloren-server-cli --features tracy,simd --profile releasedebuginfo"
|
||||||
tracy-world-server-releasedebuginfo = "run --bin veloren-server-cli --features tracy,simd --profile releasedebuginfo"
|
tracy-test-server = "run --bin veloren-server-cli --no-default-features --features tracy,simd --profile no_overflow"
|
||||||
# voxygen
|
# voxygen
|
||||||
test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui,shaderc-from-source"
|
test-voxygen = "run --bin veloren-voxygen --no-default-features --features simd,egui-ui,shaderc-from-source"
|
||||||
tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui,shaderc-from-source --profile no_overflow"
|
tracy-voxygen = "run --bin veloren-voxygen --no-default-features --features tracy,simd,egui-ui,shaderc-from-source --profile no_overflow"
|
||||||
dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo"
|
dbg-voxygen = "run --bin veloren-voxygen --profile debuginfo"
|
||||||
# misc
|
# misc
|
||||||
swarm = "run --bin swarm --features client/bin_bot,client/tick_network --"
|
swarm = "run --bin swarm --features client/bin_bot,client/tick_network --"
|
||||||
|
ci-clippy = "clippy --all-targets --locked --features=bin_cmd_doc_gen,bin_compression,bin_csv,bin_graphviz,bin_bot,bin_asset_migrate,asset_tweak"
|
||||||
|
|||||||
36
CHANGELOG.md
36
CHANGELOG.md
@ -8,14 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
- Chat commands to mute and unmute players
|
||||||
- Waypoints saved between sessions and shared with group members.
|
- Waypoints saved between sessions and shared with group members.
|
||||||
- New rocks
|
- New rocks
|
||||||
- Weapon trails
|
- Weapon trails
|
||||||
- Hostile agent will now abort pursuing their target based on multiple metrics
|
- Hostile agent will now abort pursuing their target based on multiple metrics
|
||||||
- Admin command to reload all chunks on the server
|
- Admin command to reload all chunks on the server
|
||||||
- Furniture and waypoints in site2 towns
|
- Furniture and waypoints in site2 towns
|
||||||
- text input for trading
|
- Text input for trading
|
||||||
- Themed Site CliffTown, hoodoo/arabic inspired stone structures inhabited by mountaineer NPCs.
|
- Themed Site CliffTown, hoodoo/arabic inspired stone structures inhabited by mountaineer NPCs.
|
||||||
- NPCs now have rudimentary personalities
|
- NPCs now have rudimentary personalities
|
||||||
- Added Belarusian translation
|
- Added Belarusian translation
|
||||||
@ -24,6 +24,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Add stealth stat on Bag UI
|
- Add stealth stat on Bag UI
|
||||||
- Water caves
|
- Water caves
|
||||||
- Modular weapons
|
- Modular weapons
|
||||||
|
- Added Thai translation
|
||||||
|
- Skiing and ice skating
|
||||||
|
- Added loot ownership for NPC drops
|
||||||
|
- Bamboo collectibles now spawn near rivers
|
||||||
|
- Chest sprites can longer be exploded
|
||||||
|
- Smoke varies by temperature, humidity, time of day and house
|
||||||
|
- Added loot ownership for drops from mining
|
||||||
|
- Added an option for experience number accumulation.
|
||||||
|
- Added an option for damage number rounding (when greater than or equal to 1.0).
|
||||||
|
- Added sliders for incoming/non-incoming damage accumulation duration.
|
||||||
|
- New ambience sounds
|
||||||
|
- Slider for ambience volume
|
||||||
|
- Weather generated on server is sent to clients, and seen on clients as rain/clouds.
|
||||||
|
- Updated Brazilian Portuguese Translation
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
@ -33,8 +47,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Enable new giant trees, changed what entities spawn at them
|
- Enable new giant trees, changed what entities spawn at them
|
||||||
- Stealth is now shown as a percentage in Stats Diary UI
|
- Stealth is now shown as a percentage in Stats Diary UI
|
||||||
- Stealth effects from sneaking and armor are evaluated independently. Armor now has effects even when not sneaking
|
- Stealth effects from sneaking and armor are evaluated independently. Armor now has effects even when not sneaking
|
||||||
|
- Zoom-in effect when aiming bow is now optional
|
||||||
|
- Non-Humanoid NPCs now pick up consumables when less than full health and use them to heal up.
|
||||||
|
- Changed module component modifier costs to the following scheme, based on base material: 1 -> 2 -> 5 -> 10 -> 15 -> 25
|
||||||
|
- Damage from the same source dealt in the same tick will now be grouped up.
|
||||||
|
- Critical hits are now shown differently in the damage numbers.
|
||||||
|
- Fall damage and some (extra) buffs/debuffs now show up in the damage numbers.
|
||||||
|
- Optimized sprite processing decreasing the startup time of voxygen (and long freezes when trying
|
||||||
|
to enter the world when this hasn't finished).
|
||||||
|
- Metadata added to music files. Listen to the soundtrack more easily!
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
- Removed the options for single and cumulated damage.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Fixed bug that would sometimes cause taking a screenshot to panic because a buffer was mapped at the wrong time.
|
- Fixed bug that would sometimes cause taking a screenshot to panic because a buffer was mapped at the wrong time.
|
||||||
@ -46,6 +70,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Fixed an error where '{amount} Exp' floater did not use existing localizations
|
- Fixed an error where '{amount} Exp' floater did not use existing localizations
|
||||||
- Fix villagers seeing cultists and familiar enemies through objects.
|
- Fix villagers seeing cultists and familiar enemies through objects.
|
||||||
- Menacing agents are now less spammy with their menacing messages
|
- Menacing agents are now less spammy with their menacing messages
|
||||||
|
- Fixed the title screen FPS cap not applying when the background FPS limit was set higher than 60 FPS
|
||||||
|
- Fixed an issue where the hurt animation would "jump" whenever you lost/gained health.
|
||||||
|
- Fixed a bug where multiple damage sources in the same tick would show up as a singular attack.
|
||||||
|
- Fixed an issue where, if the same amount of healing and damage was received in the same tick, nothing would be shown.
|
||||||
|
- UI sfx now play from UI instead of from camera (allowing stereo sfx)
|
||||||
|
- Most sfx now correctly play when camera is underwater
|
||||||
|
- All sounds now stop upon quitting to main menu
|
||||||
|
- Combat music now loops and ends properly
|
||||||
|
|
||||||
## [0.12.0] - 2022-02-19
|
## [0.12.0] - 2022-02-19
|
||||||
|
|
||||||
|
|||||||
380
Cargo.lock
generated
380
Cargo.lock
generated
@ -191,6 +191,12 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "arrayvec"
|
||||||
|
version = "0.7.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "as-slice"
|
name = "as-slice"
|
||||||
version = "0.1.5"
|
version = "0.1.5"
|
||||||
@ -214,17 +220,17 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "assets_manager"
|
name = "assets_manager"
|
||||||
version = "0.7.2"
|
version = "0.8.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9bec562a7c25c1aa60d4394cb96c914aa9236ae53dddf5e89ea8aac8a20d98c0"
|
checksum = "c53a8477ada5edbd6ba3b0698aabaa76b352454aedc8c8dca0c6328fc8313b7e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ab_glyph",
|
"ab_glyph",
|
||||||
"ahash 0.7.6",
|
"ahash 0.7.6",
|
||||||
"bincode",
|
"bincode",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"log",
|
"log",
|
||||||
"notify 4.0.17",
|
"notify",
|
||||||
"parking_lot 0.11.2",
|
"parking_lot 0.12.0",
|
||||||
"ron 0.7.0",
|
"ron 0.7.0",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@ -417,7 +423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
|
checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayref",
|
"arrayref",
|
||||||
"arrayvec",
|
"arrayvec 0.5.2",
|
||||||
"constant_time_eq",
|
"constant_time_eq",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -1461,16 +1467,6 @@ dependencies = [
|
|||||||
"syn 1.0.90",
|
"syn 1.0.90",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "deflate"
|
|
||||||
version = "0.8.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
|
|
||||||
dependencies = [
|
|
||||||
"adler32",
|
|
||||||
"byteorder",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "deflate"
|
name = "deflate"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
@ -1756,6 +1752,16 @@ dependencies = [
|
|||||||
"str-buf",
|
"str-buf",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "etagere"
|
||||||
|
version = "0.2.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6301151a318f367f392c31395beb1cfba5ccd9abc44d1db0db3a4b27b9601c89"
|
||||||
|
dependencies = [
|
||||||
|
"euclid",
|
||||||
|
"svg_fmt",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "euc"
|
name = "euc"
|
||||||
version = "0.5.3"
|
version = "0.5.3"
|
||||||
@ -1920,25 +1926,6 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fsevent"
|
|
||||||
version = "0.4.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"fsevent-sys 2.0.1",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fsevent-sys"
|
|
||||||
version = "2.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fsevent-sys"
|
name = "fsevent-sys"
|
||||||
version = "4.1.0"
|
version = "4.1.0"
|
||||||
@ -1948,22 +1935,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fuchsia-zircon"
|
|
||||||
version = "0.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"fuchsia-zircon-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fuchsia-zircon-sys"
|
|
||||||
version = "0.3.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "funty"
|
name = "funty"
|
||||||
version = "1.2.0"
|
version = "1.2.0"
|
||||||
@ -2069,6 +2040,19 @@ dependencies = [
|
|||||||
"byteorder",
|
"byteorder",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "generator"
|
||||||
|
version = "0.7.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
"log",
|
||||||
|
"rustversion",
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "generic-array"
|
name = "generic-array"
|
||||||
version = "0.12.4"
|
version = "0.12.4"
|
||||||
@ -2144,7 +2128,7 @@ name = "gfx-backend-dx11"
|
|||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec 0.5.2",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"gfx-auxil",
|
"gfx-auxil",
|
||||||
"gfx-hal",
|
"gfx-hal",
|
||||||
@ -2165,7 +2149,7 @@ name = "gfx-backend-dx12"
|
|||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec 0.5.2",
|
||||||
"bit-set",
|
"bit-set",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"d3d12",
|
"d3d12",
|
||||||
@ -2196,7 +2180,7 @@ name = "gfx-backend-gl"
|
|||||||
version = "0.8.1"
|
version = "0.8.1"
|
||||||
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec 0.5.2",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"fxhash",
|
"fxhash",
|
||||||
"gfx-auxil",
|
"gfx-auxil",
|
||||||
@ -2219,7 +2203,7 @@ name = "gfx-backend-metal"
|
|||||||
version = "0.8.1"
|
version = "0.8.1"
|
||||||
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec 0.5.2",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"block",
|
"block",
|
||||||
"cocoa-foundation",
|
"cocoa-foundation",
|
||||||
@ -2245,7 +2229,7 @@ name = "gfx-backend-vulkan"
|
|||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
source = "git+https://github.com/gfx-rs/gfx?rev=27a1dae3796d33d23812f2bb8c7e3b5aea18b521#27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec 0.5.2",
|
||||||
"ash",
|
"ash",
|
||||||
"byteorder",
|
"byteorder",
|
||||||
"core-graphics-types",
|
"core-graphics-types",
|
||||||
@ -2502,8 +2486,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
|
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash 0.7.6",
|
"ahash 0.7.6",
|
||||||
"rayon",
|
|
||||||
"serde",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2513,6 +2495,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
|
checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash 0.7.6",
|
"ahash 0.7.6",
|
||||||
|
"rayon",
|
||||||
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2751,16 +2735,16 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "image"
|
name = "image"
|
||||||
version = "0.23.14"
|
version = "0.24.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
|
checksum = "28edd9d7bc256be2502e325ac0628bde30b7001b9b52e0abe31a1a9dc2701212"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"byteorder",
|
"byteorder",
|
||||||
"color_quant",
|
"color_quant",
|
||||||
"jpeg-decoder",
|
"jpeg-decoder",
|
||||||
"num-iter",
|
"num-iter",
|
||||||
"num-rational 0.3.2",
|
"num-rational 0.4.0",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"png",
|
"png",
|
||||||
]
|
]
|
||||||
@ -2786,17 +2770,6 @@ dependencies = [
|
|||||||
"lazy_static",
|
"lazy_static",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "inotify"
|
|
||||||
version = "0.7.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"inotify-sys",
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "inotify"
|
name = "inotify"
|
||||||
version = "0.9.6"
|
version = "0.9.6"
|
||||||
@ -2848,15 +2821,6 @@ version = "0.6.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9448015e586b611e5d322f6703812bbca2f1e709d5773ecd38ddb4e3bb649504"
|
checksum = "9448015e586b611e5d322f6703812bbca2f1e709d5773ecd38ddb4e3bb649504"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "iovec"
|
|
||||||
version = "0.1.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itertools"
|
name = "itertools"
|
||||||
version = "0.10.3"
|
version = "0.10.3"
|
||||||
@ -2909,9 +2873,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "jpeg-decoder"
|
name = "jpeg-decoder"
|
||||||
version = "0.1.22"
|
version = "0.2.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
|
checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "js-sys"
|
name = "js-sys"
|
||||||
@ -3079,6 +3043,15 @@ version = "0.2.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
|
checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libmimalloc-sys"
|
||||||
|
version = "0.1.25"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "11ca136052550448f55df7898c6dbe651c6b574fe38a0d9ea687a9f8088a2e2c"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libsqlite3-sys"
|
name = "libsqlite3-sys"
|
||||||
version = "0.20.1"
|
version = "0.20.1"
|
||||||
@ -3152,6 +3125,19 @@ dependencies = [
|
|||||||
"cfg-if 1.0.0",
|
"cfg-if 1.0.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "loom"
|
||||||
|
version = "0.5.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 1.0.0",
|
||||||
|
"generator",
|
||||||
|
"scoped-tls",
|
||||||
|
"tracing",
|
||||||
|
"tracing-subscriber",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "loupe"
|
name = "loupe"
|
||||||
version = "0.1.3"
|
version = "0.1.3"
|
||||||
@ -3309,6 +3295,15 @@ dependencies = [
|
|||||||
"objc",
|
"objc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mimalloc"
|
||||||
|
version = "0.1.29"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2f64ad83c969af2e732e907564deb0d0ed393cec4af80776f77dd77a1a427698"
|
||||||
|
dependencies = [
|
||||||
|
"libmimalloc-sys",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "minifb"
|
name = "minifb"
|
||||||
version = "0.22.0"
|
version = "0.22.0"
|
||||||
@ -3335,15 +3330,6 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "miniz_oxide"
|
|
||||||
version = "0.3.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
|
|
||||||
dependencies = [
|
|
||||||
"adler32",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miniz_oxide"
|
name = "miniz_oxide"
|
||||||
version = "0.4.4"
|
version = "0.4.4"
|
||||||
@ -3355,22 +3341,12 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mio"
|
name = "miniz_oxide"
|
||||||
version = "0.6.23"
|
version = "0.5.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
|
checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if 0.1.10",
|
"adler",
|
||||||
"fuchsia-zircon",
|
|
||||||
"fuchsia-zircon-sys",
|
|
||||||
"iovec",
|
|
||||||
"kernel32-sys",
|
|
||||||
"libc",
|
|
||||||
"log",
|
|
||||||
"miow 0.2.2",
|
|
||||||
"net2",
|
|
||||||
"slab",
|
|
||||||
"winapi 0.2.8",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -3381,7 +3357,7 @@ checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"miow 0.3.7",
|
"miow",
|
||||||
"ntapi",
|
"ntapi",
|
||||||
"winapi 0.3.9",
|
"winapi 0.3.9",
|
||||||
]
|
]
|
||||||
@ -3394,24 +3370,12 @@ checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"miow 0.3.7",
|
"miow",
|
||||||
"ntapi",
|
"ntapi",
|
||||||
"wasi 0.11.0+wasi-snapshot-preview1",
|
"wasi 0.11.0+wasi-snapshot-preview1",
|
||||||
"winapi 0.3.9",
|
"winapi 0.3.9",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "mio-extras"
|
|
||||||
version = "2.0.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
|
|
||||||
dependencies = [
|
|
||||||
"lazycell",
|
|
||||||
"log",
|
|
||||||
"mio 0.6.23",
|
|
||||||
"slab",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mio-misc"
|
name = "mio-misc"
|
||||||
version = "1.2.2"
|
version = "1.2.2"
|
||||||
@ -3424,18 +3388,6 @@ dependencies = [
|
|||||||
"mio 0.7.14",
|
"mio 0.7.14",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "miow"
|
|
||||||
version = "0.2.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
|
|
||||||
dependencies = [
|
|
||||||
"kernel32-sys",
|
|
||||||
"net2",
|
|
||||||
"winapi 0.2.8",
|
|
||||||
"ws2_32-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "miow"
|
name = "miow"
|
||||||
version = "0.3.7"
|
version = "0.3.7"
|
||||||
@ -3606,17 +3558,6 @@ dependencies = [
|
|||||||
"jni-sys",
|
"jni-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "net2"
|
|
||||||
version = "0.2.37"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if 0.1.10",
|
|
||||||
"libc",
|
|
||||||
"winapi 0.3.9",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nibble_vec"
|
name = "nibble_vec"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
@ -3727,33 +3668,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "notify"
|
name = "notify"
|
||||||
version = "4.0.17"
|
version = "5.0.0-pre.15"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257"
|
checksum = "553f9844ad0b0824605c20fb55a661679782680410abfb1a8144c2e7e437e7a7"
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"filetime",
|
|
||||||
"fsevent",
|
|
||||||
"fsevent-sys 2.0.1",
|
|
||||||
"inotify 0.7.1",
|
|
||||||
"libc",
|
|
||||||
"mio 0.6.23",
|
|
||||||
"mio-extras",
|
|
||||||
"walkdir 2.3.2",
|
|
||||||
"winapi 0.3.9",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "notify"
|
|
||||||
version = "5.0.0-pre.14"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d13c22db70a63592e098fb51735bab36646821e6389a0ba171f3549facdf0b74"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"filetime",
|
"filetime",
|
||||||
"fsevent-sys 4.1.0",
|
"fsevent-sys",
|
||||||
"inotify 0.9.6",
|
"inotify",
|
||||||
"kqueue",
|
"kqueue",
|
||||||
"libc",
|
"libc",
|
||||||
"mio 0.8.2",
|
"mio 0.8.2",
|
||||||
@ -3883,17 +3806,6 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "num-rational"
|
|
||||||
version = "0.3.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
|
|
||||||
dependencies = [
|
|
||||||
"autocfg",
|
|
||||||
"num-integer",
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-rational"
|
name = "num-rational"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
@ -4099,6 +4011,15 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ordered-float"
|
||||||
|
version = "3.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "96bcbab4bfea7a59c2c0fe47211a1ac4e3e96bea6eb446d704f310bc5c732ae2"
|
||||||
|
dependencies = [
|
||||||
|
"num-traits",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "os_str_bytes"
|
name = "os_str_bytes"
|
||||||
version = "6.0.0"
|
version = "6.0.0"
|
||||||
@ -4387,14 +4308,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "png"
|
name = "png"
|
||||||
version = "0.16.8"
|
version = "0.17.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
|
checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"deflate 0.8.6",
|
"deflate",
|
||||||
"miniz_oxide 0.3.7",
|
"miniz_oxide 0.5.3",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -4490,9 +4411,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "profiling"
|
name = "profiling"
|
||||||
version = "1.0.5"
|
version = "1.0.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9145ac0af1d93c638c98c40cf7d25665f427b2a44ad0a99b1dccf3e2f25bb987"
|
checksum = "2f61dcf0b917cd75d4521d7343d1ffff3d1583054133c9b5cbea3375c703c40d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"profiling-procmacros",
|
"profiling-procmacros",
|
||||||
"tracy-client",
|
"tracy-client",
|
||||||
@ -4500,9 +4421,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "profiling-procmacros"
|
name = "profiling-procmacros"
|
||||||
version = "1.0.5"
|
version = "1.0.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "151b4774158c69aae073abb06d0cf879c4657966e6f2d7535d9b0e94e85500af"
|
checksum = "98eee3c112f2a6f784b6713fe1d7fb7d6506e066121c0a49371fdb976f72bae5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote 1.0.17",
|
"quote 1.0.17",
|
||||||
"syn 1.0.90",
|
"syn 1.0.90",
|
||||||
@ -5178,9 +5099,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustls-pemfile"
|
name = "rustls-pemfile"
|
||||||
version = "0.3.0"
|
version = "1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360"
|
checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64",
|
"base64",
|
||||||
]
|
]
|
||||||
@ -5554,12 +5475,12 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "shred"
|
name = "shred"
|
||||||
version = "0.12.0"
|
version = "0.13.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "eb0210289d693217926314867c807e0b7b42f7e23c136adb31f8697f5bf242d3"
|
checksum = "102269e720bb814df57e136161cad841f2b6f411e003ac748fc48aaf2363bea3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec 0.7.2",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"mopa",
|
"mopa",
|
||||||
"rayon",
|
"rayon",
|
||||||
"shred-derive",
|
"shred-derive",
|
||||||
@ -5727,11 +5648,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "specs"
|
name = "specs"
|
||||||
version = "0.16.2"
|
version = "0.18.0"
|
||||||
source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4ea85dac2880f84d4025ff5ace80cda6d8bc43bc88b6a389b9277fcf894b51e9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossbeam-queue",
|
"crossbeam-queue",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"hibitset",
|
"hibitset",
|
||||||
"log",
|
"log",
|
||||||
"rayon",
|
"rayon",
|
||||||
@ -5745,7 +5667,8 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "specs-derive"
|
name = "specs-derive"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
source = "git+https://github.com/amethyst/specs.git?rev=f985bec5d456f7b0dd8aae99848f9473c2cd9d46#f985bec5d456f7b0dd8aae99848f9473c2cd9d46"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3e23e09360f3d2190fec4222cd9e19d3158d5da948c0d1ea362df617dd103511"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.36",
|
"proc-macro2 1.0.36",
|
||||||
"quote 1.0.17",
|
"quote 1.0.17",
|
||||||
@ -5755,7 +5678,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "specs-idvs"
|
name = "specs-idvs"
|
||||||
version = "0.1.1"
|
version = "0.1.1"
|
||||||
source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=8be2abcddf8f524cb5876e8dd20a7e47cfaf7573#8be2abcddf8f524cb5876e8dd20a7e47cfaf7573"
|
source = "git+https://gitlab.com/veloren/specs-idvs.git?rev=c17abc638f23ef221ce7384c7dd77eef757b82f4#c17abc638f23ef221ce7384c7dd77eef757b82f4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"specs",
|
"specs",
|
||||||
]
|
]
|
||||||
@ -6310,9 +6233,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing-tracy"
|
name = "tracing-tracy"
|
||||||
version = "0.8.0"
|
version = "0.9.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "773057bb2b440e868776522a0587f732b1125116f12aca0eb37dea48d55ad2cd"
|
checksum = "23a42311a35ed976d72f359de43e9fe028ec9d9f1051c4c52bd05a4f66ff3cbf"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"tracing-core",
|
"tracing-core",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
@ -6321,19 +6244,20 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracy-client"
|
name = "tracy-client"
|
||||||
version = "0.12.7"
|
version = "0.13.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dffcb26a0c786a0e154afdf21284969ff23759f42f156bcfddddae1a3c2404f2"
|
checksum = "42ebfe7a24c18b5ba86d8920c124b41b942352f863fbe0c84d3d63428fa1860f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"loom",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"tracy-client-sys",
|
"tracy-client-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracy-client-sys"
|
name = "tracy-client-sys"
|
||||||
version = "0.16.0"
|
version = "0.17.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6226e4e77f0d46ce7ebb0a4b1daa82790035248b75bbf605b932a1d7b3b22b6d"
|
checksum = "178d021455e83078bb38c00b70046b95117ef0a0312cbef925f426d833d11c79"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
]
|
]
|
||||||
@ -6380,9 +6304,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tuple_utils"
|
name = "tuple_utils"
|
||||||
version = "0.3.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1"
|
checksum = "cffaaf9392ef73cd30828797152476aaa2fa37a17856934fa63d4843f34290e9"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "twox-hash"
|
name = "twox-hash"
|
||||||
@ -6546,7 +6470,7 @@ dependencies = [
|
|||||||
"bincode",
|
"bincode",
|
||||||
"byteorder",
|
"byteorder",
|
||||||
"clap 3.1.8",
|
"clap 3.1.8",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"image",
|
"image",
|
||||||
"num 0.4.0",
|
"num 0.4.0",
|
||||||
"quinn",
|
"quinn",
|
||||||
@ -6588,7 +6512,7 @@ dependencies = [
|
|||||||
"dot_vox",
|
"dot_vox",
|
||||||
"enum-iterator",
|
"enum-iterator",
|
||||||
"fxhash",
|
"fxhash",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"kiddo 0.1.7",
|
"kiddo 0.1.7",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
@ -6674,7 +6598,7 @@ version = "0.10.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bincode",
|
"bincode",
|
||||||
"flate2",
|
"flate2",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"image",
|
"image",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"serde",
|
"serde",
|
||||||
@ -6692,7 +6616,7 @@ name = "veloren-common-state"
|
|||||||
version = "0.10.0"
|
version = "0.10.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bincode",
|
"bincode",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
"rayon",
|
"rayon",
|
||||||
"scopeguard",
|
"scopeguard",
|
||||||
@ -6714,9 +6638,9 @@ dependencies = [
|
|||||||
name = "veloren-common-systems"
|
name = "veloren-common-systems"
|
||||||
version = "0.10.0"
|
version = "0.10.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"ordered-float 2.10.0",
|
"ordered-float 3.0.0",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rayon",
|
"rayon",
|
||||||
"slab",
|
"slab",
|
||||||
@ -6727,6 +6651,7 @@ dependencies = [
|
|||||||
"veloren-common-base",
|
"veloren-common-base",
|
||||||
"veloren-common-ecs",
|
"veloren-common-ecs",
|
||||||
"veloren-common-net",
|
"veloren-common-net",
|
||||||
|
"veloren-common-state",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -6764,7 +6689,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "veloren-network-protocol"
|
name = "veloren-network-protocol"
|
||||||
version = "0.6.0"
|
version = "0.6.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-channel",
|
"async-channel",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@ -6818,10 +6743,11 @@ dependencies = [
|
|||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"enumset",
|
"enumset",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"humantime",
|
"humantime",
|
||||||
"itertools",
|
"itertools",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
"noise",
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
"portpicker",
|
"portpicker",
|
||||||
"prometheus",
|
"prometheus",
|
||||||
@ -6834,7 +6760,7 @@ dependencies = [
|
|||||||
"ron 0.7.0",
|
"ron 0.7.0",
|
||||||
"rusqlite",
|
"rusqlite",
|
||||||
"rustls 0.20.4",
|
"rustls 0.20.4",
|
||||||
"rustls-pemfile 0.3.0",
|
"rustls-pemfile 1.0.0",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"slab",
|
"slab",
|
||||||
@ -6863,6 +6789,7 @@ dependencies = [
|
|||||||
"clap 3.1.8",
|
"clap 3.1.8",
|
||||||
"crossterm 0.23.2",
|
"crossterm 0.23.2",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
"mimalloc",
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
"ron 0.7.0",
|
"ron 0.7.0",
|
||||||
"serde",
|
"serde",
|
||||||
@ -6903,11 +6830,12 @@ dependencies = [
|
|||||||
"egui_wgpu_backend",
|
"egui_wgpu_backend",
|
||||||
"egui_winit_platform",
|
"egui_winit_platform",
|
||||||
"enum-iterator",
|
"enum-iterator",
|
||||||
|
"etagere",
|
||||||
"euc",
|
"euc",
|
||||||
"gilrs",
|
"gilrs",
|
||||||
"glyph_brush",
|
"glyph_brush",
|
||||||
"guillotiere",
|
"guillotiere",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"iced_native",
|
"iced_native",
|
||||||
"iced_winit",
|
"iced_winit",
|
||||||
"image",
|
"image",
|
||||||
@ -6915,11 +6843,12 @@ dependencies = [
|
|||||||
"itertools",
|
"itertools",
|
||||||
"keyboard-keynames",
|
"keyboard-keynames",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
"mimalloc",
|
||||||
"mumble-link",
|
"mumble-link",
|
||||||
"native-dialog",
|
"native-dialog",
|
||||||
"num 0.4.0",
|
"num 0.4.0",
|
||||||
"num_cpus",
|
"num_cpus",
|
||||||
"ordered-float 2.10.0",
|
"ordered-float 3.0.0",
|
||||||
"profiling",
|
"profiling",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"rand_chacha 0.3.1",
|
"rand_chacha 0.3.1",
|
||||||
@ -6962,6 +6891,7 @@ version = "0.10.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
"mimalloc",
|
||||||
"vek 0.15.8",
|
"vek 0.15.8",
|
||||||
"veloren-common",
|
"veloren-common",
|
||||||
"veloren-voxygen-dynlib",
|
"veloren-voxygen-dynlib",
|
||||||
@ -6980,7 +6910,7 @@ version = "0.1.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"find_folder",
|
"find_folder",
|
||||||
"libloading 0.7.3",
|
"libloading 0.7.3",
|
||||||
"notify 5.0.0-pre.14",
|
"notify",
|
||||||
"tracing",
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -7011,7 +6941,7 @@ dependencies = [
|
|||||||
"clap 3.1.8",
|
"clap 3.1.8",
|
||||||
"deunicode",
|
"deunicode",
|
||||||
"git2",
|
"git2",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"ron 0.7.0",
|
"ron 0.7.0",
|
||||||
"serde",
|
"serde",
|
||||||
"tracing",
|
"tracing",
|
||||||
@ -7029,12 +6959,12 @@ dependencies = [
|
|||||||
"clap 3.1.8",
|
"clap 3.1.8",
|
||||||
"criterion",
|
"criterion",
|
||||||
"csv",
|
"csv",
|
||||||
"deflate 1.0.0",
|
"deflate",
|
||||||
"enum-iterator",
|
"enum-iterator",
|
||||||
"fallible-iterator",
|
"fallible-iterator",
|
||||||
"flate2",
|
"flate2",
|
||||||
"fxhash",
|
"fxhash",
|
||||||
"hashbrown 0.11.2",
|
"hashbrown 0.12.0",
|
||||||
"image",
|
"image",
|
||||||
"itertools",
|
"itertools",
|
||||||
"kiddo 0.2.4",
|
"kiddo 0.2.4",
|
||||||
@ -7045,7 +6975,7 @@ dependencies = [
|
|||||||
"noisy_float",
|
"noisy_float",
|
||||||
"num 0.4.0",
|
"num 0.4.0",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"ordered-float 2.10.0",
|
"ordered-float 3.0.0",
|
||||||
"packed_simd_2",
|
"packed_simd_2",
|
||||||
"probability",
|
"probability",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
@ -7619,7 +7549,7 @@ name = "wgpu"
|
|||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
|
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec 0.5.2",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"log",
|
"log",
|
||||||
"naga",
|
"naga",
|
||||||
@ -7639,7 +7569,7 @@ name = "wgpu-core"
|
|||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
|
source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arrayvec",
|
"arrayvec 0.5.2",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"cfg_aliases",
|
"cfg_aliases",
|
||||||
"copyless",
|
"copyless",
|
||||||
@ -7906,16 +7836,6 @@ dependencies = [
|
|||||||
"winapi 0.3.9",
|
"winapi 0.3.9",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ws2_32-sys"
|
|
||||||
version = "0.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
|
|
||||||
dependencies = [
|
|
||||||
"winapi 0.2.8",
|
|
||||||
"winapi-build",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wyz"
|
name = "wyz"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
|
|||||||
@ -35,7 +35,6 @@ overflow-checks = true
|
|||||||
debug-assertions = true
|
debug-assertions = true
|
||||||
panic = "abort"
|
panic = "abort"
|
||||||
debug = false
|
debug = false
|
||||||
codegen-units = 8
|
|
||||||
lto = false
|
lto = false
|
||||||
incremental = true
|
incremental = true
|
||||||
# All packages that aren't members of this workspace
|
# All packages that aren't members of this workspace
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Stab(
|
kind: Stab(
|
||||||
damage: 15.0,
|
damage: 30.0,
|
||||||
poise: 20.0,
|
poise: 20.0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Stab(
|
scaled: Some(Stab(
|
||||||
damage: 60.0,
|
damage: 120.0,
|
||||||
poise: 45.0,
|
poise: 45.0,
|
||||||
knockback: 25.0,
|
knockback: 25.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 3.0,
|
forward_speed: 3.0,
|
||||||
buildup_duration: 0.3,
|
buildup_duration: 0.6,
|
||||||
charge_duration: 4.0,
|
charge_duration: 8.0,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.4,
|
recover_duration: 0.8,
|
||||||
ori_modifier: 0.1,
|
ori_modifier: 0.1,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 37,
|
base_damage: 74,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 27.5,
|
base_poise_damage: 27.5,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 9.0,
|
knockback: 9.0,
|
||||||
range: 3.0,
|
range: 3.0,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.7,
|
base_buildup_duration: 1.4,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.6,
|
buildup_duration: 1.2,
|
||||||
recover_duration: 0.35,
|
recover_duration: 0.7,
|
||||||
projectile: Poisonball(
|
projectile: Poisonball(
|
||||||
damage: 25.0,
|
damage: 70.0,
|
||||||
radius: 3.0,
|
radius: 3.5,
|
||||||
energy_regen: 0,
|
energy_regen: 0,
|
||||||
min_falloff: 0.2,
|
min_falloff: 0.2,
|
||||||
),
|
),
|
||||||
@ -14,6 +14,6 @@ BasicRanged(
|
|||||||
..Default::default()
|
..Default::default()
|
||||||
}),*/
|
}),*/
|
||||||
projectile_speed: 260.0,
|
projectile_speed: 260.0,
|
||||||
num_projectiles: 3,
|
num_projectiles: 1,
|
||||||
projectile_spread: 0.3,
|
projectile_spread: 0.3,
|
||||||
)
|
)
|
||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 25,
|
base_damage: 50,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 16,
|
base_poise_damage: 16,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 2.0,
|
knockback: 2.0,
|
||||||
range: 3.0,
|
range: 3.0,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Piercing,
|
damage_kind: Piercing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
LeapMelee(
|
LeapMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
movement_duration: 0.4,
|
movement_duration: 0.8,
|
||||||
swing_duration: 0.075,
|
swing_duration: 0.075,
|
||||||
recover_duration: 0.2,
|
recover_duration: 0.4,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 30.0,
|
damage: 60.0,
|
||||||
poise: 20.0,
|
poise: 20.0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 27,
|
base_damage: 54,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 3.0,
|
range: 3.0,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
LeapMelee(
|
LeapMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
movement_duration: 0.4,
|
movement_duration: 0.8,
|
||||||
swing_duration: 0.075,
|
swing_duration: 0.075,
|
||||||
recover_duration: 0.2,
|
recover_duration: 0.4,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 35.0,
|
damage: 70.0,
|
||||||
poise: 30.0,
|
poise: 30.0,
|
||||||
knockback: 1.0,
|
knockback: 1.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 30,
|
base_damage: 60,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 21,
|
base_poise_damage: 21,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 3.0,
|
range: 3.0,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Piercing,
|
damage_kind: Piercing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 22,
|
base_damage: 44,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 14,
|
base_poise_damage: 14,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 3.0,
|
range: 3.0,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.2,
|
buildup_duration: 0.4,
|
||||||
recover_duration: 0.2,
|
recover_duration: 0.4,
|
||||||
beam_duration: 1.0,
|
beam_duration: 1.0,
|
||||||
damage: 0.6,
|
damage: 1.2,
|
||||||
tick_rate: 15.0,
|
tick_rate: 15.0,
|
||||||
range: 30.0,
|
range: 30.0,
|
||||||
max_angle: 1.0,
|
max_angle: 1.0,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 1.6,
|
||||||
recover_duration: 0.35,
|
recover_duration: 0.7,
|
||||||
projectile: Fireball(
|
projectile: Fireball(
|
||||||
damage: 13.0,
|
damage: 26.0,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
energy_regen: 0,
|
energy_regen: 0,
|
||||||
min_falloff: 0.5,
|
min_falloff: 0.5,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 14.0,
|
base_damage: 28.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 28,
|
base_poise_damage: 28,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.6,
|
base_buildup_duration: 1.2,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 2.0,
|
forward_movement: 2.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 12.0,
|
damage: 24.0,
|
||||||
poise: 25.0,
|
poise: 25.0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 18.0,
|
damage: 36.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 17.0,
|
knockback: 17.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 4.0,
|
forward_speed: 4.0,
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 1.6,
|
||||||
charge_duration: 1.0,
|
charge_duration: 2.0,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 1.0,
|
recover_duration: 2.0,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.9,
|
buildup_duration: 1.8,
|
||||||
recover_duration: 1.0,
|
recover_duration: 1.0,
|
||||||
beam_duration: 1.0,
|
beam_duration: 1.15,
|
||||||
damage: 42.0,
|
damage: 64.0,
|
||||||
tick_rate: 0.5,
|
tick_rate: 0.35,
|
||||||
range: 22.0,
|
range: 22.0,
|
||||||
max_angle: 5.0,
|
max_angle: 5.0,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
|
|||||||
@ -2,14 +2,14 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 18.0,
|
base_damage: 36.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 15,
|
base_poise_damage: 15,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.8,
|
range: 2.8,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.7,
|
base_buildup_duration: 1.4,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.3,
|
||||||
@ -18,14 +18,14 @@ ComboMelee(
|
|||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 18.0,
|
base_damage: 36.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 18,
|
base_poise_damage: 18,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.8,
|
range: 2.8,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.3,
|
||||||
@ -34,14 +34,14 @@ ComboMelee(
|
|||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 18.0,
|
base_damage: 36.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.8,
|
range: 2.8,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.3,
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
BasicMelee(
|
BasicMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.25,
|
buildup_duration: 0.5,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.25,
|
recover_duration: 0.5,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Slash(
|
kind: Slash(
|
||||||
damage: 20.0,
|
damage: 40.0,
|
||||||
poise: 40.0,
|
poise: 40.0,
|
||||||
knockback: 25.0,
|
knockback: 25.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 8.0,
|
damage: 16.0,
|
||||||
poise: 50.0,
|
poise: 50.0,
|
||||||
knockback: 6.0,
|
knockback: 6.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 15.0,
|
damage: 30.0,
|
||||||
poise: 100.0,
|
poise: 100.0,
|
||||||
knockback: 12.0,
|
knockback: 12.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 1.9,
|
forward_speed: 1.9,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
charge_duration: 3.0,
|
charge_duration: 6.0,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.7,
|
recover_duration: 1.4,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
BasicSummon(
|
BasicSummon(
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 0.75,
|
||||||
cast_duration: 0.2,
|
cast_duration: 0.2,
|
||||||
recover_duration: 0.2,
|
recover_duration: 0.3,
|
||||||
summon_amount: 12,
|
summon_amount: 12,
|
||||||
summon_distance: (4, 9),
|
summon_distance: (4, 9),
|
||||||
summon_info: (
|
summon_info: (
|
||||||
|
|||||||
@ -2,49 +2,49 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 11.0,
|
base_damage: 22.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 4.5,
|
range: 4.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 3.0,
|
forward_movement: 3.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 9.0,
|
base_damage: 18.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 3.0,
|
forward_movement: 3.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 14.0,
|
base_damage: 28.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 1.3,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 3.5,
|
forward_movement: 3.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
recover_duration: 0.35,
|
recover_duration: 0.7,
|
||||||
projectile: Fireball(
|
projectile: Fireball(
|
||||||
damage: 10.0,
|
damage: 20.0,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
energy_regen: 5.0,
|
energy_regen: 5.0,
|
||||||
min_falloff: 0.5,
|
min_falloff: 0.5,
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.4,
|
buildup_duration: 0.8,
|
||||||
recover_duration: 0.25,
|
recover_duration: 0.5,
|
||||||
beam_duration: 0.5,
|
beam_duration: 0.5,
|
||||||
damage: 5.0,
|
damage: 10.0,
|
||||||
tick_rate: 3.0,
|
tick_rate: 3.0,
|
||||||
range: 15.0,
|
range: 15.0,
|
||||||
max_angle: 22.5,
|
max_angle: 22.5,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 10.0,
|
base_damage: 20.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 4.5,
|
range: 4.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 2.0,
|
forward_movement: 2.0,
|
||||||
damage_kind: Slashing,
|
damage_kind: Slashing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
@ -24,17 +24,17 @@ ComboMelee(
|
|||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 8.0,
|
base_damage: 16.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Slashing,
|
damage_kind: Slashing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
@ -46,17 +46,17 @@ ComboMelee(
|
|||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 13.0,
|
base_damage: 26.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 1.3,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Slashing,
|
damage_kind: Slashing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
recover_duration: 0.35,
|
recover_duration: 0.7,
|
||||||
projectile: Fireball(
|
projectile: Fireball(
|
||||||
damage: 10.0,
|
damage: 20.0,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
energy_regen: 5.0,
|
energy_regen: 5.0,
|
||||||
min_falloff: 0.5,
|
min_falloff: 0.5,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
Shockwave(
|
Shockwave(
|
||||||
energy_cost: 60.0,
|
energy_cost: 60.0,
|
||||||
buildup_duration: 0.7,
|
buildup_duration: 1.4,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.2,
|
recover_duration: 0.4,
|
||||||
damage: 20.0,
|
damage: 40.0,
|
||||||
poise_damage: 0,
|
poise_damage: 0,
|
||||||
knockback: ( strength: 25.0, direction: Away),
|
knockback: ( strength: 25.0, direction: Away),
|
||||||
shockwave_angle: 360.0,
|
shockwave_angle: 360.0,
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.4,
|
buildup_duration: 0.8,
|
||||||
recover_duration: 0.25,
|
recover_duration: 0.5,
|
||||||
beam_duration: 0.5,
|
beam_duration: 0.5,
|
||||||
damage: 5.0,
|
damage: 10.0,
|
||||||
tick_rate: 3.0,
|
tick_rate: 3.0,
|
||||||
range: 15.0,
|
range: 15.0,
|
||||||
max_angle: 22.5,
|
max_angle: 22.5,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 10.0,
|
base_damage: 20.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 4.5,
|
range: 4.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 2.0,
|
forward_movement: 2.0,
|
||||||
damage_kind: Slashing,
|
damage_kind: Slashing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
@ -24,17 +24,17 @@ ComboMelee(
|
|||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 8.0,
|
base_damage: 16.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Slashing,
|
damage_kind: Slashing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
@ -46,17 +46,17 @@ ComboMelee(
|
|||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 13.0,
|
base_damage: 26.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 0.375,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Slashing,
|
damage_kind: Slashing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 0.75,
|
||||||
recover_duration: 0.4,
|
recover_duration: 0.8,
|
||||||
beam_duration: 0.25,
|
beam_duration: 0.25,
|
||||||
damage: 7.0,
|
damage: 10.5,
|
||||||
tick_rate: 2.0,
|
tick_rate: 2.0,
|
||||||
range: 40.0,
|
range: 40.0,
|
||||||
max_angle: 1.0,
|
max_angle: 1.0,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 1.2,
|
||||||
recover_duration: 0.5,
|
recover_duration: 1.0,
|
||||||
projectile: ClayRocket(
|
projectile: ClayRocket(
|
||||||
damage: 50.0,
|
damage: 75.0,
|
||||||
knockback: 18.0,
|
knockback: 18.0,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
min_falloff: 0.75,
|
min_falloff: 0.75,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
Shockwave(
|
Shockwave(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 1.5,
|
buildup_duration: 2.25,
|
||||||
swing_duration: 0.12,
|
swing_duration: 0.12,
|
||||||
recover_duration: 1.2,
|
recover_duration: 2.4,
|
||||||
damage: 50.0,
|
damage: 75.0,
|
||||||
poise_damage: 50,
|
poise_damage: 50,
|
||||||
knockback: (strength: 30.0, direction: TowardsUp),
|
knockback: (strength: 30.0, direction: TowardsUp),
|
||||||
shockwave_angle: 180.0,
|
shockwave_angle: 180.0,
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
BasicMelee(
|
BasicMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 1.2,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.5,
|
recover_duration: 1.0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 20.0,
|
damage: 30.0,
|
||||||
poise: 50.0,
|
poise: 50.0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 8.0,
|
damage: 16.0,
|
||||||
poise: 25.0,
|
poise: 25.0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 15.0,
|
damage: 30.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 17.0,
|
knockback: 17.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 3,
|
forward_speed: 3,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
charge_duration: 1.0,
|
charge_duration: 2.0,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 1.0,
|
recover_duration: 2.0,
|
||||||
ori_modifier: 0.1,
|
ori_modifier: 0.1,
|
||||||
charge_through: true,
|
charge_through: true,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.25,
|
buildup_duration: 0.5,
|
||||||
recover_duration: 0.25,
|
recover_duration: 0.5,
|
||||||
beam_duration: 1,
|
beam_duration: 1,
|
||||||
damage: 3.0,
|
damage: 6.0,
|
||||||
tick_rate: 2.0,
|
tick_rate: 2.0,
|
||||||
range: 25.0,
|
range: 25.0,
|
||||||
max_angle: 1.0,
|
max_angle: 1.0,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 0.75,
|
||||||
recover_duration: 0.8,
|
recover_duration: 1.6,
|
||||||
projectile: ExplodingPumpkin(
|
projectile: ExplodingPumpkin(
|
||||||
damage: 25.0,
|
damage: 37.5,
|
||||||
knockback: 25.0,
|
knockback: 25.0,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
min_falloff: 0.6,
|
min_falloff: 0.6,
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.7,
|
buildup_duration: 1.4,
|
||||||
recover_duration: 0.6,
|
recover_duration: 0.9,
|
||||||
beam_duration: 1.0,
|
beam_duration: 1.0,
|
||||||
damage: 6.0,
|
damage: 9.0,
|
||||||
tick_rate: 1.5,
|
tick_rate: 1.5,
|
||||||
range: 20.0,
|
range: 20.0,
|
||||||
max_angle: 15.0,
|
max_angle: 15.0,
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
BasicMelee(
|
BasicMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.6,
|
buildup_duration: 0.9,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.6,
|
recover_duration: 1.2,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Slash(
|
kind: Slash(
|
||||||
damage: 14.0,
|
damage: 21.0,
|
||||||
poise: 10.0,
|
poise: 10.0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 16.0,
|
base_damage: 32.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 12,
|
base_poise_damage: 12,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.25,
|
base_buildup_duration: 0.5,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.25,
|
base_recover_duration: 0.5,
|
||||||
forward_movement: 0.5,
|
forward_movement: 0.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,49 +2,49 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 16.0,
|
base_damage: 32.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 6,
|
base_poise_damage: 6,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.2,
|
base_buildup_duration: 0.4,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 16.0,
|
base_damage: 32.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 8,
|
base_poise_damage: 8,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.22,
|
base_buildup_duration: 0.44,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 0.0,
|
forward_movement: 0.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 16.0,
|
base_damage: 32.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 10,
|
base_poise_damage: 10,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.2,
|
base_buildup_duration: 0.4,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -3,13 +3,13 @@ ChargedMelee(
|
|||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 5.0,
|
damage: 10.0,
|
||||||
poise: 50.0,
|
poise: 50.0,
|
||||||
knockback: 0.0,
|
knockback: 0.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 45.0,
|
damage: 90.0,
|
||||||
poise: 150.0,
|
poise: 150.0,
|
||||||
knockback: 0.0,
|
knockback: 0.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -17,8 +17,8 @@ ChargedMelee(
|
|||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 45.0,
|
angle: 45.0,
|
||||||
),
|
),
|
||||||
charge_duration: 1.5,
|
charge_duration: 3.0,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
hit_timing: 0.8,
|
hit_timing: 0.8,
|
||||||
recover_duration: 0.5,
|
recover_duration: 1.0,
|
||||||
)
|
)
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 20.0,
|
base_damage: 40.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 12,
|
base_poise_damage: 12,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.5,
|
base_buildup_duration: 1.0,
|
||||||
base_swing_duration: 0.2,
|
base_swing_duration: 0.2,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.5,
|
base_recover_duration: 1.0,
|
||||||
forward_movement: 0.5,
|
forward_movement: 0.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
BasicMelee(
|
BasicMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.2,
|
buildup_duration: 0.4,
|
||||||
swing_duration: 0.05,
|
swing_duration: 0.05,
|
||||||
recover_duration: 0.3,
|
recover_duration: 0.6,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 4,
|
damage: 8,
|
||||||
poise: 5,
|
poise: 5,
|
||||||
knockback: 0,
|
knockback: 0,
|
||||||
energy_regen: 0,
|
energy_regen: 0,
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
SpinMelee(
|
SpinMelee(
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 0.25,
|
||||||
swing_duration: 0.3,
|
swing_duration: 0.3,
|
||||||
recover_duration: 0.5,
|
recover_duration: 1.0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: SonicWave(
|
kind: SonicWave(
|
||||||
damage: 5,
|
damage: 10,
|
||||||
poise: 100,
|
poise: 100,
|
||||||
knockback: 20,
|
knockback: 20,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 1.6,
|
||||||
recover_duration: 0.35,
|
recover_duration: 0.7,
|
||||||
projectile: NecroticSphere(
|
projectile: NecroticSphere(
|
||||||
damage: 26.0,
|
damage: 52.0,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
energy_regen: 0,
|
energy_regen: 0,
|
||||||
min_falloff: 0.5,
|
min_falloff: 0.5,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 20.0,
|
base_damage: 40.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 28,
|
base_poise_damage: 28,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.5,
|
base_buildup_duration: 1.0,
|
||||||
base_swing_duration: 0.075,
|
base_swing_duration: 0.075,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 2.0,
|
forward_movement: 2.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.40,
|
buildup_duration: 0.3,
|
||||||
recover_duration: 0.50,
|
recover_duration: 1.0,
|
||||||
beam_duration: 1.0,
|
beam_duration: 1.0,
|
||||||
damage: 15.0,
|
damage: 22.5,
|
||||||
tick_rate: 5.0,
|
tick_rate: 5.0,
|
||||||
range: 22.0,
|
range: 22.0,
|
||||||
max_angle: 15.0,
|
max_angle: 15.0,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.75,
|
buildup_duration: 1.125,
|
||||||
recover_duration: 0.4,
|
recover_duration: 0.8,
|
||||||
projectile: NecroticSphere(
|
projectile: NecroticSphere(
|
||||||
damage: 45.0,
|
damage: 67.5,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
min_falloff: 0.9,
|
min_falloff: 0.9,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
SpinMelee(
|
SpinMelee(
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 1.2,
|
||||||
swing_duration: 0.5,
|
swing_duration: 0.5,
|
||||||
recover_duration: 0.6,
|
recover_duration: 1.2,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: NecroticVortex(
|
kind: NecroticVortex(
|
||||||
damage: 20.0,
|
damage: 30.0,
|
||||||
pull: 7.0,
|
pull: 7.0,
|
||||||
lifesteal: 2.0,
|
lifesteal: 2.0,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Stab(
|
kind: Stab(
|
||||||
damage: 15.0,
|
damage: 22.5,
|
||||||
poise: 25.0,
|
poise: 25.0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Stab(
|
scaled: Some(Stab(
|
||||||
damage: 60.0,
|
damage: 90.0,
|
||||||
poise: 100.0,
|
poise: 100.0,
|
||||||
knockback: 30.0,
|
knockback: 30.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -24,10 +24,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 5.0,
|
forward_speed: 5.0,
|
||||||
buildup_duration: 0.4,
|
buildup_duration: 0.6,
|
||||||
charge_duration: 4.0,
|
charge_duration: 8.0,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 1.7,
|
recover_duration: 3.4,
|
||||||
ori_modifier: 0.1,
|
ori_modifier: 0.1,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -3,7 +3,7 @@ ChargedMelee(
|
|||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Slash(
|
kind: Slash(
|
||||||
damage: 5.0,
|
damage: 7.5,
|
||||||
poise: 50.0,
|
poise: 50.0,
|
||||||
knockback: 0.0,
|
knockback: 0.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -17,9 +17,9 @@ ChargedMelee(
|
|||||||
range: 5.0,
|
range: 5.0,
|
||||||
angle: 45.0,
|
angle: 45.0,
|
||||||
),
|
),
|
||||||
charge_duration: 1.5,
|
charge_duration: 4.5,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
hit_timing: 0.8,
|
hit_timing: 0.8,
|
||||||
recover_duration: 0.5,
|
recover_duration: 1.0,
|
||||||
specifier: Some(GroundCleave),
|
specifier: Some(GroundCleave),
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicMelee(
|
BasicMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.3,
|
buildup_duration: 0.45,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.6,
|
recover_duration: 1.2,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Slash(
|
kind: Slash(
|
||||||
damage: 15.0,
|
damage: 15.0,
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Slash(
|
kind: Slash(
|
||||||
damage: 8.0,
|
damage: 16.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 8.0,
|
knockback: 8.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Slash(
|
scaled: Some(Slash(
|
||||||
damage: 16.0,
|
damage: 32.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 7.0,
|
knockback: 7.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 3.0,
|
forward_speed: 3.0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
charge_duration: 3.0,
|
charge_duration: 6.0,
|
||||||
swing_duration: 0.35,
|
swing_duration: 0.35,
|
||||||
recover_duration: 1.2,
|
recover_duration: 2.4,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: true,
|
is_interruptible: true,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 9.0,
|
base_damage: 18.0,
|
||||||
damage_increase: 1.0,
|
damage_increase: 1.0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 50.0,
|
angle: 50.0,
|
||||||
base_buildup_duration: 0.6,
|
base_buildup_duration: 1.2,
|
||||||
base_swing_duration: 0.12,
|
base_swing_duration: 0.12,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.6,
|
base_recover_duration: 1.2,
|
||||||
forward_movement: 3.5,
|
forward_movement: 3.5,
|
||||||
damage_kind: Slashing,
|
damage_kind: Slashing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
@ -24,17 +24,17 @@ ComboMelee(
|
|||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 13.0,
|
base_damage: 26.0,
|
||||||
damage_increase: 1.5,
|
damage_increase: 1.5,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 16.0,
|
knockback: 16.0,
|
||||||
range: 5.5,
|
range: 5.5,
|
||||||
angle: 15.0,
|
angle: 15.0,
|
||||||
base_buildup_duration: 0.5,
|
base_buildup_duration: 1.0,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 1.2,
|
base_recover_duration: 2.4,
|
||||||
forward_movement: 4.5,
|
forward_movement: 4.5,
|
||||||
damage_kind: Slashing,
|
damage_kind: Slashing,
|
||||||
damage_effect: Some(Buff((
|
damage_effect: Some(Buff((
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 20.0,
|
base_damage: 40.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 28,
|
base_poise_damage: 28,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.0,
|
range: 2.0,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.6,
|
base_buildup_duration: 1.2,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 3.0,
|
forward_movement: 3.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,49 +2,49 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 14.0,
|
base_damage: 28.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 15,
|
base_poise_damage: 15,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 1.3,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 2.0,
|
forward_movement: 2.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 14.0,
|
base_damage: 28.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 18,
|
base_poise_damage: 18,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 14.0,
|
base_damage: 28.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.25,
|
buildup_duration: 0.5,
|
||||||
recover_duration: 0.25,
|
recover_duration: 0.5,
|
||||||
beam_duration: 1.0,
|
beam_duration: 1.0,
|
||||||
damage: 3.0,
|
damage: 6.0,
|
||||||
tick_rate: 2.0,
|
tick_rate: 2.0,
|
||||||
range: 25.0,
|
range: 25.0,
|
||||||
max_angle: 1.0,
|
max_angle: 1.0,
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 8.0,
|
damage: 16.0,
|
||||||
poise: 25.0,
|
poise: 25.0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 15.0,
|
damage: 30.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 17.0,
|
knockback: 17.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 4.0,
|
forward_speed: 4.0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
charge_duration: 1.0,
|
charge_duration: 2.0,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 1.0,
|
recover_duration: 2.0,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.4,
|
buildup_duration: 0.8,
|
||||||
recover_duration: 0.25,
|
recover_duration: 0.5,
|
||||||
beam_duration: 0.5,
|
beam_duration: 0.5,
|
||||||
damage: 7.0,
|
damage: 14.0,
|
||||||
tick_rate: 3.0,
|
tick_rate: 3.0,
|
||||||
range: 15.0,
|
range: 15.0,
|
||||||
max_angle: 22.5,
|
max_angle: 22.5,
|
||||||
|
|||||||
@ -2,49 +2,49 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 22.0,
|
base_damage: 44.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 1.3,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 2.0,
|
forward_movement: 2.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 22.0,
|
base_damage: 44.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 22.0,
|
base_damage: 44.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 4.0,
|
damage: 8.0,
|
||||||
poise: 30.0,
|
poise: 30.0,
|
||||||
knockback: 2.0,
|
knockback: 2.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 8.0,
|
damage: 16.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 7.0,
|
knockback: 7.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 2.0,
|
forward_speed: 2.0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
charge_duration: 0.8,
|
charge_duration: 1.6,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 1.0,
|
recover_duration: 2.0,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -2,65 +2,65 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 6.0,
|
base_damage: 12.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 15,
|
base_poise_damage: 15,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 1.0,
|
knockback: 1.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.6,
|
base_buildup_duration: 1.2,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.1,
|
base_recover_duration: 0.2,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 6.0,
|
base_damage: 12.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 15,
|
base_poise_damage: 15,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 1.0,
|
knockback: 1.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.15,
|
base_buildup_duration: 0.3,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.1,
|
base_recover_duration: 0.2,
|
||||||
forward_movement: 0.8,
|
forward_movement: 0.8,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 6.0,
|
base_damage: 12.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 15,
|
base_poise_damage: 15,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 1.0,
|
knockback: 1.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.2,
|
base_buildup_duration: 0.4,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.1,
|
base_recover_duration: 0.2,
|
||||||
forward_movement: 0.8,
|
forward_movement: 0.8,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 4,
|
stage: 4,
|
||||||
base_damage: 6.0,
|
base_damage: 12.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 15,
|
base_poise_damage: 15,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 8.0,
|
knockback: 8.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.2,
|
base_buildup_duration: 0.4,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.1,
|
base_recover_duration: 0.2,
|
||||||
forward_movement: 0.8,
|
forward_movement: 0.8,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 1.6,
|
||||||
recover_duration: 0.35,
|
recover_duration: 0.7,
|
||||||
projectile: NecroticSphere(
|
projectile: NecroticSphere(
|
||||||
damage: 13.0,
|
damage: 26.0,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
energy_regen: 0,
|
energy_regen: 0,
|
||||||
min_falloff: 0.5,
|
min_falloff: 0.5,
|
||||||
|
|||||||
@ -3,13 +3,13 @@ ChargedMelee(
|
|||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 4.0,
|
damage: 8.0,
|
||||||
poise: 30.0,
|
poise: 30.0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 20.0,
|
damage: 40.0,
|
||||||
poise: 80.0,
|
poise: 80.0,
|
||||||
knockback: 20.0,
|
knockback: 20.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -17,7 +17,7 @@ ChargedMelee(
|
|||||||
range: 6.0,
|
range: 6.0,
|
||||||
angle: 90.0,
|
angle: 90.0,
|
||||||
),
|
),
|
||||||
charge_duration: 0.8,
|
charge_duration: 3.2,
|
||||||
swing_duration: 0.7,
|
swing_duration: 0.7,
|
||||||
hit_timing: 0.9,
|
hit_timing: 0.9,
|
||||||
recover_duration: 0.7,
|
recover_duration: 0.7,
|
||||||
|
|||||||
@ -2,39 +2,39 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 8.0,
|
base_damage: 16.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 22,
|
poise_damage_increase: 22,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 1.3,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 2.0,
|
forward_movement: 2.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 8.0,
|
base_damage: 16.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 22,
|
base_poise_damage: 22,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 10.0,
|
knockback: 10.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.2,
|
base_buildup_duration: 0.4,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 8.0,
|
base_damage: 16.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 22,
|
base_poise_damage: 22,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
@ -44,7 +44,7 @@ ComboMelee(
|
|||||||
base_buildup_duration: 0.2,
|
base_buildup_duration: 0.2,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 10.0,
|
base_damage: 20.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 28,
|
base_poise_damage: 28,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.7,
|
range: 2.7,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,49 +2,49 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 5.0,
|
base_damage: 10.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 15,
|
base_poise_damage: 15,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.45,
|
base_buildup_duration: 0.9,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 5.0,
|
base_damage: 10.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 18,
|
base_poise_damage: 18,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 0.0,
|
forward_movement: 0.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 5.0,
|
base_damage: 10.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.07,
|
base_swing_duration: 0.07,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.2,
|
base_recover_duration: 0.4,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,15 +2,15 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 7.0,
|
damage: 14.0,
|
||||||
poise: 28.0,
|
poise: 28.0,
|
||||||
knockback: 8.0,
|
knockback: 8.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 28.0,
|
damage: 65.0,
|
||||||
poise: 40.0,
|
poise: 35.0,
|
||||||
knockback: 17.0,
|
knockback: 14.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
)),
|
)),
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 2.0,
|
forward_speed: 2.0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
charge_duration: 1.2,
|
charge_duration: 2.4,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 1.1,
|
recover_duration: 2.2,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -2,33 +2,33 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 25.0,
|
base_damage: 50.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 22,
|
base_poise_damage: 22,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 1.3,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 37.0,
|
base_damage: 74.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 0,
|
base_poise_damage: 0,
|
||||||
poise_damage_increase: 22,
|
poise_damage_increase: 22,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 0.5,
|
forward_movement: 0.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
BasicMelee(
|
BasicMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.65,
|
buildup_duration: 1.15,
|
||||||
swing_duration: 0.3,
|
swing_duration: 0.3,
|
||||||
recover_duration: 0.35,
|
recover_duration: 0.85,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 10.0,
|
damage:20.0,
|
||||||
poise: 28.0,
|
poise: 28.0,
|
||||||
knockback: 25.0,
|
knockback: 25.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -2,33 +2,33 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 8.0,
|
base_damage: 16.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 30,
|
base_poise_damage: 30,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 1.3,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 8.0,
|
base_damage: 16.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 30,
|
base_poise_damage: 30,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.5,
|
forward_movement: 1.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,19 +1,19 @@
|
|||||||
LeapMelee(
|
LeapMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.5,
|
||||||
movement_duration: 0.4,
|
movement_duration: 0.8,
|
||||||
swing_duration: 0.075,
|
swing_duration: 0.075,
|
||||||
recover_duration: 0.2,
|
recover_duration: 0.6,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 12.0,
|
damage: 36.0,
|
||||||
poise: 60.0,
|
poise: 60.0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
range: 4.5,
|
range: 6.75,
|
||||||
angle: 180.0,
|
angle: 180.0,
|
||||||
),
|
),
|
||||||
forward_leap_strength: 40.0,
|
forward_leap_strength: 45.0,
|
||||||
vertical_leap_strength: 10.0,
|
vertical_leap_strength: 10.0,
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
LeapMelee(
|
LeapMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.2,
|
buildup_duration: 0.8,
|
||||||
movement_duration: 0.3,
|
movement_duration: 0.6,
|
||||||
swing_duration: 0.075,
|
swing_duration: 0.075,
|
||||||
recover_duration: 0.125,
|
recover_duration: 0.25,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 8.0,
|
damage: 16.0,
|
||||||
poise: 30.0,
|
poise: 30.0,
|
||||||
knockback: 2.0,
|
knockback: 2.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 7.5,
|
damage: 15.0,
|
||||||
poise: 28.0,
|
poise: 28.0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 2.0,
|
damage: 4.0,
|
||||||
poise: 28.0,
|
poise: 28.0,
|
||||||
knockback: 7.0,
|
knockback: 7.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -17,11 +17,11 @@ DashMelee(
|
|||||||
angle: 45.0,
|
angle: 45.0,
|
||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 2.5,
|
forward_speed: 1.8,
|
||||||
buildup_duration: 1.2,
|
buildup_duration: 1.5,
|
||||||
charge_duration: 1.0,
|
charge_duration: 1.2,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 1.0,
|
recover_duration: 2.0,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -2,49 +2,49 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 10.0,
|
base_damage: 20.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 15,
|
base_poise_damage: 15,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 40.0,
|
angle: 40.0,
|
||||||
base_buildup_duration: 0.6,
|
base_buildup_duration: 1.2,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 0.3,
|
forward_movement: 0.3,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 2,
|
stage: 2,
|
||||||
base_damage: 10.0,
|
base_damage: 20.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 17,
|
base_poise_damage: 17,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 40.0,
|
angle: 40.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 0.5,
|
forward_movement: 0.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 10.0,
|
base_damage: 20.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
range: 2.2,
|
range: 2.2,
|
||||||
angle: 40.0,
|
angle: 40.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 0.5,
|
forward_movement: 0.5,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 3.0,
|
base_damage: 6.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 10,
|
base_poise_damage: 10,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 1.0,
|
knockback: 1.0,
|
||||||
range: 1.5,
|
range: 1.5,
|
||||||
angle: 50.0,
|
angle: 50.0,
|
||||||
base_buildup_duration: 0.3,
|
base_buildup_duration: 0.6,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.6,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
Shockwave(
|
Shockwave(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.6,
|
buildup_duration: 1.2,
|
||||||
swing_duration: 0.12,
|
swing_duration: 0.12,
|
||||||
recover_duration: 1.2,
|
recover_duration: 2.4,
|
||||||
damage: 50.0,
|
damage: 100.0,
|
||||||
poise_damage: 50,
|
poise_damage: 50,
|
||||||
knockback: (strength: 40.0, direction: TowardsUp),
|
knockback: (strength: 40.0, direction: TowardsUp),
|
||||||
shockwave_angle: 100.0,
|
shockwave_angle: 100.0,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 30.0,
|
base_damage: 60.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 40,
|
base_poise_damage: 40,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 3.5,
|
range: 3.5,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.9,
|
base_buildup_duration: 1.8,
|
||||||
base_swing_duration: 0.1,
|
base_swing_duration: 0.1,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.9,
|
base_recover_duration: 1.8,
|
||||||
forward_movement: 3.0,
|
forward_movement: 3.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
SpinMelee(
|
SpinMelee(
|
||||||
buildup_duration: 0.1,
|
buildup_duration: 0.2,
|
||||||
swing_duration: 0.3,
|
swing_duration: 0.3,
|
||||||
recover_duration: 0.1,
|
recover_duration: 0.1,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 50.0,
|
damage: 100.0,
|
||||||
poise: 30.0,
|
poise: 30.0,
|
||||||
knockback: 0.0,
|
knockback: 0.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -2,13 +2,13 @@ DashMelee(
|
|||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 12.0,
|
damage: 20.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 8.0,
|
knockback: 8.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 16.0,
|
damage: 25.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 17.0,
|
knockback: 17.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 2.0,
|
forward_speed: 2.0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 1.0,
|
||||||
charge_duration: 1.2,
|
charge_duration: 2.4,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 1.1,
|
recover_duration: 1.8,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 27.0,
|
base_damage: 54.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 40,
|
base_poise_damage: 40,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 4.0,
|
knockback: 4.0,
|
||||||
range: 7.5,
|
range: 7.5,
|
||||||
angle: 60.0,
|
angle: 60.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 3.0,
|
forward_movement: 3.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,49 +2,49 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 30.0,
|
base_damage: 40.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 35,
|
base_poise_damage: 32.5,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 7.5,
|
range: 7.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.7,
|
base_buildup_duration: 1.3,
|
||||||
|
base_swing_duration: 0.15,
|
||||||
|
hit_timing: 0.5,
|
||||||
|
base_recover_duration: 0.5,
|
||||||
|
forward_movement: 1.0,
|
||||||
|
damage_kind: Crushing,
|
||||||
|
),
|
||||||
|
(
|
||||||
|
stage: 2,
|
||||||
|
base_damage: 50.0,
|
||||||
|
damage_increase: 0,
|
||||||
|
base_poise_damage: 32.5,
|
||||||
|
poise_damage_increase: 0,
|
||||||
|
knockback: 3.0,
|
||||||
|
range: 5.5,
|
||||||
|
angle: 30.0,
|
||||||
|
base_buildup_duration: 0.2,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.3,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
|
||||||
stage: 2,
|
|
||||||
base_damage: 34.0,
|
|
||||||
damage_increase: 0,
|
|
||||||
base_poise_damage: 35,
|
|
||||||
poise_damage_increase: 0,
|
|
||||||
knockback: 3.0,
|
|
||||||
range: 5.5,
|
|
||||||
angle: 30.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,
|
|
||||||
),
|
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 40.0,
|
base_damage: 60.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 35,
|
base_poise_damage: 32.5,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 25.0,
|
knockback: 25.0,
|
||||||
range: 5.5,
|
range: 5.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.3,
|
base_buildup_duration: 0.4,
|
||||||
base_swing_duration: 0.125,
|
base_swing_duration: 0.125,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.9,
|
base_recover_duration: 1.6,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 11.0,
|
base_damage: 22.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 28,
|
base_poise_damage: 28,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 2.0,
|
knockback: 2.0,
|
||||||
range: 3.0,
|
range: 3.0,
|
||||||
angle: 15.0,
|
angle: 15.0,
|
||||||
base_buildup_duration: 0.4,
|
base_buildup_duration: 0.8,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 3.0,
|
forward_movement: 3.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,7 +2,23 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 11.0,
|
base_damage: 16.5,
|
||||||
|
damage_increase: 0,
|
||||||
|
base_poise_damage: 20,
|
||||||
|
poise_damage_increase: 0,
|
||||||
|
knockback: 3.0,
|
||||||
|
range: 3.0,
|
||||||
|
angle: 15.0,
|
||||||
|
base_buildup_duration: 0.95,
|
||||||
|
base_swing_duration: 0.15,
|
||||||
|
hit_timing: 0.5,
|
||||||
|
base_recover_duration: 0.50,
|
||||||
|
forward_movement: 1.0,
|
||||||
|
damage_kind: Crushing,
|
||||||
|
),
|
||||||
|
(
|
||||||
|
stage: 2,
|
||||||
|
base_damage: 30.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
@ -12,39 +28,23 @@ ComboMelee(
|
|||||||
base_buildup_duration: 0.65,
|
base_buildup_duration: 0.65,
|
||||||
base_swing_duration: 0.15,
|
base_swing_duration: 0.15,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.3,
|
base_recover_duration: 0.50,
|
||||||
forward_movement: 1.0,
|
|
||||||
damage_kind: Crushing,
|
|
||||||
),
|
|
||||||
(
|
|
||||||
stage: 2,
|
|
||||||
base_damage: 15.0,
|
|
||||||
damage_increase: 0,
|
|
||||||
base_poise_damage: 20,
|
|
||||||
poise_damage_increase: 0,
|
|
||||||
knockback: 3.0,
|
|
||||||
range: 3.0,
|
|
||||||
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,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
stage: 3,
|
stage: 3,
|
||||||
base_damage: 18.0,
|
base_damage: 36.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 20,
|
base_poise_damage: 20,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 3.0,
|
range: 3.0,
|
||||||
angle: 15.0,
|
angle: 15.0,
|
||||||
base_buildup_duration: 0.35,
|
base_buildup_duration: 0.525,
|
||||||
base_swing_duration: 0.125,
|
base_swing_duration: 0.125,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.9,
|
base_recover_duration: 1.25,
|
||||||
forward_movement: 1.0,
|
forward_movement: 1.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 0.75,
|
||||||
recover_duration: 0.5,
|
recover_duration: 1.0,
|
||||||
beam_duration: 2.5,
|
beam_duration: 2.5,
|
||||||
damage: 5.0,
|
damage: 7.5,
|
||||||
tick_rate: 2.0,
|
tick_rate: 2.0,
|
||||||
range: 25.0,
|
range: 25.0,
|
||||||
max_angle: 15.0,
|
max_angle: 15.0,
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
BasicMelee(
|
BasicMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.3,
|
buildup_duration: 0.45,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.6,
|
recover_duration: 1.2,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 5.0,
|
damage: 7.5,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 50.0,
|
knockback: 50.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -8,7 +8,7 @@ DashMelee(
|
|||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
),
|
),
|
||||||
scaled: Some(Bash(
|
scaled: Some(Bash(
|
||||||
damage: 25.0,
|
damage: 12.5,
|
||||||
poise: 40.0,
|
poise: 40.0,
|
||||||
knockback: 30.0,
|
knockback: 30.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
@ -18,10 +18,10 @@ DashMelee(
|
|||||||
),
|
),
|
||||||
energy_drain: 0,
|
energy_drain: 0,
|
||||||
forward_speed: 10.0,
|
forward_speed: 10.0,
|
||||||
buildup_duration: 0.4,
|
buildup_duration: 0.6,
|
||||||
charge_duration: 2.0,
|
charge_duration: 4.0,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.5,
|
recover_duration: 1.0,
|
||||||
ori_modifier: 0.3,
|
ori_modifier: 0.3,
|
||||||
charge_through: false,
|
charge_through: false,
|
||||||
is_interruptible: false,
|
is_interruptible: false,
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
BasicSummon(
|
BasicSummon(
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 0.75,
|
||||||
cast_duration: 1.0,
|
cast_duration: 1.0,
|
||||||
recover_duration: 0.5,
|
recover_duration: 0.75,
|
||||||
summon_amount: 1,
|
summon_amount: 1,
|
||||||
summon_distance: (1, 1),
|
summon_distance: (1, 1),
|
||||||
summon_info: (
|
summon_info: (
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
Shockwave(
|
Shockwave(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.4,
|
buildup_duration: 0.6,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 3.5,
|
recover_duration: 7.0,
|
||||||
damage: 1.0,
|
damage: 1.5,
|
||||||
poise_damage: 0,
|
poise_damage: 0,
|
||||||
knockback: ( strength: 18.0, direction: Away),
|
knockback: ( strength: 18.0, direction: Away),
|
||||||
shockwave_angle: 360.0,
|
shockwave_angle: 360.0,
|
||||||
|
|||||||
@ -4,7 +4,7 @@ SpinMelee(
|
|||||||
recover_duration: 0.0,
|
recover_duration: 0.0,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Slash(
|
kind: Slash(
|
||||||
damage: 40.0,
|
damage: 80.0,
|
||||||
poise: 0.0,
|
poise: 0.0,
|
||||||
knockback: 50.0,
|
knockback: 50.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 1.0,
|
buildup_duration: 1.5,
|
||||||
recover_duration: 0.3,
|
recover_duration: 0.45,
|
||||||
projectile: Arrow(
|
projectile: Arrow(
|
||||||
damage: 20.0,
|
damage: 30.0,
|
||||||
knockback: 5.0,
|
knockback: 5.0,
|
||||||
energy_regen: 10.0,
|
energy_regen: 10.0,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.25,
|
buildup_duration: 0.375,
|
||||||
recover_duration: 0.25,
|
recover_duration: 0.375,
|
||||||
beam_duration: 1.0,
|
beam_duration: 2.0,
|
||||||
damage: 3.5,
|
damage: 5.25,
|
||||||
tick_rate: 3.0,
|
tick_rate: 3.0,
|
||||||
range: 20.0,
|
range: 20.0,
|
||||||
max_angle: 15.0,
|
max_angle: 15.0,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
BasicRanged(
|
BasicRanged(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.5,
|
buildup_duration: 0.5,
|
||||||
recover_duration: 0.35,
|
recover_duration: 1.4,
|
||||||
projectile: Frostball(
|
projectile: Frostball(
|
||||||
damage: 12.0,
|
damage: 24.0,
|
||||||
radius: 5.0,
|
radius: 5.0,
|
||||||
min_falloff: 0.5,
|
min_falloff: 0.5,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2,17 +2,17 @@ ComboMelee(
|
|||||||
stage_data: [
|
stage_data: [
|
||||||
(
|
(
|
||||||
stage: 1,
|
stage: 1,
|
||||||
base_damage: 18.0,
|
base_damage: 36.0,
|
||||||
damage_increase: 0,
|
damage_increase: 0,
|
||||||
base_poise_damage: 40,
|
base_poise_damage: 40,
|
||||||
poise_damage_increase: 0,
|
poise_damage_increase: 0,
|
||||||
knockback: 3.0,
|
knockback: 3.0,
|
||||||
range: 2.5,
|
range: 2.5,
|
||||||
angle: 30.0,
|
angle: 30.0,
|
||||||
base_buildup_duration: 0.6,
|
base_buildup_duration: 1.2,
|
||||||
base_swing_duration: 0.2,
|
base_swing_duration: 0.4,
|
||||||
hit_timing: 0.5,
|
hit_timing: 0.5,
|
||||||
base_recover_duration: 0.4,
|
base_recover_duration: 0.8,
|
||||||
forward_movement: 5.0,
|
forward_movement: 5.0,
|
||||||
damage_kind: Crushing,
|
damage_kind: Crushing,
|
||||||
),
|
),
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
Shockwave(
|
Shockwave(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 1.5,
|
buildup_duration: 4.5,
|
||||||
swing_duration: 0.12,
|
swing_duration: 0.12,
|
||||||
recover_duration: 1.2,
|
recover_duration: 3.6,
|
||||||
damage: 20.0,
|
damage: 60.0,
|
||||||
poise_damage: 30,
|
poise_damage: 30,
|
||||||
knockback: (strength: 30.0, direction: TowardsUp),
|
knockback: (strength: 30.0, direction: TowardsUp),
|
||||||
shockwave_angle: 90.0,
|
shockwave_angle: 90.0,
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
SpinMelee(
|
SpinMelee(
|
||||||
buildup_duration: 0.35,
|
buildup_duration: 1.05,
|
||||||
swing_duration: 0.3,
|
swing_duration: 0.3,
|
||||||
recover_duration: 0.2,
|
recover_duration: 0.6,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 15.0,
|
damage: 45.0,
|
||||||
poise: 30.0,
|
poise: 30.0,
|
||||||
knockback: 20.0,
|
knockback: 20.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
BasicMelee(
|
BasicMelee(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 2.4,
|
||||||
swing_duration: 0.1,
|
swing_duration: 0.1,
|
||||||
recover_duration: 0.5,
|
recover_duration: 1.5,
|
||||||
melee_constructor: (
|
melee_constructor: (
|
||||||
kind: Bash(
|
kind: Bash(
|
||||||
damage: 10.0,
|
damage: 30.0,
|
||||||
poise: 25.0,
|
poise: 25.0,
|
||||||
knockback: 15.0,
|
knockback: 15.0,
|
||||||
energy_regen: 0.0,
|
energy_regen: 0.0,
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
BasicBeam(
|
BasicBeam(
|
||||||
buildup_duration: 0.8,
|
buildup_duration: 1.2,
|
||||||
recover_duration: 0.25,
|
recover_duration: 0.5,
|
||||||
beam_duration: 0.25,
|
beam_duration: 0.5,
|
||||||
damage: 1.0,
|
damage: 1.5,
|
||||||
tick_rate: 5.0,
|
tick_rate: 5.0,
|
||||||
range: 15.0,
|
range: 15.0,
|
||||||
max_angle: 30.0,
|
max_angle: 30.0,
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
Shockwave(
|
Shockwave(
|
||||||
energy_cost: 0,
|
energy_cost: 0,
|
||||||
buildup_duration: 0.6,
|
buildup_duration: 0.9,
|
||||||
swing_duration: 0.15,
|
swing_duration: 0.15,
|
||||||
recover_duration: 1.0,
|
recover_duration: 2.0,
|
||||||
damage: 10.0,
|
damage: 15.0,
|
||||||
poise_damage: 10,
|
poise_damage: 10,
|
||||||
knockback: (strength: 18.0, direction: Up),
|
knockback: (strength: 18.0, direction: Up),
|
||||||
shockwave_angle: 90.0,
|
shockwave_angle: 90.0,
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user