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

Правка стилистики кода в соответствии с замечаниями ревьюера

Browse Source
This commit is contained in:
Moon Horse
2022-01-12 02:32:11 +03:00
parent cd1cd0d036
commit 57df2595ec
7 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lua/entities/gmod_subway_81-717_mvm/init.lua
View File

@@ -561,7 +561,7 @@ function ENT:Think()
local power = Panel.V1 > -1.5
local brightness = math.min(1,Panel.Headlights1)*0.60 +
math.min(1,Panel.Headlights2)*0.40
local T = {}
self:SetPackedBool("Headlights1",Panel.Headlights1 > 0)
self:SetPackedBool("Headlights2",Panel.Headlights2 > 0)
@@ -589,6 +589,12 @@ function ENT:Think()
end
end
--îňđŕáîňęŕ "âűáčâŕíč˙" Ŕ54 ďđč âęëţ÷ĺíčč đĺâĺđńŕ âďĺđĺä â îáĺčő ęŕáčíŕő
T[4] = self:ReadTrainWire(4)
T[5] = self:ReadTrainWire(5)
if T[4]*T[5] > 0 then
self.A54:TriggerInput("Set",0)
end
-- Door button lights
self:SetPackedBool("DoorsLeftL",Panel.DoorsLeft > 0.5)

2
lua/metrostroi/systems/sys_81_714_electric.lua
View File

@@ -78,7 +78,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
if isMVM then
Train:WriteTrainWire(71,S["33D"]*Train.OtklBV.Value)
end
Train.RPvozvrat.VozRpPressed = T[17]~=0
Train.RPvozvrat.VozRpPressed = T[17]
--Вагонная часть
S["10A"] = BO*Train.A30.Value
S["ZR"] = (1-Train.RRP.Value)+(B*Train.A39.Value*(1-Train.RPvozvrat.Value)*Train.RRP.Value)*-1

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

@@ -89,11 +89,6 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
Train:WriteTrainWire(5,S["10AK"]*KV["10AK-5"] + KRU["5/3-ZM31"]*-10)
Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"] + --[[max(0,min(1,T[4])*KV["4-0"]*-10)]]KV["4-0"]*-10)
if T[4]*KV["4-0"] ~= 0 then
Train.A54:TriggerInput("Set",0)
Train:WriteTrainWire(5,0)
end
--Train:WriteTrainWire(4,S["10AK"]*KV["10AK-4"]*(1-T[4]*KV["4-0"]*-10))
Panel.LST = T[6]*Train.A40.Value
Panel.LhRK = (T[2]+T[-2])*Train.A57.Value
@@ -455,8 +450,7 @@ function TRAIN_SYSTEM:SolveAllInternalCircuits(Train,dT,firstIter)
Panel.L1 = T[57]
end
Panel.M8 = S["V2"]*Train.PVK.Value
Train.RPvozvrat.VozRpPressed = T[17]~=0
Train.RPvozvrat.VozRpPressed = T[17]
Train.C1:TriggerInput("Set", T[1])
Panel.IST = Train.C1.Value*Train.VKST.Value*T[64]

3
lua/metrostroi/systems/sys_yar_13b.lua
View File

@@ -94,7 +94,8 @@ function TRAIN_SYSTEM:Think()
end
--self.RUTTarget = 250 + 150*self.Train.Pneumatic.WeightLoadRatio
-- RPvozvrat operation
Train.RPvozvrat:TriggerInput("Close", not Train.RPvozvrat.VozRpPressed and
local A = Train.RPvozvrat.VozRpPressed ~= 0
Train.RPvozvrat:TriggerInput("Close", not A and
((Train.DR1.Value == 1.0) or
(Train.DR2.Value == 1.0) or
(Train.RPL.Value == 1.0) or