xevion/project-cybersyn
1
0
Fork 0
mirror of https://github.com/Xevion/project-cybersyn.git synced 2025-12-09 10:08:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed display bug

Browse Source
This commit is contained in:
mamoniot
2022-12-23 17:29:53 -05:00
parent a4694742f8
commit 9282c09267
9 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cybersyn/changelog.txt
View File

@@ -4,7 +4,7 @@ Date: 2022-12-22
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
- Allowed station and fuel combinators to be set to network id "everything", 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
- 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
- Added more detailed missing train alerts

56
cybersyn/scripts/central-planning.lua
View File

@@ -62,19 +62,19 @@ function create_delivery(map_data, r_station_id, p_station_id, train_id, manifes
r_station.deliveries_total = r_station.deliveries_total + 1
p_station.deliveries_total = p_station.deliveries_total + 1
local r_is_every = r_station.network_name == NETWORK_EVERY
local p_is_every = p_station.network_name == NETWORK_EVERY
local r_is_each = r_station.network_name == NETWORK_EACH
local p_is_each = p_station.network_name == NETWORK_EACH
for item_i, item in ipairs(manifest) do
assert(item.count > 0, "main.lua error, transfer amount was not positive")
r_station.deliveries[item.name] = (r_station.deliveries[item.name] or 0) + item.count
p_station.deliveries[item.name] = (p_station.deliveries[item.name] or 0) - item.count
if item_i > 1 or r_is_every or p_is_every then
if item_i > 1 or r_is_each or p_is_each then
local f, a
if r_is_every then
if r_is_each then
f, a = pairs(r_station.network_flag--[[@as {[string]: int}]])
if p_is_every then
if p_is_each then
for network_name, _ in f, a do
local item_network_name = network_name..":"..item.name
economy.all_r_stations[item_network_name] = nil
@@ -82,7 +82,7 @@ function create_delivery(map_data, r_station_id, p_station_id, train_id, manifes
end
f, a = pairs(p_station.network_flag--[[@as {[string]: int}]])
end
elseif p_is_every then
elseif p_is_each then
f, a = pairs(p_station.network_flag--[[@as {[string]: int}]])
else
f, a = once, r_station.network_name
@@ -299,7 +299,7 @@ local function tick_dispatch(map_data, mod_settings)
local r_station = stations[r_station_id]
---@type string
local network_name
if r_station.network_name == NETWORK_EVERY then
if r_station.network_name == NETWORK_EACH then
_, _, network_name = string.find(item_network_name, "(^.*):")
else
network_name = r_station.network_name
@@ -337,8 +337,8 @@ local function tick_dispatch(map_data, mod_settings)
goto p_continue
end
p_flag = p_station.network_name == NETWORK_EVERY and (p_station.network_flag[item_name] or 0) or p_station.network_flag
r_flag = r_station.network_name == NETWORK_EVERY and (r_station.network_flag[item_name] or 0) or r_station.network_flag
p_flag = p_station.network_name == NETWORK_EACH and (p_station.network_flag[item_name] or 0) or p_station.network_flag
r_flag = r_station.network_name == NETWORK_EACH and (r_station.network_flag[item_name] or 0) or r_station.network_flag
netand = band(p_flag, r_flag)
if netand == 0 then
goto p_continue
@@ -510,7 +510,7 @@ local function tick_poll_station(map_data, mod_settings)
station.priority = 0
station.item_priority = nil
station.locked_slots = 0
if station.network_name == NETWORK_EVERY then
if station.network_name == NETWORK_EACH then
station.network_flag = {}
else
station.network_flag = mod_settings.network_flag
@@ -519,6 +519,7 @@ local function tick_poll_station(map_data, mod_settings)
station.tick_signals = comb1_signals
station.item_p_counts = {}
local is_requesting_nothing = true
if comb1_signals then
if comb2_signals then
station.item_thresholds = {}
@@ -552,7 +553,7 @@ local function tick_poll_station(map_data, mod_settings)
station.r_threshold = abs(item_count)
elseif item_name == LOCKED_SLOTS then
station.locked_slots = max(item_count, 0)
elseif station.network_name == NETWORK_EVERY then
elseif station.network_name == NETWORK_EACH then
station.network_flag[item_name] = item_count
end
comb1_signals[k] = nil
@@ -565,7 +566,6 @@ local function tick_poll_station(map_data, mod_settings)
comb1_signals[k] = nil
end
end
local is_requesting_nothing = true
for k, v in pairs(comb1_signals) do
---@type string
local item_name = v.signal.name
@@ -583,7 +583,7 @@ local function tick_poll_station(map_data, mod_settings)
is_not_requesting = false
is_requesting_nothing = false
local f, a
if station.network_name == NETWORK_EVERY then
if station.network_name == NETWORK_EACH then
f, a = pairs(station.network_flag--[[@as {[string]: int}]])
else
f, a = once, station.network_name
@@ -604,7 +604,7 @@ local function tick_poll_station(map_data, mod_settings)
if is_not_requesting then
if station.is_p and effective_item_count > 0 and item_count > 0 then
local f, a
if station.network_name == NETWORK_EVERY then
if station.network_name == NETWORK_EACH then
f, a = pairs(station.network_flag--[[@as {[string]: int}]])
else
f, a = once, station.network_name
@@ -624,21 +624,21 @@ local function tick_poll_station(map_data, mod_settings)
end
end
end
if station.display_state > 1 then
if is_requesting_nothing and band(station.display_state, 2) == 1 then
station.display_state = station.display_state - 2
end
if station.display_state > 1 then
if is_requesting_nothing and band(station.display_state, 2) > 0 then
station.display_state = station.display_state - 2
update_display(map_data, station)
end
if band(station.display_state, 8) > 0 then
if band(station.display_state, 4) > 0 then
station.display_state = station.display_state - 4
else
station.display_state = station.display_state - 8
update_display(map_data, station)
end
if band(station.display_state, 8) == 1 then
if band(station.display_state, 4) == 1 then
station.display_state = station.display_state - 4
else
station.display_state = station.display_state - 8
update_display(map_data, station)
end
elseif band(station.display_state, 4) == 1 then
station.display_state = station.display_state + 4
end
elseif band(station.display_state, 4) > 0 then
station.display_state = station.display_state + 4
end
end
return false
@@ -664,7 +664,7 @@ local function tick_poll_comb(map_data, mod_settings)
--NOTE: the following has undefined behavior if last_comb is deleted
local comb_id, comb = next(map_data.to_comb, tick_data.last_comb)
tick_data.last_comb = comb_id
local refueler_id, _ = next(map_data.everything_refuelers, tick_data.last_refueler)
local refueler_id, _ = next(map_data.each_refuelers, tick_data.last_refueler)
tick_data.last_refueler = refueler_id
if comb and comb.valid then

2
cybersyn/scripts/constants.lua
View File

@@ -23,7 +23,7 @@ MODE_WAGON_MANIFEST = "-"
MODE_REFUELER = ">>"
NETWORK_SIGNAL_DEFAULT = {name="signal-A", type="virtual"}
NETWORK_EVERY = "signal-everything"
NETWORK_EACH = "signal-each"
INACTIVITY_TIME = 100
LOCK_TRAIN_TIME = 60*60*60*24*7

12
cybersyn/scripts/factorio-api.lua
View File

@@ -319,11 +319,11 @@ function set_refueler_from_comb(map_data, mod_settings, id)
refueler.allows_all_trains = bit_extract(bits, 2) > 0
refueler.priority = 0
if refueler.network_name == NETWORK_EVERY then
map_data.everything_refuelers[id] = true
if refueler.network_name == NETWORK_EACH then
map_data.each_refuelers[id] = true
refueler.network_flag = {}
else
map_data.everything_refuelers[id] = nil
map_data.each_refuelers[id] = nil
refueler.network_flag = mod_settings.network_flag
end
@@ -337,7 +337,7 @@ function set_refueler_from_comb(map_data, mod_settings, id)
if item_type == "virtual" then
if item_name == SIGNAL_PRIORITY then
refueler.priority = item_count
elseif refueler.network_name == NETWORK_EVERY then
elseif refueler.network_name == NETWORK_EACH then
refueler.network_flag[item_name] = item_count
end
end
@@ -349,7 +349,7 @@ function set_refueler_from_comb(map_data, mod_settings, id)
end
local f, a
if old_network == NETWORK_EVERY then
if old_network == NETWORK_EACH then
f, a = pairs(refueler.network_flag--[[@as {[string]: int}]])
elseif old_network ~= refueler.network_name then
f, a = once, old_network
@@ -366,7 +366,7 @@ function set_refueler_from_comb(map_data, mod_settings, id)
end
end
if refueler.network_name == NETWORK_EVERY then
if refueler.network_name == NETWORK_EACH then
f, a = pairs(refueler.network_flag--[[@as {[string]: int}]])
elseif old_network ~= refueler.network_name then
f, a = once, refueler.network_name

4
cybersyn/scripts/global.lua
View File

@@ -19,7 +19,7 @@
---@field public tick_state uint
---@field public tick_data {}
---@field public economy Economy
---@field public everything_refuelers {[uint]: true}
---@field public each_refuelers {[uint]: true}
---@field public active_alerts {[LuaTrain]: int}?
---@field public se_tele_old_id {[string]: uint}
@@ -147,7 +147,7 @@ function init_global()
global.layout_top_id = 1
global.refuelers = {}
global.to_refuelers = {}
global.everything_refuelers = {}
global.each_refuelers = {}
IS_SE_PRESENT = remote.interfaces["space-exploration"] ~= nil
if IS_SE_PRESENT then

6
cybersyn/scripts/gui.lua
View File

@@ -96,7 +96,7 @@ function gui_opened(comb, player)
{type="line", style_mods={top_padding=10}},
{type="label", name="network_label", ref={"network_label"}, style="heading_3_label", caption={"cybersyn-gui.network"}, style_mods={top_padding=8}},
{type="flow", name="bottom", direction="horizontal", style_mods={vertical_align="center"}, children={
{type="choose-elem-button", name="network", style="slot_button_in_shallow_frame", ref={"network"}, elem_type="signal", tooltip={"cybersyn-gui.network-tooltip"}, signal=signal, style_mods={bottom_margin=1, right_margin=6}, actions={
{type="choose-elem-button", name="network", style="slot_button_in_shallow_frame", ref={"network"}, elem_type="signal", tooltip={"cybersyn-gui.network-tooltip"}, signal=signal, style_mods={bottom_margin=1, right_margin=6, top_margin=2}, actions={
on_elem_changed={"choose-elem-button", comb.unit_number}
}},
{type="flow", name="right", direction="vertical", style_mods={horizontal_align="left"}, children={
@@ -195,8 +195,8 @@ function register_gui_actions()
local signal = element.elem_value
if signal and (signal.name == "signal-everything" or signal.name == "signal-anything" or signal.name == "signal-each") then
if param.operation == MODE_PRIMARY_IO or param.operation == MODE_PRIMARY_IO_ACTIVE or param.operation == MODE_PRIMARY_IO_FAILED_REQUEST or param.operation == MODE_REFUELER then
signal.name = NETWORK_EVERY
element.elem_value.name = NETWORK_EVERY
signal.name = NETWORK_EACH
element.elem_value.name = NETWORK_EACH
else
signal = nil
element.elem_value = nil

4
cybersyn/scripts/main.lua
View File

@@ -76,7 +76,7 @@ local function on_refueler_broken(map_data, refueler_id, refueler)
end
end
local f, a
if refueler.network_name == NETWORK_EVERY then
if refueler.network_name == NETWORK_EACH then
f, a = pairs(refueler.network_flag--[[@as {[string]: int}]])
else
f, a = once, refueler.network_name
@@ -90,7 +90,7 @@ local function on_refueler_broken(map_data, refueler_id, refueler)
end
end
end
map_data.everything_refuelers[refueler_id] = nil
map_data.each_refuelers[refueler_id] = nil
map_data.refuelers[refueler_id] = nil
interface_raise_refueler_removed(refueler_id, refueler)
end

2
cybersyn/scripts/migrations.lua
View File

@@ -120,7 +120,7 @@ local migrations_table = {
map_data.tick_state = STATE_INIT
map_data.tick_data = {}
map_data.everything_refuelers = {}
map_data.each_refuelers = {}
for k, comb in pairs(map_data.to_comb) do
local control = get_comb_control(comb)

2
cybersyn/scripts/train-events.lua
View File

@@ -332,7 +332,7 @@ local function on_train_leaves_stop(map_data, mod_settings, train_id, train)
local refueler = map_data.refuelers[id]
set_refueler_from_comb(map_data, mod_settings, id)
local refueler_network_flag = refueler.network_name == NETWORK_EVERY and refueler.network_flag[train.network_name] or refueler.network_flag
local refueler_network_flag = refueler.network_name == NETWORK_EACH and refueler.network_flag[train.network_name] or refueler.network_flag
if btest(train.network_flag, refueler_network_flag) and (refueler.allows_all_trains or refueler.accepted_layouts[train.layout_id]) and refueler.trains_total < refueler.entity_stop.trains_limit then
local accepted = false
local dist = nil