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' into 'More-potions'

Browse Source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Pybit 2024-01-04 11:48:30 +00:00
commit f6204f9d04
239 changed files with 8566 additions and 3765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab/CI/publish.gitlab-ci.yml
View File

@ -33,9 +33,12 @@ gittag:
extends: .publish
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule"
image: registry.gitlab.com/veloren/veloren-docker-ci/base/common:${CACHE_IMAGE_TAG}
image: bitnami/git:latest
dependencies: []
tags: ["veloren/veloren", "publish", "trusted"]
before_script:
- git --version
- git lfs --version
script:
- git config --global user.email "gitlab-veloren-bot@veloren.net"
- git config --global user.name "veloren-bot"

5
CHANGELOG.md
View File

@ -38,7 +38,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- A way to target non-player entities with commands. With rtsim_id: `rtsim@<id>`, with uid: `uid@<id>`.
- Shorthand in voxygen for specific entities in commands, some examples `@target`, `@mount`, `@viewpoint`.
- Added hit_timing to BasicMelee abilities
- Potion of Agility
- A tavern building where npcs go to relax.
- Toggle for walking instead of running (Default: `I`).
- Added day duration slider configuration on map creation UI.
### Changed
@ -90,6 +92,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed "low fps" of different shaders caused by low floating point precision when using time.
- Fixed bug where airship captains would mass generate after using /reload_chunks
- Fixed french translation "Énergie Consommée" -> "Regain d'Énergie"
- Fixed Perforate icon not displaying
## [0.15.0] - 2023-07-01

5
Cargo.lock generated
View File

@ -1880,9 +1880,9 @@ dependencies = [
[[package]]
name = "enumset"
version = "1.1.2"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e875f1719c16de097dee81ed675e2d9bb63096823ed3f0ca827b7dea3028bbbb"
checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
dependencies = [
"enumset_derive",
]
@ -7430,6 +7430,7 @@ dependencies = [
"csv",
"deflate",
"enum-map",
"enumset",
"fallible-iterator",
"flate2",
"fxhash",

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

@ -565,6 +565,12 @@
Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"),
],
),
// Crustaceans
Custom("Crab"): (
primary: Simple(None, "common.abilities.custom.crab.triplestrike"),
secondary: Simple(None, "common.abilities.custom.crab.triplestrike"),
abilities: [],
),
/// TODO: Organize the rest into further catagories and give purple tier droppers+ custom skillsets
Custom("Turret"): (
primary: Simple(None, "common.abilities.custom.turret.arrows"),

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

@ -1,55 +1,57 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 8.0,
damage_increase: 1.0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
angle: 50.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.08,
melee_constructor: (
kind: Slash(
damage: 8,
poise: 15,
knockback: 8,
energy_regen: 0,
),
range: 3.5,
angle: 50.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
buildup_duration: 0.4,
swing_duration: 0.08,
hit_timing: 0.5,
base_recover_duration: 0.5,
forward_movement: 2.5,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 0.5,
movement: (
swing: Some(Forward(2.5)),
),
ori_modifier: 0.7,
),
(
stage: 2,
base_damage: 10.0,
damage_increase: 1.5,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 12.0,
range: 3.5,
angle: 30.0,
base_buildup_duration: 0.7,
base_swing_duration: 0.1,
melee_constructor: (
kind: Slash(
damage: 10,
poise: 20,
knockback: 12,
energy_regen: 0,
),
range: 3.5,
angle: 30.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
buildup_duration: 0.7,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.7,
forward_movement: 2.0,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 0.7,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
)
energy_cost_per_strike: 0,
)

56
assets/common/abilities/custom/arthropods/antlion/singlestrike.ron
View File

@ -1,33 +1,31 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 74,
damage_increase: 0,
base_poise_damage: 27.5,
poise_damage_increase: 0,
knockback: 9.0,
range: 3.0,
angle: 60.0,
base_buildup_duration: 1.4,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 74,
poise: 27.5,
knockback: 9,
energy_regen: 0,
),
range: 3.0,
angle: 60.0,
damage_effect: Some(Buff((
kind: Ensnared,
dur_secs: 6.0,
strength: Value(0.5),
chance: 0.6,
))),
),
buildup_duration: 1.4,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 1.0,
damage_kind: Crushing,
damage_effect: Some(Buff((
kind: Ensnared,
dur_secs: 6.0,
strength: DamageFraction(0.1),
chance: 0.6,
))),
recover_duration: 0.8,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.8,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.8,
)
energy_cost_per_strike: 0,
)

54
assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron
View File

@ -1,33 +1,31 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 50,
damage_increase: 0,
base_poise_damage: 16,
poise_damage_increase: 0,
knockback: 2.0,
range: 3.0,
angle: 60.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Stab(
damage: 50,
poise: 16,
knockback: 2,
energy_regen: 0,
),
range: 3.0,
angle: 60.0,
damage_effect: Some(Buff((
kind: Poisoned,
dur_secs: 7.0,
strength: DamageFraction(0.6),
chance: 0.4,
))),
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 1.0,
damage_kind: Piercing,
damage_effect: Some(Buff((
kind: Poisoned,
dur_secs: 7.0,
strength: DamageFraction(0.6),
chance: 0.4,
))),
recover_duration: 0.8,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.8,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.8,
energy_cost_per_strike: 0,
)

44
assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron
View File

@ -1,27 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 54,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.0,
angle: 60.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 54,
poise: 20,
knockback: 5,
energy_regen: 0,
),
range: 3.0,
angle: 60.0,
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.8,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.5,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.5,
)
energy_cost_per_strike: 0,
)

54
assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron
View File

@ -1,33 +1,31 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 60,
damage_increase: 0,
base_poise_damage: 21,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.0,
angle: 60.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Stab(
damage: 60,
poise: 21,
knockback: 3,
energy_regen: 0,
),
range: 3.0,
angle: 60.0,
damage_effect: Some(Buff((
kind: Poisoned,
dur_secs: 9.0,
strength: DamageFraction(0.7),
chance: 0.8,
))),
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 1.0,
damage_kind: Piercing,
damage_effect: Some(Buff((
kind: Poisoned,
dur_secs: 9.0,
strength: DamageFraction(0.7),
chance: 0.8,
))),
recover_duration: 0.8,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.8,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.8,
energy_cost_per_strike: 0,
)

42
assets/common/abilities/custom/arthropods/weevil/singlestrike.ron
View File

@ -1,27 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 44,
damage_increase: 0,
base_poise_damage: 14,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.0,
angle: 60.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 44,
poise: 14,
knockback: 3,
energy_regen: 0,
),
range: 3.0,
angle: 60.0,
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.8,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.6,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.6,
energy_cost_per_strike: 0,
)

42
assets/common/abilities/custom/asp/singlestrike.ron
View File

@ -1,27 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 28.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.5,
angle: 60.0,
base_buildup_duration: 1.2,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 28,
poise: 28,
knockback: 3,
energy_regen: 0,
),
range: 3.5,
angle: 60.0,
),
buildup_duration: 1.2,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 2.0,
damage_kind: Crushing,
recover_duration: 0.4,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.65,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.65,
energy_cost_per_strike: 0,
)

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

@ -1,59 +1,65 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 36.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.8,
angle: 30.0,
base_buildup_duration: 1.4,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 36,
poise: 15,
knockback: 3,
energy_regen: 0,
),
range: 2.8,
angle: 30.0,
),
buildup_duration: 1.4,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.3,
forward_movement: 2.0,
damage_kind: Crushing,
recover_duration: 0.3,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.65,
),
(
stage: 2,
base_damage: 36.0,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.8,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 36,
poise: 18,
knockback: 3,
energy_regen: 0,
),
range: 2.8,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.3,
forward_movement: 1.5,
damage_kind: Crushing,
recover_duration: 0.3,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.65,
),
(
stage: 3,
base_damage: 36.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.8,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 36,
poise: 20,
knockback: 3,
energy_regen: 0,
),
range: 2.8,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.3,
forward_movement: 1.5,
damage_kind: Crushing,
recover_duration: 0.3,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.65,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.65,
energy_cost_per_strike: 0,
)

39
assets/common/abilities/custom/birdmediumbasic/singlestrike.ron
View File

@ -1,27 +1,18 @@
ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 1.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 0.0,
range: 2.5,
angle: 150.0,
base_buildup_duration: 0.1,
base_swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.2,
forward_movement: 0.0,
damage_kind: Piercing,
BasicMelee(
energy_cost: 0,
buildup_duration: 0.1,
swing_duration: 0.07,
hit_timing: 0.5,
recover_duration: 0.2,
melee_constructor: (
kind: Stab(
damage: 1,
poise: 0,
knockback: 0,
energy_regen: 0,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
range: 2.5,
angle: 150.0,
),
ori_modifier: 0.6,
)

59
assets/common/abilities/custom/boreal_warrior/hammer/singlestrike.ron
View File

@ -1,31 +1,28 @@
ComboMelee(
stage_data: [(
stage: 1,
base_damage: 15.0,
damage_increase: 0.75,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 3.5,
range: 4.5,
angle: 50.0,
base_buildup_duration: 0.7,
base_swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.45,
forward_movement: 0.0,
damage_kind: Crushing,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: Value(0.3),
chance: 0.4,
))),
)],
initial_energy_gain: 5.0,
max_energy_gain: 12.5,
energy_increase: 2.5,
speed_increase: 0.1,
max_speed_increase: 0.4,
scales_from_combo: 2,
ori_modifier: 1.0,
)
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Bash(
damage: 15,
poise: 0,
knockback: 3.5,
energy_regen: 5,
),
range: 4.5,
angle: 50.0,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 2.0,
strength: Value(0.3),
chance: 0.4,
))),
),
buildup_duration: 0.7,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.45,
ori_modifier: 1.0,
),
],
energy_cost_per_strike: 0,
)

65
assets/common/abilities/custom/crab/triplestrike.ron Normal file
View File

@ -0,0 +1,65 @@
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Slash(
damage: 5,
poise: 5,
knockback: 0,
energy_regen: 0,
),
range: 1.1,
angle: 30.0,
),
buildup_duration: 1.3,
swing_duration: 0.07,
hit_timing: 0.5,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.5)),
),
ori_modifier: 0.65,
),
(
melee_constructor: (
kind: Slash(
damage: 8,
poise: 8,
knockback: 1,
energy_regen: 0,
),
range: 1.1,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.07,
hit_timing: 0.5,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.5)),
),
ori_modifier: 0.65,
),
(
melee_constructor: (
kind: Slash(
damage: 12,
poise: 9,
knockback: 1,
energy_regen: 0,
),
range: 1.1,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.07,
hit_timing: 0.5,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.5)),
),
ori_modifier: 0.65,
),
],
energy_cost_per_strike: 0,
)

84
assets/common/abilities/custom/cyclops/doublestrike.ron
View File

@ -1,49 +1,51 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 32.0,
damage_increase: 0.0,
base_poise_damage: 20,
poise_damage_increase: 0.0,
knockback: 5.0,
range: 6,
angle: 90.0,
base_buildup_duration: 0.5,
base_swing_duration: 0.4,
melee_constructor: (
kind: Bash(
damage: 32,
poise: 20,
knockback: 5,
energy_regen: 0,
),
range: 6.0,
angle: 90.0,
),
buildup_duration: 0.5,
swing_duration: 0.4,
hit_timing: 0.4,
base_recover_duration: 0.4,
forward_movement: 0.3,
damage_kind: Crushing,
recover_duration: 0.4,
movement: (
swing: Some(Forward(0.3)),
),
ori_modifier: 0.65,
),
(
stage: 2,
base_damage: 36.0,
damage_increase: 0.0,
base_poise_damage: 40.0,
poise_damage_increase: 0.0,
knockback: 10.0,
range: 8,
angle: 45.0,
base_buildup_duration: 0.6,
base_swing_duration: 0.6,
melee_constructor: (
kind: Bash(
damage: 36,
poise: 40,
knockback: 10,
energy_regen: 0,
),
range: 8.0,
angle: 45.0,
damage_effect: Some(Buff((
kind: Crippled,
dur_secs: 3.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
),
buildup_duration: 0.6,
swing_duration: 0.6,
hit_timing: 0.3,
base_recover_duration: 1.2,
forward_movement: 0.2,
damage_kind: Crushing,
damage_effect: Some(Buff((
kind: Crippled,
dur_secs: 3.0,
strength: DamageFraction(0.1),
chance: 1.0,
))),
recover_duration: 1.2,
movement: (
swing: Some(Forward(0.2)),
),
ori_modifier: 0.65,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.65,
energy_cost_per_strike: 0,
)

96
assets/common/abilities/custom/dullahan/melee.ron
View File

@ -1,55 +1,57 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 35.5,
damage_increase: 0.0,
base_poise_damage: 15.0,
poise_damage_increase: 0.0,
knockback: 2.0,
range: 6.0,
angle: 60.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Slash(
damage: 35,
poise: 15,
knockback: 2,
energy_regen: 0,
),
range: 6.0,
angle: 60.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 3.0,
strength: DamageFraction(0.05),
chance: 0.3,
))),
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.4,
base_recover_duration: 0.3,
forward_movement: 0.8,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 3.0,
strength: DamageFraction(0.05),
chance: 0.3,
))),
recover_duration: 0.3,
movement: (
swing: Some(Forward(0.8)),
),
ori_modifier: 0.6,
),
(
stage: 2,
base_damage: 38.5,
damage_increase: 0.0,
base_poise_damage: 20.0,
poise_damage_increase: 0.0,
knockback: 8.0,
range: 6.0,
angle: 60.0,
base_buildup_duration: 0.7,
base_swing_duration: 0.1,
melee_constructor: (
kind: Slash(
damage: 38.5,
poise: 20,
knockback: 8,
energy_regen: 0,
),
range: 6.0,
angle: 60.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 3.0,
strength: DamageFraction(0.1),
chance: 0.15,
))),
),
buildup_duration: 0.7,
swing_duration: 0.1,
hit_timing: 0.4,
base_recover_duration: 1.3,
forward_movement: 0.2,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 3.0,
strength: DamageFraction(0.1),
chance: 0.15,
))),
recover_duration: 1.3,
movement: (
swing: Some(Forward(0.2)),
),
ori_modifier: 0.6,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.6,
energy_cost_per_strike: 0,
)

39
assets/common/abilities/custom/husk_brute/singlestrike.ron
View File

@ -1,27 +1,18 @@
ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 40.0,
damage_increase: 0,
base_poise_damage: 12,
poise_damage_increase: 0,
knockback: 5.0,
range: 3.5,
angle: 60.0,
base_buildup_duration: 1.0,
base_swing_duration: 0.2,
hit_timing: 0.5,
base_recover_duration: 1.0,
forward_movement: 0.5,
damage_kind: Crushing,
BasicMelee(
energy_cost: 0,
buildup_duration: 1.0,
swing_duration: 0.2,
hit_timing: 0.5,
recover_duration: 1.0,
melee_constructor: (
kind: Bash(
damage: 40,
poise: 12,
knockback: 5,
energy_regen: 0,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
range: 3.5,
angle: 60.0,
),
ori_modifier: 0.6,
)

42
assets/common/abilities/custom/maneater/singlestrike.ron
View File

@ -1,27 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 40.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.5,
angle: 60.0,
base_buildup_duration: 1.0,
base_swing_duration: 0.075,
melee_constructor: (
kind: Bash(
damage: 40,
poise: 28,
knockback: 3,
energy_regen: 0,
),
range: 3.5,
angle: 60.0,
),
buildup_duration: 1.0,
swing_duration: 0.075,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 2.0,
damage_kind: Crushing,
recover_duration: 0.4,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.65,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.65,
energy_cost_per_strike: 0,
)

96
assets/common/abilities/custom/oni/doublestrike.ron
View File

