Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/veloren/veloren into xvar/wgpu-egui

Browse Source
This commit is contained in:
Ben Wallis 2021-06-17 21:36:38 +01:00
commit 71707f3ada
240 changed files with 3203 additions and 1323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

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

7
CHANGELOG.md
View File

@ -9,14 +9,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
- Added a skill tree for mining, which gains xp from mining ores and gems. - Added a skill tree for mining, which gains xp from mining ores and gems.
- Added debug line info to release builds, enhancing the usefulness of panic backtraces
- NPCs and animals can now make sounds in response to certain events
- Players can press H to greet others
### Changed ### Changed
- Entity-entity pushback is no longer applied in forced movement states like rolling and leaping. - Entity-entity pushback is no longer applied in forced movement states like rolling and leaping.
- Updated audio library (rodio 0.13 -> 0.14).
### Removed ### Removed
### Fixed ### Fixed
- Cases where no audio output could be produced before.
- Significantly improved the performance of playing sound effects
## [0.10.0] - 2021-06-12 ## [0.10.0] - 2021-06-12
### Added ### Added

178
Cargo.lock generated
View File

@ -619,15 +619,6 @@ dependencies = [
"objc_id", "objc_id",
] ]
[[package]]
name = "clipboard_wayland"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61bcb8cde0387fde807b9b7af66ce8bd1665ef736e46e6e47fda82ea003e6ade"
dependencies = [
"smithay-clipboard",
]
[[package]] [[package]]
name = "clipboard_wayland" name = "clipboard_wayland"
version = "0.2.0" version = "0.2.0"
@ -637,16 +628,6 @@ dependencies = [
"smithay-clipboard", "smithay-clipboard",
] ]
[[package]]
name = "clipboard_x11"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40403aa5220e5cd303d32dc4248cac8aa92bf47e3ae31e0e2481081755a63ff1"
dependencies = [
"thiserror",
"x11rb",
]
[[package]] [[package]]
name = "clipboard_x11" name = "clipboard_x11"
version = "0.3.1" version = "0.3.1"
@ -937,8 +918,8 @@ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
"mach 0.3.2", "mach 0.3.2",
"ndk 0.3.0", "ndk",
"ndk-glue 0.3.0", "ndk-glue",
"nix 0.20.0", "nix 0.20.0",
"oboe", "oboe",
"parking_lot 0.11.1", "parking_lot 0.11.1",
@ -1060,6 +1041,20 @@ dependencies = [
"itertools 0.9.0", "itertools 0.9.0",
] ]
[[package]]
name = "crossbeam"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-channel",
"crossbeam-deque 0.8.0",
"crossbeam-epoch 0.9.5",
"crossbeam-queue",
"crossbeam-utils 0.8.5",
]
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.1" version = "0.5.1"
@ -2449,13 +2444,13 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.3.0" version = "0.4.0"
source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf" source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.2.0" version = "0.3.0"
source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf" source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
dependencies = [ dependencies = [
"futures", "futures",
"log", "log",
@ -2464,8 +2459,8 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.1.0" version = "0.2.0"
source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf" source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"glam", "glam",
@ -2477,8 +2472,8 @@ dependencies = [
[[package]] [[package]]
name = "iced_native" name = "iced_native"
version = "0.3.0" version = "0.4.0"
source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf" source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -2489,16 +2484,16 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.2.0" version = "0.3.0"
source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf" source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
dependencies = [ dependencies = [
"iced_core", "iced_core",
] ]
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.2.0" version = "0.3.0"
source = "git+https://github.com/hecrj/iced?rev=8d882d787e6b7fd7c2435f42f82933e2ed904edf#8d882d787e6b7fd7c2435f42f82933e2ed904edf" source = "git+https://github.com/Imberflur/iced?tag=winit-0.25#18a48a5eeefd2aa6e50f5dd0751ac2e94c88a9eb"
dependencies = [ dependencies = [
"iced_futures", "iced_futures",
"iced_graphics", "iced_graphics",
@ -2506,7 +2501,7 @@ dependencies = [
"log", "log",
"thiserror", "thiserror",
"winapi 0.3.9", "winapi 0.3.9",
"window_clipboard 0.1.4", "window_clipboard",
"winit", "winit",
] ]
@ -2700,7 +2695,7 @@ dependencies = [
[[package]] [[package]]
name = "keyboard-keynames" name = "keyboard-keynames"
version = "0.1.0" version = "0.1.0"
source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c#a97ae509cdb9dc70cf1bf0af762d2d1d3a0d6e0c" source = "git+https://gitlab.com/Frinksy/keyboard-keynames.git?rev=9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc#9ae8f89014d0b0c5b61d0e821c5aeb6140c5c0dc"
dependencies = [ dependencies = [
"libc", "libc",
"memmap", "memmap",
@ -3091,6 +3086,18 @@ dependencies = [
"slab", "slab",
] ]
[[package]]
name = "mio-misc"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ddf05411bb159cdb5801bb10002afb66cb4572be656044315e363460ce69dc2"
dependencies = [
"crossbeam",
"crossbeam-queue",
"log",
"mio 0.7.11",
]
[[package]] [[package]]
name = "miow" name = "miow"
version = "0.2.2" version = "0.2.2"
@ -3160,18 +3167,6 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "ndk"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
dependencies = [
"jni-sys",
"ndk-sys",
"num_enum 0.4.3",
"thiserror",
]
[[package]] [[package]]
name = "ndk" name = "ndk"
version = "0.3.0" version = "0.3.0"
@ -3180,24 +3175,10 @@ checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
dependencies = [ dependencies = [
"jni-sys", "jni-sys",
"ndk-sys", "ndk-sys",
"num_enum 0.5.1", "num_enum",
"thiserror", "thiserror",
] ]
[[package]]
name = "ndk-glue"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241"
dependencies = [
"lazy_static",
"libc",
"log",
"ndk 0.2.1",
"ndk-macro",
"ndk-sys",
]
[[package]] [[package]]
name = "ndk-glue" name = "ndk-glue"
version = "0.3.0" version = "0.3.0"
@ -3207,7 +3188,7 @@ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
"log", "log",
"ndk 0.3.0", "ndk",
"ndk-macro", "ndk-macro",
"ndk-sys", "ndk-sys",
] ]
@ -3528,16 +3509,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "num_enum"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
dependencies = [
"derivative",
"num_enum_derive 0.4.3",
]
[[package]] [[package]]
name = "num_enum" name = "num_enum"
version = "0.5.1" version = "0.5.1"
@ -3545,19 +3516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
dependencies = [ dependencies = [
"derivative", "derivative",
"num_enum_derive 0.5.1", "num_enum_derive",
]
[[package]]
name = "num_enum_derive"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d"
dependencies = [
"proc-macro-crate",
"proc-macro2 1.0.27",
"quote 1.0.9",
"syn 1.0.72",
] ]
[[package]] [[package]]
@ -3637,8 +3596,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfa187b38ae20374617b7ad418034ed3dc90ac980181d211518bd03537ae8f8d" checksum = "dfa187b38ae20374617b7ad418034ed3dc90ac980181d211518bd03537ae8f8d"
dependencies = [ dependencies = [
"jni", "jni",
"ndk 0.3.0", "ndk",
"ndk-glue 0.3.0", "ndk-glue",
"num-derive", "num-derive",
"num-traits", "num-traits",
"oboe-sys", "oboe-sys",
@ -4440,9 +4399,9 @@ dependencies = [
[[package]] [[package]]
name = "rodio" name = "rodio"
version = "0.13.1" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b65c2eda643191f6d1bb12ea323a9db8d9ba95374e9be3780b5a9fb5cfb8520f" checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9"
dependencies = [ dependencies = [
"cpal", "cpal",
"lewton", "lewton",
@ -6215,7 +6174,7 @@ dependencies = [
"veloren-world", "veloren-world",
"wgpu", "wgpu",
"wgpu-profiler", "wgpu-profiler",
"window_clipboard 0.2.1", "window_clipboard",
"winit", "winit",
"winres", "winres",
] ]
@ -6825,7 +6784,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu" name = "wgpu"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu-rs.git?rev=7486bdad64bb5d17b709ecccb41e063469efff88#7486bdad64bb5d17b709ecccb41e063469efff88" source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"js-sys", "js-sys",
@ -6845,7 +6804,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-core" name = "wgpu-core"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0#53eab747a32414232be45d47cae8a43a369395d0" source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bitflags", "bitflags",
@ -6885,7 +6844,7 @@ dependencies = [
[[package]] [[package]]
name = "wgpu-types" name = "wgpu-types"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=53eab747a32414232be45d47cae8a43a369395d0#53eab747a32414232be45d47cae8a43a369395d0" source = "git+https://github.com/gfx-rs/wgpu.git?rev=a92b8549a8e2cb9dac781bafc5ed32828f3caf46#a92b8549a8e2cb9dac781bafc5ed32828f3caf46"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"serde", "serde",
@ -6953,19 +6912,6 @@ 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 = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "window_clipboard"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37cf16659e398a96f4ab8deff2b9db2ca0c3c5d6c1b59b1d577b7f888f0f03c6"
dependencies = [
"clipboard-win 4.2.1",
"clipboard_macos",
"clipboard_wayland 0.1.2",
"clipboard_x11 0.2.0",
"raw-window-handle",
]
[[package]] [[package]]
name = "window_clipboard" name = "window_clipboard"
version = "0.2.1" version = "0.2.1"
@ -6974,15 +6920,16 @@ checksum = "33a4518b538a45ad39d138a8c3bea8f6b4452174aeb38143d1dd643a3a838ccc"
dependencies = [ dependencies = [
"clipboard-win 4.2.1", "clipboard-win 4.2.1",
"clipboard_macos", "clipboard_macos",
"clipboard_wayland 0.2.0", "clipboard_wayland",
"clipboard_x11 0.3.1", "clipboard_x11",
"raw-window-handle", "raw-window-handle",
] ]
[[package]] [[package]]
name = "winit" name = "winit"
version = "0.24.0" version = "0.25.0"
source = "git+https://gitlab.com/veloren/winit.git?branch=macos-test-spiffed#488c511802dfd95ca54f6f76a38547c93c7b02c9" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cocoa", "cocoa",
@ -6994,15 +6941,16 @@ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
"log", "log",
"mio 0.6.23", "mio 0.7.11",
"mio-extras", "mio-misc",
"ndk 0.2.1", "ndk",
"ndk-glue 0.2.1", "ndk-glue",
"ndk-sys", "ndk-sys",
"objc", "objc",
"parking_lot 0.11.1", "parking_lot 0.11.1",
"percent-encoding", "percent-encoding",
"raw-window-handle", "raw-window-handle",
"scopeguard",
"serde", "serde",
"smithay-client-toolkit", "smithay-client-toolkit",
"wayland-client 0.28.5", "wayland-client 0.28.5",

7
Cargo.toml
View File

@ -89,7 +89,8 @@ opt-level = 3
overflow-checks = false overflow-checks = false
debug-assertions = false debug-assertions = false
lto = true lto = true
debug = false debug = 1 # line tables so we can have useful backtraces
panic = "abort" # don't need unwinding so we can skip including the landing pads for that
# used for cargo bench # used for cargo bench
[profile.bench] [profile.bench]
@ -113,11 +114,9 @@ buildInputs = ["openssl"]
nativeBuildInputs = ["pkg-config"] nativeBuildInputs = ["pkg-config"]
[patch.crates-io] [patch.crates-io]
# macos CI fix isn't released yet
winit = { git = "https://gitlab.com/veloren/winit.git", branch = "macos-test-spiffed" }
vek = { git = "https://gitlab.com/veloren/vek.git", branch = "fix_intrinsics2" } vek = { git = "https://gitlab.com/veloren/vek.git", branch = "fix_intrinsics2" }
# patch wgpu so we can use wgpu-profiler crate # patch wgpu so we can use wgpu-profiler crate
wgpu = { git = "https://github.com/gfx-rs/wgpu-rs.git", rev = "7486bdad64bb5d17b709ecccb41e063469efff88" } wgpu = { git = "https://github.com/gfx-rs/wgpu.git", rev = "a92b8549a8e2cb9dac781bafc5ed32828f3caf46" }
# # use the latest fixes in naga (remove when updates trickle down to wgpu-rs) # # use the latest fixes in naga (remove when updates trickle down to wgpu-rs)
# naga = { git = "https://github.com/gfx-rs/naga.git", rev = "3a0f0144112ff621dd7f731bf455adf6cab19164" } # naga = { git = "https://github.com/gfx-rs/naga.git", rev = "3a0f0144112ff621dd7f731bf455adf6cab19164" }

27
assets/common/abilities/ability_set_manifest.ron
View File

@ -149,13 +149,20 @@
abilities: [], abilities: [],
), ),
Custom("Basilisk"): ( Custom("Basilisk"): (
primary: "common.abilities.custom.basilisk.singlestrike", primary: "common.abilities.custom.basilisk.petrify",
secondary: "common.abilities.custom.basilisk.triplestrike", secondary: "common.abilities.custom.basilisk.triplestrike",
abilities: [
(None, "common.abilities.custom.basilisk.dash"),
],
),
Custom("Asp"): (
primary: "common.abilities.custom.asp.singlestrike",
secondary: "common.abilities.custom.asp.firebomb",
abilities: [], abilities: [],
), ),
Custom("Quad Low Ranged"): ( Custom("Maneater"): (
primary: "common.abilities.custom.quadlowranged.singlestrike", primary: "common.abilities.custom.maneater.singlestrike",
secondary: "common.abilities.custom.quadlowranged.firebomb", secondary: "common.abilities.custom.maneater.poisonball",
abilities: [], abilities: [],
), ),
Custom("Quad Low Breathe"): ( Custom("Quad Low Breathe"): (
@ -264,6 +271,18 @@
(None, "common.abilities.custom.birdlargefire.fireshockwave"), (None, "common.abilities.custom.birdlargefire.fireshockwave"),
], ],
), ),
Custom("Bird Large Basic"): (
primary: "common.abilities.custom.birdlargebasic.triplestrike",
secondary: "common.abilities.custom.birdlargebasic.summontornadoes",
abilities: [
(None, "common.abilities.custom.birdlargebasic.dash"),
],
),
Custom("Tornado"): (
primary: "common.abilities.custom.tornado.spin",
secondary: "common.abilities.empty.basic",
abilities: [],
),
Tool(Debug): ( Tool(Debug): (
primary: "common.abilities.debug.forwardboost", primary: "common.abilities.debug.forwardboost",
secondary: "common.abilities.debug.upboost", secondary: "common.abilities.debug.upboost",

6
assets/common/abilities/axe/doublestrike.ron
View File

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

2
assets/common/abilities/axesimple/doublestrike.ron
View File

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

18
assets/common/abilities/custom/asp/firebomb.ron Normal file
View File

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

9
assets/common/abilities/custom/quadlowranged/singlestrike.ron → assets/common/abilities/custom/asp/singlestrike.ron
View File

@ -2,17 +2,18 @@ ComboMelee(
stage_data: [ stage_data: [
( (
stage: 1, stage: 1,
base_damage: 80, base_damage: 140,
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.4, base_buildup_duration: 0.6,
base_swing_duration: 0.1, base_swing_duration: 0.1,
base_recover_duration: 0.4, hit_timing: 0.5,
forward_movement: 3.0, base_recover_duration: 0.2,
forward_movement: 2.0,
damage_kind: Crushing, damage_kind: Crushing,
), ),
], ],

20
assets/common/abilities/custom/basilisk/dash.ron Normal file
View File

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

19
assets/common/abilities/custom/basilisk/petrify.ron Normal file
View File

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

17
assets/common/abilities/custom/basilisk/triplestrike.ron
View File

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

20
assets/common/abilities/custom/birdlargebasic/dash.ron Normal file
View File

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

18
assets/common/abilities/custom/birdlargebasic/summontornadoes.ron Normal file
View File

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

60
assets/common/abilities/custom/birdlargebasic/triplestrike.ron Normal file
View File

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

3
assets/common/abilities/custom/birdlargebreathe/triplestrike.ron
View File

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

3
assets/common/abilities/custom/birdlargefire/triplestrike.ron
View File

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

5
assets/common/abilities/custom/husk/singlestrike.ron
View File

@ -2,15 +2,16 @@ ComboMelee(
stage_data: [ stage_data: [
( (
stage: 1, stage: 1,
base_damage: 90, base_damage: 160,
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: 2.5,
angle: 60.0, angle: 60.0,
base_buildup_duration: 0.25, base_buildup_duration: 0.25,
base_swing_duration: 0.07, base_swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.25, base_recover_duration: 0.25,
forward_movement: 0.5, forward_movement: 0.5,
damage_kind: Crushing, damage_kind: Crushing,

27
assets/common/abilities/custom/husk/triplestrike.ron
View File

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

18
assets/common/abilities/custom/maneater/poisonball.ron Normal file
View File

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

15
assets/common/abilities/custom/basilisk/singlestrike.ron → assets/common/abilities/custom/maneater/singlestrike.ron
View File

@ -2,17 +2,18 @@ ComboMelee(
stage_data: [ stage_data: [
( (
stage: 1, stage: 1,
base_damage: 130, base_damage: 200,
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.0, range: 3.5,
angle: 60.0, angle: 60.0,
base_buildup_duration: 0.4, base_buildup_duration: 0.5,
base_swing_duration: 0.07, base_swing_duration: 0.075,
base_recover_duration: 0.4, hit_timing: 0.5,
forward_movement: 3.0, base_recover_duration: 0.2,
forward_movement: 2.0,
damage_kind: Crushing, damage_kind: Crushing,
), ),
], ],
@ -23,5 +24,5 @@ ComboMelee(
max_speed_increase: 0.0, max_speed_increase: 0.0,
scales_from_combo: 0, scales_from_combo: 0,
is_interruptible: false, is_interruptible: false,
ori_modifier: 0.6, ori_modifier: 0.65,
) )

2
assets/common/abilities/custom/mindflayer/necroticsphere.ron
View File

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

4
assets/common/abilities/custom/mindflayer/necroticvortex.ron
View File

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

4
assets/common/abilities/custom/mindflayer/summonminions.ron
View File

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

5
assets/common/abilities/custom/quadlowbasic/singlestrike.ron
View File

@ -2,15 +2,16 @@ ComboMelee(
stage_data: [ stage_data: [
( (
stage: 1, stage: 1,
base_damage: 100, base_damage: 200,
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.4, base_buildup_duration: 0.6,
base_swing_duration: 0.07, base_swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.4, base_recover_duration: 0.4,
forward_movement: 3.0, forward_movement: 3.0,
damage_kind: Crushing, damage_kind: Crushing,

15
assets/common/abilities/custom/quadlowbasic/triplestrike.ron
View File

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

4
assets/common/abilities/custom/quadlowbreathe/dash.ron
View File

@ -1,7 +1,7 @@
DashMelee( DashMelee(
energy_cost: 0, energy_cost: 0,
base_damage: 50, base_damage: 80,
scaled_damage: 100, scaled_damage: 150,
base_poise_damage: 25, base_poise_damage: 25,
scaled_poise_damage: 0, scaled_poise_damage: 0,
base_knockback: 4.0, base_knockback: 4.0,

2
assets/common/abilities/custom/quadlowbreathe/flamethrower.ron
View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.4, buildup_duration: 0.4,
recover_duration: 0.25, recover_duration: 0.25,
beam_duration: 0.5, beam_duration: 0.5,
damage: 40, damage: 70,
tick_rate: 3.0, tick_rate: 3.0,
range: 15.0, range: 15.0,
max_angle: 22.5, max_angle: 22.5,

21
assets/common/abilities/custom/quadlowbreathe/triplestrike.ron
View File

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

10
assets/common/abilities/custom/quadlowquick/quadstrike.ron
View File

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

6
assets/common/abilities/custom/quadlowranged/firebomb.ron
View File

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

2
assets/common/abilities/custom/quadlowtail/charged.ron
View File

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

3
assets/common/abilities/custom/quadlowtail/triplestrike.ron
View File

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

3
assets/common/abilities/custom/quadmedbasic/singlestrike.ron
View File

@ -6,11 +6,12 @@ ComboMelee(
damage_increase: 0, damage_increase: 0,
base_poise_damage: 28, base_poise_damage: 28,
poise_damage_increase: 0, poise_damage_increase: 0,
knockback: 5.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.4,
base_swing_duration: 0.1, base_swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.4, base_recover_duration: 0.4,
forward_movement: 1.0, forward_movement: 1.0,
damage_kind: Crushing, damage_kind: Crushing,

3
assets/common/abilities/custom/quadmedbasic/triplestrike.ron
View File

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

6
assets/common/abilities/custom/quadmedcharge/doublestrike.ron
View File

@ -6,11 +6,12 @@ ComboMelee(
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: 4.0,
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
base_buildup_duration: 0.65, base_buildup_duration: 0.65,
base_swing_duration: 0.1, base_swing_duration: 0.1,
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,
@ -21,11 +22,12 @@ ComboMelee(
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: 4.0,
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
base_buildup_duration: 0.4, base_buildup_duration: 0.4,
base_swing_duration: 0.1, base_swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.3, base_recover_duration: 0.3,
forward_movement: 0.5, forward_movement: 0.5,
damage_kind: Crushing, damage_kind: Crushing,

6
assets/common/abilities/custom/quadmedhoof/basic.ron
View File

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

2
assets/common/abilities/custom/quadmedjump/doublestrike.ron
View File

@ -11,6 +11,7 @@ ComboMelee(
angle: 30.0, angle: 30.0,
base_buildup_duration: 0.65, base_buildup_duration: 0.65,
base_swing_duration: 0.1, base_swing_duration: 0.1,
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,
@ -26,6 +27,7 @@ ComboMelee(
angle: 30.0, angle: 30.0,
base_buildup_duration: 0.4, base_buildup_duration: 0.4,
base_swing_duration: 0.1, base_swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.3, base_recover_duration: 0.3,
forward_movement: 1.5, forward_movement: 1.5,
damage_kind: Crushing, damage_kind: Crushing,

3
assets/common/abilities/custom/quadmedquick/triplestrike.ron
View File

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

3
assets/common/abilities/custom/quadsmallbasic/singlestrike.ron
View File

@ -6,11 +6,12 @@ ComboMelee(
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: 1.0,
range: 1.5, range: 1.5,
angle: 50.0, angle: 50.0,
base_buildup_duration: 0.3, base_buildup_duration: 0.3,
base_swing_duration: 0.15, base_swing_duration: 0.15,
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,

1
assets/common/abilities/custom/stonegolemfist/singlestrike.ron
View File

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

5
assets/common/abilities/custom/theropodbasic/singlestrike.ron
View File

@ -2,15 +2,16 @@ ComboMelee(
stage_data: [ stage_data: [
( (
stage: 1, stage: 1,
base_damage: 130, base_damage: 270,
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.5, base_buildup_duration: 0.4,
base_swing_duration: 0.15, base_swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.4, base_recover_duration: 0.4,
forward_movement: 3.0, forward_movement: 3.0,
damage_kind: Crushing, damage_kind: Crushing,

21
assets/common/abilities/custom/theropodbasic/triplestrike.ron
View File

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

1
assets/common/abilities/custom/theropodbird/singlestrike.ron
View File

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

3
assets/common/abilities/custom/theropodbird/triplestrike.ron
View File

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

4
assets/common/abilities/custom/tidalwarrior/totem.ron
View File

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

19
assets/common/abilities/custom/tornado/spin.ron Normal file
View File

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

2
assets/common/abilities/custom/wendigomagic/frostbomb.ron
View File

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

5
assets/common/abilities/custom/wendigomagic/singlestrike.ron
View File

@ -2,15 +2,16 @@ ComboMelee(
stage_data: [ stage_data: [
( (
stage: 1, stage: 1,
base_damage: 120, base_damage: 180,
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: 2.5,
angle: 30.0, angle: 30.0,
base_buildup_duration: 0.6, base_buildup_duration: 0.6,
base_swing_duration: 0.2, base_swing_duration: 0.2,
hit_timing: 0.5,
base_recover_duration: 0.4, base_recover_duration: 0.4,
forward_movement: 5.0, forward_movement: 5.0,
damage_kind: Crushing, damage_kind: Crushing,

5
assets/common/abilities/hammer/singlestrike.ron
View File

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

18
assets/common/abilities/hammersimple/doublestrike.ron
View File

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

2
assets/common/abilities/spear/doublestrike.ron
View File

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

2
assets/common/abilities/sword/spin.ron
View File

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

9
assets/common/abilities/sword/triplestrike.ron
View File

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

2
assets/common/abilities/swordsimple/doublestrike.ron
View File

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

7
assets/common/cave_scatter/dark_floor.ron
View File

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

12
assets/common/cave_scatter/deep_floor.ron
View File

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

2
assets/common/cave_scatter/shallow_floor.ron
View File

@ -1,6 +1,6 @@
[ [
(110, Stones), (110, Stones),
(150, ShortGrass), (250, ShortGrass),
(50, CaveMushroom), (50, CaveMushroom),
(50, Mushroom), (50, Mushroom),
(30, AmethystSmall), (30, AmethystSmall),

17
assets/common/items/npc_armor/biped_large/generic.ron Normal file
View File

@ -0,0 +1,17 @@
ItemDef(
name: "Generic Biped Large",
description: "Worn by bipeds.",
kind: Armor((
kind: Chest("GenericBipedLarge"),
stats: (
protection: Normal(45.0),
poise_resilience: Normal(1.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

2
assets/common/items/npc_armor/biped_large/mindflayer.ron
View File

@ -4,7 +4,7 @@ ItemDef(
kind: Armor(( kind: Armor((
kind: Chest("Mindflayer"), kind: Chest("Mindflayer"),
stats: ( stats: (
protection: Normal(60.0), protection: Normal(110.0),
poise_resilience: Normal(1.0), poise_resilience: Normal(1.0),
energy_max: 0, energy_max: 0,
energy_reward: 0.0, energy_reward: 0.0,

17
assets/common/items/npc_armor/quadruped_low/generic.ron Normal file
View File

@ -0,0 +1,17 @@
ItemDef(
name: "Quad Low Generic",
description: "Scaly.",
kind: Armor((
kind: Chest("QuadrupedLowGeneric"),
stats: (
protection: Normal(40.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/npc_armor/quadruped_low/shell.ron Normal file
View File

@ -0,0 +1,17 @@
ItemDef(
name: "Quad Low Shell",
description: "Shell.",
kind: Armor((
kind: Chest("QuadrupedLowShell"),
stats: (
protection: Normal(750.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

17
assets/common/items/npc_armor/theropod/rugged.ron Normal file
View File

@ -0,0 +1,17 @@
ItemDef(
name: "Theropod Rugged",
description: "stronk.",
kind: Armor((
kind: Chest("TheropodRugged"),
stats: (
protection: Normal(80.0),
poise_resilience: Normal(0.0),
energy_max: 0,
energy_reward: 0.0,
crit_power: 0.0,
stealth: 0.0,
),
)),
quality: Moderate,
tags: [],
)

4
assets/common/items/npc_weapons/unique/quadlowranged.ron → assets/common/items/npc_weapons/unique/asp.ron
View File

@ -1,5 +1,5 @@
ItemDef( ItemDef(
name: "Quad Low Ranged", name: "Asp",
description: "testing123", description: "testing123",
kind: Tool(( kind: Tool((
kind: Natural, kind: Natural,
@ -14,5 +14,5 @@ ItemDef(
)), )),
quality: Low, quality: Low,
tags: [], tags: [],
ability_spec: Some(Custom("Quad Low Ranged")), ability_spec: Some(Custom("Asp")),
) )

19
assets/common/items/npc_weapons/unique/birdlargebasic.ron Normal file
View File

@ -0,0 +1,19 @@
ItemDef(
name: "Bird Large Basic",
description: "testing123",
kind: Tool((
kind: Natural,
hands: Two,
stats: Direct((
equip_time_secs: 0.01,
power: 1.0,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
crit_mult: 1.9142857,
)),
)),
quality: Low,
tags: [],
ability_spec: Some(Custom("Bird Large Basic")),
)

18
assets/common/items/npc_weapons/unique/maneater.ron Normal file
View File

@ -0,0 +1,18 @@
ItemDef(
name: "Maneater",
description: "testing123",
kind: Tool((
kind: Natural,
hands: Two,
stats: Direct((
equip_time_secs: 0.01,
power: 1.0,
poise_strength: 1.0,
speed: 1.0,
crit_chance: 0.0625,
)),
)),
quality: Low,
tags: [],
ability_spec: Some(Custom("Maneater")),
)

19
assets/common/items/npc_weapons/unique/tornado.ron Normal file
View File

@ -0,0 +1,19 @@
ItemDef(
name: "Tornado",
description: "Tornado weapon",
kind: Tool((
kind: Natural,
hands: Two,
stats: Direct((
equip_time_secs: 0.01,
power: 1.0,
poise_strength: 0.0,
speed: 1.0,
crit_chance: 0.0,
crit_mult: 0.0,
)),
)),
quality: Low,
tags: [],
ability_spec: Some(Custom("Tornado")),
)

4
assets/common/loot_tables/creature/bird_large/roc.ron Normal file
View File

@ -0,0 +1,4 @@
[
(0.5, Item("common.items.food.meat.beast_large_raw")),
(1.0, Item("common.items.crafting_ing.animal_misc.raptor_feather")),
]

2
assets/common/loot_tables/creature/quad_small/generic.ron
View File

@ -1,4 +1,4 @@
[ [
(1.0, Item("common.items.crafting_ing.hide.animal_hide")), (1.0, ItemQuantity("common.items.crafting_ing.hide.animal_hide", 1, 2)),
(0.25, Item("common.items.food.meat.beast_small_raw")), (0.25, Item("common.items.food.meat.beast_small_raw")),
] ]

13
assets/common/loot_tables/trading.ron
View File

@ -8,12 +8,17 @@
(1.0, Item("common.items.crafting_ing.hide.animal_hide")), (1.0, Item("common.items.crafting_ing.hide.animal_hide")),
(0.5, Item("common.items.crafting_ing.hide.tough_hide")), (0.5, Item("common.items.crafting_ing.hide.tough_hide")),
(0.2, Item("common.items.crafting_ing.hide.scales")), (0.2, Item("common.items.crafting_ing.hide.scales")),
(0.08, Item("common.items.crafting_ing.animal_misc.fur")), (0.8, Item("common.items.crafting_ing.animal_misc.fur")),
(0.08, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), (0.15, Item("common.items.crafting_ing.animal_misc.grim_eyeball")),
(0.08, Item("common.items.crafting_ing.animal_misc.icy_fang")), (0.1, Item("common.items.crafting_ing.animal_misc.icy_fang")),
(0.08, Item("common.items.crafting_ing.animal_misc.large_horn")), (0.08, Item("common.items.crafting_ing.animal_misc.large_horn")),
(0.08, Item("common.items.crafting_ing.animal_misc.lively_vine")), (0.15, Item("common.items.crafting_ing.animal_misc.lively_vine")),
(0.08, Item("common.items.crafting_ing.animal_misc.phoenix_feather")), (0.08, Item("common.items.crafting_ing.animal_misc.phoenix_feather")),
(1.0, Item("common.items.food.meat.beast_small_raw")),
(0.6, Item("common.items.food.meat.beast_large_raw")),
(1.3, Item("common.items.food.meat.bird_raw")),
(1.2, Item("common.items.food.meat.fish_raw")),
(0.8, Item("common.items.food.meat.tough_raw")),
(0.2, Item("common.items.mineral.ore.bloodstone")), (0.2, Item("common.items.mineral.ore.bloodstone")),
(1.0, Item("common.items.mineral.ore.coal")), (1.0, Item("common.items.mineral.ore.coal")),
(0.4, Item("common.items.mineral.ore.cobalt")), (0.4, Item("common.items.mineral.ore.cobalt")),

18
assets/common/npc_names.ron
View File

@ -826,9 +826,17 @@
keyword: "wendigo", keyword: "wendigo",
generic: "Wendigo" generic: "Wendigo"
), ),
troll: ( troll_cave: (
keyword: "troll", keyword: "troll_cave",
generic: "Troll" generic: "Cave Troll"
),
troll_mountain: (
keyword: "troll_mountain",
generic: "Mountain Troll"
),
troll_swamp: (
keyword: "troll_swamp",
generic: "Swamp Troll"
), ),
dullahan: ( dullahan: (
keyword: "dullahan", keyword: "dullahan",
@ -1080,6 +1088,10 @@
keyword: "cockatrice", keyword: "cockatrice",
generic: "Cockatrice" generic: "Cockatrice"
), ),
roc: (
keyword: "roc",
generic: "Roc"
),
) )
), ),
quadruped_low: ( quadruped_low: (

91
assets/common/recipe_book.ron
View File

@ -418,10 +418,9 @@
(Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
(Item("common.items.crafting_ing.twigs"), 5), (Item("common.items.crafting_ing.twigs"), 5),
(Item("common.items.crafting_ing.leather.thick_leather"), 4), (Item("common.items.crafting_ing.leather.thick_leather"), 4),
(Item("common.items.crafting_ing.cloth.linen"), 5), (Item("common.items.crafting_ing.cloth.wool"), 5),
(Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.mineral.gem.sapphire"), 1),
(Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.tool.craftsman_hammer"), 0),
(Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
), ),
@ -431,11 +430,10 @@
(Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
(Item("common.items.crafting_ing.twigs"), 5), (Item("common.items.crafting_ing.twigs"), 5),
(Item("common.items.crafting_ing.leather.thick_leather"), 4), (Item("common.items.crafting_ing.leather.thick_leather"), 4),
(Item("common.items.crafting_ing.cloth.linen"), 5), (Item("common.items.crafting_ing.cloth.silk"), 5),
(Item("common.items.crafting_ing.animal_misc.icy_fang"), 1), (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1),
(Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.mineral.gem.ruby"), 1),
(Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.tool.craftsman_hammer"), 0),
(Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
), ),
@ -443,12 +441,11 @@
output: ("common.items.glider.glider_woodraptor", 1), output: ("common.items.glider.glider_woodraptor", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6),
(Item("common.items.crafting_ing.twigs"), 15), (Item("common.items.crafting_ing.twigs"), 5),
(Item("common.items.crafting_ing.leather.leather_strips"), 5), (Item("common.items.crafting_ing.leather.thick_leather"), 4),
(Item("common.items.crafting_ing.cloth.linen"), 5), (Item("common.items.crafting_ing.cloth.lifecloth"), 5),
(Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.mineral.gem.emerald"), 1),
(Item("common.items.tool.craftsman_hammer"), 0), (Item("common.items.tool.craftsman_hammer"), 0),
(Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
), ),
@ -466,7 +463,6 @@
inputs: [ inputs: [
(Item("common.items.crafting_ing.leather.leather_strips"), 8), (Item("common.items.crafting_ing.leather.leather_strips"), 8),
(Item("common.items.crafting_ing.twigs"), 6), (Item("common.items.crafting_ing.twigs"), 6),
(Item("common.items.crafting_ing.stones"), 0),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
), ),
@ -476,7 +472,6 @@
(Item("common.items.crafting_ing.leather.leather_strips"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 4),
(Item("common.items.crafting_ing.twigs"), 10), (Item("common.items.crafting_ing.twigs"), 10),
(Item("common.items.mineral.ore.veloritefrag"), 1), (Item("common.items.mineral.ore.veloritefrag"), 1),
(Item("common.items.crafting_ing.stones"), 0),
], ],
craft_sprite: Some(Anvil), craft_sprite: Some(Anvil),
), ),
@ -662,8 +657,8 @@
"carapace back": ( "carapace back": (
output: ("common.items.armor.hide.carapace.back", 1), output: ("common.items.armor.hide.carapace.back", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.hide.carapace"), 3), (Item("common.items.crafting_ing.hide.carapace"), 3),
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.leather.leather_strips"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -671,8 +666,8 @@
"carapace belt": ( "carapace belt": (
output: ("common.items.armor.hide.carapace.belt", 1), output: ("common.items.armor.hide.carapace.belt", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.hide.carapace"), 2), (Item("common.items.crafting_ing.hide.carapace"), 2),
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.leather.leather_strips"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -680,8 +675,8 @@
"carapace chest": ( "carapace chest": (
output: ("common.items.armor.hide.carapace.chest", 1), output: ("common.items.armor.hide.carapace.chest", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.steel"), 2),
(Item("common.items.crafting_ing.hide.carapace"), 10), (Item("common.items.crafting_ing.hide.carapace"), 10),
(Item("common.items.mineral.ingot.steel"), 2),
(Item("common.items.crafting_ing.leather.leather_strips"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 4),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -689,8 +684,8 @@
"carapace feet": ( "carapace feet": (
output: ("common.items.armor.hide.carapace.foot", 1), output: ("common.items.armor.hide.carapace.foot", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.hide.carapace"), 3), (Item("common.items.crafting_ing.hide.carapace"), 3),
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.leather.leather_strips"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -698,8 +693,8 @@
"carapace hands": ( "carapace hands": (
output: ("common.items.armor.hide.carapace.hand", 1), output: ("common.items.armor.hide.carapace.hand", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.hide.carapace"), 3), (Item("common.items.crafting_ing.hide.carapace"), 3),
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.leather.leather_strips"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -707,8 +702,8 @@
"carapace pants": ( "carapace pants": (
output: ("common.items.armor.hide.carapace.pants", 1), output: ("common.items.armor.hide.carapace.pants", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.hide.carapace"), 8), (Item("common.items.crafting_ing.hide.carapace"), 8),
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.leather.leather_strips"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 4),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -716,8 +711,8 @@
"carapace shoulder": ( "carapace shoulder": (
output: ("common.items.armor.hide.carapace.shoulder", 1), output: ("common.items.armor.hide.carapace.shoulder", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.hide.carapace"), 8), (Item("common.items.crafting_ing.hide.carapace"), 8),
(Item("common.items.mineral.ingot.steel"), 1),
(Item("common.items.crafting_ing.leather.leather_strips"), 6), (Item("common.items.crafting_ing.leather.leather_strips"), 6),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -726,9 +721,9 @@
"primal back": ( "primal back": (
output: ("common.items.armor.hide.primal.back", 1), output: ("common.items.armor.hide.primal.back", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.hide.plate"), 3),
(Item("common.items.crafting_ing.animal_misc.large_horn"), 1), (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
(Item("common.items.crafting_ing.cloth.lifecloth"), 1), (Item("common.items.crafting_ing.cloth.lifecloth"), 1),
(Item("common.items.crafting_ing.hide.plate"), 3),
(Item("common.items.crafting_ing.leather.rigid_leather"), 2), (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -736,8 +731,8 @@
"primal belt": ( "primal belt": (
output: ("common.items.armor.hide.primal.belt", 1), output: ("common.items.armor.hide.primal.belt", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.lifecloth"), 1),
(Item("common.items.crafting_ing.hide.plate"), 2), (Item("common.items.crafting_ing.hide.plate"), 2),
(Item("common.items.crafting_ing.cloth.lifecloth"), 1),
(Item("common.items.crafting_ing.leather.rigid_leather"), 2), (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -745,9 +740,9 @@
"primal chest": ( "primal chest": (
output: ("common.items.armor.hide.primal.chest", 1), output: ("common.items.armor.hide.primal.chest", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.hide.plate"), 10),
(Item("common.items.crafting_ing.animal_misc.large_horn"), 1), (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
(Item("common.items.crafting_ing.cloth.lifecloth"), 2), (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
(Item("common.items.crafting_ing.hide.plate"), 10),
(Item("common.items.crafting_ing.leather.rigid_leather"), 4), (Item("common.items.crafting_ing.leather.rigid_leather"), 4),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -755,8 +750,8 @@
"primal feet": ( "primal feet": (
output: ("common.items.armor.hide.primal.foot", 1), output: ("common.items.armor.hide.primal.foot", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.lifecloth"), 1),
(Item("common.items.crafting_ing.hide.plate"), 3), (Item("common.items.crafting_ing.hide.plate"), 3),
(Item("common.items.crafting_ing.cloth.lifecloth"), 1),
(Item("common.items.crafting_ing.leather.rigid_leather"), 2), (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -764,8 +759,8 @@
"primal hands": ( "primal hands": (
output: ("common.items.armor.hide.primal.hand", 1), output: ("common.items.armor.hide.primal.hand", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.lifecloth"), 1),
(Item("common.items.crafting_ing.hide.plate"), 3), (Item("common.items.crafting_ing.hide.plate"), 3),
(Item("common.items.crafting_ing.cloth.lifecloth"), 1),
(Item("common.items.crafting_ing.leather.rigid_leather"), 2), (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -773,9 +768,9 @@
"primal pants": ( "primal pants": (
output: ("common.items.armor.hide.primal.pants", 1), output: ("common.items.armor.hide.primal.pants", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.hide.plate"), 8),
(Item("common.items.crafting_ing.animal_misc.large_horn"), 1), (Item("common.items.crafting_ing.animal_misc.large_horn"), 1),
(Item("common.items.crafting_ing.cloth.lifecloth"), 2), (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
(Item("common.items.crafting_ing.hide.plate"), 8),
(Item("common.items.crafting_ing.leather.rigid_leather"), 4), (Item("common.items.crafting_ing.leather.rigid_leather"), 4),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -783,9 +778,9 @@
"primal shoulder": ( "primal shoulder": (
output: ("common.items.armor.hide.primal.shoulder", 1), output: ("common.items.armor.hide.primal.shoulder", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.hide.plate"), 8),
(Item("common.items.crafting_ing.animal_misc.large_horn"), 2), (Item("common.items.crafting_ing.animal_misc.large_horn"), 2),
(Item("common.items.crafting_ing.cloth.lifecloth"), 2), (Item("common.items.crafting_ing.cloth.lifecloth"), 2),
(Item("common.items.crafting_ing.hide.plate"), 8),
(Item("common.items.crafting_ing.leather.rigid_leather"), 6), (Item("common.items.crafting_ing.leather.rigid_leather"), 6),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -794,8 +789,8 @@
"dragonscale back": ( "dragonscale back": (
output: ("common.items.armor.hide.dragonscale.back", 1), output: ("common.items.armor.hide.dragonscale.back", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.hide.dragon_scale"), 3), (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.leather.rigid_leather"), 1), (Item("common.items.crafting_ing.leather.rigid_leather"), 1),
(Item("common.items.crafting_ing.hide.scales"), 2), (Item("common.items.crafting_ing.hide.scales"), 2),
], ],
@ -804,8 +799,8 @@
"dragonscale belt": ( "dragonscale belt": (
output: ("common.items.armor.hide.dragonscale.belt", 1), output: ("common.items.armor.hide.dragonscale.belt", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.hide.dragon_scale"), 2), (Item("common.items.crafting_ing.hide.dragon_scale"), 2),
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.hide.scales"), 2), (Item("common.items.crafting_ing.hide.scales"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -813,8 +808,8 @@
"dragonscale chest": ( "dragonscale chest": (
output: ("common.items.armor.hide.dragonscale.chest", 1), output: ("common.items.armor.hide.dragonscale.chest", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.bloodsteel"), 3),
(Item("common.items.crafting_ing.hide.dragon_scale"), 10), (Item("common.items.crafting_ing.hide.dragon_scale"), 10),
(Item("common.items.mineral.ingot.bloodsteel"), 3),
(Item("common.items.crafting_ing.leather.rigid_leather"), 2), (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
(Item("common.items.crafting_ing.hide.scales"), 4), (Item("common.items.crafting_ing.hide.scales"), 4),
], ],
@ -823,8 +818,8 @@
"dragonscale feet": ( "dragonscale feet": (
output: ("common.items.armor.hide.dragonscale.foot", 1), output: ("common.items.armor.hide.dragonscale.foot", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.hide.dragon_scale"), 3), (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.hide.scales"), 2), (Item("common.items.crafting_ing.hide.scales"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -832,8 +827,8 @@
"dragonscale hands": ( "dragonscale hands": (
output: ("common.items.armor.hide.dragonscale.hand", 1), output: ("common.items.armor.hide.dragonscale.hand", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.hide.dragon_scale"), 3), (Item("common.items.crafting_ing.hide.dragon_scale"), 3),
(Item("common.items.mineral.ingot.bloodsteel"), 2),
(Item("common.items.crafting_ing.hide.scales"), 2), (Item("common.items.crafting_ing.hide.scales"), 2),
], ],
craft_sprite: Some(CraftingBench), craft_sprite: Some(CraftingBench),
@ -841,8 +836,8 @@
"dragonscale pants": ( "dragonscale pants": (
output: ("common.items.armor.hide.dragonscale.pants", 1), output: ("common.items.armor.hide.dragonscale.pants", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.bloodsteel"), 3),
(Item("common.items.crafting_ing.hide.dragon_scale"), 8), (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
(Item("common.items.mineral.ingot.bloodsteel"), 3),
(Item("common.items.crafting_ing.leather.rigid_leather"), 1), (Item("common.items.crafting_ing.leather.rigid_leather"), 1),
(Item("common.items.crafting_ing.hide.scales"), 4), (Item("common.items.crafting_ing.hide.scales"), 4),
], ],
@ -851,8 +846,8 @@
"dragonscale shoulder": ( "dragonscale shoulder": (
output: ("common.items.armor.hide.dragonscale.shoulder", 1), output: ("common.items.armor.hide.dragonscale.shoulder", 1),
inputs: [ inputs: [
(Item("common.items.mineral.ingot.bloodsteel"), 3),
(Item("common.items.crafting_ing.hide.dragon_scale"), 8), (Item("common.items.crafting_ing.hide.dragon_scale"), 8),
(Item("common.items.mineral.ingot.bloodsteel"), 3),
(Item("common.items.crafting_ing.leather.rigid_leather"), 2), (Item("common.items.crafting_ing.leather.rigid_leather"), 2),
(Item("common.items.crafting_ing.hide.scales"), 6), (Item("common.items.crafting_ing.hide.scales"), 6),
], ],
@ -1109,6 +1104,7 @@
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.moonweave"), 3), (Item("common.items.crafting_ing.cloth.moonweave"), 3),
(Item("common.items.crafting_ing.hide.leather_troll"), 3), (Item("common.items.crafting_ing.hide.leather_troll"), 3),
(Item("common.items.mineral.ingot.silver"), 1),
(Item("common.items.mineral.ingot.cobalt"), 2), (Item("common.items.mineral.ingot.cobalt"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
@ -1129,6 +1125,7 @@
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.moonweave"), 10), (Item("common.items.crafting_ing.cloth.moonweave"), 10),
(Item("common.items.crafting_ing.hide.leather_troll"), 5), (Item("common.items.crafting_ing.hide.leather_troll"), 5),
(Item("common.items.mineral.ingot.silver"), 1),
(Item("common.items.mineral.ingot.cobalt"), 3), (Item("common.items.mineral.ingot.cobalt"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
@ -1180,7 +1177,7 @@
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 3), (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 1), (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 1),
(Item("common.items.mineral.ore.silver"), 1), (Item("common.items.mineral.ingot.gold"), 1),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(Loom), craft_sprite: Some(Loom),
@ -1189,7 +1186,7 @@
output: ("common.items.armor.cloth.sunsilk.belt", 1), output: ("common.items.armor.cloth.sunsilk.belt", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 2), (Item("common.items.crafting_ing.cloth.sunsilk"), 2),
(Item("common.items.mineral.ore.silver"), 1), (Item("common.items.mineral.ingot.gold"), 1),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(Loom), craft_sprite: Some(Loom),
@ -1199,7 +1196,7 @@
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 10), (Item("common.items.crafting_ing.cloth.sunsilk"), 10),
(Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2), (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2),
(Item("common.items.mineral.ore.silver"), 2), (Item("common.items.mineral.ingot.gold"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(Loom), craft_sprite: Some(Loom),
@ -1208,7 +1205,7 @@
output: ("common.items.armor.cloth.sunsilk.foot", 1), output: ("common.items.armor.cloth.sunsilk.foot", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 3), (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
(Item("common.items.mineral.ore.silver"), 2), (Item("common.items.mineral.ingot.gold"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(Loom), craft_sprite: Some(Loom),
@ -1217,7 +1214,7 @@
output: ("common.items.armor.cloth.sunsilk.hand", 1), output: ("common.items.armor.cloth.sunsilk.hand", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 3), (Item("common.items.crafting_ing.cloth.sunsilk"), 3),
(Item("common.items.mineral.ore.silver"), 2), (Item("common.items.mineral.ingot.gold"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(Loom), craft_sprite: Some(Loom),
@ -1226,7 +1223,7 @@
output: ("common.items.armor.cloth.sunsilk.pants", 1), output: ("common.items.armor.cloth.sunsilk.pants", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 8), (Item("common.items.crafting_ing.cloth.sunsilk"), 8),
(Item("common.items.mineral.ore.silver"), 3), (Item("common.items.mineral.ingot.gold"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(Loom), craft_sprite: Some(Loom),
@ -1235,7 +1232,7 @@
output: ("common.items.armor.cloth.sunsilk.shoulder", 1), output: ("common.items.armor.cloth.sunsilk.shoulder", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.sunsilk"), 8), (Item("common.items.crafting_ing.cloth.sunsilk"), 8),
(Item("common.items.mineral.ore.silver"), 3), (Item("common.items.mineral.ingot.gold"), 3),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
craft_sprite: Some(Loom), craft_sprite: Some(Loom),
@ -1635,13 +1632,13 @@
"tiny leather pouch": ( "tiny leather pouch": (
output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1), output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.leather.leather_strips"), 6), (Item("common.items.crafting_ing.leather.leather_strips"), 12),
], ],
), ),
"knitted red pouch": ( "knitted red pouch": (
output: ("common.items.armor.misc.bag.knitted_red_pouch", 1), output: ("common.items.armor.misc.bag.knitted_red_pouch", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.linen_red"), 3), (Item("common.items.crafting_ing.cloth.wool"), 6),
(Item("common.items.armor.misc.bag.tiny_red_pouch"), 2), (Item("common.items.armor.misc.bag.tiny_red_pouch"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
@ -1649,7 +1646,7 @@
"woven red bag": ( "woven red bag": (
output: ("common.items.armor.misc.bag.woven_red_bag", 1), output: ("common.items.armor.misc.bag.woven_red_bag", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.cloth.linen_red"), 6), (Item("common.items.crafting_ing.cloth.silk"), 6),
(Item("common.items.armor.misc.bag.knitted_red_pouch"), 1), (Item("common.items.armor.misc.bag.knitted_red_pouch"), 1),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
@ -1659,7 +1656,7 @@
inputs: [ inputs: [
(Item("common.items.mineral.gem.diamond"), 2), (Item("common.items.mineral.gem.diamond"), 2),
(Item("common.items.crafting_ing.twigs"), 2), (Item("common.items.crafting_ing.twigs"), 2),
(Item("common.items.crafting_ing.cloth.linen"), 3), (Item("common.items.crafting_ing.cloth.silk"), 4),
(Item("common.items.crafting_ing.leather.leather_strips"), 3), (Item("common.items.crafting_ing.leather.leather_strips"), 3),
(Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2), (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
@ -1669,9 +1666,9 @@
"sturdy red backpack": ( "sturdy red backpack": (
output: ("common.items.armor.misc.bag.sturdy_red_backpack", 1), output: ("common.items.armor.misc.bag.sturdy_red_backpack", 1),
inputs: [ inputs: [
(Item("common.items.mineral.gem.diamond"), 2), (Item("common.items.mineral.gem.amethyst"), 2),
(Item("common.items.crafting_ing.cloth.linen_red"), 3), (Item("common.items.crafting_ing.cloth.linen_red"), 3),
(Item("common.items.crafting_ing.leather.thick_leather"), 3), (Item("common.items.crafting_ing.leather.thick_leather"), 6),
(Item("common.items.armor.misc.bag.woven_red_bag"), 1), (Item("common.items.armor.misc.bag.woven_red_bag"), 1),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),
], ],
@ -1689,7 +1686,7 @@
output: ("common.items.armor.misc.bag.mindflayer_spellbag", 1), output: ("common.items.armor.misc.bag.mindflayer_spellbag", 1),
inputs: [ inputs: [
(Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1), (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1),
(Item("common.items.crafting_ing.leather.thick_leather"), 8), (Item("common.items.crafting_ing.leather.rigid_leather"), 8),
(Item("common.items.mineral.gem.diamond"), 4), (Item("common.items.mineral.gem.diamond"), 4),
(Item("common.items.mineral.ore.veloritefrag"), 10), (Item("common.items.mineral.ore.veloritefrag"), 10),
(Item("common.items.crafting_tools.sewing_set"), 0), (Item("common.items.crafting_tools.sewing_set"), 0),

121
assets/voxygen/audio/sfx.ron
View File

@ -831,5 +831,126 @@
], ],
threshold: 0.2, threshold: 0.2,
), ),
Utterance(Angry, BipedLarge): (
files: [
"voxygen.audio.sfx.utterance.ogre_angry1",
"voxygen.audio.sfx.utterance.ogre_angry2",
],
threshold: 1.0,
),
Utterance(Angry, Bird): (
files: [
"voxygen.audio.sfx.utterance.bird_angry1",
],
threshold: 1.0,
),
Utterance(Calm, Pig): (
files: [
"voxygen.audio.sfx.utterance.pig_calm1",
],
threshold: 1.0,
),
Utterance(Angry, Adlet): (
files: [
"voxygen.audio.sfx.utterance.adlet_angry1",
"voxygen.audio.sfx.utterance.adlet_angry2",
],
threshold: 1.0,
),
Utterance(Angry, Alligator): (
files: [
"voxygen.audio.sfx.utterance.alligator_angry1",
"voxygen.audio.sfx.utterance.alligator_angry2",
],
threshold: 1.0,
),
Utterance(Angry, Antelope): (
files: [
"voxygen.audio.sfx.utterance.antelope_angry1",
],
threshold: 1.0,
),
Utterance(Angry, Reptile): (
files: [
"voxygen.audio.sfx.utterance.alligator_angry1",
"voxygen.audio.sfx.utterance.alligator_angry2",
],
threshold: 1.0,
),
Utterance(Angry, Saurok): (
files: [
"voxygen.audio.sfx.utterance.saurok_angry1",
],
threshold: 1.0,
),
Utterance(Angry, Wendigo): (
files: [
"voxygen.audio.sfx.utterance.wendigo_angry1",
],
threshold: 1.0,
),
Utterance(Calm, Cow): (
files: [
"voxygen.audio.sfx.utterance.cow_calm1",
"voxygen.audio.sfx.utterance.cow_calm2",
"voxygen.audio.sfx.utterance.cow_calm3",
],
threshold: 1.0,
),
Utterance(Calm, Sheep): (
files: [
"voxygen.audio.sfx.utterance.sheep_calm1",
],
threshold: 1.0,
),
Utterance(Greeting, HumanMale): (
files: [
"voxygen.audio.sfx.utterance.humanmale_greeting1",
],
threshold: 1.0,
),
Utterance(Hurt, Adlet): (
files: [
"voxygen.audio.sfx.utterance.adlet_hurt1",
"voxygen.audio.sfx.utterance.adlet_hurt2",
],
threshold: 1.0,
),
Utterance(Hurt, Antelope): (
files: [
"voxygen.audio.sfx.utterance.antelope",
],
threshold: 1.0,
),
Utterance(Hurt, HumanMale): (
files: [
"voxygen.audio.sfx.utterance.humanmale_hurt1",
],
threshold: 1.0,
),
Utterance(Hurt, Lion): (
files: [
"voxygen.audio.sfx.utterance.lion_hurt1",
],
threshold: 1.0,
),
Utterance(Hurt, Marlin): (
files: [
"voxygen.audio.sfx.utterance.marlin_hurt1",
],
threshold: 1.0,
),
Utterance(Hurt, Maneater): (
files: [
"voxygen.audio.sfx.utterance.maneater_hurt1",
],
threshold: 1.0,
),
Utterance(Hurt, Mindflayer): (
files: [
"voxygen.audio.sfx.utterance.mindflayer_hurt1",
],
threshold: 1.0,
),
} }
) )

BIN
assets/voxygen/audio/sfx/utterance/adlet_angry1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/adlet_angry2.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/adlet_hurt1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/adlet_hurt2.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/alligator_angry1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/alligator_angry2.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/antelope_angry1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/antelope_hurt1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/bird_angry1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/cow_calm1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/cow_calm2.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/cow_calm3.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/humanmale_greeting1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/humanmale_hurt1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/mandragora_hurt1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/maneater_hurt1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/marlin_hurt1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/mindflayer_hurt1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/ogre_angry1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/ogre_angry2.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/pig_calm1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/saurok_angry1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/sheep_calm1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/sfx/utterance/wendigo_angry1.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
assets/voxygen/i18n/en/hud/misc.ron
View File

@ -32,9 +32,9 @@ You are welcome to take whatever you need on your journey!
Look at the bottom right of the screen to find various things like your bag, the crafting menu and the map. Look at the bottom right of the screen to find various things like your bag, the crafting menu and the map.
The crafting menu allows you to create armor, weapons, food and much more! The crafting stations allow you to create armor, weapons, food and much more!
The wild animals all around town are a great source of Leather Scraps to create some protection against the dangers of the world. The wild animals all around town are a great source of Animal Hide to create some protection against the dangers of the world.
Whenever you feel ready, try to get even better equipment from the many challenges marked on your map! Whenever you feel ready, try to get even better equipment from the many challenges marked on your map!
"#, "#,

778
assets/voxygen/i18n/ru_RU/_manifest.ron
View File

@ -1,18 +1,6 @@
/// Translation document instructions
///
/// In order to keep localization documents readible please follow the following
/// rules:
/// - separate the string map sections using a commentary describing the purpose
/// of the next section
/// - prepend multi-line strings with a commentary
/// - append one blank lines after a multi-line strings and two after sections
///
/// To add a new language in Veloren, just write an additional `.ron` file in
/// `assets/voxygen/i18n` and that's it!
///
/// WARNING: Localization files shall be saved in UTF-8 format without BOM /// WARNING: Localization files shall be saved in UTF-8 format without BOM
/// Localization for "global" Russian /// Localization for RUS
( (
metadata: ( metadata: (
language_name: "Русский", language_name: "Русский",
@ -42,515 +30,8 @@
), ),
}, },
sub_directories: [], sub_directories: [],
string_map: { string_map: {
/// Start Common section
// Texts used in multiple locations with the same formatting
"common.username": "Имя пользователя",
"common.singleplayer": "Одиночная игра",
"common.multiplayer": "Мультиплеер",
"common.servers": "Сервера",
"common.quit": "Выход",
"common.settings": "Настройки",
"common.languages": "Язык",
"common.interface": "Интерфейс",
"common.gameplay": "Геймплей",
"common.controls": "Управление",
"common.video": "Видео",
"common.sound": "Звук",
"common.languages": "Языки",
"common.resume": "Продолжить",
"common.characters": "Персонажи",
"common.close": "Закрыть",
"common.yes": "Да",
"common.no": "Нет",
"common.back": "Назад",
"common.create": "Создать",
"common.okay": "Окей",
"common.accept": "Принять",
"common.decline": "Отклонить",
"common.disclaimer": "Дисклеймер",
"common.cancel": "Отмена",
"common.none": "Нет",
"common.error": "Ошибка",
"common.fatal_error": "Критическая ошибка",
"common.you": "Вы",
"common.automatic": "Авто",
"common.random": "Случайно",
// Settings Window title
"common.interface_settings": "Настройки интерфейса",
"common.gameplay_settings": "Настройки геймплея",
"common.controls_settings": "Настройки управления",
"common.video_settings": "Графические настройки",
"common.sound_settings": "Звуковые настройки",
"common.language_settings": "Языковые настройки",
// Message when connection to the server is lost
"common.connection_lost": r#"Соединение потеряно!
Сервер перезагрузился?
Клиент обновлен до последней версии?"#,
"common.species.orc": "Орк",
"common.species.human": "Человек",
"common.species.dwarf": "Дварф",
"common.species.elf": "Эльф",
"common.species.undead": "Нежить",
"common.species.danari": "Данари",
"common.weapons.axe": "Топор",
"common.weapons.sword": "Меч",
"common.weapons.staff": "Посох",
"common.weapons.bow": "Лук",
"common.weapons.hammer": "Молот",
"common.weapons.sceptre": "Лечащий посох",
"common.rand_appearance": "Случайная внешность и имя",
/// End Common section
/// Start Main screen section
"main.username": "Имя пользователя",
"main.server": "Сервер",
"main.password": "Пароль",
"main.connecting": "Подключение",
"main.creating_world": "Создание мира",
"main.tip": "Совет:",
// Welcome notice that appears the first time Veloren is started
"main.notice": r#"Добро пожаловать в Veloren-Alpha!
Прежде чем начать веселье, прими во внимание следующие вещи:
- Это очень ранняя альфа. Тут есть баги, крайне незавершенный геймплей, неотполированные механики и отсутсвующие фичи.
- Если у вас есть конструктивный фидбек или сообщение об ошибке, вы можете связаться с нами через Reddit, GitLab или наш Discord-сервер.
- Veloren лицензирован GPL 3 open-source licence. Это означает, игра бесплатна, ее можно модифицировать и переделывать на свой вкус (при условии, что готовая работа тоже лицензирована GPL 3).
- Veloren - некоммерческий проект, каждый работает над ним добровольно.
Если тебе нравится, что ты видишь, милости просим присоединиться к команде разработчиков или художественной команде!
Спасибо за прочтение, мы надеемся, вам понравится игра!
~ Команда разработчиков Veloren"#,
// Login process description
"main.login_process": r#"Информация по входу:
Обратите внимание, что теперь вам нужен аккаунт
играть на серверах с включенной аутентификацией.
Вы можете создать аккаунт тут:
https://veloren.net/account/."#,
"main.login.server_not_found": "Сервер не найден",
"main.login.authentication_error": "Ошибка аутентификации на сервер",
"main.login.server_full": "Сервер полон",
"main.login.untrusted_auth_server": "Аутентификация не пройдена",
"main.login.outdated_client_or_server": "ServerWentMad: Возможно, версии несовместимы. Проверьте наличие обновлений.",
"main.login.timeout": "Timeout: Сервер не ответил вовремя. (Перегрузка или проблемы с сетью).",
"main.login.server_shut_down": "Сервер выключен",
"main.login.network_error": "Ошибка сети",
"main.login.failed_sending_request": "Запрос аутентификации провален",
"main.login.invalid_character": "Выбранный персонаж недоступен",
"main.login.client_crashed": "Клиент вылетел",
"main.login.not_on_whitelist": "Чтобы войти, необходимо быть внесенным в Вайтлист",
"main.login.banned": "Вы были забанены по следующей причине",
"main.login.kicked": "Вы были кикнуты по следующей причине",
"main.login.select_language": "Выбрать язык",
"main.servers.select_server": "Выбрать сервер",
/// End Main screen section
/// Start HUD Section
"hud.do_not_show_on_startup": "Не показывать это при запуске",
"hud.show_tips": "Показать советы",
"hud.quests": "Квесты",
"hud.you_died": "Вы мертвы",
"hud.waypoint_saved": "Точка спауна сохранена",
"hud.press_key_to_show_keybindings_fmt": "[{key}] Раскладка",
"hud.press_key_to_toggle_lantern_fmt": "[{key}] Фонарь",
"hud.press_key_to_show_debug_info_fmt": "Нажмите {key}, чтобы показать панель отладки",
"hud.press_key_to_toggle_keybindings_fmt": "Нажмите {key}, чтобы показать раскладку",
"hud.press_key_to_toggle_debug_info_fmt": "Нажмите {key}, чтобы включить панель отладки",
// Chat outputs
"hud.chat.online_msg": "[{name}] сейчас онлайн.",
"hud.chat.offline_msg": "[{name}] сейчас оффлайн.",
"hud.chat.default_death_msg": "[{name}] умер",
"hud.chat.environmental_kill_msg": "[{name}] умер от {environment}",
"hud.chat.fall_kill_msg": "[{name}] разбился",
"hud.chat.suicide_msg": "[{name}] сам стал виной своей смерти",
"hud.chat.pvp_melee_kill_msg": "[{attacker}] одолел [{victim}]",
"hud.chat.pvp_ranged_kill_msg": "[{attacker}] подстрелил [{victim}]",
"hud.chat.pvp_explosion_kill_msg": "[{attacker}] взорвал [{victim}]",
"hud.chat.pvp_energy_kill_msg": "[{attacker}] убил [{victim}] с помощью магии",
"hud.chat.pvp_buff_kill_msg": "[{attacker}] убил [{victim}]",
"hud.chat.npc_melee_kill_msg": "{attacker} убил [{victim}]",
"hud.chat.npc_ranged_kill_msg": "{attacker} подстрелил [{victim}]",
"hud.chat.npc_explosion_kill_msg": "{attacker} взорвал [{victim}]",
"hud.chat.npc_energy_kill_msg": "{attacker} убил [{victim}] с помощью магии",
"hud.chat.npc_other_kill_msg": "{attacker} убил [{victim}]",
"hud.chat.loot_msg": "Вы подобрали [{item}]",
"hud.chat.loot_fail": "Ваш инвентарь полон!",
"hud.chat.goodbye": "До встречи!",
"hud.chat.connection_lost": "Соединение потеряно. Кик через {time} секунд.",
// SCT outputs
"hud.sct.experience": "{amount} Опыт",
"hud.sct.block": "ЗАБЛОКИРОВАНО",
// Respawn message
"hud.press_key_to_respawn": r#"Нажмите {key}, чтобы возродиться на последнем костре, который вы посетили."#,
// Welcome message
"hud.welcome": r#"Добро пожаловать в Veloren-Alpha!,
Немного советов перед тем началом игры:
Нажмите F1, чтобы увидеть доступые команды.
Напишите /help, чтобы увидеть команды чата.
В мире есть сундуки и другие рандомно генерируемые объекты!
Нажмите ПКМ, чтобы собрать их.
Чтобы использовать то, что вы нашли в сундуках, откройте свой инвентарь 'B'.
Двойной клик на предмет в инвентаре использует или экипирует его.
Чтобы выкинуть его, кликните на предмет, а потом кликните вне инвентаря.
Ночи в Veloren могут быть довольно темными.
Зажгите свой фонарь, нажав на 'G'.
Хотите увидеть курсор, чтобы закрыть это окно? Нажмите TAB!
Наслаждайтесь миром Veloren."#,
"hud.temp_quest_headline": r#"Пожалуйста, путешественник, помоги нам!"#,
"hud.temp_quest_text": r#"Подземелья наполнены злыми культистами,
которые появились вокруг наших мирных городов!
Собери компанию, запасись едой
и победи мерзкого лидера и его приспешников.
Может быть ты даже сможешь получить один из их
магических предметов?"#,
// Inventory
"hud.bag.inventory": "Инвентарь",
"hud.bag.stats_title": "Характеристики",
"hud.bag.exp": "Опыт",
"hud.bag.armor": "Броня",
"hud.bag.stats": "Статы",
"hud.bag.head": "Голова",
"hud.bag.neck": "Шея",
"hud.bag.tabard": "Накидка",
"hud.bag.shoulders": "Плечи",
"hud.bag.chest": "Нагрудник",
"hud.bag.hands": "Руки",
"hud.bag.lantern": "Фонарь",
"hud.bag.glider": "Глайдер",
"hud.bag.belt": "Пояс",
"hud.bag.ring": "Кольцо",
"hud.bag.back": "Спина",
"hud.bag.legs": "Ноги",
"hud.bag.feet": "Ботинки",
"hud.bag.mainhand": "Главная рука",
"hud.bag.offhand": "Второстепенная рука",
// Map and Questlog
"hud.map.map_title": "Карта",
"hud.map.qlog_title": "Квесты",
// Settings
"hud.settings.general": "Общие",
"hud.settings.none": "Нет",
"hud.settings.press_behavior.toggle": "Переключить",
"hud.settings.press_behavior.hold": "Держать",
"hud.settings.help_window": "Окно помощи",
"hud.settings.debug_info": "Панель отладки",
"hud.settings.tips_on_startup": "Советы на старте",
"hud.settings.ui_scale": "Размер интерфейса",
"hud.settings.relative_scaling": "Относительное масштабирование",
"hud.settings.custom_scaling": "Пользовательское масштабирование",
"hud.settings.crosshair": "Перекрестие",
"hud.settings.transparency": "Прозрачность",
"hud.settings.hotbar": "Хотбар",
"hud.settings.toggle_shortcuts": "Отображать ярлыки",
"hud.settings.buffs_skillbar": "Баффы на панели навыков",
"hud.settings.buffs_mmap": "Баффы на миникарте",
"hud.settings.toggle_bar_experience": "Отображать полоску опыта",
"hud.settings.scrolling_combat_text": "Боевой журнал",
"hud.settings.single_damage_number": "Отдельные числа урона",
"hud.settings.cumulated_damage": "Суммарный урон",
"hud.settings.incoming_damage": "Входящий урон",
"hud.settings.cumulated_incoming_damage": "Суммарный входящий урон",
"hud.settings.speech_bubble": "Текстовые облачка",
"hud.settings.speech_bubble_dark_mode": "Темный режим текстовых облачков",
"hud.settings.speech_bubble_icon": "Значок текстовых облачков",
"hud.settings.energybar_numbers": "Отображение полоски энергии",
"hud.settings.values": "Значение",
"hud.settings.percentages": "Проценты",
"hud.settings.chat": "Чат",
"hud.settings.background_transparency": "Прозрачность заднего фона",
"hud.settings.chat_character_name": "Имя персонажа в чате",
"hud.settings.loading_tips": "Советы при загрузке",
"hud.settings.pan_sensitivity": "Чувствительность камеры",
"hud.settings.zoom_sensitivity": "Чувствительность зума",
"hud.settings.invert_scroll_zoom": "Инвертировать прокрутку зума",
"hud.settings.invert_mouse_y_axis": "Инвертировать ось Y",
"hud.settings.enable_mouse_smoothing": "Размытие камеры",
"hud.settings.free_look_behavior": "Настройка свободной камеры",
"hud.settings.auto_walk_behavior": "Автодвижение",
"hud.settings.stop_auto_walk_on_input": "Остановить автодвижение на кнопку движения",
"hud.settings.view_distance": "Дальность прорисовки",
"hud.settings.sprites_view_distance": "Дальность прорисовки спрайтов",
"hud.settings.figures_view_distance": "Дальность прорисовки объектов",
"hud.settings.maximum_fps": "Максимум FPS",
"hud.settings.fov": "Поле зрения (градусы)",
"hud.settings.gamma": "Гамма",
"hud.settings.exposure": "Экспозиция",
"hud.settings.ambiance": "Яркость окружения",
"hud.settings.antialiasing_mode": "Сглаживание",
"hud.settings.cloud_rendering_mode": "Рендер облаков",
"hud.settings.fluid_rendering_mode": "Рендер жидкостей",
"hud.settings.fluid_rendering_mode.cheap": "Низко",
"hud.settings.fluid_rendering_mode.shiny": "Высоко",
"hud.settings.cloud_rendering_mode.minimal": "Минимально",
"hud.settings.cloud_rendering_mode.low": "Низко",
"hud.settings.cloud_rendering_mode.medium": "Средне",
"hud.settings.cloud_rendering_mode.high": "Высоко",
"hud.settings.cloud_rendering_mode.ultra": "Ультра",
"hud.settings.fullscreen": "Полный экран",
"hud.settings.fullscreen_mode": "Режим полного экрана",
"hud.settings.fullscreen_mode.exclusive": "Особый",
"hud.settings.fullscreen_mode.borderless": "Без рамок",
"hud.settings.particles": "Частицы",
"hud.settings.resolution": "Разрешение",
"hud.settings.bit_depth": "Разрядность",
"hud.settings.refresh_rate": "Частота обновления",
"hud.settings.save_window_size": "Сохранить размер окна",
"hud.settings.lighting_rendering_mode": "Режим рендера освещения",
"hud.settings.lighting_rendering_mode.ashikhmin": "Тип A - Высоко ",
"hud.settings.lighting_rendering_mode.blinnphong": "Тип B - Средне",
"hud.settings.lighting_rendering_mode.lambertian": "Тип L - Низко",
"hud.settings.shadow_rendering_mode": "Режим рендера теней",
"hud.settings.shadow_rendering_mode.none": "Нет",
"hud.settings.shadow_rendering_mode.cheap": "Низко",
"hud.settings.shadow_rendering_mode.map": "Карта",
"hud.settings.shadow_rendering_mode.map.resolution": "Разрешение",
"hud.settings.lod_detail": "LoD-детали",
"hud.settings.save_window_size": "Сохранить размер окна",
"hud.settings.music_volume": "Громкость музыки",
"hud.settings.sound_effect_volume": "Громкость звуковых эффектов",
"hud.settings.audio_device": "Аудио устройство",
"hud.settings.awaitingkey": "Нажми клавишу...",
"hud.settings.unbound": "Ничего",
"hud.settings.reset_keybinds": "По-умолчанию",
"hud.social": "Другие игроки",
"hud.social.online": "Онлайн",
"hud.social.friends": "Друзья",
"hud.social.not_yet_available": "Пока недоступно",
"hud.social.faction": "Фракция",
"hud.social.play_online_fmt": "{nb_player} игрок(ов) онлайн",
"hud.social.name": "Имя",
"hud.social.level": "Ур.",
"hud.social.zone": "Зона",
"hud.social.account": "Аккаунт",
"hud.crafting": "Крафт",
"hud.crafting.recipes": "Рецепты",
"hud.crafting.ingredients": "Ингредиенты:",
"hud.crafting.craft": "Создать",
"hud.crafting.tool_cata": "Требуется:",
"hud.group": "Группа",
"hud.group.invite_to_join": "[{name}] пригласил вас в свою группу!",
"hud.group.invite": "Пригласить",
"hud.group.kick": "Кикнуть",
"hud.group.assign_leader": "Назначить лидером",
"hud.group.leave": "Покинуть группу",
"hud.group.dead" : "Мертв",
"hud.group.out_of_range": "Слишком далеко",
"hud.group.add_friend": "Добавить в друзья",
"hud.group.link_group": "Объединить группы",
"hud.group.in_menu": "В меню",
"hud.group.members": "Участники группы",
"hud.spell": "Заклинания",
"hud.free_look_indicator": "Свободная камера активна. Нажмите {key}, чтобы выключить",
"hud.auto_walk_indicator": "Автодвижение активно",
"hud.map.difficulty": "Сложность",
"hud.map.towns": "Города",
"hud.map.castles": "Замки",
"hud.map.dungeons": "Данжи",
"hud.map.caves": "Пещеры",
"hud.map.cave": "Пещера",
"hud.map.town": "Город",
"hud.map.castle": "Замок",
"hud.map.dungeon": "Данж",
"hud.map.difficulty_dungeon": "Сложность данжа: {difficulty}",
"hud.map.drag": "Перетащить",
"hud.map.zoom": "Зум",
"hud.map.recenter": "Рецентрировать",
/// End HUD section
/// Start GameInput section
"gameinput.primary": "Основная атака",
"gameinput.secondary": "Второстепенная атака/Блок/Прицел",
"gameinput.slot1": "Быстрый слот 1",
"gameinput.slot2": "Быстрый слот 2",
"gameinput.slot3": "Быстрый слот 3",
"gameinput.slot4": "Быстрый слот 4",
"gameinput.slot5": "Быстрый слот 5",
"gameinput.slot6": "Быстрый слот 6",
"gameinput.slot7": "Быстрый слот 7",
"gameinput.slot8": "Быстрый слот 8",
"gameinput.slot9": "Быстрый слот 9",
"gameinput.slot10": "Быстрый слот 10",
"gameinput.swaploadout": "Сменить снаряжение",
"gameinput.togglecursor": "Отображать курсор",
"gameinput.help": "Отображать окно помощи",
"gameinput.toggleinterface": "Отображать интерфейс",
"gameinput.toggledebug": "Отображать FPS и экран отладки",
"gameinput.screenshot": "Сделать скриншот",
"gameinput.toggleingameui": "Отображать неймтеги",
"gameinput.fullscreen": "Включить полный экран",
"gameinput.moveforward": "Двигаться вперед",
"gameinput.moveleft": "Двигаться влево",
"gameinput.moveright": "Двигаться вправо",
"gameinput.moveback": "Двигаться назад",
"gameinput.jump": "Прыжок",
"gameinput.glide": "Глайдер",
"gameinput.roll": "Кувырок",
"gameinput.climb": "Карабкаться",
"gameinput.climbdown": "Карабкаться вниз",
"gameinput.wallleap": "Прыжок от стены",
"gameinput.togglelantern": "Включить фонарь",
"gameinput.mount": "Оседлать",
"gameinput.enter": "Войти",
"gameinput.chat": "Чат",
"gameinput.command": "Командовать",
"gameinput.escape": "Выйти",
"gameinput.map": "Карта",
"gameinput.bag": "Рюкзак",
"gameinput.social": "Социальное",
"gameinput.sit": "Сесть",
"gameinput.spellbook": "Заклинания",
"gameinput.settings": "Настройки",
"gameinput.respawn": "Возродиться",
"gameinput.charge": "Зарядить",
"gameinput.togglewield": "Достать/убрать оружие",
"gameinput.interact": "Взаимодействовать",
"gameinput.freelook": "Свободная камера",
"gameinput.autowalk": "Автодвижение",
"gameinput.dance": "Танцевать",
"gameinput.select": "Выбрать объект",
"gameinput.acceptgroupinvite": "Принять приглашение в группу",
"gameinput.declinegroupinvite": "Отклонить приглашение в группу",
"gameinput.crafting": "Крафт",
"gameinput.fly": "Полет",
"gameinput.sneak": "Скрытность",
"gameinput.swimdown": "Плыть вниз",
"gameinput.swimup": "Плыть вверх",
/// End GameInput section
/// Start chracter selection section
"char_selection.loading_characters": "Загрузка персонажей...",
"char_selection.delete_permanently": "Навсегда удалить этого персонажа?",
"char_selection.deleting_character": "Удаление персонажа...",
"char_selection.change_server": "Сменить сервер",
"char_selection.enter_world": "Войти в мир",
"char_selection.logout": "Выйти в меню",
"char_selection.create_new_character": "Создать нового персонажа",
"char_selection.creating_character": "Создание персонажа...",
"char_selection.character_creation": "Создание персонажа",
"char_selection.human_default": "Стандартный человек",
"char_selection.level_fmt": "Уровень {level_nb}",
"char_selection.uncanny_valley": "Wilderness",
"char_selection.plains_of_uncertainty": "Plains of Uncertainty",
"char_selection.beard": "Борода",
"char_selection.hair_style": "Прическа",
"char_selection.hair_color": "Цвет волос",
"char_selection.eye_color": "Цвет глаз",
"char_selection.skin": "Кожа",
"char_selection.eyeshape": "Детали глаз",
"char_selection.accessories": "Аксессуары",
"char_selection.create_info_name": "Вашему персонажу необходимо имя!",
/// End chracter selection section
/// Start character window section
"character_window.character_name": "Имя персонажа",
// Charater stats
"character_window.character_stats": r#"Стойкость
Выносливость
Сила воли
Защита
"#,
/// End character window section
/// Start Escape Menu Section
"esc_menu.logout": "Выйти в меню",
"esc_menu.quit_game": "Выйти из игры",
/// End Escape Menu Section
/// Buffs and Debuffs
"buff.remove": "Кликните, чтобы убрать",
"buff.title.missing": "Отсутствует название",
"buff.desc.missing": "Отсутствует описание",
// Buffs
"buff.title.heal": "Лечение",
"buff.desc.heal": "Лечит в течении времени.",
"buff.title.potion": "Зелье",
"buff.desc.potion": "Пьем...",
"buff.title.saturation": "Сыт",
"buff.desc.saturation": "Получайте здоровье от расходников в течении времени.",
// Debuffs
"buff.title.bleed": "Кровотечение",
"buff.desc.bleed": "Наносит переодический урон.",
}, },
@ -558,105 +39,196 @@ https://veloren.net/account/."#,
vector_map: { vector_map: {
"loading.tips": [ "loading.tips": [
"Нажмите 'G', чтобы зажечь фонарь.", "Нажмите 'G', чтобы зажечь фонарь.",
"Нажмите 'F1', чтобы увидеть управление по-умолчанию.", "Нажмите 'F1', чтобы просмотреть все клавиши по умолчанию.",
"Вы можете написать /say или /s, чтобы обратиться только к игрокам вблизи вас.", "Вы можете ввести /tell или /s, чтобы общаться только с игроками непосредственно вокруг вас.",
"Вы можете написать /region или /r, чтобы обратиться к игрокам в нескольких сотнях блоков вокруг вас.", "Вы можете ввести /region или /r, чтобы общаться только с игроками в паре сотен блоков вокруг вас.",
"Вы можете написать /group или /g, чтобы обратиться к игрокам в вашей группе.", "Администраторы могут использовать команду /build для входа в режим постройки.",
"Чтобы отправить приватное сообщение, напишите /tell, а затем имя персонажа и сообщение.", "Вы можете ввести /group или /g, чтобы общаться только с игроками в вашей текущей группе.",
"NPC одного уровня могут быть разной сложности.", "Чтобы отправить личные сообщения, введите /tell, а затем имя игрока и ваше сообщение.",
"Осматривайтесь, чтобы найти еду, сундуки и другой лут!", "Смотрите внимательно чтобы найти еду, сундуки и другие предметы, разбросанные по всему миру!",
"Инвентарь забит едой? Попробуйте скрафтить из нее еду получше!", "Инвентарь, заполненный едой? Попробуйте приготовить из нее еду получше!",
"Думаете, чем заняться? Подземелья отмечены коричневыми метками на карте!", "Интересно, чем можно заняться? Попробуйте пройти одно из подземелий, отмеченных на карте!",
"Не забудьте настроить графику под свою систему. Нажмите 'N', чтобы открыть настройки.", "Не забудьте настроить графику для вашей системы. Нажмите 'N', чтобы открыть настройки.",
"Играть с остальными веселее! Нажмите 'O', чтобы посмотреть кто онлайн.", "Играть с другими-это весело! Нажмите 'О', чтобы узнать, кто находится в сети.",
"NPC с черепом около полоски здоровья намного сильнее, по сравнению с вами.", "Нажмите 'J', чтобы танцевать. Вечеринка!",
"Нажмите 'J', чтобы танцевать. Тусовка!", "Нажмите 'L-Shift', чтобы открыть свой дельтаплан и покорить небо.",
"Нажмите 'L-Shift', чтобы открыть Глайдер и покорить небеса.", "Veloren все еще находится в Пре-Альфе. Мы делаем все возможное, чтобы улучшать его каждый день!",
"Veloren все еще пре-альфа. Мы стараемся улучшать его каждый день!", "Если вы хотите присоединиться к команде разработчиков или просто пообщаться с нами, присоединяйтесь к нашему серверу Discord.",
"Если вы хотите присоединиться к команде разработчиков или просто пообщаться с нами, заходите на наш Дискорд-сервер.", "Вы можете переключить отображение количества здоровья на панели здоровья в настройках.",
"Вы можете включить отображение чисел на полосе здоровья в настройках.", "Сядьте у костра (с помощью клавиши 'К'), чтобы залечить свои раны.",
"Чтобы увидеть свои характеристики нажмите на 'Статы' в инвентаре.", "Вам нужно больше сумок или лучшая броня, чтобы продолжить свое путешествие? Нажмите 'C', чтобы открыть меню крафта!",
],
"npc.speech.villager": [
"Хорошая погода?",
"Как дела?",
"Доброе утро!",
"Интересно, что думает Catoblepas когда ест траву.", /// in original Catoblepas (киса) но яб сменил на овцу в оригинале
"Хорошая погода, не правда ли?",
"Мысли об этих подземельях пугают меня. Надеюсь их кто-нибудь уничтожит",
"Когда я вырасту, я буду исследовать пещеры.",
"Вы не видели моего кота?",
"Вы когда-нибудь слышали о свирепых сухопутных акулах? Я слышал, они живут в пустынях",
"Говорят, в пещерах можно найти блестящие драгоценные камни всех видов.",
"Я просто помешан на сыре!",
"Ты не зайдешь? Мы как раз собирались съесть немного сыра",
"Говорят, мухоморы полезны для здоровья. Сам я их не ем.",
"Не забудь про печенья!",
"Я просто обожаю сыр дварфов. Я бы хотел научиться его готовить.",
"Интересно, что по ту сторону гор.",
"Я надеюсь сделать свой собственный дельтаплан когда-нибудь.",
"Хочешь, покажу тебе свой сад? Ладно, может в следующий раз.",
"Прекрасный день для прогулки по лесу!",
"Быть или не быть? Я подумываю о том чтобы стать фермером.",
"Тебе не кажется, что наша деревня самая лучшая?",
"Как ты думаешь, что заставляет Glowing Remains светься?",
"Время второго завтрака!",
"Ты когда - нибудь ловил светлячка?",
"I just can't understand where those Sauroks keep coming from.",
"Я бы хотел, чтобы кто-нибудь держал волков подальше от деревнию.",
"Прошлой ночью мне приснился чудесный сон о сыре. Что это значит?",
"Я оставила немного сыра у брата. Теперь я не знаю, съеден сыр или нет. Я называю его сыром Шредингера.",
"Я оставил немного сыра у сестры. Теперь я не знаю, съеден сыр или нет. Я называю его сыром Шредингера.",
"Кто-то должен что-то сделать с этими культистами. Желательно не я.",
"Надеюсь, скоро пойдет дождь. Это было бы хорошо для урожая.",
"Я люблю мед! И я ненавижу пчел.",
"Я хочу однажды увидеть мир. В жизни должно быть что-то большее, чем эта деревня.",
],
"npc.speech.villager_decline_trade": [
"Извините, мне нечем торговать.",
"Торговля? Как будто у меня есть что-то, что может вас заинтересовать.",
"Мой дом принадлежит мне, я не променяю его ни на что.",
],
"npc.speech.merchant_advertisement": [
"Могу ли я заинтересовать вас сделкой?",
"Ты хочешь со мной поторговать?",
"У меня много товаров, не хочешь взглянуть?"
],
"npc.speech.merchant_busy": [
"Эй, подожди своей очереди.",
"Пожалуйста, подождите, я здесь один на всех.",
"Видите другого человека перед собой?",
"Минутку, дай мне закончить.",
"Не лезь вне очереди!",
"Я занят, зайди попозже."
],
"npc.speech.merchant_trade_successful": [
"Спасибо, что торгуете со мной!",
"Спасибо вам!",
],
"npc.speech.merchant_trade_declined": [
"Может быть, в другой раз, хорошего дня!",
"Жаль, тогда, может быть, в следующий раз!"
],
"npc.speech.villager_cultist_alarm": [
"Берегись! На свободе разгуливает культист!",
"К оружию! Культисты атакуют!",
"Как посмели культисты напасть на нашу деревню!",
"Смерть культистам!",
"Культистов здесь не потерпят!",
"Кровожадный культист!",
"Попробуй на вкус острие моего меча, грязный культист!",
"Ничего не сможет смыть кровь с твоих рук, культист!",
"Миллиарды пузырящихся синих ракушек! Культист среди нас!",
"Зло этого культиста вот-вот закончится!",
"Этот культист мой!",
"Приготовься встретить своего создателя, грязный культист!",
"Я вижу культиста! Схватите его!",
"Я вижу культиста! В атаку!",
"Я вижу культиста! Не дайте им сбежать!",
"Будет ли самый почтенный культист заботиться о какой-то СМЕРТИ?!",
"Никогда не прощу! Никогда не забуду! Культист, сожалею!",
"Умри, культист!",
"Ваше царство террора захвачено!",
"Вот тебе за все, что ты сделал!",
"Мы не очень хорошо относимся к вашим людям здесь.",
"Тебе следовало оставаться под землей!",
], ],
"npc.speech.villager_under_attack": [ "npc.speech.villager_under_attack": [
"Помогите, меня атакуют!", "Помогите, Меня атакуют!",
"Помогите, меня атакуют!", "Помогите, Меня атакуют!",
"Ай! Меня атакуют!", "Оуч, Меня атакуют!",
"Ай! Меня атакуют! На помощь!", "Оуч, Меня атакуют!",
"Помогите мне! Меня атакуют!", "Помоги мне! Меня атакуют!",
"Меня атакуют! Помогите!", "Меня атакуют! Помогите!",
"Меня атакуют!! На помощь!", "Меня атакуют! Помогите мне!",
"Помогите!", "Помогите!",
"На помощь! На помощь!", "Помогите! Помогите!",
"Помогите! Помогите! Помогите!", "Помогите! Помогите! Помогите!",
"Меня атакуют!", "Меня атакуют!",
"ААА! Меня атакуют!", "АААААА! Меня атакуют!",
"AAA! Меня атакуют! На помощь!", "АААААА! Меня атакуют! Помогите!",
"Помогите! Нас атакуют!", "Помогите! Мы атакованны!",
"На помощь! Убийца!", "Помогите! Убийца!",
"Помогите! Здесь убийца!", "Помогите! Убийца на свободе!",
"На помощь! Меня пытаются убить!", "Помогите! Они пытаются меня убить!",
"Стража, меня атакуют!", "Стража, Меня атакуют!",
"Стража, на помощь!", "Стража! Меня атакуют!",
"Меня атакуют! Стража!", "Меня атакуют! Стража!",
"Помогите! Стража! Меня атакуют!", "Помогите! Стража! Меня атакуют!",
"Стража! Cкорее!", "Стража! Скорее!",
"Стража! Стража!", "Стража! Стража!",
"Стража! На меня напали!", "Стража! Этот злодей бьёт меня!",
"Стража, убейте этого мерзкого злодея", "Стража, Схватите этого негодяя!",
"Стража! Тут убийца!", "Стража! Здесь убийца!",
"Стража! Помогите мне!", "Стража! Помогите me!",
"Тебе это не сойдет с рук! Охрана!", "Тебе это не сойдет с рук! Стража!",
"Ты враг!", "Ты изверг!",
"Помогите!", "Помогите мне!",
"На помощь! Пожалуйста!", "Помогите! Пожалуйста!",
"Ай! Стража, помогите!", "Ой! Стража! Помогите!",
"Они пришли за мной!", "Они идут за мной!",
"На помощь, на помощь, на меня напали!", "Помогите! Помогите! Меня постигла расплата!",
"Ах, теперь мы видим насилие, присущее системе.", "Ах, теперь мы видим насилие, присущее системе.",
"Это всего лишь царапина!", "Это всего лишь царапина!",
"Прекрати!", "Остановитесь!",
"Что я вообще тебе сделал?!", "Что я тебе сделал?!",
"Пожалуйста, прекрати меня бить!", "Пожалуйста, не бей!",
"Эй, поаккуратнее с этой штукой!", "Эй! Смотри, куда направляешь эту штуку",
"Мерзкий негодняй, отстань!", "Гнусный негодяй, проваливай отсюда!",
"Остановись! Уходи!", "Прекрати! Уходи!",
"Ты злишь меня!", "Ты уже достал!",
"Ай! Кем ты себя возомнил?!", "Эй! Что ты возомнил о себе?!",
"Я лишу тебя головы за это!", "Я тебе башку оторву!",
"Остановись! У меня нет ничего ценного!", "Остановись пожалуйста. У меня ничего нет!",
"Я натравлю на тебя братьев! Они больше меня!", "Я позову брата, он больше меня",
"Нееет, я расскажу маме!", "Нет! Я расскажу маме!",
"Будь ты проклят!", "Будь ты проклят!",
"Пожалуйста, не надо!", "Пожалуйста, не делай этого.",
"Это было недружелюбно!", "Это не приятно!",
"Хорошо, ты сильный, а теперь убери оружие!", "Ваше оружие работает, вы можете убрать его прямо сейчас!",
"Пощади меня!", "Пощади!",
"Пожалуйста, у меня семья!", "Пожалуйста, у меня семья!",
"Я слишком молод, чтобы умирать!", "Я слишком молод чтобы умереть!",
"Мы можем решить все словами?", "Может договоримся?",
"Насилие не выход!", "Насилие не выход!",
"Так и знал, что день будет плохим...", "Сегодня выдался плохой день...",
"Эй, больно же!", "Эй, это больно!",
"Эй!", "Ик!",
"Как некультурно!", "Как грубо!",
"Остановись, я прошу!", "Остановись, прошу тебя!",
"Проклятие!", "Чтоб ты сдох!",
"Это не смешно.", "Это не смешно.",
"Как ты смеешь?!", "Как ты смеешь?!",
"Ты заплатишь за это!", "Ты заплатишь за это!",
"Не продолжай, а то пожалеешь!", "Ты об этом пожалеешь!",
"Не заставляй делать тебе больно!", "Не заставляй меня делать тебе больно!",
"Ты все неправильно понял!", "Произошла какая то ошибка!",
"Зачем ты так?!", "Не делай этого!",
"Проваливай, вражина!", "Изыди, дьявол",
"Это было больно!", "Это очень больно!",
"Почему ты это делаешь?", "Зачем ты это сделал?",
"Ради духов, уймись!", "Ради всего святого, прекрати!",
"Ты меня с кем-то спутал!", "Ты меня перепутал с кем то",
"Я не заслужил этого!", "Я не заслуживаю этого!",
"Пожалуйста, не делай так больше.", "Пожалуйста, больше так не делай.",
"Стража, киньте этого монстра в озеро!", "Стража, утопите этого монстра в озере!",
"Я натравлю на тебя своего тараска!", "Я натравлю своего tarasque на тебя!",
"Почему я?",
], ],
"npc.speech.villager_enemy_killed": [
"Я уничтожил врага!",
"Наконец-то мир!",
"... что же я наделал?",
]
} }
) )

32
assets/voxygen/i18n/ru_RU/char_selection.ron Normal file
View File

@ -0,0 +1,32 @@
/// WARNING: Localization files shall be saved in UTF-8 format without BOM
/// Localization for "global" English
(
string_map: {
"char_selection.loading_characters": "Загрузка персонажей...",
"char_selection.delete_permanently": "Навсегда удалить этого персонажа?",
"char_selection.deleting_character": "Удаление Персонажа...",
"char_selection.change_server": "Сменить сервер",
"char_selection.enter_world": "Войти в мир",
"char_selection.logout": "Разлогиниться",
"char_selection.create_new_character": "Создать нового персонажа",
"char_selection.creating_character": "Создание персонажа...",
"char_selection.character_creation": "Персонаж создан",
"char_selection.human_default": "Стандартный человек",
"char_selection.level_fmt": "Уровень {level_nb}",
"char_selection.uncanny_valley": "Wilderness",
"char_selection.plains_of_uncertainty": "Plains of Uncertainty",
"char_selection.beard": "Борода",
"char_selection.hair_style": "Прическа",
"char_selection.hair_color": "Цвет волос",
"char_selection.eye_color": "Цвет глаз",
"char_selection.skin": "Кожа",
"char_selection.eyeshape": "Детали глаз",
"char_selection.accessories": "Аксессуары",
"char_selection.create_info_name": "Вашему персонажу нужно имя!",
"char_selection.version_mismatch": "ПРЕДУПРЕЖДЕНИЕ! На этом сервере работает другая, возможно, несовместимая версия игры. Пожалуйста, обновите свою игру.",
},
vector_map: {
}
)

Some files were not shown because too many files have changed in this diff Show More