diff --git a/Src/Lib/RailWorks.lua b/Src/Lib/RailWorks.lua index d6b391c7..c0c1a7a8 100644 --- a/Src/Lib/RailWorks.lua +++ b/Src/Lib/RailWorks.lua @@ -42,7 +42,7 @@ function P.GetRVNumber () return Call("GetRVNumber") end -function P.SendConsistMessage (message, argument, direction) +function P.Engine_SendConsistMessage (message, argument, direction) return Call("SendConsistMessage", message, tostring(argument), direction) == 1 end @@ -146,7 +146,7 @@ function P.SendSignalMessage (message, argument, direction, link, index) return Call("SendSignalMessage", message, argument, direction, link, index) end -function P.SendConsistMessage (message, argument) +function P.Signal_SendConsistMessage (message, argument) if argument == nil then Call("SendConsistMessage", message) else diff --git a/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/CommonScripts/MP36PH_Engine_Script.lua b/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/CommonScripts/MP36PH_Engine_Script.lua index 62f7fcf1..5df013a4 100644 --- a/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/CommonScripts/MP36PH_Engine_Script.lua +++ b/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/CommonScripts/MP36PH_Engine_Script.lua @@ -332,4 +332,4 @@ OnCustomSignalMessage = RailWorks.wraperrors(function (message) acses:receivemessage(message) end) -OnConsistMessage = RailWorks.SendConsistMessage \ No newline at end of file +OnConsistMessage = RailWorks.Engine_SendConsistMessage \ No newline at end of file diff --git a/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/Diesel/P42DC/Amtrak/Locomotive/P42DC_EngineScript.lua b/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/Diesel/P42DC/Amtrak/Locomotive/P42DC_EngineScript.lua index 4ff8781c..08a1593c 100644 --- a/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/Diesel/P42DC/Amtrak/Locomotive/P42DC_EngineScript.lua +++ b/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/Diesel/P42DC/Amtrak/Locomotive/P42DC_EngineScript.lua @@ -307,4 +307,4 @@ OnCustomSignalMessage = RailWorks.wraperrors(function (message) acses:receivemessage(message) end) -OnConsistMessage = RailWorks.SendConsistMessage \ No newline at end of file +OnConsistMessage = RailWorks.Engine_SendConsistMessage \ No newline at end of file diff --git a/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/Passengers/MultiLevel/Driving Trailer/CommonScripts/CabCar_EngineScript.lua b/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/Passengers/MultiLevel/Driving Trailer/CommonScripts/CabCar_EngineScript.lua index 2483af9d..321d58a3 100644 --- a/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/Passengers/MultiLevel/Driving Trailer/CommonScripts/CabCar_EngineScript.lua +++ b/Src/Mod/DTG/WashingtonBaltimore/RailVehicles/Passengers/MultiLevel/Driving Trailer/CommonScripts/CabCar_EngineScript.lua @@ -312,4 +312,4 @@ OnCustomSignalMessage = RailWorks.wraperrors(function (message) acses:receivemessage(message) end) -OnConsistMessage = RailWorks.SendConsistMessage \ No newline at end of file +OnConsistMessage = RailWorks.Engine_SendConsistMessage \ No newline at end of file diff --git a/Src/Mod/RSC/AcelaHHP8Pack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.lua b/Src/Mod/RSC/AcelaHHP8Pack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.lua index cc45393a..d7d9e4b7 100644 --- a/Src/Mod/RSC/AcelaHHP8Pack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.lua +++ b/Src/Mod/RSC/AcelaHHP8Pack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.lua @@ -225,10 +225,10 @@ local function setplayerpantos () local rearup = pantoup and pantosel > 0.5 frontpantoanim:setanimatedstate(frontup) rearpantoanim:setanimatedstate(rearup) - RailWorks.SendConsistMessage(messageid.raisefrontpanto, frontup, 0) - RailWorks.SendConsistMessage(messageid.raisefrontpanto, frontup, 1) - RailWorks.SendConsistMessage(messageid.raiserearpanto, rearup, 0) - RailWorks.SendConsistMessage(messageid.raiserearpanto, rearup, 1) + RailWorks.Engine_SendConsistMessage(messageid.raisefrontpanto, frontup, 0) + RailWorks.Engine_SendConsistMessage(messageid.raisefrontpanto, frontup, 1) + RailWorks.Engine_SendConsistMessage(messageid.raiserearpanto, rearup, 0) + RailWorks.Engine_SendConsistMessage(messageid.raiserearpanto, rearup, 1) local frontcontact = frontpantoanim:getposition() == 1 local rearcontact = rearpantoanim:getposition() == 1 @@ -244,10 +244,10 @@ local function setaipantos () local rearup = false frontpantoanim:setanimatedstate(frontup) rearpantoanim:setanimatedstate(rearup) - RailWorks.SendConsistMessage(messageid.raisefrontpanto, frontup, 0) - RailWorks.SendConsistMessage(messageid.raisefrontpanto, frontup, 1) - RailWorks.SendConsistMessage(messageid.raiserearpanto, rearup, 0) - RailWorks.SendConsistMessage(messageid.raiserearpanto, rearup, 1) + RailWorks.Engine_SendConsistMessage(messageid.raisefrontpanto, frontup, 0) + RailWorks.Engine_SendConsistMessage(messageid.raisefrontpanto, frontup, 1) + RailWorks.Engine_SendConsistMessage(messageid.raiserearpanto, rearup, 0) + RailWorks.Engine_SendConsistMessage(messageid.raiserearpanto, rearup, 1) end local function setslavepantos () @@ -507,5 +507,5 @@ OnConsistMessage = RailWorks.wraperrors(function (message, argument, direction) elseif message == messageid.raiserearpanto then state.raiserearpantomsg = argument == "true" end - RailWorks.SendConsistMessage(message, argument, direction) + RailWorks.Engine_SendConsistMessage(message, argument, direction) end) \ No newline at end of file diff --git a/Src/Mod/RSC/AcelaPack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.lua b/Src/Mod/RSC/AcelaPack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.lua index aad7e796..155cea49 100644 --- a/Src/Mod/RSC/AcelaPack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.lua +++ b/Src/Mod/RSC/AcelaPack01/RailVehicles/Electric/Acela/Default/CommonScripts/PowerCar_EngineScript.lua @@ -285,10 +285,10 @@ local function setplayerpantos () local rearup = pantoup and pantosel > 0.5 frontpantoanim:setanimatedstate(frontup) rearpantoanim:setanimatedstate(rearup) - RailWorks.SendConsistMessage(messageid.raisefrontpanto, frontup, 0) - RailWorks.SendConsistMessage(messageid.raisefrontpanto, frontup, 1) - RailWorks.SendConsistMessage(messageid.raiserearpanto, rearup, 0) - RailWorks.SendConsistMessage(messageid.raiserearpanto, rearup, 1) + RailWorks.Engine_SendConsistMessage(messageid.raisefrontpanto, frontup, 0) + RailWorks.Engine_SendConsistMessage(messageid.raisefrontpanto, frontup, 1) + RailWorks.Engine_SendConsistMessage(messageid.raiserearpanto, rearup, 0) + RailWorks.Engine_SendConsistMessage(messageid.raiserearpanto, rearup, 1) local frontcontact = frontpantoanim:getposition() == 1 local rearcontact = rearpantoanim:getposition() == 1 @@ -304,10 +304,10 @@ local function setaipantos () local rearup = false frontpantoanim:setanimatedstate(frontup) rearpantoanim:setanimatedstate(rearup) - RailWorks.SendConsistMessage(messageid.raisefrontpanto, frontup, 0) - RailWorks.SendConsistMessage(messageid.raisefrontpanto, frontup, 1) - RailWorks.SendConsistMessage(messageid.raiserearpanto, rearup, 0) - RailWorks.SendConsistMessage(messageid.raiserearpanto, rearup, 1) + RailWorks.Engine_SendConsistMessage(messageid.raisefrontpanto, frontup, 0) + RailWorks.Engine_SendConsistMessage(messageid.raisefrontpanto, frontup, 1) + RailWorks.Engine_SendConsistMessage(messageid.raiserearpanto, rearup, 0) + RailWorks.Engine_SendConsistMessage(messageid.raiserearpanto, rearup, 1) end local function setslavepantos () @@ -336,8 +336,8 @@ end local function settilt () local isolate = RailWorks.GetControlValue("TiltIsolate", 0) - RailWorks.SendConsistMessage(messageid.tiltisolate, isolate, 0) - RailWorks.SendConsistMessage(messageid.tiltisolate, isolate, 1) + RailWorks.Engine_SendConsistMessage(messageid.tiltisolate, isolate, 0) + RailWorks.Engine_SendConsistMessage(messageid.tiltisolate, isolate, 1) end local function setcone () @@ -357,18 +357,18 @@ do end if RailWorks.GetControlValue("DestOnOff", 0) == 1 then - RailWorks.SendConsistMessage(messageid.destination, id, 0) - RailWorks.SendConsistMessage(messageid.destination, id, 1) + RailWorks.Engine_SendConsistMessage(messageid.destination, id, 0) + RailWorks.Engine_SendConsistMessage(messageid.destination, id, 1) else - RailWorks.SendConsistMessage(messageid.destination, 0, 0) - RailWorks.SendConsistMessage(messageid.destination, 0, 1) + RailWorks.Engine_SendConsistMessage(messageid.destination, 0, 0) + RailWorks.Engine_SendConsistMessage(messageid.destination, 0, 1) end end end local function setaidest () - RailWorks.SendConsistMessage(messageid.destination, 1, 0) - RailWorks.SendConsistMessage(messageid.destination, 1, 1) + RailWorks.Engine_SendConsistMessage(messageid.destination, 1, 0) + RailWorks.Engine_SendConsistMessage(messageid.destination, 1, 1) end local function setstatusscreen () @@ -602,5 +602,5 @@ OnConsistMessage = RailWorks.wraperrors(function (message, argument, direction) elseif message == messageid.raiserearpanto then state.raisefrontpantomsg = argument == "true" end - RailWorks.SendConsistMessage(message, argument, direction) + RailWorks.Engine_SendConsistMessage(message, argument, direction) end) \ No newline at end of file diff --git a/Src/Mod/RSC/M8Pack01/RailVehicles/Electric/M8MTA/Scripts/M8_EngineScript.lua b/Src/Mod/RSC/M8Pack01/RailVehicles/Electric/M8MTA/Scripts/M8_EngineScript.lua index 73c2c3c1..d758be91 100644 --- a/Src/Mod/RSC/M8Pack01/RailVehicles/Electric/M8MTA/Scripts/M8_EngineScript.lua +++ b/Src/Mod/RSC/M8Pack01/RailVehicles/Electric/M8MTA/Scripts/M8_EngineScript.lua @@ -273,4 +273,4 @@ OnCustomSignalMessage = RailWorks.wraperrors(function (message) acses:receivemessage(message) end) -OnConsistMessage = RailWorks.SendConsistMessage \ No newline at end of file +OnConsistMessage = RailWorks.Engine_SendConsistMessage \ No newline at end of file diff --git a/Src/Mod/RSC/NewYorkNewHaven/RailVehicles/Electric/ACS-64/Default/CommonScripts/EngineScript.lua b/Src/Mod/RSC/NewYorkNewHaven/RailVehicles/Electric/ACS-64/Default/CommonScripts/EngineScript.lua index 9f958e00..c59a5172 100644 --- a/Src/Mod/RSC/NewYorkNewHaven/RailVehicles/Electric/ACS-64/Default/CommonScripts/EngineScript.lua +++ b/Src/Mod/RSC/NewYorkNewHaven/RailVehicles/Electric/ACS-64/Default/CommonScripts/EngineScript.lua @@ -486,4 +486,4 @@ OnCustomSignalMessage = RailWorks.wraperrors(function (message) acses:receivemessage(message) end) -OnConsistMessage = RailWorks.SendConsistMessage \ No newline at end of file +OnConsistMessage = RailWorks.Engine_SendConsistMessage \ No newline at end of file diff --git a/Src/Mod/RSC/NorthEastCorridor/RailVehicles/Electric/AEM7/Default/Engine/RailVehicle_EngineScript.lua b/Src/Mod/RSC/NorthEastCorridor/RailVehicles/Electric/AEM7/Default/Engine/RailVehicle_EngineScript.lua index b4c4137d..e26d4c8d 100644 --- a/Src/Mod/RSC/NorthEastCorridor/RailVehicles/Electric/AEM7/Default/Engine/RailVehicle_EngineScript.lua +++ b/Src/Mod/RSC/NorthEastCorridor/RailVehicles/Electric/AEM7/Default/Engine/RailVehicle_EngineScript.lua @@ -252,4 +252,4 @@ OnCustomSignalMessage = RailWorks.wraperrors(function (message) acses:receivemessage(message) end) -OnConsistMessage = RailWorks.SendConsistMessage \ No newline at end of file +OnConsistMessage = RailWorks.Engine_SendConsistMessage \ No newline at end of file diff --git a/Src/Mod/RSC/P32Pack01/RailVehicles/Diesel/P32DC/CommonScripts/P32DC_EngineScript.lua b/Src/Mod/RSC/P32Pack01/RailVehicles/Diesel/P32DC/CommonScripts/P32DC_EngineScript.lua index bd374119..85bf1777 100644 --- a/Src/Mod/RSC/P32Pack01/RailVehicles/Diesel/P32DC/CommonScripts/P32DC_EngineScript.lua +++ b/Src/Mod/RSC/P32Pack01/RailVehicles/Diesel/P32DC/CommonScripts/P32DC_EngineScript.lua @@ -367,4 +367,4 @@ OnCustomSignalMessage = RailWorks.wraperrors(function (message) acses:receivemessage(message) end) -OnConsistMessage = RailWorks.SendConsistMessage \ No newline at end of file +OnConsistMessage = RailWorks.Engine_SendConsistMessage \ No newline at end of file