Merge branch 'beginner_balance_tweaks' into 'master'

Beginner balance tweaks

See merge request veloren/veloren!4269
This commit is contained in:
crabman 2024-02-14 23:23:29 +00:00
commit 5c4e68cce7
187 changed files with 2005 additions and 1076 deletions

View File

@ -85,6 +85,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated wgpu. Now supports OpenGL. Dx11 no longer supported. - Updated wgpu. Now supports OpenGL. Dx11 no longer supported.
- Changes center_cursor to be reset_cursor_position so the cursor is effectively grabbed - Changes center_cursor to be reset_cursor_position so the cursor is effectively grabbed
- Plugin interface based on WASI 0.2 WIT, wasmtime executes these components - Plugin interface based on WASI 0.2 WIT, wasmtime executes these components
- Balance changes; Smoother entity progression consisting of larger variety in (effective) health pools, dps, entity flee_health alterations, and minor weight distribution changes for entity spawns.
- Made power of weapon tiers scale non-linearly.
- Sword Changes; Pommel Strike has been nerfed -> increased energy cost, increased _durations, and decreased poise damage. Heavy Sweep has been nerfed -> decreased poise damage and stun vulnerability damage. Pillar Thrust has been altered -> decreased maximum base damage with an increase in stun vulnerability damage.
### Removed ### Removed
- Medium and large potions from all loot tables - Medium and large potions from all loot tables

View File

@ -464,7 +464,7 @@
), ),
Custom("Quad Low Tail"): ( Custom("Quad Low Tail"): (
primary: Simple(None, "common.abilities.custom.quadlowtail.charged"), primary: Simple(None, "common.abilities.custom.quadlowtail.charged"),
secondary: Simple(None, "common.abilities.custom.quadlowtail.triplestrike"), secondary: Simple(None, "common.abilities.custom.quadlowtail.singlestrike"),
abilities: [], abilities: [],
), ),
Custom("Quad Low Quick"): ( Custom("Quad Low Quick"): (
@ -496,7 +496,7 @@
), ),
Custom("Mossy Snail"): ( Custom("Mossy Snail"): (
primary: Simple(None, "common.abilities.custom.mossy_snail.headbutt"), primary: Simple(None, "common.abilities.custom.mossy_snail.headbutt"),
secondary: Simple(None, "common.abilities.custom.mossy_snail.hastened"), secondary: Simple(None, "common.abilities.custom.mossy_snail.harden"),
abilities: [], abilities: [],
), ),
Custom("Treant Sapling"): ( Custom("Treant Sapling"): (
@ -563,6 +563,13 @@
Simple(None, "common.abilities.custom.arthropods.weevil.threadshot"), Simple(None, "common.abilities.custom.arthropods.weevil.threadshot"),
], ],
), ),
Custom("Crawler"): (
primary: Simple(None, "common.abilities.custom.arthropods.crawler.singlestrike"),
secondary: Simple(None, "common.abilities.custom.arthropods.crawler.harden"),
abilities: [
Simple(None, "common.abilities.custom.arthropods.crawler.threadshot"),
],
),
Custom("Dagonite"): ( Custom("Dagonite"): (
primary: Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"), primary: Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"),
secondary: Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"), secondary: Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"),

View File

@ -11,8 +11,8 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.9, buildup_duration: 0.65,
swing_duration: 0.07, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
movement: ( movement: (
@ -31,8 +31,8 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.6, buildup_duration: 0.75,
swing_duration: 0.07, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
ori_modifier: 0.7, ori_modifier: 0.7,
@ -48,8 +48,8 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.65,
swing_duration: 0.07, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
movement: ( movement: (

View File

@ -2,26 +2,26 @@ DashMelee(
energy_cost: 0, energy_cost: 0,
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Stab(
damage: 30.0, damage: 15.0,
poise: 20.0, poise: 20.0,
knockback: 10.0, knockback: 10.0,
energy_regen: 0.0, energy_regen: 0.0,
), ),
scaled: Some(( scaled: Some((
kind: Stab( kind: Stab(
damage: 120.0, damage: 60.0,
poise: 45.0, poise: 45.0,
knockback: 25.0, knockback: 25.0,
energy_regen: 0.0, energy_regen: 0.0,
))), ))),
range: 5.0, range: 5.0,
angle: 90.0, angle: 90.0,
), ),
energy_drain: 0, energy_drain: 0,
forward_speed: 3.0, forward_speed: 5.0,
buildup_duration: 0.6, buildup_duration: 0.45,
charge_duration: 8.0, charge_duration: 2.5,
swing_duration: 0.1, swing_duration: 0.25,
recover_duration: 0.8, recover_duration: 0.8,
ori_modifier: 0.1, ori_modifier: 0.1,
charge_through: false, charge_through: false,

View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 74, damage: 39,
poise: 27.5, poise: 27.5,
knockback: 9, knockback: 9,
energy_regen: 0, energy_regen: 0,
@ -17,10 +17,10 @@ ComboMelee2(
chance: 0.6, chance: 0.6,
))), ))),
), ),
buildup_duration: 1.4, buildup_duration: 0.65,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.5,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(1.0)),
), ),

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 1.2, buildup_duration: 1.2,
recover_duration: 0.7, recover_duration: 0.7,
projectile: Poisonball( projectile: Poisonball(
damage: 70.0, damage: 58.0,
radius: 3.5, radius: 3.5,
energy_regen: 0, energy_regen: 0,
min_falloff: 0.2, min_falloff: 0.2,

View File

@ -17,12 +17,12 @@ ComboMelee2(
chance: 0.4, chance: 0.4,
))), ))),
), ),
buildup_duration: 0.8, buildup_duration: 0.55,
swing_duration: 0.1, swing_duration: 0.35,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.8, ori_modifier: 0.8,
), ),

View File

@ -0,0 +1,9 @@
SelfBuff(
buildup_duration: 0.35,
cast_duration: 0.75,
recover_duration: 0.3,
buff_kind: ProtectingWard,
buff_strength: 0.4,
buff_duration: Some(10.0),
energy_cost: 0,
)

View File

@ -0,0 +1,25 @@
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Bash(
damage: 30,
poise: 19,
knockback: 4.2,
energy_regen: 0,
),
range: 3.5,
angle: 60.0,
),
buildup_duration: 0.5,
swing_duration: 0.3,
hit_timing: 0.5,
recover_duration: 1.0,
movement: (
swing: Some(Forward(0.1)),
),
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
)

View File

@ -0,0 +1,19 @@
BasicBeam(
buildup_duration: 0.55,
recover_duration: 0.8,
beam_duration: 1.0,
damage: 1.32,
tick_rate: 15.0,
range: 30.0,
max_angle: 1.0,
damage_effect: Some(Buff((
kind: Frozen,
dur_secs: 4.0,
strength: Value(1.0),
chance: 1.0,
))),
energy_regen: 0.0,
energy_drain: 0,
ori_rate: 0.95,
specifier: WebStrand,
)

View File

@ -1,9 +1,9 @@
SelfBuff( SelfBuff(
buildup_duration: 0.4, buildup_duration: 1.1,
cast_duration: 0.8, cast_duration: 0.4,
recover_duration: 0.3, recover_duration: 0.7,
buff_kind: ProtectingWard, buff_kind: ProtectingWard,
buff_strength: 1.5, buff_strength: 0.32,
buff_duration: Some(10.0), buff_duration: Some(6.0),
energy_cost: 0, energy_cost: 0,
) )

View File

@ -1,18 +1,18 @@
LeapMelee( LeapMelee(
energy_cost: 0, energy_cost: 0,
buildup_duration: 1.0, buildup_duration: 0.65,
movement_duration: 0.8, movement_duration: 0.8,
swing_duration: 0.075, swing_duration: 0.35,
recover_duration: 0.4, recover_duration: 0.6,
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 60.0, damage: 52.0,
poise: 20.0, poise: 20.0,
knockback: 4.0, knockback: 8.0,
energy_regen: 0.0, energy_regen: 0.0,
), ),
range: 4.5, range: 4.5,
angle: 180.0, angle: 135.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
forward_leap_strength: 40.0, forward_leap_strength: 40.0,

