diff --git a/data/trackassembly/dsv/cl_TRACKASSEMBLY_ADDITIONS.txt b/data/trackassembly/dsv/cl_TRACKASSEMBLY_ADDITIONS.txt index 41a069ef..8efc63dd 100644 --- a/data/trackassembly/dsv/cl_TRACKASSEMBLY_ADDITIONS.txt +++ b/data/trackassembly/dsv/cl_TRACKASSEMBLY_ADDITIONS.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( DSV ): 12/31/15 21:41:25 [ LUA ] +# ExportIntoFile( DSV ): 01/17/16 18:43:15 [ LUA ] # Data settings: MODELBASE MODELADD ENTCLASS LINEID POSOFF ANGOFF MOVETYPE PHYSINIT DRSHADOW PHMOTION PHYSLEEP SETSOLID TRACKASSEMBLY_ADDITIONS models/shinji85/train/rail_r_switch.mdl "models/shinji85/train/sw_lever.mdl" "buttonswitch" 1 "-100,125,0" "NULL" -1 -1 -1 -1 -1 -1 TRACKASSEMBLY_ADDITIONS models/shinji85/train/rail_r_switch.mdl "models/shinji85/train/rail_r_switcher1.mdl" "prop_dynamic" 2 "NULL" "NULL" 6 6 -1 1 1 6 diff --git a/data/trackassembly/dsv/cl_TRACKASSEMBLY_PHYSPROPERTIES.txt b/data/trackassembly/dsv/cl_TRACKASSEMBLY_PHYSPROPERTIES.txt index ce75e445..c5bf7e46 100644 --- a/data/trackassembly/dsv/cl_TRACKASSEMBLY_PHYSPROPERTIES.txt +++ b/data/trackassembly/dsv/cl_TRACKASSEMBLY_PHYSPROPERTIES.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( DSV ): 12/31/15 21:41:25 [ LUA ] +# ExportIntoFile( DSV ): 01/17/16 18:43:15 [ LUA ] # Data settings: TYPE LINEID NAME TRACKASSEMBLY_PHYSPROPERTIES "Special" 1 "default" TRACKASSEMBLY_PHYSPROPERTIES "Special" 2 "default_silent" diff --git a/data/trackassembly/dsv/cl_TRACKASSEMBLY_PIECES.txt b/data/trackassembly/dsv/cl_TRACKASSEMBLY_PIECES.txt index d73ec1a2..daa60a33 100644 --- a/data/trackassembly/dsv/cl_TRACKASSEMBLY_PIECES.txt +++ b/data/trackassembly/dsv/cl_TRACKASSEMBLY_PIECES.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( DSV ): 12/31/15 21:41:25 [ LUA ] +# ExportIntoFile( DSV ): 01/17/16 18:43:15 [ LUA ] # Data settings: MODEL TYPE NAME LINEID POINT ORIGIN ANGLE TRACKASSEMBLY_PIECES "models/bobsters_trains/rails/2ft/misc/cross.mdl" "Bobster's two feet rails" "Cross" 1 "83,0,3.015" "83,0,3.015" "0,0,0" TRACKASSEMBLY_PIECES "models/bobsters_trains/rails/2ft/misc/cross.mdl" "Bobster's two feet rails" "Cross" 2 "0.003,83,3.015" "0.003,83,3.015" "0,90,0" @@ -144,6 +144,74 @@ TRACKASSEMBLY_PIECES "models/magtrains1ga/straight_1024.mdl" "Magnum's Rails" "S TRACKASSEMBLY_PIECES "models/magtrains1ga/straight_1024.mdl" "Magnum's Rails" "Straight 1024" 2 "-512,0,-1" "-512,0,-1" "0,180,0" TRACKASSEMBLY_PIECES "models/magtrains1ga/straight_2048.mdl" "Magnum's Rails" "Straight 2048" 1 "1024,0,-1" "1024,0,-1" "0,0,0" TRACKASSEMBLY_PIECES "models/magtrains1ga/straight_2048.mdl" "Magnum's Rails" "Straight 2048" 2 "-1024,0,-1" "-1024,0,-1" "0,180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_cross_128.mdl" "Mr.Train's G-Gauge" "Cross 128" 1 "64,0,1.516" "64,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_cross_128.mdl" "Mr.Train's G-Gauge" "Cross 128" 2 "0,64,1.516" "0,64,1.516" "0,90,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_cross_128.mdl" "Mr.Train's G-Gauge" "Cross 128" 3 "-64,0,1.516" "-64,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_cross_128.mdl" "Mr.Train's G-Gauge" "Cross 128" 4 "0,-64,1.516" "0,-64,1.516" "0,-90,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_1.mdl" "Mr.Train's G-Gauge" "Ramp 1" 1 "16,0,1.516" "16,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_1.mdl" "Mr.Train's G-Gauge" "Ramp 1" 2 "-16,0,3.016" "-16,0,3.016" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_2.mdl" "Mr.Train's G-Gauge" "Ramp 2" 1 "16,0,1.516" "16,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_2.mdl" "Mr.Train's G-Gauge" "Ramp 2" 2 "-16,0,4.516" "-16,0,4.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_3.mdl" "Mr.Train's G-Gauge" "Ramp 3" 1 "16,0,1.516" "16,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_3.mdl" "Mr.Train's G-Gauge" "Ramp 3" 2 "-16,0,6.016" "-16,0,6.016" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_s_left_22_5.mdl" "Mr.Train's G-Gauge" "S Left 22 5" 1 "256,39,1.516" "256,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_s_left_22_5.mdl" "Mr.Train's G-Gauge" "S Left 22 5" 2 "-256,-39,1.516" "-256,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_s_right_22_5.mdl" "Mr.Train's G-Gauge" "S Right 22 5" 1 "256,-39,1.516" "256,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_s_right_22_5.mdl" "Mr.Train's G-Gauge" "S Right 22 5" 2 "-256,39,1.516" "-256,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_1024.mdl" "Mr.Train's G-Gauge" "Straight 1024" 1 "512,0,1.516" "512,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_1024.mdl" "Mr.Train's G-Gauge" "Straight 1024" 2 "-512,0,1.516" "-512,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_128.mdl" "Mr.Train's G-Gauge" "Straight 128" 1 "64,0,1.516" "64,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_128.mdl" "Mr.Train's G-Gauge" "Straight 128" 2 "-64,0,1.516" "-64,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_2048.mdl" "Mr.Train's G-Gauge" "Straight 2048" 1 "1024,0,1.516" "1024,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_2048.mdl" "Mr.Train's G-Gauge" "Straight 2048" 2 "-1024,0,1.516" "-1024,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_256.mdl" "Mr.Train's G-Gauge" "Straight 256" 1 "128,0,1.516" "128,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_256.mdl" "Mr.Train's G-Gauge" "Straight 256" 2 "-128,0,1.516" "-128,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_32.mdl" "Mr.Train's G-Gauge" "Straight 32" 1 "16,0,1.516" "16,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_32.mdl" "Mr.Train's G-Gauge" "Straight 32" 2 "-16,0,1.516" "-16,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_512.mdl" "Mr.Train's G-Gauge" "Straight 512" 1 "256,0,1.516" "256,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_512.mdl" "Mr.Train's G-Gauge" "Straight 512" 2 "-256,0,1.516" "-256,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_64.mdl" "Mr.Train's G-Gauge" "Straight 64" 1 "32,0,1.516" "32,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_64.mdl" "Mr.Train's G-Gauge" "Straight 64" 2 "-32,0,1.516" "-32,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 1" 1 "256,39,1.516" "256,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 1" 2 "0,39,1.516" "0,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 1" 3 "-256,-39,1.516" "-256,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 2" 1 "256,39,1.516" "256,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 2" 2 "0,39,1.516" "0,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 2" 3 "-256,-39,1.516" "-256,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 1" 1 "256,-39,1.516" "256,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 1" 2 "0,-39,1.516" "0,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 1" 3 "-256,39,1.516" "-256,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 2" 1 "256,-39,1.516" "256,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 2" 2 "0,-39,1.516" "0,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 2" 3 "-256,39,1.516" "-256,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 1" 1 "195.938,39,1.516" "195.938,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 1" 2 "195.938,-39,1.516" "195.938,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 1" 3 "-195.937,-39,1.516" "-195.937,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 1" 4 "-195.937,39,1.516" "-195.937,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 2" 1 "195.938,39,1.516" "195.938,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 2" 2 "195.938,-39,1.516" "195.938,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 2" 3 "-195.937,-39,1.516" "-195.937,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 2" 4 "-195.937,39,1.516" "-195.937,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 1" 1 "195.938,39,1.516" "195.938,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 1" 2 "195.938,-39,1.516" "195.938,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 1" 3 "-195.937,-39,1.516" "-195.937,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 1" 4 "-195.937,39,1.516" "-195.937,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 2" 1 "195.938,39,1.516" "195.938,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 2" 2 "195.938,-39,1.516" "195.938,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 2" 3 "-195.937,-39,1.516" "-195.937,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 2" 4 "-195.937,39,1.516" "-195.937,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_22_5.mdl" "Mr.Train's G-Gauge" "Turn Left 22 5" 1 "263.75,248.25,1.516" "263.75,248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_22_5.mdl" "Mr.Train's G-Gauge" "Turn Left 22 5" 2 "67.855,209.265,1.516" "67.855,209.265,1.516" "0,-157.5,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_45.mdl" "Mr.Train's G-Gauge" "Turn Left 45" 1 "263.75,248.25,1.516" "263.75,248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_45.mdl" "Mr.Train's G-Gauge" "Turn Left 45" 2 "-98.326,98.323,1.516" "-98.326,98.323,1.516" "0,-135,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_90.mdl" "Mr.Train's G-Gauge" "Turn Left 90" 1 "263.75,248.25,1.516" "263.75,248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_90.mdl" "Mr.Train's G-Gauge" "Turn Left 90" 2 "-248.25,-263.75,1.516" "-248.25,-263.75,1.516" "0,-90,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_22_5.mdl" "Mr.Train's G-Gauge" "Turn Right 22 5" 1 "263.75,-248.25,1.516" "263.75,-248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_22_5.mdl" "Mr.Train's G-Gauge" "Turn Right 22 5" 2 "67.872,-209.299,1.516" "67.872,-209.299,1.516" "0,157.5,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_45.mdl" "Mr.Train's G-Gauge" "Turn Right 45" 1 "263.75,-248.25,1.516" "263.75,-248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_45.mdl" "Mr.Train's G-Gauge" "Turn Right 45" 2 "-98.302,-98.302,1.516" "-98.302,-98.302,1.516" "0,135,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_90.mdl" "Mr.Train's G-Gauge" "Turn Right 90" 1 "263.75,-248.25,1.516" "263.75,-248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_90.mdl" "Mr.Train's G-Gauge" "Turn Right 90" 2 "-248.25,263.75,1.516" "-248.25,263.75,1.516" "0,90,0" TRACKASSEMBLY_PIECES "models/props/m_gauge/track/m_gauge_128_cross.mdl" "Mr.Train's M-Gauge" "Cross 128" 1 "64,0,0.016" "64,0,0.016" "0,0,0" TRACKASSEMBLY_PIECES "models/props/m_gauge/track/m_gauge_128_cross.mdl" "Mr.Train's M-Gauge" "Cross 128" 2 "0,64,0.016" "0,64,0.016" "0,90,0" TRACKASSEMBLY_PIECES "models/props/m_gauge/track/m_gauge_128_cross.mdl" "Mr.Train's M-Gauge" "Cross 128" 3 "-64,0,0.016" "-64,0,0.016" "0,-180,0" diff --git a/data/trackassembly/dsv/sv_TRACKASSEMBLY_ADDITIONS.txt b/data/trackassembly/dsv/sv_TRACKASSEMBLY_ADDITIONS.txt index de6c7c6d..a9f10b4d 100644 --- a/data/trackassembly/dsv/sv_TRACKASSEMBLY_ADDITIONS.txt +++ b/data/trackassembly/dsv/sv_TRACKASSEMBLY_ADDITIONS.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( DSV ): 12/31/15 21:41:32 [ LUA ] +# ExportIntoFile( DSV ): 01/17/16 17:32:16 [ LUA ] # Data settings: MODELBASE MODELADD ENTCLASS LINEID POSOFF ANGOFF MOVETYPE PHYSINIT DRSHADOW PHMOTION PHYSLEEP SETSOLID TRACKASSEMBLY_ADDITIONS models/shinji85/train/rail_r_switch.mdl "models/shinji85/train/sw_lever.mdl" "buttonswitch" 1 "-100,125,0" "NULL" -1 -1 -1 -1 -1 -1 TRACKASSEMBLY_ADDITIONS models/shinji85/train/rail_r_switch.mdl "models/shinji85/train/rail_r_switcher1.mdl" "prop_dynamic" 2 "NULL" "NULL" 6 6 -1 1 1 6 diff --git a/data/trackassembly/dsv/sv_TRACKASSEMBLY_PHYSPROPERTIES.txt b/data/trackassembly/dsv/sv_TRACKASSEMBLY_PHYSPROPERTIES.txt index 33b915b7..79add3ee 100644 --- a/data/trackassembly/dsv/sv_TRACKASSEMBLY_PHYSPROPERTIES.txt +++ b/data/trackassembly/dsv/sv_TRACKASSEMBLY_PHYSPROPERTIES.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( DSV ): 12/31/15 21:41:32 [ LUA ] +# ExportIntoFile( DSV ): 01/17/16 17:32:16 [ LUA ] # Data settings: TYPE LINEID NAME TRACKASSEMBLY_PHYSPROPERTIES "Special" 1 "default" TRACKASSEMBLY_PHYSPROPERTIES "Special" 2 "default_silent" diff --git a/data/trackassembly/dsv/sv_TRACKASSEMBLY_PIECES.txt b/data/trackassembly/dsv/sv_TRACKASSEMBLY_PIECES.txt index 9bcd92c0..dde5bb70 100644 --- a/data/trackassembly/dsv/sv_TRACKASSEMBLY_PIECES.txt +++ b/data/trackassembly/dsv/sv_TRACKASSEMBLY_PIECES.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( DSV ): 12/31/15 21:41:32 [ LUA ] +# ExportIntoFile( DSV ): 01/17/16 17:32:16 [ LUA ] # Data settings: MODEL TYPE NAME LINEID POINT ORIGIN ANGLE TRACKASSEMBLY_PIECES "models/bobsters_trains/rails/2ft/misc/cross.mdl" "Bobster's two feet rails" "Cross" 1 "83,0,3.015" "83,0,3.015" "0,0,0" TRACKASSEMBLY_PIECES "models/bobsters_trains/rails/2ft/misc/cross.mdl" "Bobster's two feet rails" "Cross" 2 "0.003,83,3.015" "0.003,83,3.015" "0,90,0" @@ -144,6 +144,74 @@ TRACKASSEMBLY_PIECES "models/magtrains1ga/straight_1024.mdl" "Magnum's Rails" "S TRACKASSEMBLY_PIECES "models/magtrains1ga/straight_1024.mdl" "Magnum's Rails" "Straight 1024" 2 "-512,0,-1" "-512,0,-1" "0,180,0" TRACKASSEMBLY_PIECES "models/magtrains1ga/straight_2048.mdl" "Magnum's Rails" "Straight 2048" 1 "1024,0,-1" "1024,0,-1" "0,0,0" TRACKASSEMBLY_PIECES "models/magtrains1ga/straight_2048.mdl" "Magnum's Rails" "Straight 2048" 2 "-1024,0,-1" "-1024,0,-1" "0,180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_cross_128.mdl" "Mr.Train's G-Gauge" "Cross 128" 1 "64,0,1.516" "64,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_cross_128.mdl" "Mr.Train's G-Gauge" "Cross 128" 2 "0,64,1.516" "0,64,1.516" "0,90,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_cross_128.mdl" "Mr.Train's G-Gauge" "Cross 128" 3 "-64,0,1.516" "-64,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_cross_128.mdl" "Mr.Train's G-Gauge" "Cross 128" 4 "0,-64,1.516" "0,-64,1.516" "0,-90,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_1.mdl" "Mr.Train's G-Gauge" "Ramp 1" 1 "16,0,1.516" "16,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_1.mdl" "Mr.Train's G-Gauge" "Ramp 1" 2 "-16,0,3.016" "-16,0,3.016" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_2.mdl" "Mr.Train's G-Gauge" "Ramp 2" 1 "16,0,1.516" "16,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_2.mdl" "Mr.Train's G-Gauge" "Ramp 2" 2 "-16,0,4.516" "-16,0,4.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_3.mdl" "Mr.Train's G-Gauge" "Ramp 3" 1 "16,0,1.516" "16,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_ramp_3.mdl" "Mr.Train's G-Gauge" "Ramp 3" 2 "-16,0,6.016" "-16,0,6.016" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_s_left_22_5.mdl" "Mr.Train's G-Gauge" "S Left 22 5" 1 "256,39,1.516" "256,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_s_left_22_5.mdl" "Mr.Train's G-Gauge" "S Left 22 5" 2 "-256,-39,1.516" "-256,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_s_right_22_5.mdl" "Mr.Train's G-Gauge" "S Right 22 5" 1 "256,-39,1.516" "256,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_s_right_22_5.mdl" "Mr.Train's G-Gauge" "S Right 22 5" 2 "-256,39,1.516" "-256,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_1024.mdl" "Mr.Train's G-Gauge" "Straight 1024" 1 "512,0,1.516" "512,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_1024.mdl" "Mr.Train's G-Gauge" "Straight 1024" 2 "-512,0,1.516" "-512,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_128.mdl" "Mr.Train's G-Gauge" "Straight 128" 1 "64,0,1.516" "64,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_128.mdl" "Mr.Train's G-Gauge" "Straight 128" 2 "-64,0,1.516" "-64,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_2048.mdl" "Mr.Train's G-Gauge" "Straight 2048" 1 "1024,0,1.516" "1024,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_2048.mdl" "Mr.Train's G-Gauge" "Straight 2048" 2 "-1024,0,1.516" "-1024,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_256.mdl" "Mr.Train's G-Gauge" "Straight 256" 1 "128,0,1.516" "128,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_256.mdl" "Mr.Train's G-Gauge" "Straight 256" 2 "-128,0,1.516" "-128,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_32.mdl" "Mr.Train's G-Gauge" "Straight 32" 1 "16,0,1.516" "16,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_32.mdl" "Mr.Train's G-Gauge" "Straight 32" 2 "-16,0,1.516" "-16,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_512.mdl" "Mr.Train's G-Gauge" "Straight 512" 1 "256,0,1.516" "256,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_512.mdl" "Mr.Train's G-Gauge" "Straight 512" 2 "-256,0,1.516" "-256,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_64.mdl" "Mr.Train's G-Gauge" "Straight 64" 1 "32,0,1.516" "32,0,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_straight_64.mdl" "Mr.Train's G-Gauge" "Straight 64" 2 "-32,0,1.516" "-32,0,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 1" 1 "256,39,1.516" "256,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 1" 2 "0,39,1.516" "0,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 1" 3 "-256,-39,1.516" "-256,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 2" 1 "256,39,1.516" "256,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 2" 2 "0,39,1.516" "0,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Left 2" 3 "-256,-39,1.516" "-256,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 1" 1 "256,-39,1.516" "256,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 1" 2 "0,-39,1.516" "0,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 1" 3 "-256,39,1.516" "-256,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 2" 1 "256,-39,1.516" "256,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 2" 2 "0,-39,1.516" "0,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl" "Mr.Train's G-Gauge" "Switch 1 Right 2" 3 "-256,39,1.516" "-256,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 1" 1 "195.938,39,1.516" "195.938,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 1" 2 "195.938,-39,1.516" "195.938,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 1" 3 "-195.937,-39,1.516" "-195.937,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 1" 4 "-195.937,39,1.516" "-195.937,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 2" 1 "195.938,39,1.516" "195.938,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 2" 2 "195.938,-39,1.516" "195.938,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 2" 3 "-195.937,-39,1.516" "-195.937,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Left 2" 4 "-195.937,39,1.516" "-195.937,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 1" 1 "195.938,39,1.516" "195.938,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 1" 2 "195.938,-39,1.516" "195.938,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 1" 3 "-195.937,-39,1.516" "-195.937,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 1" 4 "-195.937,39,1.516" "-195.937,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 2" 1 "195.938,39,1.516" "195.938,39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 2" 2 "195.938,-39,1.516" "195.938,-39,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 2" 3 "-195.937,-39,1.516" "-195.937,-39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl" "Mr.Train's G-Gauge" "Switch 2 Right 2" 4 "-195.937,39,1.516" "-195.937,39,1.516" "0,-180,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_22_5.mdl" "Mr.Train's G-Gauge" "Turn Left 22 5" 1 "263.75,248.25,1.516" "263.75,248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_22_5.mdl" "Mr.Train's G-Gauge" "Turn Left 22 5" 2 "67.855,209.265,1.516" "67.855,209.265,1.516" "0,-157.5,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_45.mdl" "Mr.Train's G-Gauge" "Turn Left 45" 1 "263.75,248.25,1.516" "263.75,248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_45.mdl" "Mr.Train's G-Gauge" "Turn Left 45" 2 "-98.326,98.323,1.516" "-98.326,98.323,1.516" "0,-135,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_90.mdl" "Mr.Train's G-Gauge" "Turn Left 90" 1 "263.75,248.25,1.516" "263.75,248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_left_90.mdl" "Mr.Train's G-Gauge" "Turn Left 90" 2 "-248.25,-263.75,1.516" "-248.25,-263.75,1.516" "0,-90,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_22_5.mdl" "Mr.Train's G-Gauge" "Turn Right 22 5" 1 "263.75,-248.25,1.516" "263.75,-248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_22_5.mdl" "Mr.Train's G-Gauge" "Turn Right 22 5" 2 "67.872,-209.299,1.516" "67.872,-209.299,1.516" "0,157.5,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_45.mdl" "Mr.Train's G-Gauge" "Turn Right 45" 1 "263.75,-248.25,1.516" "263.75,-248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_45.mdl" "Mr.Train's G-Gauge" "Turn Right 45" 2 "-98.302,-98.302,1.516" "-98.302,-98.302,1.516" "0,135,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_90.mdl" "Mr.Train's G-Gauge" "Turn Right 90" 1 "263.75,-248.25,1.516" "263.75,-248.25,1.516" "0,0,0" +TRACKASSEMBLY_PIECES "models/props/g_gauge/track/g_gauge_track_turn_right_90.mdl" "Mr.Train's G-Gauge" "Turn Right 90" 2 "-248.25,263.75,1.516" "-248.25,263.75,1.516" "0,90,0" TRACKASSEMBLY_PIECES "models/props/m_gauge/track/m_gauge_128_cross.mdl" "Mr.Train's M-Gauge" "Cross 128" 1 "64,0,0.016" "64,0,0.016" "0,0,0" TRACKASSEMBLY_PIECES "models/props/m_gauge/track/m_gauge_128_cross.mdl" "Mr.Train's M-Gauge" "Cross 128" 2 "0,64,0.016" "0,64,0.016" "0,90,0" TRACKASSEMBLY_PIECES "models/props/m_gauge/track/m_gauge_128_cross.mdl" "Mr.Train's M-Gauge" "Cross 128" 3 "-64,0,0.016" "-64,0,0.016" "0,-180,0" diff --git a/data/trackassembly/exp/cl_TRACKASSEMBLY_ADDITIONS.txt b/data/trackassembly/exp/cl_TRACKASSEMBLY_ADDITIONS.txt index 6459d2d8..428220c2 100644 --- a/data/trackassembly/exp/cl_TRACKASSEMBLY_ADDITIONS.txt +++ b/data/trackassembly/exp/cl_TRACKASSEMBLY_ADDITIONS.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( INS ): 12/31/15 21:41:25 [ LUA ] +# ExportIntoFile( INS ): 01/17/16 18:43:15 [ LUA ] # Data settings: MODELBASE,MODELADD,ENTCLASS,LINEID,POSOFF,ANGOFF,MOVETYPE,PHYSINIT,DRSHADOW,PHMOTION,PHYSLEEP,SETSOLID asmlib.InsertRecord("ADDITIONS", {"models/shinji85/train/sw_lever.mdl","buttonswitch",1,"-100,125,0","NULL",-1,-1,-1,-1,-1,-1}) asmlib.InsertRecord("ADDITIONS", {"models/shinji85/train/rail_r_switcher1.mdl","prop_dynamic",2,"NULL","NULL",6,6,-1,1,1,6}) diff --git a/data/trackassembly/exp/cl_TRACKASSEMBLY_PHYSPROPERTIES.txt b/data/trackassembly/exp/cl_TRACKASSEMBLY_PHYSPROPERTIES.txt index 2aa9b362..d180823e 100644 --- a/data/trackassembly/exp/cl_TRACKASSEMBLY_PHYSPROPERTIES.txt +++ b/data/trackassembly/exp/cl_TRACKASSEMBLY_PHYSPROPERTIES.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( INS ): 12/31/15 21:41:25 [ LUA ] +# ExportIntoFile( INS ): 01/17/16 18:43:15 [ LUA ] # Data settings: TYPE,LINEID,NAME asmlib.InsertRecord("PHYSPROPERTIES", {"Special",1,"default"}) asmlib.InsertRecord("PHYSPROPERTIES", {"Special",2,"default_silent"}) diff --git a/data/trackassembly/exp/cl_TRACKASSEMBLY_PIECES.txt b/data/trackassembly/exp/cl_TRACKASSEMBLY_PIECES.txt index f598d0bb..641ac925 100644 --- a/data/trackassembly/exp/cl_TRACKASSEMBLY_PIECES.txt +++ b/data/trackassembly/exp/cl_TRACKASSEMBLY_PIECES.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( INS ): 12/31/15 21:41:25 [ LUA ] +# ExportIntoFile( INS ): 01/17/16 18:43:15 [ LUA ] # Data settings: MODEL,TYPE,NAME,LINEID,POINT,ORIGIN,ANGLE asmlib.InsertRecord("PIECES", {"models/bobsters_trains/rails/2ft/misc/cross.mdl","Bobster's two feet rails","Cross",1,"83,0,3.015","83,0,3.015","0,0,0"}) asmlib.InsertRecord("PIECES", {"models/bobsters_trains/rails/2ft/misc/cross.mdl","Bobster's two feet rails","Cross",2,"0.003,83,3.015","0.003,83,3.015","0,90,0"}) @@ -144,6 +144,74 @@ asmlib.InsertRecord("PIECES", {"models/magtrains1ga/straight_1024.mdl","Magnum's Rails","Straight 1024",2,"-512,0,-1","-512,0,-1","0,180,0"}) asmlib.InsertRecord("PIECES", {"models/magtrains1ga/straight_2048.mdl","Magnum's Rails","Straight 2048",1,"1024,0,-1","1024,0,-1","0,0,0"}) asmlib.InsertRecord("PIECES", {"models/magtrains1ga/straight_2048.mdl","Magnum's Rails","Straight 2048",2,"-1024,0,-1","-1024,0,-1","0,180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_cross_128.mdl","Mr.Train's G-Gauge","Cross 128",1,"64,0,1.516","64,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_cross_128.mdl","Mr.Train's G-Gauge","Cross 128",2,"0,64,1.516","0,64,1.516","0,90,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_cross_128.mdl","Mr.Train's G-Gauge","Cross 128",3,"-64,0,1.516","-64,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_cross_128.mdl","Mr.Train's G-Gauge","Cross 128",4,"0,-64,1.516","0,-64,1.516","0,-90,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_1.mdl","Mr.Train's G-Gauge","Ramp 1",1,"16,0,1.516","16,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_1.mdl","Mr.Train's G-Gauge","Ramp 1",2,"-16,0,3.016","-16,0,3.016","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_2.mdl","Mr.Train's G-Gauge","Ramp 2",1,"16,0,1.516","16,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_2.mdl","Mr.Train's G-Gauge","Ramp 2",2,"-16,0,4.516","-16,0,4.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_3.mdl","Mr.Train's G-Gauge","Ramp 3",1,"16,0,1.516","16,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_3.mdl","Mr.Train's G-Gauge","Ramp 3",2,"-16,0,6.016","-16,0,6.016","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_s_left_22_5.mdl","Mr.Train's G-Gauge","S Left 22 5",1,"256,39,1.516","256,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_s_left_22_5.mdl","Mr.Train's G-Gauge","S Left 22 5",2,"-256,-39,1.516","-256,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_s_right_22_5.mdl","Mr.Train's G-Gauge","S Right 22 5",1,"256,-39,1.516","256,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_s_right_22_5.mdl","Mr.Train's G-Gauge","S Right 22 5",2,"-256,39,1.516","-256,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_1024.mdl","Mr.Train's G-Gauge","Straight 1024",1,"512,0,1.516","512,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_1024.mdl","Mr.Train's G-Gauge","Straight 1024",2,"-512,0,1.516","-512,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_128.mdl","Mr.Train's G-Gauge","Straight 128",1,"64,0,1.516","64,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_128.mdl","Mr.Train's G-Gauge","Straight 128",2,"-64,0,1.516","-64,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_2048.mdl","Mr.Train's G-Gauge","Straight 2048",1,"1024,0,1.516","1024,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_2048.mdl","Mr.Train's G-Gauge","Straight 2048",2,"-1024,0,1.516","-1024,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_256.mdl","Mr.Train's G-Gauge","Straight 256",1,"128,0,1.516","128,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_256.mdl","Mr.Train's G-Gauge","Straight 256",2,"-128,0,1.516","-128,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_32.mdl","Mr.Train's G-Gauge","Straight 32",1,"16,0,1.516","16,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_32.mdl","Mr.Train's G-Gauge","Straight 32",2,"-16,0,1.516","-16,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_512.mdl","Mr.Train's G-Gauge","Straight 512",1,"256,0,1.516","256,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_512.mdl","Mr.Train's G-Gauge","Straight 512",2,"-256,0,1.516","-256,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_64.mdl","Mr.Train's G-Gauge","Straight 64",1,"32,0,1.516","32,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_64.mdl","Mr.Train's G-Gauge","Straight 64",2,"-32,0,1.516","-32,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl","Mr.Train's G-Gauge","Switch 1 Left 1",1,"256,39,1.516","256,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl","Mr.Train's G-Gauge","Switch 1 Left 1",2,"0,39,1.516","0,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl","Mr.Train's G-Gauge","Switch 1 Left 1",3,"-256,-39,1.516","-256,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl","Mr.Train's G-Gauge","Switch 1 Left 2",1,"256,39,1.516","256,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl","Mr.Train's G-Gauge","Switch 1 Left 2",2,"0,39,1.516","0,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl","Mr.Train's G-Gauge","Switch 1 Left 2",3,"-256,-39,1.516","-256,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl","Mr.Train's G-Gauge","Switch 1 Right 1",1,"256,-39,1.516","256,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl","Mr.Train's G-Gauge","Switch 1 Right 1",2,"0,-39,1.516","0,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl","Mr.Train's G-Gauge","Switch 1 Right 1",3,"-256,39,1.516","-256,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl","Mr.Train's G-Gauge","Switch 1 Right 2",1,"256,-39,1.516","256,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl","Mr.Train's G-Gauge","Switch 1 Right 2",2,"0,-39,1.516","0,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl","Mr.Train's G-Gauge","Switch 1 Right 2",3,"-256,39,1.516","-256,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl","Mr.Train's G-Gauge","Switch 2 Left 1",1,"195.938,39,1.516","195.938,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl","Mr.Train's G-Gauge","Switch 2 Left 1",2,"195.938,-39,1.516","195.938,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl","Mr.Train's G-Gauge","Switch 2 Left 1",3,"-195.937,-39,1.516","-195.937,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl","Mr.Train's G-Gauge","Switch 2 Left 1",4,"-195.937,39,1.516","-195.937,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl","Mr.Train's G-Gauge","Switch 2 Left 2",1,"195.938,39,1.516","195.938,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl","Mr.Train's G-Gauge","Switch 2 Left 2",2,"195.938,-39,1.516","195.938,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl","Mr.Train's G-Gauge","Switch 2 Left 2",3,"-195.937,-39,1.516","-195.937,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl","Mr.Train's G-Gauge","Switch 2 Left 2",4,"-195.937,39,1.516","-195.937,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl","Mr.Train's G-Gauge","Switch 2 Right 1",1,"195.938,39,1.516","195.938,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl","Mr.Train's G-Gauge","Switch 2 Right 1",2,"195.938,-39,1.516","195.938,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl","Mr.Train's G-Gauge","Switch 2 Right 1",3,"-195.937,-39,1.516","-195.937,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl","Mr.Train's G-Gauge","Switch 2 Right 1",4,"-195.937,39,1.516","-195.937,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl","Mr.Train's G-Gauge","Switch 2 Right 2",1,"195.938,39,1.516","195.938,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl","Mr.Train's G-Gauge","Switch 2 Right 2",2,"195.938,-39,1.516","195.938,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl","Mr.Train's G-Gauge","Switch 2 Right 2",3,"-195.937,-39,1.516","-195.937,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl","Mr.Train's G-Gauge","Switch 2 Right 2",4,"-195.937,39,1.516","-195.937,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_22_5.mdl","Mr.Train's G-Gauge","Turn Left 22 5",1,"263.75,248.25,1.516","263.75,248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_22_5.mdl","Mr.Train's G-Gauge","Turn Left 22 5",2,"67.855,209.265,1.516","67.855,209.265,1.516","0,-157.5,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_45.mdl","Mr.Train's G-Gauge","Turn Left 45",1,"263.75,248.25,1.516","263.75,248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_45.mdl","Mr.Train's G-Gauge","Turn Left 45",2,"-98.326,98.323,1.516","-98.326,98.323,1.516","0,-135,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_90.mdl","Mr.Train's G-Gauge","Turn Left 90",1,"263.75,248.25,1.516","263.75,248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_90.mdl","Mr.Train's G-Gauge","Turn Left 90",2,"-248.25,-263.75,1.516","-248.25,-263.75,1.516","0,-90,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_22_5.mdl","Mr.Train's G-Gauge","Turn Right 22 5",1,"263.75,-248.25,1.516","263.75,-248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_22_5.mdl","Mr.Train's G-Gauge","Turn Right 22 5",2,"67.872,-209.299,1.516","67.872,-209.299,1.516","0,157.5,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_45.mdl","Mr.Train's G-Gauge","Turn Right 45",1,"263.75,-248.25,1.516","263.75,-248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_45.mdl","Mr.Train's G-Gauge","Turn Right 45",2,"-98.302,-98.302,1.516","-98.302,-98.302,1.516","0,135,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_90.mdl","Mr.Train's G-Gauge","Turn Right 90",1,"263.75,-248.25,1.516","263.75,-248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_90.mdl","Mr.Train's G-Gauge","Turn Right 90",2,"-248.25,263.75,1.516","-248.25,263.75,1.516","0,90,0"}) asmlib.InsertRecord("PIECES", {"models/props/m_gauge/track/m_gauge_128_cross.mdl","Mr.Train's M-Gauge","Cross 128",1,"64,0,0.016","64,0,0.016","0,0,0"}) asmlib.InsertRecord("PIECES", {"models/props/m_gauge/track/m_gauge_128_cross.mdl","Mr.Train's M-Gauge","Cross 128",2,"0,64,0.016","0,64,0.016","0,90,0"}) asmlib.InsertRecord("PIECES", {"models/props/m_gauge/track/m_gauge_128_cross.mdl","Mr.Train's M-Gauge","Cross 128",3,"-64,0,0.016","-64,0,0.016","0,-180,0"}) diff --git a/data/trackassembly/exp/sv_TRACKASSEMBLY_ADDITIONS.txt b/data/trackassembly/exp/sv_TRACKASSEMBLY_ADDITIONS.txt index 9b29d289..83eeda61 100644 --- a/data/trackassembly/exp/sv_TRACKASSEMBLY_ADDITIONS.txt +++ b/data/trackassembly/exp/sv_TRACKASSEMBLY_ADDITIONS.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( INS ): 12/31/15 21:41:32 [ LUA ] +# ExportIntoFile( INS ): 01/17/16 17:32:16 [ LUA ] # Data settings: MODELBASE,MODELADD,ENTCLASS,LINEID,POSOFF,ANGOFF,MOVETYPE,PHYSINIT,DRSHADOW,PHMOTION,PHYSLEEP,SETSOLID asmlib.InsertRecord("ADDITIONS", {"models/shinji85/train/sw_lever.mdl","buttonswitch",1,"-100,125,0","NULL",-1,-1,-1,-1,-1,-1}) asmlib.InsertRecord("ADDITIONS", {"models/shinji85/train/rail_r_switcher1.mdl","prop_dynamic",2,"NULL","NULL",6,6,-1,1,1,6}) diff --git a/data/trackassembly/exp/sv_TRACKASSEMBLY_PHYSPROPERTIES.txt b/data/trackassembly/exp/sv_TRACKASSEMBLY_PHYSPROPERTIES.txt index ed5ad67a..fe6e521d 100644 --- a/data/trackassembly/exp/sv_TRACKASSEMBLY_PHYSPROPERTIES.txt +++ b/data/trackassembly/exp/sv_TRACKASSEMBLY_PHYSPROPERTIES.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( INS ): 12/31/15 21:41:32 [ LUA ] +# ExportIntoFile( INS ): 01/17/16 17:32:16 [ LUA ] # Data settings: TYPE,LINEID,NAME asmlib.InsertRecord("PHYSPROPERTIES", {"Special",1,"default"}) asmlib.InsertRecord("PHYSPROPERTIES", {"Special",2,"default_silent"}) diff --git a/data/trackassembly/exp/sv_TRACKASSEMBLY_PIECES.txt b/data/trackassembly/exp/sv_TRACKASSEMBLY_PIECES.txt index 5cc6e9a2..2400e1cc 100644 --- a/data/trackassembly/exp/sv_TRACKASSEMBLY_PIECES.txt +++ b/data/trackassembly/exp/sv_TRACKASSEMBLY_PIECES.txt @@ -1,4 +1,4 @@ -# ExportIntoFile( INS ): 12/31/15 21:41:32 [ LUA ] +# ExportIntoFile( INS ): 01/17/16 17:32:16 [ LUA ] # Data settings: MODEL,TYPE,NAME,LINEID,POINT,ORIGIN,ANGLE asmlib.InsertRecord("PIECES", {"models/bobsters_trains/rails/2ft/misc/cross.mdl","Bobster's two feet rails","Cross",1,"83,0,3.015","83,0,3.015","0,0,0"}) asmlib.InsertRecord("PIECES", {"models/bobsters_trains/rails/2ft/misc/cross.mdl","Bobster's two feet rails","Cross",2,"0.003,83,3.015","0.003,83,3.015","0,90,0"}) @@ -144,6 +144,74 @@ asmlib.InsertRecord("PIECES", {"models/magtrains1ga/straight_1024.mdl","Magnum's Rails","Straight 1024",2,"-512,0,-1","-512,0,-1","0,180,0"}) asmlib.InsertRecord("PIECES", {"models/magtrains1ga/straight_2048.mdl","Magnum's Rails","Straight 2048",1,"1024,0,-1","1024,0,-1","0,0,0"}) asmlib.InsertRecord("PIECES", {"models/magtrains1ga/straight_2048.mdl","Magnum's Rails","Straight 2048",2,"-1024,0,-1","-1024,0,-1","0,180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_cross_128.mdl","Mr.Train's G-Gauge","Cross 128",1,"64,0,1.516","64,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_cross_128.mdl","Mr.Train's G-Gauge","Cross 128",2,"0,64,1.516","0,64,1.516","0,90,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_cross_128.mdl","Mr.Train's G-Gauge","Cross 128",3,"-64,0,1.516","-64,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_cross_128.mdl","Mr.Train's G-Gauge","Cross 128",4,"0,-64,1.516","0,-64,1.516","0,-90,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_1.mdl","Mr.Train's G-Gauge","Ramp 1",1,"16,0,1.516","16,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_1.mdl","Mr.Train's G-Gauge","Ramp 1",2,"-16,0,3.016","-16,0,3.016","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_2.mdl","Mr.Train's G-Gauge","Ramp 2",1,"16,0,1.516","16,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_2.mdl","Mr.Train's G-Gauge","Ramp 2",2,"-16,0,4.516","-16,0,4.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_3.mdl","Mr.Train's G-Gauge","Ramp 3",1,"16,0,1.516","16,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_ramp_3.mdl","Mr.Train's G-Gauge","Ramp 3",2,"-16,0,6.016","-16,0,6.016","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_s_left_22_5.mdl","Mr.Train's G-Gauge","S Left 22 5",1,"256,39,1.516","256,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_s_left_22_5.mdl","Mr.Train's G-Gauge","S Left 22 5",2,"-256,-39,1.516","-256,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_s_right_22_5.mdl","Mr.Train's G-Gauge","S Right 22 5",1,"256,-39,1.516","256,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_s_right_22_5.mdl","Mr.Train's G-Gauge","S Right 22 5",2,"-256,39,1.516","-256,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_1024.mdl","Mr.Train's G-Gauge","Straight 1024",1,"512,0,1.516","512,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_1024.mdl","Mr.Train's G-Gauge","Straight 1024",2,"-512,0,1.516","-512,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_128.mdl","Mr.Train's G-Gauge","Straight 128",1,"64,0,1.516","64,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_128.mdl","Mr.Train's G-Gauge","Straight 128",2,"-64,0,1.516","-64,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_2048.mdl","Mr.Train's G-Gauge","Straight 2048",1,"1024,0,1.516","1024,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_2048.mdl","Mr.Train's G-Gauge","Straight 2048",2,"-1024,0,1.516","-1024,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_256.mdl","Mr.Train's G-Gauge","Straight 256",1,"128,0,1.516","128,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_256.mdl","Mr.Train's G-Gauge","Straight 256",2,"-128,0,1.516","-128,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_32.mdl","Mr.Train's G-Gauge","Straight 32",1,"16,0,1.516","16,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_32.mdl","Mr.Train's G-Gauge","Straight 32",2,"-16,0,1.516","-16,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_512.mdl","Mr.Train's G-Gauge","Straight 512",1,"256,0,1.516","256,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_512.mdl","Mr.Train's G-Gauge","Straight 512",2,"-256,0,1.516","-256,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_64.mdl","Mr.Train's G-Gauge","Straight 64",1,"32,0,1.516","32,0,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_straight_64.mdl","Mr.Train's G-Gauge","Straight 64",2,"-32,0,1.516","-32,0,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl","Mr.Train's G-Gauge","Switch 1 Left 1",1,"256,39,1.516","256,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl","Mr.Train's G-Gauge","Switch 1 Left 1",2,"0,39,1.516","0,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_1.mdl","Mr.Train's G-Gauge","Switch 1 Left 1",3,"-256,-39,1.516","-256,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl","Mr.Train's G-Gauge","Switch 1 Left 2",1,"256,39,1.516","256,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl","Mr.Train's G-Gauge","Switch 1 Left 2",2,"0,39,1.516","0,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_left_2.mdl","Mr.Train's G-Gauge","Switch 1 Left 2",3,"-256,-39,1.516","-256,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl","Mr.Train's G-Gauge","Switch 1 Right 1",1,"256,-39,1.516","256,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl","Mr.Train's G-Gauge","Switch 1 Right 1",2,"0,-39,1.516","0,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_1.mdl","Mr.Train's G-Gauge","Switch 1 Right 1",3,"-256,39,1.516","-256,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl","Mr.Train's G-Gauge","Switch 1 Right 2",1,"256,-39,1.516","256,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl","Mr.Train's G-Gauge","Switch 1 Right 2",2,"0,-39,1.516","0,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_1_right_2.mdl","Mr.Train's G-Gauge","Switch 1 Right 2",3,"-256,39,1.516","-256,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl","Mr.Train's G-Gauge","Switch 2 Left 1",1,"195.938,39,1.516","195.938,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl","Mr.Train's G-Gauge","Switch 2 Left 1",2,"195.938,-39,1.516","195.938,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl","Mr.Train's G-Gauge","Switch 2 Left 1",3,"-195.937,-39,1.516","-195.937,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_1.mdl","Mr.Train's G-Gauge","Switch 2 Left 1",4,"-195.937,39,1.516","-195.937,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl","Mr.Train's G-Gauge","Switch 2 Left 2",1,"195.938,39,1.516","195.938,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl","Mr.Train's G-Gauge","Switch 2 Left 2",2,"195.938,-39,1.516","195.938,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl","Mr.Train's G-Gauge","Switch 2 Left 2",3,"-195.937,-39,1.516","-195.937,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_left_2.mdl","Mr.Train's G-Gauge","Switch 2 Left 2",4,"-195.937,39,1.516","-195.937,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl","Mr.Train's G-Gauge","Switch 2 Right 1",1,"195.938,39,1.516","195.938,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl","Mr.Train's G-Gauge","Switch 2 Right 1",2,"195.938,-39,1.516","195.938,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl","Mr.Train's G-Gauge","Switch 2 Right 1",3,"-195.937,-39,1.516","-195.937,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_1.mdl","Mr.Train's G-Gauge","Switch 2 Right 1",4,"-195.937,39,1.516","-195.937,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl","Mr.Train's G-Gauge","Switch 2 Right 2",1,"195.938,39,1.516","195.938,39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl","Mr.Train's G-Gauge","Switch 2 Right 2",2,"195.938,-39,1.516","195.938,-39,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl","Mr.Train's G-Gauge","Switch 2 Right 2",3,"-195.937,-39,1.516","-195.937,-39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_switch_2_right_2.mdl","Mr.Train's G-Gauge","Switch 2 Right 2",4,"-195.937,39,1.516","-195.937,39,1.516","0,-180,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_22_5.mdl","Mr.Train's G-Gauge","Turn Left 22 5",1,"263.75,248.25,1.516","263.75,248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_22_5.mdl","Mr.Train's G-Gauge","Turn Left 22 5",2,"67.855,209.265,1.516","67.855,209.265,1.516","0,-157.5,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_45.mdl","Mr.Train's G-Gauge","Turn Left 45",1,"263.75,248.25,1.516","263.75,248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_45.mdl","Mr.Train's G-Gauge","Turn Left 45",2,"-98.326,98.323,1.516","-98.326,98.323,1.516","0,-135,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_90.mdl","Mr.Train's G-Gauge","Turn Left 90",1,"263.75,248.25,1.516","263.75,248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_left_90.mdl","Mr.Train's G-Gauge","Turn Left 90",2,"-248.25,-263.75,1.516","-248.25,-263.75,1.516","0,-90,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_22_5.mdl","Mr.Train's G-Gauge","Turn Right 22 5",1,"263.75,-248.25,1.516","263.75,-248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_22_5.mdl","Mr.Train's G-Gauge","Turn Right 22 5",2,"67.872,-209.299,1.516","67.872,-209.299,1.516","0,157.5,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_45.mdl","Mr.Train's G-Gauge","Turn Right 45",1,"263.75,-248.25,1.516","263.75,-248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_45.mdl","Mr.Train's G-Gauge","Turn Right 45",2,"-98.302,-98.302,1.516","-98.302,-98.302,1.516","0,135,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_90.mdl","Mr.Train's G-Gauge","Turn Right 90",1,"263.75,-248.25,1.516","263.75,-248.25,1.516","0,0,0"}) + asmlib.InsertRecord("PIECES", {"models/props/g_gauge/track/g_gauge_track_turn_right_90.mdl","Mr.Train's G-Gauge","Turn Right 90",2,"-248.25,263.75,1.516","-248.25,263.75,1.516","0,90,0"}) asmlib.InsertRecord("PIECES", {"models/props/m_gauge/track/m_gauge_128_cross.mdl","Mr.Train's M-Gauge","Cross 128",1,"64,0,0.016","64,0,0.016","0,0,0"}) asmlib.InsertRecord("PIECES", {"models/props/m_gauge/track/m_gauge_128_cross.mdl","Mr.Train's M-Gauge","Cross 128",2,"0,64,0.016","0,64,0.016","0,90,0"}) asmlib.InsertRecord("PIECES", {"models/props/m_gauge/track/m_gauge_128_cross.mdl","Mr.Train's M-Gauge","Cross 128",3,"-64,0,0.016","-64,0,0.016","0,-180,0"}) diff --git a/lua/autorun/trackassembly_init.lua b/lua/autorun/trackassembly_init.lua index 2fc34395..350fae62 100644 --- a/lua/autorun/trackassembly_init.lua +++ b/lua/autorun/trackassembly_init.lua @@ -14,6 +14,7 @@ local RealTime = RealTime local bitBor = bit and bit.bor local vguiCreate = vgui and vgui.Create local fileExists = file and file.Exists +local stringExplode = string and string.Explode local surfaceScreenWidth = surface and surface.ScreenWidth local surfaceScreenHeight = surface and surface.ScreenHeight local duplicatorStoreEntityModifier = duplicator and duplicator.StoreEntityModifier @@ -26,7 +27,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.172") +asmlib.SetOpVar("TOOL_VERSION","5.173") 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")) @@ -35,7 +36,7 @@ asmlib.SetOpVar("MAX_MASS",50000) asmlib.SetOpVar("MAX_LINEAR",1000) asmlib.SetOpVar("MAX_ROTATION",360) asmlib.SetOpVar("LOG_ONLY",nil) -asmlib.SetOpVar("LOG_SKIP",{"Qsort","ModelToName","ArrayCount"}) +asmlib.SetOpVar("LOG_SKIP",{"Qsort","ModelToName","GetEntitySpawn: Not hitting active point"}) asmlib.SetLogControl(0,"") ------ CONFIGURE REPLICATED CVARS ----- Server tells the client what value to use @@ -63,7 +64,7 @@ local gsToolNameU = asmlib.GetOpVar("TOOLNAME_NU") local gsPathBAS = asmlib.GetOpVar("DIRPATH_BAS") local gsPathDSV = asmlib.GetOpVar("DIRPATH_DSV") local gsFullDSV = gsPathBAS..gsPathDSV..asmlib.GetInstPref()..gsToolPrefU -local gaTimerSet = asmlib.ExplodeString(asmlib.GetCoVar("timermode","STR"),asmlib.GetOpVar("OPSYM_DIRECTORY")) +local gaTimerSet = stringExplode(asmlib.GetOpVar("OPSYM_DIRECTORY"),asmlib.GetCoVar("timermode","STR")) -------- ACTIONS ---------- if(SERVER) then @@ -174,7 +175,7 @@ if(CLIENT) then local uiAng = Angle(0, RealTime() * 10, 0) local uiPos = Vector() if(uiKept > 1) then - local uiCalc = asmlib.GetCenterPoint(uiRec,"P") + local uiCalc = asmlib.GetCorePoint(uiRec,"P") if(not asmlib.IsExistent(uiCalc)) then return asmlib.StatusLog(false,"OPEN_FRAME: ModelPanel.LayoutEntity: Center point non-applicable") end asmlib.SetVector(uiPos,uiCalc) elseif(uiKept == 1) then @@ -238,7 +239,7 @@ if(CLIENT) then local uiKept = tonumber(uiRec.Kept) or 0 local uiCen = Vector() if(uiKept > 1) then - local uiCalc = asmlib.GetCenterPoint(uiRec,"P") + local uiCalc = asmlib.GetCorePoint(uiRec,"P") if(not asmlib.IsExistent(uiCalc)) then return asmlib.StatusLog(false,"OPEN_FRAME: ListView.OnRowSelected: Center point non-applicable") end asmlib.SetVector(uiCen,uiCalc) elseif(uiKept == 1) then diff --git a/lua/trackassembly/trackasmlib.lua b/lua/trackassembly/trackasmlib.lua index 83ab4830..5ed994ba 100644 --- a/lua/trackassembly/trackasmlib.lua +++ b/lua/trackassembly/trackasmlib.lua @@ -107,6 +107,7 @@ local timerExists = timer and timer.Exists local timerCreate = timer and timer.Create local timerDestroy = timer and timer.Destroy local tableEmpty = table and table.Empty +local tableMaxn = table and table.maxn local stringLen = string and string.len local stringSub = string and string.sub local stringFind = string and string.find @@ -114,6 +115,9 @@ local stringGsub = string and string.gsub local stringUpper = string and string.upper local stringLower = string and string.lower local stringFormat = string and string.format +local stringExplode = string and string.Explode +local stringImplode = string and string.Implode +local stringToFileName = string and string.GetFileFromFilename local surfaceSetFont = surface and surface.SetFont local surfaceDrawLine = surface and surface.DrawLine local surfaceDrawText = surface and surface.DrawText @@ -871,7 +875,7 @@ local function AddLineListView(pnListView,frUsed,ivNdex) local nUsed = RoundValue(tValue.Value,0.001) local pnRec = pnListView:AddLine(nUsed,nAct,sType,sModel) if(not IsExistent(pnRec)) then - return StatusLog(false,"LineAddListView: Failed to create a ListView line for <"..sModel.."> #"..tostring(iNdex)) end + return StatusLog(nil,"LineAddListView: Failed to create a ListView line for <"..sModel.."> #"..tostring(iNdex)) end return pnRec, tValue end @@ -1120,7 +1124,7 @@ function ModelToName(sModel) local fCh, bCh, Cnt = "", "", 1 local sSymDiv = GetOpVar("OPSYM_DIVIDER") local sSymDir = GetOpVar("OPSYM_DIRECTORY") - local sModel = stringGsub(StringToFile(sModel),GetOpVar("FILE_MODEL"),"") + local sModel = stringGsub(stringToFileName(sModel),GetOpVar("FILE_MODEL"),"") local gModel = stringSub(sModel,1,-1) -- Create a copy so we can select cut-off parts later on local tCut, tSub, tApp = SettingsModelToName("GET") if(tCut and tCut[1]) then @@ -1234,7 +1238,7 @@ local function TransferPOA(stOffset,sMode) if(not IsExistent(stOffset)) then return StatusLog(nil,"TransferPOA: Destination needed") end if(not IsString(sMode)) then - return StatusLog(nil,"TransferPOA: Mode {"..type(sMode).."}<"tostring(sMode)"> not string") end + return StatusLog(nil,"TransferPOA: Mode {"..type(sMode).."}<"..tostring(sMode).."> not string") end local arPOA = GetOpVar("ARRAY_DECODEPOA") if(sMode == "V") then stOffset[cvX] = arPOA[1] @@ -1465,52 +1469,6 @@ function DefaultString(sBase, sDefault) return "" end -function ExplodeString(sStr,sDelim) - if(not (IsString(sStr) and IsString(sDelim))) then - return StatusLog(nil,"ExplodeString: All parameters should be strings") - end - if(IsEmptyString(sDelim)) then - return StatusLog(nil,"ExplodeString: Missing string exploding delimiter") - end - local sStr = sStr - local sDelim = stringSub(sDelim,1,1) - if(stringSub(sStr,-1,-1) ~= sDelim) then -- Triggers on the delimiter - sStr = sStr..sDelim - end - local Data = {} - local lenStr = stringLen(sStr) - local S, E, I, V = 1, 1, 1, "" - while(E <= lenStr) do - local Ch = stringSub(sStr,E,E) - if(Ch == sDelim) then - V = stringSub(sStr,S,E-1) - S = E + 1 - Data[I] = V or "" - I = I + 1 - end - E = E + 1 - end - return Data -end - -function ImplodeString(tParts,sDelim) - if(not (tParts and tParts[1])) then return "" end - if(not IsString(sDelim)) then - return StatusLog(nil,"ImplodeString: The delimiter {"..type(sDelim).."}<"..tostring(sDelim).."> not string") - end - local iCnt = 1 - local sImplode = "" - local sDelim = stringSub(tostring(sDelim),1,1) - while(tParts[iCnt]) do - sImplode = sImplode..tostring(tParts[iCnt]) - if(tParts[iCnt+1]) then - sImplode = sImplode..sDelim - end - iCnt = iCnt + 1 - end - return sImplode -end - function PadString(sStr,sPad,ivCnt) if(not IsString(sStr)) then return StatusLog("" ,"PadString: String {"..type(sStr).."}<"..tostring(sStr).."> not string") end @@ -1541,7 +1499,7 @@ function StringToBGID(sStr) if(IsEmptyString(sStr)) then return StatusLog(nil, "StringToBGID: Empty string") end local Cnt = 1 - local Data = ExplodeString(sStr,GetOpVar("OPSYM_SEPARATOR")) + local Data = stringExplode(GetOpVar("OPSYM_SEPARATOR"),sStr) while(Data[Cnt]) do local Num = tonumber(Data[Cnt]) if(not IsExistent(Num)) then @@ -1556,25 +1514,6 @@ function StringToBGID(sStr) return StatusLog(nil, "StringToBGID: No data found") end ---[[ - * Extracts the file name from a path - * props/models/example/wheel.mdl --> wheel.mdl -]]-- -function StringToFile(sPath) - if(not IsString(sPath)) then - return StatusLog(GetOpVar("MISS_NOAV"),"StringToFile: Path {"..type(sPath).."}<"..tostring(sPath).."> not string") end - if(IsEmptyString(sPath)) then - return StatusLog(GetOpVar("MISS_NOAV"),"StringToFile: Path is empty") end - local sSymDir = GetOpVar("OPSYM_DIRECTORY") - local New = stringFind(sPath,sSymDir,1) - if(not IsExistent(New))then return sPath end - local Old = 0 - while(New) do Old = New - New = stringFind(sPath,sSymDir,New+1) - end - return stringSub(sPath,Old+1,-1) -end - ----------------- PRINTS ------------------------ function Print(tT,sS) @@ -1614,79 +1553,7 @@ function Print(tT,sS) end end -function ArrayPrint(arArr,sName,nCol) - if(not IsExistent(arArr)) then - return StatusLog(0,"ArrayPrint: Array missing") end - if(not (type(arArr) == "table")) then - return StatusLog(0,"ArrayPrint: Array is "..type(arArr)) end - if(not arArr[1]) then - return StatusLog(0,"ArrayPrint: Array empty") end - local Cnt, Next = 1 - local Col, Max, Cols = 0, 0, 0 - local Line = (sName or "Data").." = { \n" - local Pad = PadString(" "," ",stringLen(Line)-1) - local symSep = GetOpVar("OPSYM_SEPARATOR") - while(arArr[Cnt]) do - Col = stringLen(tostring(arArr[Cnt])) - if(Col > Max) then - Max = Col - end - Cnt = Cnt + 1 - end - Col = mathClamp((tonumber(nCol) or 1),1,100) - Cols = Col-1 - Cnt = 1 - while(arArr[Cnt]) do - Next = arArr[Cnt + 1] - if(nCol and Cols == Col-1) then - Line = Line..Pad - end - Line = Line..PadString(tostring(arArr[Cnt])," ",-Max-1) - if(Next) then - Line = Line..symSep - end - if(nCol and Cols == 0) then - Cols = Col - 1 - if(Next) then - Line = Line.."\n" - end - elseif(nCol and Cols > 0) then - Cols = Cols - 1 - end - Cnt = Cnt + 1 - end - LogInstance(Line.."\n}") -end - -local function ArrayCount(arArr) - if(not IsExistent(arArr)) then - return StatusLog(nil,"ArrayCount: Array missing") end - if(not (type(arArr) == "table")) then - return StatusLog(nil,"ArrayCount: Array is "..type(arArr)) end - if(not IsExistent(arArr[1])) then - return StatusLog(0,"ArrayCount: Table is empty or hash based") end - local Count = 1 - while(arArr[Count]) do Count = Count + 1 end - return (Count - 1) -end - -local function IsArrayOr(arArr,ivEnd) - if(not IsExistent(arArr)) then - return StatusLog(nil,"IsArrayOr: Array missing") end - if(not (type(arArr) == "table")) then - return StatusLog(nil,"IsArrayOr: Array is "..type(arArr)) end - local iEnd = tonumber(ivEnd) - if(not IsExistent(iEnd)) then - return StatusLog(nil,"IsArrayOr: End NAN {" - ..type(ivEnd).."}<"..tostring(ivEnd)..">") end - local iCnt, bFlg = 1, false - while(iCnt <= iEnd) do - bFlg = bFlg or (arArr[iCnt] and true or false) - iCnt = iCnt + 1 - end return bFlg -end - -------------- Variable Interfaces -------------- +------------- VARIABLE INTERFACES -------------- local function SQLBuildError(anyError) if(not IsExistent(anyError)) then @@ -1729,11 +1596,11 @@ end ------------------------- PLAYER ----------------------------------- -function ConCommandPly(pPly,sCvar,anyValue) +function ConCommandPly(pPly,sCvar,snValue) if(not pPly) then return StatusLog("","StringConCmd: Player invalid") end if(not IsString(sCvar)) then return StatusLog("","StringConCmd: Convar {"..type(sCvar).."}<"..tostring(sCvar).."> not string") end - return pPly:ConCommand(GetOpVar("TOOLNAME_PL")..sCvar.." "..tostring(sValue).."\n") + return pPly:ConCommand(GetOpVar("TOOLNAME_PL")..sCvar.." "..tostring(snValue).."\n") end function PrintNotifyPly(pPly,sText,sNotifType) @@ -1744,23 +1611,23 @@ function PrintNotifyPly(pPly,sText,sNotifType) end end -function UndoCratePly(sMessage) - SetOpVar("LABEL_UNDO",tostring(sMessage)) +function UndoCratePly(anyMessage) + SetOpVar("LABEL_UNDO",tostring(anyMessage)) undoCreate(GetOpVar("LABEL_UNDO")) return true end function UndoAddEntityPly(oEnt) if(not (oEnt and oEnt:IsValid())) then - return StatusLog(false,"AddUndoPly: Entity invalid") + return StatusLog(false,"AddUndoPly: Entity invalid") end undoAddEntity(oEnt) return true end -function UndoFinishPly(pPly,sMessage) +function UndoFinishPly(pPly,anyMessage) if(not pPly) then return StatusLog(false,"UndoFinishPly: Player invalid") end pPly:EmitSound("physics/metal/metal_canister_impact_hard"..mathFloor(mathRandom(3))..".wav") - undoSetCustomUndoText(GetOpVar("LABEL_UNDO")..tostring(sMessage or "")) + undoSetCustomUndoText(GetOpVar("LABEL_UNDO")..tostring(anyMessage or "")) undoSetPlayer(pPly) undoFinish() return true @@ -1846,7 +1713,7 @@ local function MatchType(defTable,snValue,ivIndex,bQuoted,sQuote,bStopRevise,bSt local sModeDB = GetOpVar("MODE_DATABASE") if(tipField == "TEXT") then snOut = tostring(snValue) - if(not bStopEmpty and (snOut == "nil" or IsEmptyString(snOut)) then + if(not bStopEmpty and (snOut == "nil" or IsEmptyString(snOut))) then if (sModeDB == "SQL") then snOut = "NULL" elseif(sModeDB == "LUA") then snOut = "NULL" else return StatusLog(nil,"MatchType: Wrong database mode <"..sModeDB..">") end @@ -2200,20 +2067,22 @@ function CreateTable(sTable,defTable,bDelete,bReload) return StatusLog(false,"CreateTable: Table key {"..type(sTable).."}<"..tostring(sTable).."> not string") end if(not (type(defTable) == "table")) then return StatusLog(false,"CreateTable: Table definition missing for "..sTable) end - defTable.Size = ArrayCount(defTable) - if(defTable.Size <= 0) then - return StatusLog(false,"CreateTable: Record definition empty for "..sTable) end + if(#defTable <= 0) then + return StatusLog(false,"CreateTable: Record definition missing for "..sTable) end + if(#defTable ~= tableMaxn(defTable)) then + return StatusLog(false,"CreateTable: Record definition mismatch for "..sTable) end + defTable.Size = #defTable local sModeDB = GetOpVar("MODE_DATABASE") local sTable = stringUpper(sTable) defTable.Name = GetOpVar("TOOLNAME_PU")..sTable SetOpVar("DEFTABLE_"..sTable,defTable) - local sDisable = GetOpVar("OPSYM_DISABLE") + local symDis = GetOpVar("OPSYM_DISABLE") local namTable = defTable.Name local Cnt, defField = 1, nil while(defTable[Cnt]) do defField = defTable[Cnt] - defField[3] = DefaultString(tostring(defField[3] or sDisable), sDisable) - defField[4] = DefaultString(tostring(defField[4] or sDisable), sDisable) + defField[3] = DefaultString(tostring(defField[3] or symDis), symDis) + defField[4] = DefaultString(tostring(defField[4] or symDis), symDis) Cnt = Cnt + 1 end libCache[namTable] = {} @@ -2419,7 +2288,7 @@ function TimerSetting(sTimerSet) -- Generates a timer settings table and keeps t return StatusLog(nil,"TimerSetting: Timer set missing for setup") end if(not IsString(sTimerSet)) then return StatusLog(nil,"TimerSetting: Timer set {"..type(sTimerSet).."}<"..tostring(sTimerSet).."> not string") end - local tBoom = ExplodeString(sTimerSet,GetOpVar("OPSYM_REVSIGN")) + local tBoom = stringExplode(GetOpVar("OPSYM_REVSIGN"),sTimerSet) tBoom[1] = tostring(tBoom[1] or "CQT") tBoom[2] = (tonumber(tBoom[2]) or 0) tBoom[3] = ((tonumber(tBoom[3]) or 0) ~= 0) and true or false @@ -2466,7 +2335,7 @@ local function TimerAttach(oLocation,tKeys,defTable,anyMessage) end return StatusLog(Place[Key],"TimerAttach: Place["..tostring(Key).."].Load = "..tostring(Place[Key].Load)) elseif(sModeTM == "OBJ") then - local TimerID = ImplodeString(tKeys,"_") + local TimerID = stringImplode(GetOpVar("OPSYM_DIVIDER"),tKeys) LogInstance("TimerAttach: TimID <"..TimerID..">") if(timerExists(TimerID)) then return StatusLog(Place[Key],"TimerAttach: Timer exists") end timerCreate(TimerID, nLifeTM, 1, function() @@ -2515,7 +2384,7 @@ local function TimerRestart(oLocation,tKeys,defTable,anyMessage) if(sModeTM == "CQT") then sModeTM = "CQT" -- Just for something to do here and to be known that this is mode CQT elseif(sModeTM == "OBJ") then - local keyTimerID = ImplodeString(tKeys,GetOpVar("OPSYM_DIVIDER")) + local keyTimerID = stringImplode(GetOpVar("OPSYM_DIVIDER"),tKeys) if(not timerExists(keyTimerID)) then return StatusLog(nil,"TimerRestart: Timer missing <"..keyTimerID..">") end timerStart(keyTimerID) @@ -2553,7 +2422,7 @@ function CacheQueryPiece(sModel) else local sModeDB = GetOpVar("MODE_DATABASE") if(sModeDB == "SQL") then - LogInstance("CacheQueryPiece: Model >> Pool <"..StringToFile(sModel)..">") + LogInstance("CacheQueryPiece: Model >> Pool <"..stringToFileName(sModel)..">") Cache[sModel] = {} stPiece = Cache[sModel] stPiece.Kept = 0 @@ -2614,7 +2483,7 @@ function CacheQueryAdditions(sModel) else local sModeDB = GetOpVar("MODE_DATABASE") if(sModeDB == "SQL") then - LogInstance("CacheQueryAdditions: Model >> Pool <"..StringToFile(sModel)..">") + LogInstance("CacheQueryAdditions: Model >> Pool <"..stringToFileName(sModel)..">") Cache[sModel] = {} stAddition = Cache[sModel] stAddition.Kept = 0 @@ -2782,31 +2651,35 @@ function CacheQueryProperty(sType) end end -function GetCenterPoint(oRec,sO) - if(not IsString(sO)) then - return StatusLog(nil,"GetCenterPoint: Offset {"..type(sO).."}<"..tostring(sO).."> not string") end - local sO = stringSub(sO,1,1) - if((sO ~= "P") and (sO ~= "O")) then - return StatusLog(nil,"GetCenterPoint: Wrong offset name") end - local stPOA = LocatePOA(oRec,1) - if(not IsExistent(stPOA)) then - return StatusLog(nil,"GetCenterPoint: First point missing") end - local iInd, vCen = 1, Vector() - while(stPOA) do - local arOff = stPOA[sO] - if(not IsExistent(arOff)) then - return StatusLog(nil,"GetCenterPoint: Offset <"..sO.."> not found for point #" - ..tostring(iInd).." and slot <"..tostring(oRec.Slot)..">") end - AddVectorXYZ(vCen,arOff[cvX],arOff[cvY],arOff[cvZ]) - iInd = iInd + 1 - stPOA = LocatePOA(oRec,iInd) - if(not IsExistent(stPOA)) then - return StatusLog(nil,"GetCenterPoint: Point #"..tostring(iInd).." missing from record") end - end - if(iInd > 1) then - vCen:Mul(1/(iInd-1)) +function GetCorePoint(oRec,sName) + if(not IsString(sName)) then + return StatusLog(nil,"GetCorePoint: Offset {"..type(sName).."}<"..tostring(sName).."> not string") end + local sName = stringSub(sName,1,1) + if((sName ~= "P") and (sName ~= "O")) then + return StatusLog(nil,"GetCorePoint: Wrong offset name <"..sName..">") end + if(not IsExistent(oRec.Core)) then oRec.Core = {} end + local vCore = oRec.Core[sName] + if(IsExistent(vCore)) then + return vCore + else + oRec.Core[sName] = Vector() + local iInd, vCore = 1, oRec.Core[sName] + while(iInd <= oRec.Kept) do + local stPOA = LocatePOA(oRec,iInd) + if(not IsExistent(stPOA)) then -- Does the registered point really persists + return StatusLog(nil,"GetCorePoint: Point #"..tostring(iInd).." index mismatch") end + local arOff = stPOA[sName] + if(not IsExistent(arOff)) then + return StatusLog(nil,"GetCorePoint: Offset <"..sName.."> not found for point #" + ..tostring(iInd).." and slot <"..tostring(oRec.Slot)..">") end + AddVectorXYZ(vCore,arOff[cvX],arOff[cvY],arOff[cvZ]) + iInd = iInd + 1 + end + if(iInd > 1) then + vCore:Mul(1/(iInd-1)) + end + return StatusLog(vCore,"GetCorePoint: From cache <"..sName.."> = ["..tostring(vCore).."]") end - return vCen end ---------------------- AssemblyLib EXPORT -------------------------------- @@ -2868,7 +2741,7 @@ function ImportFromDSV(sTable,sDelim,bCommit,sPrefix) end if(not (stringSub(Line,1,1) == SymOff)) then if(stringSub(Line,1,TabLen) == namTable) then - local Data = ExplodeString(stringSub(Line,TabLen+2,LinLen),sDelim) + local Data = stringExplode(sDelim,stringSub(Line,TabLen+2,LinLen)) for k,v in pairs(Data) do local vLen = stringLen(v) if(stringSub(v,1,1) == "\"" and stringSub(v,vLen,vLen) == "\"") then @@ -3151,7 +3024,7 @@ function GetEntitySpawn(trEnt,trHitPos,shdModel,ivhdPointID, if(not IsExistent(nActRadius)) then return StatusLog(nil,"GetEntitySpawn: Active radius NAN {"..type(nvActRadius).."}<"..tostring(nvActRadius)..">") end local trRec = CacheQueryPiece(trEnt:GetModel()) - if(not IsExistent(hdRec)) then + if(not IsExistent(trRec)) then return StatusLog(nil,"GetEntitySpawn: Trace model missing <"..trEnt:GetModel()..">") end if(not IsExistent(LocatePOA(trRec,1))) then return StatusLog(nil,"GetEntitySpawn: Trace has no points") end @@ -3454,7 +3327,7 @@ function MakePiece(sModel,vPos,aAng,nMass,sBgSkIDs,clColor) end phPiece:EnableMotion(false) phPiece:SetMass(mathClamp(tonumber(nMass) or 1,1,GetOpVar("MAX_MASS"))) - local BgSk = ExplodeString((sBgSkIDs or ""),GetOpVar("OPSYM_DIRECTORY")) + local BgSk = stringExplode(GetOpVar("OPSYM_DIRECTORY"),(sBgSkIDs or "")) ePiece:SetSkin(mathClamp(tonumber(BgSk[2]) or 0,0,ePiece:SkinCount()-1)) if(not AttachBodyGroups(ePiece,BgSk[1] or "")) then ePiece:Remove() @@ -3499,7 +3372,7 @@ function ApplyPhysicalSettings(ePiece,nPi,nFr,nGr,sPh) if(not (ePiece and ePiece:IsValid())) then return StatusLog(false,"ApplyPhysicalSettings: Piece entity not valid") end -- Initialize dupe settings using this array - local dataSettings = {0} + local dataSettings = {} if(nPi ~= 0) then ePiece.PhysgunDisabled = true ePiece:SetUnFreezable(true) @@ -3513,7 +3386,7 @@ function ApplyPhysicalSettings(ePiece,nPi,nFr,nGr,sPh) if(nGr ~= 0) then constructSetPhysProp(nil,ePiece,0,pyPiece,{GravityToggle = true }) else constructSetPhysProp(nil,ePiece,0,pyPiece,{GravityToggle = false}) end if(sPh ~= "") then constructSetPhysProp(nil,ePiece,0,pyPiece,{Material = sPh}) end - if(IsArrayOr(dataSettings,1)) then -- Are there any settings to be saved + if(tableMaxn(dataSettings) > 0) then -- Are there any settings to be saved duplicatorStoreEntityModifier(ePiece,GetOpVar("TOOLNAME_PL").."dupe_phys_set",dataSettings) end return StatusLog(true,"ApplyPhysicalSettings: Success") end diff --git a/lua/weapons/gmod_tool/stools/trackassembly.lua b/lua/weapons/gmod_tool/stools/trackassembly.lua index f3f4f7d6..b2566207 100644 --- a/lua/weapons/gmod_tool/stools/trackassembly.lua +++ b/lua/weapons/gmod_tool/stools/trackassembly.lua @@ -25,6 +25,8 @@ local fileExists = file and file.Exists local stringSub = string and string.sub local stringUpper = string and string.upper local stringLower = string and string.lower +local stringExplode = string and string.Explode +local stringToFileName = string and string.GetFileFromFilename local cleanupRegister = cleanup and cleanup.Register local languageAdd = language and language.Add local languageGetPhrase = language and language.GetPhrase @@ -66,6 +68,7 @@ local gsNoMD = asmlib.GetOpVar("MISS_NOMD") -- No model local gsSymRev = asmlib.GetOpVar("OPSYM_REVSIGN") local gsSymDir = asmlib.GetOpVar("OPSYM_DIRECTORY") local gsNoAnchor = gsNoID..gsSymRev..gsNoMD +local gsErrorPad = "\n " --- Render Base Colours local conPalette = asmlib.MakeContainer("Colours") @@ -297,7 +300,7 @@ function TOOL:SetAnchor(stTrace) if(not (phEnt and phEnt:IsValid())) then return asmlib.StatusLog(false,"TOOL:SetAnchor(): Trace no physics") end local plPly = self:GetOwner() if(not (plPly and plPly:IsValid())) then return asmlib.StatusLog(false,"TOOL:SetAnchor(): Player invalid") end - local sAnchor = trEnt:EntIndex()..gsSymRev..asmlib.StringToFile(trEnt:GetModel()) + local sAnchor = trEnt:EntIndex()..gsSymRev..stringToFileName(trEnt:GetModel()) trEnt:SetRenderMode(RENDERMODE_TRANSALPHA) trEnt:SetColor(conPalette:Select("an")) self:SetObject(1,trEnt,stTrace.HitPos,phEnt,stTrace.PhysicsBone,stTrace.HitNormal) @@ -339,16 +342,16 @@ function TOOL:LeftClick(stTrace) local staatts = self:GetStackAttempts() local ignphysgn = self:GetIgnorePhysgun() local bnderrmod = self:GetBoundErrorMode() - local fnmodel = asmlib.StringToFile(model) + local fnmodel = stringToFileName(model) local aninfo , anEnt = self:GetAnchor() local pointid, pnextid = self:GetPointID() local nextx , nexty , nextz = self:GetPosOffsets() local nextpic, nextyaw, nextrol = self:GetAngOffsets() asmlib.LoadKeyPly(ply) if(stTrace.HitWorld) then -- Spawn it on the map ... - local errInfo = "\n MCspawn: "..mcspawn - .."\n Player : "..ply:GetName() - .."\n hdModel: "..fnmodel + local errInfo = gsErrorPad.."MCspawn: "..mcspawn + ..gsErrorPad.."Player : "..ply:GetName() + ..gsErrorPad.."hdModel: "..fnmodel local ePiece = asmlib.MakePiece(model,stTrace.HitPos,ANG_ZERO,mass,bgskids,conPalette:Select("w")) if(ePiece) then local aAng = asmlib.GetNormalAngle(ply,stTrace,surfsnap,ydegsnp) @@ -366,7 +369,7 @@ function TOOL:LeftClick(stTrace) aAng:RotateAroundAxis(aAng:Forward(), nextrol) ePiece:SetAngles(aAng) if(not asmlib.SetBoundPos(ePiece,vPos,ply,bnderrmod,"TOOL:LeftClick(HitWorld)" - .."\n Event : Spawning when HitWorld"..errInfo)) then return false end + ..gsErrorPad.."Event : Spawning when HitWorld"..errInfo)) then return false end else -- Spawn on Active point local stSpawn = asmlib.GetNormalSpawn(stTrace.HitPos,aAng,model, pointid,nextx,nexty,nextz,nextpic,nextyaw,nextrol) @@ -374,7 +377,7 @@ function TOOL:LeftClick(stTrace) return asmlib.StatusLog(false,"TOOL:LeftClick(HitWorld): No spawn data"..errInfo) end stSpawn.SPos:Add(asmlib.PointOffsetUp(ePiece,pointid) * stTrace.HitNormal) if(not asmlib.SetBoundPos(ePiece,stSpawn.SPos,ply,bnderrmod,"TOOL:LeftClick(HitWorld)" - .."\n Event : Spawning when HitWorld"..errInfo)) then return false end + ..gsErrorPad.."Event : Spawning when HitWorld"..errInfo)) then return false end ePiece:SetAngles(stSpawn.SAng) end asmlib.UndoCratePly(gsUndoPrefN..fnmodel.." ( World spawn )") @@ -383,7 +386,7 @@ function TOOL:LeftClick(stTrace) if(not asmlib.ApplyPhysicalAnchor(ePiece,anEnt,weld,nocollide)) then return asmlib.StatusLog(false,"TOOL:LeftClick(HitWorld): Failed to apply physical anchor"..errInfo) end asmlib.UndoAddEntityPly(ePiece) - asmlib.UndoFinishPly(ply,gsUndoPrefN..fnmodel.." ( World spawn )") + asmlib.UndoFinishPly(ply) return asmlib.StatusLog(true,"TOOL:LeftClick(HitWorld): Success hit world <"..fnmodel..">") end return asmlib.StatusLog(false,"TOOL:LeftClick(HitWorld): Failed to create <"..fnmodel..">") @@ -399,7 +402,7 @@ function TOOL:LeftClick(stTrace) return asmlib.StatusLog(false,"TOOL:LeftClick(HitProp): Trace is other type of object") end local trModel = trEnt:GetModel() - local fntrmod = asmlib.StringToFile(trModel) + local fntrmod = stringToFileName(trModel) -- No need stacking relative to non-persistent props or using them... local trRec = asmlib.CacheQueryPiece(trModel) @@ -421,38 +424,38 @@ function TOOL:LeftClick(stTrace) local stSpawn = asmlib.GetEntitySpawn(trEnt,stTrace.HitPos,model,pointid, actrad,spnflat,igntype,nextx,nexty,nextz,nextpic,nextyaw,nextrol) if(not stSpawn) then -- Not aiming into an active point - local IDs = asmlib.ExplodeString(bgskids,gsSymDir) + local IDs = stringExplode(gsSymDir,bgskids) if(not asmlib.AttachBodyGroups(trEnt,IDs[1] or "")) then return asmlib.StatusLog(false,"TOOL:LeftClick(Bodygroup/Skin): Failed <"..bgskids..">") end trEnt:SetSkin(mathClamp(tonumber(IDs[2]) or 0,0,trEnt:SkinCount()-1)) return asmlib.StatusLog(true,"TOOL:LeftClick(Bodygroup/Skin): Success <"..bgskids..">") end - if(asmlib.LoadKeyPly(ply,"SPEED")) then -- IN_SPEED: Switch the tool mode ( Stacking ) + if(asmlib.LoadKeyPly(ply,"SPEED") and hdRec.Kept > 1) then -- IN_SPEED: Switch the tool mode ( Stacking ) if(count <= 0) then return asmlib.StatusLog(false,"Stack count #"..count.." not properly picked") end if(pointid == pnextid) then return asmlib.StatusLog(false,"Point ID #"..pointid.." overlap") end local ePieceO, ePieceN local iNdex, iTrys = 1, staatts local vTemp, trPos = Vector(), trEnt:GetPos() + local errInfo = gsErrorPad.."Player : "..ply:GetName() + ..gsErrorPad.."trModel: "..fntrmod + ..gsErrorPad.."hdModel: "..fnmodel + ..gsErrorPad.."pointID: "..tostring(pointid).." >> "..tostring(pnextid) local hdOffs = asmlib.LocatePOA(stSpawn.HRec,pnextid) - local errInfo = "\n Player : "..ply:GetName() - .."\n trModel: "..fntrmod - .."\n hdModel: "..fnmodel - .."\n pointID: "..tostring(pointid).." >> "..tostring(pnextid) if(not hdOffs) then asmlib.PrintNotifyPly(ply,"Cannot find next PointID data !","ERROR") return asmlib.StatusLog(false,"TOOL:LeftClick(Stack)" - .."\n Event : Stacking non-existent next PointID on client prop"..errInfo) + ..gsErrorPad.."Event : Stacking non-existent next PointID on client prop"..errInfo) end -- Validate existent next point ID asmlib.UndoCratePly(gsUndoPrefN..fnmodel.." ( Stack #"..tostring(count).." )") while(iNdex <= count) do local sIterat = "["..tostring(iNdex).."]" - local errIter = "\n Iterats: "..sIterat - .."\n StackTr: "..tostring( nTrys ).." ?= "..tostring(staatts) + local errIter = gsErrorPad.."Iterats: "..sIterat + ..gsErrorPad.."StackTr: "..tostring( iTrys ).." ?= "..tostring(staatts) ePieceN = asmlib.MakePiece(model,trPos,ANG_ZERO,mass,bgskids,conPalette:Select("w")) if(ePieceN) then if(not asmlib.SetBoundPos(ePieceN,stSpawn.SPos,ply,bnderrmod,"TOOL:LeftClick(Stack)" - .."\n Event : Stacking piece position out of map bounds")) then + ..gsErrorPad.."Event : Stacking piece position out of map bounds")) then asmlib.UndoFinishPly(ply,sIterat) return asmlib.StatusLog(false,"TOOL:LeftClick(Stack): Position set irrelevant"..errInfo..errIter) end -- Set position is valid @@ -473,10 +476,10 @@ function TOOL:LeftClick(stTrace) asmlib.PrintNotifyPly(ply,"Cannot obtain spawn data!","ERROR") asmlib.UndoFinishPly(ply,sIterat) return asmlib.StatusLog(true,"TOOL:LeftClick(Stack)" - .."\n Event : Stacking has invalid user data"..errInfo..errIter) + ..gsErrorPad.."Event : Stacking has invalid user data"..errInfo..errIter) end -- Spawn data is valid for the current iteration iNdex ePieceO = ePieceN - iNdex = iNdex - 1 + iNdex = iNdex + 1 iTrys = staatts else iTrys = iTrys - 1 @@ -485,7 +488,7 @@ function TOOL:LeftClick(stTrace) asmlib.PrintNotifyPly(ply,"Spawn attempts ran off!","ERROR") asmlib.UndoFinishPly(ply,sIterat) return asmlib.StatusLog(false,"TOOL:LeftClick(Stack)" - .."\n Event : Stacking failed to allocate memory for a piece"..errInfo..errIter) + ..gsErrorPad.."Event : Stacking failed to allocate memory for a piece"..errInfo..errIter) end -- We still have enough memory to preform the stacking if(hdRec.Kept == 1) then asmlib.LogInstance("TOOL:LeftClick(Stack): Player "..ply:GetName() @@ -498,12 +501,12 @@ function TOOL:LeftClick(stTrace) else local ePiece = asmlib.MakePiece(model,stTrace.HitPos,ANG_ZERO,mass,bgskids,conPalette:Select("w")) if(ePiece) then - local errInfo = "\n Player : "..ply:GetName() - .."\n trModel: "..fntrmod - .."\n hdModel: "..fnmodel - .."\n pointID: "..tostring(pointid).." >> "..tostring(pnextid) + local errInfo = gsErrorPad.."Player : "..ply:GetName() + ..gsErrorPad.."trModel: "..fntrmod + ..gsErrorPad.."hdModel: "..fnmodel + ..gsErrorPad.."pointID: "..tostring(pointid).." >> "..tostring(pnextid) if(not asmlib.SetBoundPos(ePiece,stSpawn.SPos,ply,bnderrmod,"TOOL:LeftClick(Snap)" - .."\n Event : Snap one piece relative to another"..errInfo)) then return false end + ..gsErrorPad.."Event : Snap one piece relative to another"..errInfo)) then return false end ePiece:SetAngles(stSpawn.SAng) if(not asmlib.ApplyPhysicalSettings(ePiece,ignphysgn,freeze,gravity,physmater)) then return asmlib.StatusLog(false,"TOOL:LeftClick(Snap): Failed to apply physical settings on snapping"..errInfo) end @@ -785,7 +788,7 @@ function TOOL:DrawToolScreen(w, h) goToolScr:SetTextEdge(0,0) local stTrace = LocalPlayer():GetEyeTrace() local anInfo, anEnt = self:GetAnchor() - local tInfo = asmlib.ExplodeString(anInfo,gsSymRev) + local tInfo = stringExplode(gsSymRev,anInfo) if(not (stTrace and stTrace.Hit)) then goToolScr:DrawText("Trace status: Invalid","r") goToolScr:DrawTextAdd(" ["..(tInfo[1] or gsNoID).."]","an") @@ -822,12 +825,12 @@ function TOOL:DrawToolScreen(w, h) end if(trRec) then trMaxCN = trRec.Kept - trModel = asmlib.StringToFile(trModel) + trModel = stringToFileName(trModel) else - trModel = "["..gsNoMD.."]"..asmlib.StringToFile(trModel) + trModel = "["..gsNoMD.."]"..stringToFileName(trModel) end end - model = asmlib.StringToFile(model) + model = stringToFileName(model) actrad = asmlib.RoundValue(actrad,0.01) maxrad = asmlib.GetCoVar("maxactrad", "FLT") goToolScr:DrawText("TM: " ..(trModel or gsNoAV),"y")