From 0941f03608ad2305f0767070fb8e65a6efed4252 Mon Sep 17 00:00:00 2001 From: jshipsey Date: Tue, 15 Jun 2021 01:43:49 -0400 Subject: [PATCH] buffs to stretch progression --- .../common/abilities/ability_set_manifest.ron | 15 ++- assets/common/abilities/axe/doublestrike.ron | 4 +- .../common/abilities/custom/asp/firebomb.ron | 18 ++++ .../{quadlowranged => asp}/singlestrike.ron | 8 +- .../abilities/custom/basilisk/petrify.ron | 19 ++++ .../custom/basilisk/triplestrike.ron | 14 +-- .../abilities/custom/husk/singlestrike.ron | 4 +- .../abilities/custom/husk/triplestrike.ron | 24 ++--- .../abilities/custom/maneater/poisonball.ron | 18 ++++ .../{basilisk => maneater}/singlestrike.ron | 14 +-- .../custom/mindflayer/necroticsphere.ron | 2 +- .../custom/mindflayer/necroticvortex.ron | 4 +- .../custom/quadlowbasic/singlestrike.ron | 4 +- .../custom/quadlowbasic/triplestrike.ron | 12 +-- .../abilities/custom/quadlowbreathe/dash.ron | 4 +- .../custom/quadlowbreathe/flamethrower.ron | 2 +- .../custom/quadlowbreathe/triplestrike.ron | 18 ++-- .../custom/quadlowquick/quadstrike.ron | 6 +- .../custom/quadlowranged/firebomb.ron | 6 +- .../abilities/custom/quadlowtail/charged.ron | 2 +- .../custom/quadmedbasic/singlestrike.ron | 2 +- .../custom/quadmedcharge/doublestrike.ron | 4 +- .../abilities/custom/quadmedhoof/basic.ron | 6 +- .../custom/quadsmallbasic/singlestrike.ron | 2 +- .../custom/theropodbasic/singlestrike.ron | 4 +- .../custom/theropodbasic/triplestrike.ron | 18 ++-- .../custom/wendigomagic/frostbomb.ron | 2 +- .../custom/wendigomagic/singlestrike.ron | 4 +- .../common/abilities/hammer/singlestrike.ron | 2 +- .../abilities/hammersimple/doublestrike.ron | 16 ++-- .../common/abilities/sword/triplestrike.ron | 4 +- assets/common/cave_scatter/dark_floor.ron | 7 +- assets/common/cave_scatter/deep_floor.ron | 10 +- assets/common/cave_scatter/shallow_floor.ron | 2 +- .../items/npc_armor/biped_large/generic.ron | 17 ++++ .../npc_armor/biped_large/mindflayer.ron | 2 +- .../items/npc_armor/quadruped_low/generic.ron | 17 ++++ .../items/npc_armor/quadruped_low/shell.ron | 17 ++++ .../items/npc_armor/theropod/rugged.ron | 17 ++++ .../unique/{quadlowranged.ron => asp.ron} | 4 +- .../items/npc_weapons/unique/maneater.ron | 18 ++++ .../creature/quad_small/generic.ron | 2 +- assets/common/loot_tables/trading.ron | 13 ++- assets/common/recipe_book.ron | 91 +++++++++---------- assets/voxygen/i18n/en/hud/misc.ron | 4 +- common/src/comp/body.rs | 9 +- common/src/comp/inventory/loadout_builder.rs | 49 +++++++++- common/src/states/utils.rs | 4 +- server/src/sys/agent.rs | 6 +- world/src/layer/mod.rs | 10 +- 50 files changed, 380 insertions(+), 181 deletions(-) create mode 100644 assets/common/abilities/custom/asp/firebomb.ron rename assets/common/abilities/custom/{quadlowranged => asp}/singlestrike.ron (79%) create mode 100644 assets/common/abilities/custom/basilisk/petrify.ron create mode 100644 assets/common/abilities/custom/maneater/poisonball.ron rename assets/common/abilities/custom/{basilisk => maneater}/singlestrike.ron (67%) create mode 100644 assets/common/items/npc_armor/biped_large/generic.ron create mode 100644 assets/common/items/npc_armor/quadruped_low/generic.ron create mode 100644 assets/common/items/npc_armor/quadruped_low/shell.ron create mode 100644 assets/common/items/npc_armor/theropod/rugged.ron rename assets/common/items/npc_weapons/unique/{quadlowranged.ron => asp.ron} (80%) create mode 100644 assets/common/items/npc_weapons/unique/maneater.ron diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index ef9979ce3f..a9e33c3b0b 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -149,13 +149,18 @@ abilities: [], ), Custom("Basilisk"): ( - primary: "common.abilities.custom.basilisk.singlestrike", - secondary: "common.abilities.custom.basilisk.triplestrike", + primary: "common.abilities.custom.basilisk.triplestrike", + secondary: "common.abilities.custom.basilisk.petrify", abilities: [], ), - Custom("Quad Low Ranged"): ( - primary: "common.abilities.custom.quadlowranged.singlestrike", - secondary: "common.abilities.custom.quadlowranged.firebomb", + Custom("Asp"): ( + primary: "common.abilities.custom.asp.singlestrike", + secondary: "common.abilities.custom.asp.firebomb", + abilities: [], + ), + Custom("Maneater"): ( + primary: "common.abilities.custom.maneater.singlestrike", + secondary: "common.abilities.custom.maneater.poisonball", abilities: [], ), Custom("Quad Low Breathe"): ( diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron index 029bb4cdaf..80de5e37e0 100644 --- a/assets/common/abilities/axe/doublestrike.ron +++ b/assets/common/abilities/axe/doublestrike.ron @@ -6,7 +6,7 @@ ComboMelee( base_poise_damage: 12, damage_increase: 10, poise_damage_increase: 0, - knockback: 8.0, + knockback: 5.0, range: 3.5, angle: 50.0, base_buildup_duration: 0.15, @@ -22,7 +22,7 @@ ComboMelee( base_poise_damage: 20, damage_increase: 15, poise_damage_increase: 0, - knockback: 12.0, + knockback: 6.0, range: 3.5, angle: 30.0, base_buildup_duration: 0.2, diff --git a/assets/common/abilities/custom/asp/firebomb.ron b/assets/common/abilities/custom/asp/firebomb.ron new file mode 100644 index 0000000000..383f35ee39 --- /dev/null +++ b/assets/common/abilities/custom/asp/firebomb.ron @@ -0,0 +1,18 @@ +BasicRanged( + energy_cost: 0, + buildup_duration: 0.8, + recover_duration: 0.35, + projectile: Fireball( + damage: 130.0, + radius: 5.0, + energy_regen: 0, + ), + projectile_body: Object(BoltFire), + /*projectile_light: Some(LightEmitter { + col: (1.0, 0.75, 0.11).into(), + ..Default::default() + }),*/ + projectile_speed: 70.0, + num_projectiles: 1, + projectile_spread: 0.0, +) diff --git a/assets/common/abilities/custom/quadlowranged/singlestrike.ron b/assets/common/abilities/custom/asp/singlestrike.ron similarity index 79% rename from assets/common/abilities/custom/quadlowranged/singlestrike.ron rename to assets/common/abilities/custom/asp/singlestrike.ron index 81b81f3cd0..ec3acbcd37 100644 --- a/assets/common/abilities/custom/quadlowranged/singlestrike.ron +++ b/assets/common/abilities/custom/asp/singlestrike.ron @@ -2,18 +2,18 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 80, + base_damage: 140, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, range: 3.5, angle: 60.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.6, base_swing_duration: 0.1, hit_timing: 0.5, - base_recover_duration: 0.4, - forward_movement: 3.0, + base_recover_duration: 0.2, + forward_movement: 2.0, damage_kind: Crushing, ), ], diff --git a/assets/common/abilities/custom/basilisk/petrify.ron b/assets/common/abilities/custom/basilisk/petrify.ron new file mode 100644 index 0000000000..c8fb5b3021 --- /dev/null +++ b/assets/common/abilities/custom/basilisk/petrify.ron @@ -0,0 +1,19 @@ +BasicBeam( + buildup_duration: 0.9, + recover_duration: 1.0, + beam_duration: 1.0, + damage: 420, + tick_rate: 0.5, + range: 22.0, + max_angle: 5.0, + damage_effect: Some(Buff(( + kind: Frozen, + dur_secs: 0.8, + strength: Value(5.0), + chance: 1.0, + ))), + energy_regen: 0, + energy_drain: 0, + orientation_behavior: Normal, + specifier: Cultist, +) \ No newline at end of file diff --git a/assets/common/abilities/custom/basilisk/triplestrike.ron b/assets/common/abilities/custom/basilisk/triplestrike.ron index cd4942d2bb..db05cf3e26 100644 --- a/assets/common/abilities/custom/basilisk/triplestrike.ron +++ b/assets/common/abilities/custom/basilisk/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 100, + base_damage: 180, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, - knockback: 7.0, + knockback: 3.0, range: 2.8, angle: 30.0, - base_buildup_duration: 0.65, + base_buildup_duration: 0.7, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,11 +18,11 @@ ComboMelee( ), ( stage: 2, - base_damage: 100, + base_damage: 180, damage_increase: 0, base_poise_damage: 18, poise_damage_increase: 0, - knockback: 7.0, + knockback: 3.0, range: 2.8, angle: 30.0, base_buildup_duration: 0.4, @@ -34,11 +34,11 @@ ComboMelee( ), ( stage: 3, - base_damage: 100, + base_damage: 180, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, - knockback: 7.0, + knockback: 3.0, range: 2.8, angle: 30.0, base_buildup_duration: 0.4, diff --git a/assets/common/abilities/custom/husk/singlestrike.ron b/assets/common/abilities/custom/husk/singlestrike.ron index 92e1e2d3eb..d64184bfa8 100644 --- a/assets/common/abilities/custom/husk/singlestrike.ron +++ b/assets/common/abilities/custom/husk/singlestrike.ron @@ -2,12 +2,12 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 90, + base_damage: 160, damage_increase: 0, base_poise_damage: 12, poise_damage_increase: 0, knockback: 5.0, - range: 3.5, + range: 2.5, angle: 60.0, base_buildup_duration: 0.25, base_swing_duration: 0.07, diff --git a/assets/common/abilities/custom/husk/triplestrike.ron b/assets/common/abilities/custom/husk/triplestrike.ron index 25e985d3d2..d4b66e6a50 100644 --- a/assets/common/abilities/custom/husk/triplestrike.ron +++ b/assets/common/abilities/custom/husk/triplestrike.ron @@ -2,12 +2,12 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 120, + base_damage: 160, damage_increase: 0, - base_poise_damage: 8, + base_poise_damage: 6, poise_damage_increase: 0, - knockback: 5.0, - range: 3.5, + knockback: 3.0, + range: 2.5, angle: 30.0, base_buildup_duration: 0.2, base_swing_duration: 0.07, @@ -18,12 +18,12 @@ ComboMelee( ), ( stage: 2, - base_damage: 120, + base_damage: 160, damage_increase: 0, - base_poise_damage: 10, + base_poise_damage: 8, poise_damage_increase: 0, - knockback: 5.0, - range: 3.5, + knockback: 3.0, + range: 2.5, angle: 30.0, base_buildup_duration: 0.22, base_swing_duration: 0.07, @@ -34,12 +34,12 @@ ComboMelee( ), ( stage: 3, - base_damage: 120, + base_damage: 160, damage_increase: 0, - base_poise_damage: 12, + base_poise_damage: 10, poise_damage_increase: 0, - knockback: 5.0, - range: 3.5, + knockback: 3.0, + range: 2.5, angle: 30.0, base_buildup_duration: 0.2, base_swing_duration: 0.07, diff --git a/assets/common/abilities/custom/maneater/poisonball.ron b/assets/common/abilities/custom/maneater/poisonball.ron new file mode 100644 index 0000000000..f8a2b14c9b --- /dev/null +++ b/assets/common/abilities/custom/maneater/poisonball.ron @@ -0,0 +1,18 @@ +BasicRanged( + energy_cost: 0, + buildup_duration: 0.8, + recover_duration: 0.35, + projectile: NecroticSphere( + damage: 260.0, + radius: 5.0, + energy_regen: 0, + ), + projectile_body: Object(FireworkPurple), + /*projectile_light: Some(LightEmitter { + col: (1.0, 0.75, 0.11).into(), + ..Default::default() + }),*/ + projectile_speed: 70.0, + num_projectiles: 3, + projectile_spread: 0.2, +) diff --git a/assets/common/abilities/custom/basilisk/singlestrike.ron b/assets/common/abilities/custom/maneater/singlestrike.ron similarity index 67% rename from assets/common/abilities/custom/basilisk/singlestrike.ron rename to assets/common/abilities/custom/maneater/singlestrike.ron index 65846146d6..45ebb89522 100644 --- a/assets/common/abilities/custom/basilisk/singlestrike.ron +++ b/assets/common/abilities/custom/maneater/singlestrike.ron @@ -2,18 +2,18 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 130, + base_damage: 200, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, - range: 3.0, + range: 3.5, angle: 60.0, - base_buildup_duration: 0.4, - base_swing_duration: 0.07, + base_buildup_duration: 0.5, + base_swing_duration: 0.075, hit_timing: 0.5, - base_recover_duration: 0.4, - forward_movement: 3.0, + base_recover_duration: 0.2, + forward_movement: 2.0, damage_kind: Crushing, ), ], @@ -24,5 +24,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 0.6, + ori_modifier: 0.65, ) diff --git a/assets/common/abilities/custom/mindflayer/necroticsphere.ron b/assets/common/abilities/custom/mindflayer/necroticsphere.ron index e8ab890b78..08c2039552 100644 --- a/assets/common/abilities/custom/mindflayer/necroticsphere.ron +++ b/assets/common/abilities/custom/mindflayer/necroticsphere.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 0.75, recover_duration: 0.4, projectile: NecroticSphere( - damage: 300.0, + damage: 450.0, radius: 5.0, ), projectile_body: Object(FireworkPurple), diff --git a/assets/common/abilities/custom/mindflayer/necroticvortex.ron b/assets/common/abilities/custom/mindflayer/necroticvortex.ron index 896b380b62..b4d750fea2 100644 --- a/assets/common/abilities/custom/mindflayer/necroticvortex.ron +++ b/assets/common/abilities/custom/mindflayer/necroticvortex.ron @@ -1,12 +1,12 @@ SpinMelee( - buildup_duration: 0.5, + buildup_duration: 0.8, swing_duration: 0.2, recover_duration: 0.6, base_damage: 80.0, base_poise_damage: 1.0, knockback: ( strength: 7.0, direction: Towards), range: 16.0, - damage_effect: Some(Lifesteal(1.0)), + damage_effect: Some(Lifesteal(2.0)), energy_cost: 0.0, is_infinite: true, movement_behavior: Stationary, diff --git a/assets/common/abilities/custom/quadlowbasic/singlestrike.ron b/assets/common/abilities/custom/quadlowbasic/singlestrike.ron index c0bd5a47fb..d0ce162fcd 100644 --- a/assets/common/abilities/custom/quadlowbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadlowbasic/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 100, + base_damage: 200, damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, knockback: 3.0, range: 2.0, angle: 60.0, - base_buildup_duration: 0.4, + base_buildup_duration: 0.6, base_swing_duration: 0.07, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron index f7b49ad5ac..db548b316b 100644 --- a/assets/common/abilities/custom/quadlowbasic/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowbasic/triplestrike.ron @@ -2,11 +2,11 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 80, + base_damage: 140, damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, - knockback: 7.0, + knockback: 3.0, range: 2.2, angle: 30.0, base_buildup_duration: 0.65, @@ -18,11 +18,11 @@ ComboMelee( ), ( stage: 2, - base_damage: 80, + base_damage: 140, damage_increase: 0, base_poise_damage: 18, poise_damage_increase: 0, - knockback: 7.0, + knockback: 3.0, range: 2.2, angle: 30.0, base_buildup_duration: 0.4, @@ -34,11 +34,11 @@ ComboMelee( ), ( stage: 3, - base_damage: 80, + base_damage: 140, damage_increase: 0, base_poise_damage: 20, poise_damage_increase: 0, - knockback: 7.0, + knockback: 3.0, range: 2.2, angle: 30.0, base_buildup_duration: 0.4, diff --git a/assets/common/abilities/custom/quadlowbreathe/dash.ron b/assets/common/abilities/custom/quadlowbreathe/dash.ron index 645e4b8516..32ae96a698 100644 --- a/assets/common/abilities/custom/quadlowbreathe/dash.ron +++ b/assets/common/abilities/custom/quadlowbreathe/dash.ron @@ -1,7 +1,7 @@ DashMelee( energy_cost: 0, - base_damage: 50, - scaled_damage: 100, + base_damage: 80, + scaled_damage: 150, base_poise_damage: 25, scaled_poise_damage: 0, base_knockback: 4.0, diff --git a/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron b/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron index 6a24929f17..ddc09e0ef6 100644 --- a/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron +++ b/assets/common/abilities/custom/quadlowbreathe/flamethrower.ron @@ -2,7 +2,7 @@ BasicBeam( buildup_duration: 0.4, recover_duration: 0.25, beam_duration: 0.5, - damage: 40, + damage: 70, tick_rate: 3.0, range: 15.0, max_angle: 22.5, diff --git a/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron b/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron index 6944d309f3..6c68f6f61a 100644 --- a/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron +++ b/assets/common/abilities/custom/quadlowbreathe/triplestrike.ron @@ -2,11 +2,11 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 75, + base_damage: 220, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 20, poise_damage_increase: 0, - knockback: 10.0, + knockback: 3.0, range: 2.5, angle: 30.0, base_buildup_duration: 0.65, @@ -18,11 +18,11 @@ ComboMelee( ), ( stage: 2, - base_damage: 75, + base_damage: 220, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 20, poise_damage_increase: 0, - knockback: 10.0, + knockback: 3.0, range: 2.5, angle: 30.0, base_buildup_duration: 0.4, @@ -34,11 +34,11 @@ ComboMelee( ), ( stage: 3, - base_damage: 75, + base_damage: 220, damage_increase: 0, - base_poise_damage: 0, + base_poise_damage: 20, poise_damage_increase: 0, - knockback: 10.0, + knockback: 3.0, range: 2.5, angle: 30.0, base_buildup_duration: 0.4, diff --git a/assets/common/abilities/custom/quadlowquick/quadstrike.ron b/assets/common/abilities/custom/quadlowquick/quadstrike.ron index 3c7f848f43..fdf237aebf 100644 --- a/assets/common/abilities/custom/quadlowquick/quadstrike.ron +++ b/assets/common/abilities/custom/quadlowquick/quadstrike.ron @@ -6,7 +6,7 @@ ComboMelee( damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, - knockback: 2.0, + knockback: 1.0, range: 2.5, angle: 30.0, base_buildup_duration: 0.6, @@ -22,7 +22,7 @@ ComboMelee( damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, - knockback: 2.0, + knockback: 1.0, range: 2.5, angle: 30.0, base_buildup_duration: 0.15, @@ -38,7 +38,7 @@ ComboMelee( damage_increase: 0, base_poise_damage: 15, poise_damage_increase: 0, - knockback: 2.0, + knockback: 1.0, range: 2.5, angle: 30.0, base_buildup_duration: 0.2, diff --git a/assets/common/abilities/custom/quadlowranged/firebomb.ron b/assets/common/abilities/custom/quadlowranged/firebomb.ron index beb3c27f1c..4c758438cf 100644 --- a/assets/common/abilities/custom/quadlowranged/firebomb.ron +++ b/assets/common/abilities/custom/quadlowranged/firebomb.ron @@ -2,12 +2,12 @@ BasicRanged( energy_cost: 0, buildup_duration: 0.8, recover_duration: 0.35, - projectile: Fireball( - damage: 80.0, + projectile: NecroticSphere( + damage: 130.0, radius: 5.0, energy_regen: 0, ), - projectile_body: Object(BoltFire), + projectile_body: Object(FireworkPurple), /*projectile_light: Some(LightEmitter { col: (1.0, 0.75, 0.11).into(), ..Default::default() diff --git a/assets/common/abilities/custom/quadlowtail/charged.ron b/assets/common/abilities/custom/quadlowtail/charged.ron index fb03117f1c..d2c563f69c 100644 --- a/assets/common/abilities/custom/quadlowtail/charged.ron +++ b/assets/common/abilities/custom/quadlowtail/charged.ron @@ -13,6 +13,6 @@ ChargedMelee( charge_duration: 0.8, swing_duration: 0.7, hit_timing: 0.9, - recover_duration: 1.2, + recover_duration: 0.7, damage_kind: Crushing, ) diff --git a/assets/common/abilities/custom/quadmedbasic/singlestrike.ron b/assets/common/abilities/custom/quadmedbasic/singlestrike.ron index 2dcb7c3eb5..d5659cd650 100644 --- a/assets/common/abilities/custom/quadmedbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadmedbasic/singlestrike.ron @@ -6,7 +6,7 @@ ComboMelee( damage_increase: 0, base_poise_damage: 28, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.0, range: 2.7, angle: 60.0, base_buildup_duration: 0.4, diff --git a/assets/common/abilities/custom/quadmedcharge/doublestrike.ron b/assets/common/abilities/custom/quadmedcharge/doublestrike.ron index 83ba1ae46b..d535ccb97a 100644 --- a/assets/common/abilities/custom/quadmedcharge/doublestrike.ron +++ b/assets/common/abilities/custom/quadmedcharge/doublestrike.ron @@ -6,7 +6,7 @@ ComboMelee( damage_increase: 0, base_poise_damage: 22, poise_damage_increase: 0, - knockback: 10.0, + knockback: 4.0, range: 2.5, angle: 30.0, base_buildup_duration: 0.65, @@ -22,7 +22,7 @@ ComboMelee( damage_increase: 0, base_poise_damage: 0, poise_damage_increase: 22, - knockback: 10.0, + knockback: 4.0, range: 2.5, angle: 30.0, base_buildup_duration: 0.4, diff --git a/assets/common/abilities/custom/quadmedhoof/basic.ron b/assets/common/abilities/custom/quadmedhoof/basic.ron index a7608d6b22..b1d70e5f7f 100644 --- a/assets/common/abilities/custom/quadmedhoof/basic.ron +++ b/assets/common/abilities/custom/quadmedhoof/basic.ron @@ -1,12 +1,12 @@ BasicMelee( energy_cost: 0, - buildup_duration: 0.45, - swing_duration: 0.5, + buildup_duration: 0.65, + swing_duration: 0.3, recover_duration: 0.35, base_damage: 100, base_poise_damage: 28, knockback: ( strength: 25.0, direction: Away), - range: 1.2, + range: 0.8, max_angle: 50.0, damage_effect: None, damage_kind: Crushing, diff --git a/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron b/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron index 0448be9345..d494ab6974 100644 --- a/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron +++ b/assets/common/abilities/custom/quadsmallbasic/singlestrike.ron @@ -6,7 +6,7 @@ ComboMelee( damage_increase: 0, base_poise_damage: 10, poise_damage_increase: 0, - knockback: 3.0, + knockback: 1.0, range: 1.5, angle: 50.0, base_buildup_duration: 0.3, diff --git a/assets/common/abilities/custom/theropodbasic/singlestrike.ron b/assets/common/abilities/custom/theropodbasic/singlestrike.ron index 08cf1209e4..9c607d0058 100644 --- a/assets/common/abilities/custom/theropodbasic/singlestrike.ron +++ b/assets/common/abilities/custom/theropodbasic/singlestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 130, + base_damage: 270, damage_increase: 0, base_poise_damage: 40, poise_damage_increase: 0, knockback: 4.0, range: 7.5, angle: 60.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.4, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.4, diff --git a/assets/common/abilities/custom/theropodbasic/triplestrike.ron b/assets/common/abilities/custom/theropodbasic/triplestrike.ron index c8766e2bbd..7157a77620 100644 --- a/assets/common/abilities/custom/theropodbasic/triplestrike.ron +++ b/assets/common/abilities/custom/theropodbasic/triplestrike.ron @@ -2,14 +2,14 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 140, + base_damage: 300, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.0, range: 7.5, angle: 30.0, - base_buildup_duration: 0.9, + base_buildup_duration: 0.7, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.3, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 160, + base_damage: 340, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.0, range: 5.5, angle: 30.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.4, base_swing_duration: 0.15, hit_timing: 0.5, base_recover_duration: 0.15, @@ -34,14 +34,14 @@ ComboMelee( ), ( stage: 3, - base_damage: 200, + base_damage: 400, damage_increase: 0, base_poise_damage: 35, poise_damage_increase: 0, - knockback: 5.0, + knockback: 25.0, range: 5.5, angle: 30.0, - base_buildup_duration: 0.35, + base_buildup_duration: 0.3, base_swing_duration: 0.125, hit_timing: 0.5, base_recover_duration: 0.9, diff --git a/assets/common/abilities/custom/wendigomagic/frostbomb.ron b/assets/common/abilities/custom/wendigomagic/frostbomb.ron index 5cf95514b2..d49f94fcc1 100644 --- a/assets/common/abilities/custom/wendigomagic/frostbomb.ron +++ b/assets/common/abilities/custom/wendigomagic/frostbomb.ron @@ -3,7 +3,7 @@ BasicRanged( buildup_duration: 0.5, recover_duration: 0.35, projectile: Frostball( - damage: 80.0, + damage: 120.0, radius: 5.0, ), projectile_body: Object(BoltFire), // TODO: Get ice projectile model diff --git a/assets/common/abilities/custom/wendigomagic/singlestrike.ron b/assets/common/abilities/custom/wendigomagic/singlestrike.ron index 39185a761d..efdf2b7bc9 100644 --- a/assets/common/abilities/custom/wendigomagic/singlestrike.ron +++ b/assets/common/abilities/custom/wendigomagic/singlestrike.ron @@ -2,12 +2,12 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 120, + base_damage: 180, damage_increase: 0, base_poise_damage: 40, poise_damage_increase: 0, knockback: 3.0, - range: 3.5, + range: 2.5, angle: 30.0, base_buildup_duration: 0.6, base_swing_duration: 0.2, diff --git a/assets/common/abilities/hammer/singlestrike.ron b/assets/common/abilities/hammer/singlestrike.ron index 85da88b26e..d4aef1f59c 100644 --- a/assets/common/abilities/hammer/singlestrike.ron +++ b/assets/common/abilities/hammer/singlestrike.ron @@ -5,7 +5,7 @@ ComboMelee( damage_increase: 10, base_poise_damage: 20, poise_damage_increase: 0, - knockback: 5.0, + knockback: 3.5, range: 4.5, angle: 50.0, base_buildup_duration: 0.2, diff --git a/assets/common/abilities/hammersimple/doublestrike.ron b/assets/common/abilities/hammersimple/doublestrike.ron index 13d7423c1e..fa333528e3 100644 --- a/assets/common/abilities/hammersimple/doublestrike.ron +++ b/assets/common/abilities/hammersimple/doublestrike.ron @@ -2,12 +2,12 @@ ComboMelee( stage_data: [ ( stage: 1, - base_damage: 90, + base_damage: 240, damage_increase: 10, - base_poise_damage: 30, + base_poise_damage: 40, poise_damage_increase: 0, knockback: 4.0, - range: 3.5, + range: 4.5, angle: 50.0, base_buildup_duration: 0.6, base_swing_duration: 0.08, @@ -18,14 +18,14 @@ ComboMelee( ), ( stage: 2, - base_damage: 130, + base_damage: 320, damage_increase: 15, - base_poise_damage: 30, + base_poise_damage: 40, poise_damage_increase: 0, knockback: 16.0, - range: 1.5, + range: 2.5, angle: 30.0, - base_buildup_duration: 0.5, + base_buildup_duration: 0.6, base_swing_duration: 0.25, hit_timing: 0.5, base_recover_duration: 1.2, @@ -40,5 +40,5 @@ ComboMelee( max_speed_increase: 0.0, scales_from_combo: 0, is_interruptible: false, - ori_modifier: 0.6, + ori_modifier: 0.65, ) diff --git a/assets/common/abilities/sword/triplestrike.ron b/assets/common/abilities/sword/triplestrike.ron index b078f9f180..93ae1ffd07 100644 --- a/assets/common/abilities/sword/triplestrike.ron +++ b/assets/common/abilities/sword/triplestrike.ron @@ -6,7 +6,7 @@ ComboMelee( damage_increase: 10, base_poise_damage: 10, poise_damage_increase: 0, - knockback: 1.0, + knockback: 0.0, range: 4.0, angle: 30.0, base_buildup_duration: 0.1, @@ -38,7 +38,7 @@ ComboMelee( damage_increase: 20, base_poise_damage: 15, poise_damage_increase: 0, - knockback: 4.0, + knockback: 2.0, range: 6.0, angle: 10.0, base_buildup_duration: 0.15, diff --git a/assets/common/cave_scatter/dark_floor.ron b/assets/common/cave_scatter/dark_floor.ron index 1b3f456bff..bd89d3a6dd 100644 --- a/assets/common/cave_scatter/dark_floor.ron +++ b/assets/common/cave_scatter/dark_floor.ron @@ -1,10 +1,11 @@ [ - (20, Velorite), - (30, VeloriteFrag), - (5, CaveMushroom), + (50, Velorite), + (60, VeloriteFrag), + (40, CaveMushroom), (16, SapphireSmall), (12, EmeraldSmall), (15, Cobalt), + (30, Bloodstone), (40, Coal), (10, RubySmall), ] diff --git a/assets/common/cave_scatter/deep_floor.ron b/assets/common/cave_scatter/deep_floor.ron index 66c2e3ce59..c18d335e7a 100644 --- a/assets/common/cave_scatter/deep_floor.ron +++ b/assets/common/cave_scatter/deep_floor.ron @@ -1,14 +1,14 @@ [ - (30, Velorite), + (40, Velorite), (40, VeloriteFrag), - (10, CaveMushroom), + (30, CaveMushroom), (30, Mushroom), - (10, AmethystSmall), - (10, TopazSmall), + (30, AmethystSmall), + (30, TopazSmall), (16, SapphireSmall), (60, CrystalLow), (12, EmeraldSmall), - (5, Cobalt), + (15, Cobalt), (40, Coal), (70, Iron), (10, RubySmall), diff --git a/assets/common/cave_scatter/shallow_floor.ron b/assets/common/cave_scatter/shallow_floor.ron index 290a476ac3..f80601194a 100644 --- a/assets/common/cave_scatter/shallow_floor.ron +++ b/assets/common/cave_scatter/shallow_floor.ron @@ -1,6 +1,6 @@ [ (110, Stones), - (150, ShortGrass), + (250, ShortGrass), (50, CaveMushroom), (50, Mushroom), (30, AmethystSmall), diff --git a/assets/common/items/npc_armor/biped_large/generic.ron b/assets/common/items/npc_armor/biped_large/generic.ron new file mode 100644 index 0000000000..edf92287cb --- /dev/null +++ b/assets/common/items/npc_armor/biped_large/generic.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Generic Biped Large", + description: "Worn by bipeds.", + kind: Armor(( + kind: Chest("GenericBipedLarge"), + stats: ( + protection: Normal(45.0), + poise_resilience: Normal(1.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [], +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_large/mindflayer.ron b/assets/common/items/npc_armor/biped_large/mindflayer.ron index cfddaadbfa..2d1696b29f 100644 --- a/assets/common/items/npc_armor/biped_large/mindflayer.ron +++ b/assets/common/items/npc_armor/biped_large/mindflayer.ron @@ -4,7 +4,7 @@ ItemDef( kind: Armor(( kind: Chest("Mindflayer"), stats: ( - protection: Normal(60.0), + protection: Normal(110.0), poise_resilience: Normal(1.0), energy_max: 0, energy_reward: 0.0, diff --git a/assets/common/items/npc_armor/quadruped_low/generic.ron b/assets/common/items/npc_armor/quadruped_low/generic.ron new file mode 100644 index 0000000000..a5e634b032 --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_low/generic.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Quad Low Generic", + description: "Scaly.", + kind: Armor(( + kind: Chest("QuadrupedLowGeneric"), + stats: ( + protection: Normal(40.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [], +) diff --git a/assets/common/items/npc_armor/quadruped_low/shell.ron b/assets/common/items/npc_armor/quadruped_low/shell.ron new file mode 100644 index 0000000000..0fcf7e270e --- /dev/null +++ b/assets/common/items/npc_armor/quadruped_low/shell.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Quad Low Shell", + description: "Shell.", + kind: Armor(( + kind: Chest("QuadrupedLowShell"), + stats: ( + protection: Normal(750.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [], +) diff --git a/assets/common/items/npc_armor/theropod/rugged.ron b/assets/common/items/npc_armor/theropod/rugged.ron new file mode 100644 index 0000000000..01c260de60 --- /dev/null +++ b/assets/common/items/npc_armor/theropod/rugged.ron @@ -0,0 +1,17 @@ +ItemDef( + name: "Theropod Rugged", + description: "stronk.", + kind: Armor(( + kind: Chest("TheropodRugged"), + stats: ( + protection: Normal(80.0), + poise_resilience: Normal(0.0), + energy_max: 0, + energy_reward: 0.0, + crit_power: 0.0, + stealth: 0.0, + ), + )), + quality: Moderate, + tags: [], +) diff --git a/assets/common/items/npc_weapons/unique/quadlowranged.ron b/assets/common/items/npc_weapons/unique/asp.ron similarity index 80% rename from assets/common/items/npc_weapons/unique/quadlowranged.ron rename to assets/common/items/npc_weapons/unique/asp.ron index 2f4bcf2464..4312766e53 100644 --- a/assets/common/items/npc_weapons/unique/quadlowranged.ron +++ b/assets/common/items/npc_weapons/unique/asp.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Quad Low Ranged", + name: "Asp", description: "testing123", kind: Tool(( kind: Natural, @@ -14,5 +14,5 @@ ItemDef( )), quality: Low, tags: [], - ability_spec: Some(Custom("Quad Low Ranged")), + ability_spec: Some(Custom("Asp")), ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/maneater.ron b/assets/common/items/npc_weapons/unique/maneater.ron new file mode 100644 index 0000000000..93fc149b6c --- /dev/null +++ b/assets/common/items/npc_weapons/unique/maneater.ron @@ -0,0 +1,18 @@ +ItemDef( + name: "Maneater", + description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: Direct(( + equip_time_secs: 0.01, + power: 1.0, + poise_strength: 1.0, + speed: 1.0, + crit_chance: 0.0625, + )), + )), + quality: Low, + tags: [], + ability_spec: Some(Custom("Maneater")), +) \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/generic.ron b/assets/common/loot_tables/creature/quad_small/generic.ron index 431e082771..d7aeb6531a 100644 --- a/assets/common/loot_tables/creature/quad_small/generic.ron +++ b/assets/common/loot_tables/creature/quad_small/generic.ron @@ -1,4 +1,4 @@ [ - (1.0, Item("common.items.crafting_ing.hide.animal_hide")), + (1.0, ItemQuantity("common.items.crafting_ing.hide.animal_hide", 1, 2)), (0.25, Item("common.items.food.meat.beast_small_raw")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/trading.ron b/assets/common/loot_tables/trading.ron index c109d6db31..9db4df6cdb 100644 --- a/assets/common/loot_tables/trading.ron +++ b/assets/common/loot_tables/trading.ron @@ -8,12 +8,17 @@ (1.0, Item("common.items.crafting_ing.hide.animal_hide")), (0.5, Item("common.items.crafting_ing.hide.tough_hide")), (0.2, Item("common.items.crafting_ing.hide.scales")), - (0.08, Item("common.items.crafting_ing.animal_misc.fur")), - (0.08, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), - (0.08, Item("common.items.crafting_ing.animal_misc.icy_fang")), + (0.8, Item("common.items.crafting_ing.animal_misc.fur")), + (0.15, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), + (0.1, Item("common.items.crafting_ing.animal_misc.icy_fang")), (0.08, Item("common.items.crafting_ing.animal_misc.large_horn")), - (0.08, Item("common.items.crafting_ing.animal_misc.lively_vine")), + (0.15, Item("common.items.crafting_ing.animal_misc.lively_vine")), (0.08, Item("common.items.crafting_ing.animal_misc.phoenix_feather")), + (1.0, Item("common.items.food.meat.beast_small_raw")), + (0.6, Item("common.items.food.meat.beast_large_raw")), + (1.3, Item("common.items.food.meat.bird_raw")), + (1.2, Item("common.items.food.meat.fish_raw")), + (0.8, Item("common.items.food.meat.tough_raw")), (0.2, Item("common.items.mineral.ore.bloodstone")), (1.0, Item("common.items.mineral.ore.coal")), (0.4, Item("common.items.mineral.ore.cobalt")), diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 85f6d48076..9f8f48e7dd 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -418,10 +418,9 @@ (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.twigs"), 5), (Item("common.items.crafting_ing.leather.thick_leather"), 4), - (Item("common.items.crafting_ing.cloth.linen"), 5), - (Item("common.items.mineral.gem.ruby"), 1), + (Item("common.items.crafting_ing.cloth.wool"), 5), + (Item("common.items.mineral.gem.sapphire"), 1), (Item("common.items.tool.craftsman_hammer"), 0), - (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(CraftingBench), ), @@ -431,11 +430,10 @@ (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), (Item("common.items.crafting_ing.twigs"), 5), (Item("common.items.crafting_ing.leather.thick_leather"), 4), - (Item("common.items.crafting_ing.cloth.linen"), 5), + (Item("common.items.crafting_ing.cloth.silk"), 5), (Item("common.items.crafting_ing.animal_misc.icy_fang"), 1), (Item("common.items.mineral.gem.ruby"), 1), (Item("common.items.tool.craftsman_hammer"), 0), - (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(CraftingBench), ), @@ -443,12 +441,11 @@ output: ("common.items.glider.glider_woodraptor", 1), inputs: [ (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 6), - (Item("common.items.crafting_ing.twigs"), 15), - (Item("common.items.crafting_ing.leather.leather_strips"), 5), - (Item("common.items.crafting_ing.cloth.linen"), 5), - (Item("common.items.mineral.gem.ruby"), 1), + (Item("common.items.crafting_ing.twigs"), 5), + (Item("common.items.crafting_ing.leather.thick_leather"), 4), + (Item("common.items.crafting_ing.cloth.lifecloth"), 5), + (Item("common.items.mineral.gem.emerald"), 1), (Item("common.items.tool.craftsman_hammer"), 0), - (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(CraftingBench), ), @@ -466,7 +463,6 @@ inputs: [ (Item("common.items.crafting_ing.leather.leather_strips"), 8), (Item("common.items.crafting_ing.twigs"), 6), - (Item("common.items.crafting_ing.stones"), 0), ], craft_sprite: Some(CraftingBench), ), @@ -476,7 +472,6 @@ (Item("common.items.crafting_ing.leather.leather_strips"), 4), (Item("common.items.crafting_ing.twigs"), 10), (Item("common.items.mineral.ore.veloritefrag"), 1), - (Item("common.items.crafting_ing.stones"), 0), ], craft_sprite: Some(Anvil), ), @@ -662,8 +657,8 @@ "carapace back": ( output: ("common.items.armor.hide.carapace.back", 1), inputs: [ - (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.hide.carapace"), 3), + (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), @@ -671,8 +666,8 @@ "carapace belt": ( output: ("common.items.armor.hide.carapace.belt", 1), inputs: [ - (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.hide.carapace"), 2), + (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), @@ -680,8 +675,8 @@ "carapace chest": ( output: ("common.items.armor.hide.carapace.chest", 1), inputs: [ - (Item("common.items.mineral.ingot.steel"), 2), (Item("common.items.crafting_ing.hide.carapace"), 10), + (Item("common.items.mineral.ingot.steel"), 2), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], craft_sprite: Some(CraftingBench), @@ -689,8 +684,8 @@ "carapace feet": ( output: ("common.items.armor.hide.carapace.foot", 1), inputs: [ - (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.hide.carapace"), 3), + (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), @@ -698,8 +693,8 @@ "carapace hands": ( output: ("common.items.armor.hide.carapace.hand", 1), inputs: [ - (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.hide.carapace"), 3), + (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.leather.leather_strips"), 2), ], craft_sprite: Some(CraftingBench), @@ -707,8 +702,8 @@ "carapace pants": ( output: ("common.items.armor.hide.carapace.pants", 1), inputs: [ - (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.hide.carapace"), 8), + (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.leather.leather_strips"), 4), ], craft_sprite: Some(CraftingBench), @@ -716,8 +711,8 @@ "carapace shoulder": ( output: ("common.items.armor.hide.carapace.shoulder", 1), inputs: [ - (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.hide.carapace"), 8), + (Item("common.items.mineral.ingot.steel"), 1), (Item("common.items.crafting_ing.leather.leather_strips"), 6), ], craft_sprite: Some(CraftingBench), @@ -726,9 +721,9 @@ "primal back": ( output: ("common.items.armor.hide.primal.back", 1), inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 3), (Item("common.items.crafting_ing.animal_misc.large_horn"), 1), (Item("common.items.crafting_ing.cloth.lifecloth"), 1), - (Item("common.items.crafting_ing.hide.plate"), 3), (Item("common.items.crafting_ing.leather.rigid_leather"), 2), ], craft_sprite: Some(CraftingBench), @@ -736,8 +731,8 @@ "primal belt": ( output: ("common.items.armor.hide.primal.belt", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.lifecloth"), 1), (Item("common.items.crafting_ing.hide.plate"), 2), + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), (Item("common.items.crafting_ing.leather.rigid_leather"), 2), ], craft_sprite: Some(CraftingBench), @@ -745,9 +740,9 @@ "primal chest": ( output: ("common.items.armor.hide.primal.chest", 1), inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 10), (Item("common.items.crafting_ing.animal_misc.large_horn"), 1), (Item("common.items.crafting_ing.cloth.lifecloth"), 2), - (Item("common.items.crafting_ing.hide.plate"), 10), (Item("common.items.crafting_ing.leather.rigid_leather"), 4), ], craft_sprite: Some(CraftingBench), @@ -755,8 +750,8 @@ "primal feet": ( output: ("common.items.armor.hide.primal.foot", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.lifecloth"), 1), (Item("common.items.crafting_ing.hide.plate"), 3), + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), (Item("common.items.crafting_ing.leather.rigid_leather"), 2), ], craft_sprite: Some(CraftingBench), @@ -764,8 +759,8 @@ "primal hands": ( output: ("common.items.armor.hide.primal.hand", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.lifecloth"), 1), (Item("common.items.crafting_ing.hide.plate"), 3), + (Item("common.items.crafting_ing.cloth.lifecloth"), 1), (Item("common.items.crafting_ing.leather.rigid_leather"), 2), ], craft_sprite: Some(CraftingBench), @@ -773,9 +768,9 @@ "primal pants": ( output: ("common.items.armor.hide.primal.pants", 1), inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 8), (Item("common.items.crafting_ing.animal_misc.large_horn"), 1), (Item("common.items.crafting_ing.cloth.lifecloth"), 2), - (Item("common.items.crafting_ing.hide.plate"), 8), (Item("common.items.crafting_ing.leather.rigid_leather"), 4), ], craft_sprite: Some(CraftingBench), @@ -783,9 +778,9 @@ "primal shoulder": ( output: ("common.items.armor.hide.primal.shoulder", 1), inputs: [ + (Item("common.items.crafting_ing.hide.plate"), 8), (Item("common.items.crafting_ing.animal_misc.large_horn"), 2), (Item("common.items.crafting_ing.cloth.lifecloth"), 2), - (Item("common.items.crafting_ing.hide.plate"), 8), (Item("common.items.crafting_ing.leather.rigid_leather"), 6), ], craft_sprite: Some(CraftingBench), @@ -794,8 +789,8 @@ "dragonscale back": ( output: ("common.items.armor.hide.dragonscale.back", 1), inputs: [ - (Item("common.items.mineral.ingot.bloodsteel"), 2), (Item("common.items.crafting_ing.hide.dragon_scale"), 3), + (Item("common.items.mineral.ingot.bloodsteel"), 2), (Item("common.items.crafting_ing.leather.rigid_leather"), 1), (Item("common.items.crafting_ing.hide.scales"), 2), ], @@ -804,8 +799,8 @@ "dragonscale belt": ( output: ("common.items.armor.hide.dragonscale.belt", 1), inputs: [ - (Item("common.items.mineral.ingot.bloodsteel"), 2), (Item("common.items.crafting_ing.hide.dragon_scale"), 2), + (Item("common.items.mineral.ingot.bloodsteel"), 2), (Item("common.items.crafting_ing.hide.scales"), 2), ], craft_sprite: Some(CraftingBench), @@ -813,8 +808,8 @@ "dragonscale chest": ( output: ("common.items.armor.hide.dragonscale.chest", 1), inputs: [ - (Item("common.items.mineral.ingot.bloodsteel"), 3), (Item("common.items.crafting_ing.hide.dragon_scale"), 10), + (Item("common.items.mineral.ingot.bloodsteel"), 3), (Item("common.items.crafting_ing.leather.rigid_leather"), 2), (Item("common.items.crafting_ing.hide.scales"), 4), ], @@ -823,8 +818,8 @@ "dragonscale feet": ( output: ("common.items.armor.hide.dragonscale.foot", 1), inputs: [ - (Item("common.items.mineral.ingot.bloodsteel"), 2), (Item("common.items.crafting_ing.hide.dragon_scale"), 3), + (Item("common.items.mineral.ingot.bloodsteel"), 2), (Item("common.items.crafting_ing.hide.scales"), 2), ], craft_sprite: Some(CraftingBench), @@ -832,8 +827,8 @@ "dragonscale hands": ( output: ("common.items.armor.hide.dragonscale.hand", 1), inputs: [ - (Item("common.items.mineral.ingot.bloodsteel"), 2), (Item("common.items.crafting_ing.hide.dragon_scale"), 3), + (Item("common.items.mineral.ingot.bloodsteel"), 2), (Item("common.items.crafting_ing.hide.scales"), 2), ], craft_sprite: Some(CraftingBench), @@ -841,8 +836,8 @@ "dragonscale pants": ( output: ("common.items.armor.hide.dragonscale.pants", 1), inputs: [ - (Item("common.items.mineral.ingot.bloodsteel"), 3), (Item("common.items.crafting_ing.hide.dragon_scale"), 8), + (Item("common.items.mineral.ingot.bloodsteel"), 3), (Item("common.items.crafting_ing.leather.rigid_leather"), 1), (Item("common.items.crafting_ing.hide.scales"), 4), ], @@ -851,8 +846,8 @@ "dragonscale shoulder": ( output: ("common.items.armor.hide.dragonscale.shoulder", 1), inputs: [ - (Item("common.items.mineral.ingot.bloodsteel"), 3), (Item("common.items.crafting_ing.hide.dragon_scale"), 8), + (Item("common.items.mineral.ingot.bloodsteel"), 3), (Item("common.items.crafting_ing.leather.rigid_leather"), 2), (Item("common.items.crafting_ing.hide.scales"), 6), ], @@ -1109,6 +1104,7 @@ inputs: [ (Item("common.items.crafting_ing.cloth.moonweave"), 3), (Item("common.items.crafting_ing.hide.leather_troll"), 3), + (Item("common.items.mineral.ingot.silver"), 1), (Item("common.items.mineral.ingot.cobalt"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -1129,6 +1125,7 @@ inputs: [ (Item("common.items.crafting_ing.cloth.moonweave"), 10), (Item("common.items.crafting_ing.hide.leather_troll"), 5), + (Item("common.items.mineral.ingot.silver"), 1), (Item("common.items.mineral.ingot.cobalt"), 3), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -1180,7 +1177,7 @@ inputs: [ (Item("common.items.crafting_ing.cloth.sunsilk"), 3), (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 1), - (Item("common.items.mineral.ore.silver"), 1), + (Item("common.items.mineral.ingot.gold"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(Loom), @@ -1189,7 +1186,7 @@ output: ("common.items.armor.cloth.sunsilk.belt", 1), inputs: [ (Item("common.items.crafting_ing.cloth.sunsilk"), 2), - (Item("common.items.mineral.ore.silver"), 1), + (Item("common.items.mineral.ingot.gold"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(Loom), @@ -1199,7 +1196,7 @@ inputs: [ (Item("common.items.crafting_ing.cloth.sunsilk"), 10), (Item("common.items.crafting_ing.animal_misc.phoenix_feather"), 2), - (Item("common.items.mineral.ore.silver"), 2), + (Item("common.items.mineral.ingot.gold"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(Loom), @@ -1208,7 +1205,7 @@ output: ("common.items.armor.cloth.sunsilk.foot", 1), inputs: [ (Item("common.items.crafting_ing.cloth.sunsilk"), 3), - (Item("common.items.mineral.ore.silver"), 2), + (Item("common.items.mineral.ingot.gold"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(Loom), @@ -1217,7 +1214,7 @@ output: ("common.items.armor.cloth.sunsilk.hand", 1), inputs: [ (Item("common.items.crafting_ing.cloth.sunsilk"), 3), - (Item("common.items.mineral.ore.silver"), 2), + (Item("common.items.mineral.ingot.gold"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(Loom), @@ -1226,7 +1223,7 @@ output: ("common.items.armor.cloth.sunsilk.pants", 1), inputs: [ (Item("common.items.crafting_ing.cloth.sunsilk"), 8), - (Item("common.items.mineral.ore.silver"), 3), + (Item("common.items.mineral.ingot.gold"), 3), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(Loom), @@ -1235,7 +1232,7 @@ output: ("common.items.armor.cloth.sunsilk.shoulder", 1), inputs: [ (Item("common.items.crafting_ing.cloth.sunsilk"), 8), - (Item("common.items.mineral.ore.silver"), 3), + (Item("common.items.mineral.ingot.gold"), 3), (Item("common.items.crafting_tools.sewing_set"), 0), ], craft_sprite: Some(Loom), @@ -1635,13 +1632,13 @@ "tiny leather pouch": ( output: ("common.items.armor.misc.bag.tiny_leather_pouch", 1), inputs: [ - (Item("common.items.crafting_ing.leather.leather_strips"), 6), + (Item("common.items.crafting_ing.leather.leather_strips"), 12), ], ), "knitted red pouch": ( output: ("common.items.armor.misc.bag.knitted_red_pouch", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen_red"), 3), + (Item("common.items.crafting_ing.cloth.wool"), 6), (Item("common.items.armor.misc.bag.tiny_red_pouch"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -1649,7 +1646,7 @@ "woven red bag": ( output: ("common.items.armor.misc.bag.woven_red_bag", 1), inputs: [ - (Item("common.items.crafting_ing.cloth.linen_red"), 6), + (Item("common.items.crafting_ing.cloth.silk"), 6), (Item("common.items.armor.misc.bag.knitted_red_pouch"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -1659,7 +1656,7 @@ inputs: [ (Item("common.items.mineral.gem.diamond"), 2), (Item("common.items.crafting_ing.twigs"), 2), - (Item("common.items.crafting_ing.cloth.linen"), 3), + (Item("common.items.crafting_ing.cloth.silk"), 4), (Item("common.items.crafting_ing.leather.leather_strips"), 3), (Item("common.items.armor.misc.bag.tiny_leather_pouch"), 2), (Item("common.items.crafting_tools.sewing_set"), 0), @@ -1669,9 +1666,9 @@ "sturdy red backpack": ( output: ("common.items.armor.misc.bag.sturdy_red_backpack", 1), inputs: [ - (Item("common.items.mineral.gem.diamond"), 2), + (Item("common.items.mineral.gem.amethyst"), 2), (Item("common.items.crafting_ing.cloth.linen_red"), 3), - (Item("common.items.crafting_ing.leather.thick_leather"), 3), + (Item("common.items.crafting_ing.leather.thick_leather"), 6), (Item("common.items.armor.misc.bag.woven_red_bag"), 1), (Item("common.items.crafting_tools.sewing_set"), 0), ], @@ -1689,7 +1686,7 @@ output: ("common.items.armor.misc.bag.mindflayer_spellbag", 1), inputs: [ (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1), - (Item("common.items.crafting_ing.leather.thick_leather"), 8), + (Item("common.items.crafting_ing.leather.rigid_leather"), 8), (Item("common.items.mineral.gem.diamond"), 4), (Item("common.items.mineral.ore.veloritefrag"), 10), (Item("common.items.crafting_tools.sewing_set"), 0), diff --git a/assets/voxygen/i18n/en/hud/misc.ron b/assets/voxygen/i18n/en/hud/misc.ron index 04b74ef477..d447525a9f 100644 --- a/assets/voxygen/i18n/en/hud/misc.ron +++ b/assets/voxygen/i18n/en/hud/misc.ron @@ -32,9 +32,9 @@ You are welcome to take whatever you need on your journey! Look at the bottom right of the screen to find various things like your bag, the crafting menu and the map. -The crafting menu allows you to create armor, weapons, food and much more! +The crafting stations allow you to create armor, weapons, food and much more! -The wild animals all around town are a great source of Leather Scraps to create some protection against the dangers of the world. +The wild animals all around town are a great source of Animal Hide to create some protection against the dangers of the world. Whenever you feel ready, try to get even better equipment from the many challenges marked on your map! "#, diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 470763465a..72a2f4748f 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -517,6 +517,7 @@ impl Body { Body::Theropod(theropod) => match theropod.species { theropod::Species::Archaeos => 3500, theropod::Species::Odonto => 3000, + theropod::Species::Ntouka => 3000, _ => 1100, }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { @@ -527,7 +528,7 @@ impl Body { quadruped_low::Species::Tortoise => 900, quadruped_low::Species::Rocksnapper => 1400, quadruped_low::Species::Pangolin => 400, - quadruped_low::Species::Maneater => 700, + quadruped_low::Species::Maneater => 1300, quadruped_low::Species::Sandshark => 900, quadruped_low::Species::Hakulaq => 500, quadruped_low::Species::Lavadrake => 1600, @@ -685,7 +686,11 @@ impl Body { pub fn base_poise(&self) -> u32 { match self { Body::Humanoid(_) => 100, - Body::BipedLarge(_) => 250, + Body::BipedLarge(biped_large) => match biped_large.species { + biped_large::Species::Mindflayer => 320, + biped_large::Species::Minotaur => 280, + _ => 250, + }, Body::Golem(_) => 300, _ => 100, } diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index c1ced2481c..5c8f48345f 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -197,9 +197,12 @@ fn default_main_tool(body: &Body) -> Item { )), }, Body::QuadrupedLow(quadruped_low) => match quadruped_low.species { - quadruped_low::Species::Maneater | quadruped_low::Species::Asp => Some( - Item::new_from_asset_expect("common.items.npc_weapons.unique.quadlowranged"), - ), + quadruped_low::Species::Maneater => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.maneater", + )), + quadruped_low::Species::Asp => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.asp", + )), quadruped_low::Species::Crocodile | quadruped_low::Species::Alligator | quadruped_low::Species::Salamander => Some(Item::new_from_asset_expect( @@ -414,12 +417,52 @@ impl LoadoutBuilder { }) => self.chest(Some(Item::new_from_asset_expect( "common.items.npc_armor.biped_large.harvester", ))), + Body::BipedLarge(biped_large::Body { + species: + biped_large::Species::Ogre + | biped_large::Species::Cyclops + | biped_large::Species::Blueoni + | biped_large::Species::Redoni + | biped_large::Species::Troll + | biped_large::Species::Wendigo, + .. + }) => self.chest(Some(Item::new_from_asset_expect( + "common.items.npc_armor.biped_large.generic", + ))), Body::Golem(golem::Body { species: golem::Species::ClayGolem, .. }) => self.chest(Some(Item::new_from_asset_expect( "common.items.npc_armor.golem.claygolem", ))), + Body::QuadrupedLow(quadruped_low::Body { + species: + quadruped_low::Species::Basilisk + | quadruped_low::Species::Asp + | quadruped_low::Species::Lavadrake + | quadruped_low::Species::Maneater + | quadruped_low::Species::Rocksnapper + | quadruped_low::Species::Sandshark, + .. + }) => self.chest(Some(Item::new_from_asset_expect( + "common.items.npc_armor.quadruped_low.generic", + ))), + Body::QuadrupedLow(quadruped_low::Body { + species: quadruped_low::Species::Tortoise, + .. + }) => self.chest(Some(Item::new_from_asset_expect( + "common.items.npc_armor.quadruped_low.shell", + ))), + Body::Theropod(theropod::Body { + species: + theropod::Species::Archaeos + | theropod::Species::Yale + | theropod::Species::Ntouka + | theropod::Species::Odonto, + .. + }) => self.chest(Some(Item::new_from_asset_expect( + "common.items.npc_armor.theropod.rugged", + ))), _ => self, }; diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index 3d933bd396..eefa5e1a15 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -92,7 +92,7 @@ impl Body { quadruped_low::Species::Alligator => 110.0, quadruped_low::Species::Salamander => 85.0, quadruped_low::Species::Monitor => 160.0, - quadruped_low::Species::Asp => 130.0, + quadruped_low::Species::Asp => 110.0, quadruped_low::Species::Tortoise => 60.0, quadruped_low::Species::Rocksnapper => 70.0, quadruped_low::Species::Pangolin => 120.0, @@ -100,7 +100,7 @@ impl Body { quadruped_low::Species::Sandshark => 160.0, quadruped_low::Species::Hakulaq => 140.0, quadruped_low::Species::Lavadrake => 100.0, - quadruped_low::Species::Basilisk => 120.0, + quadruped_low::Species::Basilisk => 90.0, quadruped_low::Species::Deadwood => 140.0, }, Body::Ship(_) => 0.0, diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs index d6dab17616..a4b45e9149 100644 --- a/server/src/sys/agent.rs +++ b/server/src/sys/agent.rs @@ -1617,8 +1617,10 @@ impl<'a> AgentData<'a> { circle_time: 1, }, "Quad Med Basic" => Tactic::QuadMedBasic, - "Quad Low Ranged" => Tactic::QuadLowRanged, - "Quad Low Breathe" | "Quad Low Beam" => Tactic::QuadLowBeam, + "Asp" | "Maneater" => Tactic::QuadLowRanged, + "Quad Low Breathe" | "Quad Low Beam" | "Basilisk" => { + Tactic::QuadLowBeam + }, "Quad Low Tail" => Tactic::TailSlap, "Quad Low Quick" => Tactic::QuadLowQuick, "Quad Low Basic" => Tactic::QuadLowBasic, diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index bff44eb784..847650313c 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -328,7 +328,7 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { // Scatter things in caves if cave_depth > 40.0 && cave_depth < 80.0 { - if rng.gen::() < 0.2 * (cave_x.max(0.5).powf(4.0)) && !vein_condition { + if rng.gen::() < 0.14 * (cave_x.max(0.5).powf(4.0)) && !vein_condition { let kind = *Lottery::::load_expect("common.cave_scatter.shallow_floor") .read() @@ -349,7 +349,7 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { ); } } else if cave_depth < 200.0 && cave_depth > 80.0 { - if rng.gen::() < 0.12 * (cave_x.max(0.5).powf(4.0)) && !vein_condition { + if rng.gen::() < 0.08 * (cave_x.max(0.5).powf(4.0)) && !vein_condition { let kind = *Lottery::::load_expect("common.cave_scatter.deep_floor") .read() @@ -370,7 +370,7 @@ pub fn apply_caves_to(canvas: &mut Canvas, rng: &mut impl Rng) { ); } } else { - if rng.gen::() < 0.12 * (cave_x.max(0.5).powf(4.0)) + if rng.gen::() < 0.08 * (cave_x.max(0.5).powf(4.0)) && cave_depth > 40.0 && !vein_condition { @@ -445,7 +445,7 @@ pub fn apply_caves_supplement<'a>( .map_or(true, |b| b.is_fluid()) }) }) { - if RandomField::new(index.seed).chance(wpos2d.into(), 0.0018) + if RandomField::new(index.seed).chance(wpos2d.into(), 0.0014) && cave_base < surface_z as i32 - 40 { let is_hostile: bool; @@ -470,7 +470,7 @@ pub fn apply_caves_supplement<'a>( }; comp::quadruped_low::Body::random_with(dynamic_rng, &species) .into() - } else if cave_depth < 200.0 { + } else if cave_depth < 190.0 { is_hostile = true; let species = match dynamic_rng.gen_range(0..3) { 0 => comp::quadruped_low::Species::Rocksnapper,