xevion/project-cybersyn
1
0
Fork 0
mirror of https://github.com/Xevion/project-cybersyn.git synced 2026-01-31 08:25:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed a depot crash

Browse Source
This commit is contained in:
monica
2023-01-09 10:57:55 -05:00
parent 00850789a9
commit 73589b5c81
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cybersyn/scripts/main.lua
+1 -1
View File
@@ -31,7 +31,7 @@ function on_depot_broken(map_data, depot_id, depot)
local stops = e.force.get_train_stops({name = depot.entity_stop.backer_name, surface = e.surface})
for stop in rnext_consume, stops do
local new_depot_id = stop.unit_number
if map_data.depots[new_depot_id] then
if new_depot_id ~= depot_id and map_data.depots[new_depot_id] then
train.depot_id = new_depot_id--[[@as uint]]
goto continue
end
cybersyn/scripts/train-events.lua
+17 -15
View File
@@ -278,28 +278,30 @@ local function on_train_leaves_stop(map_data, mod_settings, train_id, train)
train.r_station_id = nil
train.manifest = nil
--add to available trains for depot bypass
local fuel_fill = INF
for _, v in pairs(train.entity.locomotives) do
for _, loco in pairs(v) do
local inv = loco.get_fuel_inventory()
if inv then
local inv_size = #inv
if inv_size > 0 then
local fuel_total = 0
---@type uint
for i = 1, inv_size do
local item = inv[i]
if item.valid_for_read then
fuel_total = fuel_total + item.count/get_stack_size(map_data, item.name)
local fuel_fill = 1
if mod_settings.fuel_threshold < 1 then
for _, v in pairs(train.entity.locomotives) do
for _, loco in pairs(v) do
local inv = loco.get_fuel_inventory()
if inv then
local inv_size = #inv
if inv_size > 0 then
local fuel_total = 0
---@type uint
for i = 1, inv_size do
local item = inv[i]
if item.valid_for_read then
fuel_total = fuel_total + item.count/get_stack_size(map_data, item.name)
end
end
fuel_fill = min(fuel_fill, fuel_total/inv_size)
end
fuel_fill = min(fuel_fill, fuel_total/inv_size)
end
end
end
end
if fuel_fill > mod_settings.fuel_threshold then
--if fuel_fill == INF, it's probably a modded electric train
--if fuel_fill == 1, it's probably a modded electric train
if not train.disable_bypass then
train.status = STATUS_TO_D_BYPASS
add_available_train(map_data, train_id, train)