Skip to content

Commit

Permalink
Crusher Balance (#3591)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Crusher Code slightly cleaner
Crushers do more damage
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
I want to see how they feel like this.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
balance: Crusher damage has been slightly increased across the board.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Erika Fox <[email protected]>
Co-authored-by: Erika Fox <[email protected]>
Co-authored-by: Sun-Soaked <[email protected]>
Co-authored-by: Theos <[email protected]>
  • Loading branch information
4 people authored Nov 10, 2024
1 parent daba8a8 commit 1c0bec0
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions code/modules/mining/equipment/kinetic_crusher.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@
var/charge_time = 15
var/detonation_damage = 20
var/backstab_bonus = 10
var/unwielded_force = 0
var/wielded_force = 25

/obj/item/kinetic_crusher/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 60, 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=15)
AddComponent(/datum/component/two_handed, force_unwielded=unwielded_force, force_wielded=wielded_force)

/obj/item/kinetic_crusher/examine(mob/living/user)
. = ..()
Expand Down Expand Up @@ -154,16 +156,13 @@
detonation_damage = 10
slowdown = 0.5//hevy
attack_verb = list("mashed", "flattened", "bisected", "eradicated","destroyed")
unwielded_force = 0
wielded_force = 30

/obj/item/kinetic_crusher/old/examine(mob/user)
. = ..()
. += "<span class='notice'>This hunk of junk's so heavy that you can barely swing it! Though, that blade looks pretty sharp...</span>"

/obj/item/kinetic_crusher/old/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 60, 110)
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=25)//big choppa!

/obj/item/kinetic_crusher/old/melee_attack_chain(mob/user, atom/target, params)
..()
user.changeNext_move(CLICK_CD_MELEE * 2.0)//...slow swinga.
Expand Down Expand Up @@ -204,18 +203,14 @@
detonation_damage = 35
backstab_bonus = 15
actions_types = list()

unwielded_force = 0
wielded_force = 22

/obj/item/kinetic_crusher/syndie_crusher/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))

/obj/item/kinetic_crusher/syndie_crusher/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 60, 150)
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=10)

/// triggered on wield of two handed item
/obj/item/kinetic_crusher/syndie_crusher/proc/on_wield(obj/item/source, mob/user)
SIGNAL_HANDLER
Expand Down

0 comments on commit 1c0bec0

Please sign in to comment.