metrostroi-repo/MetrostroiAddon
1
0
Fork 0
mirror of https://github.com/metrostroi-repo/MetrostroiAddon.git synced 2026-05-02 00:42:29 +00:00
Code Activity

Implemented rechargeable battery and imitation of control circuit's current. Randomized initial battery voltage and relays trigger level

Browse Source
This commit is contained in:
Moon Horse
2023-05-02 02:22:30 +03:00
parent d17cb74904
commit 0027160c2d
15 changed files with 156 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lua/metrostroi/systems/sys_81_717_electric.lua
View File

@@ -56,8 +56,9 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
local P = Train.PositionSwitch
local RheostatController = Train.RheostatController
local RK = RheostatController.SelectedPosition
local B = (Train.Battery.Voltage > 55) and 1 or 0
local BO = B*Train.VB.Value
local B = (Train.Battery.Voltage >= 60) and 1 or (Train.Battery.Voltage >= Train.Battery.CutoffVoltage) and 0.5 or 0
local BO = B*Train.VB.Value*(1-Train.PA1.Value)
local BO2 = B*Train.VB.Value*(1-Train.PA2.Value)
local T = Train.SolverTemporaryVariables
local elType = self.Type
local isMVM = elType == 1
@@ -77,11 +78,12 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
S["10AK"] = T[10]*Train.A54.Value*Train.A84.Value
S["U2"] = S["10AK"]*KV["U2-10AK"] --10AK-KV-U2
--print(Train.Battery.CutoffVoltage)
--Reverser
S["7D"] = T[10]*Train.A48.Value
S["7G"] = S["7D"]*KV["10-7G"] --10-A48-RV-7G --FIXME 34w ARS
S["B3"] = B*Train.A44.Value
S["B3"] = B*(1-Train.PA2.Value)*Train.A44.Value
S["14a"] = S["B3"]*KRU["14/1-B3"]
S["14b"] = S["14a"]*Train.A17.Value
S["F"] = T[10]*Train.A29.Value
@@ -475,7 +477,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
--Вагонная часть
S["10A"] = BO*Train.A30.Value
S["ZR"] = (1-Train.RRP.Value)+(B*Train.A39.Value*(1-Train.RPvozvrat.Value)*Train.RRP.Value)*-1
S["ZR"] = (1-Train.RRP.Value)+(B*(1-Train.PA2.Value)*Train.A39.Value*(1-Train.RPvozvrat.Value)*Train.RRP.Value)*-1
if isMVM then
S["1A"] = T[1]*Train.A1.Value*Train.IGLA_PCBK.KVC
@@ -703,7 +705,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
Panel.TW18 = S["18A"]
Panel.GreenRP = S["10AN"]*S["UO"]
S["36N"] = BO*Train.A45.Value
S["36N"] = BO2*Train.A45.Value
Train:WriteTrainWire(37,Train.ConverterProtection.Value)
Train:WriteTrainWire(69,S["36N"]*Train.BPSNon.Value)
Train:WriteTrainWire(36,T[69]*(1-Train.BPSNon.Value))
@@ -715,7 +717,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
Train.KUP:TriggerInput("Set",S["B9a"]*Train.A75.Value)
Panel.KUP = S["B9a"]*Train.KUP.Value
S["D4"] = BO*Train.A13.Value
S["D4"] = BO2*Train.A13.Value
if isLVZ then
if isKSD then
S["D1"] = T[10]*Train.A21.Value*KV["D-D1"]+S["14b"]*KRU["11/3-D1/1"]+T[16]*Train.VUD1.Value
@@ -881,13 +883,13 @@ function TRAIN_SYSTEM:SolveRKInternalCircuits(Train,dT,firstIter)
local P = Train.PositionSwitch
local RheostatController = Train.RheostatController
local RK = RheostatController.SelectedPosition
local B = (Train.Battery.Voltage > 55) and 1 or 0
local BO = B*Train.VB.Value
local B = (Train.Battery.Voltage >= 60) and 1 or (Train.Battery.Voltage >= Train.Battery.CutoffVoltage) and 0.5 or 0
local BO = B*Train.VB.Value*(1-Train.PA1.Value)
local T = Train.SolverTemporaryVariables
--Вагонная часть
S["10A"] = BO*Train.A30.Value
S["ZR"] = (1-Train.RRP.Value)+(B*Train.A39.Value*(1-Train.RPvozvrat.Value)*Train.RRP.Value)*-1
S["ZR"] = (1-Train.RRP.Value)+(B*(1-Train.PA2.Value)*Train.A39.Value*(1-Train.RPvozvrat.Value)*Train.RRP.Value)*-1
S["1N"] = C(11<=RK and RK<=18)*(1-Train.LK4.Value)