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

[MIRROR] Adds a Datum port type for Admin Circuits (#8333)

Browse Source 
* Adds a Datum port type for Admin Circuits (#61582)

Admin circuit components were limited in their utility due to the setvar, getvar, proccall, and signal handler components only being able to operate on atoms. I have improved them by adding the datum datatype, which is used exclusively by the aforementioned components in place of the atom datatype their target port currently uses. Furthermore, an option for the expected output type has been added to the getvar and proccall components. This option defaults to any.

* Adds a Datum port type for Admin Circuits

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
This commit is contained in:
SkyratBot
2021-09-23 02:47:25 +02:00
committed by GitHub
parent b7c7b6654a
commit 03e4ccf68e
8 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/components/admin/getvar.dm
+11 -1
View File
@@ -11,19 +11,29 @@
/// Entity to get variable of
var/datum/port/input/entity
/// Expected type of output
var/datum/port/input/option/expected_output_type
/// Variable name
var/datum/port/input/variable_name
/// Variable value
var/datum/port/output/output_value
/obj/item/circuit_component/get_variable/populate_options()
expected_output_type = add_option_port("Expected Output Type", GLOB.wiremod_fundamental_types)
/obj/item/circuit_component/get_variable/populate_ports()
entity = add_input_port("Target", PORT_TYPE_ATOM)
entity = add_input_port("Target", PORT_TYPE_DATUM)
variable_name = add_input_port("Variable Name", PORT_TYPE_STRING)
output_value = add_output_port("Output Value", PORT_TYPE_ANY)
/obj/item/circuit_component/get_variable/pre_input_received(datum/port/input/port)
if(port == expected_output_type)
if(output_value.datatype != expected_output_type.value)
output_value.set_datatype(expected_output_type.value)
/obj/item/circuit_component/get_variable/input_received(datum/port/input/port)
var/atom/object = entity.value
var/var_name = variable_name.value
code/modules/wiremod/components/admin/proccall.dm
+11 -1
View File
@@ -14,6 +14,9 @@
var/datum/port/input/option/proccall_options
/// Expected type of output
var/datum/port/input/option/expected_output_type
/// Entity to proccall on
var/datum/port/input/entity
@@ -34,13 +37,20 @@
proccall_options = add_option_port("Proccall Options", component_options)
expected_output_type = add_option_port("Expected Output Type", GLOB.wiremod_fundamental_types)
/obj/item/circuit_component/proccall/populate_ports()
entity = add_input_port("Target", PORT_TYPE_ATOM)
entity = add_input_port("Target", PORT_TYPE_DATUM)
proc_name = add_input_port("Proc Name", PORT_TYPE_STRING)
arguments = add_input_port("Arguments", PORT_TYPE_LIST)
output_value = add_output_port("Output Value", PORT_TYPE_ANY)
/obj/item/circuit_component/proccall/pre_input_received(datum/port/input/port)
if(port == expected_output_type)
if(output_value.datatype != expected_output_type.value)
output_value.set_datatype(expected_output_type.value)
/obj/item/circuit_component/proccall/input_received(datum/port/input/port)
var/called_on
if(proccall_options.value == COMP_PROC_OBJECT)
code/modules/wiremod/components/admin/setvar.dm
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/item/circuit_component/set_variable/populate_ports()
entity = add_input_port("Target", PORT_TYPE_ATOM)
entity = add_input_port("Target", PORT_TYPE_DATUM)
variable_name = add_input_port("Variable Name", PORT_TYPE_STRING)
new_value = add_input_port("New Value", PORT_TYPE_ANY)
code/modules/wiremod/components/admin/signal_handler/signal_handler.dm
+2 -2
View File
@@ -69,8 +69,8 @@
if(entity)
remove_output_port(entity)
target = add_input_port("Target", PORT_TYPE_ATOM, order = 1, trigger = null)
entity = add_output_port("Source Entity", PORT_TYPE_ATOM, order = 0)
target = add_input_port("Target", PORT_TYPE_DATUM, order = 1, trigger = null)
entity = add_output_port("Source Entity", PORT_TYPE_DATUM, order = 0)
/obj/item/circuit_component/signal_handler/save_data_to_list(list/component_data)
. = ..()