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

Merge remote-tracking branch 'origin/dev' into ##386,387,388,243

# Conflicts:
#	lua/metrostroi/systems/sys_81_717_electric.lua
This commit is contained in:
Moon Horse
2022-01-08 14:21:44 +03:00
97 changed files with 189 additions and 353 deletions

View File

@@ -59,7 +59,7 @@ function TRAIN_SYSTEM:Think(dT)
local speed = Train.ALSCoil.Speed
--vv При торможении смещение на 2км\ч vv
----[[
if true or self.SpeedDec then
if self.SpeedDec then
Train.BIS_R1:TriggerInput("Set", self.Power*inrange(speed,5.5,11.5 ,3.5 ,14.0 ,Train.BIS_R1.Value > 0))
Train.BIS_R2:TriggerInput("Set", self.Power*inrange(speed,10 ,21.5 ,8.2 ,25.7 ,Train.BIS_R2.Value > 0))
Train.BIS_R3:TriggerInput("Set", self.Power*inrange(speed,20 ,31.5 ,17.6,35.7 ,Train.BIS_R3.Value > 0))