View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 54, damage: 43,
poise: 20, poise: 20,
knockback: 5, knockback: 5,
energy_regen: 0, energy_regen: 0,
@ -11,14 +11,14 @@ ComboMelee2(
range: 3.0, range: 3.0,
angle: 60.0, angle: 60.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.7,
swing_duration: 0.1, swing_duration: 0.2,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.5, ori_modifier: 0.8,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -1,12 +1,12 @@
LeapMelee( LeapMelee(
energy_cost: 0, energy_cost: 0,
buildup_duration: 1.0, buildup_duration: 0.65,
movement_duration: 0.8, movement_duration: 0.8,
swing_duration: 0.075, swing_duration: 0.35,
recover_duration: 0.4, recover_duration: 0.4,
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 70.0, damage: 49.0,
poise: 30.0, poise: 30.0,
knockback: 1.0, knockback: 1.0,
energy_regen: 0.0, energy_regen: 0.0,

View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Stab(
damage: 60, damage: 36,
poise: 21, poise: 21,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
@ -17,12 +17,12 @@ ComboMelee2(
chance: 0.8, chance: 0.8,
))), ))),
), ),
buildup_duration: 0.8, buildup_duration: 0.6,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.8, ori_modifier: 0.8,
), ),

View File

@ -3,7 +3,7 @@ SelfBuff(
cast_duration: 0.8, cast_duration: 0.8,
recover_duration: 0.3, recover_duration: 0.3,
buff_kind: ProtectingWard, buff_kind: ProtectingWard,
buff_strength: 1.2, buff_strength: 0.3,
buff_duration: Some(10.0), buff_duration: Some(10.0),
energy_cost: 0, energy_cost: 0,
) )

View File

@ -3,20 +3,20 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 44, damage: 9.5,
poise: 14, poise: 12,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.0, range: 3.0,
angle: 60.0, angle: 60.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.55,
swing_duration: 0.1, swing_duration: 0.35,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 1.1,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.6, ori_modifier: 0.6,
), ),

View File

@ -1,19 +1,15 @@
BasicBeam( BasicRanged(
buildup_duration: 0.4, energy_cost: 0,
recover_duration: 0.4, buildup_duration: 0.6,
beam_duration: 1.0, recover_duration: 0.9,
damage: 1.2, projectile: Pebble(
tick_rate: 15.0, damage: 8,
range: 30.0, knockback: 2,
max_angle: 1.0, ),
damage_effect: Some(Buff(( projectile_body: Object(Pebble),
kind: Frozen, projectile_light: None,
dur_secs: 4.0, projectile_speed: 70.0,
strength: DamageFraction(1.0), num_projectiles: 1,
chance: 1.0, projectile_spread: 0.0,
))), move_efficiency: 0.3,
energy_regen: 0.0,
energy_drain: 0,
ori_rate: 0.95,
specifier: WebStrand,
) )

View File

@ -2,23 +2,23 @@ ComboMelee2(
strikes: [ strikes: [
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Stab(
damage: 28, damage: 31,
poise: 28, poise: 10,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 4.0,
angle: 60.0, angle: 30.0,
), ),
buildup_duration: 1.2, buildup_duration: 0.9,
swing_duration: 0.1, swing_duration: 0.5,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(2.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.65, ori_modifier: 0.55,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -18,11 +18,11 @@ DashMelee(
angle: 45.0, angle: 45.0,
), ),
energy_drain: 0, energy_drain: 0,
forward_speed: 4.0, forward_speed: 2.0,
buildup_duration: 1.6, buildup_duration: 1.3,
charge_duration: 2.0, charge_duration: 2.0,
swing_duration: 0.1, swing_duration: 0.3,
recover_duration: 2.0, recover_duration: 2.0,
ori_modifier: 0.3, ori_modifier: 0.1,
charge_through: false, charge_through: false,
) )

View File

@ -3,62 +3,42 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 36, damage: 72,
poise: 15, poise: 15,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.8, range: 2.8,
angle: 30.0, angle: 90.0,
), ),
buildup_duration: 1.4, buildup_duration: 1.15,
swing_duration: 0.07, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.3, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(2.0)), swing: Some(Forward(0.25)),
), ),
ori_modifier: 0.65, ori_modifier: 0.65,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Slash(
damage: 36, damage: 39,
poise: 18, poise: 18,
knockback: 3, knockback: 24,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.8, range: 3.2,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.55,
swing_duration: 0.07, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.3, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(1.5)), swing: Some(Forward(0.45)),
), ),
ori_modifier: 0.65, ori_modifier: 0.85,
),
(
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,
recover_duration: 0.3,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.65,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -31,8 +31,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.05,
swing_duration: 0.1, swing_duration: 0.45,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 1.3, buildup_duration: 1.4,
swing_duration: 0.1, swing_duration: 0.6,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -31,8 +31,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.15,
swing_duration: 0.1, swing_duration: 0.35,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.8,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -31,8 +31,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.2,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.8,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -9,7 +9,7 @@ DashMelee(
), ),
scaled: Some(( scaled: Some((
kind: Bash( kind: Bash(
damage: 6.0, damage: 9.0,
poise: 20.0, poise: 20.0,
knockback: 6.0, knockback: 6.0,
energy_regen: 0.0, energy_regen: 0.0,

View File

@ -3,16 +3,16 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 1, damage: 5.5,
poise: 0, poise: 0,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.5, range: 3.0,
angle: 150.0, angle: 150.0,
), ),
buildup_duration: 0.6, buildup_duration: 0.9,
swing_duration: 0.5, swing_duration: 0.7,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.8,
movement: ( movement: (

View File

@ -31,8 +31,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.2,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.8,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -11,8 +11,8 @@ ComboMelee2(
range: 1.1, range: 1.1,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 1.3, buildup_duration: 0.9,
swing_duration: 0.07, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -31,8 +31,8 @@ ComboMelee2(
range: 1.1, range: 1.1,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.05,
swing_duration: 0.07, swing_duration: 0.35,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 1.1, range: 1.1,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.05,
swing_duration: 0.07, swing_duration: 0.35,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -37,8 +37,8 @@ ComboMelee2(
chance: 1.0, chance: 1.0,
))), ))),
), ),
buildup_duration: 0.6, buildup_duration: 0.8,
swing_duration: 0.6, swing_duration: 0.8,
hit_timing: 0.3, hit_timing: 0.3,
recover_duration: 1.2, recover_duration: 1.2,
movement: ( movement: (

View File

@ -19,9 +19,9 @@ DashMelee(
), ),
energy_drain: 0, energy_drain: 0,
forward_speed: 3, forward_speed: 3,
buildup_duration: 1.0, buildup_duration: 0.65,
charge_duration: 2.0, charge_duration: 2.0,
swing_duration: 0.1, swing_duration: 0.35,
recover_duration: 2.0, recover_duration: 2.0,
ori_modifier: 0.1, ori_modifier: 0.1,
charge_through: true, charge_through: true,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.5, buildup_duration: 0.5,
recover_duration: 0.5, recover_duration: 0.5,
beam_duration: 1, beam_duration: 1,
damage: 6.0, damage: 9.0,
tick_rate: 2.0, tick_rate: 2.0,
range: 25.0, range: 25.0,
max_angle: 1.0, max_angle: 1.0,

View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 4.0, damage: 6.0,
poise: 5, poise: 5,
knockback: 3.0, knockback: 3.0,
energy_regen: 0, energy_regen: 0,
@ -11,10 +11,10 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 40.0, angle: 40.0,
), ),
buildup_duration: 0.3, buildup_duration: 0.6,
swing_duration: 0.2, swing_duration: 0.3,
hit_timing: 0.4, hit_timing: 0.6,
recover_duration: 0.3, recover_duration: 0.7,
movement: ( movement: (
swing: Some(Forward(0.5)), swing: Some(Forward(0.5)),
), ),

View File

