From a81c71b461cb84219a7ce925b0baef2d504b4c35 Mon Sep 17 00:00:00 2001 From: Snowram Date: Fri, 25 Jun 2021 20:00:04 +0200 Subject: [PATCH] Increases base damage of husk attack, rename some cultist weapons --- .../abilities/custom/husk_brute/chargedmelee.ron | 4 ++-- assets/common/abilities/custom/minotaur/cleave.ron | 4 ++-- assets/common/entity/dungeon/tier-5/warlock.ron | 6 +++--- assets/common/entity/dungeon/tier-5/warlord.ron | 6 +++--- .../bow/bipedlarge-velorite.ron | 2 +- .../hammer/bipedlarge-cultist.ron} | 2 +- .../staff/bipedlarge-cultist.ron} | 2 +- .../sword/bipedlarge-cultist.ron | 2 +- .../common/skillset/dungeon/tier-5/sword_simple.ron | 13 ------------- assets/common/skillset/dungeon/tier-5/warlord.ron | 5 ----- assets/voxygen/voxel/biped_weapon_manifest.ron | 8 ++++---- common/src/comp/inventory/loadout_builder.rs | 4 ++-- 12 files changed, 20 insertions(+), 38 deletions(-) rename assets/common/items/{weapons => npc_weapons}/bow/bipedlarge-velorite.ron (90%) rename assets/common/items/{weapons/hammer/bipedlarge-cultist_purp_2h-0.ron => npc_weapons/hammer/bipedlarge-cultist.ron} (88%) rename assets/common/items/{weapons/staff/bipedlarge-cultist_staff.ron => npc_weapons/staff/bipedlarge-cultist.ron} (90%) rename assets/common/items/{weapons => npc_weapons}/sword/bipedlarge-cultist.ron (88%) delete mode 100644 assets/common/skillset/dungeon/tier-5/sword_simple.ron delete mode 100644 assets/common/skillset/dungeon/tier-5/warlord.ron diff --git a/assets/common/abilities/custom/husk_brute/chargedmelee.ron b/assets/common/abilities/custom/husk_brute/chargedmelee.ron index 94c388f71b..9b778e9af8 100644 --- a/assets/common/abilities/custom/husk_brute/chargedmelee.ron +++ b/assets/common/abilities/custom/husk_brute/chargedmelee.ron @@ -1,8 +1,8 @@ ChargedMelee( energy_cost: 0, energy_drain: 0, - initial_damage: 0, - scaled_damage: 500, + initial_damage: 50, + scaled_damage: 450, initial_poise_damage: 50, scaled_poise_damage: 150, initial_knockback: 0.0, diff --git a/assets/common/abilities/custom/minotaur/cleave.ron b/assets/common/abilities/custom/minotaur/cleave.ron index dff30a6fe4..3aa9a1b690 100644 --- a/assets/common/abilities/custom/minotaur/cleave.ron +++ b/assets/common/abilities/custom/minotaur/cleave.ron @@ -1,8 +1,8 @@ ChargedMelee( energy_cost: 0, energy_drain: 0, - initial_damage: 0, - scaled_damage: 500, + initial_damage: 50, + scaled_damage: 450, initial_poise_damage: 50, scaled_poise_damage: 150, initial_knockback: 0.0, diff --git a/assets/common/entity/dungeon/tier-5/warlock.ron b/assets/common/entity/dungeon/tier-5/warlock.ron index b6d9ae4608..369bd091cb 100644 --- a/assets/common/entity/dungeon/tier-5/warlock.ron +++ b/assets/common/entity/dungeon/tier-5/warlock.ron @@ -5,11 +5,11 @@ EntityConfig ( loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")), main_tool: Some(Choice([ - (1.5, Some(Item("common.items.weapons.staff.bipedlarge-cultist_staff"))), - (1.0, Some(Item("common.items.weapons.bow.bipedlarge-velorite"))), + (1.5, Some(Item("common.items.npc_weapons.staff.bipedlarge-cultist"))), + (1.0, Some(Item("common.items.npc_weapons.bow.bipedlarge-velorite"))), ])), second_tool: None, loadout_asset: None, - skillset_asset: Some("common.skillset.dungeon.tier-5.enemy"), + skillset_asset: None, ) diff --git a/assets/common/entity/dungeon/tier-5/warlord.ron b/assets/common/entity/dungeon/tier-5/warlord.ron index 01f7c29a71..fe2152e6e4 100644 --- a/assets/common/entity/dungeon/tier-5/warlord.ron +++ b/assets/common/entity/dungeon/tier-5/warlord.ron @@ -5,11 +5,11 @@ EntityConfig ( loot: Some(LootTable("common.loot_tables.dungeon.tier-5.enemy")), main_tool: Some(Choice([ - (1.5, Some(Item("common.items.weapons.sword.bipedlarge-cultist"))), - (1.0, Some(Item("common.items.weapons.hammer.bipedlarge-cultist_purp_2h-0"))), + (1.5, Some(Item("common.items.npc_weapons.sword.bipedlarge-cultist"))), + (1.0, Some(Item("common.items.npc_weapons.hammer.bipedlarge-cultist"))), ])), second_tool: None, loadout_asset: None, - skillset_asset: Some("common.skillset.dungeon.tier-5.warlord"), + skillset_asset: None, ) diff --git a/assets/common/items/weapons/bow/bipedlarge-velorite.ron b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron similarity index 90% rename from assets/common/items/weapons/bow/bipedlarge-velorite.ron rename to assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron index 800a221e8e..40c9d278dc 100644 --- a/assets/common/items/weapons/bow/bipedlarge-velorite.ron +++ b/assets/common/items/npc_weapons/bow/bipedlarge-velorite.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Velorite Bow (bipedlarge)", + name: "Giant Velorite Bow", description: "Infused with Velorite power.", kind: Tool(( kind: Bow, diff --git a/assets/common/items/weapons/hammer/bipedlarge-cultist_purp_2h-0.ron b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron similarity index 88% rename from assets/common/items/weapons/hammer/bipedlarge-cultist_purp_2h-0.ron rename to assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron index 6161fa12a7..1493bb69a2 100644 --- a/assets/common/items/weapons/hammer/bipedlarge-cultist_purp_2h-0.ron +++ b/assets/common/items/npc_weapons/hammer/bipedlarge-cultist.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Magical Cultist Warhammer (bipedlarge)", + name: "Giant Cultist Warhammer", description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Hammer, diff --git a/assets/common/items/weapons/staff/bipedlarge-cultist_staff.ron b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron similarity index 90% rename from assets/common/items/weapons/staff/bipedlarge-cultist_staff.ron rename to assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron index c709f9a11b..13139bd011 100644 --- a/assets/common/items/weapons/staff/bipedlarge-cultist_staff.ron +++ b/assets/common/items/npc_weapons/staff/bipedlarge-cultist.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Cultist Staff (bipedlarge)", + name: "Giant Cultist Staff", description: "The fire gives off no heat.", kind: Tool(( kind: Staff, diff --git a/assets/common/items/weapons/sword/bipedlarge-cultist.ron b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron similarity index 88% rename from assets/common/items/weapons/sword/bipedlarge-cultist.ron rename to assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron index dd62980f60..06eae29d7a 100644 --- a/assets/common/items/weapons/sword/bipedlarge-cultist.ron +++ b/assets/common/items/npc_weapons/sword/bipedlarge-cultist.ron @@ -1,5 +1,5 @@ ItemDef( - name: "Magical Cultist Greatsword (bipedlarge)", + name: "Giant Cultist Greatsword", description: "This belonged to an evil Cult Leader.", kind: Tool(( kind: Sword, diff --git a/assets/common/skillset/dungeon/tier-5/sword_simple.ron b/assets/common/skillset/dungeon/tier-5/sword_simple.ron deleted file mode 100644 index 28d8bc547d..0000000000 --- a/assets/common/skillset/dungeon/tier-5/sword_simple.ron +++ /dev/null @@ -1,13 +0,0 @@ -([ - Group(Weapon(Sword)), - - // TripleStrike - Skill((Sword(TsCombo), None)), - Skill((Sword(TsDamage), Some(1))), - Skill((Sword(TsRegen), Some(1))), - - // Dash - Skill((Sword(DDamage), Some(1))), - Skill((Sword(DCost), Some(1))), - Skill((Sword(DDrain), Some(1))), -]) diff --git a/assets/common/skillset/dungeon/tier-5/warlord.ron b/assets/common/skillset/dungeon/tier-5/warlord.ron deleted file mode 100644 index 85c6edcab3..0000000000 --- a/assets/common/skillset/dungeon/tier-5/warlord.ron +++ /dev/null @@ -1,5 +0,0 @@ -([ - // Just gather everything - Tree("common.skillset.dungeon.tier-5.sword_simple"), - Tree("common.skillset.dungeon.tier-5.hammer"), -]) diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 93ea6dc59f..04d8e11aea 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -1074,19 +1074,19 @@ vox_spec: ("weapon.hammer.2hhammer_oni_red", (-3.0, -4.5, -12.0)), color: None ), - "common.items.weapons.sword.bipedlarge-cultist": ( + "common.items.npc_weapons.sword.bipedlarge-cultist": ( vox_spec: ("weapon.sword.cultist", (-1.5, -4.0, -6.0)), color: None ), - "common.items.weapons.hammer.bipedlarge-cultist_purp_2h-0": ( + "common.items.npc_weapons.hammer.bipedlarge-cultist": ( vox_spec: ("weapon.hammer.cult_purp-0", (-3.5, -4.5, -5.0)), color: None ), - "common.items.weapons.bow.bipedlarge-velorite": ( + "common.items.npc_weapons.bow.bipedlarge-velorite": ( vox_spec: ("weapon.bow.velorite", (-1.5, -4.0, -15.0)), color: None ), - "common.items.weapons.staff.bipedlarge-cultist_staff": ( + "common.items.npc_weapons.staff.bipedlarge-cultist": ( vox_spec: ("weapon.staff.firestaff_cultist", (-2.5, -2.5, -4.0)), color: None ), diff --git a/common/src/comp/inventory/loadout_builder.rs b/common/src/comp/inventory/loadout_builder.rs index c3b6f5d3ff..2eb0a990d7 100644 --- a/common/src/comp/inventory/loadout_builder.rs +++ b/common/src/comp/inventory/loadout_builder.rs @@ -302,10 +302,10 @@ fn default_main_tool(body: &Body) -> Item { "common.items.npc_weapons.hammer.oni_red_hammer", )), (biped_large::Species::Cultistwarlord, _) => Some(Item::new_from_asset_expect( - "common.items.weapons.sword.bipedlarge-cultist", + "common.items.npc_weapons.sword.bipedlarge-cultist", )), (biped_large::Species::Cultistwarlock, _) => Some(Item::new_from_asset_expect( - "common.items.weapons.staff.bipedlarge-cultist_staff", + "common.items.npc_weapons.staff.bipedlarge-cultist", )), (biped_large::Species::Huskbrute, _) => Some(Item::new_from_asset_expect( "common.items.npc_weapons.unique.husk_brute",