From 108d8274fa3fbc2239a9c1ab4e7c98a93f6f104f Mon Sep 17 00:00:00 2001 From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com> Date: Wed, 27 Mar 2024 22:54:14 -0400 Subject: [PATCH] Melee buffs (#466) * 1H Buffs * Powerfist Buffs * 2H Buffs * forgot I nerfed this, It's fine now * forgot i nerfed fireaxe too, whoops lol * Appeasing God Emperor Hangy Kiss my ass Daniel * Apparently tadano made it 100% and I didn't realize * Stop bitching daniel cola --------- Co-authored-by: xTrainx Co-authored-by: Marcus D. Johnston <93160383+Aurrain@users.noreply.github.com> --- code/game/objects/items/melee/f13onehanded.dm | 29 ++++++++++++------- code/game/objects/items/melee/f13powerfist.dm | 4 +-- code/game/objects/items/melee/f13twohanded.dm | 12 ++++---- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/code/game/objects/items/melee/f13onehanded.dm b/code/game/objects/items/melee/f13onehanded.dm index 5c942f3cf3..69dbb01d64 100644 --- a/code/game/objects/items/melee/f13onehanded.dm +++ b/code/game/objects/items/melee/f13onehanded.dm @@ -102,7 +102,8 @@ desc = "This long blade is favoured by Legion officers and leaders, a finely crafted weapon with good steel and hilt made from bronze and bone." icon_state = "spatha" item_state = "spatha" - force = 38 + force = 42 + armour_penetration = 0.10 wound_bonus = 30 block_chance = 18 @@ -111,7 +112,7 @@ desc = "A long one-handed blade sporting lovingly applied wraps and a wonderfully forged and engraved guard. The blade looks to be carefully sharpened." icon_state = "longblade" item_state = "longblade" - force = 38 + force = 39 block_chance = 18 /obj/item/melee/onehanded/machete/scrapsabre @@ -133,8 +134,8 @@ icon_state = "throw_spear" item_state = "tribalspear" force = 20 - throwforce = 35 - armour_penetration = 0.10 + throwforce = 40 + armour_penetration = 0.15 max_reach = 2 embedding = list("pain_mult" = 4, "embed_chance" = 100, "fall_chance" = 8) w_class = WEIGHT_CLASS_NORMAL @@ -233,7 +234,8 @@ icon_state = "knife_trench" item_state = "knife_trench" desc = "This blade is designed for brutal close quarters combat." - force = 31 + force = 33 + wound_bonus = 10 custom_materials = list(/datum/material/iron=8000) attack_verb = list("slashed", "stabbed", "sliced", "shanked", "ripped", "lacerated") @@ -360,12 +362,12 @@ desc = "a finely balanced knife made from a lightweight alloy, designed for being thrown. You can easily embed these in someone, and you look darn cool while doing so." icon_state = "knife_throw" force = 20 - throwforce = 23 + throwforce = 27 armour_penetration = 0.25 bare_wound_bonus = 15 //keep your arteries covered throw_speed = 5 throw_range = 7 - embedding = list("pain_mult" = 4, "embed_chance" = 70, "fall_chance" = 5) + embedding = list("pain_mult" = 4, "embed_chance" = 75, "fall_chance" = 5) /////////// // CLUBS // @@ -429,6 +431,7 @@ block_chance = 30 attack_verb = list("smacked", "thwacked", "democratized", "freedomed") + // Classic Baton /obj/item/melee/classic_baton name = "wooden baton" @@ -754,7 +757,8 @@ icon_state = "spiked" item_state = "spiked" sharpness = SHARP_POINTY - force = 25 + force = 26 + armour_penetration = 0.2 // Sappers Keywords: Damage 25 /obj/item/melee/unarmed/sappers @@ -792,7 +796,7 @@ item_state = "lacerator" w_class = WEIGHT_CLASS_NORMAL force = 27 - bare_wound_bonus = 5 + bare_wound_bonus = 15 sharpness = SHARP_EDGED attack_verb = list("slashed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' @@ -879,7 +883,8 @@ hitsound = 'sound/f13weapons/pan.ogg' custom_materials = list(/datum/material/iron = 4000) -// Entrenching tool P81 + +// Entrenching tool P81 (based, they deserve better if they're using this) /obj/item/shovel/trench name = "p81 entrenching tool" desc = "The 'Pattern 2281' Entrenching Tool is a new piece of infantry equipment given in limited quantity to infantry troops. An extremely robust shovel with a serrated edge for chopping wood." @@ -889,7 +894,9 @@ icon_state = "entrenching_tool" item_state = "trench" w_class = WEIGHT_CLASS_NORMAL - force = 30 + force = 35 + armour_penetration = 0.1 + wound_bonus = 10 throwforce = 15 toolspeed = 0.7 sharpness = SHARP_EDGED diff --git a/code/game/objects/items/melee/f13powerfist.dm b/code/game/objects/items/melee/f13powerfist.dm index 19000363b2..3496bb88ab 100644 --- a/code/game/objects/items/melee/f13powerfist.dm +++ b/code/game/objects/items/melee/f13powerfist.dm @@ -56,7 +56,7 @@ lefthand_file = 'modular_BD2/legio_invicta/icons/onmob_legion_lefthand.dmi' icon_state = "goliath" item_state = "goliath" - force = 25 + force = 30 throw_distance = 3 @@ -288,7 +288,7 @@ w_class = WEIGHT_CLASS_BULKY item_flags = ABSTRACT // don't put in storage slot_flags = 0 - force = 55 + force = 60 damtype = "fire" tool_behaviour = TOOL_WELDER toolspeed = 0.3 diff --git a/code/game/objects/items/melee/f13twohanded.dm b/code/game/objects/items/melee/f13twohanded.dm index d5d58dd688..fb28dfeb4a 100644 --- a/code/game/objects/items/melee/f13twohanded.dm +++ b/code/game/objects/items/melee/f13twohanded.dm @@ -52,7 +52,7 @@ /obj/item/twohanded/legionaxe/ComponentInitialize() . = ..() AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools - AddComponent(/datum/component/two_handed, force_unwielded=25, force_wielded=50, icon_wielded="[icon_prefix]2") + AddComponent(/datum/component/two_handed, force_unwielded=25, force_wielded=56, icon_wielded="[icon_prefix]2") /obj/item/twohanded/legionaxe/suicide_act(mob/user) user.visible_message("[user] axes [user.p_them()]self from head to toe! It looks like [user.p_theyre()] trying to commit suicide!") @@ -136,7 +136,7 @@ /obj/item/twohanded/fireaxe/boneaxe/ComponentInitialize() . = ..() - AddComponent(/datum/component/two_handed, force_unwielded=25, force_wielded=40, icon_wielded="[icon_prefix]2") + AddComponent(/datum/component/two_handed, force_unwielded=25, force_wielded=50, icon_wielded="[icon_prefix]2") /obj/item/twohanded/fireaxe/boneaxe/afterattack(atom/A, mob/living/user, proximity) . = ..() @@ -298,10 +298,12 @@ icon_prefix = "lance" inhand_x_dimension = 64 inhand_y_dimension = 64 + armour_penetration = 0.10 + /obj/item/twohanded/spear/lance/ComponentInitialize() . = ..() - AddComponent(/datum/component/two_handed, force_unwielded=15, force_wielded=30, icon_wielded="[icon_prefix]_wield") + AddComponent(/datum/component/two_handed, force_unwielded=15, force_wielded=35, icon_wielded="[icon_prefix]_wield") // Scrap spear Keywords: Damage 17/28, Reach, Throw bonus @@ -748,8 +750,8 @@ icon_state = "chainsaw" icon_prefix = "chainsaw" force = 8 - wound_bonus = 15 - bare_wound_bonus = 15 + wound_bonus = 40 + bare_wound_bonus = 30 sharpness = SHARP_EDGED resistance_flags = FIRE_PROOF attack_verb = list("sawed", "shredded", "mauled")