cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 18:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes inconsistent PKC descriptions and broken bubblegum/wendigo trophies (#90736)

Browse Source 
Bubblegum trophy has attempted to modify its' *own* dual wielding, so if
you attached and detached it you were able to have a tiny 20 force two
handed weapon. Yeah. This PR implements a way for trophies to
consistently modify their damage, and fixes some oversights (values not
being assigned/updating) in two handed component code.

Closes #90731

🆑
fix: Fixed inconsistent proto-kinetic crusher descriptions
fix: Fixed Bubblegum and Wendigo crusher trophies sometimes not working.
/🆑
This commit is contained in:
SmArtKar
2025-04-25 17:36:00 +02:00
committed by Shadow-Quill
parent d671a8fc3d
commit 4e3911b960
3 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm
+10 -4
View File
@@ -52,6 +52,8 @@
var/current_inhand_icon_state = "crusher"
/// Used by retool kits when changing the crusher's projectile sprite
var/projectile_icon = "pulse1"
/// Wielded damage we deal, aka our "real" damage
var/force_wielded = 20
/obj/item/kinetic_crusher/Initialize(mapload)
. = ..()
@@ -60,8 +62,8 @@
effectiveness = 110, \
)
//technically it's huge and bulky, but this provides an incentive to use it
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20)
//register_context() // BUBBER EDIT - context is added through reskinning
update_wielding()
register_context()
/obj/item/kinetic_crusher/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()
@@ -83,8 +85,8 @@
/obj/item/kinetic_crusher/examine(mob/living/user)
. = ..()
. += span_notice("Mark a large creature with a destabilizing force with right-click, then hit them in melee to do <b>[force + detonation_damage]</b> damage.")
. += span_notice("Does <b>[force + detonation_damage + backstab_bonus]</b> damage if the target is backstabbed, instead of <b>[force + detonation_damage]</b>.")
. += span_notice("Mark a large creature with a destabilizing force with right-click, then hit them in melee to do <b>[force_wielded + detonation_damage]</b> damage.")
. += span_notice("Does <b>[force_wielded + detonation_damage + backstab_bonus]</b> damage if the target is backstabbed, instead of <b>[force_wielded + detonation_damage]</b>.")
for(var/obj/item/crusher_trophy/crusher_trophy as anything in trophies)
. += span_notice("It has \a [crusher_trophy] attached, which causes [crusher_trophy.effect_desc()].")
@@ -243,6 +245,10 @@
update_appearance()
playsound(src.loc, 'sound/items/weapons/kinetic_reload.ogg', 60, TRUE)
/// Updates the two handed component with new damage values
/obj/item/kinetic_crusher/proc/update_wielding()
AddComponent(/datum/component/two_handed, force_unwielded = 0, force_wielded = force_wielded)
/obj/item/kinetic_crusher/ui_action_click(mob/user, actiontype)
set_light_on(!light_on)
playsound(user, 'sound/items/weapons/empty.ogg', 100, TRUE)
code/modules/mining/equipment/kinetic_crusher/trophies_megafauna.dm
+18 -12
View File
@@ -57,17 +57,19 @@
/obj/item/crusher_trophy/demon_claws/add_to(obj/item/kinetic_crusher/pkc, mob/living/user)
. = ..()
if(.)
pkc.force += bonus_value * 0.2
pkc.detonation_damage += bonus_value * 0.8
AddComponent(/datum/component/two_handed, force_wielded=(20 + bonus_value * 0.2))
if(!.)
return
pkc.force_wielded += bonus_value * 0.2
pkc.detonation_damage += bonus_value * 0.8
pkc.update_wielding()
/obj/item/crusher_trophy/demon_claws/remove_from(obj/item/kinetic_crusher/pkc, mob/living/user)
. = ..()
if(.)
pkc.force -= bonus_value * 0.2
pkc.detonation_damage -= bonus_value * 0.8
AddComponent(/datum/component/two_handed, force_wielded=20)
if(!.)
return
pkc.force_wielded -= bonus_value * 0.2
pkc.detonation_damage -= bonus_value * 0.8
pkc.update_wielding()
/obj/item/crusher_trophy/demon_claws/on_melee_hit(mob/living/target, mob/living/user)
user.heal_ordered_damage(bonus_value * 0.1, damage_heal_order)
@@ -152,13 +154,17 @@
/obj/item/crusher_trophy/wendigo_horn/add_to(obj/item/kinetic_crusher/crusher, mob/living/user)
. = ..()
if(.)
crusher.AddComponent(/datum/component/two_handed, force_wielded=40)
if(!.)
return
crusher.force_wielded += 20
crusher.update_wielding()
/obj/item/crusher_trophy/wendigo_horn/remove_from(obj/item/kinetic_crusher/crusher, mob/living/user)
. = ..()
if(.)
crusher.AddComponent(/datum/component/two_handed, force_wielded=20)
if(!.)
return
crusher.force_wielded -= 20
crusher.update_wielding()
// Goliath Broodmother
/obj/item/crusher_trophy/broodmother_tongue