Skip to content

Commit

Permalink
Added all of Ron's rails
Browse files Browse the repository at this point in the history
  • Loading branch information
@dvdvideo1234
dvdvideo1234 committed Feb 14, 2016
1 parent 7692d75 commit 09c7c8a
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 24 deletions.
61 changes: 41 additions & 20 deletions lua/autorun/trackassembly_init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ asmlib.SetIndexes("V",1,2,3)
asmlib.SetIndexes("A",1,2,3)
asmlib.SetIndexes("S",4,5,6,7)
asmlib.InitAssembly("track","assembly")
asmlib.SetOpVar("TOOL_VERSION","5.202")
asmlib.SetOpVar("TOOL_VERSION","5.203")
asmlib.SetOpVar("DIRPATH_BAS",asmlib.GetOpVar("TOOLNAME_NL")..asmlib.GetOpVar("OPSYM_DIRECTORY"))
asmlib.SetOpVar("DIRPATH_EXP","exp"..asmlib.GetOpVar("OPSYM_DIRECTORY"))
asmlib.SetOpVar("DIRPATH_DSV","dsv"..asmlib.GetOpVar("OPSYM_DIRECTORY"))
Expand Down Expand Up @@ -1520,7 +1520,7 @@ else
asmlib.InsertRecord({"models/ron/m_strom/ii/gle_xxxg2/gle_128g2.mdl" , "#", "#", 3, "", "-64, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/ii/gle_xxxg2/gle_128g2.mdl" , "#", "#", 4, "", "-64,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/ii/gle_xxxg1/gle_inner_c90g1.mdl", "#", "#", 1, "", " 0,-52.001,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/ii/gle_xxxg1/gle_inner_c90g1.mdl", "#", "#", 2, "", "-1747.999,-1800,7", "0,-90,0"})
asmlib.InsertRecord({"models/ron/m_strom/ii/gle_xxxg1/gle_inner_c90g1.mdl", "#", "#", 2, "", "-1748,-1800,7", "0,-90,0"})
asmlib.InsertRecord({"models/ron/m_strom/ii/gle_xxxg1/gle_inner_left_c225g1.mdl", "#", "#", 1, "", "0,-52.012,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/ii/gle_xxxg1/gle_inner_left_c225g1.mdl", "#", "#", 2, "", "-668.901,-185.014,7", "0,-157.5,0"})
asmlib.InsertRecord({"models/ron/m_strom/oo/gle_xxxg1/gle_inner_left_c225g1.mdl", "#", "#", 1, "", "0,-52.012,7", ""})
Expand Down Expand Up @@ -1742,43 +1742,43 @@ else
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_switched.mdl", "#", "#", 1, "", "-384,-64,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_switched.mdl", "#", "#", 2, "", " 0 , 64,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_switched.mdl", "#", "#", 3, "", "-570, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_switched.mdl", "#", "#", 4, "", "-953.4,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_switched.mdl", "#", "#", 4, "", "-954,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_unswitched.mdl", "#", "#", 1, "", "-384,-64,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_unswitched.mdl", "#", "#", 2, "", " 0 , 64,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_unswitched.mdl", "#", "#", 3, "", "-570, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_unswitched.mdl", "#", "#", 4, "", "-953.4,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_left/sjne_left_unswitched.mdl", "#", "#", 4, "", "-954,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_switched.mdl", "#", "#", 1, "", " 0 ,-64,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_switched.mdl", "#", "#", 2, "", "-384, 64,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_switched.mdl", "#", "#", 3, "", "-953.4, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_switched.mdl", "#", "#", 3, "", "-954, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_switched.mdl", "#", "#", 4, "", "-570,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_unswitched.mdl", "#", "#", 1, "", " 0 ,-64,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_unswitched.mdl", "#", "#", 2, "", "-384, 64,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_unswitched.mdl", "#", "#", 3, "", "-953.4, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_unswitched.mdl", "#", "#", 3, "", "-954, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/m_strom/sjne_right/sjne_right_unswitched.mdl", "#", "#", 4, "", "-570,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_switched.mdl", "#", "#", 1, "", "-384,-64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_switched.mdl", "#", "#", 2, "", " 0 , 64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_switched.mdl", "#", "#", 3, "", "-570, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_switched.mdl", "#", "#", 4, "", "-953.4,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_switched.mdl", "#", "#", 4, "", "-954,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_unswitched.mdl", "#", "#", 1, "", "-384,-64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_unswitched.mdl", "#", "#", 2, "", " 0 , 64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_unswitched.mdl", "#", "#", 3, "", "-570, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_unswitched.mdl", "#", "#", 4, "", "-953.4,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_left/sjn_left_unswitched.mdl", "#", "#", 4, "", "-954,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_switched.mdl", "#", "#", 1, "", " 0 ,-64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_switched.mdl", "#", "#", 2, "", "-384, 64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_switched.mdl", "#", "#", 3, "", "-953.4, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_switched.mdl", "#", "#", 3, "", "-954, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_switched.mdl", "#", "#", 4, "", "-570,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_unswitched.mdl", "#", "#", 1, "", " 0 ,-64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_unswitched.mdl", "#", "#", 2, "", "-384, 64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_unswitched.mdl", "#", "#", 3, "", "-953.4, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_unswitched.mdl", "#", "#", 3, "", "-954, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/sjn_right/sjn_right_unswitched.mdl", "#", "#", 4, "", "-570,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg2/glx_roadg2.mdl", "#", "#", 1, "", " 130,-64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg2/glx_roadg2.mdl", "#", "#", 2, "", " 130, 64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg2/glx_roadg2.mdl", "#", "#", 3, "", "-130, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg2/glx_roadg2.mdl", "#", "#", 4, "", "-130,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg1/glx_roadg1.mdl", "#", "#", 1, "", " 130,0,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg1/glx_roadg1.mdl", "#", "#", 2, "", "-130,0,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg1/glx_sidewalkg1.mdl", "#", "#", 1, "", " 130,0,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg1/glx_sidewalkg1.mdl", "#", "#", 2, "", "-130,0,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg2/glx_roadg2.mdl", "#", "#", 1, "", " 128,-64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg2/glx_roadg2.mdl", "#", "#", 2, "", " 128, 64,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg2/glx_roadg2.mdl", "#", "#", 3, "", "-128, 64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg2/glx_roadg2.mdl", "#", "#", 4, "", "-128,-64,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg1/glx_roadg1.mdl", "#", "#", 1, "", " 128,0,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg1/glx_roadg1.mdl", "#", "#", 2, "", "-128,0,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg1/glx_sidewalkg1.mdl", "#", "#", 1, "", " 128,0,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/glx_crossing/glx_xxxg1/glx_sidewalkg1.mdl", "#", "#", 2, "", "-128,0,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/jn_left/jn_left_inner_switched_225.mdl" , "#", "#", 1, "", " 0,0,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/jn_left/jn_left_inner_switched_225.mdl" , "#", "#", 2, "", "-512,0,7", "0,-180,0"})
asmlib.InsertRecord({"models/ron/o_strom/jn_left/jn_left_inner_switched_225.mdl" , "#", "#", 3, "", "-668.744,-132.977,7", "0,-157.5,0"})
Expand Down Expand Up @@ -1839,12 +1839,33 @@ else
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_left_c225g1.mdl" , "#", "#", 2, "", "-679.023,-179.3,7", "0,-157.5,0"})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_left_c45g1.mdl" , "#", "#", 1, "", "0,-52.033,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_left_c45g1.mdl" , "#", "#", 2, "", "-1326.439,-601.533,7", "0,-135,0"})

asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_inner_left_c45g1.mdl" , "#", "#", 1, "", "0,-52.032,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_inner_left_c45g1.mdl" , "#", "#", 2, "", "-1236.966,-565.028,7", "0,-135,0"})
asmlib.InsertRecord({"models/ron/m_strom/oo/gle_xxxg1/gle_inner_left_c45g1.mdl" , "#", "#", 1, "", "0,-52.032,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/oo/gle_xxxg1/gle_inner_left_c45g1.mdl" , "#", "#", 2, "", "-1235.977,-564.026,7", "0,-135,0"})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_inner_c90g1.mdl", "#", "#", 1, "", " 0,-52,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_inner_c90g1.mdl", "#", "#", 2, "", "-1748,-1800,7", "0,-90,0"})
asmlib.InsertRecord({"models/ron/m_strom/oo/gle_xxxg1/gle_inner_c90g1.mdl", "#", "#", 1, "", " 0,-52.001,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/oo/gle_xxxg1/gle_inner_c90g1.mdl", "#", "#", 2, "", "-1748,-1800,7", "0,-90,0"})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_inner_right_c45g1.mdl", "#", "#", 1, "", "0,52.193,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_inner_right_c45g1.mdl", "#", "#", 2, "", "-1236.971,565.219,6.887", "0,135,0"})
asmlib.InsertRecord({"models/ron/m_strom/oo/gle_xxxg1/gle_inner_right_c45g1.mdl", "#", "#", 1, "", "0,53.004,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/oo/gle_xxxg1/gle_inner_right_c45g1.mdl", "#", "#", 2, "", "-1236.005,564.978,7", "0,135,0"})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_c90g1.mdl" , "#", "#", 1, "", "0,-52.033,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_c90g1.mdl" , "#", "#", 2, "", "-1875.969,-1928.001,7", "0,-90,0"})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_right_c225g1.mdl", "#", "#", 1, "", "0, 52.032,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_right_c225g1.mdl", "#", "#", 2, "", "-679.015,179.288,7", "0,157.5,0"})
asmlib.InsertRecord({"models/ron/o_strom/dgl_xxxg1/dgl_outer_right_c225g1.mdl", "#", "#", 1, "", "0, 52.032,3", ""})
asmlib.InsertRecord({"models/ron/o_strom/dgl_xxxg1/dgl_outer_right_c225g1.mdl", "#", "#", 2, "", "-679.015,179.288,3", "0,157.5,0"})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_right_c45g1.mdl" , "#", "#", 1, "", "0, 52.033,7", ""})
asmlib.InsertRecord({"models/ron/o_strom/gl_xxxg1/gl_outer_right_c45g1.mdl" , "#", "#", 2, "", "-1326.5,601.490,7", "0,135,0"})
asmlib.InsertRecord({"models/ron/m_strom/special/trenner/gle_trennerg1.mdl" , "#", "#", 1, "", " 64,0,7", ""})
asmlib.InsertRecord({"models/ron/m_strom/special/trenner/gle_trennerg1.mdl" , "#", "#", 2, "", "-64,0,7", "0,-180,0"})
end

