[MIRROR] Refactors port types completely and adds the option type. Refactors options to use this new type (#7386)

* Refactors port types completely and adds the option type. Refactors options to use this new type (#60571)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Refactors port types completely and adds the option type. Refactors options to use this new type

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

code/modules/wiremod/components/math/arithmetic.dm

@@ -11,9 +11,12 @@
 	/// The amount of input ports to have
 	var/input_port_amount = 4
 
+	var/datum/port/input/option/arithmetic_option
+
 	/// The result from the output
 	var/datum/port/output/output
 
+	var/list/arithmetic_ports
 	circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL
 
 /obj/item/circuit_component/arithmetic/populate_options()
@@ -25,13 +28,14 @@
 		COMP_ARITHMETIC_MIN,
 		COMP_ARITHMETIC_MAX,
 	)
-	options = component_options
+	arithmetic_option = add_option_port("Arithmetic Option", component_options)
 
 /obj/item/circuit_component/arithmetic/Initialize()
 	. = ..()
+	arithmetic_ports = list()
 	for(var/port_id in 1 to input_port_amount)
 		var/letter = ascii2text(text2ascii("A") + (port_id-1))
-		add_input_port(letter, PORT_TYPE_NUMBER)
+		arithmetic_ports += add_input_port(letter, PORT_TYPE_NUMBER)
 
 	output = add_output_port("Output", PORT_TYPE_NUMBER)
 
@@ -40,10 +44,8 @@
 	if(.)
 		return
 
-	var/list/ports = input_ports.Copy()
-	var/datum/port/input/first_port = ports[1]
-	ports -= first_port
-	ports -= trigger_input
+	var/list/ports = arithmetic_ports.Copy()
+	var/datum/port/input/first_port = popleft(ports)
 	var/result = first_port.input_value
 
 	for(var/datum/port/input/input_port as anything in ports)
@@ -51,7 +53,7 @@
 		if(isnull(value))
 			continue
 
-		switch(current_option)
+		switch(arithmetic_option.input_value)
 			if(COMP_ARITHMETIC_ADD)
 				result += value
 			if(COMP_ARITHMETIC_SUBTRACT)

code/modules/wiremod/components/math/comparison.dm

@@ -7,6 +7,8 @@
 	display_name = "Comparison"
 	desc = "A component that compares two objects."
 
+	var/datum/port/input/option/comparison_option
+
 	input_port_amount = 2
 	var/current_type = PORT_TYPE_ANY
 
@@ -19,20 +21,20 @@
 		COMP_COMPARISON_GREATER_THAN_OR_EQUAL,
 		COMP_COMPARISON_LESS_THAN_OR_EQUAL,
 	)
-	options = component_options
+	comparison_option = add_option_port("Comparison Option", component_options)
 
 /obj/item/circuit_component/compare/comparison/input_received(datum/port/input/port)
-	switch(current_option)
+	switch(comparison_option.input_value)
 		if(COMP_COMPARISON_EQUAL, COMP_COMPARISON_NOT_EQUAL)
 			if(current_type != PORT_TYPE_ANY)
 				current_type = PORT_TYPE_ANY
-				input_ports[1].set_datatype(PORT_TYPE_ANY)
-				input_ports[2].set_datatype(PORT_TYPE_ANY)
+				compare_ports[1].set_datatype(PORT_TYPE_ANY)
+				compare_ports[2].set_datatype(PORT_TYPE_ANY)
 		else
 			if(current_type != PORT_TYPE_NUMBER)
 				current_type = PORT_TYPE_NUMBER
-				input_ports[1].set_datatype(PORT_TYPE_NUMBER)
-				input_ports[2].set_datatype(PORT_TYPE_NUMBER)
+				compare_ports[1].set_datatype(PORT_TYPE_NUMBER)
+				compare_ports[2].set_datatype(PORT_TYPE_NUMBER)
 	return ..()
 
 
@@ -41,8 +43,9 @@
 		return FALSE
 
 	// Comparison component only compares the first two ports
-	var/input1 = input_ports[1].input_value
-	var/input2 = input_ports[2].input_value
+	var/input1 = compare_ports[1].input_value
+	var/input2 = compare_ports[2].input_value
+	var/current_option = comparison_option.input_value
 
 	switch(current_option)
 		if(COMP_COMPARISON_EQUAL)

code/modules/wiremod/components/math/logic.dm

@@ -7,16 +7,20 @@
 	display_name = "Logic"
 	desc = "A component with 'and' and 'or' capabilities."
 
+	var/datum/port/input/option/logic_options
+
 /obj/item/circuit_component/compare/logic/populate_options()
 	var/static/component_options = list(
 		COMP_LOGIC_AND,
 		COMP_LOGIC_OR,
 		COMP_LOGIC_XOR,
 	)
-	options = component_options
+	logic_options = add_option_port("Logic Options", component_options)
 
 /obj/item/circuit_component/compare/logic/do_comparisons(list/ports)
 	. = FALSE
+	var/current_option = logic_options.input_value
+
 	// Used by XOR
 	var/total_ports = 0
 	var/total_true_ports = 0