@ -8,8 +8,8 @@ BasicBeam(
max_angle: 25.0, max_angle: 25.0,
damage_effect: Some(Buff(( damage_effect: Some(Buff((
kind: Burning, kind: Burning,
dur_secs: 4.0, dur_secs: 8.0,
strength: DamageFraction(0.1), strength: Value(0.4),
chance: 0.25, chance: 0.25,
))), ))),
energy_regen: 0, energy_regen: 0,

View File

@ -17,8 +17,8 @@ ComboMelee2(
chance: 0.3, chance: 0.3,
))), ))),
), ),
buildup_duration: 0.8, buildup_duration: 0.7,
swing_duration: 0.1, swing_duration: 0.2,
hit_timing: 0.4, hit_timing: 0.4,
recover_duration: 0.3, recover_duration: 0.3,
movement: ( movement: (
@ -43,8 +43,8 @@ ComboMelee2(
chance: 0.15, chance: 0.15,
))), ))),
), ),
buildup_duration: 0.7, buildup_duration: 0.95,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.4, hit_timing: 0.4,
recover_duration: 1.3, recover_duration: 1.3,
movement: ( movement: (

View File

@ -6,8 +6,8 @@ LeapMelee(
recover_duration: 0.4, recover_duration: 0.4,
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 6.0, damage: 3.5,
poise: 20.0, poise: 2.0,
knockback: 5.0, knockback: 5.0,
energy_regen: 0.0, energy_regen: 0.0,
), ),

View File

@ -31,8 +31,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.2,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.9,
swing_duration: 0.1, swing_duration: 0.2,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -22,7 +22,7 @@ ComboMelee2(
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.3)),
), ),
ori_modifier: 0.6, ori_modifier: 0.6,
), ),

View File

@ -11,12 +11,12 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.9, buildup_duration: 0.65,
swing_duration: 0.07, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.2)),
), ),
ori_modifier: 0.7, ori_modifier: 0.7,
), ),
@ -31,8 +31,8 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.9,
swing_duration: 0.07, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
ori_modifier: 0.7, ori_modifier: 0.7,
@ -48,12 +48,12 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.9,
swing_duration: 0.07, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.2)),
), ),
ori_modifier: 0.7, ori_modifier: 0.7,
), ),

View File

@ -31,8 +31,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.1,
swing_duration: 0.1, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.7,
swing_duration: 0.1, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -1,15 +1,15 @@
BasicRanged( BasicRanged(
energy_cost: 0, energy_cost: 0,
buildup_duration: 0.6, buildup_duration: 1.0,
recover_duration: 1.0, recover_duration: 0.6,
projectile: Frostball( projectile: Frostball(
damage: 30.0, damage: 35.0,
radius: 3.0, radius: 4.0,
min_falloff: 0.1, min_falloff: 0.1,
), ),
projectile_body: Object(IceBomb), projectile_body: Object(IceBomb),
projectile_speed: 25.0, projectile_speed: 25.0,
num_projectiles: 3, num_projectiles: 1,
projectile_spread: 0.07, projectile_spread: 0.0,
move_efficiency: 0.75, move_efficiency: 0.3,
) )

View File

@ -9,7 +9,7 @@ BasicBeam(
damage_effect: Some(Buff(( damage_effect: Some(Buff((
kind: Frozen, kind: Frozen,
dur_secs: 10.0, dur_secs: 10.0,
strength: Value(0.25), strength: Value(0.15),
chance: 0.25, chance: 0.25,
))), ))),
energy_regen: 0, energy_regen: 0,

View File

@ -18,11 +18,11 @@ ComboMelee2(
))), ))),
), ),
buildup_duration: 1.2, buildup_duration: 1.2,
swing_duration: 0.07, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(3.0)), swing: Some(Forward(0.2)),
), ),
ori_modifier: 0.6, ori_modifier: 0.6,
), ),

View File

@ -2,61 +2,61 @@ ComboMelee2(
strikes: [ strikes: [
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Stab(
damage: 28, damage: 16,
poise: 15, poise: 5,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.2, range: 2.2,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.7,
swing_duration: 0.3,
hit_timing: 0.5,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.15)),
),
ori_modifier: 0.65,
),
(
melee_constructor: (
kind: Stab(
damage: 16,
poise: 5,
knockback: 3,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 0.5,
swing_duration: 0.3,
hit_timing: 0.5,
recover_duration: 0.6,
movement: (
swing: Some(Forward(0.1)),
),
ori_modifier: 0.65,
),
(
melee_constructor: (
kind: Bash(
damage: 44,
poise: 25,
knockback: 3,
energy_regen: 0,
),
range: 2.2,
angle: 260.0,
),
buildup_duration: 1.3, buildup_duration: 1.3,
swing_duration: 0.07, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(2.0)), swing: Some(Forward(0.5)),
),
ori_modifier: 0.65,
),
(
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,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.5)),
),
ori_modifier: 0.65,
),
(
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,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.5)),
), ),
ori_modifier: 0.65, ori_modifier: 0.65,
), ),

View File

@ -3,7 +3,7 @@ BasicRanged(
buildup_duration: 1.5, buildup_duration: 1.5,
recover_duration: 1.0, recover_duration: 1.0,
projectile: Magicball( projectile: Magicball(
damage: 8.0, damage: 22.0,
radius: 3.0, radius: 3.0,
energy_regen: 0, energy_regen: 0,
min_falloff: 0.5, min_falloff: 0.5,

View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 4.0, damage: 14.5,
poise: 5, poise: 5,
knockback: 3.0, knockback: 3.0,
energy_regen: 0, energy_regen: 0,
@ -11,10 +11,10 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 40.0, angle: 40.0,
), ),
buildup_duration: 1.5, buildup_duration: 0.5,
swing_duration: 0.4, swing_duration: 0.2,
hit_timing: 0.4, hit_timing: 0.5,
recover_duration: 1.0, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(0.5)), swing: Some(Forward(0.5)),
), ),

View File

@ -3,8 +3,8 @@ BasicRanged(
buildup_duration: 1.6, buildup_duration: 1.6,
recover_duration: 0.7, recover_duration: 0.7,
projectile: NecroticSphere( projectile: NecroticSphere(
damage: 52.0, damage: 26.0,
radius: 5.0, radius: 3.0,
energy_regen: 0, energy_regen: 0,
min_falloff: 0.5, min_falloff: 0.5,
), ),

View File

@ -3,22 +3,22 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 40, damage: 39,
poise: 28, poise: 5,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 60.0, angle: 60.0,
), ),
buildup_duration: 1.0, buildup_duration: 0.25,
swing_duration: 0.075, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(2.0)), swing: Some(Forward(0.15)),
), ),
ori_modifier: 0.65, ori_modifier: 0.75,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -2,7 +2,7 @@ BasicBeam(
buildup_duration: 0.3, buildup_duration: 0.3,
recover_duration: 1.0, recover_duration: 1.0,
beam_duration: 1.0, beam_duration: 1.0,
damage: 22.5, damage: 20.0,
tick_rate: 5.0, tick_rate: 5.0,
range: 22.0, range: 22.0,
max_angle: 15.0, max_angle: 15.0,
@ -10,10 +10,10 @@ BasicBeam(
kind: Cursed, kind: Cursed,
dur_secs: 30.0, dur_secs: 30.0,
strength: Value(0.5), strength: Value(0.5),
chance: 1.0, chance: 0.33,
))), ))),
energy_regen: 0, energy_regen: 0,
energy_drain: 0, energy_drain: 0,
ori_rate: 0.5, ori_rate: 0.4,
specifier: Cultist, specifier: Cultist,
) )

View File

@ -1,5 +1,5 @@
Blink( Blink(
buildup_duration: 0.75, buildup_duration: 0.75,
recover_duration: 0.25, recover_duration: 0.25,
max_range: 100.0, max_range: 150.0,
) )

View File

@ -2,8 +2,8 @@ SelfBuff(
buildup_duration: 0.1, buildup_duration: 0.1,
cast_duration: 0.1, cast_duration: 0.1,
recover_duration: 0.4, recover_duration: 0.4,
buff_kind: Hastened, buff_kind: ProtectingWard,
buff_strength: 0.8, buff_strength: 0.1,
buff_duration: Some(6.0), buff_duration: Some(6.0),
energy_cost: 0, energy_cost: 0,
) )

View File