@ -1,55 +1,57 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 18.0,
damage_increase: 1.0,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 4.0,
range: 3.5,
angle: 50.0,
base_buildup_duration: 1.2,
base_swing_duration: 0.12,
melee_constructor: (
kind: Slash(
damage: 18,
poise: 0,
knockback: 4,
energy_regen: 0,
),
range: 3.5,
angle: 50.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
buildup_duration: 1.2,
swing_duration: 0.12,
hit_timing: 0.5,
base_recover_duration: 1.2,
forward_movement: 3.5,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 1.2,
movement: (
swing: Some(Forward(3.5)),
),
ori_modifier: 0.6,
),
(
stage: 2,
base_damage: 26.0,
damage_increase: 1.5,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 16.0,
range: 5.5,
angle: 15.0,
base_buildup_duration: 1.0,
base_swing_duration: 0.15,
melee_constructor: (
kind: Slash(
damage: 26,
poise: 0,
knockback: 16,
energy_regen: 0,
),
range: 5.5,
angle: 15.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
buildup_duration: 1.0,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 2.4,
forward_movement: 4.5,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 2.4,
movement: (
swing: Some(Forward(4.5)),
),
ori_modifier: 0.6,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.6,
energy_cost_per_strike: 0,
)

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

@ -1,27 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 40.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.0,
angle: 60.0,
base_buildup_duration: 1.2,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 40,
poise: 28,
knockback: 3,
energy_regen: 0,
),
range: 2.0,
angle: 60.0,
),
buildup_duration: 1.2,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 3.0,
damage_kind: Crushing,
recover_duration: 0.8,
movement: (
swing: Some(Forward(3.0)),
),
ori_modifier: 0.6,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.6,
energy_cost_per_strike: 0,
)

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

@ -1,59 +1,65 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 28.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.2,
angle: 30.0,
base_buildup_duration: 1.3,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 28,
poise: 15,
knockback: 3,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 1.3,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 2.0,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.65,
),
(
stage: 2,
base_damage: 28.0,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 28,
poise: 18,
knockback: 3,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 1.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.65,
),
(
stage: 3,
base_damage: 28.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 28,
poise: 20,
knockback: 3,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 1.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.65,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.65,
energy_cost_per_strike: 0,
)

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

@ -1,59 +1,65 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 44.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 1.3,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 44,
poise: 20,
knockback: 3,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 1.3,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 2.0,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.7,
),
(
stage: 2,
base_damage: 44.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 44,
poise: 20,
knockback: 3,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 1.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.7,
),
(
stage: 3,
base_damage: 44.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 44,
poise: 20,
knockback: 3,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 1.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

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

@ -1,75 +1,85 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 12.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 1.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 1.2,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 12,
poise: 15,
knockback: 1,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 1.2,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.2,
forward_movement: 1.5,
damage_kind: Crushing,
recover_duration: 0.2,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.8,
),
(
stage: 2,
base_damage: 12.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 1.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.3,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 12,
poise: 15,
knockback: 1,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.3,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.2,
forward_movement: 0.8,
damage_kind: Crushing,
recover_duration: 0.2,
movement: (
swing: Some(Forward(0.8)),
),
ori_modifier: 0.8,
),
(
stage: 3,
base_damage: 12.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 1.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 12,
poise: 15,
knockback: 1,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.4,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.2,
forward_movement: 0.8,
damage_kind: Crushing,
recover_duration: 0.2,
movement: (
swing: Some(Forward(0.8)),
),
ori_modifier: 0.8,
),
(
stage: 4,
base_damage: 12.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 8.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 12,
poise: 15,
knockback: 8,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.4,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.2,
forward_movement: 0.8,
damage_kind: Crushing,
recover_duration: 0.2,
movement: (
swing: Some(Forward(0.8)),
),
ori_modifier: 0.8,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.8,
energy_cost_per_strike: 0,
)

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

@ -1,59 +1,65 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 22,
knockback: 10.0,
range: 2.2,
angle: 30.0,
base_buildup_duration: 1.3,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 16,
poise: 22,
knockback: 10,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 1.3,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 2.0,
damage_kind: Crushing,
recover_duration: 0.4,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.7,
),
(
stage: 2,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 22,
poise_damage_increase: 0,
knockback: 10.0,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 16,
poise: 22,
knockback: 10,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 0.4,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.4,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
(
stage: 3,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 22,
poise_damage_increase: 0,
knockback: 10.0,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.2,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 16,
poise: 22,
knockback: 10,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 0.2,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.4,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

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

@ -1,27 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 20.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.7,
angle: 60.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 20,
poise: 28,
knockback: 3,
energy_regen: 0,
),
range: 2.7,
angle: 60.0,
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.8,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

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

@ -1,59 +1,62 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 5.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.9,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 10,
poise: 15,
knockback: 5,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.9,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.4,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
(
stage: 2,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
knockback: 5.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 10,
poise: 18,
knockback: 5,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 0.0,
damage_kind: Crushing,
recover_duration: 0.4,
ori_modifier: 0.7,
),
(
stage: 3,
base_damage: 10.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 5.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.07,
melee_constructor: (
kind: Bash(
damage: 10,
poise: 20,
knockback: 5,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.4,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

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

@ -1,43 +1,45 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 50.0,
damage_increase: 0,
base_poise_damage: 22,
poise_damage_increase: 0,
knockback: 4.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 1.3,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 50,
poise: 22,
knockback: 4,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 1.3,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
(
stage: 2,
base_damage: 74.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 22,
knockback: 4.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 74,
poise: 22,
knockback: 4,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 0.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.5)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

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

@ -1,43 +1,45 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 30,
poise_damage_increase: 0,
knockback: 4.0,
range: 2.2,
angle: 30.0,
base_buildup_duration: 1.3,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 16,
poise: 30,
knockback: 4,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 1.3,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.8,
),
(
stage: 2,
base_damage: 16.0,
damage_increase: 0,
base_poise_damage: 30,
poise_damage_increase: 0,
knockback: 4.0,
range: 2.2,
angle: 30.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.1,
melee_constructor: (
kind: Bash(
damage: 16,
poise: 30,
knockback: 4,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 0.8,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 1.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.8,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.8,
energy_cost_per_strike: 0,
)

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

@ -1,59 +1,65 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 20.0,
damage_increase: 0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 5.0,
range: 2.2,
angle: 40.0,
base_buildup_duration: 1.2,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 20,
poise: 15,
knockback: 5,
energy_regen: 0,
),
range: 2.2,
angle: 40.0,
),
buildup_duration: 1.2,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 0.3,
damage_kind: Crushing,
recover_duration: 0.8,
movement: (
swing: Some(Forward(0.3)),
),
ori_modifier: 0.8,
),
(
stage: 2,
base_damage: 20.0,
damage_increase: 0,
base_poise_damage: 17,
poise_damage_increase: 0,
knockback: 5.0,
range: 2.2,
angle: 40.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 20,
poise: 17,
knockback: 5,
energy_regen: 0,
),
range: 2.2,
angle: 40.0,
),
buildup_duration: 0.8,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 0.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.5)),
),
ori_modifier: 0.8,
),
(
stage: 3,
base_damage: 20.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 5.0,
range: 2.2,
angle: 40.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 20,
poise: 20,
knockback: 5,
energy_regen: 0,
),
range: 2.2,
angle: 40.0,
),
buildup_duration: 0.8,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 0.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.5)),
),
ori_modifier: 0.8,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.8,
energy_cost_per_strike: 0,
)

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

@ -1,27 +1,18 @@
ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 6.0,
damage_increase: 0,
base_poise_damage: 10,
poise_damage_increase: 0,
knockback: 1.0,
range: 1.5,
angle: 50.0,
base_buildup_duration: 0.6,
base_swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 1.0,
damage_kind: Crushing,
BasicMelee(
energy_cost: 0,
buildup_duration: 0.6,
swing_duration: 0.15,
hit_timing: 0.5,
recover_duration: 0.6,
melee_constructor: (
kind: Bash(
damage: 6,
poise: 10,
knockback: 1,
energy_regen: 0,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
range: 1.5,
angle: 50.0,
),
ori_modifier: 0.7,
)

74
assets/common/abilities/custom/roshwalr/doublehusk.ron
View File

@ -1,43 +1,45 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 28.0,
damage_increase: 0,
base_poise_damage: 7.5,
poise_damage_increase: 0,
knockback: 3.0,
range: 3,
angle: 75.0,
base_buildup_duration: 1.2,
base_swing_duration: 0.07,
melee_constructor: (
kind: Stab(
damage: 28,
poise: 7.5,
knockback: 3,
energy_regen: 5,
),
range: 3.0,
angle: 75.0,
),
buildup_duration: 1.2,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.3,
forward_movement: 0.25,
damage_kind: Piercing,
recover_duration: 0.3,
movement: (
swing: Some(Forward(0.25)),
),
ori_modifier: 0.5,
),
(
stage: 2,
base_damage: 28.0,
damage_increase: 0,
base_poise_damage: 7.5,
poise_damage_increase: 0,
knockback: 3.0,
range: 3,
angle: 75.0,
base_buildup_duration: 0.2,
base_swing_duration: 0.07,
melee_constructor: (
kind: Stab(
damage: 28,
poise: 7.5,
knockback: 3,
energy_regen: 5,
),
range: 3.0,
angle: 75.0,
),
buildup_duration: 0.2,
swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 0.25,
damage_kind: Piercing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.25)),
),
ori_modifier: 0.5,
),
],
initial_energy_gain: 5,
max_energy_gain: 5,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.65,
)
energy_cost_per_strike: 0,
)

39
assets/common/abilities/custom/simpleflyingmelee/singlestrike.ron
View File

@ -1,27 +1,18 @@
ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 1.0,
damage_increase: 0,
base_poise_damage: 0,
poise_damage_increase: 0,
knockback: 0.0,
range: 2.5,
angle: 150.0,
base_buildup_duration: 0.1,
base_swing_duration: 0.07,
hit_timing: 0.5,
base_recover_duration: 0.2,
forward_movement: 0.0,
damage_kind: Piercing,
BasicMelee(
energy_cost: 0,
buildup_duration: 0.1,
swing_duration: 0.07,
hit_timing: 0.5,
recover_duration: 0.2,
melee_constructor: (
kind: Stab(
damage: 1,
poise: 0,
knockback: 0,
energy_regen: 0,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
range: 2.5,
angle: 150.0,
),
ori_modifier: 0.6,
)

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

@ -1,27 +1,18 @@
ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 60.0,
damage_increase: 0,
base_poise_damage: 40,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.5,
angle: 60.0,
base_buildup_duration: 1.8,
base_swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 1.8,
forward_movement: 3.0,
damage_kind: Crushing,
BasicMelee(
energy_cost: 0,
buildup_duration: 1.8,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 1.8,
melee_constructor: (
kind: Bash(
damage: 60,
poise: 40,
knockback: 3,
energy_regen: 0,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
range: 3.5,
angle: 60.0,
),
ori_modifier: 0.7,
)

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

@ -1,27 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 54.0,
damage_increase: 0,
base_poise_damage: 40,
poise_damage_increase: 0,
knockback: 4.0,
range: 7.5,
angle: 60.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 54,
poise: 40,
knockback: 4,
energy_regen: 0,
),
range: 7.5,
angle: 60.0,
),
buildup_duration: 0.8,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 3.0,
damage_kind: Crushing,
recover_duration: 0.8,
movement: (
swing: Some(Forward(3.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

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

@ -1,59 +1,65 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 40.0,
damage_increase: 0,
base_poise_damage: 32.5,
poise_damage_increase: 0,
knockback: 3.0,
range: 7.5,
angle: 30.0,
base_buildup_duration: 1.3,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 40,
poise: 32.5,
knockback: 3,
energy_regen: 0,
),
range: 7.5,
angle: 30.0,
),
buildup_duration: 1.3,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.5,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.5,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
(
stage: 2,
base_damage: 50.0,
damage_increase: 0,
base_poise_damage: 32.5,
poise_damage_increase: 0,
knockback: 3.0,
range: 5.5,
angle: 30.0,
base_buildup_duration: 0.2,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 50,
poise: 32.5,
knockback: 3,
energy_regen: 0,
),
range: 5.5,
angle: 30.0,
),
buildup_duration: 0.2,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.3,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.3,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
(
stage: 3,
base_damage: 60.0,
damage_increase: 0,
base_poise_damage: 32.5,
poise_damage_increase: 0,
knockback: 25.0,
range: 5.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.125,
melee_constructor: (
kind: Bash(
damage: 60,
poise: 32.5,
knockback: 25,
energy_regen: 0,
),
range: 5.5,
angle: 30.0,
),
buildup_duration: 0.4,
swing_duration: 0.125,
hit_timing: 0.5,
base_recover_duration: 1.6,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 1.6,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

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

@ -1,27 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 22.0,
damage_increase: 0,
base_poise_damage: 28,
poise_damage_increase: 0,
knockback: 2.0,
range: 3.0,
angle: 15.0,
base_buildup_duration: 0.8,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 22,
poise: 28,
knockback: 2,
energy_regen: 0,
),
range: 3.0,
angle: 15.0,
),
buildup_duration: 0.8,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 3.0,
damage_kind: Crushing,
recover_duration: 0.8,
movement: (
swing: Some(Forward(3.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

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

@ -1,59 +1,65 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 16.5,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.0,
angle: 15.0,
base_buildup_duration: 0.95,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 16.5,
poise: 20,
knockback: 3,
energy_regen: 0,
),
range: 3.0,
angle: 15.0,
),
buildup_duration: 0.95,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.50,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.5,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.6,
),
(
stage: 2,
base_damage: 30.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.0,
angle: 15.0,
base_buildup_duration: 0.65,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 30,
poise: 20,
knockback: 3,
energy_regen: 0,
),
range: 3.0,
angle: 15.0,
),
buildup_duration: 0.65,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.50,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.5,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.6,
),
(
stage: 3,
base_damage: 36.0,
damage_increase: 0,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 3.0,
range: 3.0,
angle: 15.0,
base_buildup_duration: 0.525,
base_swing_duration: 0.125,
melee_constructor: (
kind: Bash(
damage: 36,
poise: 20,
knockback: 3,
energy_regen: 0,
),
range: 3.0,
angle: 15.0,
),
buildup_duration: 0.525,
swing_duration: 0.125,
hit_timing: 0.5,
base_recover_duration: 1.25,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 1.25,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.6,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.6,
energy_cost_per_strike: 0,
)

104
assets/common/abilities/custom/theropodsmall/triplestrike.ron
View File

@ -1,59 +1,65 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 30.0,
damage_increase: 0,
base_poise_damage: 17.5,
poise_damage_increase: 0,
knockback: 3.0,
range: 4.5,
angle: 30.0,
base_buildup_duration: 1.3,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 30,
poise: 17.5,
knockback: 3,
energy_regen: 0,
),
range: 4.5,
angle: 30.0,
),
buildup_duration: 1.3,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.5,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.5,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
(
stage: 2,
base_damage: 30.0,
damage_increase: 0,
base_poise_damage: 20.5,
poise_damage_increase: 0,
knockback: 3.0,
range: 4.5,
angle: 30.0,
base_buildup_duration: 0.2,
base_swing_duration: 0.15,
melee_constructor: (
kind: Bash(
damage: 30,
poise: 20.5,
knockback: 3,
energy_regen: 0,
),
range: 4.5,
angle: 30.0,
),
buildup_duration: 0.2,
swing_duration: 0.15,
hit_timing: 0.5,
base_recover_duration: 0.3,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 0.3,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
(
stage: 3,
base_damage: 30.0,
damage_increase: 0,
base_poise_damage: 22.5,
poise_damage_increase: 0,
knockback: 25.0,
range: 5.5,
angle: 30.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.125,
melee_constructor: (
kind: Bash(
damage: 30,
poise: 22.5,
knockback: 25,
energy_regen: 0,
),
range: 5.5,
angle: 30.0,
),
buildup_duration: 0.4,
swing_duration: 0.125,
hit_timing: 0.5,
base_recover_duration: 1.6,
forward_movement: 1.0,
damage_kind: Crushing,
recover_duration: 1.6,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
)
energy_cost_per_strike: 0,
)

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

