-
-
Notifications
You must be signed in to change notification settings - Fork 538
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
20 changed files
with
295 additions
and
58 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
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 |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| //General defines for items that use power and the cell component. | ||
| /// The minimal amount of power an item can use. | ||
| #define POWER_CELL_USE_MINIMUM 1 | ||
| /// For items that barely use any power at all. | ||
| #define POWER_CELL_USE_VERY_LOW 10 | ||
| /// For items that generally wouldn't use very much power. | ||
| #define POWER_CELL_USE_LOW 30 | ||
| /// For items that use a average amount of power. | ||
| #define POWER_CELL_USE_NORMAL 50 | ||
| /// For items that use a high amount of power. | ||
| #define POWER_CELL_USE_HIGH 70 | ||
| /// For items that use A LOT OF POWER. | ||
| #define POWER_CELL_USE_INSANE 100 |
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 |
|---|---|---|
| @@ -0,0 +1,178 @@ | ||
| /* | ||
| CELL COMPONENT | ||
| What we aim to achieve with cell components is a universal framework for all items that would logically use batteries, | ||
| Be it a flashlight, T-ray scanner or multitool. All of them would logically require batteries right? Well, welcome, | ||
| to the cell component. | ||
| General logic: | ||
| Component attaches to parent(flashlight etc) | ||
| Registers onhit signal to check if it's being slapped by a battery | ||
| Component moves battery to equipment loc, keeps a record, and then communicates with | ||
| the equipment and controls the behaviour of said equipment. | ||
| If it's a robot, it uses the robot cell - Using certified shitcode.(this needs redone) | ||
| If you are adding this to an item that is active for a period of time, register signal to COMSIG_CELL_START_USE when it would start using the cell | ||
| and COMSIG_CELL_STOP_USE when it should stop. To handle the turning off of said item once the cell is depleted, add your code into the | ||
| component_cell_out_of_charge/component_cell_removed proc using loc where necessary, processing is done in the component! | ||
| */ | ||
|
|
||
| /datum/component/cell | ||
| /// Our reference to the inserted cell, which will be stored in the parent. | ||
| var/obj/item/stock_parts/cell/inserted_cell | ||
| /// The item reference to parent. | ||
| var/obj/item/equipment | ||
| /// How much power do we use each process? | ||
| var/power_use_amount = POWER_CELL_USE_NORMAL | ||
| /// Are we using a robot's powersource? | ||
| var/inside_robot = FALSE | ||
| /// Callback interaction for when the cell is removed. | ||
| var/datum/callback/on_cell_removed = null | ||
| ///Can this cell be removed from the parent? | ||
| var/cell_can_be_removed = TRUE | ||
| ///Our reference to the cell overlay | ||
| var/mutable_appearance/cell_overlay = null | ||
|
|
||
| /datum/component/cell/Initialize(cell_override, _on_cell_removed, _power_use_amount, start_with_cell = TRUE, _cell_can_be_removed) | ||
| if(!isitem(parent)) //Currently only compatable with items. | ||
| return COMPONENT_INCOMPATIBLE | ||
|
|
||
| equipment = parent //We'd like a simple reference to the atom this component is attached to instead of having to declare it every time we use it. | ||
|
|
||
| if(_on_cell_removed) | ||
| src.on_cell_removed = _on_cell_removed | ||
|
|
||
| if(_power_use_amount) | ||
| power_use_amount = _power_use_amount | ||
| else | ||
| power_use_amount = equipment.power_use_amount | ||
|
|
||
| if(_cell_can_be_removed) | ||
| cell_can_be_removed = _cell_can_be_removed | ||
|
|
||
| if(start_with_cell) | ||
| var/obj/item/stock_parts/cell/new_cell | ||
| if(cell_override) | ||
| new_cell = new cell_override() | ||
| else | ||
| new_cell = new /obj/item/stock_parts/cell/upgraded() | ||
| inserted_cell = new_cell | ||
| new_cell.forceMove(parent) //We use the parents location so things like EMP's can interact with the cell. | ||
| handle_cell_overlays() | ||
| return ..() | ||
|
|
||
| /datum/component/cell/RegisterWithParent() | ||
| //Component to Parent signal registries | ||
| RegisterSignal(parent, COMSIG_ITEM_POWER_USE, .proc/simple_power_use) | ||
| RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/insert_cell) | ||
| RegisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT , .proc/remove_cell) | ||
| RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine_cell) | ||
|
|
||
| /datum/component/cell/UnregisterFromParent() | ||
| UnregisterSignal(parent, COMSIG_ITEM_POWER_USE) | ||
| UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) | ||
| UnregisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT) | ||
| UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) | ||
|
|
||
| /datum/component/cell/Destroy(force, silent) | ||
| if(on_cell_removed) | ||
| QDEL_NULL(on_cell_removed) | ||
| if(inserted_cell) | ||
| if(!inside_robot) //We really don't want to be deleting the robot's cell. | ||
| QDEL_NULL(inserted_cell) | ||
| inserted_cell = null | ||
| return ..() | ||
|
|
||
| /// This proc is the basic way of processing the cell, with included feedback. It will return a bitflag if it failed to use the power, or COMPONENT_POWER_SUCCESS if it succeeds. | ||
| /// The user is sent the feedback, use_amount is an override, check_only will only return if it can use the cell and feedback relating to that. | ||
| /datum/component/cell/proc/simple_power_use(datum/source, use_amount, mob/user, check_only) | ||
| SIGNAL_HANDLER | ||
|
|
||
| if(!use_amount) | ||
| use_amount = power_use_amount | ||
|
|
||
| if(!inserted_cell) | ||
| if(user) | ||
| to_chat(user, "<span class='danger'>There is no cell inside [equipment]</span>") | ||
| return COMPONENT_NO_CELL | ||
|
|
||
| if(check_only && inserted_cell.charge < use_amount) | ||
| if(user) | ||
| to_chat(user, "<span class='danger'>The cell inside [equipment] does not have enough charge to perform this action!</span>") | ||
| return COMPONENT_NO_CHARGE | ||
|
|
||
| if(!inserted_cell.use(use_amount)) | ||
| inserted_cell.update_appearance() //Updates the attached cell sprite - Why does this not happen in cell.use? | ||
| if(user) | ||
| to_chat(user, "<span class='danger'>The cell inside [equipment] does not have enough charge to perform this action!</span>") | ||
| return COMPONENT_NO_CHARGE | ||
|
|
||
| inserted_cell.update_appearance() | ||
|
|
||
| return COMPONENT_POWER_SUCCESS | ||
|
|
||
| /datum/component/cell/proc/examine_cell(atom/A, mob/user, list/examine_list) | ||
| SIGNAL_HANDLER | ||
|
|
||
| if(!inserted_cell) | ||
| examine_list += "<span class='danger'>It does not have a cell inserted!</span>" | ||
| else if(!inside_robot) | ||
| examine_list += "<span class='notice'>It has [inserted_cell] inserted. It has <b>[inserted_cell.percent()]%</b> charge left." | ||
| else | ||
| examine_list += "<span class='notice'>It is drawing power from an external powersource, reading <b>[inserted_cell.percent()]%</b> charge.</span>" | ||
|
|
||
| /// Handling of cell removal. | ||
| /datum/component/cell/proc/remove_cell(datum/source, mob/user) | ||
| if(!equipment.can_interact(user)) | ||
| return | ||
|
|
||
| if(inside_robot) | ||
| return | ||
|
|
||
| if(!cell_can_be_removed) | ||
| return | ||
|
|
||
| if(inserted_cell) | ||
| to_chat(user, "<span class='notice'>You remove [inserted_cell] from [equipment]!</span>") | ||
| playsound(equipment, 'sound/weapons/magout.ogg', 40, TRUE) | ||
| inserted_cell.forceMove(get_turf(equipment)) | ||
| INVOKE_ASYNC(user, /mob/living.proc/put_in_hands, inserted_cell) | ||
| inserted_cell = null | ||
| if(on_cell_removed) | ||
| on_cell_removed.Invoke() | ||
| handle_cell_overlays(TRUE) | ||
| else | ||
| to_chat(user, "<span class='danger'>There is no cell inserted in [equipment]!</span>") | ||
|
|
||
| /// Handling of cell insertion. | ||
| /datum/component/cell/proc/insert_cell(datum/source, obj/item/inserting_item, mob/living/user, params) | ||
| if(!equipment.can_interact(user)) | ||
| return | ||
|
|
||
| if(inside_robot) //More robot shitcode, if we allowed them to remove the cell, it would cause the universe to implode. | ||
| return | ||
|
|
||
| if(!istype(inserting_item, /obj/item/stock_parts/cell)) | ||
| return | ||
|
|
||
| if(inserted_cell) //No quickswap compatibility | ||
| to_chat(user, "<span class='danger'>There is already a cell inserted in [equipment]!</span>") | ||
| return | ||
|
|
||
| to_chat(user, "<span class='notice'>You insert [inserting_item] into [equipment]!</span>") | ||
| playsound(equipment, 'sound/weapons/magin.ogg', 40, TRUE) | ||
| inserted_cell = inserting_item | ||
| inserting_item.forceMove(parent) | ||
| handle_cell_overlays(FALSE) | ||
|
|
||
| /datum/component/cell/proc/handle_cell_overlays(update_overlays) | ||
| if(inserted_cell) | ||
| cell_overlay = mutable_appearance(equipment.icon, "[initial(equipment.icon_state)]_cell") | ||
| equipment.add_overlay(cell_overlay) | ||
| else | ||
| QDEL_NULL(cell_overlay) | ||
| cell_overlay = null | ||
| if(update_overlays) | ||
| equipment.overlays.Cut() | ||
| equipment.update_overlays() |
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
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 |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /obj/item/weldingtool/electric | ||
| name = "electrical welding tool" | ||
| desc = "An experimental welding tool capable of welding functionality through the use of electricity. The flame seems almost cold." | ||
| icon_state = "elwelder" | ||
| light_power = 1 | ||
| light_color = LIGHT_COLOR_HALOGEN | ||
| tool_behaviour = NONE | ||
| toolspeed = 0.5 //twice as fast, but doesn't require welding fuel | ||
| power_use_amount = POWER_CELL_USE_LOW | ||
| // We don't use fuel | ||
| change_icons = FALSE | ||
| var/cell_override = /obj/item/stock_parts/cell/high | ||
| var/powered = FALSE | ||
| max_fuel = 20 //uses fuel anyways like a boss | ||
|
|
||
| /obj/item/weldingtool/electric/Initialize(mapload) | ||
| . = ..() | ||
| AddComponent(/datum/component/cell, cell_override, CALLBACK(src, PROC_REF(switched_off))) | ||
|
|
||
| /obj/item/weldingtool/electric/attack_self(mob/user, modifiers) | ||
| . = ..() | ||
| if(!powered) | ||
| if(!(item_use_power(power_use_amount, user, TRUE) & COMPONENT_POWER_SUCCESS)) | ||
| return | ||
| powered = !powered | ||
| playsound(src, 'sound/effects/sparks4.ogg', 100, TRUE) | ||
| if(powered) | ||
| to_chat(user, span_notice("You turn [src] on.")) | ||
| switched_on() | ||
| return | ||
| to_chat(user, span_notice("You turn [src] off.")) | ||
| switched_off() | ||
|
|
||
| /obj/item/weldingtool/electric/switched_on(mob/user) | ||
| welding = TRUE | ||
| tool_behaviour = TOOL_WELDER | ||
| light_on = TRUE | ||
| force = 15 | ||
| damtype = BURN | ||
| hitsound = 'sound/items/welder.ogg' | ||
| set_light_on(powered) | ||
| update_appearance() | ||
| START_PROCESSING(SSobj, src) | ||
|
|
||
| /obj/item/weldingtool/electric/switched_off(mob/user) | ||
| powered = FALSE | ||
| welding = FALSE | ||
| light_on = FALSE | ||
| force = initial(force) | ||
| damtype = BRUTE | ||
| set_light_on(powered) | ||
| tool_behaviour = NONE | ||
| update_appearance() | ||
| STOP_PROCESSING(SSobj, src) | ||
|
|
||
| /obj/item/weldingtool/electric/process(seconds_per_tick) | ||
| if(!powered) | ||
| switched_off() | ||
| return | ||
| if(!(item_use_power(power_use_amount) & COMPONENT_POWER_SUCCESS)) | ||
| switched_off() | ||
| return | ||
|
|
||
| // We don't need to know how much fuel it has, because it doesn't use any. | ||
| /obj/item/weldingtool/electric/examine(mob/user) | ||
| . = ..() | ||
| . -= "It contains [get_fuel()] unit\s of fuel out of [max_fuel]." | ||
|
|
||
| // This is what uses fuel in the parent. We override it here to not use fuel | ||
| /obj/item/weldingtool/electric/use(used = 0) | ||
| return isOn() | ||
|
|
||
| /obj/item/weldingtool/electric/examine() | ||
| . = ..() | ||
| . += "[src] is currently [powered ? "powered" : "unpowered"]." | ||
|
|
||
| /obj/item/weldingtool/electric/update_icon_state() | ||
| if(powered) | ||
| mob_overlay_icon = "[initial(mob_overlay_icon)]1" | ||
| else | ||
| mob_overlay_icon = "[initial(mob_overlay_icon)]" | ||
| return ..() |
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
Oops, something went wrong.