fixed inconsistent naming

cybersyn/changelog.txt

@@ -3,7 +3,7 @@ Version: 1.2.0
 Date: 2022-12-23
   Changes:
     - Forced provide stations to wait until they can service the highest priority request station
-    - Provide stations now override request thresholds with the per-item thresholds set by their station info combinator
+    - Provide stations now override request thresholds with the per-item thresholds set by their station control combinator
     - Allowed station and fuel combinators to be set to network id "each", for each virtual signal they recieve as input, the stop is added to that network and its signal strength is used as the network mask
     - Added the ability to specify per-station whether request thresholds represent total items or total stacks
     - Prioritized a train's distance from the provide station over the train's cargo capacity
@@ -49,7 +49,7 @@ Date: 2022-12-8
 Version: 1.1.0
 Date: 2022-12-8
   Changes:
-    - Added the ability to use the priority signal as input to station info combinators so one can override priority on items with station info combinators thresholds
+    - Added the ability to use the priority signal as input to station control combinators so one can override priority on items with station control combinators thresholds
     - Added refueler stations
     - Slightly more permissive allow-list logic
     - Made non-backwards compatible improvements and bugfixes to the modding interface

cybersyn/locale/en/base.cfg

@@ -29,7 +29,7 @@ cybersyn-combinator=Cybernetic combinator
 cybersyn-combinator-output=Cybernetic combinator output
 
 [entity-description]
-cybersyn-combinator=Has 4 different control modes. Primary control allows providing and requesting. Optional Control allows setting thresholds per-item and reading all in progress deliveries. Depot control allows parked trains to be added to the network. Wagon control allows for reading the desired contents of the adjacent wagon.
+cybersyn-combinator=Has 5 different control modes. Station mode allows providing and requesting. Station control mode allows setting thresholds per-item and reading all in progress deliveries. Depot mode allows parked trains to be added to the network. Fuel loader mode allows refueling stations to be designated. Wagon control mode allows for reading the desired contents of the adjacent wagon.
 
 [technology-name]
 cybersyn-train-network=Cybersyn train network
@@ -58,12 +58,12 @@ no-train-matches-p-layout=Could not find a train on the allow-list of __2__ to m
 
 [cybersyn-gui]
 combinator-title=Cybernetic combinator
-operation=Control Mode
+operation=Mode
 comb1=Station
 depot=Depot
 refueler=Fuel loader
-comb2=Station info
-wagon-manifest=Wagon info
+comb2=Station control
+wagon-manifest=Wagon control
 network=Network
 network-tooltip=A signal is used to identify which network this combinator is a member of. Trains will only be dispatched from depots to provider and requester stations if they are all identified with the same signal.
 allow-list-description=Automatic allow-list

cybersyn/scripts/constants.lua

@@ -19,7 +19,7 @@ MODE_PRIMARY_IO_FAILED_REQUEST = "^"
 MODE_PRIMARY_IO_ACTIVE = "<<"
 MODE_SECONDARY_IO = "%"
 MODE_DEPOT = "+"
-MODE_WAGON_MANIFEST = "-"
+MODE_WAGON = "-"
 MODE_REFUELER = ">>"
 
 NETWORK_SIGNAL_DEFAULT = {name="signal-A", type="virtual"}

cybersyn/scripts/factorio-api.lua

@@ -451,7 +451,7 @@ function get_comb_gui_settings(comb)
 		selected_index = 3
 	elseif op == MODE_SECONDARY_IO then
 		selected_index = 4
-	elseif op == MODE_WAGON_MANIFEST then
+	elseif op == MODE_WAGON then
 		selected_index = 5
 	end
 	return selected_index, params.first_signal, switch_state, not allows_all_trains, is_stack

cybersyn/scripts/gui.lua

@@ -185,7 +185,7 @@ function register_gui_actions()
 				elseif element.selected_index == 4 then
 					set_comb_operation(comb, MODE_SECONDARY_IO)
 				elseif element.selected_index == 5 then
-					set_comb_operation(comb, MODE_WAGON_MANIFEST)
+					set_comb_operation(comb, MODE_WAGON)
 				else
 					return
 				end

cybersyn/scripts/layout.lua

@@ -532,7 +532,7 @@ function reset_stop_layout(map_data, stop, is_station_or_refueler, forbidden_ent
 						end
 					elseif entity.name == COMBINATOR_NAME then
 						local param = map_data.to_comb_params[entity.unit_number]
-						if param.operation == MODE_WAGON_MANIFEST then
+						if param.operation == MODE_WAGON then
 							local pos = entity.position
 							local is_there
 							if is_ver then

cybersyn/scripts/main.lua

@@ -247,7 +247,7 @@ local function on_combinator_built(map_data, comb)
 		params.operation = op
 		params.first_signal = NETWORK_SIGNAL_DEFAULT
 		control.parameters = params
-	elseif op ~= MODE_PRIMARY_IO and op ~= MODE_SECONDARY_IO and op ~= MODE_DEPOT and op ~= MODE_REFUELER and op ~= MODE_WAGON_MANIFEST then
+	elseif op ~= MODE_PRIMARY_IO and op ~= MODE_SECONDARY_IO and op ~= MODE_DEPOT and op ~= MODE_REFUELER and op ~= MODE_WAGON then
 		op = MODE_PRIMARY_IO
 		params.operation = op
 		control.parameters = params
@@ -258,7 +258,7 @@ local function on_combinator_built(map_data, comb)
 	map_data.to_output[comb.unit_number] = out
 	map_data.to_stop[comb.unit_number] = stop
 
-	if op == MODE_WAGON_MANIFEST then
+	if op == MODE_WAGON then
 		if rail then
 			update_stop_from_rail(map_data, rail, nil, true)
 		end