-
-
Notifications
You must be signed in to change notification settings - Fork 453
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes shielded hardsuits not properly appearing + refactor (#21831)
* work * done
- Loading branch information
Showing
3 changed files
with
86 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,116 @@ | ||
| /datum/component/shielded | ||
|
|
||
| ///file to get the shield icon from | ||
| var/shield_icon | ||
| ///specific icon used for the shield | ||
| var/shield_icon_state | ||
|
|
||
|
|
||
| ///current number of shield charges | ||
| var/current_shield_charges | ||
| ///maximum number of charges the shield can have | ||
| var/max_shield_charges | ||
| ///How long it takes for a shield charge to recharge | ||
| var/shield_recharge | ||
|
|
||
| ///Cooldown after getting hit for the shield to recharge | ||
| COOLDOWN_DECLARE(recharge_cooldown) | ||
|
|
||
| ///clothing slot the item is stored in | ||
| var/target_slot | ||
|
|
||
| var/cached_mutable_appearance | ||
| ///the visual overlay of the shield | ||
| var/mutable_appearance/cached_mutable_appearance | ||
|
|
||
| ///whether or not the shield visual is emissive | ||
| var/emissive = FALSE | ||
|
|
||
| ///the emissive visual overlay of the shield | ||
| var/mutable_appearance/cached_emissive_appearance | ||
|
|
||
| var/is_shielded = FALSE | ||
| var/is_charged = TRUE | ||
| ///Boolean whether or not the shield is currently worn the user | ||
| var/shield_active = TRUE | ||
|
|
||
| var/mob/living/current_owner | ||
|
|
||
| /datum/component/shielded/Initialize(shielded_icon, shielded_icon_state, shielded_recharge, slot) | ||
| /datum/component/shielded/Initialize(shielded_icon, shielded_icon_state, max_shield, shielded_recharge, slot, emissive_shield = FALSE) | ||
| if(!shielded_icon) | ||
| CRASH("Invalid shield icon passed") | ||
| if(!shielded_icon_state) | ||
| CRASH("Invalid shield icon state passed") | ||
| if(!isnum(max_shield)) | ||
| CRASH("Invalid max shield charges passed, expected number, found [max_shield]") | ||
| if(!isnum(shielded_recharge)) | ||
| CRASH("Invalid shield recharge passed, expected number, found [shielded_recharge]") | ||
|
|
||
| shield_icon = shielded_icon | ||
| shield_icon_state = shielded_icon_state | ||
| max_shield_charges = max_shield | ||
| current_shield_charges = max_shield_charges | ||
| shield_recharge = shielded_recharge | ||
| target_slot = slot | ||
| emissive = emissive_shield | ||
| cached_mutable_appearance = mutable_appearance(shield_icon, shield_icon_state) | ||
| cached_emissive_appearance = emissive_appearance(shield_icon, shield_icon_state, parent) | ||
|
|
||
| RegisterSignal(parent,COMSIG_ITEM_HIT_REACT,PROC_REF(on_hit_react)) | ||
| RegisterSignal(parent,COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) | ||
| RegisterSignal(parent,COMSIG_ITEM_DROPPED, PROC_REF(on_dropped)) | ||
|
|
||
| /datum/component/shielded/proc/apply_shield() | ||
| if(is_shielded) | ||
| return | ||
|
|
||
| is_shielded = TRUE | ||
|
|
||
| if(!current_owner) | ||
| return | ||
|
|
||
| if(is_charged) | ||
| current_owner.add_overlay(cached_mutable_appearance) | ||
| RegisterSignal(parent, COMSIG_ITEM_HIT_REACT, PROC_REF(on_hit_react)) | ||
| RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) | ||
| RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_dropped)) | ||
|
|
||
| /datum/component/shielded/proc/remove_shield() | ||
| if(!is_shielded) | ||
| return | ||
| /datum/component/shielded/Destroy(force, silent) | ||
| STOP_PROCESSING(SSobj, src) | ||
| return ..() | ||
|
|
||
| is_shielded = FALSE | ||
| /datum/component/shielded/proc/on_hit_react(datum/source, mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) | ||
| if(drain_charge()) | ||
| var/datum/effect_system/spark_spread/s = new | ||
| s.set_up(2, 1, current_owner) | ||
| s.start() | ||
| current_owner.visible_message(span_danger("[current_owner]'s shields deflect [attack_text] in a shower of sparks!")) | ||
| return COMPONENT_HIT_REACTION_BLOCK | ||
|
|
||
| if(!current_owner) | ||
| return | ||
|
|
||
| if(is_charged) | ||
| current_owner.cut_overlay(cached_mutable_appearance) | ||
|
|
||
| /datum/component/shielded/proc/drain_charge() | ||
| if(!is_charged) | ||
| return | ||
| is_charged = FALSE | ||
| if(!current_owner) | ||
| return | ||
| current_owner.cut_overlay(cached_mutable_appearance) | ||
| addtimer(CALLBACK(src,PROC_REF(recharge)),shield_recharge) | ||
|
|
||
| /datum/component/shielded/proc/recharge() | ||
| if(is_charged) | ||
| return | ||
| is_charged = TRUE | ||
| if(!shield_active) | ||
| return FALSE | ||
| if(!current_owner) | ||
| return | ||
| current_owner.add_overlay(cached_mutable_appearance) | ||
| return FALSE | ||
| if(current_shield_charges <= 0) | ||
| return FALSE | ||
|
|
||
| current_shield_charges -- | ||
|
|
||
| /datum/component/shielded/proc/on_hit_react(datum/source, mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) | ||
| if(!is_shielded || !is_charged) | ||
| return | ||
| drain_charge() | ||
| return COMPONENT_HIT_REACTION_BLOCK | ||
| current_owner.update_appearance(UPDATE_OVERLAYS) | ||
|
|
||
| if(shield_recharge) | ||
| COOLDOWN_START(src, recharge_cooldown, shield_recharge) | ||
| START_PROCESSING(SSobj, src) | ||
| return TRUE | ||
|
|
||
| /datum/component/shielded/process(delta_time) | ||
| if(COOLDOWN_FINISHED(src, recharge_cooldown) && current_shield_charges < max_shield_charges) | ||
| current_shield_charges = clamp(current_shield_charges + 1, 0, max_shield_charges) | ||
| playsound(get_turf(parent), 'sound/magic/charge.ogg', 50, 1) | ||
| if(current_shield_charges >= max_shield_charges) | ||
| STOP_PROCESSING(SSobj, src) | ||
| if(current_owner) | ||
| current_owner.update_appearance(UPDATE_OVERLAYS) | ||
|
|
||
| /datum/component/shielded/proc/on_equipped(datum/source, mob/equipper, slot) | ||
| current_owner = equipper | ||
| if(target_slot && target_slot != slot) | ||
| remove_shield() | ||
| return | ||
| apply_shield() | ||
| shield_active = (target_slot == slot) | ||
| RegisterSignal(current_owner, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(update_shield_overlay)) | ||
| current_owner.update_appearance(UPDATE_OVERLAYS) | ||
|
|
||
| /datum/component/shielded/proc/on_dropped(datum/source,mob/dropper) | ||
| remove_shield() | ||
| shield_active = FALSE | ||
| UnregisterSignal(current_owner, COMSIG_ATOM_UPDATE_OVERLAYS) | ||
| current_owner.update_appearance(UPDATE_OVERLAYS) | ||
| current_owner = null | ||
|
|
||
| /datum/component/shielded/proc/update_shield_overlay(atom/source, list/overlays) | ||
| SIGNAL_HANDLER | ||
|
|
||
| if(shield_active && current_shield_charges >= 1) | ||
| overlays += cached_mutable_appearance | ||
| if(emissive) | ||
| overlays += cached_emissive_appearance |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters