From ba0db563cc740637995a162c9d615af33efc1b9b Mon Sep 17 00:00:00 2001 From: uniior Date: Sat, 17 Feb 2024 13:09:50 -0300 Subject: [PATCH] Address comments --- .../abilities/custom/quadmedquick/dash.ron | 8 ++++---- .../custom/quadmedquick/triplestrike.ron | 12 +++++------ .../custom/treant_sapling/shockwave.ron | 4 ++-- assets/common/item_i18n_manifest.ron | 6 ++++++ .../unique/quadruped_medium/highland.ron | 20 +++++++++++++++++++ .../unique/quadruped_medium/wolf.ron | 20 +++++++++++++++++++ assets/voxygen/i18n/en/item/weapon/npc.ftl | 6 ++++++ common/src/comp/body.rs | 6 +++--- common/src/comp/inventory/loadout_builder.rs | 9 ++++++--- 9 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 assets/common/items/npc_weapons/unique/quadruped_medium/highland.ron create mode 100644 assets/common/items/npc_weapons/unique/quadruped_medium/wolf.ron diff --git a/assets/common/abilities/custom/quadmedquick/dash.ron b/assets/common/abilities/custom/quadmedquick/dash.ron index 72621d3e24..2cbeb5fb2c 100644 --- a/assets/common/abilities/custom/quadmedquick/dash.ron +++ b/assets/common/abilities/custom/quadmedquick/dash.ron @@ -2,16 +2,16 @@ DashMelee( energy_cost: 0, melee_constructor: ( kind: Bash( - damage: 10.0, - poise: 20.0, + damage: 15.0, + poise: 28.0, knockback: 3.0, energy_regen: 0.0, ), scaled: Some(( kind: Bash( damage: 4.0, - poise: 20.0, - knockback: 6.0, + poise: 28.0, + knockback: 7.0, energy_regen: 0.0, ))), range: 2.0, diff --git a/assets/common/abilities/custom/quadmedquick/triplestrike.ron b/assets/common/abilities/custom/quadmedquick/triplestrike.ron index dd5a8e0d60..68d37bd944 100644 --- a/assets/common/abilities/custom/quadmedquick/triplestrike.ron +++ b/assets/common/abilities/custom/quadmedquick/triplestrike.ron @@ -3,8 +3,8 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 12, - poise: 12, + damage: 20, + poise: 15, knockback: 5, energy_regen: 0, ), @@ -23,8 +23,8 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 12, - poise: 12, + damage: 20, + poise: 17, knockback: 5, energy_regen: 0, ), @@ -43,8 +43,8 @@ ComboMelee2( ( melee_constructor: ( kind: Bash( - damage: 14, - poise: 14, + damage: 20, + poise: 20, knockback: 5, energy_regen: 0, ), diff --git a/assets/common/abilities/custom/treant_sapling/shockwave.ron b/assets/common/abilities/custom/treant_sapling/shockwave.ron index 899a073ff1..a45d27b00a 100644 --- a/assets/common/abilities/custom/treant_sapling/shockwave.ron +++ b/assets/common/abilities/custom/treant_sapling/shockwave.ron @@ -8,8 +8,8 @@ Shockwave( knockback: ( strength: 5.0, direction: Away), shockwave_angle: 360.0, shockwave_vertical_angle: 90.0, - shockwave_speed: 10, - shockwave_duration: 1.3, + shockwave_speed: 16, + shockwave_duration: 0.8, dodgeable: Jump, move_efficiency: 0.1, damage_kind: Crushing, diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index 9d03840cdb..8da7e01b99 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -2628,6 +2628,9 @@ 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.highland", + ): "common-items-npc_weapons-unique-quadruped_medium-highland", Simple( "common.items.npc_weapons.unique.quadruped_medium.horse", ): "common-items-npc_weapons-unique-quadruped_medium-horse", @@ -2637,6 +2640,9 @@ Simple( "common.items.npc_weapons.unique.quadruped_medium.mouflon", ): "common-items-npc_weapons-unique-quadruped_medium-mouflon", + Simple( + "common.items.npc_weapons.unique.quadruped_medium.wolf", + ): "common-items-npc_weapons-unique-quadruped_medium-wolf", Simple( "common.items.npc_weapons.unique.quadruped_low.asp", ): "common-items-npc_weapons-unique-quadruped_low-asp", diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/highland.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/highland.ron new file mode 100644 index 0000000000..ce30496df5 --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/highland.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Highland", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.75, + effect_power: 1.0, + speed: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Common, + tags: [], + ability_spec: Some(Custom("Quad Med Basic")), +) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/unique/quadruped_medium/wolf.ron b/assets/common/items/npc_weapons/unique/quadruped_medium/wolf.ron new file mode 100644 index 0000000000..139b16013f --- /dev/null +++ b/assets/common/items/npc_weapons/unique/quadruped_medium/wolf.ron @@ -0,0 +1,20 @@ +ItemDef( + legacy_name: "Wolf", + legacy_description: "testing123", + kind: Tool(( + kind: Natural, + hands: Two, + stats: ( + equip_time_secs: 0.01, + power: 0.6, + effect_power: 0.6, + speed: 1.0, + range: 1.0, + energy_efficiency: 1.0, + buff_strength: 1.0, + ), + )), + quality: Common, + tags: [], + ability_spec: Some(Custom("Quad Med Quick")), +) \ No newline at end of file diff --git a/assets/voxygen/i18n/en/item/weapon/npc.ftl b/assets/voxygen/i18n/en/item/weapon/npc.ftl index 3f3c012b77..f7d3fafc63 100644 --- a/assets/voxygen/i18n/en/item/weapon/npc.ftl +++ b/assets/voxygen/i18n/en/item/weapon/npc.ftl @@ -400,6 +400,9 @@ common-items-npc_weapons-unique-quadruped_medium-donkey = Donkey common-items-npc_weapons-unique-quadruped_medium-grolgar = Grolgar .desc = testing123 +common-items-npc_weapons-unique-quadruped_medium-highland = Highland + .desc = testing123 + common-items-npc_weapons-unique-quadruped_medium-horse = Horse .desc = testing123 @@ -409,6 +412,9 @@ common-items-npc_weapons-unique-quadruped_medium-moose = Moose common-items-npc_weapons-unique-quadruped_medium-mouflon = Mouflon .desc = testing123 +common-items-npc_weapons-unique-quadruped_medium-wolf = Wolf + .desc = testing123 + common-items-npc_weapons-unique-quadruped_small-boar = Boar .desc = testing123 diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index cc8e5ed7ce..569598768e 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -1016,9 +1016,9 @@ impl Body { quadruped_low::Species::Lavadrake => 460, quadruped_low::Species::Maneater => 800, quadruped_low::Species::Mossdrake => 720, - quadruped_low::Species::Rocksnapper => 480, - quadruped_low::Species::Reefsnapper => 490, - quadruped_low::Species::Rootsnapper => 500, + quadruped_low::Species::Rocksnapper => 380, + quadruped_low::Species::Reefsnapper => 390, + quadruped_low::Species::Rootsnapper => 400, quadruped_low::Species::Sandshark => 550, // T3B quadruped_low::Species::Basilisk => 1300, diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index 3d5c8e851f..f136dbbd8a 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -567,7 +567,7 @@ fn default_main_tool(body: &Body) -> Item { }, Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species { quadruped_medium::Species::Wolf => Some(Item::new_from_asset_expect( - "common.items.npc_weapons.unique.quadmedquick", + "common.items.npc_weapons.unique.quadruped_medium.wolf", )), // Below uniques still follow quadmedhoof just with stat alterations quadruped_medium::Species::Alpaca | quadruped_medium::Species::Llama => { @@ -622,10 +622,13 @@ fn default_main_tool(body: &Body) -> Item { quadruped_medium::Species::Roshwalr => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.roshwalr", )), - quadruped_medium::Species::Cattle - | quadruped_medium::Species::Yak => Some(Item::new_from_asset_expect( + quadruped_medium::Species::Cattle => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.quadmedbasicgentle", )), + quadruped_medium::Species::Highland + | quadruped_medium::Species::Yak => Some(Item::new_from_asset_expect( + "common.items.npc_weapons.unique.quadruped_medium.highland", + )), quadruped_medium::Species::Frostfang => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.frostfang", )),