@ -3,22 +3,22 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 3.0, damage: 4.5,
poise: 5, poise: 7,
knockback: 1.0, knockback: 1.0,
energy_regen: 0, energy_regen: 0,
), ),
range: 5.0, range: 4.0,
angle: 60.0, angle: 45.0,
), ),
buildup_duration: 0.6, buildup_duration: 1.15,
swing_duration: 0.4, swing_duration: 0.45,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(0.5)), swing: Some(Forward(0.6)),
), ),
ori_modifier: 0.7, ori_modifier: 0.45,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -17,8 +17,8 @@ ComboMelee2(
chance: 0.1, chance: 0.1,
))), ))),
), ),
buildup_duration: 1.2, buildup_duration: 1.0,
swing_duration: 0.12, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 1.2, recover_duration: 1.2,
movement: ( movement: (
@ -43,8 +43,8 @@ ComboMelee2(
chance: 0.1, chance: 0.1,
))), ))),
), ),
buildup_duration: 1.0, buildup_duration: 1.8,
swing_duration: 0.15, swing_duration: 0.55,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 2.4, recover_duration: 2.4,
movement: ( movement: (

View File

@ -3,20 +3,20 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 40, damage: 36,
poise: 28, poise: 28,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.0, range: 3.0,
angle: 60.0, angle: 90.0,
), ),
buildup_duration: 1.2, buildup_duration: 0.5,
swing_duration: 0.07, swing_duration: 0.2,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.5,
movement: ( movement: (
swing: Some(Forward(3.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.6, ori_modifier: 0.6,
), ),

View File

@ -2,21 +2,41 @@ ComboMelee2(
strikes: [ strikes: [
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Slash(
damage: 28, damage: 36,
poise: 15, poise: 0,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.2, range: 4.0,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 1.3, buildup_duration: 0.75,
swing_duration: 0.07, swing_duration: 0.45,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(2.0)), swing: Some(Forward(0.4)),
),
ori_modifier: 0.65,
),
(
melee_constructor: (
kind: Stab(
damage: 18,
poise: 12,
knockback: 15,
energy_regen: 0,
),
range: 3.5,
angle: 75.0,
),
buildup_duration: 0.35,
swing_duration: 0.35,
hit_timing: 0.5,
recover_duration: 0.3,
movement: (
swing: Some(Forward(0.2)),
), ),
ori_modifier: 0.65, ori_modifier: 0.65,
), ),
@ -24,39 +44,19 @@ ComboMelee2(
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 28, damage: 28,
poise: 18, poise: 40,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.2, range: 3.0,
angle: 30.0, angle: 55.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.55,
swing_duration: 0.07, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(1.5)), swing: Some(Forward(0.3)),
),
ori_modifier: 0.65,
),
(
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,
recover_duration: 0.6,
movement: (
swing: Some(Forward(1.5)),
), ),
ori_modifier: 0.65, ori_modifier: 0.65,
), ),

View File

@ -3,26 +3,26 @@ DashMelee(
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 16.0, damage: 16.0,
poise: 25.0, poise: 0.0,
knockback: 4.0, knockback: 4.0,
energy_regen: 0.0, energy_regen: 0.0,
), ),
scaled: Some(( scaled: Some((
kind: Bash( kind: Bash(
damage: 30.0, damage: 36.0,
poise: 0.0, poise: 8.0,
knockback: 17.0, knockback: 23.0,
energy_regen: 0.0, energy_regen: 0.0,
))), ))),
range: 2.5, range: 2.5,
angle: 45.0, angle: 45.0,
), ),
energy_drain: 0, energy_drain: 0,
forward_speed: 4.0, forward_speed: 1.8,
buildup_duration: 1.0, buildup_duration: 0.65,
charge_duration: 2.0, charge_duration: 2.0,
swing_duration: 0.1, swing_duration: 0.35,
recover_duration: 2.0, recover_duration: 2.0,
ori_modifier: 0.3, ori_modifier: 0.1,
charge_through: false, charge_through: false,
) )

View File

@ -1,8 +1,8 @@
BasicBeam( BasicBeam(
buildup_duration: 0.8, buildup_duration: 1.1,
recover_duration: 0.5, recover_duration: 1.6,
beam_duration: 0.5, beam_duration: 0.5,
damage: 14.0, damage: 26.0,
tick_rate: 3.0, tick_rate: 3.0,
range: 15.0, range: 15.0,
max_angle: 22.5, max_angle: 22.5,
@ -10,7 +10,7 @@ BasicBeam(
kind: Burning, kind: Burning,
dur_secs: 10.0, dur_secs: 10.0,
strength: DamageFraction(0.5), strength: DamageFraction(0.5),
chance: 0.25, chance: 1.0,
))), ))),
energy_regen: 0, energy_regen: 0,
energy_drain: 0, energy_drain: 0,

View File

@ -3,62 +3,62 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 44, damage: 60,
poise: 20, poise: 20,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.5, range: 3.5,
angle: 30.0, angle: 45.0,
), ),
buildup_duration: 1.3, buildup_duration: 1.4,
swing_duration: 0.1, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.7,
movement: ( movement: (
swing: Some(Forward(2.0)), swing: Some(Forward(0.15)),
), ),
ori_modifier: 0.7, ori_modifier: 0.8,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 44, damage: 44,
poise: 20, poise: 20,
knockback: 3, knockback: 12,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.5, range: 3.0,
angle: 30.0, angle: 75.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.95,
swing_duration: 0.1, swing_duration: 0.65,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.2,
movement: ( movement: (
swing: Some(Forward(1.5)), swing: Some(Forward(0.15)),
), ),
ori_modifier: 0.7, ori_modifier: 0.8,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 44, damage: 26,
poise: 20, poise: 5,
knockback: 3, knockback: 10,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.3,
swing_duration: 0.1, swing_duration: 0.2,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(1.5)), swing: Some(Forward(0.3)),
), ),
ori_modifier: 0.7, ori_modifier: 0.8,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -13,16 +13,16 @@ DashMelee(
poise: 0.0, poise: 0.0,
knockback: 7.0, knockback: 7.0,
energy_regen: 0.0, energy_regen: 0.0,
))), ))),
range: 2.0, range: 3.0,
angle: 45.0, angle: 45.0,
), ),
energy_drain: 0, energy_drain: 0,
forward_speed: 2.0, forward_speed: 2.0,
buildup_duration: 1.0, buildup_duration: 0.65,
charge_duration: 1.6, charge_duration: 1.6,
swing_duration: 0.1, swing_duration: 0.35,
recover_duration: 2.0, recover_duration: 2.0,
ori_modifier: 0.3, ori_modifier: 0.1,
charge_through: false, charge_through: false,
) )

View File

