mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-20 11:40:07 +01:00
MrMelbertandGitHub
5bf6d09903
## About The Pull Request - `apply_damage` is now uniform, handled, in a single place. At the living level. - Fixes people being held at gunpoint from being unable to flinch from taking damage. - Fixes a few signals (explodable, glass jaw) of apply damage maybe potentially not having effects if the passed hit zone was a bodypart and not a def zone. - Fixes regenerator component always halting regeneration no matter what damage taken. - Fixes pressure damage being unaffected by `brute_mod` despite what documentation claims. - Signalizes the `check_species_weakness` proc on species. ## Why It's Good For The Game The copy+paste of this proc made it awful, awful to maintain or add features to. And also made it very bug prone. This just takes a step forward in making sustaining damage a lot more consistent, not only across all mobs, but across all methods of... taking damage. Unarmed attacks, hulk, item attacks, etc. ## Changelog 🆑 Melbert fix: People held at gunpoint can now flinch when being hit. fix: Regenerating mobs no longer stop regenerating no matter hit with what. fix: Pressure damage is now properly modified by a mob's brute damage modifier. fix: Fixes some occasions which some effects (glass jaw, explodable worn items) won't respond to hits. refactor: Refactored core code related to mobs sustaining damage. /🆑
63 lines
2.2 KiB
Plaintext
63 lines
2.2 KiB
Plaintext
///Objects or mobs with this componenet will drop items when taking damage.
|
|
/datum/component/pinata
|
|
///How much damage does an attack need to do to have a chance to drop "candy"
|
|
var/minimum_damage
|
|
///What is the likelyhood some "candy" should drop when attacked.
|
|
var/drop_chance
|
|
///A list of "candy" items that can be dropped when taking damage
|
|
var/candy
|
|
///Number of "candy" items dropped when the structure is destroyed/mob is killed, set to 0 if none. drop_chance and minimum damage are not applied.
|
|
var/death_drop
|
|
|
|
/datum/component/pinata/Initialize(
|
|
minimum_damage = 10,
|
|
drop_chance = 40,
|
|
candy = list(/obj/item/food/candy, /obj/item/food/lollipop/cyborg, /obj/item/food/gumball, /obj/item/food/bubblegum, /obj/item/food/chocolatebar),
|
|
death_drop = 5,
|
|
)
|
|
|
|
src.minimum_damage = minimum_damage
|
|
src.drop_chance = drop_chance
|
|
src.candy = candy
|
|
src.death_drop = death_drop
|
|
|
|
if(ismob(parent))
|
|
RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(damage_inflicted))
|
|
RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(pinata_broken))
|
|
return
|
|
if(isobj(parent))
|
|
var/obj/parent_integrity_test = parent
|
|
if(parent_integrity_test.uses_integrity)
|
|
RegisterSignal(parent, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(damage_inflicted))
|
|
RegisterSignal(parent, COMSIG_ATOM_DESTRUCTION, PROC_REF(pinata_broken))
|
|
return
|
|
return COMPONENT_INCOMPATIBLE
|
|
|
|
/datum/component/pinata/proc/damage_inflicted(obj/target, damage, damage_type, ...)
|
|
SIGNAL_HANDLER
|
|
if(damage < minimum_damage || damage_type == STAMINA || damage_type == OXY)
|
|
return
|
|
if(!prob(drop_chance + damage)) //Higher damage means less rolls but higher odds on the roll
|
|
return
|
|
var/list/turf_options = get_adjacent_open_turfs(parent)
|
|
turf_options += get_turf(parent)
|
|
if(length(turf_options))
|
|
var/dropped_item = pick(candy)
|
|
new dropped_item(pick(turf_options))
|
|
|
|
/datum/component/pinata/proc/pinata_broken()
|
|
SIGNAL_HANDLER
|
|
for(var/i in 1 to death_drop)
|
|
var/dropped_item = pick(candy)
|
|
new dropped_item(get_turf(parent))
|
|
qdel(src)
|
|
|
|
/datum/component/pinata/Destroy(force, silent)
|
|
UnregisterSignal(parent, list(
|
|
COMSIG_MOB_APPLY_DAMAGE,
|
|
COMSIG_LIVING_DEATH,
|
|
COMSIG_ATOM_TAKE_DAMAGE,
|
|
COMSIG_ATOM_DESTRUCTION,
|
|
))
|
|
return ..()
|