diff --git a/CHANGELOG.md b/CHANGELOG.md index 730672dbeb..f13c959fab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. - 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 +- 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 - Medium and large potions from all loot tables diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index a9cca9666d..a532cb57aa 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -464,7 +464,7 @@ ), Custom("Quad Low Tail"): ( 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: [], ), Custom("Quad Low Quick"): ( @@ -496,7 +496,7 @@ ), Custom("Mossy Snail"): ( 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: [], ), Custom("Treant Sapling"): ( @@ -563,6 +563,13 @@ 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"): ( primary: Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"), secondary: Simple(None, "common.abilities.custom.arthropods.dagonite.leapshockwave"), diff --git a/assets/common/abilities/adlet/elder/triplestrike.ron b/assets/common/abilities/adlet/elder/triplestrike.ron index 5a3248f632..37f941caa0 100644 --- a/assets/common/abilities/adlet/elder/triplestrike.ron +++ b/assets/common/abilities/adlet/elder/triplestrike.ron @@ -11,8 +11,8 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.9, - swing_duration: 0.07, + buildup_duration: 0.65, + swing_duration: 0.25, hit_timing: 0.5, recover_duration: 0.4, movement: ( @@ -31,8 +31,8 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.6, - swing_duration: 0.07, + buildup_duration: 0.75, + swing_duration: 0.25, hit_timing: 0.5, recover_duration: 0.4, ori_modifier: 0.7, @@ -48,8 +48,8 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.07, + buildup_duration: 0.65, + swing_duration: 0.15, hit_timing: 0.5, recover_duration: 0.4, movement: ( diff --git a/assets/common/abilities/custom/arthropods/antlion/charge.ron b/assets/common/abilities/custom/arthropods/antlion/charge.ron index 3f851fcaf5..9086964ae0 100644 --- a/assets/common/abilities/custom/arthropods/antlion/charge.ron +++ b/assets/common/abilities/custom/arthropods/antlion/charge.ron @@ -2,26 +2,26 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Stab( - damage: 30.0, + damage: 15.0, poise: 20.0, knockback: 10.0, energy_regen: 0.0, ), scaled: Some(( kind: Stab( - damage: 120.0, + damage: 60.0, poise: 45.0, knockback: 25.0, energy_regen: 0.0, - ))), + ))), range: 5.0, angle: 90.0, ), energy_drain: 0, - forward_speed: 3.0, - buildup_duration: 0.6, - charge_duration: 8.0, - swing_duration: 0.1, + forward_speed: 5.0, + buildup_duration: 0.45, + charge_duration: 2.5, + swing_duration: 0.25, recover_duration: 0.8, ori_modifier: 0.1, charge_through: false, diff --git a/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron b/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron index 9a7d5d8d98..9795c75f81 100644 --- a/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/antlion/singlestrike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 74, + damage: 39, poise: 27.5, knockback: 9, energy_regen: 0, @@ -17,10 +17,10 @@ ComboMelee2( chance: 0.6, ))), ), - buildup_duration: 1.4, - swing_duration: 0.1, + buildup_duration: 0.65, + swing_duration: 0.15, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 0.5, movement: ( swing: Some(Forward(1.0)), ), diff --git a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron index 65418ddfd1..79d4043581 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/poisonball.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 1.2, recover_duration: 0.7, projectile: Poisonball( - damage: 70.0, + damage: 58.0, radius: 3.5, energy_regen: 0, min_falloff: 0.2, diff --git a/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron b/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron index d13f5f7b05..efc1f1954d 100644 --- a/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/blackwidow/singlestrike.ron @@ -17,12 +17,12 @@ ComboMelee2( chance: 0.4, ))), ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.55, + swing_duration: 0.35, hit_timing: 0.5, recover_duration: 0.8, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.8, ), diff --git a/assets/common/abilities/custom/arthropods/crawler/harden.ron b/assets/common/abilities/custom/arthropods/crawler/harden.ron new file mode 100644 index 0000000000..baa4404b3e --- /dev/null +++ b/assets/common/abilities/custom/arthropods/crawler/harden.ron @@ -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, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/arthropods/crawler/singlestrike.ron b/assets/common/abilities/custom/arthropods/crawler/singlestrike.ron new file mode 100644 index 0000000000..28e0b8e124 --- /dev/null +++ b/assets/common/abilities/custom/arthropods/crawler/singlestrike.ron @@ -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, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/arthropods/crawler/threadshot.ron b/assets/common/abilities/custom/arthropods/crawler/threadshot.ron new file mode 100644 index 0000000000..0693ec1a35 --- /dev/null +++ b/assets/common/abilities/custom/arthropods/crawler/threadshot.ron @@ -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, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/arthropods/hornbeetle/harden.ron b/assets/common/abilities/custom/arthropods/hornbeetle/harden.ron index f3c4b944bf..6076d1d300 100644 --- a/assets/common/abilities/custom/arthropods/hornbeetle/harden.ron +++ b/assets/common/abilities/custom/arthropods/hornbeetle/harden.ron @@ -1,9 +1,9 @@ SelfBuff( - buildup_duration: 0.4, - cast_duration: 0.8, - recover_duration: 0.3, + buildup_duration: 1.1, + cast_duration: 0.4, + recover_duration: 0.7, buff_kind: ProtectingWard, - buff_strength: 1.5, - buff_duration: Some(10.0), + buff_strength: 0.32, + buff_duration: Some(6.0), energy_cost: 0, ) \ No newline at end of file diff --git a/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron b/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron index b4f5d192a9..bad16b993b 100644 --- a/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron +++ b/assets/common/abilities/custom/arthropods/hornbeetle/leap.ron @@ -1,18 +1,18 @@ LeapMelee( energy_cost: 0, - buildup_duration: 1.0, + buildup_duration: 0.65, movement_duration: 0.8, - swing_duration: 0.075, - recover_duration: 0.4, + swing_duration: 0.35, + recover_duration: 0.6, melee_constructor: ( kind: Bash( - damage: 60.0, + damage: 52.0, poise: 20.0, - knockback: 4.0, + knockback: 8.0, energy_regen: 0.0, ), range: 4.5, - angle: 180.0, + angle: 135.0, multi_target: Some(Normal), ), forward_leap_strength: 40.0, diff --git a/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron b/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron index d50bdaa969..fb438d4501 100644 --- a/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/hornbeetle/singlestrike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 54, + damage: 43, poise: 20, knockback: 5, energy_regen: 0, @@ -11,14 +11,14 @@ ComboMelee2( range: 3.0, angle: 60.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.7, + swing_duration: 0.2, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 0.6, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), - ori_modifier: 0.5, + ori_modifier: 0.8, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/arthropods/tarantula/leap.ron b/assets/common/abilities/custom/arthropods/tarantula/leap.ron index 10bb730809..f61b9cba9c 100644 --- a/assets/common/abilities/custom/arthropods/tarantula/leap.ron +++ b/assets/common/abilities/custom/arthropods/tarantula/leap.ron @@ -1,12 +1,12 @@ LeapMelee( energy_cost: 0, - buildup_duration: 1.0, + buildup_duration: 0.65, movement_duration: 0.8, - swing_duration: 0.075, + swing_duration: 0.35, recover_duration: 0.4, melee_constructor: ( kind: Bash( - damage: 70.0, + damage: 49.0, poise: 30.0, knockback: 1.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron b/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron index 9038d0709e..a51dc1ba47 100644 --- a/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/tarantula/singlestrike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Stab( - damage: 60, + damage: 36, poise: 21, knockback: 3, energy_regen: 0, @@ -17,12 +17,12 @@ ComboMelee2( chance: 0.8, ))), ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.6, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.8, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.8, ), diff --git a/assets/common/abilities/custom/arthropods/weevil/harden.ron b/assets/common/abilities/custom/arthropods/weevil/harden.ron index 0f75717333..cdc516d0ce 100644 --- a/assets/common/abilities/custom/arthropods/weevil/harden.ron +++ b/assets/common/abilities/custom/arthropods/weevil/harden.ron @@ -3,7 +3,7 @@ SelfBuff( cast_duration: 0.8, recover_duration: 0.3, buff_kind: ProtectingWard, - buff_strength: 1.2, + buff_strength: 0.3, buff_duration: Some(10.0), energy_cost: 0, ) \ No newline at end of file diff --git a/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron b/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron index a53e224097..fda7b232e7 100644 --- a/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron +++ b/assets/common/abilities/custom/arthropods/weevil/singlestrike.ron @@ -3,20 +3,20 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 44, - poise: 14, + damage: 9.5, + poise: 12, knockback: 3, energy_regen: 0, ), range: 3.0, angle: 60.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.55, + swing_duration: 0.35, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 1.1, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.6, ), diff --git a/assets/common/abilities/custom/arthropods/weevil/threadshot.ron b/assets/common/abilities/custom/arthropods/weevil/threadshot.ron index df2e9ee30e..d0a782c540 100644 --- a/assets/common/abilities/custom/arthropods/weevil/threadshot.ron +++ b/assets/common/abilities/custom/arthropods/weevil/threadshot.ron @@ -1,19 +1,15 @@ -BasicBeam( - buildup_duration: 0.4, - recover_duration: 0.4, - beam_duration: 1.0, - damage: 1.2, - tick_rate: 15.0, - range: 30.0, - max_angle: 1.0, - damage_effect: Some(Buff(( - kind: Frozen, - dur_secs: 4.0, - strength: DamageFraction(1.0), - chance: 1.0, - ))), - energy_regen: 0.0, - energy_drain: 0, - ori_rate: 0.95, - specifier: WebStrand, +BasicRanged( + energy_cost: 0, + buildup_duration: 0.6, + recover_duration: 0.9, + projectile: Pebble( + damage: 8, + knockback: 2, + ), + projectile_body: Object(Pebble), + projectile_light: None, + projectile_speed: 70.0, + num_projectiles: 1, + projectile_spread: 0.0, + move_efficiency: 0.3, ) \ No newline at end of file diff --git a/assets/common/abilities/custom/asp/singlestrike.ron b/assets/common/abilities/custom/asp/singlestrike.ron index 99b8bd3a64..add4e4a4e2 100644 --- a/assets/common/abilities/custom/asp/singlestrike.ron +++ b/assets/common/abilities/custom/asp/singlestrike.ron @@ -2,23 +2,23 @@ ComboMelee2( strikes: [ ( melee_constructor: ( - kind: Bash( - damage: 28, - poise: 28, + kind: Stab( + damage: 31, + poise: 10, knockback: 3, energy_regen: 0, ), - range: 3.5, - angle: 60.0, + range: 4.0, + angle: 30.0, ), - buildup_duration: 1.2, - swing_duration: 0.1, + buildup_duration: 0.9, + swing_duration: 0.5, hit_timing: 0.5, recover_duration: 0.4, movement: ( - swing: Some(Forward(2.0)), + swing: Some(Forward(0.1)), ), - ori_modifier: 0.65, + ori_modifier: 0.55, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/basilisk/dash.ron b/assets/common/abilities/custom/basilisk/dash.ron index aa44de03b6..6a6f37717b 100644 --- a/assets/common/abilities/custom/basilisk/dash.ron +++ b/assets/common/abilities/custom/basilisk/dash.ron @@ -18,11 +18,11 @@ DashMelee( angle: 45.0, ), energy_drain: 0, - forward_speed: 4.0, - buildup_duration: 1.6, + forward_speed: 2.0, + buildup_duration: 1.3, charge_duration: 2.0, - swing_duration: 0.1, + swing_duration: 0.3, recover_duration: 2.0, - ori_modifier: 0.3, + ori_modifier: 0.1, charge_through: false, ) diff --git a/assets/common/abilities/custom/basilisk/triplestrike.ron b/assets/common/abilities/custom/basilisk/triplestrike.ron index 4e5e5c1d90..61174ef4cf 100644 --- a/assets/common/abilities/custom/basilisk/triplestrike.ron +++ b/assets/common/abilities/custom/basilisk/triplestrike.ron @@ -3,62 +3,42 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 36, + damage: 72, poise: 15, knockback: 3, energy_regen: 0, ), range: 2.8, - angle: 30.0, + angle: 90.0, ), - buildup_duration: 1.4, - swing_duration: 0.07, + buildup_duration: 1.15, + swing_duration: 0.25, hit_timing: 0.5, - recover_duration: 0.3, + recover_duration: 0.4, movement: ( - swing: Some(Forward(2.0)), + swing: Some(Forward(0.25)), ), ori_modifier: 0.65, ), ( melee_constructor: ( - kind: Bash( - damage: 36, + kind: Slash( + damage: 39, poise: 18, - knockback: 3, + knockback: 24, energy_regen: 0, ), - range: 2.8, + range: 3.2, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.07, + buildup_duration: 0.55, + swing_duration: 0.25, hit_timing: 0.5, - recover_duration: 0.3, + recover_duration: 0.8, movement: ( - swing: Some(Forward(1.5)), + swing: Some(Forward(0.45)), ), - ori_modifier: 0.65, - ), - ( - 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, + ori_modifier: 0.85, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/birdlargebasic/triplestrike.ron b/assets/common/abilities/custom/birdlargebasic/triplestrike.ron index ca0ffd6eec..6c34dce179 100644 --- a/assets/common/abilities/custom/birdlargebasic/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargebasic/triplestrike.ron @@ -31,8 +31,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.05, + swing_duration: 0.45, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 1.3, - swing_duration: 0.1, + buildup_duration: 1.4, + swing_duration: 0.6, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron b/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron index 03bf0f68b4..3b8bb572d8 100644 --- a/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargebreathe/triplestrike.ron @@ -31,8 +31,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.15, + swing_duration: 0.35, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.1, + buildup_duration: 0.8, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/custom/birdlargefire/triplestrike.ron b/assets/common/abilities/custom/birdlargefire/triplestrike.ron index 03bf0f68b4..6059d51424 100644 --- a/assets/common/abilities/custom/birdlargefire/triplestrike.ron +++ b/assets/common/abilities/custom/birdlargefire/triplestrike.ron @@ -31,8 +31,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.2, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.1, + buildup_duration: 0.8, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/custom/bushly/dash.ron b/assets/common/abilities/custom/bushly/dash.ron index 296c972763..67d9abc41f 100644 --- a/assets/common/abilities/custom/bushly/dash.ron +++ b/assets/common/abilities/custom/bushly/dash.ron @@ -9,7 +9,7 @@ DashMelee( ), scaled: Some(( kind: Bash( - damage: 6.0, + damage: 9.0, poise: 20.0, knockback: 6.0, energy_regen: 0.0, diff --git a/assets/common/abilities/custom/bushly/singlestrike.ron b/assets/common/abilities/custom/bushly/singlestrike.ron index 7dfb07bee7..043d8e32ef 100644 --- a/assets/common/abilities/custom/bushly/singlestrike.ron +++ b/assets/common/abilities/custom/bushly/singlestrike.ron @@ -3,16 +3,16 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 1, + damage: 5.5, poise: 0, knockback: 0, energy_regen: 0, ), - range: 2.5, + range: 3.0, angle: 150.0, ), - buildup_duration: 0.6, - swing_duration: 0.5, + buildup_duration: 0.9, + swing_duration: 0.7, hit_timing: 0.5, recover_duration: 0.8, movement: ( diff --git a/assets/common/abilities/custom/cloudwyvern/triplestrike.ron b/assets/common/abilities/custom/cloudwyvern/triplestrike.ron index 03bf0f68b4..6059d51424 100644 --- a/assets/common/abilities/custom/cloudwyvern/triplestrike.ron +++ b/assets/common/abilities/custom/cloudwyvern/triplestrike.ron @@ -31,8 +31,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.2, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.1, + buildup_duration: 0.8, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/custom/crab/triplestrike.ron b/assets/common/abilities/custom/crab/triplestrike.ron index 4a026a239b..d231d48ae6 100644 --- a/assets/common/abilities/custom/crab/triplestrike.ron +++ b/assets/common/abilities/custom/crab/triplestrike.ron @@ -11,8 +11,8 @@ ComboMelee2( range: 1.1, angle: 30.0, ), - buildup_duration: 1.3, - swing_duration: 0.07, + buildup_duration: 0.9, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -31,8 +31,8 @@ ComboMelee2( range: 1.1, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.07, + buildup_duration: 1.05, + swing_duration: 0.35, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 1.1, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.07, + buildup_duration: 1.05, + swing_duration: 0.35, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/custom/cyclops/doublestrike.ron b/assets/common/abilities/custom/cyclops/doublestrike.ron index fd1121ab4d..f026ad27fe 100644 --- a/assets/common/abilities/custom/cyclops/doublestrike.ron +++ b/assets/common/abilities/custom/cyclops/doublestrike.ron @@ -37,8 +37,8 @@ ComboMelee2( chance: 1.0, ))), ), - buildup_duration: 0.6, - swing_duration: 0.6, + buildup_duration: 0.8, + swing_duration: 0.8, hit_timing: 0.3, recover_duration: 1.2, movement: ( diff --git a/assets/common/abilities/custom/deadwood/dash.ron b/assets/common/abilities/custom/deadwood/dash.ron index 3c44cf19ba..b7ae85a89d 100644 --- a/assets/common/abilities/custom/deadwood/dash.ron +++ b/assets/common/abilities/custom/deadwood/dash.ron @@ -19,9 +19,9 @@ DashMelee( ), energy_drain: 0, forward_speed: 3, - buildup_duration: 1.0, + buildup_duration: 0.65, charge_duration: 2.0, - swing_duration: 0.1, + swing_duration: 0.35, recover_duration: 2.0, ori_modifier: 0.1, charge_through: true, diff --git a/assets/common/abilities/custom/deadwood/lifestealbeam.ron b/assets/common/abilities/custom/deadwood/lifestealbeam.ron index 32f44e4c63..8e1ce81ce8 100644 --- a/assets/common/abilities/custom/deadwood/lifestealbeam.ron +++ b/assets/common/abilities/custom/deadwood/lifestealbeam.ron @@ -2,7 +2,7 @@ BasicBeam( buildup_duration: 0.5, recover_duration: 0.5, beam_duration: 1, - damage: 6.0, + damage: 9.0, tick_rate: 2.0, range: 25.0, max_angle: 1.0, diff --git a/assets/common/abilities/custom/driggle/bite.ron b/assets/common/abilities/custom/driggle/bite.ron index 84c1e42d19..f9f15e7d30 100644 --- a/assets/common/abilities/custom/driggle/bite.ron +++ b/assets/common/abilities/custom/driggle/bite.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 4.0, + damage: 6.0, poise: 5, knockback: 3.0, energy_regen: 0, @@ -11,10 +11,10 @@ ComboMelee2( range: 2.5, angle: 40.0, ), - buildup_duration: 0.3, - swing_duration: 0.2, - hit_timing: 0.4, - recover_duration: 0.3, + buildup_duration: 0.6, + swing_duration: 0.3, + hit_timing: 0.6, + recover_duration: 0.7, movement: ( swing: Some(Forward(0.5)), ), diff --git a/assets/common/abilities/custom/driggle/flamethrower.ron b/assets/common/abilities/custom/driggle/flamethrower.ron index 397f85714c..e2911a5ae7 100644 --- a/assets/common/abilities/custom/driggle/flamethrower.ron +++ b/assets/common/abilities/custom/driggle/flamethrower.ron @@ -8,8 +8,8 @@ BasicBeam( max_angle: 25.0, damage_effect: Some(Buff(( kind: Burning, - dur_secs: 4.0, - strength: DamageFraction(0.1), + dur_secs: 8.0, + strength: Value(0.4), chance: 0.25, ))), energy_regen: 0, diff --git a/assets/common/abilities/custom/dullahan/melee.ron b/assets/common/abilities/custom/dullahan/melee.ron index 3aee8dddf7..21043c2fdd 100644 --- a/assets/common/abilities/custom/dullahan/melee.ron +++ b/assets/common/abilities/custom/dullahan/melee.ron @@ -17,8 +17,8 @@ ComboMelee2( chance: 0.3, ))), ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.7, + swing_duration: 0.2, hit_timing: 0.4, recover_duration: 0.3, movement: ( @@ -43,8 +43,8 @@ ComboMelee2( chance: 0.15, ))), ), - buildup_duration: 0.7, - swing_duration: 0.1, + buildup_duration: 0.95, + swing_duration: 0.15, hit_timing: 0.4, recover_duration: 1.3, movement: ( diff --git a/assets/common/abilities/custom/emberfly/leap.ron b/assets/common/abilities/custom/emberfly/leap.ron index 405ead3587..84d217e467 100644 --- a/assets/common/abilities/custom/emberfly/leap.ron +++ b/assets/common/abilities/custom/emberfly/leap.ron @@ -6,8 +6,8 @@ LeapMelee( recover_duration: 0.4, melee_constructor: ( kind: Bash( - damage: 6.0, - poise: 20.0, + damage: 3.5, + poise: 2.0, knockback: 5.0, energy_regen: 0.0, ), diff --git a/assets/common/abilities/custom/flamewyvern/triplestrike.ron b/assets/common/abilities/custom/flamewyvern/triplestrike.ron index 03bf0f68b4..eb9088909f 100644 --- a/assets/common/abilities/custom/flamewyvern/triplestrike.ron +++ b/assets/common/abilities/custom/flamewyvern/triplestrike.ron @@ -31,8 +31,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.2, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.1, + buildup_duration: 0.9, + swing_duration: 0.2, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/custom/frostfang/singlestrike.ron b/assets/common/abilities/custom/frostfang/singlestrike.ron index 3f926554d9..213f2a1584 100644 --- a/assets/common/abilities/custom/frostfang/singlestrike.ron +++ b/assets/common/abilities/custom/frostfang/singlestrike.ron @@ -22,7 +22,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.8, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.3)), ), ori_modifier: 0.6, ), diff --git a/assets/common/abilities/custom/frostfang/triplestrike.ron b/assets/common/abilities/custom/frostfang/triplestrike.ron index 3874146167..83479d8922 100644 --- a/assets/common/abilities/custom/frostfang/triplestrike.ron +++ b/assets/common/abilities/custom/frostfang/triplestrike.ron @@ -11,12 +11,12 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.9, - swing_duration: 0.07, + buildup_duration: 0.65, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.4, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.7, ), @@ -31,8 +31,8 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.07, + buildup_duration: 0.9, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.4, ori_modifier: 0.7, @@ -48,12 +48,12 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.07, + buildup_duration: 0.9, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.4, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.7, ), diff --git a/assets/common/abilities/custom/frostwyvern/triplestrike.ron b/assets/common/abilities/custom/frostwyvern/triplestrike.ron index 03bf0f68b4..689005b58b 100644 --- a/assets/common/abilities/custom/frostwyvern/triplestrike.ron +++ b/assets/common/abilities/custom/frostwyvern/triplestrike.ron @@ -31,8 +31,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.1, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.1, + buildup_duration: 0.7, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/custom/icedrake/icebombs.ron b/assets/common/abilities/custom/icedrake/icebombs.ron index 8279f494c9..d217ba1ab2 100644 --- a/assets/common/abilities/custom/icedrake/icebombs.ron +++ b/assets/common/abilities/custom/icedrake/icebombs.ron @@ -1,15 +1,15 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.6, - recover_duration: 1.0, + buildup_duration: 1.0, + recover_duration: 0.6, projectile: Frostball( - damage: 30.0, - radius: 3.0, + damage: 35.0, + radius: 4.0, min_falloff: 0.1, ), projectile_body: Object(IceBomb), projectile_speed: 25.0, - num_projectiles: 3, - projectile_spread: 0.07, - move_efficiency: 0.75, + num_projectiles: 1, + projectile_spread: 0.0, + move_efficiency: 0.3, ) diff --git a/assets/common/abilities/custom/icedrake/icebreath.ron b/assets/common/abilities/custom/icedrake/icebreath.ron index b4181ffab2..cbe2caccb8 100644 --- a/assets/common/abilities/custom/icedrake/icebreath.ron +++ b/assets/common/abilities/custom/icedrake/icebreath.ron @@ -9,7 +9,7 @@ BasicBeam( damage_effect: Some(Buff(( kind: Frozen, dur_secs: 10.0, - strength: Value(0.25), + strength: Value(0.15), chance: 0.25, ))), energy_regen: 0, diff --git a/assets/common/abilities/custom/icedrake/icy_bite.ron b/assets/common/abilities/custom/icedrake/icy_bite.ron index 83a6cefee0..bee29da495 100644 --- a/assets/common/abilities/custom/icedrake/icy_bite.ron +++ b/assets/common/abilities/custom/icedrake/icy_bite.ron @@ -18,11 +18,11 @@ ComboMelee2( ))), ), buildup_duration: 1.2, - swing_duration: 0.07, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.8, movement: ( - swing: Some(Forward(3.0)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.6, ), diff --git a/assets/common/abilities/custom/icedrake/multi_bite.ron b/assets/common/abilities/custom/icedrake/multi_bite.ron index 33276cdc93..1b44d012fc 100644 --- a/assets/common/abilities/custom/icedrake/multi_bite.ron +++ b/assets/common/abilities/custom/icedrake/multi_bite.ron @@ -2,61 +2,61 @@ ComboMelee2( strikes: [ ( melee_constructor: ( - kind: Bash( - damage: 28, - poise: 15, + kind: Stab( + damage: 16, + poise: 5, knockback: 3, energy_regen: 0, ), range: 2.2, 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, - swing_duration: 0.07, + swing_duration: 0.4, hit_timing: 0.5, - recover_duration: 0.6, + recover_duration: 0.8, movement: ( - swing: Some(Forward(2.0)), - ), - 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)), + swing: Some(Forward(0.5)), ), ori_modifier: 0.65, ), diff --git a/assets/common/abilities/custom/irrwurz/magicball.ron b/assets/common/abilities/custom/irrwurz/magicball.ron index 036ddff397..3ec35b490e 100644 --- a/assets/common/abilities/custom/irrwurz/magicball.ron +++ b/assets/common/abilities/custom/irrwurz/magicball.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 1.5, recover_duration: 1.0, projectile: Magicball( - damage: 8.0, + damage: 22.0, radius: 3.0, energy_regen: 0, min_falloff: 0.5, diff --git a/assets/common/abilities/custom/irrwurz/singlestrike.ron b/assets/common/abilities/custom/irrwurz/singlestrike.ron index 94079d80dd..52f2c86633 100644 --- a/assets/common/abilities/custom/irrwurz/singlestrike.ron +++ b/assets/common/abilities/custom/irrwurz/singlestrike.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 4.0, + damage: 14.5, poise: 5, knockback: 3.0, energy_regen: 0, @@ -11,10 +11,10 @@ ComboMelee2( range: 2.5, angle: 40.0, ), - buildup_duration: 1.5, - swing_duration: 0.4, - hit_timing: 0.4, - recover_duration: 1.0, + buildup_duration: 0.5, + swing_duration: 0.2, + hit_timing: 0.5, + recover_duration: 0.4, movement: ( swing: Some(Forward(0.5)), ), diff --git a/assets/common/abilities/custom/maneater/poisonball.ron b/assets/common/abilities/custom/maneater/poisonball.ron index 4500a40c56..e8f2b49247 100644 --- a/assets/common/abilities/custom/maneater/poisonball.ron +++ b/assets/common/abilities/custom/maneater/poisonball.ron @@ -3,8 +3,8 @@ BasicRanged( buildup_duration: 1.6, recover_duration: 0.7, projectile: NecroticSphere( - damage: 52.0, - radius: 5.0, + damage: 26.0, + radius: 3.0, energy_regen: 0, min_falloff: 0.5, ), diff --git a/assets/common/abilities/custom/maneater/singlestrike.ron b/assets/common/abilities/custom/maneater/singlestrike.ron index 756337b4a2..b9715b0d1e 100644 --- a/assets/common/abilities/custom/maneater/singlestrike.ron +++ b/assets/common/abilities/custom/maneater/singlestrike.ron @@ -3,22 +3,22 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 40, - poise: 28, + damage: 39, + poise: 5, knockback: 3, energy_regen: 0, ), range: 3.5, angle: 60.0, ), - buildup_duration: 1.0, - swing_duration: 0.075, + buildup_duration: 0.25, + swing_duration: 0.25, hit_timing: 0.5, - recover_duration: 0.4, + recover_duration: 0.8, movement: ( - swing: Some(Forward(2.0)), + swing: Some(Forward(0.15)), ), - ori_modifier: 0.65, + ori_modifier: 0.75, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/mindflayer/cursedflames.ron b/assets/common/abilities/custom/mindflayer/cursedflames.ron index c1085dd0b9..3a22d090ef 100644 --- a/assets/common/abilities/custom/mindflayer/cursedflames.ron +++ b/assets/common/abilities/custom/mindflayer/cursedflames.ron @@ -2,7 +2,7 @@ BasicBeam( buildup_duration: 0.3, recover_duration: 1.0, beam_duration: 1.0, - damage: 22.5, + damage: 20.0, tick_rate: 5.0, range: 22.0, max_angle: 15.0, @@ -10,10 +10,10 @@ BasicBeam( kind: Cursed, dur_secs: 30.0, strength: Value(0.5), - chance: 1.0, + chance: 0.33, ))), energy_regen: 0, energy_drain: 0, - ori_rate: 0.5, + ori_rate: 0.4, specifier: Cultist, ) diff --git a/assets/common/abilities/custom/mindflayer/dimensionaldoor.ron b/assets/common/abilities/custom/mindflayer/dimensionaldoor.ron index 385b8486ac..03fcfaff10 100644 --- a/assets/common/abilities/custom/mindflayer/dimensionaldoor.ron +++ b/assets/common/abilities/custom/mindflayer/dimensionaldoor.ron @@ -1,5 +1,5 @@ Blink( buildup_duration: 0.75, recover_duration: 0.25, - max_range: 100.0, -) \ No newline at end of file + max_range: 150.0, +) diff --git a/assets/common/abilities/custom/mossy_snail/hastened.ron b/assets/common/abilities/custom/mossy_snail/harden.ron similarity index 71% rename from assets/common/abilities/custom/mossy_snail/hastened.ron rename to assets/common/abilities/custom/mossy_snail/harden.ron index 59997f8ba1..1a47c01c3c 100644 --- a/assets/common/abilities/custom/mossy_snail/hastened.ron +++ b/assets/common/abilities/custom/mossy_snail/harden.ron @@ -2,8 +2,8 @@ SelfBuff( buildup_duration: 0.1, cast_duration: 0.1, recover_duration: 0.4, - buff_kind: Hastened, - buff_strength: 0.8, + buff_kind: ProtectingWard, + buff_strength: 0.1, buff_duration: Some(6.0), energy_cost: 0, ) \ No newline at end of file diff --git a/assets/common/abilities/custom/mossy_snail/headbutt.ron b/assets/common/abilities/custom/mossy_snail/headbutt.ron index 8db16c7513..80a75a77f3 100644 --- a/assets/common/abilities/custom/mossy_snail/headbutt.ron +++ b/assets/common/abilities/custom/mossy_snail/headbutt.ron @@ -3,22 +3,22 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 3.0, - poise: 5, + damage: 4.5, + poise: 7, knockback: 1.0, energy_regen: 0, ), - range: 5.0, - angle: 60.0, + range: 4.0, + angle: 45.0, ), - buildup_duration: 0.6, - swing_duration: 0.4, + buildup_duration: 1.15, + swing_duration: 0.45, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.6)), ), - ori_modifier: 0.7, + ori_modifier: 0.45, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/oni/doublestrike.ron b/assets/common/abilities/custom/oni/doublestrike.ron index f347805769..e5b6f3bae5 100644 --- a/assets/common/abilities/custom/oni/doublestrike.ron +++ b/assets/common/abilities/custom/oni/doublestrike.ron @@ -17,8 +17,8 @@ ComboMelee2( chance: 0.1, ))), ), - buildup_duration: 1.2, - swing_duration: 0.12, + buildup_duration: 1.0, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 1.2, movement: ( @@ -43,8 +43,8 @@ ComboMelee2( chance: 0.1, ))), ), - buildup_duration: 1.0, - swing_duration: 0.15, + buildup_duration: 1.8, + swing_duration: 0.55, hit_timing: 0.5, recover_duration: 2.4, movement: ( diff --git a/assets/common/abilities/custom/quadlowbasic/singlestrike.ron b/assets/common/abilities/custom/quadlowbasic/singlestrike.ron index a929d60112..fd8b7ae6f6 100644 --- a/assets/common/abilities/custom/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadlowbasic/singlestrike.ron @@ -3,20 +3,20 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 40, + damage: 36, poise: 28, knockback: 3, energy_regen: 0, ), - range: 2.0, - angle: 60.0, + range: 3.0, + angle: 90.0, ), - buildup_duration: 1.2, - swing_duration: 0.07, + buildup_duration: 0.5, + swing_duration: 0.2, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 0.5, movement: ( - swing: Some(Forward(3.0)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.6, ), diff --git a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron index 33276cdc93..e9d564408c 100644 --- a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron @@ -2,21 +2,41 @@ ComboMelee2( strikes: [ ( melee_constructor: ( - kind: Bash( - damage: 28, - poise: 15, + kind: Slash( + damage: 36, + poise: 0, knockback: 3, energy_regen: 0, ), - range: 2.2, + range: 4.0, angle: 30.0, ), - buildup_duration: 1.3, - swing_duration: 0.07, + buildup_duration: 0.75, + swing_duration: 0.45, hit_timing: 0.5, - recover_duration: 0.6, + recover_duration: 0.4, 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, ), @@ -24,39 +44,19 @@ ComboMelee2( melee_constructor: ( kind: Bash( damage: 28, - poise: 18, + poise: 40, knockback: 3, energy_regen: 0, ), - range: 2.2, - angle: 30.0, + range: 3.0, + angle: 55.0, ), - buildup_duration: 0.8, - swing_duration: 0.07, + buildup_duration: 0.55, + swing_duration: 0.25, 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)), + swing: Some(Forward(0.3)), ), ori_modifier: 0.65, ), diff --git a/assets/common/abilities/custom/quadlowbreathe/dash.ron b/assets/common/abilities/custom/quadlowbreathe/dash.ron index 59338016d0..56d3014a28 100644 --- a/assets/common/abilities/custom/quadlowbreathe/dash.ron +++ b/assets/common/abilities/custom/quadlowbreathe/dash.ron @@ -3,26 +3,26 @@ DashMelee( melee_constructor: ( kind: Bash( damage: 16.0, - poise: 25.0, + poise: 0.0, knockback: 4.0, energy_regen: 0.0, ), scaled: Some(( kind: Bash( - damage: 30.0, - poise: 0.0, - knockback: 17.0, + damage: 36.0, + poise: 8.0, + knockback: 23.0, energy_regen: 0.0, - ))), + ))), range: 2.5, angle: 45.0, ), energy_drain: 0, - forward_speed: 4.0, - buildup_duration: 1.0, + forward_speed: 1.8, + buildup_duration: 0.65, charge_duration: 2.0, - swing_duration: 0.1, + swing_duration: 0.35, recover_duration: 2.0, - ori_modifier: 0.3, + ori_modifier: 0.1, charge_through: false, ) diff --git a/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron b/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron index c27b2c6d41..63d6ea0223 100644 --- a/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron +++ b/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron @@ -1,8 +1,8 @@ BasicBeam( - buildup_duration: 0.8, - recover_duration: 0.5, + buildup_duration: 1.1, + recover_duration: 1.6, beam_duration: 0.5, - damage: 14.0, + damage: 26.0, tick_rate: 3.0, range: 15.0, max_angle: 22.5, @@ -10,7 +10,7 @@ BasicBeam( kind: Burning, dur_secs: 10.0, strength: DamageFraction(0.5), - chance: 0.25, + chance: 1.0, ))), energy_regen: 0, energy_drain: 0, diff --git a/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron b/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron index aa109a29d0..bbef408ede 100644 --- a/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron @@ -3,62 +3,62 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 44, + damage: 60, poise: 20, knockback: 3, energy_regen: 0, ), - range: 2.5, - angle: 30.0, + range: 3.5, + angle: 45.0, ), - buildup_duration: 1.3, - swing_duration: 0.1, + buildup_duration: 1.4, + swing_duration: 0.4, hit_timing: 0.5, - recover_duration: 0.6, + recover_duration: 0.7, movement: ( - swing: Some(Forward(2.0)), + swing: Some(Forward(0.15)), ), - ori_modifier: 0.7, + ori_modifier: 0.8, ), ( melee_constructor: ( kind: Bash( damage: 44, poise: 20, - knockback: 3, + knockback: 12, energy_regen: 0, ), - range: 2.5, - angle: 30.0, + range: 3.0, + angle: 75.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.95, + swing_duration: 0.65, hit_timing: 0.5, - recover_duration: 0.6, + recover_duration: 0.2, movement: ( - swing: Some(Forward(1.5)), + swing: Some(Forward(0.15)), ), - ori_modifier: 0.7, + ori_modifier: 0.8, ), ( melee_constructor: ( kind: Bash( - damage: 44, - poise: 20, - knockback: 3, + damage: 26, + poise: 5, + knockback: 10, energy_regen: 0, ), range: 2.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.3, + swing_duration: 0.2, hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(1.5)), + swing: Some(Forward(0.3)), ), - ori_modifier: 0.7, + ori_modifier: 0.8, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/quadlowquick/dash.ron b/assets/common/abilities/custom/quadlowquick/dash.ron index 832e8201c6..93db824fb5 100644 --- a/assets/common/abilities/custom/quadlowquick/dash.ron +++ b/assets/common/abilities/custom/quadlowquick/dash.ron @@ -13,16 +13,16 @@ DashMelee( poise: 0.0, knockback: 7.0, energy_regen: 0.0, - ))), - range: 2.0, + ))), + range: 3.0, angle: 45.0, ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 1.0, + buildup_duration: 0.65, charge_duration: 1.6, - swing_duration: 0.1, + swing_duration: 0.35, recover_duration: 2.0, - ori_modifier: 0.3, + ori_modifier: 0.1, charge_through: false, ) diff --git a/assets/common/abilities/custom/quadlowquick/quadstrike.ron b/assets/common/abilities/custom/quadlowquick/quadstrike.ron index a0ec0c8b8a..0170035366 100644 --- a/assets/common/abilities/custom/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/custom/quadlowquick/quadstrike.ron @@ -11,14 +11,14 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 1.2, - swing_duration: 0.1, + buildup_duration: 0.75, + swing_duration: 0.45, hit_timing: 0.5, recover_duration: 0.2, movement: ( - swing: Some(Forward(1.5)), + swing: Some(Forward(0.3)), ), - ori_modifier: 0.8, + ori_modifier: 0.7, ), ( melee_constructor: ( @@ -31,14 +31,14 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.3, - swing_duration: 0.07, + buildup_duration: 0.45, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.2, movement: ( - swing: Some(Forward(0.8)), + swing: Some(Forward(0.08)), ), - ori_modifier: 0.8, + ori_modifier: 0.7, ), ( melee_constructor: ( @@ -52,13 +52,13 @@ ComboMelee2( angle: 30.0, ), buildup_duration: 0.4, - swing_duration: 0.07, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.2, movement: ( - swing: Some(Forward(0.8)), + swing: Some(Forward(0.08)), ), - ori_modifier: 0.8, + ori_modifier: 0.7, ), ( melee_constructor: ( @@ -72,13 +72,13 @@ ComboMelee2( angle: 30.0, ), buildup_duration: 0.4, - swing_duration: 0.07, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.2, movement: ( - swing: Some(Forward(0.8)), + swing: Some(Forward(0.08)), ), - ori_modifier: 0.8, + ori_modifier: 0.7, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/quadlowtail/charged.ron b/assets/common/abilities/custom/quadlowtail/charged.ron index 6d2169566b..28dd1ce9f0 100644 --- a/assets/common/abilities/custom/quadlowtail/charged.ron +++ b/assets/common/abilities/custom/quadlowtail/charged.ron @@ -4,23 +4,23 @@ ChargedMelee( melee_constructor: ( kind: Bash( damage: 8.0, - poise: 30.0, + poise: 5.0, knockback: 10.0, energy_regen: 0.0, ), scaled: Some(( kind: Bash( - damage: 40.0, - poise: 80.0, - knockback: 20.0, + damage: 35.0, + poise: 35.0, + knockback: 35.0, energy_regen: 0.0, - ))), - range: 6.0, + ))), + range: 4.5, angle: 90.0, multi_target: Some(Normal), ), - charge_duration: 3.2, - swing_duration: 0.7, - hit_timing: 0.9, - recover_duration: 0.7, + charge_duration: 1.7, + swing_duration: 0.4, + hit_timing: 0.5, + recover_duration: 1.1, ) diff --git a/assets/common/abilities/custom/quadlowtail/singlestrike.ron b/assets/common/abilities/custom/quadlowtail/singlestrike.ron new file mode 100644 index 0000000000..74b0f36381 --- /dev/null +++ b/assets/common/abilities/custom/quadlowtail/singlestrike.ron @@ -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, +) diff --git a/assets/common/abilities/custom/quadlowtail/triplestrike.ron b/assets/common/abilities/custom/quadlowtail/triplestrike.ron deleted file mode 100644 index 2b2e056d84..0000000000 --- a/assets/common/abilities/custom/quadlowtail/triplestrike.ron +++ /dev/null @@ -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, -) diff --git a/assets/common/abilities/custom/quadmedbasic/singlestrike.ron b/assets/common/abilities/custom/quadmedbasic/singlestrike.ron index fc8b819beb..0e0f02ee62 100644 --- a/assets/common/abilities/custom/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadmedbasic/singlestrike.ron @@ -11,12 +11,12 @@ ComboMelee2( range: 2.7, angle: 60.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.5, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.8, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), diff --git a/assets/common/abilities/custom/quadmedbasic/triplestrike.ron b/assets/common/abilities/custom/quadmedbasic/triplestrike.ron index 757a3d9a8a..7e377d4c82 100644 --- a/assets/common/abilities/custom/quadmedbasic/triplestrike.ron +++ b/assets/common/abilities/custom/quadmedbasic/triplestrike.ron @@ -11,12 +11,12 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.9, - swing_duration: 0.07, + buildup_duration: 0.55, + swing_duration: 0.35, hit_timing: 0.5, recover_duration: 0.4, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), @@ -32,9 +32,12 @@ ComboMelee2( angle: 30.0, ), buildup_duration: 0.8, - swing_duration: 0.07, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.4, + movement: ( + swing: Some(Forward(0.2)), + ), ori_modifier: 0.7, ), ( @@ -48,12 +51,12 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.07, + buildup_duration: 0.9, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.4, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), diff --git a/assets/common/abilities/custom/quadmedcharge/dash.ron b/assets/common/abilities/custom/quadmedcharge/dash.ron index e2923a3c8c..bd36958743 100644 --- a/assets/common/abilities/custom/quadmedcharge/dash.ron +++ b/assets/common/abilities/custom/quadmedcharge/dash.ron @@ -13,16 +13,16 @@ DashMelee( poise: 35.0, knockback: 14.0, energy_regen: 0.0, - ))), - range: 2.5, + ))), + range: 3.0, angle: 45.0, ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 1.0, + buildup_duration: 1.6, charge_duration: 2.4, - swing_duration: 0.1, - recover_duration: 2.2, + swing_duration: 0.4, + recover_duration: 1.2, ori_modifier: 0.3, charge_through: false, ) diff --git a/assets/common/abilities/custom/quadmedcharge/doublestrike.ron b/assets/common/abilities/custom/quadmedcharge/doublestrike.ron index 076cc6c178..145f5f97c9 100644 --- a/assets/common/abilities/custom/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/custom/quadmedcharge/doublestrike.ron @@ -8,17 +8,17 @@ ComboMelee2( knockback: 4, energy_regen: 0, ), - range: 2.5, + range: 3.5, angle: 30.0, ), - buildup_duration: 1.3, - swing_duration: 0.1, + buildup_duration: 0.85, + swing_duration: 0.45, hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), - ori_modifier: 0.7, + ori_modifier: 0.6, ), ( melee_constructor: ( @@ -31,14 +31,14 @@ ComboMelee2( range: 2.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.1, + swing_duration: 0.35, hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.1)), ), - ori_modifier: 0.7, + ori_modifier: 0.6, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/quadmedhoof/basic.ron b/assets/common/abilities/custom/quadmedhoof/basic.ron index 3faad48eaa..ca6cffc328 100644 --- a/assets/common/abilities/custom/quadmedhoof/basic.ron +++ b/assets/common/abilities/custom/quadmedhoof/basic.ron @@ -1,18 +1,18 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.55, - swing_duration: 0.3, + buildup_duration: 0.7, + swing_duration: 0.45, hit_timing: 0.4, recover_duration: 0.85, melee_constructor: ( kind: Bash( - damage:20.0, - poise: 28.0, - knockback: 25.0, + damage: 10.0, + poise: 14.0, + knockback: 8.0, energy_regen: 0.0, ), - range: 0.8, + range: 3.0, angle: 50.0, ), - ori_modifier: 1.0, + ori_modifier: 0.5, ) diff --git a/assets/common/abilities/custom/quadmedjump/doublestrike.ron b/assets/common/abilities/custom/quadmedjump/doublestrike.ron index 07d0b4d635..fded90a6d0 100644 --- a/assets/common/abilities/custom/quadmedjump/doublestrike.ron +++ b/assets/common/abilities/custom/quadmedjump/doublestrike.ron @@ -11,12 +11,12 @@ ComboMelee2( range: 2.2, angle: 30.0, ), - buildup_duration: 1.3, - swing_duration: 0.1, + buildup_duration: 0.7, + swing_duration: 0.5, hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.2)), ), ori_modifier: 0.8, ), @@ -31,12 +31,12 @@ ComboMelee2( range: 2.2, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 0.85, + swing_duration: 0.45, hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(1.5)), + swing: Some(Forward(0.4)), ), ori_modifier: 0.8, ), diff --git a/assets/common/abilities/custom/quadmedjump/leap.ron b/assets/common/abilities/custom/quadmedjump/leap.ron index 5b0114b4c2..6151cef2a3 100644 --- a/assets/common/abilities/custom/quadmedjump/leap.ron +++ b/assets/common/abilities/custom/quadmedjump/leap.ron @@ -1,9 +1,9 @@ LeapMelee( energy_cost: 0, - buildup_duration: 1.5, + buildup_duration: 0.95, movement_duration: 0.8, - swing_duration: 0.075, - recover_duration: 0.6, + swing_duration: 0.55, + recover_duration: 0.4, melee_constructor: ( kind: Bash( damage: 36.0, diff --git a/assets/common/abilities/custom/quadmedjump/quickleap.ron b/assets/common/abilities/custom/quadmedjump/quickleap.ron index e9190469a1..a511251555 100644 --- a/assets/common/abilities/custom/quadmedjump/quickleap.ron +++ b/assets/common/abilities/custom/quadmedjump/quickleap.ron @@ -1,8 +1,8 @@ LeapMelee( energy_cost: 0, - buildup_duration: 0.8, + buildup_duration: 0.5, movement_duration: 0.6, - swing_duration: 0.075, + swing_duration: 0.3, recover_duration: 0.25, melee_constructor: ( kind: Bash( diff --git a/assets/common/abilities/custom/quadmedquick/dash.ron b/assets/common/abilities/custom/quadmedquick/dash.ron index 8850d8e9df..2cbeb5fb2c 100644 --- a/assets/common/abilities/custom/quadmedquick/dash.ron +++ b/assets/common/abilities/custom/quadmedquick/dash.ron @@ -19,10 +19,10 @@ DashMelee( ), energy_drain: 0, forward_speed: 1.8, - buildup_duration: 1.5, + buildup_duration: 0.85, charge_duration: 1.2, - swing_duration: 0.1, + swing_duration: 0.65, recover_duration: 2.0, - ori_modifier: 0.3, + ori_modifier: 0.1, charge_through: false, ) diff --git a/assets/common/abilities/custom/quadmedquick/triplestrike.ron b/assets/common/abilities/custom/quadmedquick/triplestrike.ron index 2b0ee263c9..68d37bd944 100644 --- a/assets/common/abilities/custom/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/custom/quadmedquick/triplestrike.ron @@ -11,12 +11,12 @@ ComboMelee2( range: 2.2, angle: 40.0, ), - buildup_duration: 1.2, - swing_duration: 0.15, + buildup_duration: 0.75, + swing_duration: 0.45, hit_timing: 0.5, recover_duration: 0.8, movement: ( - swing: Some(Forward(0.3)), + swing: Some(Forward(0.25)), ), ori_modifier: 0.8, ), @@ -31,12 +31,12 @@ ComboMelee2( range: 2.2, angle: 40.0, ), - buildup_duration: 0.8, - swing_duration: 0.15, + buildup_duration: 0.5, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.35)), ), ori_modifier: 0.8, ), @@ -51,12 +51,12 @@ ComboMelee2( range: 2.2, angle: 40.0, ), - buildup_duration: 0.8, - swing_duration: 0.15, + buildup_duration: 1.15, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.5)), + swing: Some(Forward(0.35)), ), ori_modifier: 0.8, ), diff --git a/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron b/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron index a83773e74b..ed3e93ef89 100644 --- a/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron @@ -1,18 +1,25 @@ -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, +ComboMelee2( + strikes: [ + ( + melee_constructor: ( + kind: Bash( + damage: 9, + poise: 3, + knockback: 1, + energy_regen: 0, + ), + range: 1.5, + 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, - ), - ori_modifier: 0.7, -) + ], + energy_cost_per_strike: 0, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/roshwalr/doublehusk.ron b/assets/common/abilities/custom/roshwalr/doublehusk.ron index 002139e71c..fa1761b728 100644 --- a/assets/common/abilities/custom/roshwalr/doublehusk.ron +++ b/assets/common/abilities/custom/roshwalr/doublehusk.ron @@ -16,7 +16,7 @@ ComboMelee2( hit_timing: 0.5, recover_duration: 0.3, movement: ( - swing: Some(Forward(0.25)), + swing: Some(Forward(0.15)), ), ori_modifier: 0.5, ), @@ -31,12 +31,12 @@ ComboMelee2( range: 3.0, angle: 75.0, ), - buildup_duration: 0.2, + buildup_duration: 0.5, swing_duration: 0.07, hit_timing: 0.5, recover_duration: 0.6, movement: ( - swing: Some(Forward(0.25)), + swing: Some(Forward(0.15)), ), ori_modifier: 0.5, ), diff --git a/assets/common/abilities/custom/seawyvern/triplestrike.ron b/assets/common/abilities/custom/seawyvern/triplestrike.ron index 03bf0f68b4..1c4116e159 100644 --- a/assets/common/abilities/custom/seawyvern/triplestrike.ron +++ b/assets/common/abilities/custom/seawyvern/triplestrike.ron @@ -31,8 +31,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.1, + swing_duration: 0.4, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.1, + buildup_duration: 0.8, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/custom/theropodbasic/dash.ron b/assets/common/abilities/custom/theropodbasic/dash.ron index b173d08c8a..6ed8eb3590 100644 --- a/assets/common/abilities/custom/theropodbasic/dash.ron +++ b/assets/common/abilities/custom/theropodbasic/dash.ron @@ -9,20 +9,20 @@ DashMelee( ), scaled: Some(( kind: Bash( - damage: 25.0, + damage: 84.0, poise: 0.0, - knockback: 17.0, + knockback: 12.0, energy_regen: 0.0, - ))), - range: 4.0, + ))), + range: 3.0, angle: 45.0, ), energy_drain: 0, forward_speed: 2.0, - buildup_duration: 1.0, + buildup_duration: 0.7, charge_duration: 2.4, - swing_duration: 0.1, - recover_duration: 1.8, - ori_modifier: 0.3, + swing_duration: 0.3, + recover_duration: 0.7, + ori_modifier: 0.1, charge_through: false, ) diff --git a/assets/common/abilities/custom/theropodbasic/singlestrike.ron b/assets/common/abilities/custom/theropodbasic/singlestrike.ron index f73beb51c1..ef6bdc52fa 100644 --- a/assets/common/abilities/custom/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/custom/theropodbasic/singlestrike.ron @@ -3,22 +3,22 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 54, + damage: 40, poise: 40, - knockback: 4, + knockback: 18, energy_regen: 0, ), - range: 7.5, + range: 5.5, angle: 60.0, ), - buildup_duration: 0.8, - swing_duration: 0.15, + buildup_duration: 0.5, + swing_duration: 0.2, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 0.3, movement: ( - swing: Some(Forward(3.0)), + swing: Some(Forward(0.25)), ), - ori_modifier: 0.7, + ori_modifier: 0.85, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/theropodbasic/triplestrike.ron b/assets/common/abilities/custom/theropodbasic/triplestrike.ron index 0d7f779ffb..23ae53e49d 100644 --- a/assets/common/abilities/custom/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/custom/theropodbasic/triplestrike.ron @@ -3,62 +3,62 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 40, - poise: 32.5, - knockback: 3, + damage: 32.5, + poise: 15, + knockback: 5, energy_regen: 0, ), - range: 7.5, - angle: 30.0, + range: 5.0, + angle: 45.0, ), - buildup_duration: 1.3, + buildup_duration: 0.8, swing_duration: 0.15, hit_timing: 0.5, - recover_duration: 0.5, + recover_duration: 0.1, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.2)), ), - ori_modifier: 0.7, + ori_modifier: 0.9, ), ( melee_constructor: ( - kind: Bash( - damage: 50, - poise: 32.5, - knockback: 3, + kind: Slash( + damage: 18, + poise: 10, + knockback: 7.5, energy_regen: 0, ), - range: 5.5, - angle: 30.0, + range: 5.0, + angle: 45.0, ), - buildup_duration: 0.2, - swing_duration: 0.15, + buildup_duration: 0.25, + swing_duration: 0.2, hit_timing: 0.5, recover_duration: 0.3, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.3)), ), - ori_modifier: 0.7, + ori_modifier: 0.9, ), ( melee_constructor: ( kind: Bash( damage: 60, - poise: 32.5, + poise: 22.5, knockback: 25, energy_regen: 0, ), range: 5.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.125, + buildup_duration: 0.65, + swing_duration: 0.25, hit_timing: 0.5, - recover_duration: 1.6, + recover_duration: 1.1, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), - ori_modifier: 0.7, + ori_modifier: 0.9, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/theropodbird/singlestrike.ron b/assets/common/abilities/custom/theropodbird/singlestrike.ron index 61c04e29ce..b6898bba36 100644 --- a/assets/common/abilities/custom/theropodbird/singlestrike.ron +++ b/assets/common/abilities/custom/theropodbird/singlestrike.ron @@ -5,18 +5,18 @@ ComboMelee2( kind: Bash( damage: 22, poise: 28, - knockback: 2, + knockback: 5, energy_regen: 0, ), - range: 3.0, - angle: 15.0, + range: 3.5, + angle: 45.0, ), - buildup_duration: 0.8, - swing_duration: 0.15, + buildup_duration: 0.65, + swing_duration: 0.25, hit_timing: 0.5, - recover_duration: 0.8, + recover_duration: 0.4, movement: ( - swing: Some(Forward(3.0)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.7, ), diff --git a/assets/common/abilities/custom/theropodbird/triplestrike.ron b/assets/common/abilities/custom/theropodbird/triplestrike.ron index d4d1965298..fa398f097f 100644 --- a/assets/common/abilities/custom/theropodbird/triplestrike.ron +++ b/assets/common/abilities/custom/theropodbird/triplestrike.ron @@ -2,8 +2,48 @@ ComboMelee2( strikes: [ ( melee_constructor: ( - kind: Bash( + kind: Slash( 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, knockback: 3, energy_regen: 0, @@ -12,51 +52,11 @@ ComboMelee2( angle: 15.0, ), buildup_duration: 0.95, - swing_duration: 0.15, + swing_duration: 0.25, hit_timing: 0.5, - recover_duration: 0.5, + recover_duration: 1.3, movement: ( - swing: Some(Forward(1.0)), - ), - 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)), + swing: Some(Forward(0.1)), ), ori_modifier: 0.6, ), diff --git a/assets/common/abilities/custom/theropodsmall/triplestrike.ron b/assets/common/abilities/custom/theropodsmall/triplestrike.ron index 33cf6f3ca7..d5b934ce6a 100644 --- a/assets/common/abilities/custom/theropodsmall/triplestrike.ron +++ b/assets/common/abilities/custom/theropodsmall/triplestrike.ron @@ -2,63 +2,63 @@ ComboMelee2( strikes: [ ( melee_constructor: ( - kind: Bash( - damage: 30, - poise: 17.5, + kind: Slash( + damage: 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, energy_regen: 0, ), - range: 4.5, - angle: 30.0, + range: 3.0, + angle: 45.0, ), - buildup_duration: 1.3, - swing_duration: 0.15, + buildup_duration: 0.45, + swing_duration: 0.6, hit_timing: 0.5, recover_duration: 0.5, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.15)), ), - ori_modifier: 0.7, + ori_modifier: 0.6, ), ( melee_constructor: ( kind: Bash( - damage: 30, - poise: 20.5, - knockback: 3, + damage: 14, + poise: 12, + knockback: 12, energy_regen: 0, ), range: 4.5, - angle: 30.0, + angle: 45.0, ), - buildup_duration: 0.2, - swing_duration: 0.15, + buildup_duration: 0.775, + swing_duration: 0.25, hit_timing: 0.5, - recover_duration: 0.3, + recover_duration: 0.4, movement: ( - swing: Some(Forward(1.0)), + swing: Some(Forward(0.1)), ), - ori_modifier: 0.7, - ), - ( - 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, + ori_modifier: 0.6, ), ], energy_cost_per_strike: 0, diff --git a/assets/common/abilities/custom/treant_sapling/shockwave.ron b/assets/common/abilities/custom/treant_sapling/shockwave.ron index 2a291d00fd..5823a30e7e 100644 --- a/assets/common/abilities/custom/treant_sapling/shockwave.ron +++ b/assets/common/abilities/custom/treant_sapling/shockwave.ron @@ -1,15 +1,15 @@ Shockwave( energy_cost: 0.0, - buildup_duration: 4.0, + buildup_duration: 1.6, swing_duration: 0.1, - recover_duration: 0.1, - damage: 15.0, + recover_duration: 2.3, + damage: 8.0, poise_damage: 0, knockback: ( strength: 5.0, direction: Away), shockwave_angle: 360.0, shockwave_vertical_angle: 90.0, - shockwave_speed: 20.0, - shockwave_duration: 0.5, + shockwave_speed: 32.5, + shockwave_duration: 0.4, dodgeable: Jump, move_efficiency: 0.1, damage_kind: Crushing, diff --git a/assets/common/abilities/custom/turret/arrows.ron b/assets/common/abilities/custom/turret/arrows.ron index 87632a484a..01be8cd988 100644 --- a/assets/common/abilities/custom/turret/arrows.ron +++ b/assets/common/abilities/custom/turret/arrows.ron @@ -1,6 +1,6 @@ BasicRanged( energy_cost: 0, - buildup_duration: 0.1, + buildup_duration: 1.2, recover_duration: 0.5, projectile: Arrow( damage: 30.0, diff --git a/assets/common/abilities/custom/wealdwyvern/triplestrike.ron b/assets/common/abilities/custom/wealdwyvern/triplestrike.ron index 03bf0f68b4..6ffb8d6cff 100644 --- a/assets/common/abilities/custom/wealdwyvern/triplestrike.ron +++ b/assets/common/abilities/custom/wealdwyvern/triplestrike.ron @@ -31,8 +31,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.8, - swing_duration: 0.1, + buildup_duration: 1.2, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( @@ -51,8 +51,8 @@ ComboMelee2( range: 3.5, angle: 30.0, ), - buildup_duration: 0.4, - swing_duration: 0.1, + buildup_duration: 0.9, + swing_duration: 0.3, hit_timing: 0.5, recover_duration: 0.6, movement: ( diff --git a/assets/common/abilities/sword/heavy_pillar_thrust.ron b/assets/common/abilities/sword/heavy_pillar_thrust.ron index e4dbe07f30..3f3b916706 100644 --- a/assets/common/abilities/sword/heavy_pillar_thrust.ron +++ b/assets/common/abilities/sword/heavy_pillar_thrust.ron @@ -7,22 +7,22 @@ DiveMelee( recover_duration: 0.3, melee_constructor: ( kind: Slash( - damage: 25, + damage: 16, poise: 40, knockback: 0, energy_regen: 0, ), scaled: Some(( kind: Slash( - damage: 10, - poise: 10, + damage: 8, + poise: 11, knockback: 0, energy_regen: 0, ))), range: 2.0, angle: 45.0, multi_target: Some(Normal), - damage_effect: Some(StunnedVulnerable(0.5)), + damage_effect: Some(StunnedVulnerable(0.9)), ), max_scaling: 3, meta: ( diff --git a/assets/common/abilities/sword/heavy_pommel_strike.ron b/assets/common/abilities/sword/heavy_pommel_strike.ron index 63cee6aa3d..c7c4f8e3b1 100644 --- a/assets/common/abilities/sword/heavy_pommel_strike.ron +++ b/assets/common/abilities/sword/heavy_pommel_strike.ron @@ -4,21 +4,21 @@ ComboMelee2( melee_constructor: ( kind: Bash( damage: 12, - poise: 50, + poise: 19, knockback: 0, energy_regen: 0, ), range: 1.5, angle: 45.0, ), - buildup_duration: 0.15, - swing_duration: 0.1, + buildup_duration: 0.3, + swing_duration: 0.15, hit_timing: 0.5, recover_duration: 0.1, ori_modifier: 0.6, ), ], - energy_cost_per_strike: 5, + energy_cost_per_strike: 9, meta: ( init_event: Some(EnterStance(Sword(Heavy))), ), diff --git a/assets/common/abilities/sword/heavy_sweep.ron b/assets/common/abilities/sword/heavy_sweep.ron index 3ba2c818a1..28a9b679b3 100644 --- a/assets/common/abilities/sword/heavy_sweep.ron +++ b/assets/common/abilities/sword/heavy_sweep.ron @@ -4,13 +4,13 @@ ComboMelee2( melee_constructor: ( kind: Slash( damage: 21, - poise: 30, + poise: 22, knockback: 0, energy_regen: 0, ), range: 4.0, angle: 90.0, - damage_effect: Some(StunnedVulnerable(0.8)), + damage_effect: Some(StunnedVulnerable(0.7)), ), buildup_duration: 0.3, swing_duration: 0.2, diff --git a/assets/common/entity/wild/aggressive/bat.ron b/assets/common/entity/wild/peaceful/bat.ron similarity index 85% rename from assets/common/entity/wild/aggressive/bat.ron rename to assets/common/entity/wild/peaceful/bat.ron index fd30d40975..549ce1b004 100644 --- a/assets/common/entity/wild/aggressive/bat.ron +++ b/assets/common/entity/wild/peaceful/bat.ron @@ -2,10 +2,10 @@ ( name: Automatic, body: RandomWith("bat"), - alignment: Alignment(Enemy), + alignment: Alignment(Wild), loot: LootTable("common.loot_tables.creature.bat"), inventory: ( loadout: FromBody, ), meta: [], -) \ No newline at end of file +) diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index 0662ba167f..e5fde15df2 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -24,6 +24,21 @@ Simple( "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( "common.items.npc_armor.bird_large.phoenix", ): "common-items-npc_armor-bird_large-phoenix", @@ -519,6 +534,12 @@ Simple( "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( "common.items.npc_armor.quadruped_medium.frostfang", ): "common-items-npc_armor-quadruped_medium-frostfang", @@ -528,9 +549,42 @@ Simple( "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( "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( "common.items.npc_armor.back.backpack_blue", ): "armor-misc-back-backpack", @@ -2406,12 +2460,6 @@ Simple( "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( "common.items.npc_weapons.unique.beast_claws", ): "common-items-npc_weapons-unique-beast_claws", @@ -2451,9 +2499,6 @@ Simple( "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( "common.items.npc_weapons.unique.driggle", ): "common-items-npc_weapons-unique-driggle", @@ -2490,21 +2535,75 @@ Simple( "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( "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( "common.items.npc_weapons.unique.mossysnail", ): "common-items-npc_weapons-unique-mossysnail", Simple( "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( "common.items.npc_weapons.unique.quadlowbasic", ): "common-items-npc_weapons-unique-quadlowbasic", @@ -2622,6 +2721,9 @@ Simple( "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( "common.items.npc_weapons.unique.arthropods.mosscrawler", ): "common-items-npc_weapons-unique-arthropods-mosscrawler", diff --git a/assets/common/items/npc_armor/arthropod/generic.ron b/assets/common/items/npc_armor/arthropod/generic.ron index e6ebe3c8e0..3590e01198 100644 --- a/assets/common/items/npc_armor/arthropod/generic.ron +++ b/assets/common/items/npc_armor/arthropod/generic.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest, stats: Direct(( - protection: Some(Normal(60.0)), - poise_resilience: Some(Normal(1.0)), + protection: Some(Normal(83.0)), + poise_resilience: Some(Normal(20.0)), )), )), quality: Legendary, diff --git a/assets/common/items/npc_armor/arthropod/leafbeetle.ron b/assets/common/items/npc_armor/arthropod/leafbeetle.ron new file mode 100644 index 0000000000..8e87f44074 --- /dev/null +++ b/assets/common/items/npc_armor/arthropod/leafbeetle.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/arthropod/weevil.ron b/assets/common/items/npc_armor/arthropod/weevil.ron new file mode 100644 index 0000000000..debd783d1e --- /dev/null +++ b/assets/common/items/npc_armor/arthropod/weevil.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_low/basilisk.ron b/assets/common/items/npc_armor/quadruped_low/basilisk.ron new file mode 100644 index 0000000000..1bc1e5e1ed --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_low/basilisk.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_low/crocodylia.ron b/assets/common/items/npc_armor/quadruped_low/crocodylia.ron new file mode 100644 index 0000000000..bffff4b7f3 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_low/crocodylia.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_low/drake.ron b/assets/common/items/npc_armor/quadruped_low/drake.ron new file mode 100644 index 0000000000..98747af12f --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_low/drake.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_low/sandshark.ron b/assets/common/items/npc_armor/quadruped_low/sandshark.ron new file mode 100644 index 0000000000..15483f197f --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_low/sandshark.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_low/shell.ron b/assets/common/items/npc_armor/quadruped_low/shell.ron index c7d7bbef1b..fcae1f63b7 100644 --- a/assets/common/items/npc_armor/quadruped_low/shell.ron +++ b/assets/common/items/npc_armor/quadruped_low/shell.ron @@ -4,8 +4,8 @@ ItemDef( kind: Armor(( kind: Chest, stats: Direct(( - protection: Some(Normal(320.0)), - poise_resilience: Some(Normal(0.0)), + protection: Some(Normal(260.0)), + poise_resilience: Some(Normal(25.0)), )), )), quality: Moderate, diff --git a/assets/common/items/npc_armor/quadruped_low/snapper.ron b/assets/common/items/npc_armor/quadruped_low/snapper.ron new file mode 100644 index 0000000000..3fab61c448 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_low/snapper.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_medium/bonerattler.ron b/assets/common/items/npc_armor/quadruped_medium/bonerattler.ron new file mode 100644 index 0000000000..fa21ac768e --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_medium/bonerattler.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_medium/broad.ron b/assets/common/items/npc_armor/quadruped_medium/broad.ron new file mode 100644 index 0000000000..a50257e348 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_medium/broad.ron @@ -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: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_medium/catoblepas.ron b/assets/common/items/npc_armor/quadruped_medium/catoblepas.ron new file mode 100644 index 0000000000..453fbf9e08 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_medium/catoblepas.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Catoblepas Armor", + legacy_description: "Thick and rigid.", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(166.0)), + poise_resilience: Some(Normal(20.0)), + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_medium/dreadhorn.ron b/assets/common/items/npc_armor/quadruped_medium/dreadhorn.ron new file mode 100644 index 0000000000..a0a2a088f5 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_medium/dreadhorn.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Dreadhorn Armor", + legacy_description: "Thick and rigid.", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(52.0)), + poise_resilience: Some(Normal(20.0)), + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_medium/equus.ron b/assets/common/items/npc_armor/quadruped_medium/equus.ron new file mode 100644 index 0000000000..4aedbe2b30 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_medium/equus.ron @@ -0,0 +1,14 @@ +ItemDef( + legacy_name: "Horse Armor", + legacy_description: "testing123", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(20.0)), + poise_resilience: Some(Normal(5.0)), + energy_max: Some(10), + )), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_medium/hirdrasil.ron b/assets/common/items/npc_armor/quadruped_medium/hirdrasil.ron new file mode 100644 index 0000000000..14760fd986 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_medium/hirdrasil.ron @@ -0,0 +1,14 @@ +ItemDef( + legacy_name: "Hirdrasil's Blessing", + legacy_description: "testing123", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(30.0)), + poise_resilience: Some(Normal(20.0)), + energy_max: Some(100), + )), + )), + quality: High, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_small/boar.ron b/assets/common/items/npc_armor/quadruped_small/boar.ron new file mode 100644 index 0000000000..2cb1d213d2 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_small/boar.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Boar Armor", + legacy_description: "Worn by small beasties.", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(20.0)), + poise_resilience: Some(Normal(10.0)), + )), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_small/hyena.ron b/assets/common/items/npc_armor/quadruped_small/hyena.ron new file mode 100644 index 0000000000..de5c9f318d --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_small/hyena.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Hyena Armor", + legacy_description: "Worn by small beasties.", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(56.0)), + poise_resilience: Some(Normal(10.0)), + )), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/quadruped_small/mossysnail.ron b/assets/common/items/npc_armor/quadruped_small/mossysnail.ron new file mode 100644 index 0000000000..3a588a7e32 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_small/mossysnail.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Mossy Shell", + legacy_description: "The sturdy home of a lil fella.", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(90.0)), + poise_resilience: Some(Normal(10.0)), + )), + )), + quality: Common, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/theropod/raptor.ron b/assets/common/items/npc_armor/theropod/raptor.ron new file mode 100644 index 0000000000..5b37fe6057 --- /dev/null +++ b/assets/common/items/npc_armor/theropod/raptor.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Raptor Hide", + legacy_description: "stronk.", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(49.0)), + poise_resilience: Some(Normal(15.0)), + )), + )), + quality: High, + tags: [], +) diff --git a/assets/common/items/npc_armor/theropod/rugged.ron b/assets/common/items/npc_armor/theropod/rugged.ron index 77ef94a932..8ad5ff0fa1 100644 --- a/assets/common/items/npc_armor/theropod/rugged.ron +++ b/assets/common/items/npc_armor/theropod/rugged.ron @@ -1,13 +1,13 @@ ItemDef( legacy_name: "Theropod Rugged", - legacy_description: "stronk.", + legacy_description: "For big scary dinos.", kind: Armor(( kind: Chest, stats: Direct(( - protection: Some(Normal(80.0)), - poise_resilience: Some(Normal(25.0)), + protection: Some(Normal(92.0)), + poise_resilience: Some(Normal(30.0)), )), )), - quality: Moderate, + quality: Epic, tags: [], ) diff --git a/assets/common/items/npc_armor/theropod/yale.ron b/assets/common/items/npc_armor/theropod/yale.ron new file mode 100644 index 0000000000..c84c7d8f8c --- /dev/null +++ b/assets/common/items/npc_armor/theropod/yale.ron @@ -0,0 +1,13 @@ +ItemDef( + legacy_name: "Yale Armor", + legacy_description: "Floofy to to fend off the cold.", + kind: Armor(( + kind: Chest, + stats: Direct(( + protection: Some(Normal(5.0)), + poise_resilience: Some(Normal(20.0)), + )), + )), + quality: High, + tags: [], +) diff --git a/assets/common/items/npc_weapons/unique/arthropods/antlion.ron b/assets/common/items/npc_weapons/unique/arthropods/antlion.ron index 9eab36d8f5..82323ad711 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/antlion.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/antlion.ron @@ -6,7 +6,7 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.01, - power: 0.5, + power: 1.0, effect_power: 1.0, speed: 1.0, range: 1.0, @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Epic, + quality: High, tags: [], ability_spec: Some(Custom("Antlion")), ) diff --git a/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron b/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron index 657e23949e..2d87b289a7 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/blackwidow.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Epic, + quality: High, tags: [], ability_spec: Some(Custom("Black Widow")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron b/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron index 503ea0c27d..2fed3acdbc 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/cavespider.ron @@ -6,10 +6,10 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.01, - power: 0.6, + power: 0.68, effect_power: 1.0, - speed: 0.6, - range: 0.8, + speed: 0.85, + range: 0.9, energy_efficiency: 1.0, buff_strength: 0.9, ), diff --git a/assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron b/assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron index 06e881ac41..a907b86f87 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/leafbeetle.ron @@ -6,15 +6,15 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.01, - power: 0.86, - effect_power: 1.0, - speed: 0.86, + power: 0.35, + effect_power: 0.4, + speed: 0.54, range: 1.0, energy_efficiency: 1.0, - buff_strength: 0.875, + buff_strength: 0.455, ), )), - quality: High, + quality: Common, tags: [], ability_spec: Some(Custom("Antlion")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/arthropods/moltencrawler.ron b/assets/common/items/npc_weapons/unique/arthropods/moltencrawler.ron new file mode 100644 index 0000000000..1da94c4b9c --- /dev/null +++ b/assets/common/items/npc_weapons/unique/arthropods/moltencrawler.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Molten Crawler", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 2.15, + effect_power: 0.9, + speed: 0.8, + range: 0.8, + energy_efficiency: 1.0, + buff_strength: 1.4, + ), + )), + quality: Moderate, + tags: [], + ability_spec: Some(Custom("Crawler")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/arthropods/mosscrawler.ron b/assets/common/items/npc_weapons/unique/arthropods/mosscrawler.ron index 56f0b289fc..56754f3850 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/mosscrawler.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/mosscrawler.ron @@ -6,15 +6,15 @@ ItemDef( hands: Two, stats: ( equip_time_secs: 0.01, - power: 0.72, - effect_power: 1.0, - speed: 0.72, + power: 2.1, + effect_power: 0.9, + speed: 0.9, range: 0.8, energy_efficiency: 1.0, - buff_strength: 0.6, + buff_strength: 1.3, ), )), quality: Moderate, tags: [], - ability_spec: Some(Custom("Weevil")), + ability_spec: Some(Custom("Crawler")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron b/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron index ca5fade24d..07ed8e17aa 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/tarantula.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Epic, + quality: Moderate, tags: [], ability_spec: Some(Custom("Tarantula")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/arthropods/weevil.ron b/assets/common/items/npc_weapons/unique/arthropods/weevil.ron index fca272b27c..04e4b99845 100644 --- a/assets/common/items/npc_weapons/unique/arthropods/weevil.ron +++ b/assets/common/items/npc_weapons/unique/arthropods/weevil.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: High, + quality: Common, tags: [], ability_spec: Some(Custom("Weevil")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/asp.ron b/assets/common/items/npc_weapons/unique/quadruped_low/asp.ron similarity index 94% rename from assets/common/items/npc_weapons/unique/asp.ron rename to assets/common/items/npc_weapons/unique/quadruped_low/asp.ron index d681e7d93f..f4cd75a79a 100644 --- a/assets/common/items/npc_weapons/unique/asp.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/asp.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Low, + quality: Moderate, tags: [], ability_spec: Some(Custom("Asp")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/basilisk.ron b/assets/common/items/npc_weapons/unique/quadruped_low/basilisk.ron similarity index 95% rename from assets/common/items/npc_weapons/unique/basilisk.ron rename to assets/common/items/npc_weapons/unique/quadruped_low/basilisk.ron index 6c3e3af031..2667a87168 100644 --- a/assets/common/items/npc_weapons/unique/basilisk.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/basilisk.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Low, + quality: Epic, tags: [], ability_spec: Some(Custom("Basilisk")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/deadwood.ron b/assets/common/items/npc_weapons/unique/quadruped_low/deadwood.ron similarity index 94% rename from assets/common/items/npc_weapons/unique/deadwood.ron rename to assets/common/items/npc_weapons/unique/quadruped_low/deadwood.ron index b7cbbca7aa..dfa8e2b49c 100644 --- a/assets/common/items/npc_weapons/unique/deadwood.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/deadwood.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Low, + quality: Moderate, tags: [], ability_spec: Some(Custom("Deadwood")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/hakulaq.ron b/assets/common/items/npc_weapons/unique/quadruped_low/hakulaq.ron new file mode 100644 index 0000000000..9d525e2905 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_low/hakulaq.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Hakulaq", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.65, + effect_power: 1.0, + speed: 0.8, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Moderate, + tags: [], + ability_spec: Some(Custom("Quad Low Basic")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/icedrake.ron b/assets/common/items/npc_weapons/unique/quadruped_low/icedrake.ron similarity index 95% rename from assets/common/items/npc_weapons/unique/icedrake.ron rename to assets/common/items/npc_weapons/unique/quadruped_low/icedrake.ron index c1d1de0e7f..b8eba04a58 100644 --- a/assets/common/items/npc_weapons/unique/icedrake.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/icedrake.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Low, + quality: High, tags: [], ability_spec: Some(Custom("Ice Drake")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron b/assets/common/items/npc_weapons/unique/quadruped_low/lavadrake.ron similarity index 88% rename from assets/common/items/npc_weapons/unique/quadlowbreathe.ron rename to assets/common/items/npc_weapons/unique/quadruped_low/lavadrake.ron index cddeaebc90..dd16c913ab 100644 --- a/assets/common/items/npc_weapons/unique/quadlowbreathe.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/lavadrake.ron @@ -1,5 +1,5 @@ ItemDef( - legacy_name: "Quad Low Breathe", + legacy_name: "Lava Drake", legacy_description: "testing123", kind: Tool(( kind: Natural, @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Low, + quality: High, tags: [], ability_spec: Some(Custom("Quad Low Breathe")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/maneater.ron b/assets/common/items/npc_weapons/unique/quadruped_low/maneater.ron similarity index 95% rename from assets/common/items/npc_weapons/unique/maneater.ron rename to assets/common/items/npc_weapons/unique/quadruped_low/maneater.ron index d19f3cc2d6..2013cf9e2b 100644 --- a/assets/common/items/npc_weapons/unique/maneater.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_low/maneater.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Low, + quality: High, tags: [], ability_spec: Some(Custom("Maneater")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_low/tortoise.ron b/assets/common/items/npc_weapons/unique/quadruped_low/tortoise.ron new file mode 100644 index 0000000000..7551aeb008 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_low/tortoise.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Tortoise", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.7, + effect_power: 0.9, + speed: 0.6, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Moderate, + tags: [], + ability_spec: Some(Custom("Quad Low Basic")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/alpaca.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/alpaca.ron new file mode 100644 index 0000000000..64a3f3d238 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/alpaca.ron @@ -0,0 +1,21 @@ +ItemDef( + legacy_name: "Alpaca", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 1.0, + effect_power: 1.05, + speed: 1.0, + crit_chance: 0.125, + range: 1.1, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Common, + tags: [], + ability_spec: Some(Custom("Quad Med Hoof")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/antelope.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/antelope.ron new file mode 100644 index 0000000000..c6eecd32cf --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/antelope.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Antelope", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.9, + effect_power: 1.0, + speed: 1.1, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Common, + tags: [], + ability_spec: Some(Custom("Quad Med Hoof")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/donkey.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/donkey.ron new file mode 100644 index 0000000000..70d419318c --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/donkey.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Donkey", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 1.1, + effect_power: 1.0, + speed: 0.9, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Common, + tags: [], + ability_spec: Some(Custom("Quad Med Hoof")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/grolgar.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/grolgar.ron new file mode 100644 index 0000000000..1bd33d0378 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/grolgar.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Grolgar", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 1.55, + effect_power: 1.0, + speed: 1.2, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: High, + tags: [], + ability_spec: Some(Custom("Quad Med Jump")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadmedhoof.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/horse.ron similarity index 88% rename from assets/common/items/npc_weapons/unique/quadmedhoof.ron rename to assets/common/items/npc_weapons/unique/quadruped_medium/horse.ron index 5d6a41183e..7c2df36d76 100644 --- a/assets/common/items/npc_weapons/unique/quadmedhoof.ron +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/horse.ron @@ -1,5 +1,5 @@ ItemDef( - legacy_name: "Quad Med Hoof", + legacy_name: "Horse", legacy_description: "testing123", kind: Tool(( kind: Natural, @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Low, + quality: Common, tags: [], ability_spec: Some(Custom("Quad Med Hoof")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/moose.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/moose.ron new file mode 100644 index 0000000000..b726536bd6 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/moose.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Moose", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.5, + effect_power: 1.0, + speed: 0.5, + range: 0.95, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Moderate, + tags: [], + ability_spec: Some(Custom("Quad Med Charge")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/mouflon.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/mouflon.ron new file mode 100644 index 0000000000..14db968bb6 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/mouflon.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Mouflon", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.35, + effect_power: 1.0, + speed: 0.35, + range: 0.9, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Common, + tags: [], + ability_spec: Some(Custom("Quad Med Charge")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_small/boar.ron b/assets/common/items/npc_weapons/unique/quadruped_small/boar.ron new file mode 100644 index 0000000000..25d123b546 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_small/boar.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Boar", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 1.13, + effect_power: 1.0, + speed: 1.15, + range: 1.25, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Common, + tags: [], + ability_spec: Some(Custom("Quad Small Basic")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_small/hyena.ron b/assets/common/items/npc_weapons/unique/quadruped_small/hyena.ron new file mode 100644 index 0000000000..e18988e157 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_small/hyena.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Hyena", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 1.77, + effect_power: 1.0, + speed: 1.5, + range: 1.3, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Moderate, + tags: [], + ability_spec: Some(Custom("Quad Small Basic")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_small/rodent.ron b/assets/common/items/npc_weapons/unique/quadruped_small/rodent.ron new file mode 100644 index 0000000000..25135b4496 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_small/rodent.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Rodent", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.07, + effect_power: 1.0, + speed: 1.8, + range: 0.8, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Low, + tags: [], + ability_spec: Some(Custom("Quad Small Basic")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron index f0e66ae730..c77ee05d1c 100644 --- a/assets/common/items/npc_weapons/unique/quadsmallbasic.ron +++ b/assets/common/items/npc_weapons/unique/quadsmallbasic.ron @@ -14,7 +14,7 @@ ItemDef( buff_strength: 1.0, ), )), - quality: Low, + quality: Common, tags: [], ability_spec: Some(Custom("Quad Small Basic")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/theropod/yale.ron b/assets/common/items/npc_weapons/unique/theropod/yale.ron new file mode 100644 index 0000000000..9da55b3470 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/theropod/yale.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Yale", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.76, + effect_power: 0.84, + speed: 0.9, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: High, + tags: [], + ability_spec: Some(Custom("Theropod Charge")), +) \ No newline at end of file diff --git a/assets/common/material_stats_manifest.ron b/assets/common/material_stats_manifest.ron index 42eb5d6a69..fe750b4074 100644 --- a/assets/common/material_stats_manifest.ron +++ b/assets/common/material_stats_manifest.ron @@ -22,7 +22,7 @@ ), "common.items.mineral.ingot.steel": ( equip_time_secs: 1.0, - power: 1.25, + power: 1.2, effect_power: 1.0, speed: 1.0, range: 1.0, @@ -31,7 +31,7 @@ ), "common.items.mineral.ingot.cobalt": ( equip_time_secs: 1.0, - power: 1.5, + power: 1.35, effect_power: 1.0, speed: 1.0, range: 1.0, @@ -40,7 +40,7 @@ ), "common.items.mineral.ingot.bloodsteel": ( equip_time_secs: 1.0, - power: 1.75, + power: 1.45, effect_power: 1.0, speed: 1.0, range: 1.0, @@ -49,7 +49,7 @@ ), "common.items.mineral.ingot.orichalcum": ( equip_time_secs: 1.0, - power: 2.0, + power: 1.5, effect_power: 1.0, speed: 1.0, range: 1.0, @@ -77,7 +77,7 @@ ), "common.items.log.hardwood": ( equip_time_secs: 1.0, - power: 1.25, + power: 1.2, effect_power: 1.0, speed: 1.0, range: 1.0, @@ -86,7 +86,7 @@ ), "common.items.log.ironwood": ( equip_time_secs: 1.0, - power: 1.5, + power: 1.35, effect_power: 1.0, speed: 1.0, range: 1.0, @@ -95,7 +95,7 @@ ), "common.items.log.frostwood": ( equip_time_secs: 1.0, - power: 1.75, + power: 1.45, effect_power: 1.0, speed: 1.0, range: 1.0, @@ -104,7 +104,7 @@ ), "common.items.log.eldwood": ( equip_time_secs: 1.0, - power: 2.0, + power: 1.5, effect_power: 1.0, speed: 1.0, range: 1.0, diff --git a/assets/voxygen/i18n/en/item/armor/npc.ftl b/assets/voxygen/i18n/en/item/armor/npc.ftl index d9714cc304..f2cc8e585a 100644 --- a/assets/voxygen/i18n/en/item/armor/npc.ftl +++ b/assets/voxygen/i18n/en/item/armor/npc.ftl @@ -7,15 +7,6 @@ common-items-npc_armor-pants-leather_blue = Blue Leather Guards common-items-npc_armor-pants-plate_red = Iron Legguards .desc = Greaves forged from iron. -common-items-npc_armor-quadruped_low-dagon = Dagon's Scales - .desc = Rigid enough to withstand the pressure of the deep ocean. - -common-items-npc_armor-quadruped_low-generic = Quad Low Generic - .desc = Scaly. - -common-items-npc_armor-quadruped_low-shell = Quad Low Shell - .desc = Shell. - common-items-npc_armor-bird_large-phoenix = Phoenix Armor .desc = The thickest feather you have ever seen! @@ -508,18 +499,81 @@ common-items-npc_armor-chest-plate_red = Iron Chestplate common-items-npc_armor-arthropod-generic = Arthropod Armor .desc = Worn by arthropods. +common-items-npc_armor-arthropod-leafbeetle = Leafbeetle Armor + .desc = Worn by arthropods. + +common-items-npc_armor-arthropod-weevil = Weevil Armor + .desc = Worn by arthropods. + +common-items-npc_armor-quadruped_low-basilisk = Basilisk Armor + .desc = Made up of heavy and thick plates. + +common-items-npc_armor-quadruped_low-crocodylia = Crocodylia Armor + .desc = Scaly. + +common-items-npc_armor-quadruped_low-dagon = Dagon's Scales + .desc = Rigid enough to withstand the pressure of the deep ocean. + +common-items-npc_armor-quadruped_low-drake = Drake Armor + .desc = Adaptive to temperature. + +common-items-npc_armor-quadruped_low-generic = Quad Low Generic + .desc = Scaly. + +common-items-npc_armor-quadruped_low-sandshark = Sand Shark Armor + .desc = How is it on land? + +common-items-npc_armor-quadruped_low-shell = Quad Low Shell + .desc = Shell. + +common-items-npc_armor-quadruped_low-snapper = Snapper Shell + .desc = 'Tis but a shell. + +common-items-npc_armor-quadruped_medium-bonerattler = Bonerattler Armor + .desc = Made out of its prey's bones to protect its supple hide. + +common-items-npc_armor-quadruped_medium-broad = Quadruped Medium Generalised Armor + .desc = Testing123. + +common-items-npc_armor-quadruped_medium-catoblepas = Catoblepas Armor + .desc = Thick and rigid. + +common-items-npc_armor-quadruped_medium-claysteed = Claysteeds's Thick Skin + .desc = Testing123. + +common-items-npc_armor-quadruped_medium-dreadhorn = Dreadhorn Armor + .desc = Thick and rigid. + +common-items-npc_armor-quadruped_medium-equus = Horse Armor + .desc = Testing123. + common-items-npc_armor-quadruped_medium-frostfang = Frostfang's Thick Skin .desc = Testing123. +common-items-npc_armor-quadruped_medium-hirdrasil = Hirdrasil's Blessing + .desc = Testing123. + common-items-npc_armor-quadruped_medium-roshwalr = Roshwalr's Thick Skin .desc = Testing123. -common-items-npc_armor-quadruped_medium-claysteed = Claysteeds's Thick Skin - .desc = Testing123. +common-items-npc_armor-quadruped_small-boar = Boar Armor + .desc = Worn by small beasties. + +common-items-npc_armor-quadruped_small-hyena = Hyena Armor + .desc = Worn by small beasties. + +common-items-npc_armor-quadruped_small-mossysnail = Mossy Shell + .desc = The sturdy home of a lil fella. + +common-items-npc_armor-theropod-raptor = Raptor Hide + .desc = Stronk. common-items-npc_armor-theropod-rugged = Theropod Rugged .desc = Stronk. +common-items-npc_armor-theropod-yale = Yale Armor + .desc = Floofy to to fend off the cold. + common-items-npc_armor-biped_large-cyclops = Cyclops Armor .desc = Made of mysteries. diff --git a/assets/voxygen/i18n/en/item/weapon/npc.ftl b/assets/voxygen/i18n/en/item/weapon/npc.ftl index b4749b1e5b..fe8b26ea4e 100644 --- a/assets/voxygen/i18n/en/item/weapon/npc.ftl +++ b/assets/voxygen/i18n/en/item/weapon/npc.ftl @@ -115,12 +115,6 @@ common-items-npc_weapons-sword-haniwa_general_sword = Haniwa General Sword common-items-npc_weapons-unique-akhlut = Quad Med Basic .desc = testing123 -common-items-npc_weapons-unique-asp = Asp - .desc = testing123 - -common-items-npc_weapons-unique-basilisk = Basilisk - .desc = testing123 - common-items-npc_weapons-unique-beast_claws = Beast Claws .desc = Was attached to a beast. @@ -331,6 +325,9 @@ common-items-npc_weapons-unique-arthropods-hornbeetle = Horn Beetle common-items-npc_weapons-unique-arthropods-leafbeetle = Leaf Beetle .desc = testing123 +common-items-npc_weapons-unique-arthropods-moltencrawler = Molten Crawler + .desc = testing123 + common-items-npc_weapons-unique-arthropods-mosscrawler = Moss Crawler .desc = testing123 @@ -340,6 +337,63 @@ common-items-npc_weapons-unique-arthropods-tarantula = Tarantula common-items-npc_weapons-unique-arthropods-weevil = Weevil .desc = testing123 +common-items-npc_weapons-unique-quadruped_low-asp = Asp + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_low-basilisk = Basilisk + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_low-deadwood = Deadwood + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_low-hakulaq = Hakulaq + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_low-icedrake = Ice Drake + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_low-lavadrake = Lava Drake + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_low-maneater = Maneater + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_low-tortoise = Tortoise + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_medium-alpaca = Alpaca + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_medium-antelope = Antelope + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_medium-donkey = Donkey + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_medium-grolgar = Grolgar + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_medium-horse = Horse + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_medium-moose = Moose + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_medium-mouflon = Mouflon + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_small-boar = Boar + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_small-hyena = Hyena + .desc = testing123 + +common-items-npc_weapons-unique-quadruped_small-rodent = Rodent + .desc = testing123 + +common-items-npc_weapons-unique-theropod-yale = Yale + .desc = testing123 + common-items-npc_weapons-hammer-bipedlarge-cultist = Giant Cultist Warhammer .desc = This belonged to an evil Cult Leader. diff --git a/assets/voxygen/voxel/object_manifest.ron b/assets/voxygen/voxel/object_manifest.ron index 6c2bd0aca1..ac62ed2148 100644 --- a/assets/voxygen/voxel/object_manifest.ron +++ b/assets/voxygen/voxel/object_manifest.ron @@ -1041,4 +1041,14 @@ central: ("armor.empty"), ) ), + Pebble: ( + bone0: ( + offset: (0.0, 0.0, 0.0), + central: ("weapon.projectile.pebble"), + ), + bone1: ( + offset: (0.0, 0.0, 0.0), + central: ("armor.empty"), + ) + ), }) diff --git a/assets/voxygen/voxel/weapon/projectile/pebble.vox b/assets/voxygen/voxel/weapon/projectile/pebble.vox new file mode 100644 index 0000000000..218422d525 --- /dev/null +++ b/assets/voxygen/voxel/weapon/projectile/pebble.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59f14f9298a9674a15e7937a90ce71736ce9f7b94a6bbae61355e2fe74c683ce +size 1324 diff --git a/assets/world/manifests/spots_general/mage_tower.ron b/assets/world/manifests/spots_general/mage_tower.ron index d4ab0018ce..ee595cf212 100644 --- a/assets/world/manifests/spots_general/mage_tower.ron +++ b/assets/world/manifests/spots_general/mage_tower.ron @@ -18,7 +18,7 @@ 241: EntitySpawner("common.entity.spot.wizard.wizard_haku", 1.0), 242: EntitySpawner("common.entity.spot.wizard.novice", 1.0), 243: EntitySpawner("common.entity.spot.wizard.adept", 1.0), - 245: EntitySpawner("common.entity.wild.aggressive.bat", 0.4), + 245: EntitySpawner("common.entity.wild.peaceful.bat", 0.4), 246: Sprite(WallLampWizard), 249: RotatedSprite(DoorDark, 8), 250: RotatedSprite(DoorDark, 4), diff --git a/assets/world/manifests/spots_general/troll_cave.ron b/assets/world/manifests/spots_general/troll_cave.ron index 1b440bbf6e..b203ea4017 100644 --- a/assets/world/manifests/spots_general/troll_cave.ron +++ b/assets/world/manifests/spots_general/troll_cave.ron @@ -10,7 +10,7 @@ 242: Sprite(Mushroom), 243: Sprite(CommonLockedChest), 244: Sprite(Bones), - 245: EntitySpawner("common.entity.wild.aggressive.bat", 0.4), + 245: EntitySpawner("common.entity.wild.peaceful.bat", 0.4), }, ), ] diff --git a/assets/world/manifests/spots_general/troll_cave_mountain.ron b/assets/world/manifests/spots_general/troll_cave_mountain.ron index 19dc19391d..27d0e129a5 100644 --- a/assets/world/manifests/spots_general/troll_cave_mountain.ron +++ b/assets/world/manifests/spots_general/troll_cave_mountain.ron @@ -10,7 +10,7 @@ 242: Sprite(Mushroom), 243: Sprite(CommonLockedChest), 244: Sprite(Bones), - 245: EntitySpawner("common.entity.wild.aggressive.bat", 0.4), + 245: EntitySpawner("common.entity.wild.peaceful.bat", 0.4), }, ), ] diff --git a/assets/world/manifests/spots_general/troll_cave_swamp.ron b/assets/world/manifests/spots_general/troll_cave_swamp.ron index bf19c0ef96..dd245152c1 100644 --- a/assets/world/manifests/spots_general/troll_cave_swamp.ron +++ b/assets/world/manifests/spots_general/troll_cave_swamp.ron @@ -10,7 +10,7 @@ 242: Sprite(Mushroom), 243: Sprite(CommonLockedChest), 244: Sprite(Bones), - 245: EntitySpawner("common.entity.wild.aggressive.bat", 0.4), + 245: EntitySpawner("common.entity.wild.peaceful.bat", 0.4), }, ), ] diff --git a/assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron b/assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron index af554d35c0..b6be786a2a 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron @@ -5,7 +5,7 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (4, 8, "common.entity.wild.peaceful.bat")), (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron b/assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron index 1dd4efd1e5..fb5cfc16e1 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron @@ -5,7 +5,7 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (4, 8, "common.entity.wild.peaceful.bat")), (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron b/assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron index 95b857dd62..91c3aac5ae 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron @@ -5,7 +5,7 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (4, 8, "common.entity.wild.peaceful.bat")), (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron b/assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron index 25b79d28fb..7e131798bd 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron @@ -5,7 +5,7 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (4, 8, "common.entity.wild.peaceful.bat")), (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron b/assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron index 2c0af0bdb6..7d6ea8ed93 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron @@ -5,7 +5,7 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (4, 8, "common.entity.wild.peaceful.bat")), (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron b/assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron index 6a2415cf2e..046889c287 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron @@ -5,7 +5,7 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (4, 8, "common.entity.wild.peaceful.bat")), (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron b/assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron index a0da91abe7..aafe9dc6e0 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron @@ -5,7 +5,7 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (4, 8, "common.entity.wild.peaceful.bat")), (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/desert/rock.ron b/assets/world/wildlife/spawn/desert/rock.ron index 910a5b2a21..4402f96401 100644 --- a/assets/world/wildlife/spawn/desert/rock.ron +++ b/assets/world/wildlife/spawn/desert/rock.ron @@ -5,10 +5,10 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.wild.aggressive.rocksnapper")), - (2, (1, 1, "common.entity.wild.aggressive.dodarock")), + (4, (1, 1, "common.entity.wild.aggressive.dodarock")), (5, (1, 3, "common.entity.wild.peaceful.gecko")), (5, (1, 2, "common.entity.wild.peaceful.sand_hare")), - (5, (1, 1, "common.entity.wild.aggressive.bonerattler")), + (3, (1, 1, "common.entity.wild.aggressive.bonerattler")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/desert/wasteland.ron b/assets/world/wildlife/spawn/desert/wasteland.ron index 493a6a5206..a7ea900929 100644 --- a/assets/world/wildlife/spawn/desert/wasteland.ron +++ b/assets/world/wildlife/spawn/desert/wasteland.ron @@ -5,13 +5,13 @@ SpawnEntry ( Pack( groups: [ // Casual - (100, (1, 1, "common.entity.wild.aggressive.sandshark")), - (80, (1, 1, "common.entity.wild.peaceful.eagle")), + (5, (1, 1, "common.entity.wild.aggressive.sandshark")), + (4, (1, 1, "common.entity.wild.peaceful.eagle")), // Rare - (20, (1, 1, "common.entity.wild.aggressive.archaeos")), - (20, (1, 1, "common.entity.wild.aggressive.ntouka")), - (20, (1, 1, "common.entity.wild.aggressive.tarantula")), - (20, (1, 1, "common.entity.wild.aggressive.ogre")), + (1, (1, 1, "common.entity.wild.aggressive.archaeos")), + (1, (1, 1, "common.entity.wild.aggressive.ntouka")), + (1, (1, 1, "common.entity.wild.aggressive.tarantula")), + (2, (1, 1, "common.entity.wild.aggressive.ogre")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/jungle/rainforest.ron b/assets/world/wildlife/spawn/jungle/rainforest.ron index 16d8ed6106..a72c6f79e1 100644 --- a/assets/world/wildlife/spawn/jungle/rainforest.ron +++ b/assets/world/wildlife/spawn/jungle/rainforest.ron @@ -6,26 +6,29 @@ SpawnEntry ( groups: [ // Casual (5, (1, 1, "common.entity.wild.aggressive.tiger")), - (5, (1, 1, "common.entity.wild.aggressive.maneater")), - (5, (1, 3, "common.entity.wild.aggressive.wood_raptor")), + (3, (1, 1, "common.entity.wild.aggressive.maneater")), + (4, (2, 3, "common.entity.wild.aggressive.wood_raptor")), (5, (1, 1, "common.entity.wild.aggressive.deadwood")), - (5, (1, 1, "common.entity.wild.peaceful.dodo")), + (5, (2, 6, "common.entity.wild.peaceful.dodo")), // Rare - (1, (1, 1, "common.entity.wild.aggressive.sunlizard")), + (4, (1, 1, "common.entity.wild.aggressive.sunlizard")), (1, (1, 1, "common.entity.wild.aggressive.odonto")), - (1, (1, 1, "common.entity.wild.aggressive.mighty_saurok")), - (1, (1, 1, "common.entity.wild.aggressive.occult_saurok")), - (1, (1, 1, "common.entity.wild.aggressive.sly_saurok")), - (1, (1, 1, "common.entity.wild.aggressive.mossdrake")), + (2, (1, 3, "common.entity.wild.aggressive.mighty_saurok")), + (2, (1, 3, "common.entity.wild.aggressive.occult_saurok")), + (2, (1, 3, "common.entity.wild.aggressive.sly_saurok")), + (3, (1, 1, "common.entity.wild.aggressive.mossdrake")), ], spawn_mode: Land, day_period: [Morning, Noon, Evening], ), Pack( groups: [ - (1, (1, 1, "common.entity.wild.aggressive.tiger")), - (1, (1, 1, "common.entity.wild.aggressive.maneater")), - (1, (1, 1, "common.entity.wild.aggressive.cockatrice")), + (5, (2, 3, "common.entity.wild.aggressive.wood_raptor")), + (5, (1, 1, "common.entity.wild.aggressive.deadwood")), + (4, (1, 1, "common.entity.wild.aggressive.tiger")), + (4, (1, 1, "common.entity.wild.aggressive.maneater")), + (2, (1, 1, "common.entity.wild.aggressive.cockatrice")), + (1, (1, 1, "common.entity.wild.aggressive.odonto")), ], spawn_mode: Land, day_period: [Night], diff --git a/assets/world/wildlife/spawn/jungle/rainforest_area.ron b/assets/world/wildlife/spawn/jungle/rainforest_area.ron index 4a6412c8e1..6ccb3c6922 100644 --- a/assets/world/wildlife/spawn/jungle/rainforest_area.ron +++ b/assets/world/wildlife/spawn/jungle/rainforest_area.ron @@ -5,29 +5,39 @@ SpawnEntry ( Pack( groups: [ // Casual - (5, (1, 1, "common.entity.wild.peaceful.parrot")), - (5, (1, 1, "common.entity.wild.peaceful.quokka")), - (5, (1, 1, "common.entity.wild.peaceful.parakeet")), + (4, (1, 1, "common.entity.wild.peaceful.parrot")), + (4, (1, 1, "common.entity.wild.peaceful.parakeet")), + (4, (1, 1, "common.entity.wild.peaceful.toucan")), + (3, (1, 1, "common.entity.wild.peaceful.peacock")), // Rare (1, (1, 1, "common.entity.wild.aggressive.tarasque")), - (1, (1, 1, "common.entity.wild.peaceful.tortoise")), - (1, (1, 1, "common.entity.wild.aggressive.monitor")), - (1, (1, 1, "common.entity.wild.aggressive.horn_beetle")), - (1, (1, 1, "common.entity.wild.aggressive.stag_beetle")), - (1, (1, 1, "common.entity.wild.peaceful.crawler_moss")), - (1, (1, 1, "common.entity.wild.aggressive.rootsnapper")), - (1, (1, 1, "common.entity.wild.aggressive.axebeak")), - (1, (1, 1, "common.entity.wild.peaceful.toucan")), - (1, (1, 1, "common.entity.wild.peaceful.peacock")), + (3, (1, 1, "common.entity.wild.peaceful.tortoise")), + (3, (1, 1, "common.entity.wild.aggressive.monitor")), + (3, (1, 1, "common.entity.wild.peaceful.crawler_moss")), + (2, (1, 1, "common.entity.wild.aggressive.rootsnapper")), + (2, (1, 1, "common.entity.wild.aggressive.axebeak")), (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")), ], spawn_mode: Land, - day_period: [Morning, Noon, Evening], + day_period: [Morning, Noon], + ), + Pack( + groups: [ + (1, (1, 1, "common.entity.wild.peaceful.quokka")), + (1, (1, 1, "common.entity.wild.aggressive.tarasque")), + (2, (1, 1, "common.entity.wild.aggressive.horn_beetle")), + (2, (1, 1, "common.entity.wild.aggressive.stag_beetle")), + (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")), + ], + spawn_mode: Land, + day_period: [Evening], ), Pack( groups: [ (5, (1, 1, "common.entity.wild.peaceful.quokka")), - (1, (1, 1, "common.entity.wild.peaceful.tortoise")), + (1, (1, 1, "common.entity.wild.aggressive.tarasque")), + (1, (1, 1, "common.entity.wild.aggressive.horn_beetle")), + (1, (1, 1, "common.entity.wild.aggressive.stag_beetle")), (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/taiga/area.ron b/assets/world/wildlife/spawn/taiga/area.ron index fe986739e6..ac68b76db1 100644 --- a/assets/world/wildlife/spawn/taiga/area.ron +++ b/assets/world/wildlife/spawn/taiga/area.ron @@ -4,36 +4,39 @@ SpawnEntry ( rules: [ Pack( groups: [ - (1, (1, 1, "common.entity.wild.aggressive.bear")), - (1, (1, 1, "common.entity.wild.peaceful.eagle")), - (1, (1, 1, "common.entity.wild.peaceful.horned_owl")), - (1, (1, 1, "common.entity.wild.peaceful.moose")), - (1, (1, 1, "common.entity.wild.peaceful.tuskram")), - (1, (1, 1, "common.entity.wild.aggressive.bristleback")), - (1, (1, 4, "common.entity.wild.peaceful.crow")), - (1, (1, 7, "common.entity.wild.peaceful.deer")), - (1, (1, 7, "common.entity.wild.peaceful.jackalope")), - (1, (1, 7, "common.entity.wild.peaceful.boar")), - (1, (5, 10, "common.entity.wild.peaceful.sheep")), - (1, (1, 2, "common.entity.wild.peaceful.squirrel")), - (1, (5, 10, "common.entity.wild.peaceful.goat")), - (1, (3, 8, "common.entity.wild.peaceful.llama")), - (1, (1, 2, "common.entity.wild.peaceful.donkey")), - (1, (1, 1, "common.entity.wild.peaceful.skunk")), - (1, (1, 1, "common.entity.wild.peaceful.raccoon")), + (2, (1, 1, "common.entity.wild.aggressive.bear")), + (2, (1, 1, "common.entity.wild.peaceful.eagle")), + (2, (1, 1, "common.entity.wild.peaceful.moose")), + (2, (1, 1, "common.entity.wild.peaceful.tuskram")), + (2, (1, 1, "common.entity.wild.aggressive.bristleback")), + (2, (1, 4, "common.entity.wild.peaceful.crow")), + (3, (1, 7, "common.entity.wild.peaceful.deer")), + (3, (1, 7, "common.entity.wild.peaceful.jackalope")), + (3, (2, 5, "common.entity.wild.peaceful.boar")), + (2, (5, 10, "common.entity.wild.peaceful.sheep")), + (3, (1, 2, "common.entity.wild.peaceful.squirrel")), + (2, (5, 10, "common.entity.wild.peaceful.goat")), + (3, (3, 8, "common.entity.wild.peaceful.llama")), + (2, (1, 2, "common.entity.wild.peaceful.donkey")), + (3, (1, 1, "common.entity.wild.peaceful.skunk")), + (3, (1, 1, "common.entity.wild.peaceful.raccoon")), (1, (1, 1, "common.entity.wild.peaceful.catoblepas")), - (1, (1, 1, "common.entity.wild.peaceful.truffler")), + (3, (1, 1, "common.entity.wild.peaceful.truffler")), (1, (1, 1, "common.entity.wild.aggressive.tarasque")), - (1, (1, 1, "common.entity.wild.aggressive.saber")), + (2, (1, 1, "common.entity.wild.aggressive.saber")), ], spawn_mode: Land, day_period: [Morning, Noon, Evening], ), Pack( groups: [ - (5, (1, 3, "common.entity.wild.peaceful.squirrel")), - (5, (1, 1, "common.entity.wild.peaceful.forest_fox")), - (5, (1, 3, "common.entity.wild.peaceful.raccoon")), + (10, (1, 3, "common.entity.wild.peaceful.squirrel")), + (10, (1, 1, "common.entity.wild.peaceful.forest_fox")), + (10, (1, 3, "common.entity.wild.peaceful.raccoon")), + (8, (1, 1, "common.entity.wild.peaceful.horned_owl")), + (4, (1, 1, "common.entity.wild.aggressive.bear")), + (1, (1, 1, "common.entity.wild.aggressive.tarasque")), + (1, (1, 1, "common.entity.wild.peaceful.catoblepas")), // TODO: Maybe reenable once the dullahan design is more carefully considered, or move it elsewhere (i.e: such as a haunted/ruins site) //(2, (1, 1, "common.entity.wild.aggressive.dullahan")), ], diff --git a/assets/world/wildlife/spawn/taiga/core_forest.ron b/assets/world/wildlife/spawn/taiga/core_forest.ron index d362ba6f9f..920b4bba05 100644 --- a/assets/world/wildlife/spawn/taiga/core_forest.ron +++ b/assets/world/wildlife/spawn/taiga/core_forest.ron @@ -12,7 +12,7 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.wild.aggressive.dreadhorn")), - (1, (1, 1, "common.entity.wild.aggressive.irrwurz")), + (4, (1, 1, "common.entity.wild.aggressive.irrwurz")), ], spawn_mode: Land, day_period: [Night], diff --git a/assets/world/wildlife/spawn/temperate/plains.ron b/assets/world/wildlife/spawn/temperate/plains.ron index 4f5753c1ce..35cca6e5c5 100644 --- a/assets/world/wildlife/spawn/temperate/plains.ron +++ b/assets/world/wildlife/spawn/temperate/plains.ron @@ -14,7 +14,6 @@ SpawnEntry ( (5, (1, 1, "common.entity.wild.peaceful.leaf_beetle")), (5, (1, 1, "common.entity.wild.peaceful.bushly")), (5, (1, 1, "common.entity.wild.peaceful.driggle")), - (1, (1, 1, "common.entity.wild.aggressive.ogre")), ], spawn_mode: Land, day_period: [Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/temperate/wood.ron b/assets/world/wildlife/spawn/temperate/wood.ron index 18da6bff7e..f1174cb4e7 100644 --- a/assets/world/wildlife/spawn/temperate/wood.ron +++ b/assets/world/wildlife/spawn/temperate/wood.ron @@ -5,16 +5,16 @@ SpawnEntry ( Pack( groups: [ // Aggressive - (5, (1, 1, "common.entity.wild.aggressive.weevil")), + (4, (1, 1, "common.entity.wild.aggressive.weevil")), // Peaceful (5, (1, 1, "common.entity.wild.peaceful.skunk")), (5, (1, 4, "common.entity.wild.peaceful.crow")), - (5, (1, 1, "common.entity.wild.peaceful.leaf_beetle")), - (5, (1, 7, "common.entity.wild.peaceful.deer")), + (4, (1, 1, "common.entity.wild.peaceful.leaf_beetle")), + (4, (1, 7, "common.entity.wild.peaceful.deer")), (5, (1, 7, "common.entity.wild.peaceful.rabbit")), (5, (1, 2, "common.entity.wild.peaceful.squirrel")), - (5, (1, 1, "common.entity.wild.peaceful.mossy_snail")), - (5, (1, 1, "common.entity.wild.peaceful.treant_sapling")), + (4, (1, 1, "common.entity.wild.peaceful.mossy_snail")), + (4, (1, 1, "common.entity.wild.peaceful.treant_sapling")), (5, (1, 1, "common.entity.wild.peaceful.raccoon")), (5, (1, 1, "common.entity.wild.peaceful.turtle")), (5, (1, 2, "common.entity.wild.peaceful.frog")), @@ -27,11 +27,13 @@ SpawnEntry ( Pack( groups: [ // Solitary - (1, (1, 1, "common.entity.wild.peaceful.forest_fox")), + (20, (1, 1, "common.entity.wild.peaceful.forest_fox")), + (1, (1, 1, "common.entity.wild.peaceful.hirdrasil")), // Pack - (1, (1, 3, "common.entity.wild.peaceful.rat")), - (1, (1, 3, "common.entity.wild.peaceful.squirrel")), - (1, (1, 3, "common.entity.wild.peaceful.raccoon")), + (20, (1, 3, "common.entity.wild.peaceful.rat")), + (20, (1, 3, "common.entity.wild.peaceful.squirrel")), + (20, (1, 3, "common.entity.wild.peaceful.raccoon")), + (20, (1, 2, "common.entity.wild.peaceful.fungome")), ], spawn_mode: Land, day_period: [Night], diff --git a/assets/world/wildlife/spawn/tropical/beach.ron b/assets/world/wildlife/spawn/tropical/beach.ron index 2282be4118..1b7dff703e 100644 --- a/assets/world/wildlife/spawn/tropical/beach.ron +++ b/assets/world/wildlife/spawn/tropical/beach.ron @@ -4,8 +4,8 @@ SpawnEntry ( rules: [ Pack( groups: [ - (3, (1, 3, "common.entity.wild.aggressive.sea_crocodile")), - (3, (8, 16, "common.entity.wild.peaceful.crab")), + (2, (1, 3, "common.entity.wild.aggressive.sea_crocodile")), + (4, (8, 16, "common.entity.wild.peaceful.crab")), (1, (1, 1, "common.entity.wild.aggressive.reefsnapper")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/tropical/rainforest.ron b/assets/world/wildlife/spawn/tropical/rainforest.ron index 40eadb87ea..c16a02e1c1 100644 --- a/assets/world/wildlife/spawn/tropical/rainforest.ron +++ b/assets/world/wildlife/spawn/tropical/rainforest.ron @@ -4,13 +4,13 @@ SpawnEntry ( rules: [ Pack( groups: [ - (5, (1, 2, "common.entity.wild.aggressive.male_lion")), - (5, (1, 3, "common.entity.wild.aggressive.hyena")), - (5, (3, 6, "common.entity.wild.peaceful.zebra")), - (5, (3, 6, "common.entity.wild.peaceful.antelope")), - (5, (1, 1, "common.entity.wild.peaceful.porcupine")), - (5, (1, 1, "common.entity.wild.peaceful.pangolin")), - (5, (1, 1, "common.entity.wild.aggressive.tarantula")), + (5, (2, 3, "common.entity.wild.aggressive.male_lion")), + (5, (2, 5, "common.entity.wild.aggressive.hyena")), + (6, (3, 6, "common.entity.wild.peaceful.zebra")), + (6, (3, 6, "common.entity.wild.peaceful.antelope")), + (6, (1, 1, "common.entity.wild.peaceful.porcupine")), + (6, (1, 1, "common.entity.wild.peaceful.pangolin")), + (4, (1, 1, "common.entity.wild.aggressive.tarantula")), (1, (1, 1, "common.entity.wild.aggressive.ngoubou")), ], spawn_mode: Land, diff --git a/assets/world/wildlife/spawn/tundra/core.ron b/assets/world/wildlife/spawn/tundra/core.ron index 42ee0eaf86..f0826fb9cf 100644 --- a/assets/world/wildlife/spawn/tundra/core.ron +++ b/assets/world/wildlife/spawn/tundra/core.ron @@ -4,11 +4,11 @@ SpawnEntry ( rules: [ Pack( groups: [ - (1, (1, 1, "common.entity.wild.aggressive.snow_raptor")), - (1, (1, 1, "common.entity.wild.aggressive.wendigo")), - (1, (2, 6, "common.entity.wild.peaceful.mammoth")), - (1, (1, 3, "common.entity.wild.peaceful.yak")), - (1, (1, 1, "common.entity.wild.aggressive.mountain_troll")), + (3, (2, 4, "common.entity.wild.aggressive.snow_raptor")), + (2, (1, 1, "common.entity.wild.aggressive.wendigo")), + (1, (2, 3, "common.entity.wild.peaceful.mammoth")), + (3, (2, 6, "common.entity.wild.peaceful.yak")), + (2, (1, 1, "common.entity.wild.aggressive.mountain_troll")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/tundra/forest.ron b/assets/world/wildlife/spawn/tundra/forest.ron index 10fcb73c10..b2d90be05e 100644 --- a/assets/world/wildlife/spawn/tundra/forest.ron +++ b/assets/world/wildlife/spawn/tundra/forest.ron @@ -4,10 +4,10 @@ SpawnEntry ( rules: [ Pack( groups: [ - (1, (1, 1, "common.entity.wild.aggressive.frostfang")), - (1, (1, 1, "common.entity.wild.aggressive.snow_leopard")), + (2, (2, 3, "common.entity.wild.aggressive.frostfang")), + (3, (1, 1, "common.entity.wild.aggressive.snow_leopard")), (1, (1, 1, "common.entity.wild.aggressive.yale")), - (1, (1, 1, "common.entity.wild.aggressive.grolgar")), + (2, (1, 1, "common.entity.wild.aggressive.grolgar")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/tundra/snow.ron b/assets/world/wildlife/spawn/tundra/snow.ron index ba63fb1b84..1de51e83e9 100644 --- a/assets/world/wildlife/spawn/tundra/snow.ron +++ b/assets/world/wildlife/spawn/tundra/snow.ron @@ -4,8 +4,8 @@ SpawnEntry ( rules: [ Pack( groups: [ - (1, (1, 3, "common.entity.wild.aggressive.frostfang")), - (1, (1, 3, "common.entity.wild.aggressive.snow_raptor")), + (1, (2, 3, "common.entity.wild.aggressive.frostfang")), + (1, (2, 4, "common.entity.wild.aggressive.snow_raptor")), (1, (1, 1, "common.entity.wild.peaceful.snowy_owl")), (1, (1, 1, "common.entity.wild.peaceful.arctic_fox")), ], diff --git a/common/src/combat.rs b/common/src/combat.rs index d81e331dec..fbc9e589ff 100644 --- a/common/src/combat.rs +++ b/common/src/combat.rs @@ -989,7 +989,7 @@ pub enum DamageKind { Energy, } -const PIERCING_PENETRATION_FRACTION: f32 = 1.5; +const PIERCING_PENETRATION_FRACTION: f32 = 0.5; const SLASHING_ENERGY_FRACTION: f32 = 0.5; const CRUSHING_POISE_FRACTION: f32 = 1.0; diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs index 04f23f7fd1..d7041483e1 100644 --- a/common/src/comp/agent.rs +++ b/common/src/comp/agent.rs @@ -1,7 +1,7 @@ use crate::{ comp::{ - arthropod, biped_large, biped_small, bird_medium, humanoid, quadruped_low, - quadruped_medium, quadruped_small, ship, Body, UtteranceKind, + biped_large, biped_small, bird_medium, humanoid, quadruped_low, quadruped_medium, + quadruped_small, ship, Body, UtteranceKind, }, path::Chaser, rtsim::{NpcInput, RtSimController}, @@ -278,51 +278,75 @@ impl<'a> From<&'a Body> for Psyche { }, Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species { quadruped_small::Species::Pig => 0.5, - quadruped_small::Species::Fox => 0.7, - quadruped_small::Species::Sheep => 0.6, + quadruped_small::Species::Fox => 0.3, + quadruped_small::Species::Sheep => 0.25, quadruped_small::Species::Boar => 0.1, quadruped_small::Species::Skunk => 0.4, - quadruped_small::Species::Cat => 0.9, + quadruped_small::Species::Cat => 0.99, quadruped_small::Species::Batfox => 0.1, - quadruped_small::Species::Raccoon => 0.6, - quadruped_small::Species::Hyena => 0.2, + quadruped_small::Species::Raccoon => 0.4, + quadruped_small::Species::Hyena => 0.1, quadruped_small::Species::Dog => 0.8, - quadruped_small::Species::Rabbit => 0.7, - quadruped_small::Species::Truffler => 0.2, + quadruped_small::Species::Rabbit | quadruped_small::Species::Jackalope => 0.25, + quadruped_small::Species::Truffler => 0.08, quadruped_small::Species::Hare => 0.3, - quadruped_small::Species::Goat => 0.5, - quadruped_small::Species::Porcupine => 0.7, - quadruped_small::Species::Turtle => 0.7, - quadruped_small::Species::Beaver => 0.7, + quadruped_small::Species::Goat => 0.3, + quadruped_small::Species::Porcupine => 0.2, + quadruped_small::Species::Turtle => 0.4, + quadruped_small::Species::Beaver => 0.2, // FIXME: This is to balance for enemy rats in dungeons // Normal rats should probably always flee. quadruped_small::Species::Rat | quadruped_small::Species::TreantSapling | quadruped_small::Species::Holladon - | quadruped_small::Species::Jackalope => 0.0, + | quadruped_small::Species::MossySnail => 0.0, _ => 1.0, }, Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species { - quadruped_medium::Species::Frostfang => 0.1, - quadruped_medium::Species::Catoblepas => 0.2, - quadruped_medium::Species::Darkhound => 0.1, - quadruped_medium::Species::Dreadhorn => 0.2, - quadruped_medium::Species::Bonerattler => 0.0, - quadruped_medium::Species::Tiger => 0.1, - quadruped_medium::Species::Roshwalr => 0.0, - quadruped_medium::Species::ClaySteed => 0.0, - _ => 0.3, + // T1 + quadruped_medium::Species::Antelope => 0.15, + quadruped_medium::Species::Donkey => 0.05, + quadruped_medium::Species::Horse => 0.15, + quadruped_medium::Species::Mouflon => 0.1, + quadruped_medium::Species::Zebra => 0.1, + // T2 + // Should probably not have non-grouped, hostile animals flee until fleeing is + // improved. + quadruped_medium::Species::Barghest + | quadruped_medium::Species::Bear + | quadruped_medium::Species::Bristleback + | quadruped_medium::Species::Bonerattler => 0.0, + quadruped_medium::Species::Cattle => 0.1, + quadruped_medium::Species::Frostfang => 0.07, + quadruped_medium::Species::Grolgar => 0.0, + quadruped_medium::Species::Highland => 0.05, + quadruped_medium::Species::Kelpie => 0.35, + quadruped_medium::Species::Lion => 0.0, + quadruped_medium::Species::Moose => 0.15, + quadruped_medium::Species::Panda => 0.35, + quadruped_medium::Species::Saber + | quadruped_medium::Species::Tarasque + | quadruped_medium::Species::Tiger => 0.0, + quadruped_medium::Species::Tuskram => 0.1, + quadruped_medium::Species::Wolf => 0.2, + quadruped_medium::Species::Yak => 0.09, + // T3A + quadruped_medium::Species::Akhlut + | quadruped_medium::Species::Catoblepas + | quadruped_medium::Species::ClaySteed + | quadruped_medium::Species::Dreadhorn + | quadruped_medium::Species::Hirdrasil + | quadruped_medium::Species::Mammoth + | quadruped_medium::Species::Ngoubou + | quadruped_medium::Species::Roshwalr => 0.0, + _ => 0.15, }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { - quadruped_low::Species::Salamander | quadruped_low::Species::Elbst => 0.2, - quadruped_low::Species::Monitor => 0.3, - quadruped_low::Species::Pangolin => 0.6, - quadruped_low::Species::Tortoise => 0.2, - quadruped_low::Species::Rocksnapper => 0.05, - quadruped_low::Species::Rootsnapper => 0.05, - quadruped_low::Species::Reefsnapper => 0.05, - quadruped_low::Species::Asp => 0.05, - quadruped_low::Species::HermitAlligator => 0.0, + // T1 + quadruped_low::Species::Pangolin => 0.3, + // T2, + quadruped_low::Species::Tortoise => 0.1, + // There are a lot of hostile, solo entities. _ => 0.0, }, Body::BipedSmall(biped_small) => match biped_small.species { @@ -334,7 +358,8 @@ impl<'a> From<&'a Body> for Psyche { biped_small::Species::Husk | biped_small::Species::Boreal | biped_small::Species::Clockwork - | biped_small::Species::Flamekeeper => 0.0, + | biped_small::Species::Flamekeeper + | biped_small::Species::Irrwurz => 0.0, _ => 0.5, }, @@ -366,21 +391,7 @@ impl<'a> From<&'a Body> for Psyche { Body::Theropod(_) => 0.0, Body::Ship(_) => 0.0, Body::Dragon(_) => 0.0, - Body::Arthropod(arthropod) => match arthropod.species { - arthropod::Species::Tarantula => 0.0, - arthropod::Species::Blackwidow => 0.0, - arthropod::Species::Antlion => 0.0, - arthropod::Species::Hornbeetle => 0.1, - arthropod::Species::Leafbeetle => 0.1, - arthropod::Species::Stagbeetle => 0.1, - arthropod::Species::Weevil => 0.0, - arthropod::Species::Cavespider => 0.0, - arthropod::Species::Moltencrawler => 0.2, - arthropod::Species::Mosscrawler => 0.2, - arthropod::Species::Sandcrawler => 0.2, - arthropod::Species::Dagonite => 0.2, - arthropod::Species::Emberfly => 0.1, - }, + Body::Arthropod(_) => 0.0, Body::Crustacean(_) => 0.0, }, sight_dist: match body { diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index c52e794bfd..50403d7855 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -644,9 +644,9 @@ impl Body { arthropod::Species::Blackwidow => Vec3::new(4.0, 4.0, 2.0), arthropod::Species::Antlion => Vec3::new(4.0, 4.0, 2.2), arthropod::Species::Hornbeetle => Vec3::new(3.2, 3.2, 1.3), - arthropod::Species::Leafbeetle => Vec3::new(3.2, 3.2, 1.3), + arthropod::Species::Leafbeetle => Vec3::new(2.4, 2.8, 1.2), arthropod::Species::Stagbeetle => Vec3::new(3.2, 3.2, 1.3), - arthropod::Species::Weevil => Vec3::new(3.2, 3.2, 1.6), + arthropod::Species::Weevil => Vec3::new(2.2, 2.4, 1.1), arthropod::Species::Cavespider => Vec3::new(4.0, 4.0, 1.4), arthropod::Species::Moltencrawler => Vec3::new(3.2, 4.0, 1.5), arthropod::Species::Mosscrawler => Vec3::new(3.2, 4.0, 1.4), @@ -806,65 +806,66 @@ impl Body { match self { Body::Humanoid(_) => 50, Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species { - quadruped_small::Species::Boar => 70, - quadruped_small::Species::Batfox => 40, + // T1 + quadruped_small::Species::Boar => 60, quadruped_small::Species::Holladon => 80, - quadruped_small::Species::Hyena => 45, - quadruped_small::Species::Truffler => 45, - quadruped_small::Species::Fox => 15, + quadruped_small::Species::MossySnail => 85, + quadruped_small::Species::Porcupine => 55, + quadruped_small::Species::Truffler => 130, + // T2 + quadruped_small::Species::Hyena => 90, + // T0 + quadruped_small::Species::Batfox => 15, + quadruped_small::Species::Beaver => 25, quadruped_small::Species::Cat => 25, - quadruped_small::Species::Quokka => 10, - // FIXME: I would have set rats to 5, but that makes enemy ones in dungeons too - // easy. Put this back when the two types of rats are distinguishable. - quadruped_small::Species::Rat => 20, - quadruped_small::Species::Jackalope => 30, - quadruped_small::Species::Hare => 15, - quadruped_small::Species::Rabbit => 10, - quadruped_small::Species::Frog => 5, - quadruped_small::Species::Axolotl => 5, - quadruped_small::Species::Gecko => 5, - quadruped_small::Species::Squirrel => 10, - quadruped_small::Species::Porcupine => 15, - quadruped_small::Species::Beaver => 15, quadruped_small::Species::Dog => 30, - quadruped_small::Species::Sheep => 30, + quadruped_small::Species::Fox => 15, + quadruped_small::Species::Hare => 15, + quadruped_small::Species::Jackalope => 30, + quadruped_small::Species::Quokka => 10, + quadruped_small::Species::Rabbit => 10, quadruped_small::Species::Seal => 15, - quadruped_small::Species::MossySnail => 15, quadruped_small::Species::TreantSapling => 55, - _ => 20, + quadruped_small::Species::Sheep => 30, + quadruped_small::Species::Squirrel => 10, + _ => 5, }, Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species { - quadruped_medium::Species::Grolgar => 90, - quadruped_medium::Species::Saber => 60, - quadruped_medium::Species::Tiger => 70, - quadruped_medium::Species::Lion => 90, - quadruped_medium::Species::Tarasque => 150, - quadruped_medium::Species::Wolf => 45, - quadruped_medium::Species::Frostfang => 40, - quadruped_medium::Species::Mouflon => 40, - quadruped_medium::Species::Catoblepas => 300, - quadruped_medium::Species::Bonerattler => 50, - quadruped_medium::Species::Deer => 50, - quadruped_medium::Species::Hirdrasil => 70, - quadruped_medium::Species::Roshwalr => 500, - quadruped_medium::Species::Donkey => 55, - quadruped_medium::Species::Zebra => 55, - quadruped_medium::Species::Antelope => 45, - quadruped_medium::Species::Kelpie => 60, - quadruped_medium::Species::Horse => 60, - quadruped_medium::Species::Barghest => 170, - quadruped_medium::Species::Cattle => 100, - quadruped_medium::Species::Highland => 120, - quadruped_medium::Species::Yak => 110, - quadruped_medium::Species::Panda => 90, - quadruped_medium::Species::Bear => 90, - quadruped_medium::Species::Moose => 80, - quadruped_medium::Species::Bristleback => 90, - quadruped_medium::Species::Dreadhorn => 370, - quadruped_medium::Species::Mammoth => 250, - quadruped_medium::Species::Ngoubou => 290, + // T1 + quadruped_medium::Species::Antelope => 90, + quadruped_medium::Species::Donkey => 110, + quadruped_medium::Species::Horse => 100, + quadruped_medium::Species::Mouflon => 80, + quadruped_medium::Species::Zebra => 120, + // T2 + quadruped_medium::Species::Barghest => 120, + quadruped_medium::Species::Bear => 210, + quadruped_medium::Species::Bristleback => 340, + quadruped_medium::Species::Bonerattler => 90, + quadruped_medium::Species::Cattle => 240, + quadruped_medium::Species::Frostfang => 110, + quadruped_medium::Species::Highland => 240, + quadruped_medium::Species::Kelpie => 155, + quadruped_medium::Species::Lion => 150, + quadruped_medium::Species::Moose => 160, + quadruped_medium::Species::Panda => 180, + quadruped_medium::Species::Saber => 150, + quadruped_medium::Species::Tarasque => 200, + quadruped_medium::Species::Tiger => 170, + quadruped_medium::Species::Tuskram => 200, + quadruped_medium::Species::Wolf => 95, + quadruped_medium::Species::Yak => 270, + // T3A + quadruped_medium::Species::Akhlut => 520, + quadruped_medium::Species::Catoblepas => 350, quadruped_medium::Species::ClaySteed => 400, - _ => 70, + quadruped_medium::Species::Dreadhorn => 570, + quadruped_medium::Species::Grolgar => 320, + quadruped_medium::Species::Hirdrasil => 850, + quadruped_medium::Species::Mammoth => 740, + quadruped_medium::Species::Ngoubou => 370, + quadruped_medium::Species::Roshwalr => 500, + _ => 100, }, Body::FishMedium(_) => 15, Body::Dragon(_) => 500, @@ -932,6 +933,7 @@ impl Body { biped_small::Species::Boreal => 100, biped_small::Species::Clockwork => 250, biped_small::Species::Flamekeeper => 10000, + biped_small::Species::Irrwurz => 100, _ => 60, }, Body::Object(object) => match object { @@ -955,50 +957,67 @@ impl Body { _ => 1000, }, Body::Theropod(theropod) => match theropod.species { - theropod::Species::Archaeos => 350, - theropod::Species::Yale => 280, - theropod::Species::Dodarock => 200, - theropod::Species::Odonto => 300, - theropod::Species::Ntouka => 300, - _ => 110, + // T1 + theropod::Species::Dodarock => 85, + // T2 + theropod::Species::Axebeak => 275, + theropod::Species::Sunlizard => 210, + // T3A + theropod::Species::Yale => 680, + // T3B + theropod::Species::Archaeos => 950, + theropod::Species::Ntouka => 1150, + theropod::Species::Odonto => 1350, + _ => 240, }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { - quadruped_low::Species::Crocodile => 80, - quadruped_low::Species::SeaCrocodile => 110, - quadruped_low::Species::Alligator => 90, - quadruped_low::Species::HermitAlligator => 2000, - quadruped_low::Species::Monitor => 60, - quadruped_low::Species::Asp => 75, - quadruped_low::Species::Tortoise => 90, - quadruped_low::Species::Rocksnapper => 140, - quadruped_low::Species::Rootsnapper => 140, - quadruped_low::Species::Reefsnapper => 140, - quadruped_low::Species::Pangolin => 40, - quadruped_low::Species::Maneater => 130, - quadruped_low::Species::Sandshark => 110, - quadruped_low::Species::Hakulaq => 120, - quadruped_low::Species::Dagon => 1500, - quadruped_low::Species::Lavadrake => 160, - quadruped_low::Species::Basilisk => 200, - quadruped_low::Species::Deadwood => 120, - quadruped_low::Species::Mossdrake => 160, + // T1 quadruped_low::Species::Driggle => 40, + quadruped_low::Species::Pangolin => 40, + // T2 + quadruped_low::Species::Alligator => 420, + quadruped_low::Species::Asp => 330, + quadruped_low::Species::Crocodile => 380, + quadruped_low::Species::Deadwood => 220, + quadruped_low::Species::Elbst => 240, + quadruped_low::Species::Hakulaq => 330, + quadruped_low::Species::Monitor => 285, + quadruped_low::Species::SeaCrocodile => 450, + quadruped_low::Species::Tortoise => 120, + // T3A + quadruped_low::Species::Dagon => 1200, + quadruped_low::Species::HermitAlligator => 2000, + quadruped_low::Species::Icedrake => 640, + quadruped_low::Species::Lavadrake => 460, + quadruped_low::Species::Maneater => 800, + quadruped_low::Species::Mossdrake => 720, + quadruped_low::Species::Rocksnapper => 280, + quadruped_low::Species::Reefsnapper => 290, + quadruped_low::Species::Rootsnapper => 300, + quadruped_low::Species::Sandshark => 550, + // T3B + quadruped_low::Species::Basilisk => 1300, _ => 70, }, Body::Arthropod(arthropod) => match arthropod.species { - arthropod::Species::Tarantula => 120, - arthropod::Species::Blackwidow => 120, - arthropod::Species::Antlion => 80, - arthropod::Species::Hornbeetle => 90, - arthropod::Species::Leafbeetle => 90, - arthropod::Species::Stagbeetle => 90, - arthropod::Species::Weevil => 80, - arthropod::Species::Cavespider => 60, - arthropod::Species::Moltencrawler => 80, - arthropod::Species::Mosscrawler => 80, - arthropod::Species::Sandcrawler => 80, - arthropod::Species::Emberfly => 25, - _ => 70, + // T0 + arthropod::Species::Emberfly => 10, + // T1 + arthropod::Species::Dagonite => 70, + arthropod::Species::Leafbeetle => 125, + arthropod::Species::Weevil => 110, + // T2 + arthropod::Species::Cavespider => 320, + arthropod::Species::Tarantula => 440, + // T3A + arthropod::Species::Antlion => 540, + arthropod::Species::Blackwidow => 420, + arthropod::Species::Hornbeetle => 480, + arthropod::Species::Moltencrawler => 400, + arthropod::Species::Mosscrawler => 600, + arthropod::Species::Sandcrawler => 500, + arthropod::Species::Stagbeetle => 440, + _ => 150, }, Body::Ship(_) => 1000, Body::Crustacean(_) => 40, diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs index 02918fc64a..0cd5ac243e 100644 --- a/common/src/comp/body/object.rs +++ b/common/src/comp/body/object.rs @@ -116,6 +116,7 @@ make_case_elim!( FireRainDrop = 101, ArrowClay = 102, GrenadeClay = 103, + Pebble = 104, } ); @@ -126,7 +127,7 @@ impl Body { } } -pub const ALL_OBJECTS: [Body; 104] = [ +pub const ALL_OBJECTS: [Body; 105] = [ Body::Arrow, Body::Bomb, Body::Scarecrow, @@ -231,6 +232,7 @@ pub const ALL_OBJECTS: [Body; 104] = [ Body::FireRainDrop, Body::ArrowClay, Body::GrenadeClay, + Body::Pebble, ]; impl From for super::Body { @@ -344,6 +346,7 @@ impl Body { Body::FireRainDrop => "fire_rain_drop", Body::ArrowClay => "arrow_clay", Body::GrenadeClay => "grenade_clay", + Body::Pebble => "pebble", } } @@ -379,6 +382,7 @@ impl Body { Body::Scarecrow => 900.0, Body::TrainingDummy => 2000.0, Body::Snowball => 0.9 * WATER_DENSITY, + Body::Pebble => 1000.0, // let them sink _ => 1.1 * WATER_DENSITY, }; @@ -393,7 +397,7 @@ impl Body { Body::Arrow | Body::ArrowSnake | Body::ArrowTurret | Body::MultiArrow | Body::Dart => { 0.003 }, - Body::ArrowClay => 1.0, + Body::ArrowClay | Body::Pebble => 1.0, Body::SpectralSwordSmall => 0.5, Body::SpectralSwordLarge => 50.0, Body::BedBlue => 50.0, @@ -510,6 +514,7 @@ impl Body { Body::Mine => Vec3::new(0.8, 0.8, 0.5), Body::LightningBolt | Body::SpearIcicle => Vec3::new(1.0, 1.0, 1.0), Body::FireRainDrop => Vec3::new(0.01, 0.01, 0.02), + Body::Pebble => Vec3::new(0.4, 0.4, 0.4), // FIXME: this *must* be exhaustive match _ => Vec3::broadcast(0.5), } diff --git a/common/src/comp/fluid_dynamics.rs b/common/src/comp/fluid_dynamics.rs index 1490bdf9cb..7d222a5c72 100644 --- a/common/src/comp/fluid_dynamics.rs +++ b/common/src/comp/fluid_dynamics.rs @@ -303,7 +303,8 @@ impl Body { | object::Body::Pumpkin2 | object::Body::Pumpkin3 | object::Body::Pumpkin4 - | object::Body::Pumpkin5 => { + | object::Body::Pumpkin5 + | object::Body::Pebble => { let dim = self.dimensions().map(|a| a * 0.5 * scale); const CD: f32 = 0.5; CD * PI * dim.x * dim.z diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index f6e84da511..49b237bc96 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -1790,9 +1790,15 @@ mod tests { fn ensure_item_localization() { let manifest = ItemI18n::new_expect(); let items = all_items_expect(); + let mut errs = vec![]; for item in items { let item_key: ItemKey = (&item).into(); - let _ = manifest.item_text_opt(item_key).unwrap(); + if manifest.item_text_opt(item_key.clone()).is_none() { + errs.push(item_key) + } + } + if !errs.is_empty() { + panic!("item i18n manifest misses translation-id for following items {errs:#?}") } } } diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index d28025276e..5213863c22 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -563,20 +563,31 @@ fn default_main_tool(body: &Body) -> Item { _ => None, }, Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species { - quadruped_medium::Species::Wolf | quadruped_medium::Species::Grolgar => Some( - Item::new_from_asset_expect("common.items.npc_weapons.unique.quadmedquick"), - ), - quadruped_medium::Species::Donkey - | quadruped_medium::Species::Horse - | quadruped_medium::Species::Zebra - | quadruped_medium::Species::Kelpie - | quadruped_medium::Species::Hirdrasil - | quadruped_medium::Species::Deer - | quadruped_medium::Species::Antelope - | quadruped_medium::Species::Llama - | quadruped_medium::Species::Alpaca => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.quadmedhoof", + quadruped_medium::Species::Wolf => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadmedquick", )), + // Below uniques still follow quadmedhoof just with stat alterations + quadruped_medium::Species::Alpaca | quadruped_medium::Species::Llama => { + Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_medium.alpaca", + )) + }, + quadruped_medium::Species::Antelope | quadruped_medium::Species::Deer => { + Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_medium.antelope", + )) + }, + quadruped_medium::Species::Donkey | quadruped_medium::Species::Zebra => { + Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_medium.donkey", + )) + }, + // Provide Kelpie with unique water-centered abilities + quadruped_medium::Species::Horse | quadruped_medium::Species::Kelpie => { + Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_medium.horse", + )) + }, quadruped_medium::Species::ClaySteed => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.claysteed", )), @@ -587,13 +598,24 @@ fn default_main_tool(body: &Body) -> Item { | quadruped_medium::Species::Snowleopard => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadmedjump", )), - quadruped_medium::Species::Tuskram - | quadruped_medium::Species::Moose + // Below uniques still follow quadmedcharge just with stat alterations + quadruped_medium::Species::Moose | quadruped_medium::Species::Tuskram => { + Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_medium.moose", + )) + }, + quadruped_medium::Species::Mouflon => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_medium.mouflon", + )), + quadruped_medium::Species::Akhlut | quadruped_medium::Species::Dreadhorn | quadruped_medium::Species::Mammoth | quadruped_medium::Species::Ngoubou => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadmedcharge", )), + quadruped_medium::Species::Grolgar => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_medium.grolgar", + )), quadruped_medium::Species::Roshwalr => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.roshwalr", )), @@ -602,9 +624,6 @@ fn default_main_tool(body: &Body) -> Item { | quadruped_medium::Species::Yak => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadmedbasicgentle", )), - quadruped_medium::Species::Akhlut => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.akhlut", - )), quadruped_medium::Species::Frostfang => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.frostfang", )), @@ -614,10 +633,10 @@ fn default_main_tool(body: &Body) -> Item { }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { quadruped_low::Species::Maneater => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.maneater", + "common.items.npc_weapons.unique.quadruped_low.maneater", )), quadruped_low::Species::Asp => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.asp", + "common.items.npc_weapons.unique.quadruped_low.asp", )), quadruped_low::Species::Dagon => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.dagon", @@ -636,16 +655,22 @@ fn default_main_tool(body: &Body) -> Item { Item::new_from_asset_expect("common.items.npc_weapons.unique.quadlowquick"), ), quadruped_low::Species::Lavadrake => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.quadlowbreathe", + "common.items.npc_weapons.unique.quadruped_low.lavadrake", )), quadruped_low::Species::Deadwood => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.deadwood", + "common.items.npc_weapons.unique.quadruped_low.deadwood", )), quadruped_low::Species::Basilisk => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.basilisk", + "common.items.npc_weapons.unique.quadruped_low.basilisk", )), quadruped_low::Species::Icedrake => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.icedrake", + "common.items.npc_weapons.unique.quadruped_low.icedrake", + )), + quadruped_low::Species::Hakulaq => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_low.hakulaq", + )), + quadruped_low::Species::Tortoise => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_low.tortoise", )), quadruped_low::Species::Driggle => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.driggle", @@ -661,19 +686,35 @@ fn default_main_tool(body: &Body) -> Item { quadruped_small::Species::MossySnail => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.mossysnail", )), - _ => Some(Item::new_from_asset_expect( + quadruped_small::Species::Boar | quadruped_small::Species::Truffler => Some( + Item::new_from_asset_expect("common.items.npc_weapons.unique.quadruped_small.boar"), + ), + quadruped_small::Species::Hyena => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_small.hyena", + )), + quadruped_small::Species::Beaver + | quadruped_small::Species::Dog + | quadruped_small::Species::Cat + | quadruped_small::Species::Goat + | quadruped_small::Species::Holladon + | quadruped_small::Species::Sheep + | quadruped_small::Species::Seal => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadsmallbasic", )), + _ => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_small.rodent", + )), }, Body::Theropod(theropod) => match theropod.species { theropod::Species::Sandraptor | theropod::Species::Snowraptor | theropod::Species::Woodraptor - | theropod::Species::Axebeak => Some(Item::new_from_asset_expect( + | theropod::Species::Axebeak + | theropod::Species::Sunlizard => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.theropodbird", )), theropod::Species::Yale => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.theropodcharge", + "common.items.npc_weapons.unique.theropod.yale", )), theropod::Species::Dodarock => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.theropodsmall", @@ -699,9 +740,12 @@ fn default_main_tool(body: &Body) -> Item { "common.items.npc_weapons.unique.arthropods.mosscrawler", )) }, - arthropod::Species::Moltencrawler | arthropod::Species::Weevil => Some( - Item::new_from_asset_expect("common.items.npc_weapons.unique.arthropods.weevil"), - ), + arthropod::Species::Moltencrawler => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.arthropods.moltencrawler", + )), + arthropod::Species::Weevil => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.arthropods.weevil", + )), arthropod::Species::Blackwidow => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.arthropods.blackwidow", )), @@ -1057,22 +1101,32 @@ impl LoadoutBuilder { _ => None, }, Body::QuadrupedLow(body) => match body.species { - quadruped_low::Species::Basilisk - | quadruped_low::Species::Asp - | quadruped_low::Species::Lavadrake - | quadruped_low::Species::Maneater + quadruped_low::Species::Basilisk => { + Some("common.items.npc_armor.quadruped_low.basilisk") + }, + quadruped_low::Species::Alligator + | quadruped_low::Species::Crocodile + | quadruped_low::Species::SeaCrocodile => { + Some("common.items.npc_armor.quadruped_low.crocodylia") + }, + quadruped_low::Species::Sandshark => { + Some("common.items.npc_armor.quadruped_low.sandshark") + }, + quadruped_low::Species::Reefsnapper | quadruped_low::Species::Rocksnapper - | quadruped_low::Species::Rootsnapper - | quadruped_low::Species::Reefsnapper - | quadruped_low::Species::Sandshark - | quadruped_low::Species::Icedrake => { - Some("common.items.npc_armor.quadruped_low.generic") + | quadruped_low::Species::Rootsnapper => { + Some("common.items.npc_armor.quadruped_low.snapper") + }, + quadruped_low::Species::Icedrake + | quadruped_low::Species::Lavadrake + | quadruped_low::Species::Mossdrake => { + Some("common.items.npc_armor.quadruped_low.drake") }, quadruped_low::Species::Dagon => Some("common.items.npc_armor.quadruped_low.dagon"), quadruped_low::Species::Tortoise => { Some("common.items.npc_armor.quadruped_low.shell") }, - _ => None, + _ => Some("common.items.npc_armor.quadruped_low.generic"), }, Body::QuadrupedMedium(body) => match body.species { quadruped_medium::Species::Frostfang => { @@ -1084,16 +1138,58 @@ impl LoadoutBuilder { quadruped_medium::Species::ClaySteed => { Some("common.items.npc_armor.quadruped_medium.claysteed") }, - _ => None, + quadruped_medium::Species::Hirdrasil | quadruped_medium::Species::Akhlut => { + Some("common.items.npc_armor.quadruped_medium.hirdrasil") + }, + quadruped_medium::Species::Catoblepas | quadruped_medium::Species::Ngoubou => { + Some("common.items.npc_armor.quadruped_medium.catoblepas") + }, + quadruped_medium::Species::Dreadhorn | quadruped_medium::Species::Mammoth => { + Some("common.items.npc_armor.quadruped_medium.dreadhorn") + }, + quadruped_medium::Species::Bonerattler | quadruped_medium::Species::Grolgar => { + Some("common.items.npc_armor.quadruped_medium.bonerattler") + }, + quadruped_medium::Species::Antelope + | quadruped_medium::Species::Donkey + | quadruped_medium::Species::Deer + | quadruped_medium::Species::Horse + | quadruped_medium::Species::Kelpie + | quadruped_medium::Species::Zebra => { + Some("common.items.npc_armor.quadruped_medium.equus") + }, + _ => Some("common.items.npc_armor.quadruped_medium.broad"), }, Body::Theropod(body) => match body.species { theropod::Species::Archaeos - | theropod::Species::Yale | theropod::Species::Ntouka | theropod::Species::Odonto => Some("common.items.npc_armor.theropod.rugged"), + theropod::Species::Yale => Some("common.items.npc_armor.theropod.yale"), + _ => Some("common.items.npc_armor.theropod.raptor"), + }, + // TODO: Check over + Body::Arthropod(body) => match body.species { + arthropod::Species::Leafbeetle | arthropod::Species::Cavespider => { + Some("common.items.npc_armor.arthropod.leafbeetle") + }, + arthropod::Species::Weevil => Some("common.items.npc_armor.arthropod.weevil"), + arthropod::Species::Moltencrawler + | arthropod::Species::Mosscrawler + | arthropod::Species::Sandcrawler => None, + _ => Some("common.items.npc_armor.arthropod.generic"), + }, + Body::QuadrupedSmall(body) => match body.species { + quadruped_small::Species::Boar | quadruped_small::Species::Truffler => { + Some("common.items.npc_armor.quadruped_small.boar") + }, + quadruped_small::Species::Hyena => { + Some("common.items.npc_armor.quadruped_small.hyena") + }, + quadruped_small::Species::MossySnail => { + Some("common.items.npc_armor.quadruped_small.mossysnail") + }, _ => None, }, - Body::Arthropod(_) => Some("common.items.npc_armor.arthropod.generic"), _ => None, }; diff --git a/common/src/comp/poise.rs b/common/src/comp/poise.rs index 1db1736a24..b2fdb568d1 100644 --- a/common/src/comp/poise.rs +++ b/common/src/comp/poise.rs @@ -88,25 +88,21 @@ impl PoiseState { let (charstate_parameters, impulse) = match self { PoiseState::Normal => (None, None), PoiseState::Interrupted => ( - Some((Duration::from_millis(250), Duration::from_millis(250), 0.8)), + Some((Duration::from_millis(200), Duration::from_millis(200), 0.8)), None, ), PoiseState::Stunned => ( - Some((Duration::from_millis(750), Duration::from_millis(750), 0.5)), + Some((Duration::from_millis(350), Duration::from_millis(350), 0.5)), None, ), PoiseState::Dazed => ( - Some(( - Duration::from_millis(1000), - Duration::from_millis(1000), - 0.2, - )), + Some((Duration::from_millis(750), Duration::from_millis(750), 0.2)), None, ), PoiseState::KnockedDown => ( Some(( - Duration::from_millis(2000), - Duration::from_millis(2000), + Duration::from_millis(1500), + Duration::from_millis(1500), 0.0, )), Some(10.0), diff --git a/common/src/comp/projectile.rs b/common/src/comp/projectile.rs index a802fecf96..71f449d380 100644 --- a/common/src/comp/projectile.rs +++ b/common/src/comp/projectile.rs @@ -141,6 +141,10 @@ pub enum ProjectileConstructor { radius: f32, min_falloff: f32, }, + Pebble { + damage: f32, + knockback: f32, + }, } impl ProjectileConstructor { @@ -948,6 +952,40 @@ impl ProjectileConstructor { is_point: false, } }, + Pebble { damage, knockback } => { + let knockback = AttackEffect::new( + Some(GroupTarget::OutOfGroup), + CombatEffect::Knockback(Knockback { + strength: knockback, + direction: KnockbackDir::Away, + }) + .adjusted_by_stats(tool_stats), + ) + .with_requirement(CombatRequirement::AnyDamage); + let damage = AttackDamage::new( + Damage { + source: DamageSource::Projectile, + kind: DamageKind::Crushing, + value: damage, + }, + Some(GroupTarget::OutOfGroup), + instance, + ); + let attack = Attack::default() + .with_damage(damage) + .with_precision(precision_mult) + .with_effect(knockback); + + Projectile { + hit_solid: vec![Effect::Vanish, Effect::Vanish], + hit_entity: vec![Effect::Attack(attack), Effect::Vanish], + time_left: Duration::from_secs(10), + owner, + ignore_group: true, + is_sticky: false, + is_point: false, + } + }, } } @@ -1092,6 +1130,9 @@ impl ProjectileConstructor { *damage *= power; *radius *= range; }, + Pebble { ref mut damage, .. } => { + *damage *= power; + }, } self } @@ -1117,6 +1158,7 @@ impl ProjectileConstructor { LaserBeam { .. } => true, Trap { .. } => false, Mine { .. } => true, + Pebble { .. } => false, } } } diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs index 25b56bfa90..f90819cb63 100644 --- a/common/src/states/basic_beam.rs +++ b/common/src/states/basic_beam.rs @@ -82,6 +82,17 @@ impl CharacterBehavior for Data { handle_move(data, &mut update, 0.4); handle_jump(data, output_events, &mut update, 1.0); + // Velocity relative to the current ground + let rel_vel = data.vel.0 - data.physics.ground_vel; + // Gets offsets + let body_offsets = beam_offsets( + data.body, + data.inputs.look_dir, + update.ori.look_vec(), + rel_vel, + data.physics.on_ground, + ); + match self.stage_section { StageSection::Buildup => { if self.timer < self.static_data.buildup_duration { @@ -140,13 +151,14 @@ impl CharacterBehavior for Data { hit_durations: HashMap::new(), specifier: self.static_data.specifier, bezier: QuadraticBezier3 { - start: data.pos.0, - ctrl: data.pos.0, - end: data.pos.0, + start: data.pos.0 + body_offsets, + ctrl: data.pos.0 + body_offsets, + end: data.pos.0 + body_offsets, }, }); // Build up update.character = CharacterState::BasicBeam(Data { + beam_offset: body_offsets, timer: Duration::default(), stage_section: StageSection::Action, ..*self @@ -184,16 +196,6 @@ impl CharacterBehavior for Data { )) .prerotated(pitch) }; - // Velocity relative to the current ground - let rel_vel = data.vel.0 - data.physics.ground_vel; - // Gets offsets - let body_offsets = beam_offsets( - data.body, - data.inputs.look_dir, - update.ori.look_vec(), - rel_vel, - data.physics.on_ground, - ); update.character = CharacterState::BasicBeam(Data { beam_offset: body_offsets, diff --git a/server/agent/src/action_nodes.rs b/server/agent/src/action_nodes.rs index d607251a98..70c7987419 100644 --- a/server/agent/src/action_nodes.rs +++ b/server/agent/src/action_nodes.rs @@ -1067,7 +1067,7 @@ impl<'a> AgentData<'a> { // Arthropods "Antlion" => Tactic::ArthropodMelee, "Tarantula" | "Horn Beetle" => Tactic::ArthropodAmbush, - "Weevil" | "Black Widow" => Tactic::ArthropodRanged, + "Weevil" | "Black Widow" | "Crawler" => Tactic::ArthropodRanged, "Theropod Charge" => Tactic::CircleCharge { radius: 6, circle_time: 1, diff --git a/voxygen/anim/src/arthropod/combomelee.rs b/voxygen/anim/src/arthropod/combomelee.rs index d767d4e7fc..57984faf4c 100644 --- a/voxygen/anim/src/arthropod/combomelee.rs +++ b/voxygen/anim/src/arthropod/combomelee.rs @@ -92,7 +92,7 @@ impl Animation for ComboAnimation { next.leg_bl.position = Vec3::new(-s_a.leg_b.0, s_a.leg_b.1, s_a.leg_b.2); next.leg_br.position = Vec3::new(s_a.leg_b.0, s_a.leg_b.1, s_a.leg_b.2); } else { - next.chest.scale = Vec3::one() / s_a.scaler; + next.chest.scale = Vec3::one() * s_a.scaler; next.chest.orientation = Quaternion::rotation_x(movement2abs * 0.3) * Quaternion::rotation_z((movement1abs * 4.0 * PI).sin() * 0.02); diff --git a/voxygen/anim/src/arthropod/mod.rs b/voxygen/anim/src/arthropod/mod.rs index e44831d840..b1b05883d2 100644 --- a/voxygen/anim/src/arthropod/mod.rs +++ b/voxygen/anim/src/arthropod/mod.rs @@ -310,9 +310,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Blackwidow, _) => 1.0, (Antlion, _) => 1.0, (Hornbeetle, _) => 1.0, - (Leafbeetle, _) => 1.0, + (Leafbeetle, _) => 0.8, (Stagbeetle, _) => 1.0, - (Weevil, _) => 1.0, + (Weevil, _) => 0.75, (Cavespider, _) => 1.0, (Moltencrawler, _) => 1.0, (Mosscrawler, _) => 1.0, diff --git a/voxygen/anim/src/quadruped_low/combomelee.rs b/voxygen/anim/src/quadruped_low/combomelee.rs index 81dfd9b709..bb8da0836e 100644 --- a/voxygen/anim/src/quadruped_low/combomelee.rs +++ b/voxygen/anim/src/quadruped_low/combomelee.rs @@ -97,7 +97,7 @@ impl Animation for ComboAnimation { }, Some( "common.abilities.custom.asp.singlestrike" - | "comon.abilities.custom.maneater.singlestrike" + | "common.abilities.custom.maneater.singlestrike" | "common.abilities.custom.quadlowbasic.singlestrike", ) => { quadruped_low_alpha( diff --git a/voxygen/anim/src/quadruped_medium/mod.rs b/voxygen/anim/src/quadruped_medium/mod.rs index f4332a8917..3bb2fde797 100644 --- a/voxygen/anim/src/quadruped_medium/mod.rs +++ b/voxygen/anim/src/quadruped_medium/mod.rs @@ -683,6 +683,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Akhlut, _) => 1.4, (Bristleback, _) => 1.1, (ClaySteed, _) => 1.75, + (Frostfang, _) => 1.0, _ => 0.9, }, startangle: match (body.species, body.body_type) { diff --git a/voxygen/anim/src/quadruped_small/mod.rs b/voxygen/anim/src/quadruped_small/mod.rs index dd23109e15..2027c1ff26 100644 --- a/voxygen/anim/src/quadruped_small/mod.rs +++ b/voxygen/anim/src/quadruped_small/mod.rs @@ -308,6 +308,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Porcupine, _) => 0.65, (Hare, _) => 0.65, (Seal, _) => 0.9, + (MossySnail, _) => 1.0, _ => 0.8, }, tempo: match (body.species, body.body_type) { diff --git a/voxygen/anim/src/theropod/mod.rs b/voxygen/anim/src/theropod/mod.rs index 18d8ebc100..b35370180f 100644 --- a/voxygen/anim/src/theropod/mod.rs +++ b/voxygen/anim/src/theropod/mod.rs @@ -262,9 +262,9 @@ impl<'a> From<&'a Body> for SkeletonAttr { scaler: match (body.species, body.body_type) { (Archaeos, _) => 2.93, (Odonto, _) => 2.93, - (Sandraptor, _) => 1.1, - (Snowraptor, _) => 1.1, - (Woodraptor, _) => 1.1, + (Sandraptor, _) => 0.88, + (Snowraptor, _) => 0.85, + (Woodraptor, _) => 0.9, (Sunlizard, _) => 1.1, (Yale, _) => 1.26, (Dodarock, _) => 1.1, diff --git a/voxygen/src/audio/sfx/mod.rs b/voxygen/src/audio/sfx/mod.rs index 310f7b5824..1e824446ee 100644 --- a/voxygen/src/audio/sfx/mod.rs +++ b/voxygen/src/audio/sfx/mod.rs @@ -611,7 +611,9 @@ impl SfxMgr { audio.emit_sfx(sfx_trigger_item, *pos, Some(2.0), underwater); } }, - Body::Object(object::Body::AdletTrap | object::Body::Mine) => { + Body::Object( + object::Body::AdletTrap | object::Body::Mine | object::Body::Pebble, + ) => { if target.is_none() { let sfx_trigger_item = triggers.get_key_value(&SfxEvent::Klonk); audio.emit_sfx(sfx_trigger_item, *pos, Some(2.0), underwater); diff --git a/world/src/layer/cave.rs b/world/src/layer/cave.rs index da50591377..fa43856d9e 100644 --- a/world/src/layer/cave.rs +++ b/world/src/layer/cave.rs @@ -825,7 +825,7 @@ fn apply_entity_spawns(canvas: &mut Canvas, wpos: Vec3, biome: &Bio (biome.mushroom + 0.02) * 0.5, ), ( - Some("common.entity.wild.aggressive.bat"), + Some("common.entity.wild.peaceful.bat"), (biome.mushroom + 0.1) * 0.25, ), // Leafy biome @@ -839,7 +839,7 @@ fn apply_entity_spawns(canvas: &mut Canvas, wpos: Vec3, biome: &Bio ), ( Some("common.entity.wild.aggressive.rootsnapper"), - (biome.leafy + 0.05) * 0.05, + (biome.leafy + 0.05) * 0.02, ), ( Some("common.entity.wild.peaceful.axolotl"), @@ -855,22 +855,22 @@ fn apply_entity_spawns(canvas: &mut Canvas, wpos: Vec3, biome: &Bio ), ( Some("common.entity.wild.aggressive.rocksnapper"), - (biome.leafy.max(biome.barren) + 0.1) * 0.1, + (biome.leafy.max(biome.barren) + 0.1) * 0.08, ), ( Some("common.entity.wild.aggressive.cave_salamander"), - (biome.leafy + 0.0) * 0.3, + (biome.leafy + 0.0) * 0.2, ), ( Some("common.entity.wild.aggressive.asp"), - (biome.leafy + 0.1) * 0.25, + (biome.leafy + 0.1) * 0.15, ), ( Some("common.entity.wild.aggressive.swamp_troll"), (biome.leafy + 0.0) * 0.1, ), ( - Some("common.entity.wild.aggressive.bat"), + Some("common.entity.wild.peaceful.bat"), (biome.leafy + 0.1) * 0.25, ), // Dusty biome @@ -880,7 +880,7 @@ fn apply_entity_spawns(canvas: &mut Canvas, wpos: Vec3, biome: &Bio ), ( Some("common.entity.wild.aggressive.cave_spider"), - (biome.dusty + 0.0) * 0.4, + (biome.dusty + 0.0) * 0.25, ), ( Some("common.entity.wild.aggressive.cave_troll"), @@ -895,7 +895,7 @@ fn apply_entity_spawns(canvas: &mut Canvas, wpos: Vec3, biome: &Bio (biome.dusty + 0.1) * 0.3, ), ( - Some("common.entity.wild.aggressive.bat"), + Some("common.entity.wild.peaceful.bat"), (biome.dusty + 0.1) * 0.25, ), // Icy biome @@ -914,11 +914,11 @@ fn apply_entity_spawns(canvas: &mut Canvas, wpos: Vec3, biome: &Bio // Lava biome ( Some("common.entity.wild.aggressive.lavadrake"), - (biome.fire + 0.0) * 0.5, + (biome.fire + 0.0) * 0.2, ), ( Some("common.entity.wild.aggressive.basilisk"), - (biome.fire + 0.1) * 0.1, + (biome.fire + 0.1) * 0.01, ), ( Some("common.entity.wild.peaceful.crawler_molten"), @@ -931,7 +931,7 @@ fn apply_entity_spawns(canvas: &mut Canvas, wpos: Vec3, biome: &Bio // With depth ( Some("common.entity.wild.aggressive.black_widow"), - (biome.depth + 0.0) * 0.02, + (biome.depth + 0.0) * 0.01, ), ( Some("common.entity.wild.aggressive.ogre"), diff --git a/world/src/site2/plot/troll_cave.rs b/world/src/site2/plot/troll_cave.rs index ce7df799b3..f16b0e0294 100644 --- a/world/src/site2/plot/troll_cave.rs +++ b/world/src/site2/plot/troll_cave.rs @@ -82,7 +82,7 @@ impl Structure for TrollCave { // bat painter.spawn( EntityInfo::at((center - 2).with_z(base + 5).as_()).with_asset_expect( - "common.entity.wild.aggressive.bat", + "common.entity.wild.peaceful.bat", &mut thread_rng, None, ),