@ -11,14 +11,14 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 1.2, buildup_duration: 0.75,
swing_duration: 0.1, swing_duration: 0.45,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
movement: ( movement: (
swing: Some(Forward(1.5)), swing: Some(Forward(0.3)),
), ),
ori_modifier: 0.8, ori_modifier: 0.7,
), ),
( (
melee_constructor: ( melee_constructor: (
@ -31,14 +31,14 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.3, buildup_duration: 0.45,
swing_duration: 0.07, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
movement: ( movement: (
swing: Some(Forward(0.8)), swing: Some(Forward(0.08)),
), ),
ori_modifier: 0.8, ori_modifier: 0.7,
), ),
( (
melee_constructor: ( melee_constructor: (
@ -52,13 +52,13 @@ ComboMelee2(
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.4,
swing_duration: 0.07, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
movement: ( movement: (
swing: Some(Forward(0.8)), swing: Some(Forward(0.08)),
), ),
ori_modifier: 0.8, ori_modifier: 0.7,
), ),
( (
melee_constructor: ( melee_constructor: (
@ -72,13 +72,13 @@ ComboMelee2(
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.4,
swing_duration: 0.07, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,
movement: ( movement: (
swing: Some(Forward(0.8)), swing: Some(Forward(0.08)),
), ),
ori_modifier: 0.8, ori_modifier: 0.7,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -4,23 +4,23 @@ ChargedMelee(
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 8.0, damage: 8.0,
poise: 30.0, poise: 5.0,
knockback: 10.0, knockback: 10.0,
energy_regen: 0.0, energy_regen: 0.0,
), ),
scaled: Some(( scaled: Some((
kind: Bash( kind: Bash(
damage: 40.0, damage: 35.0,
poise: 80.0, poise: 35.0,
knockback: 20.0, knockback: 35.0,
energy_regen: 0.0, energy_regen: 0.0,
))), ))),
range: 6.0, range: 4.5,
angle: 90.0, angle: 90.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
charge_duration: 3.2, charge_duration: 1.7,
swing_duration: 0.7, swing_duration: 0.4,
hit_timing: 0.9, hit_timing: 0.5,
recover_duration: 0.7, recover_duration: 1.1,
) )

View File

@ -0,0 +1,25 @@
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Bash(
damage: 26,
poise: 11,
knockback: 0,
energy_regen: 0,
),
range: 2.2,
angle: 30.0,
),
buildup_duration: 0.95,
swing_duration: 0.45,
hit_timing: 0.5,
recover_duration: 0.4,
movement: (
swing: Some(Forward(0.15)),
),
ori_modifier: 0.7,
),
],
energy_cost_per_strike: 0,
)

View File

@ -1,65 +0,0 @@
ComboMelee2(
strikes: [
(
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,
recover_duration: 0.4,
movement: (
swing: Some(Forward(2.0)),
),
ori_modifier: 0.7,
),
(
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,
recover_duration: 0.4,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
(
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,
recover_duration: 0.4,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
),
],
energy_cost_per_strike: 0,
)

View File

@ -11,12 +11,12 @@ ComboMelee2(
range: 2.7, range: 2.7,
angle: 60.0, angle: 60.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.5,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.7, ori_modifier: 0.7,
), ),

View File

@ -11,12 +11,12 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.9, buildup_duration: 0.55,
swing_duration: 0.07, swing_duration: 0.35,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.7, ori_modifier: 0.7,
), ),
@ -32,9 +32,12 @@ ComboMelee2(
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.8,
swing_duration: 0.07, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
movement: (
swing: Some(Forward(0.2)),
),
ori_modifier: 0.7, ori_modifier: 0.7,
), ),
( (
@ -48,12 +51,12 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.9,
swing_duration: 0.07, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.4, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.7, ori_modifier: 0.7,
), ),

View File

@ -13,16 +13,16 @@ DashMelee(
poise: 35.0, poise: 35.0,
knockback: 14.0, knockback: 14.0,
energy_regen: 0.0, energy_regen: 0.0,
))), ))),
range: 2.5, range: 3.0,
angle: 45.0, angle: 45.0,
), ),
energy_drain: 0, energy_drain: 0,
forward_speed: 2.0, forward_speed: 2.0,
buildup_duration: 1.0, buildup_duration: 1.6,
charge_duration: 2.4, charge_duration: 2.4,
swing_duration: 0.1, swing_duration: 0.4,
recover_duration: 2.2, recover_duration: 1.2,
ori_modifier: 0.3, ori_modifier: 0.3,
charge_through: false, charge_through: false,
) )

View File

@ -8,17 +8,17 @@ ComboMelee2(
knockback: 4, knockback: 4,
energy_regen: 0, energy_regen: 0,
), ),
range: 2.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 1.3, buildup_duration: 0.85,
swing_duration: 0.1, swing_duration: 0.45,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.7, ori_modifier: 0.6,
), ),
( (
melee_constructor: ( melee_constructor: (
@ -31,14 +31,14 @@ ComboMelee2(
range: 2.5, range: 2.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.1,
swing_duration: 0.1, swing_duration: 0.35,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(0.5)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.7, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -1,18 +1,18 @@
BasicMelee( BasicMelee(
energy_cost: 0, energy_cost: 0,
buildup_duration: 0.55, buildup_duration: 0.7,
swing_duration: 0.3, swing_duration: 0.45,
hit_timing: 0.4, hit_timing: 0.4,
recover_duration: 0.85, recover_duration: 0.85,
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage:20.0, damage: 10.0,
poise: 28.0, poise: 14.0,
knockback: 25.0, knockback: 8.0,
energy_regen: 0.0, energy_regen: 0.0,
), ),
range: 0.8, range: 3.0,
angle: 50.0, angle: 50.0,
), ),
ori_modifier: 1.0, ori_modifier: 0.5,
) )

View File

@ -11,12 +11,12 @@ ComboMelee2(
range: 2.2, range: 2.2,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 1.3, buildup_duration: 0.7,
swing_duration: 0.1, swing_duration: 0.5,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.2)),
), ),
ori_modifier: 0.8, ori_modifier: 0.8,
), ),
@ -31,12 +31,12 @@ ComboMelee2(
range: 2.2, range: 2.2,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.85,
swing_duration: 0.1, swing_duration: 0.45,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(1.5)), swing: Some(Forward(0.4)),
), ),
ori_modifier: 0.8, ori_modifier: 0.8,
), ),

View File

@ -1,9 +1,9 @@
LeapMelee( LeapMelee(
energy_cost: 0, energy_cost: 0,
buildup_duration: 1.5, buildup_duration: 0.95,
movement_duration: 0.8, movement_duration: 0.8,
swing_duration: 0.075, swing_duration: 0.55,
recover_duration: 0.6, recover_duration: 0.4,
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 36.0, damage: 36.0,

View File

@ -1,8 +1,8 @@
LeapMelee( LeapMelee(
energy_cost: 0, energy_cost: 0,
buildup_duration: 0.8, buildup_duration: 0.5,
movement_duration: 0.6, movement_duration: 0.6,
swing_duration: 0.075, swing_duration: 0.3,
recover_duration: 0.25, recover_duration: 0.25,
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(

View File

@ -19,10 +19,10 @@ DashMelee(
), ),
energy_drain: 0, energy_drain: 0,
forward_speed: 1.8, forward_speed: 1.8,
buildup_duration: 1.5, buildup_duration: 0.85,
charge_duration: 1.2, charge_duration: 1.2,
swing_duration: 0.1, swing_duration: 0.65,
recover_duration: 2.0, recover_duration: 2.0,
ori_modifier: 0.3, ori_modifier: 0.1,
charge_through: false, charge_through: false,
) )

View File

@ -11,12 +11,12 @@ ComboMelee2(
range: 2.2, range: 2.2,
angle: 40.0, angle: 40.0,
), ),
buildup_duration: 1.2, buildup_duration: 0.75,
swing_duration: 0.15, swing_duration: 0.45,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.8,
movement: ( movement: (
swing: Some(Forward(0.3)), swing: Some(Forward(0.25)),
), ),
ori_modifier: 0.8, ori_modifier: 0.8,
), ),
@ -31,12 +31,12 @@ ComboMelee2(
range: 2.2, range: 2.2,
angle: 40.0, angle: 40.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.5,
swing_duration: 0.15, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(0.5)), swing: Some(Forward(0.35)),
), ),
ori_modifier: 0.8, ori_modifier: 0.8,
), ),
@ -51,12 +51,12 @@ ComboMelee2(
range: 2.2, range: 2.2,
angle: 40.0, angle: 40.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.15,
swing_duration: 0.15, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(0.5)), swing: Some(Forward(0.35)),
), ),
ori_modifier: 0.8, ori_modifier: 0.8,
), ),

View File

@ -1,18 +1,25 @@
BasicMelee( ComboMelee2(
energy_cost: 0, strikes: [
buildup_duration: 0.6, (
swing_duration: 0.15, melee_constructor: (
hit_timing: 0.5, kind: Bash(
recover_duration: 0.6, damage: 9,
melee_constructor: ( poise: 3,
kind: Bash( knockback: 1,
damage: 6, energy_regen: 0,
poise: 10, ),
knockback: 1, range: 1.5,
energy_regen: 0, angle: 50.0,
),
buildup_duration: 0.9,
swing_duration: 0.5,
hit_timing: 0.5,
recover_duration: 1.1,
movement: (
swing: Some(Forward(0.35)),
),
ori_modifier: 0.6,
), ),
range: 1.5, ],
angle: 50.0, energy_cost_per_strike: 0,
), )
ori_modifier: 0.7,
)

View File

@ -16,7 +16,7 @@ ComboMelee2(
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.3, recover_duration: 0.3,
movement: ( movement: (
swing: Some(Forward(0.25)), swing: Some(Forward(0.15)),
), ),
ori_modifier: 0.5, ori_modifier: 0.5,
), ),
@ -31,12 +31,12 @@ ComboMelee2(
range: 3.0, range: 3.0,
angle: 75.0, angle: 75.0,
), ),
buildup_duration: 0.2, buildup_duration: 0.5,
swing_duration: 0.07, swing_duration: 0.07,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
swing: Some(Forward(0.25)), swing: Some(Forward(0.15)),
), ),
ori_modifier: 0.5, ori_modifier: 0.5,
), ),

