Skip to content

Добавление всех проводов поезда в Wiremod #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Добавление всех проводов поезда в Wiremod #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e424fe
Добавление всех проводов поезда в Wiremod
vety010 May 2, 2025
98feae9
Фикс луа ошибки связанной с Signalling Tool
vety010 May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions lua/entities/gmod_subway_base/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ AddCSLuaFile("shared.lua")
include("shared.lua")
-----------------------------------DUPLICATOR----------------------------------

local addAllTrainWiresConVar = CreateConVar("metrostroi_wiremod_wires_count", "20", {FCVAR_ARCHIVE, FCVAR_ARCHIVE_XBOX, FCVAR_UNLOGGED}, "Allow Wiremod to access some or all (-1) TrainWires", -1)

function ENT:PreEntityCopy()
local BaseDupe = {}
local Tbl = {}
Expand Down Expand Up @@ -118,8 +120,6 @@ function ENT:Initialize()
self:InitializeSounds()
if self.NoTrain then return end

-- Possible number of train wires
self.TrainWireCount = self.TrainWireCount or 36
-- Train wires
self:ResetTrainWires()
self:UpdateWagonList()
Expand All @@ -137,6 +137,8 @@ function ENT:Initialize()
end
self:LoadSystem("FailSim")

-- Possible number of train wires
self.TrainWireCount = self.TrainWireCount or #self.TrainWires or 36

if Wire_CreateInputs then
-- Initialize wire interface
Expand Down Expand Up @@ -206,8 +208,12 @@ function ENT:Initialize()

-- Add I/O for train wires
if self.SubwayTrain then
--for i=1,self.TrainWireCount do
for i=1,20 do
-- Getting ConVar value, -1 = unlimited
local wmTrainWireCount = addAllTrainWiresConVar:GetInt()
wmTrainWireCount = wmTrainWireCount == -1 and math.huge or wmTrainWireCount
wmTrainWireCount = math.min(wmTrainWireCount, self.TrainWireCount)

for i=1,wmTrainWireCount do
table.insert(inputs,"TrainWire"..i)
table.insert(inputTypes,"NORMAL")
table.insert(outputs,"TrainWire"..i)
Expand Down
2 changes: 1 addition & 1 deletion lua/weapons/gmod_tool/stools/signalling.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ function TOOL:SendSettings()
net.SendToServer()
elseif self.Type == 3 then
if not self.Auto then return end
RunConsoleCommand("signalling_autodata",util.TableToJSON(self.aUTO))
RunConsoleCommand("signalling_autodata",util.TableToJSON(self.Auto))
net.Start "metrostroi-stool-signalling"
net.WriteUInt(2,8)
--net.WriteEntity(self)
Expand Down