@ -1,27 +1,18 @@
ComboMelee(
stage_data: [
(
stage: 1,
base_damage: 36.0,
damage_increase: 0,
base_poise_damage: 40,
poise_damage_increase: 0,
knockback: 3.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 1.2,
base_swing_duration: 0.4,
hit_timing: 0.5,
base_recover_duration: 0.8,
forward_movement: 5.0,
damage_kind: Crushing,
BasicMelee(
energy_cost: 0,
buildup_duration: 1.2,
swing_duration: 0.4,
hit_timing: 0.5,
recover_duration: 0.8,
melee_constructor: (
kind: Bash(
damage: 36,
poise: 40,
knockback: 3,
energy_regen: 0,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
range: 2.5,
angle: 30.0,
),
ori_modifier: 0.7,
)

50
assets/common/abilities/daggersimple/singlestrike.ron
View File

@ -1,33 +1,25 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 2.0,
damage_increase: 1.0,
base_poise_damage: 8,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
angle: 50.0,
base_buildup_duration: 0.1,
base_swing_duration: 0.05,
melee_constructor: (
kind: Slash(
damage: 2,
poise: 8,
knockback: 8,
energy_regen: 0,
),
range: 3.5,
angle: 50.0,
),
buildup_duration: 0.1,
swing_duration: 0.05,
hit_timing: 0.5,
base_recover_duration: 0.05,
forward_movement: 1.0,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 0.05,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
)
energy_cost_per_strike: 0,
)

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

@ -1,4 +1,4 @@
ComboMelee(
ComboMeleeDeprecated(
stage_data: [(
stage: 1,
base_damage: 15.0,

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

@ -1,43 +1,45 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 24.0,
damage_increase: 1.0,
base_poise_damage: 40,
poise_damage_increase: 0,
knockback: 4.0,
range: 4.5,
angle: 50.0,
base_buildup_duration: 0.6,
base_swing_duration: 0.08,
melee_constructor: (
kind: Bash(
damage: 24,
poise: 40,
knockback: 4,
energy_regen: 0,
),
range: 4.5,
angle: 50.0,
),
buildup_duration: 0.6,
swing_duration: 0.08,
hit_timing: 0.5,
base_recover_duration: 0.6,
forward_movement: 3.5,
damage_kind: Crushing,
recover_duration: 0.6,
movement: (
swing: Some(Forward(3.5)),
),
ori_modifier: 0.65,
),
(
stage: 2,
base_damage: 32.0,
damage_increase: 1.5,
base_poise_damage: 40,
poise_damage_increase: 0,
knockback: 16.0,
range: 2.5,
angle: 30.0,
base_buildup_duration: 0.6,
base_swing_duration: 0.25,
melee_constructor: (
kind: Bash(
damage: 32,
poise: 40,
knockback: 16,
energy_regen: 0,
),
range: 2.5,
angle: 30.0,
),
buildup_duration: 0.6,
swing_duration: 0.25,
hit_timing: 0.5,
base_recover_duration: 1.2,
forward_movement: 2.0,
damage_kind: Crushing,
recover_duration: 1.2,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.65,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.65,
energy_cost_per_strike: 0,
)

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

@ -1,55 +1,57 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 6.5,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
knockback: 4.0,
range: 2.5,
angle: 15.0,
base_buildup_duration: 0.35,
base_swing_duration: 0.075,
melee_constructor: (
kind: Stab(
damage: 6.5,
poise: 18,
knockback: 4,
energy_regen: 0,
),
range: 2.5,
angle: 15.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
buildup_duration: 0.35,
swing_duration: 0.075,
hit_timing: 0.5,
base_recover_duration: 0.4,
forward_movement: 0.7,
damage_kind: Piercing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 0.4,
movement: (
swing: Some(Forward(0.7)),
),
ori_modifier: 0.75,
),
(
stage: 2,
base_damage: 8.0,
damage_increase: 0,
base_poise_damage: 18,
poise_damage_increase: 0,
knockback: 7.0,
range: 2.5,
angle: 15.0,
base_buildup_duration: 0.5,
base_swing_duration: 0.1,
melee_constructor: (
kind: Stab(
damage: 8,
poise: 18,
knockback: 7,
energy_regen: 0,
),
range: 2.5,
angle: 15.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
buildup_duration: 0.5,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.5,
forward_movement: 0.7,
damage_kind: Piercing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 0.5,
movement: (
swing: Some(Forward(0.7)),
),
ori_modifier: 0.75,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 3.0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 2,
ori_modifier: 0.75,
energy_cost_per_strike: 0,
)

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

@ -1,55 +1,57 @@
ComboMelee(
stage_data: [
ComboMelee2(
strikes: [
(
stage: 1,
base_damage: 8.0,
damage_increase: 1.0,
base_poise_damage: 15,
poise_damage_increase: 0,
knockback: 8.0,
range: 3.5,
angle: 50.0,
base_buildup_duration: 0.4,
base_swing_duration: 0.08,
melee_constructor: (
kind: Slash(
damage: 8,
poise: 15,
knockback: 8,
energy_regen: 0,
),
range: 3.5,
angle: 50.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
buildup_duration: 0.4,
swing_duration: 0.08,
hit_timing: 0.5,
base_recover_duration: 0.5,
forward_movement: 2.5,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 0.5,
movement: (
swing: Some(Forward(2.5)),
),
ori_modifier: 0.7,
),
(
stage: 2,
base_damage: 10.0,
damage_increase: 1.5,
base_poise_damage: 20,
poise_damage_increase: 0,
knockback: 12.0,
range: 3.5,
angle: 30.0,
base_buildup_duration: 0.7,
base_swing_duration: 0.1,
melee_constructor: (
kind: Slash(
damage: 10,
poise: 20,
knockback: 12,
energy_regen: 0,
),
range: 3.5,
angle: 30.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
),
buildup_duration: 0.7,
swing_duration: 0.1,
hit_timing: 0.5,
base_recover_duration: 0.7,
forward_movement: 2.0,
damage_kind: Slashing,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 10.0,
strength: DamageFraction(0.1),
chance: 0.1,
))),
recover_duration: 0.7,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.7,
),
],
initial_energy_gain: 0,
max_energy_gain: 0,
energy_increase: 0,
speed_increase: 0.0,
max_speed_increase: 0.0,
scales_from_combo: 0,
ori_modifier: 0.7,
energy_cost_per_strike: 0,
)

11
assets/common/entity/wild/peaceful/crab.ron Normal file
View File

@ -0,0 +1,11 @@
#![enable(implicit_some)]
(
name: Automatic,
body: RandomWith("crab"),
alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.crustacean.crab"),
inventory: (
loadout: FromBody,
),
meta: [],
)

2
assets/common/items/armor/misc/bag/tiny_leather_pouch.ron
View File

@ -8,7 +8,7 @@ ItemDef(
quality: Common,
tags: [
Bag,
SalvageInto(Leather, 1),
SalvageInto(Rawhide, 1),
],
slots: 6,
)

2
assets/common/items/npc_armor/bird_large/wyvern.ron
View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest,
stats: Direct((
protection: Some(Normal(150.0)),
poise_resilience: Some(Normal(5.0)),
poise_resilience: Some(Normal(25.0)),
)),
)),
quality: Epic,

2
assets/common/items/npc_armor/quadruped_low/dagon.ron
View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest,
stats: Direct((
protection: Some(Normal(100.0)),
poise_resilience: Some(Normal(5.0)),
poise_resilience: Some(Normal(25.0)),
)),
)),
quality: Epic,

2
assets/common/items/npc_armor/theropod/rugged.ron
View File

@ -5,7 +5,7 @@ ItemDef(
kind: Chest,
stats: Direct((
protection: Some(Normal(80.0)),
poise_resilience: Some(Normal(0.0)),
poise_resilience: Some(Normal(25.0)),
)),
)),
quality: Moderate,

20
assets/common/items/npc_weapons/unique/crab_pincer.ron Normal file
View File

@ -0,0 +1,20 @@
ItemDef(
name: "Crab Pincer",
description: "testing123",
kind: Tool((
kind: Natural,
hands: Two,
stats: (
equip_time_secs: 0.5,
power: 1.0,
effect_power: 1.0,
speed: 1.0,
range: 1.0,
energy_efficiency: 1.0,
buff_strength: 1.0,
),
)),
quality: Low,
tags: [],
ability_spec: Some(Custom("Crab")),
)

10
assets/common/loadout/village/captain.ron
View File

@ -1,8 +1,12 @@
// Christmas event
//(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
#![enable(implicit_some)]
(
head: Item("common.items.armor.pirate.hat"),
head: Seasonal([
(Some(Christmas), Choice([
(1, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
(1, Some(Item("common.items.armor.pirate.hat")))
])),
(None, Item("common.items.armor.pirate.hat")),
]),
shoulders: Item("common.items.armor.mail.orichalcum.shoulder"),
chest: Item("common.items.armor.mail.orichalcum.chest"),
gloves: Item("common.items.armor.mail.orichalcum.hand"),

18
assets/common/loadout/village/farmer.ron
View File

@ -1,11 +1,17 @@
// Christmas event
//(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
#![enable(implicit_some)]
(
head: Choice([
(3, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.bamboo_twig")),
(2, None),
head: Seasonal([
(Some(Christmas), Choice([
(9, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
(3, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.bamboo_twig")),
(2, None),
])),
(None, Choice([
(3, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.bamboo_twig")),
(2, None),
])),
]),
chest: Choice([
(1, Item("common.items.armor.misc.chest.worker_green_0")),

33
assets/common/loadout/village/guard.ron
View File

@ -1,14 +1,11 @@
// Christmas event
//(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
// Christmas event
//(1.0, Some(Item("common.items.lantern.blue_0"))),
//(1.0, Some(Item("common.items.lantern.polaris"))),
//(2.0, Some(Item("common.items.lantern.red_0"))),
//(2.0, Some(Item("common.items.lantern.green_0"))),
#![enable(implicit_some)]
(
head: Choice([
(1, Item("common.items.armor.misc.head.helmet")),
head: Seasonal([
(Some(Christmas), Choice([
(1, Some(Item("common.items.armor.misc.head.helmet"))),
(1, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
])),
(None, Item("common.items.armor.misc.head.helmet")),
]),
shoulders: Item("common.items.armor.leather_plate.shoulder"),
chest: Item("common.items.armor.leather_plate.chest"),
@ -16,8 +13,18 @@
belt: Item("common.items.armor.leather_plate.belt"),
legs: Item("common.items.armor.leather_plate.pants"),
feet: Item("common.items.armor.leather_plate.foot"),
lantern: Choice([
(1, Item("common.items.lantern.black_0")),
(2, None),
]),
lantern: Seasonal([
(Some(Christmas), Choice([
(1, Some(Item("common.items.lantern.blue_0"))),
(1, Some(Item("common.items.lantern.polaris"))),
(2, Some(Item("common.items.lantern.red_0"))),
(2, Some(Item("common.items.lantern.green_0"))),
(1, Item("common.items.lantern.black_0")),
(2, None),
])),
(None, Choice([
(1, Item("common.items.lantern.black_0")),
(2, None),
])),
])
)

18
assets/common/loadout/village/herbalist.ron
View File

@ -1,11 +1,17 @@
// Christmas event
//(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
#![enable(implicit_some)]
(
head: Choice([
(3, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.hood")),
(2, None),
head: Seasonal([
(Some(Christmas), Choice([
(9, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
(3, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.hood")),
(2, None),
])),
(None, Choice([
(3, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.hood")),
(2, None),
])),
]),
chest: Choice([
(1, Item("common.items.armor.twigs.chest")),

21
assets/common/loadout/village/hunter.ron
View File

@ -1,12 +1,19 @@
// Christmas event
//(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
#![enable(implicit_some)]
(
head: Choice([
(6, None),
(2, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.hood")),
(3, Item("common.items.armor.misc.head.hood_dark")),
head: Seasonal([
(Some(Christmas), Choice([
(15, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
(6, None),
(2, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.hood")),
(3, Item("common.items.armor.misc.head.hood_dark")),
])),
(None, Choice([
(6, None),
(2, Item("common.items.armor.misc.head.straw")),
(3, Item("common.items.armor.misc.head.hood")),
(3, Item("common.items.armor.misc.head.hood_dark")),
])),
]),
chest: Choice([
(1, Item("common.items.armor.hide.leather.chest")),

15
assets/common/loadout/village/mountaineer.ron
View File

@ -1,10 +1,15 @@
// Christmas event
//(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
#![enable(implicit_some)]
(
head: Choice([
(1, Item("common.items.armor.misc.head.headband")),
(2, None),
head: Seasonal([
(Some(Christmas), Choice([
(3, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
(2, None),
(1, Item("common.items.armor.misc.head.headband")),
])),
(None, Choice([
(2, None),
(1, Item("common.items.armor.misc.head.headband")),
])),
]),
shoulders: Choice([
(1, Item("common.items.armor.cloth_blue.shoulder_0")),

15
assets/common/loadout/village/villager.ron
View File

@ -1,10 +1,15 @@
// Christmas event
//(1.0, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
#![enable(implicit_some)]
(
head: Choice([
(1, Item("common.items.armor.misc.head.straw")),
(2, None),
head: Seasonal([
(Some(Christmas), Choice([
(3, Some(Item("common.items.calendar.christmas.armor.misc.head.woolly_wintercap"))),
(1, Item("common.items.armor.misc.head.straw")),
(2, None),
])),
(None, Choice([
(1, Item("common.items.armor.misc.head.straw")),
(2, None),
])),
]),
chest: Choice([
(1, Item("common.items.armor.misc.chest.worker_green_0")),

5
assets/common/loot_tables/creature/crustacean/crab.ron Normal file
View File

@ -0,0 +1,5 @@
[
(2.0, Nothing),
(1.0, Item("common.items.crafting_ing.animal_misc.viscous_ooze")),
(1.0, Item("common.items.crafting_ing.animal_misc.strong_pincer")),
]

2
assets/common/loot_tables/creature/quad_medium/mammoth.ron
View File

@ -1,6 +1,6 @@
[
(1, All([
MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 3),
MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 1),
MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2),
],
)),

2
assets/common/loot_tables/creature/quad_medium/ngoubou.ron
View File

@ -1,6 +1,6 @@
[
(1, All([
MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 3),
MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 0, 1),
MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2),
MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 0, 2),
],

4
assets/common/material_stats_manifest.ron
View File

@ -127,11 +127,11 @@
poise_resilience: Some(Normal(30.0)),
),
"Cobalt": (
protection: Some(Normal(122.0)),
protection: Some(Normal(132.0)),
poise_resilience: Some(Normal(40.0)),
),
"Bloodsteel": (
protection: Some(Normal(146.0)),
protection: Some(Normal(156.0)),
poise_resilience: Some(Normal(50.0)),
),
"Orichalcum": (

12
assets/common/npc_names.ron
View File

@ -1417,4 +1417,16 @@
),
)
),
crustacean: (
body: (
keyword: "crustacean",
names_0: ["Ferris"],
),
species: (
crab: (
keyword: "crab",
generic: "Crab",
),
)
),
)

2
assets/common/trading/item_price_calculation.ron
View File

@ -16,7 +16,7 @@ loot_tables: [
// Ingredients
(72.5, true, "common.trading.sellable_materials"),
(1.7205, false, "common.trading.unsellable_materials"),
(2.774, false, "common.trading.unsellable_materials"),
// Food Ingredients
(20.375, true, "common.trading.food"),

5
assets/common/trading/unsellable_materials.ron
View File

@ -37,6 +37,11 @@
(0.15, Item("common.items.crafting_ing.animal_misc.lively_vine")),
(0.225, Item("common.items.crafting_ing.sticky_thread")),
// Miscellaneous Materials
(0.75, Item("common.items.crafting_ing.resin")),
(1.0, Item("common.items.crafting_ing.sentient_seed")),
(2.0, Item("common.items.crafting_ing.living_embers")),
// Ultra Rare drops
(0.0005, Item("common.items.crafting_ing.mindflayer_bag_damaged")),
]

34
assets/voxygen/audio/calendar/christmas/soundtrack.ron
View File

@ -307,6 +307,19 @@
// Dungeon music
Individual((
title: "A Heart's Ice-Cold Protection",
path: "voxygen.audio.soundtrack.dungeon.a_hearts_ice-cold_protection",
length: 205.0,
timing: None,
weather: None,
biomes:[],
sites: [
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("GeekyGami", "https://geekygami.newgrounds.com/audio/"),
)),
Individual((
title: "Mysty Temple",
path: "voxygen.audio.soundtrack.dungeon.mysty_temple",
@ -316,6 +329,7 @@
biomes:[],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Tiny", None),
@ -342,6 +356,7 @@
biomes: [],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@ -355,6 +370,7 @@
biomes: [],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@ -436,8 +452,8 @@
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 56.0, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 61.818, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.545, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-end", 6.0, Transition(Combat(High), Explore), None),
],
artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
@ -451,14 +467,14 @@
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.reversal.reversal-start", 60.0, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.reversal.reversal-start", 61.666, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.reversal.reversal-loop", 60.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.reversal.reversal-end", 4.0, Transition(Combat(High), Explore), None),
("voxygen.audio.soundtrack.combat.reversal.reversal-end", 3.666, Transition(Combat(High), Explore), None),
],
artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
),
Segmented(
title: "Valiant Voxels",
title: "Clash",
timing: None,
weather: None,
biomes: [],
@ -466,11 +482,11 @@
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-start", 7.846, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-loop", 59.126, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.valiant_voxels.valiant_voxels-end", 5.49, Transition(Combat(High), Explore), None),
("voxygen.audio.soundtrack.combat.clash.clash-start", 121.5, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.clash.clash-loop", 81.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.clash.clash-end", 1.5, Transition(Combat(High), Explore), None),
],
artist: ("Seventh Sam", "https://seventhsam.com/"),
artist: ("Alfredo Pompa D & Rodriogo Plata", None),
),
]
)

39
assets/voxygen/audio/calendar/halloween/soundtrack.ron
View File

@ -165,6 +165,19 @@
// Dungeon music
Individual((
title: "A Heart's Ice-Cold Protection",
path: "voxygen.audio.soundtrack.dungeon.a_hearts_ice-cold_protection",
length: 205.0,
timing: None,
weather: None,
biomes:[],
sites: [
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("GeekyGami", "https://geekygami.newgrounds.com/audio/"),
)),
Individual((
title: "Mysty Temple",
path: "voxygen.audio.soundtrack.dungeon.mysty_temple",
@ -174,6 +187,7 @@
biomes:[],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Tiny", None),
@ -200,6 +214,7 @@
biomes: [],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@ -213,6 +228,7 @@
biomes: [],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@ -294,8 +310,8 @@
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 56.0, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 61.818, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.545, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-end", 6.0, Transition(Combat(High), Explore), None),
],
artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
@ -309,11 +325,26 @@
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.reversal.reversal-start", 60.0, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.reversal.reversal-start", 61.666, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.reversal.reversal-loop", 60.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.reversal.reversal-end", 4.0, Transition(Combat(High), Explore), None),
("voxygen.audio.soundtrack.combat.reversal.reversal-end", 3.666, Transition(Combat(High), Explore), None),
],
artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
),
Segmented(
title: "Clash",
timing: None,
weather: None,
biomes: [],
sites: [
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.clash.clash-start", 121.5, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.clash.clash-loop", 81.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.clash.clash-end", 1.5, Transition(Combat(High), Explore), None),
],
artist: ("Alfredo Pompa D & Rodriogo Plata", None),
),
]
)

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

@ -397,27 +397,6 @@
threshold: 0.7,
subtitle: "subtitle-hammer-attack",
),
Attack(ComboMelee(Action, 1), Sword): (
files: [
"voxygen.audio.sfx.abilities.swing_sword",
],
threshold: 0.7,
subtitle: "subtitle-sword_attack",
),
Attack(ComboMelee(Action, 2), Sword): (
files: [
"voxygen.audio.sfx.abilities.separated_second_swing",
],
threshold: 0.7,
subtitle: "subtitle-sword_attack",
),
Attack(ComboMelee(Action, 3), Sword): (
files: [
"voxygen.audio.sfx.abilities.separated_third_swing",
],
threshold: 0.7,
subtitle: "subtitle-sword_attack",
),
Inventory(CollectedTool(Sword)): (
files: [
"voxygen.audio.sfx.inventory.pickup_sword",
@ -443,7 +422,7 @@
threshold: 0.5,
subtitle: "subtitle-unwield_hammer",
),
Attack(ComboMelee(Action, 1), Hammer): (
Attack(ComboMeleeDeprecated(Action, 1), Hammer): (
files: [
"voxygen.audio.sfx.abilities.swing",
],
@ -489,20 +468,6 @@
threshold: 0.5,
subtitle: "subtitle-unwield_axe",
),
Attack(ComboMelee(Action, 1), Axe): (
files: [
"voxygen.audio.sfx.abilities.swing",
],
threshold: 0.7,
subtitle: "subtitle-axe_attack",
),
Attack(ComboMelee(Action, 2), Axe): (
files: [
"voxygen.audio.sfx.abilities.swing",
],
threshold: 0.7,
subtitle: "subtitle-axe_attack",
),
Attack(RapidMelee(Action), Axe): (
files: [
"voxygen.audio.sfx.abilities.swing",
@ -549,13 +514,6 @@
threshold: 0.5,
subtitle: "subtitle-unwield_staff",
),
Attack(BasicBeam, Staff): (
files: [
"voxygen.audio.sfx.abilities.flame_thrower",
],
threshold: 0.2,
subtitle: "subtitle-staff_attack",
),
//Attack(BasicRanged, Staff): (
// files: [
// "voxygen.audio.sfx.abilities.staff_channeling",

53
assets/voxygen/audio/soundtrack.ron
View File

@ -16,6 +16,20 @@
// Overworld exploration tracks
Individual((
title: "Graceful Journey",
path: "voxygen.audio.soundtrack.overworld.graceful_journey",
length: 240.0,
timing: Day,
weather: None,
biomes: [
(Lake, 1),
(Grassland, 1),
],
sites: [Void],
music_state: Activity(Explore),
artist: ("Tobias Thy - (Thy SFX)", "https://soundcloud.com/thyofficial"),
)),
Individual((
title: "A Cold Breeze Blows",
path: "voxygen.audio.soundtrack.overworld.a_cold_breeze_blows",
@ -744,6 +758,19 @@
// Dungeon music
Individual((
title: "A Heart's Ice-Cold Protection",
path: "voxygen.audio.soundtrack.dungeon.a_hearts_ice-cold_protection",
length: 205.0,
timing: None,
weather: None,
biomes:[],
sites: [
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("GeekyGami", "https://geekygami.newgrounds.com/audio/"),
)),
Individual((
title: "Mysty Temple",
path: "voxygen.audio.soundtrack.dungeon.mysty_temple",
@ -753,6 +780,7 @@
biomes:[],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Tiny", None),
@ -779,6 +807,7 @@
biomes: [],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@ -792,6 +821,7 @@
biomes: [],
sites: [
Dungeon(Old),
Dungeon(Adlet),
],
music_state: Activity(Explore),
artist: ("Aeronic", "https://soundcloud.com/aeronic"),
@ -873,8 +903,8 @@
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 56.0, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-start", 61.818, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-loop", 54.545, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.barred_paths.barred_paths-end", 6.0, Transition(Combat(High), Explore), None),
],
artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
@ -888,11 +918,26 @@
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.reversal.reversal-start", 60.0, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.reversal.reversal-start", 61.666, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.reversal.reversal-loop", 60.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.reversal.reversal-end", 4.0, Transition(Combat(High), Explore), None),
("voxygen.audio.soundtrack.combat.reversal.reversal-end", 3.666, Transition(Combat(High), Explore), None),
],
artist: ("DaforLynx", "https://daforlynx.neocities.org/"),
),
Segmented(
title: "Clash",
timing: None,
weather: None,
biomes: [],
sites: [
Dungeon(Old),
],
segments: [
("voxygen.audio.soundtrack.combat.clash.clash-start", 121.5, Transition(Explore, Combat(High)), Some(Combat(High))),
("voxygen.audio.soundtrack.combat.clash.clash-loop", 81.0, Activity(Combat(High)), None),
("voxygen.audio.soundtrack.combat.clash.clash-end", 1.5, Transition(Combat(High), Explore), None),
],
artist: ("Alfredo Pompa D & Rodriogo Plata", None),
),
]
)

BIN
assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-end.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-loop.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/combat/barred_paths/barred_paths-start.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/combat/clash/clash-end.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/combat/clash/clash-loop.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/combat/clash/clash-start.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/combat/reversal/reversal-end.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/combat/reversal/reversal-loop.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/combat/reversal/reversal-start.ogg (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/dungeon/a_hearts_ice-cold_protection.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/audio/soundtrack/overworld/graceful_journey.ogg (Stored with Git LFS) Normal file
View File

Binary file not shown.

1
assets/voxygen/i18n/en/gameinput.ftl
View File

@ -75,3 +75,4 @@ gameinput-muteinactivemaster = Mute master volume (inactive window)
gameinput-mutemusic = Mute music volume
gameinput-mutesfx = Mute SFX volume
gameinput-muteambience = Mute ambience volume
gameinput-togglewalk = Toggle Walking

1
assets/voxygen/i18n/en/hud/misc.ftl
View File

@ -59,6 +59,7 @@ hud-follow = Follow
hud-stay= Stay
hud-sit = Sit
hud-steer = Steer
hud-lay = Lay
hud-portal = Portal
-server = Server

2
assets/voxygen/i18n/en/hud/settings.ftl
View File

@ -53,6 +53,8 @@ hud-settings-invert_controller_y_axis = Invert Controller Y Axis
hud-settings-enable_mouse_smoothing = Camera Smoothing
hud-settings-free_look_behavior = Free look behavior
hud-settings-auto_walk_behavior = Auto walk behavior
hud-settings-walking_speed_behavior = Walking speed behavior
hud-settings-walking_speed = Walking speed
hud-settings-camera_clamp_behavior = Camera clamp behavior
hud-settings-zoom_lock_behavior = Camera zoom lock behavior
hud-settings-player_physics_behavior = Player physics (experimental)

21
assets/voxygen/i18n/en/main.ftl
View File

@ -7,30 +7,30 @@ main-tip = Tip:
main-unbound_key_tip = unbound
main-notice =
Welcome to the alpha version of Veloren!
Before you dive into the fun, please keep a few things in mind:
- This is a very early alpha. Expect bugs, extremely unfinished gameplay, unpolished mechanics, and missing features.
- If you have constructive feedback or bug reports, you can contact us via Reddit, GitLab, or our community Discord server.
- Veloren is licensed under the GPL 3 open-source licence. That means you're free to play, modify, and redistribute the game however
you wish (provided derived work is also under GPL 3).
- Veloren is a non-profit community project, and everybody working on it is a volunteer.
If you like what you see, you're welcome to join the development or art teams!
Thanks for taking the time to read this notice, we hope you enjoy the game!
~ The Veloren Devs
main-login_process =
Information on the Login Process:
Please note that you need an account
to play on auth-enabled servers.
You can create an account over at
https://veloren.net/account/.
main-singleplayer-new = New
main-singleplayer-delete = Delete
@ -38,6 +38,7 @@ main-singleplayer-regenerate = Regenerate
main-singleplayer-create_custom = Create Custom
main-singleplayer-invalid_name = Error: Invalid name
main-singleplayer-seed = Seed
main-singleplayer-day_length = Day duration
main-singleplayer-random_seed = Random
main-singleplayer-size_lg = Logarithmic size
main-singleplayer-map_large_warning = Warning: Large worlds will take a long time to start for the first time

13
assets/voxygen/shaders/premultiply-alpha-vert.glsl
View File

@ -13,17 +13,14 @@ layout(push_constant) uniform Params {
layout(location = 0) out vec2 source_coords;
uvec2 unpack(uint xy) {
return uvec2(
bitfieldExtract(xy, 0, 16),
bitfieldExtract(xy, 16, 16)
);
vec2 unpack(uint xy) {
return vec2(xy & 0xFFFF, (xy >> 16) & 0xFFFF);
}
void main() {
vec2 source_size = vec2(unpack(source_size_xy));
vec2 target_offset = vec2(unpack(target_offset_xy));
vec2 target_size = vec2(unpack(target_size_xy));
vec2 source_size = unpack(source_size_xy);
vec2 target_offset = unpack(target_offset_xy);
vec2 target_size = unpack(target_size_xy);
// Generate rectangle (counter clockwise triangles)
//

BIN
assets/voxygen/voxel/armor/brinestone/crown.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/cardinal/mitre.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/misc/head/crown.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/armor/misc/head/hood.vox (Stored with Git LFS)
View File

Binary file not shown.

30
assets/voxygen/voxel/crustacean_central_manifest.ron Normal file
View File

@ -0,0 +1,30 @@
({
(Crab, Male): (
chest: (
offset: (-5.0, -4.5, 2.0),
central: ("npc.crab.crab"),
),
tail_f: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
tail_b: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
),
(Crab, Female): (
chest: (
offset: (-5.0, -4.5, 2.0),
central: ("npc.crab.crab"),
),
tail_f: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
tail_b: (
offset: (0.0, 0.0, 0.0),
central: ("armor.empty"),
),
),
})

127
assets/voxygen/voxel/crustacean_lateral_manifest.ron Normal file
View File

@ -0,0 +1,127 @@
({
(Crab, Male): (
arm_l: (
offset: (-6.0, 0.5, 2.0),
lateral: ("npc.crab.crab"),
model_index: 1,
),
pincer_l0: (
offset: (-9.0, 2.5, 1.0),
lateral: ("npc.crab.crab"),
model_index: 5,
),
pincer_l1: (
offset: (-5.0, 4.5, 2.0),
lateral: ("npc.crab.crab"),
model_index: 6,
),
arm_r: (
offset: (3.0, 0.5, 2.0),
lateral: ("npc.crab.crab"),
model_index: 1,
),
pincer_r0: (
offset: (2.0, 2.5, 1.0),
lateral: ("npc.crab.crab"),
model_index: 5,
),
pincer_r1: (
offset: (2.0, 4.5, 2.0),
lateral: ("npc.crab.crab"),
model_index: 6,
),
leg_fl: (
offset: (-8.5, -2.5, 0.0),
lateral: ("npc.crab.crab"),
model_index: 4,
),
leg_cl: (
offset: (-8.5, -2.5, 0.0),
lateral: ("npc.crab.crab"),
model_index: 3,
),
leg_bl: (
offset: (-7.5, -3.0, 0.0),
lateral: ("npc.crab.crab"),
model_index: 2,
),
leg_fr: (
offset: (3.5, -2.5, 0.0),
lateral: ("npc.crab.crab"),
model_index: 4,
),
leg_cr: (
offset: (3.5, -2.5, 0.0),
lateral: ("npc.crab.crab"),
model_index: 3,
),
leg_br: (
offset: (2.5, -3.0, 0.0),
lateral: ("npc.crab.crab"),
model_index: 2,
),
),
(Crab, Female): (
arm_l: (
offset: (-6.0, 0.5, 2.0),
lateral: ("npc.crab.crab"),
model_index: 1,
),
pincer_l0: (
offset: (-9.0, 2.5, 1.0),
lateral: ("npc.crab.crab"),
model_index: 5,
),
pincer_l1: (
offset: (-5.0, 4.5, 2.0),
lateral: ("npc.crab.crab"),
model_index: 6,
),
arm_r: (
offset: (3.0, 0.5, 2.0),
lateral: ("npc.crab.crab"),
model_index: 1,
),
pincer_r0: (
offset: (2.0, 2.5, 1.0),
lateral: ("npc.crab.crab"),
model_index: 5,
),
pincer_r1: (
offset: (2.0, 4.5, 2.0),
lateral: ("npc.crab.crab"),
model_index: 6,
),
leg_fl: (
offset: (-8.5, -2.5, 0.0),
lateral: ("npc.crab.crab"),
model_index: 4,
),
leg_cl: (
offset: (-8.5, -2.5, 0.0),
lateral: ("npc.crab.crab"),
model_index: 3,
),
leg_bl: (
offset: (-7.5, -3.0, 0.0),
lateral: ("npc.crab.crab"),
model_index: 2,
),
leg_fr: (
offset: (3.5, -2.5, 0.0),
lateral: ("npc.crab.crab"),
model_index: 4,
),
leg_cr: (
offset: (3.5, -2.5, 0.0),
lateral: ("npc.crab.crab"),
model_index: 3,
),
leg_br: (
offset: (2.5, -3.0, 0.0),
lateral: ("npc.crab.crab"),
model_index: 2,
),
),
})

60
assets/voxygen/voxel/humanoid_armor_back_manifest.ron
View File

@ -5,23 +5,23 @@
),
map: {
"common.items.armor.misc.back.short_0": (
vox_spec: ("armor.misc.back.short-0", (-5.0, -1.0, -11.0)),
vox_spec: ("armor.misc.back.short-0", (-5.0, -1.5, -11.0)),
color: None
),
"common.items.armor.misc.back.admin": (
vox_spec: ("armor.misc.back.admin", (-5.0, -1.0, -11.0)),
vox_spec: ("armor.misc.back.admin", (-5.0, -1.5, -11.0)),
color: None
),
"common.items.debug.admin_back": (
vox_spec: ("armor.misc.back.admin", (-5.0, -1.0, -11.0)),
vox_spec: ("armor.misc.back.admin", (-5.0, -1.5, -11.0)),
color: None
),
"common.items.armor.misc.back.dungeon_purple": (
vox_spec: ("armor.misc.back.dungeon_purple", (-5.0, -1.0, -14.0)),
vox_spec: ("armor.misc.back.dungeon_purple", (-5.0, -1.5, -14.0)),
color: None
),
"common.items.armor.misc.back.short_1": (
vox_spec: ("armor.misc.back.short-1", (-5.0, -1.0, -11.0)),
vox_spec: ("armor.misc.back.short-1", (-5.0, -1.5, -11.0)),
color: None
),
"common.items.armor.ferocious.back": (
@ -29,55 +29,55 @@
color: None
),
"common.items.armor.boreal.back": (
vox_spec: ("armor.boreal.back", (-5.0, -2.0, -14.0)),
vox_spec: ("armor.boreal.back", (-5.0, -2.5, -13.0)),
color: None
),
"common.items.armor.brinestone.back": (
vox_spec: ("armor.brinestone.back", (-5.0, -2.0, -14.0)),
vox_spec: ("armor.brinestone.back", (-5.0, -2.5, -12.0)),
color: None
),
"common.items.armor.misc.back.backpack": (
vox_spec: ("armor.misc.back.backpack", (-7.0, -5.0, -10.0)),
vox_spec: ("armor.misc.back.backpack", (-7.0, -5.5, -10.0)),
color: None
),
"common.items.npc_armor.back.backpack_blue": (
vox_spec: ("armor.misc.back.backpack-grey", (-7.0, -5.0, -10.0)),
vox_spec: ("armor.misc.back.backpack-grey", (-7.0, -5.5, -10.0)),
color: Some((76, 72, 178))
),
"common.items.armor.velorite_mage.back": (
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.5, -14.0)),
color: None
),
"common.items.debug.admin_back": (
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.5, -14.0)),
color: None
),
"common.items.debug.admin_back": (
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.5, -14.0)),
color: None
),
"common.items.debug.dungeon_purple": (
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.0, -14.0)),
vox_spec: ("armor.velorite_battlemage.back", (-5.0, -1.5, -14.0)),
color: None
),
"common.items.npc_armor.back.leather_blue": (
vox_spec: ("armor.leather_blue.back", (-5.0, -1.0, -11.0)),
vox_spec: ("armor.leather_blue.back", (-5.0, -1.5, -10.0)),
color: None
),
"common.items.armor.hide.rawhide.back": (
vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.0, -6.0)),
vox_spec: ("armor.hide.rawhide.back", (-4.0, -1.5, -7.0)),
color: None
),
"common.items.armor.hide.leather.back": (
vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)),
vox_spec: ("armor.hide.leather.back", (-5.0, -1.5, -11.0)),
color: None
),
"common.items.armor.miner.back": (
vox_spec: ("armor.hide.leather.back", (-5.0, -1.0, -11.0)),
vox_spec: ("armor.hide.leather.back", (-5.0, -1.5, -11.0)),
color: None
),
"common.items.armor.hide.scale.back": (
vox_spec: ("armor.hide.scale.back", (-5.0, -2.0, -10.5)),
vox_spec: ("armor.hide.scale.back", (-5.0, -1.5, -10.0)),
color: None
),
"common.items.armor.hide.carapace.back": (
@ -85,7 +85,7 @@
color: None
),
"common.items.armor.hide.primal.back": (
vox_spec: ("armor.hide.primal.back", (-5.0, -4.5, -10.5)),
vox_spec: ("armor.hide.primal.back", (-5.0, -3.5, -10.0)),
color: None
),
"common.items.armor.hide.dragonscale.back": (
@ -97,19 +97,19 @@
color: None
),
"common.items.armor.cloth.linen.back": (
vox_spec: ("armor.cloth.linen.back", (-4.0, -2.5, -8.5)),
vox_spec: ("armor.cloth.linen.back", (-4.0, -1.5, -8.0)),
color: None
),
"common.items.armor.cloth.woolen.back": (
vox_spec: ("armor.cloth.woolen.back", (-5.0, -2.5, -8.5)),
vox_spec: ("armor.cloth.woolen.back", (-5.0, -1.5, -8.0)),
color: None
),
"common.items.armor.cloth.silken.back": (
vox_spec: ("armor.cloth.silken.back", (-4.0, -2.5, -11.5)),
vox_spec: ("armor.cloth.silken.back", (-4.0, -1.5, -11.0)),
color: None
),
"common.items.armor.witch.back": (
vox_spec: ("armor.witch.back", (-4.0, -2.5, -11.5)),
vox_spec: ("armor.witch.back", (-4.0, -1.5, -11.0)),
color: None
),
"common.items.armor.cloth.druid.back": (
@ -117,7 +117,7 @@
color: None
),
"common.items.armor.cloth.moonweave.back": (
vox_spec: ("armor.cloth.moonweave.back", (-4.0, -2.0, -12.5)),
vox_spec: ("armor.cloth.moonweave.back", (-4.0, -1.5, -12.5)),
color: None
),
"common.items.armor.cloth.sunsilk.back": (
@ -125,19 +125,19 @@
color: None
),
"common.items.armor.mail.bronze.back": (
vox_spec: ("armor.mail.bronze.back", (-4.0, -2.5, -7.0)),
vox_spec: ("armor.mail.bronze.back", (-4.0, -1.5, -7.0)),
color: None
),
"common.items.armor.mail.iron.back": (
vox_spec: ("armor.mail.iron.back", (-4.0, -2.5, -10.0)),
vox_spec: ("armor.mail.iron.back", (-4.0, -1.5, -10.0)),
color: None
),
"common.items.armor.mail.steel.back": (
vox_spec: ("armor.mail.steel.back", (-4.0, -2.5, -12.0)),
vox_spec: ("armor.mail.steel.back", (-4.0, -1.5, -10.0)),
color: None
),
"common.items.armor.mail.cobalt.back": (
vox_spec: ("armor.mail.cobalt.back", (-4.0, -2.5, -12.0)),
vox_spec: ("armor.mail.cobalt.back", (-4.0, -1.5, -11.0)),
color: None
),
"common.items.armor.mail.bloodsteel.back": (
@ -145,11 +145,11 @@
color: None
),
"common.items.armor.mail.orichalcum.back": (
vox_spec: ("armor.mail.orichalcum", (-5.0, -4.5, -12.0), 6),
vox_spec: ("armor.mail.orichalcum", (-5.0, -4.5, -12.5), 6),
color: None
),
"common.items.armor.merchant.back": (
vox_spec: ("armor.merchant.back", (-8.0, -7.0, -11.0)),
vox_spec: ("armor.merchant.back", (-8.0, -8.5, -11.0)),
color: None
),
},

46
assets/voxygen/voxel/humanoid_armor_belt_manifest.ron
View File

@ -29,11 +29,11 @@
color: None
),
"common.items.armor.boreal.belt": (
vox_spec: ("armor.boreal.belt", (-4.0, -3.0, 2.0)),
vox_spec: ("armor.boreal.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.brinestone.belt": (
vox_spec: ("armor.brinestone.belt", (-4.0, -3.0, 2.0)),
vox_spec: ("armor.brinestone.belt", (-4.0, -3.5, 1.0)),
color: None
),
"common.items.armor.cloth_purple.belt": (
@ -53,7 +53,7 @@
color: None
),
"common.items.armor.leather_plate.belt": (
vox_spec: ("armor.leather_plate.belt", (-4.0, -4.5, 2.0)),
vox_spec: ("armor.leather_plate.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.twigs.belt": (
@ -101,19 +101,19 @@
color: None
),
"common.items.armor.hide.carapace.belt":(
vox_spec: ("armor.hide.carapace.belt", (-4.0, -4.0, 1.5)),
vox_spec: ("armor.hide.carapace.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.hide.primal.belt":(
vox_spec: ("armor.hide.primal.belt", (-4.0, -4.0, 1.0)),
vox_spec: ("armor.hide.primal.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.hide.dragonscale.belt":(
vox_spec: ("armor.hide.dragonscale.belt", (-4.0, -3.5, 1.5)),
vox_spec: ("armor.hide.dragonscale.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.savage.belt":(
vox_spec: ("armor.savage.belt", (-4.0, -4.0, 1.0)),
vox_spec: ("armor.savage.belt", (-4.0, -4.5, 2.0)),
color: None
),
"common.items.armor.witch.belt":(
@ -121,59 +121,59 @@
color: None
),
"common.items.armor.pirate.belt":(
vox_spec: ("armor.pirate.belt", (-4.0, -4.0, 2.5)),
vox_spec: ("armor.pirate.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.alchemist.belt":(
vox_spec: ("armor.alchemist", (-4.0, -4.0, 2.5), 2),
vox_spec: ("armor.alchemist", (-4.0, -3.5, 2.0), 2),
color: None
),
"common.items.armor.blacksmith.belt":(
vox_spec: ("armor.blacksmith.belt", (-4.0, -4.0, 2.0)),
vox_spec: ("armor.blacksmith.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.chef.belt":(
vox_spec: ("armor.chef.belt", (-4.0, -4.0, 2.0)),
vox_spec: ("armor.chef.belt", (-4.0, -4.5, 2.0)),
color: None
),
"common.items.armor.cloth.linen.belt":(
vox_spec: ("armor.cloth.linen.belt", (-4.0, -4.0, 0.0)),
vox_spec: ("armor.cloth.linen.belt", (-4.0, -3.5, 0.0)),
color: None
),
"common.items.armor.cloth.woolen.belt":(
vox_spec: ("armor.cloth.woolen.belt", (-4.0, -4.0, 1.0)),
vox_spec: ("armor.cloth.woolen.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.cloth.silken.belt":(
vox_spec: ("armor.cloth.silken.belt", (-4.0, -3.5, -3.0)),
vox_spec: ("armor.cloth.silken.belt", (-4.0, -3.5, -2.0)),
color: None
),
"common.items.armor.cloth.druid.belt":(
vox_spec: ("armor.cloth.druid.belt", (-4.0, -4.0, -0.5)),
vox_spec: ("armor.cloth.druid.belt", (-4.0, -3.5, -1.0)),
color: None
),
"common.items.armor.cloth.moonweave.belt":(
vox_spec: ("armor.cloth.moonweave.belt", (-4.0, -3.5, 1.0)),
vox_spec: ("armor.cloth.moonweave.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.cloth.sunsilk.belt":(
vox_spec: ("armor.cloth.sunsilk.belt", (-4.0, -3.5, -2.5)),
vox_spec: ("armor.cloth.sunsilk.belt", (-4.0, -3.5, -2.0)),
color: None
),
"common.items.armor.mail.bronze.belt":(
vox_spec: ("armor.mail.bronze.belt", (-4.0, -4.0, 2.0)),
vox_spec: ("armor.mail.bronze.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.mail.iron.belt":(
vox_spec: ("armor.mail.iron.belt", (-4.0, -4.0, 2.0)),
vox_spec: ("armor.mail.iron.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.mail.steel.belt":(
vox_spec: ("armor.mail.steel.belt", (-5.0, -4.0, 1.0)),
vox_spec: ("armor.mail.steel.belt", (-5.0, -4.5, 2.0)),
color: None
),
"common.items.armor.mail.cobalt.belt":(
vox_spec: ("armor.mail.cobalt.belt", (-5.0, -4.0, 1.0)),
vox_spec: ("armor.mail.cobalt.belt", (-5.0, -3.5, 2.0)),
color: None
),
"common.items.armor.mail.bloodsteel.belt":(
@ -185,11 +185,11 @@
color: None
),
"common.items.armor.cardinal.belt": (
vox_spec: ("armor.cardinal.belt", (-4.0, -3.8, 1.3)),
vox_spec: ("armor.cardinal.belt", (-4.0, -3.5, 2.0)),
color: None
),
"common.items.armor.merchant.belt": (
vox_spec: ("armor.merchant.belt", (-5.0, -4.0, 2.0)),
vox_spec: ("armor.merchant.belt", (-5.0, -3.5, 2.0)),
color: None
),
},

52
assets/voxygen/voxel/humanoid_armor_chest_manifest.ron
View File

@ -37,7 +37,7 @@
color: None
),
"common.items.armor.brinestone.chest": (
vox_spec: ("armor.brinestone.chest", (-7.0, -3.5, 0.0)),
vox_spec: ("armor.brinestone.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.assassin.chest": (
@ -135,7 +135,7 @@
color: Some((30, 0, 64))
),
"common.items.armor.leather_plate.chest": (
vox_spec: ("armor.leather_plate.chest", (-8.0, -5.5, 2.0)),
vox_spec: ("armor.leather_plate.chest", (-8.0, -4.5, 2.0)),
color: None
),
"common.items.armor.tarasque.chest":(
@ -147,11 +147,11 @@
color: None
),
"common.items.armor.velorite_mage.chest": (
vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 1.0)),
color: None
),
"common.items.debug.cultist_chest_blue": (
vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 0.5)),
vox_spec: ("armor.velorite_battlemage.chest", (-7.0, -3.5, 1.0)),
color: None
),
"common.items.armor.hide.rawhide.chest": (
@ -171,15 +171,15 @@
color: None
),
"common.items.armor.hide.carapace.chest": (
vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 1.5)),
vox_spec: ("armor.hide.carapace.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.hide.primal.chest": (
vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 0.5)),
vox_spec: ("armor.hide.primal.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.hide.dragonscale.chest": (
vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 1.5)),
vox_spec: ("armor.hide.dragonscale.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.savage.chest": (
@ -187,79 +187,79 @@
color: None
),
"common.items.armor.witch.chest": (
vox_spec: ("armor.witch.chest", (-7.0, -4.0, 2.0)),
vox_spec: ("armor.witch.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.pirate.chest": (
vox_spec: ("armor.pirate.chest", (-7.0, -4.0, 2.0)),
vox_spec: ("armor.pirate.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.alchemist.chest": (
vox_spec: ("armor.alchemist", (-7.0, -4.0, 2.0), 1),
vox_spec: ("armor.alchemist", (-7.0, -3.5, 2.0), 1),
color: None
),
"common.items.armor.blacksmith.chest": (
vox_spec: ("armor.blacksmith.chest", (-7.0, -4.0, 2.0)),
vox_spec: ("armor.blacksmith.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.chef.chest": (
vox_spec: ("armor.chef.chest", (-7.0, -4.0, 2.0)),
vox_spec: ("armor.chef.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.cloth.linen.chest": (
vox_spec: ("armor.cloth.linen.chest", (-7.0, -4.0, 2.0)),
vox_spec: ("armor.cloth.linen.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.cloth.woolen.chest": (
vox_spec: ("armor.cloth.woolen.chest", (-7.0, -4.0, 1.0)),
vox_spec: ("armor.cloth.woolen.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.cloth.silken.chest": (
vox_spec: ("armor.cloth.silken.chest", (-7.0, -4.0, 1.0)),
vox_spec: ("armor.cloth.silken.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.cloth.druid.chest": (
vox_spec: ("armor.cloth.druid.chest", (-7.0, -4.0, 2.0)),
vox_spec: ("armor.cloth.druid.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.cloth.moonweave.chest": (
vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -4.0, 1.0)),
vox_spec: ("armor.cloth.moonweave.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.cloth.sunsilk.chest": (
vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -4.0, 1.0)),
vox_spec: ("armor.cloth.sunsilk.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.mail.bronze.chest": (
vox_spec: ("armor.mail.bronze.chest", (-7.0, -4.0, 2.0)),
vox_spec: ("armor.mail.bronze.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.mail.iron.chest": (
vox_spec: ("armor.mail.iron.chest", (-7.0, -4.0, 2.0)),
vox_spec: ("armor.mail.iron.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.mail.steel.chest": (
vox_spec: ("armor.mail.steel.chest", (-8.0, -4.0, 1.0)),
vox_spec: ("armor.mail.steel.chest", (-8.0, -4.5, 2.0)),
color: None
),
"common.items.armor.mail.cobalt.chest": (
vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.0, 1.0)),
vox_spec: ("armor.mail.cobalt.chest", (-8.0, -4.5, 2.0)),
color: None
),
"common.items.armor.mail.bloodsteel.chest": (
vox_spec: ("armor.mail.bloodsteel.chest", (-8.0, -4.0, 1.0)),
vox_spec: ("armor.mail.bloodsteel.chest", (-8.0, -4.5, 2.0)),
color: None
),
"common.items.armor.mail.orichalcum.chest": (
vox_spec: ("armor.mail.orichalcum", (-7.0, -4.0, 1.0), 0),
vox_spec: ("armor.mail.orichalcum", (-7.0, -3.5, 2.0), 0),
color: None
),
"common.items.armor.cardinal.chest": (
vox_spec: ("armor.cardinal.chest", (-7.0, -4.0, 1.0)),
vox_spec: ("armor.cardinal.chest", (-7.0, -3.5, 2.0)),
color: None
),
"common.items.armor.merchant.chest": (
vox_spec: ("armor.merchant.chest", (-7.0, -4.0, 1.0)),
vox_spec: ("armor.merchant.chest", (-7.0, -3.5, 1.0)),
color: None
),
},

16
assets/voxygen/voxel/humanoid_armor_foot_manifest.ron
View File

@ -29,7 +29,7 @@
color: None
),
"common.items.armor.brinestone.foot": (
vox_spec: ("armor.brinestone.foot", (-2.5, -3.5, -2.0)),
vox_spec: ("armor.brinestone.foot", (-2.5, -4.5, -2.0)),
color: None
),
"common.items.armor.cloth_blue.foot": (
@ -53,7 +53,7 @@
color: None
),
"common.items.armor.misc.foot.jackalope_slippers": (
vox_spec: ("armor.misc.foot.jackalope", (-2.5, -3.5, -2.0)),
vox_spec: ("armor.misc.foot.jackalope", (-2.5, -4.5, -2.0)),
color: None
),
"common.items.armor.twigs.foot": (
@ -97,7 +97,7 @@
color: None
),
"common.items.armor.hide.scale.foot": (
vox_spec: ("armor.hide.scale.foot", (-2.5, -3.5, -2.0)),
vox_spec: ("armor.hide.scale.foot", (-2.5, -4.5, -2.0)),
color: None
),
"common.items.armor.hide.carapace.foot": (
@ -105,7 +105,7 @@
color: None
),
"common.items.armor.hide.primal.foot": (
vox_spec: ("armor.hide.primal.foot", (-2.5, -3.5, -2.0)),
vox_spec: ("armor.hide.primal.foot", (-2.5, -4.5, -2.0)),
color: None
),
"common.items.armor.hide.dragonscale.foot": (
@ -161,15 +161,15 @@
color: None
),
"common.items.armor.mail.cobalt.foot": (
vox_spec: ("armor.mail.cobalt.foot", (-2.5, -3.5, -2.0)),
vox_spec: ("armor.mail.cobalt.foot", (-2.5, -4.5, -2.0)),
color: None
),
"common.items.armor.mail.bloodsteel.foot": (
vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -3.5, -2.0)),
vox_spec: ("armor.mail.bloodsteel.foot", (-2.5, -4.5, -2.0)),
color: None
),
"common.items.armor.mail.orichalcum.foot": (
vox_spec: ("armor.mail.orichalcum", (-2.5, -3.5, -2.0), 3),
vox_spec: ("armor.mail.orichalcum", (-2.5, -4.5, -2.0), 3),
color: None
),
"common.items.armor.cardinal.foot": (
@ -185,7 +185,7 @@
color: None
),
"common.items.armor.misc.foot.iceskate": (
vox_spec: ("armor.misc.foot.iceskate", (-2.5, -3.5, -2.0)),
vox_spec: ("armor.misc.foot.iceskate", (-2.5, -4.5, -2.0)),
color: None
),
},

116
assets/voxygen/voxel/humanoid_armor_hand_manifest.ron
View File

@ -32,31 +32,31 @@
),
"common.items.armor.ferocious.hand": (
left: (
vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -3.0)),
vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -3.0)),
vox_spec: ("armor.ferocious.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.boreal.hand": (
left: (
vox_spec: ("armor.boreal.hand", (-2.0, -1.5, -3.0)),
vox_spec: ("armor.boreal.hand", (-2.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.boreal.hand", (-2.0, -1.5, -3.0)),
vox_spec: ("armor.boreal.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.brinestone.hand": (
left: (
vox_spec: ("armor.brinestone.hand", (-3.5, -1.5, -4.0)),
vox_spec: ("armor.brinestone.hand", (-3.5, -1.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.brinestone.hand", (-1.5, -1.5, -4.0)),
vox_spec: ("armor.brinestone.hand", (-1.5, -1.5, -3.5)),
color: None
)
),
@ -92,11 +92,11 @@
),
"common.items.armor.cultist.hand": (
left: (
vox_spec: ("armor.cultist.hand", (-3.0, -1.5, -2.5)),
vox_spec: ("armor.cultist.hand", (-2.5, -2.5, -2.5)),
color: Some((30, 0, 64))
),
right: (
vox_spec: ("armor.cultist.hand", (-2.0, -1.5, -2.5)),
vox_spec: ("armor.cultist.hand", (-2.2, -2.5, -2.5)),
color: Some((30, 0, 64))
)
),
@ -122,7 +122,7 @@
),
"common.items.armor.twigsleaves.hand": (
left: (
vox_spec: ("armor.twigsleaves.hand", (-1.5, -1.5, -2.5)),
vox_spec: ("armor.twigsleaves.hand", (-2.5, -1.5, -2.5)),
color: None
),
right: (
@ -132,7 +132,7 @@
),
"common.items.armor.twigsflowers.hand": (
left: (
vox_spec: ("armor.twigsflowers.hand", (-1.5, -1.5, -2.5)),
vox_spec: ("armor.twigsflowers.hand", (-2.5, -1.5, -2.5)),
color: None
),
right: (
@ -162,21 +162,21 @@
),
"common.items.armor.velorite_mage.hand": (
left: (
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -2.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -2.5, -2.5)),
color: None
)
),
"common.items.debug.cultist_hands_blue": (
left: (
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -2.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -1.5, -2.5)),
vox_spec: ("armor.velorite_battlemage.hand", (-2.5, -2.5, -2.5)),
color: None
)
),
@ -202,11 +202,11 @@
),
"common.items.armor.miner.hand": (
left: (
vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.0, -3.0)),
vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.0, -3.0)),
vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
@ -222,211 +222,211 @@
),
"common.items.armor.hide.carapace.hand": (
left: (
vox_spec: ("armor.hide.carapace.hand", (-3.5, -2.5, -3.0)),
vox_spec: ("armor.hide.carapace.hand", (-3.5, -2.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.hide.carapace.hand", (-1.5, -2.5, -3.0)),
vox_spec: ("armor.hide.carapace.hand", (-1.5, -2.5, -3.5)),
color: None
)
),
"common.items.armor.hide.primal.hand": (
left: (
vox_spec: ("armor.hide.primal.hand", (-3.5, -3.5, -4.0)),
vox_spec: ("armor.hide.primal.hand", (-3.5, -2.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.hide.primal.hand", (-1.5, -3.5, -4.0)),
vox_spec: ("armor.hide.primal.hand", (-1.5, -2.5, -3.5)),
color: None
)
),
"common.items.armor.hide.dragonscale.hand": (
left: (
vox_spec: ("armor.hide.dragonscale.hand", (-5.0, -1.5, -3.5)),
vox_spec: ("armor.hide.dragonscale.hand", (-5.5, -1.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.hide.dragonscale.hand", (-2.0, -1.5, -3.5)),
vox_spec: ("armor.hide.dragonscale.hand", (-1.5, -1.5, -3.5)),
color: None
)
),
"common.items.armor.savage.hand": (
left: (
vox_spec: ("armor.savage.hand", (-2.5, -3.0, -4.0)),
vox_spec: ("armor.savage.hand", (-2.5, -2.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.savage.hand", (-1.5, -3.0, -4.0)),
vox_spec: ("armor.savage.hand", (-1.5, -2.5, -3.5)),
color: None
)
),
"common.items.armor.witch.hand": (
left: (
vox_spec: ("armor.witch.hand", (-2.5, -2.5, -4.0)),
vox_spec: ("armor.witch.hand", (-2.5, -2.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.witch.hand", (-1.5, -2.5, -4.0)),
vox_spec: ("armor.witch.hand", (-1.5, -2.5, -3.5)),
color: None
)
),
"common.items.armor.pirate.hand": (
left: (
vox_spec: ("armor.pirate.hand", (-2.5, -2.5, -4.0)),
vox_spec: ("armor.pirate.hand", (-2.5, -2.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.pirate.hand", (-1.5, -2.5, -4.0)),
vox_spec: ("armor.pirate.hand", (-1.5, -2.5, -3.5)),
color: None
)
),
"common.items.armor.blacksmith.hand": (
left: (
vox_spec: ("armor.blacksmith.hand", (-1.5, -2.5, -4.0)),
vox_spec: ("armor.blacksmith.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.blacksmith.hand", (-1.5, -2.5, -4.0)),
vox_spec: ("armor.blacksmith.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.cloth.linen.hand": (
left: (
vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)),
vox_spec: ("armor.cloth.linen.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.cloth.linen.hand", (-1.5, -2.0, -3.0)),
vox_spec: ("armor.cloth.linen.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.cloth.woolen.hand": (
left: (
vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)),
vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -3.5)),
vox_spec: ("armor.cloth.woolen.hand", (-2.5, -2.5, -2.5)),
color: None
)
),
"common.items.armor.cloth.silken.hand": (
left: (
vox_spec: ("armor.cloth.silken.hand", (-2.5, -2.5, -4.0)),
vox_spec: ("armor.cloth.silken.hand", (-2.5, -2.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.cloth.silken.hand", (-1.5, -2.5, -4.0)),
vox_spec: ("armor.cloth.silken.hand", (-1.5, -2.5, -3.5)),
color: None
)
),
"common.items.armor.cloth.druid.hand": (
left: (
vox_spec: ("armor.cloth.druid.hand", (-2.5, -1.0, -3.0)),
vox_spec: ("armor.cloth.druid.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.cloth.druid.hand", (-1.5, -1.0, -3.0)),
vox_spec: ("armor.cloth.druid.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.cloth.moonweave.hand": (
left: (
vox_spec: ("armor.cloth.moonweave.hand", (-2.5, -2.0, -4.0)),
vox_spec: ("armor.cloth.moonweave.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.cloth.moonweave.hand", (-1.5, -2.0, -4.0)),
vox_spec: ("armor.cloth.moonweave.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.cloth.sunsilk.hand": (
left: (
vox_spec: ("armor.cloth.sunsilk.hand", (-2.5, -2.5, -4.0)),
vox_spec: ("armor.cloth.sunsilk.hand", (-2.5, -2.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.cloth.sunsilk.hand", (-1.5, -2.5, -4.0)),
vox_spec: ("armor.cloth.sunsilk.hand", (-1.5, -2.5, -3.5)),
color: None
)
),
"common.items.armor.mail.bronze.hand": (
left: (
vox_spec: ("armor.mail.bronze.hand", (-2.5, -2.0, -3.0)),
vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.mail.bronze.hand", (-1.5, -2.0, -3.0)),
vox_spec: ("armor.mail.bronze.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.mail.iron.hand": (
left: (
vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -3.0)),
vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -3.0)),
vox_spec: ("armor.mail.iron.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.mail.steel.hand": (
left: (
vox_spec: ("armor.mail.steel.hand", (-2.5, -1.0, -4.0)),
vox_spec: ("armor.mail.steel.hand", (-1.5, -1.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.mail.steel.hand", (-1.5, -1.0, -4.0)),
vox_spec: ("armor.mail.steel.hand", (-1.5, -1.5, -2.5)),
color: None
)
),
"common.items.armor.mail.cobalt.hand": (
left: (
vox_spec: ("armor.mail.cobalt.hand", (-2.5, -2.0, -4.0)),
vox_spec: ("armor.mail.cobalt.hand", (-3.5, -2.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.mail.cobalt.hand", (-1.5, -2.0, -4.0)),
vox_spec: ("armor.mail.cobalt.hand", (-1.5, -2.5, -2.5)),
color: None
)
),
"common.items.armor.mail.bloodsteel.hand": (
left: (
vox_spec: ("armor.mail.bloodsteel.hand", (-5.0, -1.0, -4.0)),
vox_spec: ("armor.mail.bloodsteel.hand", (-4.5, -2.5, -2.5)),
color: None
),
right: (
vox_spec: ("armor.mail.bloodsteel.hand", (-1.0, -1.0, -4.0)),
vox_spec: ("armor.mail.bloodsteel.hand", (-1.5, -2.5, -2.5)),
color: None
)
),
"common.items.armor.mail.orichalcum.hand": (
left: (
vox_spec: ("armor.mail.orichalcum", (-4.5, -2.0, -4.0), 4),
vox_spec: ("armor.mail.orichalcum", (-4.5, -2.5, -3.5), 4),
color: None
),
right: (
vox_spec: ("armor.mail.orichalcum", (-1.5, -2.0, -4.0), 4),
vox_spec: ("armor.mail.orichalcum", (-1.5, -2.5, -3.5), 4),
color: None
)
),
"common.items.armor.cardinal.hand": (
left: (
vox_spec: ("armor.cardinal.hand", (-2.5, -2.5, -4.0)),
vox_spec: ("armor.cardinal.hand", (-2.5, -2.5, -3.5)),
color: None
),
right: (
vox_spec: ("armor.cardinal.hand", (-1.5, -2.5, -4.0)),
vox_spec: ("armor.cardinal.hand", (-1.5, -2.5, -3.5)),
color: None
)
),
"common.items.armor.merchant.hand": (
left: (
vox_spec: ("armor.merchant.hand", (-2.5, -2.0, -4.0)),
vox_spec: ("armor.merchant.hand", (-1.5, -1.5, -2.5)),
color: None
),
right:(
vox_spec: ("armor.merchant.hand", (-1.5, -2.0, -4.0)),
vox_spec: ("armor.merchant.hand", (-1.5, -1.5, -2.5)),
color: None
)
),

62
assets/voxygen/voxel/humanoid_armor_head_manifest.ron
View File

@ -549,7 +549,7 @@
color: None
),
(Danari, Female, "common.items.armor.misc.head.straw"): (
vox_spec: ("armor.misc.head.straw", (-2.0, -5.0, 7.0)),
vox_spec: ("armor.misc.head.straw", (-2.0, -6.0, 7.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.straw"): (
@ -647,7 +647,7 @@
color: None
),
(Danari, Female, "common.items.armor.misc.head.mitre"): (
vox_spec: ("armor.misc.head.mitre", (-2.0, -5.0, 7.0)),
vox_spec: ("armor.misc.head.mitre", (-2.0, -4.0, 7.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.mitre"): (
@ -757,11 +757,11 @@
color: None
),
(Danari, Female, "common.items.armor.misc.head.helmet"): (
vox_spec: ("armor.misc.head.helmet", (-2.0, -5.0, 1.0)),
vox_spec: ("armor.misc.head.helmet", (-2.0, -6.0, 1.0)),
color: None
),
(Danari, Male, "common.items.armor.misc.head.helmet"): (
vox_spec: ("armor.misc.head.helmet", (-2.0, -5.0, -1.0)),
vox_spec: ("armor.misc.head.helmet", (-2.0, -6.0, 1.0)),
color: None
),
//
@ -786,7 +786,7 @@
color: None
),
(Human, Female, "common.items.armor.misc.head.bandana.red"): (
vox_spec: ("armor.misc.head.bandana.red", (-4.0, -2.0, -10.0)),
vox_spec: ("armor.misc.head.bandana.red", (-4.0, -1.0, -10.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.bandana.red"): (
@ -806,7 +806,7 @@
color: None
),
(Orc, Male, "common.items.armor.misc.head.bandana.red"): (
vox_spec: ("armor.misc.head.bandana.red", (-3.0, 0.0, -8.0)),
vox_spec: ("armor.misc.head.bandana.red", (-3.0, 0.0, -7.0)),
color: None
),
(Orc, Female, "common.items.armor.misc.head.bandana.red"): (
@ -818,7 +818,7 @@
vox_spec: ("armor.misc.head.bandana.thief", (-2.0, -2.0, -8.0)),
color: None
),
(Danari, Female, "Thicommon.items.armor.misc.head.bandana.thiefef"): (
(Danari, Female, "common.items.armor.misc.head.bandana.thief"): (
vox_spec: ("armor.misc.head.bandana.thief", (-2.0, -2.0, -8.0)),
color: None
),
@ -834,8 +834,8 @@
vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)),
color: None
),
(Human, Female, "Thcommon.items.armor.misc.head.bandana.thiefief"): (
vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -2.0, -10.0)),
(Human, Female, "common.items.armor.misc.head.bandana.thief"): (
vox_spec: ("armor.misc.head.bandana.thief", (-4.0, -1.0, -10.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.bandana.thief"): (
@ -855,7 +855,7 @@
color: None
),
(Orc, Male, "common.items.armor.misc.head.bandana.thief"): (
vox_spec: ("armor.misc.head.bandana.thief", (-3.0, 0.0, -8.0)),
vox_spec: ("armor.misc.head.bandana.thief", (-3.0, 0.0, -7.0)),
color: None
),
(Orc, Female, "common.items.armor.misc.head.bandana.thief"): (
@ -864,43 +864,43 @@
),
//
(Danari, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-2.0, -1.0, -8.0)),
vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)),
color: None
),
(Danari, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-2.0, -1.0, -8.0)),
vox_spec: ("armor.cultist.bandana", (-2.0, -2.0, -8.0)),
color: None
),
(Dwarf, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-5.0, 0.0, -10.0)),
vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)),
color: None
),
(Dwarf, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-5.0, 0.0, -10.0)),
vox_spec: ("armor.cultist.bandana", (-5.0, -1.0, -10.0)),
color: None
),
(Human, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-4.0, -1.0, -10.0)),
vox_spec: ("armor.cultist.bandana", (-4.0, -2.0, -10.0)),
color: None
),
(Human, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-4.0, 0.0, -10.0)),
vox_spec: ("armor.cultist.bandana", (-4.0, -1.0, -10.0)),
color: None
),
(Draugr, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-6.0, -1.0, -8.0)),
vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -8.0)),
color: None
),
(Draugr, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-6.0, -1.0, -9.0)),
vox_spec: ("armor.cultist.bandana", (-6.0, -2.0, -9.0)),
color: None
),
(Elf, Male, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-3.0, -1.0, -10.0)),
vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)),
color: None
),
(Elf, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-3.0, -1.0, -10.0)),
vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)),
color: None
),
(Orc, Male, "common.items.armor.cultist.bandana"): (
@ -908,7 +908,7 @@
color: None
),
(Orc, Female, "common.items.armor.cultist.bandana"): (
vox_spec: ("armor.cultist.bandana", (-3.0, -2.0, -10.0)),
vox_spec: ("armor.cultist.bandana", (-3.0, -3.0, -10.0)),
color: None
),
//
@ -941,7 +941,7 @@
color: None
),
(Danari, Female, "common.items.armor.misc.head.hood"): (
vox_spec: ("armor.misc.head.hood", (-2.0, -6.0, -2.0)),
vox_spec: ("armor.misc.head.hood", (-2.0, -5.0, -2.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.hood"): (
@ -990,7 +990,7 @@
color: None
),
(Danari, Female, "common.items.armor.misc.head.hood_dark"): (
vox_spec: ("armor.misc.head.hood_dark", (-2.0, -7.0, -3.0)),
vox_spec: ("armor.misc.head.hood_dark", (-2.0, -6.0, -3.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.hood_dark"): (
@ -1035,15 +1035,15 @@
color: None
),
(Danari, Male, "common.items.armor.misc.head.spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, 8.5)),
vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, 8.5)),
color: None
),
(Danari, Female, "common.items.armor.misc.head.spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-2.0, -4.0, 9.0)),
vox_spec: ("armor.misc.head.spikeguard", (-2.0, -5.0, 9.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.spikeguard"): (
vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, 7.0)),
vox_spec: ("armor.misc.head.spikeguard", (-6.0, -4.0, 8.0)),
color: None
),
(Draugr, Female, "common.items.armor.misc.head.spikeguard"): (
@ -1137,7 +1137,7 @@
color: None
),
(Danari, Female, "common.items.armor.cardinal.mitre"): (
vox_spec: ("armor.cardinal.mitre", (-2.0, -5.0, 7.0)),
vox_spec: ("armor.cardinal.mitre", (-2.0, -4.0, 7.0)),
color: None
),
(Draugr, Male, "common.items.armor.cardinal.mitre"): (
@ -1231,11 +1231,11 @@
color: None
),
(Danari, Male, "common.items.armor.misc.head.winged_coronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -3.0, 0.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -4.0, 0.0)),
color: None
),
(Danari, Female, "common.items.armor.misc.head.winged_coronet"): (
vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -3.0, 0.0)),
vox_spec: ("armor.misc.head.winged_coronet", (-2.0, -4.0, 0.0)),
color: None
),
(Draugr, Male, "common.items.armor.misc.head.winged_coronet"): (
@ -1337,7 +1337,7 @@
color: None
),
(Draugr, Male, "common.items.armor.brinestone.crown"): (
vox_spec: ("armor.brinestone.crown", (-6.0, -4.0, 2.0)),
vox_spec: ("armor.brinestone.crown", (-6.0, -4.0, 0.0)),
color: None
),
(Draugr, Female, "common.items.armor.brinestone.crown"): (
@ -1345,7 +1345,7 @@
color: None
),
(Orc, Male, "common.items.armor.brinestone.crown"): (
vox_spec: ("armor.brinestone.crown", (-3.0, -2.0, 2.0)),
vox_spec: ("armor.brinestone.crown", (-3.0, -2.0, 1.0)),
color: None
),
(Orc, Female, "common.items.armor.brinestone.crown"): (

50
assets/voxygen/voxel/humanoid_armor_pants_manifest.ron
View File

@ -41,7 +41,7 @@
color: None
),
"common.items.armor.brinestone.pants": (
vox_spec: ("armor.brinestone.pants", (-7.0, -3.5, 0.0)),
vox_spec: ("armor.brinestone.pants", (-7.0, -3.5, -1.0)),
color: None
),
"common.items.npc_armor.pants.plate_red": (
@ -77,7 +77,7 @@
color: Some((30, 0, 64))
),
"common.items.armor.leather_plate.pants": (
vox_spec: ("armor.leather_plate.pants", (-5.0, -4.5, 1.0)),
vox_spec: ("armor.leather_plate.pants", (-5.0, -3.5, 1.0)),
color: None
),
"common.items.armor.twigs.pants": (
@ -125,39 +125,39 @@
color: None
),
"common.items.armor.hide.scale.pants": (
vox_spec: ("armor.hide.scale.pants", (-5.0, -4.0, 0.0)),
vox_spec: ("armor.hide.scale.pants", (-5.0, -3.5, 0.0)),
color: None
),
"common.items.armor.hide.carapace.pants": (
vox_spec: ("armor.hide.carapace.pants", (-6.0, -4.0, 0.5)),
vox_spec: ("armor.hide.carapace.pants", (-6.0, -3.5, 1.0)),
color: None
),
"common.items.armor.hide.primal.pants": (
vox_spec: ("armor.hide.primal.pants", (-6.0, -4.0, 0.0)),
vox_spec: ("armor.hide.primal.pants", (-6.0, -3.5, 1.0)),
color: None
),
"common.items.armor.hide.dragonscale.pants": (
vox_spec: ("armor.hide.dragonscale.pants", (-5.0, -3.5, -1.5)),
vox_spec: ("armor.hide.dragonscale.pants", (-5.0, -3.5, -1.0)),
color: None
),
"common.items.armor.savage.pants": (
vox_spec: ("armor.savage.pants", (-5.0, -4.0, 0.5)),
vox_spec: ("armor.savage.pants", (-5.0, -3.5, 1.0)),
color: None
),
"common.items.armor.witch.pants": (
vox_spec: ("armor.witch.pants", (-5.0, -4.0, 0.5)),
vox_spec: ("armor.witch.pants", (-5.0, -3.5, 0.0)),
color: None
),
"common.items.armor.pirate.pants": (
vox_spec: ("armor.pirate.pants", (-5.0, -4.0, 1.5)),
vox_spec: ("armor.pirate.pants", (-5.0, -3.5, 0.0)),
color: None
),
"common.items.armor.alchemist.pants": (
vox_spec: ("armor.alchemist", (-5.0, -4.0, 0.5), 3),
vox_spec: ("armor.alchemist", (-5.0, -3.5, 0.0), 3),
color: None
),
"common.items.armor.blacksmith.pants": (
vox_spec: ("armor.blacksmith.pants", (-5.0, -4.0, 0.5)),
vox_spec: ("armor.blacksmith.pants", (-5.0, -3.5, 0.0)),
color: None
),
"common.items.armor.chef.pants": (
@ -165,59 +165,59 @@
color: None
),
"common.items.armor.cloth.linen.pants": (
vox_spec: ("armor.cloth.linen.pants", (-5.0, -4.0, 0.5)),
vox_spec: ("armor.cloth.linen.pants", (-5.0, -3.5, 0.0)),
color: None
),
"common.items.armor.cloth.woolen.pants": (
vox_spec: ("armor.cloth.woolen.pants", (-6.0, -5.0, 0.5)),
vox_spec: ("armor.cloth.woolen.pants", (-6.0, -4.5, 1.0)),
color: None
),
"common.items.armor.cloth.silken.pants": (
vox_spec: ("armor.cloth.silken.pants", (-5.0, -4.0, 0.5)),
vox_spec: ("armor.cloth.silken.pants", (-5.0, -3.5, 0.0)),
color: None
),
"common.items.armor.cloth.druid.pants": (
vox_spec: ("armor.cloth.druid.pants", (-5.0, -4.0, 0.5)),
vox_spec: ("armor.cloth.druid.pants", (-5.0, -3.5, -1.0)),
color: None
),
"common.items.armor.cloth.moonweave.pants": (
vox_spec: ("armor.cloth.moonweave.pants", (-6.0, -5.5, 0.5)),
vox_spec: ("armor.cloth.moonweave.pants", (-6.0, -4.5, 0.0)),
color: None
),
"common.items.armor.cloth.sunsilk.pants": (
vox_spec: ("armor.cloth.sunsilk.pants", (-6.0, -5.0, 0.5)),
vox_spec: ("armor.cloth.sunsilk.pants", (-6.0, -4.5, 0.0)),
color: None
),
"common.items.armor.mail.bronze.pants": (
vox_spec: ("armor.mail.bronze.pants", (-5.0, -4.0, 1.0)),
vox_spec: ("armor.mail.bronze.pants", (-5.0, -3.5, 1.0)),
color: None
),
"common.items.armor.mail.iron.pants": (
vox_spec: ("armor.mail.iron.pants", (-5.0, -4.0, 1.5)),
vox_spec: ("armor.mail.iron.pants", (-5.0, -3.5, 1.0)),
color: None
),
"common.items.armor.mail.steel.pants": (
vox_spec: ("armor.mail.steel.pants", (-6.0, -4.0, 0.0)),
vox_spec: ("armor.mail.steel.pants", (-6.0, -3.5, 1.0)),
color: None
),
"common.items.armor.mail.cobalt.pants": (
vox_spec: ("armor.mail.cobalt.pants", (-6.0, -5.0, 0.5)),
vox_spec: ("armor.mail.cobalt.pants", (-6.0, -5.5, 1.0)),
color: None
),
"common.items.armor.mail.bloodsteel.pants": (
vox_spec: ("armor.mail.bloodsteel.pants", (-7.0, -4.0, 0.5)),
vox_spec: ("armor.mail.bloodsteel.pants", (-7.0, -4.5, 0.0)),
color: None
),
"common.items.armor.mail.orichalcum.pants": (
vox_spec: ("armor.mail.orichalcum", (-6.0, -4.0, 0.5), 1),
vox_spec: ("armor.mail.orichalcum", (-6.0, -3.5, -1.0), 1),
color: None
),
"common.items.armor.cardinal.pants": (
vox_spec: ("armor.cardinal.pants", (-5.0, -4.0, -0.4)),
vox_spec: ("armor.cardinal.pants", (-5.0, -3.5, 0.0)),
color: None
),
"common.items.armor.merchant.pants": (
vox_spec: ("armor.merchant.pants", (-6.0, -4.0, 0.5)),
vox_spec: ("armor.merchant.pants", (-5.0, -3.5, 0.0)),
color: None
),
},

160
assets/voxygen/voxel/humanoid_armor_shoulder_manifest.ron
View File

@ -23,11 +23,11 @@
),
"common.items.armor.assassin.shoulder": (
left: (
vox_spec: ("armor.assassin.shoulder", (-4.0, -3.5, 1.0)),
vox_spec: ("armor.assassin.shoulder", (-5.0, -3.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.assassin.shoulder", (-2.0, -3.5, 1.0)),
vox_spec: ("armor.assassin.shoulder", (-1.0, -3.5, 0.0)),
color: None
)
),
@ -53,121 +53,121 @@
),
"common.items.armor.boreal.shoulder": (
left: (
vox_spec: ("armor.boreal.shoulder", (-3.5, -3.5, -3.0)),
vox_spec: ("armor.boreal.shoulder", (-4.0, -3.5, -1.0)),
color: None
),
right: (
vox_spec: ("armor.boreal.shoulder", (-1.5, -3.5, -3.0)),
vox_spec: ("armor.boreal.shoulder", (-1.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.brinestone.shoulder": (
left: (
vox_spec: ("armor.brinestone.shoulder", (-5.0, -3.5, -2.0)),
vox_spec: ("armor.brinestone.shoulder", (-6.0, -3.5, -1.0)),
color: None
),
right: (
vox_spec: ("armor.brinestone.shoulder", (-3.0, -3.5, -2.0)),
vox_spec: ("armor.brinestone.shoulder", (-2.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.cloth_purple.shoulder": (
left: (
vox_spec: ("armor.cloth_purple.shoulder", (-3.2, -3.5, 0.0)),
vox_spec: ("armor.cloth_purple.shoulder", (-4.0, -3.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.cloth_purple.shoulder", (-1.8, -3.5, 0.0)),
vox_spec: ("armor.cloth_purple.shoulder", (-1.0, -3.5, 0.0)),
color: None
)
),
"common.items.armor.cloth_blue.shoulder_0": (
left: (
vox_spec: ("armor.cloth_blue.shoulder_0", (-3.2, -3.5, 0.0)),
vox_spec: ("armor.cloth_blue.shoulder_0", (-4.0, -3.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.cloth_blue.shoulder_0", (-1.8, -3.5, 0.0)),
vox_spec: ("armor.cloth_blue.shoulder_0", (-1.0, -3.5, 0.0)),
color: None
)
),
"common.items.armor.cloth_green.shoulder": (
left: (
vox_spec: ("armor.cloth_green.shoulder", (-3.2, -3.5, 0.0)),
vox_spec: ("armor.cloth_green.shoulder", (-4.0, -3.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.cloth_green.shoulder", (-1.8, -3.5, 0.0)),
vox_spec: ("armor.cloth_green.shoulder", (-1.0, -3.5, 0.0)),
color: None
)
),
"common.items.armor.cultist.shoulder": (
left: (
vox_spec: ("armor.cultist.shoulder", (-2.0, -3.5, 0.0)),
vox_spec: ("armor.cultist.shoulder", (-3.0, -3.5, -1.0)),
color: Some((30, 0, 64))
),
right: (
vox_spec: ("armor.cultist.shoulder", (-2.9, -3.5, 0.0)),
vox_spec: ("armor.cultist.shoulder", (-2.0, -3.5, -1.0)),
color: Some((30, 0, 64))
)
),
"common.items.armor.leather_plate.shoulder": (
left: (
vox_spec: ("armor.leather_plate.shoulder", (-4.0, -4.5 , 0.0)),
vox_spec: ("armor.leather_plate.shoulder", (-4.0, -3.5 , 0.0)),
color: None
),
right: (
vox_spec: ("armor.leather_plate.shoulder", (-0.9, -4.5, 0.0)),
vox_spec: ("armor.leather_plate.shoulder", (-0.9, -3.5, 0.0)),
color: None
)
),
"common.items.armor.twigs.shoulder": (
left: (
vox_spec: ("armor.twigs.shoulder", (-5.0, -4.5 , -1.0)),
vox_spec: ("armor.twigs.shoulder", (-5.0, -4.0 , -1.0)),
color: None
),
right: (
vox_spec: ("armor.twigs.shoulder", (-1.0, -4.5, -1.0)),
vox_spec: ("armor.twigs.shoulder", (-1.0, -4.0, -1.0)),
color: None
)
),
"common.items.armor.twigsleaves.shoulder": (
left: (
vox_spec: ("armor.twigsleaves.shoulder", (-5.5, -5.0 , 0.0)),
vox_spec: ("armor.twigsleaves.shoulder", (-6.0, -5.0 , -1.0)),
color: None
),
right: (
vox_spec: ("armor.twigsleaves.shoulder", (-1.5, -5.0, 0.0)),
vox_spec: ("armor.twigsleaves.shoulder", (-1.0, -5.0, -1.0)),
color: None
)
),
"common.items.armor.twigsflowers.shoulder": (
left: (
vox_spec: ("armor.twigsflowers.shoulder", (-5.5, -5.0 , 0.0)),
vox_spec: ("armor.twigsflowers.shoulder", (-6.0, -4.0 , -2.0)),
color: None
),
right: (
vox_spec: ("armor.twigsflowers.shoulder", (-1.5, -5.0, 0.0)),
vox_spec: ("armor.twigsflowers.shoulder", (-1.0, -4.0, -2.0)),
color: None
),
),
"common.items.armor.cloth_blue.shoulder_1": (
left: (
vox_spec: ("armor.cloth_blue.shoulder_1", (-4.0, -2.5, -0.5)),
vox_spec: ("armor.cloth_blue.shoulder_1", (-4.0, -2.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.cloth_blue.shoulder_1", (-1.0, -2.5, -0.5)),
vox_spec: ("armor.cloth_blue.shoulder_1", (-1.0, -2.5, 0.0)),
color: None
)
),
"common.items.armor.misc.shoulder.iron_spikes": (
left: (
vox_spec: ("armor.misc.shoulder.iron_spikes", (-5.5, -3.8, -2.0)),
vox_spec: ("armor.misc.shoulder.iron_spikes", (-6.0, -3.5, -2.0)),
color: None
),
right: (
vox_spec: ("armor.misc.shoulder.iron_spikes", (-1.5, -3.8, -2.0)),
vox_spec: ("armor.misc.shoulder.iron_spikes", (-1.0, -3.5, -2.0)),
color: None
)
),
@ -183,31 +183,31 @@
),
"common.items.armor.misc.shoulder.leather_iron_2": (
left: (
vox_spec: ("armor.misc.shoulder.leather_iron_2", (-5.0, -2.5, -0.5)),
vox_spec: ("armor.misc.shoulder.leather_iron_2", (-5.0, -2.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.misc.shoulder.leather_iron_2", (-2.0, -2.5, -0.5)),
vox_spec: ("armor.misc.shoulder.leather_iron_2", (-2.0, -2.5, 0.0)),
color: None
)
),
"common.items.armor.misc.shoulder.leather_iron_1": (
left: (
vox_spec: ("armor.misc.shoulder.leather_iron_1", (-5.0, -2.5, -0.5)),
vox_spec: ("armor.misc.shoulder.leather_iron_1", (-5.0, -2.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.misc.shoulder.leather_iron_1", (-2.0, -2.5, -0.5)),
vox_spec: ("armor.misc.shoulder.leather_iron_1", (-2.0, -2.5, 0.0)),
color: None
)
),
"common.items.armor.misc.shoulder.leather_iron_0": (
left: (
vox_spec: ("armor.misc.shoulder.leather_iron_0", (-6.0, -2.5, -0.5)),
vox_spec: ("armor.misc.shoulder.leather_iron_0", (-6.0, -2.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.misc.shoulder.leather_iron_0", (-2.0, -2.5, -0.5)),
vox_spec: ("armor.misc.shoulder.leather_iron_0", (-2.0, -2.5, 0.0)),
color: None
)
),
@ -223,21 +223,21 @@
),
"common.items.armor.tarasque.shoulder": (
left: (
vox_spec: ("armor.tarasque.shoulder", (-5.0, -3.5 , 0.0)),
vox_spec: ("armor.tarasque.shoulder", (-4.0, -3.5 , -1.0)),
color: None
),
right: (
vox_spec: ("armor.tarasque.shoulder", (-0.0, -3.5, 0.0)),
vox_spec: ("armor.tarasque.shoulder", (-1.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.bonerattler.shoulder": (
left: (
vox_spec: ("armor.bonerattler.shoulder", (-4.0, -3.5 , 1.0)),
vox_spec: ("armor.bonerattler.shoulder", (-4.0, -3.5 , 0.0)),
color: None
),
right: (
vox_spec: ("armor.bonerattler.shoulder", (-1.0, -3.5, 1.0)),
vox_spec: ("armor.bonerattler.shoulder", (-1.0, -3.5, 0.0)),
color: None
)
),
@ -263,97 +263,97 @@
),
"common.items.armor.hide.rawhide.shoulder": (
left: (
vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.2, -0.5)),
vox_spec: ("armor.hide.rawhide.shoulder", (-4.0, -3.5, 0.0)),
color: None
),
right: (
vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.2, -0.5)),
vox_spec: ("armor.hide.rawhide.shoulder", (-1.0, -3.5, 0.0)),
color: None
)
),
"common.items.armor.hide.leather.shoulder": (
left: (
vox_spec: ("armor.hide.leather.shoulder", (-5.5, -3.2, -1.8)),
vox_spec: ("armor.hide.leather.shoulder", (-5.0, -3.5, -2.0)),
color: None
),
right: (
vox_spec: ("armor.hide.leather.shoulder", (-0.5, -3.2, -1.8)),
vox_spec: ("armor.hide.leather.shoulder", (-1.0, -3.5, -2.0)),
color: None
)
),
"common.items.armor.miner.shoulder": (
left: (
vox_spec: ("armor.hide.leather.shoulder", (-5.5, -3.2, -1.8)),
vox_spec: ("armor.hide.leather.shoulder", (-5.0, -3.5, -2.0)),
color: None
),
right: (
vox_spec: ("armor.hide.leather.shoulder", (-0.5, -3.2, -1.8)),
vox_spec: ("armor.hide.leather.shoulder", (-1.0, -3.5, -2.0)),
color: None
)
),
"common.items.armor.hide.scale.shoulder": (
left: (
vox_spec: ("armor.hide.scale.shoulder", (-3.2, -3.5 , 0.0)),
vox_spec: ("armor.hide.scale.shoulder", (-5.0, -3.5, -1.0)),
color: None
),
right: (
vox_spec: ("armor.hide.scale.shoulder", (-1.4, -3.5, -0.5)),
vox_spec: ("armor.hide.scale.shoulder", (-1.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.hide.carapace.shoulder": (
left: (
vox_spec: ("armor.hide.carapace.shoulder", (-6.0, -4.0 , -2.0)),
vox_spec: ("armor.hide.carapace.shoulder", (-6.0, -3.5, -3.0)),
color: None
),
right: (
vox_spec: ("armor.hide.carapace.shoulder", (-1.0, -4.0, -2.0)),
vox_spec: ("armor.hide.carapace.shoulder", (-1.0, -3.5, -3.0)),
color: None
)
),
"common.items.armor.hide.primal.shoulder": (
left: (
vox_spec: ("armor.hide.primal.shoulder", (-6.0, -4.0 , -3.0)),
vox_spec: ("armor.hide.primal.shoulder", (-6.0, -3.5, -3.0)),
color: None
),
right: (
vox_spec: ("armor.hide.primal.shoulder", (-1.0, -4.0, -3.0)),
vox_spec: ("armor.hide.primal.shoulder", (-1.0, -3.5, -3.0)),
color: None
)
),
"common.items.armor.hide.dragonscale.shoulder": (
left: (
vox_spec: ("armor.hide.dragonscale.shoulder", (-9.0, -3.5 , -1.0)),
vox_spec: ("armor.hide.dragonscale.shoulder", (-8.0, -3.5 , -2.0)),
color: None
),
right: (
vox_spec: ("armor.hide.dragonscale.shoulder", (0.0, -3.5, -1.0)),
vox_spec: ("armor.hide.dragonscale.shoulder", (-1.0, -3.5, -2.0)),
color: None
)
),
"common.items.armor.savage.shoulder": (
left: (
vox_spec: ("armor.savage.shoulder", (-5.5, -4.0 , -2.0)),
vox_spec: ("armor.savage.shoulder", (-5.0, -3.5 , -2.0)),
color: None
),
right: (
vox_spec: ("armor.savage.shoulder", (-0.5, -4.0, -2.0)),
vox_spec: ("armor.savage.shoulder", (-1.0, -3.5, -2.0)),
color: None
)
),
"common.items.armor.witch.shoulder": (
left: (
vox_spec: ("armor.witch.shoulder", (-5.0, -4.0 , -2.0)),
vox_spec: ("armor.witch.shoulder", (-5.0, -3.5, -1.0)),
color: None
),
right: (
vox_spec: ("armor.witch.shoulder", (-1.0, -4.0 , -2.0)),
vox_spec: ("armor.witch.shoulder", (-1.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.pirate.shoulder": (
left: (
vox_spec: ("armor.pirate.shoulder", (-5.0, -4.0 , -2.0)),
vox_spec: ("armor.pirate.shoulder", (-5.0, -3.5 , -1.0)),
color: None
),
right: (
@ -363,127 +363,127 @@
),
"common.items.armor.cloth.linen.shoulder": (
left: (
vox_spec: ("armor.cloth.linen.shoulder", (-3.5, -4.0 , -1.0)),
vox_spec: ("armor.cloth.linen.shoulder", (-3.0, -3.5 , 0.0)),
color: None
),
right: (
vox_spec: ("armor.cloth.linen.shoulder", (-0.5, -4.0, -1.0)),
vox_spec: ("armor.cloth.linen.shoulder", (-1.0, -3.5, 0.0)),
color: None
)
),
"common.items.armor.cloth.woolen.shoulder": (
left: (
vox_spec: ("armor.cloth.woolen.shoulder", (-5.5, -4.0 , -3.0)),
vox_spec: ("armor.cloth.woolen.shoulder", (-5.0, -3.5, -2.0)),
color: None
),
right: (
vox_spec: ("armor.cloth.woolen.shoulder", (-0.5, -4.0, -3.0)),
vox_spec: ("armor.cloth.woolen.shoulder", (-1.0, -3.5, -2.0)),
color: None
)
),
"common.items.armor.cloth.silken.shoulder": (
left: (
vox_spec: ("armor.cloth.silken.shoulder", (-5.0, -4.0 , -2.0)),
vox_spec: ("armor.cloth.silken.shoulder", (-5.0, -3.5 , -1.0)),
color: None
),
right: (
vox_spec: ("armor.cloth.silken.shoulder", (-1.0, -4.0, -2.0)),
vox_spec: ("armor.cloth.silken.shoulder", (-1.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.cloth.druid.shoulder": (
left: (
vox_spec: ("armor.cloth.druid.shoulder", (-4.5, -4.0 , -3.5)),
vox_spec: ("armor.cloth.druid.shoulder", (-5.0, -4.5 , -4.0)),
color: None
),
right: (
vox_spec: ("armor.cloth.druid.shoulder", (-1.5, -4.0, -3.5)),
vox_spec: ("armor.cloth.druid.shoulder", (-1.0, -4.5, -4.0)),
color: None
)
),
"common.items.armor.cloth.moonweave.shoulder": (
left: (
vox_spec: ("armor.cloth.moonweave.shoulder", (-4.5, -4.0 , -3.0)),
vox_spec: ("armor.cloth.moonweave.shoulder", (-5.0, -3.5 , -3.0)),
color: None
),
right: (
vox_spec: ("armor.cloth.moonweave.shoulder", (-1.5, -4.0, -3.0)),
vox_spec: ("armor.cloth.moonweave.shoulder", (-1.0, -3.5, -3.0)),
color: None
)
),
"common.items.armor.cloth.sunsilk.shoulder": (
left: (
vox_spec: ("armor.cloth.sunsilk.shoulder", (-6.5, -4.0 , -2.0)),
vox_spec: ("armor.cloth.sunsilk.shoulder", (-6.0, -3.5 , -1.0)),
color: None
),
right: (
vox_spec: ("armor.cloth.sunsilk.shoulder", (-0.5, -4.0, -2.0)),
vox_spec: ("armor.cloth.sunsilk.shoulder", (-1.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.mail.bronze.shoulder": (
left: (
vox_spec: ("armor.mail.bronze.shoulder", (-4.5, -4.0 , 0.0)),
vox_spec: ("armor.mail.bronze.shoulder", (-5.0, -3.5 , 0.0)),
color: None
),
right: (
vox_spec: ("armor.mail.bronze.shoulder", (-1.5, -4.0, 0.0)),
vox_spec: ("armor.mail.bronze.shoulder", (-1.0, -3.5, 0.0)),
color: None
)
),
"common.items.armor.mail.iron.shoulder": (
left: (
vox_spec: ("armor.mail.iron.shoulder", (-5.5, -4.0 , -1.0)),
vox_spec: ("armor.mail.iron.shoulder", (-5.0, -3.5, -1.0)),
color: None
),
right: (
vox_spec: ("armor.mail.iron.shoulder", (-0.5, -4.0, -1.0)),
vox_spec: ("armor.mail.iron.shoulder", (-1.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.mail.steel.shoulder": (
left: (
vox_spec: ("armor.mail.steel.shoulder", (-5.5, -3.0 , -2.0)),
vox_spec: ("armor.mail.steel.shoulder", (-6.0, -3.5 , -1.0)),
color: None
),
right: (
vox_spec: ("armor.mail.steel.shoulder", (-1.5, -3.0, -2.0)),
vox_spec: ("armor.mail.steel.shoulder", (-1.0, -3.5, -1.0)),
color: None
)
),
"common.items.armor.mail.cobalt.shoulder": (
left: (
vox_spec: ("armor.mail.cobalt.shoulder", (-5.5, -4.0 , -1.0)),
vox_spec: ("armor.mail.cobalt.shoulder", (-6.0, -4.5 , -1.0)),
color: None
),
right: (
vox_spec: ("armor.mail.cobalt.shoulder", (-1.5, -4.0, -1.0)),
vox_spec: ("armor.mail.cobalt.shoulder", (-1.0, -4.5, -1.0)),
color: None
)
),
"common.items.armor.mail.bloodsteel.shoulder": (
left: (
vox_spec: ("armor.mail.bloodsteel.shoulder", (-6.5, -5.0 , -3.0)),
vox_spec: ("armor.mail.bloodsteel.shoulder", (-8.0, -5.5, -3.0)),
color: None
),
right: (
vox_spec: ("armor.mail.bloodsteel.shoulder", (-2.5, -5.0, -3.0)),
vox_spec: ("armor.mail.bloodsteel.shoulder", (-1.0, -5.5, -3.0)),
color: None
)
),
"common.items.armor.mail.orichalcum.shoulder": (
left: (
vox_spec: ("armor.mail.orichalcum", (-7.5, -3.0 , -2.0), 5),
vox_spec: ("armor.mail.orichalcum", (-8.0, -3.5, -2.0), 5),
color: None
),
right: (
vox_spec: ("armor.mail.orichalcum", (-1.5, -3.0, -2.0), 5),
vox_spec: ("armor.mail.orichalcum", (-1.0, -3.5, -2.0), 5),
color: None
)
),
"common.items.armor.cardinal.shoulder": (
left: (
vox_spec: ("armor.cardinal.shoulder", (-5.0, -4.0, -2.0)),
vox_spec: ("armor.cardinal.shoulder", (-5.0, -2.5, -1.0)),
color: None
),
right: (

BIN
assets/voxygen/voxel/npc/crab/crab.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

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