View File

@ -31,8 +31,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.1,
swing_duration: 0.1, swing_duration: 0.4,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.8,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -9,20 +9,20 @@ DashMelee(
), ),
scaled: Some(( scaled: Some((
kind: Bash( kind: Bash(
damage: 25.0, damage: 84.0,
poise: 0.0, poise: 0.0,
knockback: 17.0, knockback: 12.0,
energy_regen: 0.0, energy_regen: 0.0,
))), ))),
range: 4.0, range: 3.0,
angle: 45.0, angle: 45.0,
), ),
energy_drain: 0, energy_drain: 0,
forward_speed: 2.0, forward_speed: 2.0,
buildup_duration: 1.0, buildup_duration: 0.7,
charge_duration: 2.4, charge_duration: 2.4,
swing_duration: 0.1, swing_duration: 0.3,
recover_duration: 1.8, recover_duration: 0.7,
ori_modifier: 0.3, ori_modifier: 0.1,
charge_through: false, charge_through: false,
) )

View File

@ -3,22 +3,22 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 54, damage: 40,
poise: 40, poise: 40,
knockback: 4, knockback: 18,
energy_regen: 0, energy_regen: 0,
), ),
range: 7.5, range: 5.5,
angle: 60.0, angle: 60.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.5,
swing_duration: 0.15, swing_duration: 0.2,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.3,
movement: ( movement: (
swing: Some(Forward(3.0)), swing: Some(Forward(0.25)),
), ),
ori_modifier: 0.7, ori_modifier: 0.85,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -3,62 +3,62 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 40, damage: 32.5,
poise: 32.5, poise: 15,
knockback: 3, knockback: 5,
energy_regen: 0, energy_regen: 0,
), ),
range: 7.5, range: 5.0,
angle: 30.0, angle: 45.0,
), ),
buildup_duration: 1.3, buildup_duration: 0.8,
swing_duration: 0.15, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.5, recover_duration: 0.1,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.2)),
), ),
ori_modifier: 0.7, ori_modifier: 0.9,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Slash(
damage: 50, damage: 18,
poise: 32.5, poise: 10,
knockback: 3, knockback: 7.5,
energy_regen: 0, energy_regen: 0,
), ),
range: 5.5, range: 5.0,
angle: 30.0, angle: 45.0,
), ),
buildup_duration: 0.2, buildup_duration: 0.25,
swing_duration: 0.15, swing_duration: 0.2,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.3, recover_duration: 0.3,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.3)),
), ),
ori_modifier: 0.7, ori_modifier: 0.9,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 60, damage: 60,
poise: 32.5, poise: 22.5,
knockback: 25, knockback: 25,
energy_regen: 0, energy_regen: 0,
), ),
range: 5.5, range: 5.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.65,
swing_duration: 0.125, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 1.6, recover_duration: 1.1,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.7, ori_modifier: 0.9,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -5,18 +5,18 @@ ComboMelee2(
kind: Bash( kind: Bash(
damage: 22, damage: 22,
poise: 28, poise: 28,
knockback: 2, knockback: 5,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.0, range: 3.5,
angle: 15.0, angle: 45.0,
), ),
buildup_duration: 0.8, buildup_duration: 0.65,
swing_duration: 0.15, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.8, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(3.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.7, ori_modifier: 0.7,
), ),

View File

@ -2,8 +2,48 @@ ComboMelee2(
strikes: [ strikes: [
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Slash(
damage: 16.5, damage: 16.5,
poise: 10,
knockback: 3,
energy_regen: 0,
),
range: 3.0,
angle: 30.0,
),
buildup_duration: 0.7,
swing_duration: 0.4,
hit_timing: 0.5,
recover_duration: 0.2,
movement: (
swing: Some(Forward(0.2)),
),
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 12,
poise: 12,
knockback: 3,
energy_regen: 0,
),
range: 3.0,
angle: 30.0,
),
buildup_duration: 0.35,
swing_duration: 0.3,
hit_timing: 0.5,
recover_duration: 0.4,
movement: (
swing: Some(Forward(0.2)),
),
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Bash(
damage: 40.125,
poise: 20, poise: 20,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
@ -12,51 +52,11 @@ ComboMelee2(
angle: 15.0, angle: 15.0,
), ),
buildup_duration: 0.95, buildup_duration: 0.95,
swing_duration: 0.15, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.5, recover_duration: 1.3,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
),
ori_modifier: 0.6,
),
(
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,
recover_duration: 0.5,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.6,
),
(
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,
recover_duration: 1.25,
movement: (
swing: Some(Forward(1.0)),
), ),
ori_modifier: 0.6, ori_modifier: 0.6,
), ),

View File

@ -2,63 +2,63 @@ ComboMelee2(
strikes: [ strikes: [
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Slash(
damage: 30, damage: 5,
poise: 17.5, poise: 0,
knockback: 0,
energy_regen: 0,
),
range: 3.0,
angle: 60.0,
),
buildup_duration: 0.65,
swing_duration: 0.4,
hit_timing: 0.5,
recover_duration: 0.4,
movement: (
swing: Some(Forward(0.15)),
),
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 6,
poise: 0,
knockback: 3, knockback: 3,
energy_regen: 0, energy_regen: 0,
), ),
range: 4.5, range: 3.0,
angle: 30.0, angle: 45.0,
), ),
buildup_duration: 1.3, buildup_duration: 0.45,
swing_duration: 0.15, swing_duration: 0.6,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.5, recover_duration: 0.5,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.15)),
), ),
ori_modifier: 0.7, ori_modifier: 0.6,
), ),
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 30, damage: 14,
poise: 20.5, poise: 12,
knockback: 3, knockback: 12,
energy_regen: 0, energy_regen: 0,
), ),
range: 4.5, range: 4.5,
angle: 30.0, angle: 45.0,
), ),
buildup_duration: 0.2, buildup_duration: 0.775,
swing_duration: 0.15, swing_duration: 0.25,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.3, recover_duration: 0.4,
movement: ( movement: (
swing: Some(Forward(1.0)), swing: Some(Forward(0.1)),
), ),
ori_modifier: 0.7, ori_modifier: 0.6,
),
(
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,
recover_duration: 1.6,
movement: (
swing: Some(Forward(1.0)),
),
ori_modifier: 0.7,
), ),
], ],
energy_cost_per_strike: 0, energy_cost_per_strike: 0,

View File