if(file.Exists(gsFullDSV.."PHYSPROPERTIES.txt", "DATA")) then
asmlib.LogInstance(gsToolNameU..": DB PHYSPROPERTIES from DSV")
asmlib.ImportFromDSV("PHYSPROPERTIES","\t",true)
asmlib.ImportFromDSV("PHYSPROPERTIES","\t",true)
else --- Valve's physical properties: https://developer.valvesoftware.com/wiki/Material_surface_properties
asmlib.LogInstance(gsToolNameU..": DB PHYSPROPERTIES from LUA")
asmlib.DefaultTable("PHYSPROPERTIES")
Expand Down
5 changes: 1 addition & 4 deletions lua/weapons/gmod_tool/stools/trackassembly.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ function TOOL:LeftClick(stTrace)
asmlib.ConCommandPly(ply,"model",trModel)
asmlib.ConCommandPly(ply,"pointid",1)
asmlib.ConCommandPly(ply,"pnextid",2)
return asmlib.StatusLog(true,"TOOL:LeftClick(Select): New piece success")
return asmlib.StatusLog(true,"TOOL:LeftClick(Select): New piece <"..trModel.."> success")
end

if(not hdRec) then return asmlib.StatusLog(false,self:GetStatus(stTrace,"TOOL:LeftClick(Prop): Holder model not a piece")) end
Expand Down Expand Up @@ -1131,7 +1131,6 @@ function TOOL.BuildCPanel(CPanel)
Max = gnMaxOffLin,
Command = gsToolPrefL.."nextx"})
pItem:SetTooltip(languageGetPhrase("tool."..gsToolNameL..".nextx"))
-- pItem:SetSlideY(1)

pItem = CPanel:AddControl("Slider", {
Label = "Offset Y:",
Expand All @@ -1140,7 +1139,6 @@ function TOOL.BuildCPanel(CPanel)
Max = gnMaxOffLin,
Command = gsToolPrefL.."nexty"})
pItem:SetTooltip(languageGetPhrase("tool."..gsToolNameL..".nexty"))
-- pItem:SetSlideY(1)

pItem = CPanel:AddControl("Slider", {
Label = "Offset Z:",
Expand All @@ -1149,7 +1147,6 @@ function TOOL.BuildCPanel(CPanel)
Max = gnMaxOffLin,
Command = gsToolPrefL.."nextz"})
pItem:SetTooltip(languageGetPhrase("tool."..gsToolNameL..".nextz"))
-- pItem:SetSlideY(1)

pItem = CPanel:AddControl("Checkbox", {
Label = "Weld",
Expand Down

0 comments on commit 09c7c8a

Please sign in to comment.