@ -1,15 +1,15 @@
Shockwave( Shockwave(
energy_cost: 0.0, energy_cost: 0.0,
buildup_duration: 4.0, buildup_duration: 1.6,
swing_duration: 0.1, swing_duration: 0.1,
recover_duration: 0.1, recover_duration: 2.3,
damage: 15.0, damage: 8.0,
poise_damage: 0, poise_damage: 0,
knockback: ( strength: 5.0, direction: Away), knockback: ( strength: 5.0, direction: Away),
shockwave_angle: 360.0, shockwave_angle: 360.0,
shockwave_vertical_angle: 90.0, shockwave_vertical_angle: 90.0,
shockwave_speed: 20.0, shockwave_speed: 32.5,
shockwave_duration: 0.5, shockwave_duration: 0.4,
dodgeable: Jump, dodgeable: Jump,
move_efficiency: 0.1, move_efficiency: 0.1,
damage_kind: Crushing, damage_kind: Crushing,

View File

@ -1,6 +1,6 @@
BasicRanged( BasicRanged(
energy_cost: 0, energy_cost: 0,
buildup_duration: 0.1, buildup_duration: 1.2,
recover_duration: 0.5, recover_duration: 0.5,
projectile: Arrow( projectile: Arrow(
damage: 30.0, damage: 30.0,

View File

@ -31,8 +31,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.8, buildup_duration: 1.2,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (
@ -51,8 +51,8 @@ ComboMelee2(
range: 3.5, range: 3.5,
angle: 30.0, angle: 30.0,
), ),
buildup_duration: 0.4, buildup_duration: 0.9,
swing_duration: 0.1, swing_duration: 0.3,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.6, recover_duration: 0.6,
movement: ( movement: (

View File

@ -7,22 +7,22 @@ DiveMelee(
recover_duration: 0.3, recover_duration: 0.3,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 25, damage: 16,
poise: 40, poise: 40,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(( scaled: Some((
kind: Slash( kind: Slash(
damage: 10, damage: 8,
poise: 10, poise: 11,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
))), ))),
range: 2.0, range: 2.0,
angle: 45.0, angle: 45.0,
multi_target: Some(Normal), multi_target: Some(Normal),
damage_effect: Some(StunnedVulnerable(0.5)), damage_effect: Some(StunnedVulnerable(0.9)),
), ),
max_scaling: 3, max_scaling: 3,
meta: ( meta: (

View File

@ -4,21 +4,21 @@ ComboMelee2(
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 12, damage: 12,
poise: 50, poise: 19,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 1.5, range: 1.5,
angle: 45.0, angle: 45.0,
), ),
buildup_duration: 0.15, buildup_duration: 0.3,
swing_duration: 0.1, swing_duration: 0.15,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.1,
ori_modifier: 0.6, ori_modifier: 0.6,
), ),
], ],
energy_cost_per_strike: 5, energy_cost_per_strike: 9,
meta: ( meta: (
init_event: Some(EnterStance(Sword(Heavy))), init_event: Some(EnterStance(Sword(Heavy))),
), ),

View File

@ -4,13 +4,13 @@ ComboMelee2(
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 21, damage: 21,
poise: 30, poise: 22,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 4.0, range: 4.0,
angle: 90.0, angle: 90.0,
damage_effect: Some(StunnedVulnerable(0.8)), damage_effect: Some(StunnedVulnerable(0.7)),
), ),
buildup_duration: 0.3, buildup_duration: 0.3,
swing_duration: 0.2, swing_duration: 0.2,

View File

@ -2,10 +2,10 @@
( (
name: Automatic, name: Automatic,
body: RandomWith("bat"), body: RandomWith("bat"),
alignment: Alignment(Enemy), alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.bat"), loot: LootTable("common.loot_tables.creature.bat"),
inventory: ( inventory: (
loadout: FromBody, loadout: FromBody,
), ),
meta: [], meta: [],
) )

View File

@ -24,6 +24,21 @@
Simple( Simple(
"common.items.npc_armor.quadruped_low.shell", "common.items.npc_armor.quadruped_low.shell",
): "common-items-npc_armor-quadruped_low-shell", ): "common-items-npc_armor-quadruped_low-shell",
Simple(
"common.items.npc_armor.quadruped_low.basilisk",
): "common-items-npc_armor-quadruped_low-basilisk",
Simple(
"common.items.npc_armor.quadruped_low.crocodylia",
): "common-items-npc_armor-quadruped_low-crocodylia",
Simple(
"common.items.npc_armor.quadruped_low.drake",
): "common-items-npc_armor-quadruped_low-drake",
Simple(
"common.items.npc_armor.quadruped_low.sandshark",
): "common-items-npc_armor-quadruped_low-sandshark",
Simple(
"common.items.npc_armor.quadruped_low.snapper",
): "common-items-npc_armor-quadruped_low-snapper",
Simple( Simple(
"common.items.npc_armor.bird_large.phoenix", "common.items.npc_armor.bird_large.phoenix",
): "common-items-npc_armor-bird_large-phoenix", ): "common-items-npc_armor-bird_large-phoenix",
@ -519,6 +534,12 @@
Simple( Simple(
"common.items.npc_armor.arthropod.generic", "common.items.npc_armor.arthropod.generic",
): "common-items-npc_armor-arthropod-generic", ): "common-items-npc_armor-arthropod-generic",
Simple(
"common.items.npc_armor.arthropod.leafbeetle",
): "common-items-npc_armor-arthropod-leafbeetle",
Simple(
"common.items.npc_armor.arthropod.weevil",
): "common-items-npc_armor-arthropod-weevil",
Simple( Simple(
"common.items.npc_armor.quadruped_medium.frostfang", "common.items.npc_armor.quadruped_medium.frostfang",
): "common-items-npc_armor-quadruped_medium-frostfang", ): "common-items-npc_armor-quadruped_medium-frostfang",
@ -528,9 +549,42 @@
Simple( Simple(
"common.items.npc_armor.quadruped_medium.claysteed", "common.items.npc_armor.quadruped_medium.claysteed",
): "common-items-npc_armor-quadruped_medium-claysteed", ): "common-items-npc_armor-quadruped_medium-claysteed",
Simple(
"common.items.npc_armor.quadruped_medium.bonerattler",
): "common-items-npc_armor-quadruped_medium-bonerattler",
Simple(
"common.items.npc_armor.quadruped_medium.broad",
): "common-items-npc_armor-quadruped_medium-broad",
Simple(
"common.items.npc_armor.quadruped_medium.catoblepas",
): "common-items-npc_armor-quadruped_medium-catoblepas",
Simple(
"common.items.npc_armor.quadruped_medium.dreadhorn",
): "common-items-npc_armor-quadruped_medium-dreadhorn",
Simple(
"common.items.npc_armor.quadruped_medium.equus",
): "common-items-npc_armor-quadruped_medium-equus",
Simple(
"common.items.npc_armor.quadruped_medium.hirdrasil",
): "common-items-npc_armor-quadruped_medium-hirdrasil",
Simple(
"common.items.npc_armor.quadruped_small.boar",
): "common-items-npc_armor-quadruped_small-boar",
Simple(
"common.items.npc_armor.quadruped_small.hyena",
): "common-items-npc_armor-quadruped_small-hyena",
Simple(
"common.items.npc_armor.quadruped_small.mossysnail",
): "common-items-npc_armor-quadruped_small-mossysnail",
Simple( Simple(
"common.items.npc_armor.theropod.rugged", "common.items.npc_armor.theropod.rugged",
): "common-items-npc_armor-theropod-rugged", ): "common-items-npc_armor-theropod-rugged",
Simple(
"common.items.npc_armor.theropod.raptor",
): "common-items-npc_armor-theropod-raptor",
Simple(
"common.items.npc_armor.theropod.yale",
): "common-items-npc_armor-theropod-yale",
Simple( Simple(
"common.items.npc_armor.back.backpack_blue", "common.items.npc_armor.back.backpack_blue",
): "armor-misc-back-backpack", ): "armor-misc-back-backpack",
@ -2406,12 +2460,6 @@
Simple( Simple(
"common.items.npc_weapons.unique.akhlut", "common.items.npc_weapons.unique.akhlut",
): "common-items-npc_weapons-unique-akhlut", ): "common-items-npc_weapons-unique-akhlut",
Simple(
"common.items.npc_weapons.unique.asp",
): "common-items-npc_weapons-unique-asp",
Simple(
"common.items.npc_weapons.unique.basilisk",
): "common-items-npc_weapons-unique-basilisk",
Simple( Simple(
"common.items.npc_weapons.unique.beast_claws", "common.items.npc_weapons.unique.beast_claws",
): "common-items-npc_weapons-unique-beast_claws", ): "common-items-npc_weapons-unique-beast_claws",
@ -2451,9 +2499,6 @@
Simple( Simple(
"common.items.npc_weapons.unique.dagon", "common.items.npc_weapons.unique.dagon",
): "common-items-npc_weapons-unique-dagon", ): "common-items-npc_weapons-unique-dagon",
Simple(
"common.items.npc_weapons.unique.deadwood",
): "common-items-npc_weapons-unique-deadwood",
Simple( Simple(
"common.items.npc_weapons.unique.driggle", "common.items.npc_weapons.unique.driggle",
): "common-items-npc_weapons-unique-driggle", ): "common-items-npc_weapons-unique-driggle",
@ -2490,21 +2535,75 @@
Simple( Simple(
"common.items.npc_weapons.unique.husk_brute", "common.items.npc_weapons.unique.husk_brute",
): "common-items-npc_weapons-unique-husk_brute", ): "common-items-npc_weapons-unique-husk_brute",
Simple(
"common.items.npc_weapons.unique.icedrake",
): "common-items-npc_weapons-unique-icedrake",
Simple( Simple(
"common.items.npc_weapons.unique.irrwurz", "common.items.npc_weapons.unique.irrwurz",
): "common-items-npc_weapons-unique-irrwurz", ): "common-items-npc_weapons-unique-irrwurz",
Simple(
"common.items.npc_weapons.unique.maneater",
): "common-items-npc_weapons-unique-maneater",
Simple( Simple(
"common.items.npc_weapons.unique.mossysnail", "common.items.npc_weapons.unique.mossysnail",
): "common-items-npc_weapons-unique-mossysnail", ): "common-items-npc_weapons-unique-mossysnail",
Simple( Simple(
"common.items.npc_weapons.unique.organ", "common.items.npc_weapons.unique.organ",
): "common-items-npc_weapons-unique-organ", ): "common-items-npc_weapons-unique-organ",
Simple(
"common.items.npc_weapons.unique.quadruped_low.hakulaq",
): "common-items-npc_weapons-unique-quadruped_low-hakulaq",
Simple(
"common.items.npc_weapons.unique.quadruped_low.tortoise",
): "common-items-npc_weapons-unique-quadruped_low-tortoise",
Simple(
"common.items.npc_weapons.unique.quadruped_medium.alpaca",
): "common-items-npc_weapons-unique-quadruped_medium-alpaca",
Simple(
"common.items.npc_weapons.unique.quadruped_medium.antelope",
): "common-items-npc_weapons-unique-quadruped_medium-antelope",
Simple(
"common.items.npc_weapons.unique.quadruped_medium.donkey",
): "common-items-npc_weapons-unique-quadruped_medium-donkey",
Simple(
"common.items.npc_weapons.unique.quadruped_medium.grolgar",
): "common-items-npc_weapons-unique-quadruped_medium-grolgar",
Simple(
"common.items.npc_weapons.unique.quadruped_medium.horse",
): "common-items-npc_weapons-unique-quadruped_medium-horse",
Simple(
"common.items.npc_weapons.unique.quadruped_medium.moose",
): "common-items-npc_weapons-unique-quadruped_medium-moose",
Simple(
"common.items.npc_weapons.unique.quadruped_medium.mouflon",
): "common-items-npc_weapons-unique-quadruped_medium-mouflon",
Simple(
"common.items.npc_weapons.unique.quadruped_low.asp",
): "common-items-npc_weapons-unique-quadruped_low-asp",
Simple(
"common.items.npc_weapons.unique.quadruped_low.basilisk",
): "common-items-npc_weapons-unique-quadruped_low-basilisk",
Simple(
"common.items.npc_weapons.unique.quadruped_low.deadwood",
): "common-items-npc_weapons-unique-quadruped_low-deadwood",
Simple(
"common.items.npc_weapons.unique.quadruped_low.icedrake",
): "common-items-npc_weapons-unique-quadruped_low-icedrake",
Simple(
"common.items.npc_weapons.unique.quadruped_low.lavadrake",
): "common-items-npc_weapons-unique-quadruped_low-lavadrake",
Simple(
"common.items.npc_weapons.unique.quadruped_low.maneater",
): "common-items-npc_weapons-unique-quadruped_low-maneater",
Simple(
"common.items.npc_weapons.unique.quadruped_small.boar",
): "common-items-npc_weapons-unique-quadruped_small-boar",
Simple(
"common.items.npc_weapons.unique.quadruped_small.hyena",
): "common-items-npc_weapons-unique-quadruped_small-hyena",
Simple(
"common.items.npc_weapons.unique.quadruped_small.rodent",
): "common-items-npc_weapons-unique-quadruped_small-rodent",
Simple(
"common.items.npc_weapons.unique.theropod.yale",
): "common-items-npc_weapons-unique-theropod-yale",
Simple(
"common.items.npc_weapons.unique.theropod",
): "common-items-npc_weapons-unique-theropod",
Simple( Simple(
"common.items.npc_weapons.unique.quadlowbasic", "common.items.npc_weapons.unique.quadlowbasic",
): "common-items-npc_weapons-unique-quadlowbasic", ): "common-items-npc_weapons-unique-quadlowbasic",
@ -2622,6 +2721,9 @@
Simple( Simple(
"common.items.npc_weapons.unique.arthropods.leafbeetle", "common.items.npc_weapons.unique.arthropods.leafbeetle",
): "common-items-npc_weapons-unique-arthropods-leafbeetle", ): "common-items-npc_weapons-unique-arthropods-leafbeetle",
Simple(
"common.items.npc_weapons.unique.arthropods.moltencrawler",
): "common-items-npc_weapons-unique-arthropods-moltencrawler",
Simple( Simple(
"common.items.npc_weapons.unique.arthropods.mosscrawler", "common.items.npc_weapons.unique.arthropods.mosscrawler",
): "common-items-npc_weapons-unique-arthropods-mosscrawler", ): "common-items-npc_weapons-unique-arthropods-mosscrawler",

View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor(( kind: Armor((
kind: Chest, kind: Chest,
stats: Direct(( stats: Direct((
protection: Some(Normal(60.0)), protection: Some(Normal(83.0)),
poise_resilience: Some(Normal(1.0)), poise_resilience: Some(Normal(20.0)),
)), )),
)), )),
quality: Legendary, quality: Legendary,

View File

@ -0,0 +1,13 @@
ItemDef(
legacy_name: "Leafbeetle Armor",
legacy_description: "Worn by arthropods.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(62.0)),
poise_resilience: Some(Normal(10.0)),
)),
)),
quality: Common,
tags: [],
)

View File

@ -0,0 +1,13 @@
ItemDef(
legacy_name: "Weevil Armor",
legacy_description: "Worn by arthropods.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(40.0)),
poise_resilience: Some(Normal(5.0)),
)),
)),
quality: Common,
tags: [],
)

View File

@ -0,0 +1,13 @@
ItemDef(
legacy_name: "Basilisk Armor",
legacy_description: "Made up of heavy and thick plates.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(52.0)),
poise_resilience: Some(Normal(30.0)),
)),
)),
quality: Epic,
tags: [],
)

View File

@ -0,0 +1,13 @@
ItemDef(
legacy_name: "Crocodylia Armor",
legacy_description: "Scaly.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(36.0)),
poise_resilience: Some(Normal(15.0)),
)),
)),
quality: Moderate,
tags: [],
)

View File

@ -0,0 +1,13 @@
ItemDef(
legacy_name: "Drake Armor",
legacy_description: "Adaptive to temperature.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(111.0)),
poise_resilience: Some(Normal(20.0)),
)),
)),
quality: High,
tags: [],
)

View File

@ -0,0 +1,13 @@
ItemDef(
legacy_name: "Sand Shark Armor",
legacy_description: "How is it on land?",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(44.0)),
poise_resilience: Some(Normal(20.0)),
)),
)),
quality: High,
tags: [],
)

View File

@ -4,8 +4,8 @@ ItemDef(
kind: Armor(( kind: Armor((
kind: Chest, kind: Chest,
stats: Direct(( stats: Direct((
protection: Some(Normal(320.0)), protection: Some(Normal(260.0)),
poise_resilience: Some(Normal(0.0)), poise_resilience: Some(Normal(25.0)),
)), )),
)), )),
quality: Moderate, quality: Moderate,

View File

@ -0,0 +1,13 @@
ItemDef(
legacy_name: "Snapper Shell",
legacy_description: "'Tis but a shell.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(126.0)),
poise_resilience: Some(Normal(40.0)),
)),
)),
quality: High,
tags: [],
)

View File

@ -0,0 +1,13 @@
ItemDef(
legacy_name: "Bonerattler Armor",
legacy_description: "Made out of its prey's bones to protect its supple hide.",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(80.0)),
poise_resilience: Some(Normal(10.0)),
)),
)),
quality: Moderate,
tags: [],
)

View File

@ -0,0 +1,14 @@
ItemDef(
legacy_name: "Quadruped Medium Generalised Armor",
legacy_description: "testing123",
kind: Armor((
kind: Chest,
stats: Direct((
protection: Some(Normal(48.0)),
poise_resilience: Some(Normal(15.0)),
energy_max: Some(10),
)),
)),
quality: Moderate,
tags: [],
)

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