Skip to content

Commit

Permalink
Added: Some of the modular city streets ( TODO make folders )
Browse files Browse the repository at this point in the history 
Fixed: Sligwolf's addons not being synced correctly
Fixed: Some WS IDs missing from URL list
Updated: Ignored models with modular city textures
  • Loading branch information
@dvdvideo1234
dvdvideo1234 committed Sep 1, 2024
1 parent 98fef5b commit b611f1b
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 13 deletions.
20 changes: 12 additions & 8 deletions data/trackassembly/tools/peaces_manager/create_report.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ set emd_chew_dbase=%emd_chew_gmod%\garrysmod\data\trackassembly\exp\trackasmlib_
set emd_chew_skip=%emd_chew_repo%\data\trackassembly\tools\peaces_manager\models_ignored.txt

:: How many addons are to be processed
set emd_chew_addfrm=1
set emd_chew_addcnt=29
set emd_chew_addfrm=30
set emd_chew_addcnt=30

:: GMA addons to be processed
set emd_chew_addlst[1]=740453553
Expand Down Expand Up @@ -62,7 +62,8 @@ set emd_chew_addlst[25]=331192490
set emd_chew_addlst[26]=1888013789
set emd_chew_addlst[27]=1955876643
set emd_chew_addlst[28]=3071058065
set emd_chew_addlst[29]=3314861708
set emd_chew_addlst[29]=3297918081
set emd_chew_addlst[30]=3314861708

:: Folder list for extraction and the directories they will be extracted
set emd_chew_adddir[1]=AlexCookie's 2ft track pack
Expand All @@ -85,15 +86,16 @@ set emd_chew_adddir[17]=Ron's G Scale Track pack
set emd_chew_adddir[18]=Ron's Minitrain Props
set emd_chew_adddir[19]=SProps
set emd_chew_adddir[20]=Shinji85's Rails
set emd_chew_adddir[21]=SligWolf's Minihover$SligWolf's White Rails
set emd_chew_adddir[22]=SligWolf's Minitrains
set emd_chew_adddir[23]=SligWolf's Railcar
set emd_chew_adddir[24]=SligWolf's Rerailers
set emd_chew_adddir[21]=SligWolf's Modelpack
set emd_chew_adddir[22]=SligWolf's Mini Trains
set emd_chew_adddir[23]=SligWolf's Bodygroup Car
set emd_chew_adddir[24]=SligWolf's Rerailer
set emd_chew_adddir[25]=StevenTechno's Buildings 1.0
set emd_chew_adddir[26]=StevenTechno's Buildings 2.0
set emd_chew_adddir[27]=Trackmania United Props
set emd_chew_adddir[28]=RockMan's Fortification
set emd_chew_adddir[29]=Modular City Street
set emd_chew_adddir[29]=SligWolf's Suspension Train
set emd_chew_adddir[30]=Modular City Street

:: Show the current folder
echo Running in: %emd_chew_pathb%
Expand Down Expand Up @@ -147,6 +149,7 @@ for /L %%k in (%emd_chew_addfrm%,1,%emd_chew_addcnt%) do (
set emd_chew_fgma=!emd_chew_fgma!!emd_chew_fdid!*
set emd_chew_fgma=!emd_chew_fgma!.!emd_chew_adext!
set "emd_chew_fdnm=!emd_chew_adddir[%%k]!"
echo Game content: !emd_chew_fgma!
for %%i in (!emd_chew_fgma!) do (
set /A emd_chew_match=1
:: Extract the GMA in the current folder
Expand All @@ -165,6 +168,7 @@ for /L %%k in (%emd_chew_addfrm%,1,%emd_chew_addcnt%) do (
set emd_chew_fgma=!emd_chew_wshop!\
set emd_chew_fgma=!emd_chew_fgma!!emd_chew_fdid!\
set emd_chew_fgma=!emd_chew_fgma!*.!emd_chew_adext!
echo Workshop content: !emd_chew_fgma!
for %%i in (!emd_chew_fgma!) do (
set /A emd_chew_match=1
:: Extract the GMA in the current folder
Expand Down
4 changes: 4 additions & 0 deletions data/trackassembly/tools/peaces_manager/models_ignored.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5661,3 +5661,7 @@ models/props_canal/canal_bridge04.mdl
models/props_canal/canal_bridge_railing01.mdl
models/props_canal/canal_bridge_railing02.mdl
models/props_canal/canal_bridge_railing_lamps.mdl

# Modular City Street
models/propper/dingles_modular_streets/street_propper_reference_texture_block.mdl
models/propper/dingles_modular_streets/street_propper_reference_texture_block2.mdl
50 changes: 45 additions & 5 deletions lua/autorun/trackassembly_init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ local asmlib = trackasmlib; if(not asmlib) then -- Module present
------------ CONFIGURE ASMLIB ------------

asmlib.InitBase("track","assembly")
asmlib.SetOpVar("TOOL_VERSION","8.762")
asmlib.SetOpVar("TOOL_VERSION","8.763")

------------ CONFIGURE GLOBAL INIT OPVARS ------------

Expand Down Expand Up @@ -521,17 +521,21 @@ if(CLIENT) then
asmlib.WorkshopID("Ron's Minitrain Props" , "728833183")
asmlib.WorkshopID("SligWolf's Modelpack" , "147812851")
asmlib.WorkshopID("Battleship's abandoned rails", "807162936")
asmlib.WorkshopID("Ron's 2ft track pack" , "634000136")
asmlib.WorkshopID("Ron's G Scale Track pack" , "865735701")
asmlib.WorkshopID("AlexCookie's 2ft track pack" , "740453553")
asmlib.WorkshopID("CAP Walkway" , "180210973")
asmlib.WorkshopID("SligWolf's Tiny Hover Racer" , "1375275167")
asmlib.WorkshopID("Joe's track pack" , "1658816805")
asmlib.WorkshopID("Plarail" , "1512053748")
asmlib.WorkshopID("StevenTechno's Buildings 2.0", "1888013789")
asmlib.WorkshopID("Modular Canals" , "1336622735")
asmlib.WorkshopID("Trackmania United Props" , "1955876643")
asmlib.WorkshopID("Anyone's Horrible Trackpack" , "2194528273")
asmlib.WorkshopID("Modular Sewer" , "2340192251")
asmlib.WorkshopID("RockMan's Fortification" , "3071058065")
asmlib.WorkshopID("SligWolf's Suspension Train" , "3297918081")
asmlib.WorkshopID("Modular City Street" , "3314861708")

asmlib.SetAction("CLEAR_GHOSTS" , function() asmlib.ClearGhosts() end)
asmlib.SetAction("CTXMENU_OPEN" , function() asmlib.IsFlag("tg_context_menu", true ) end)
Expand Down Expand Up @@ -4395,10 +4399,46 @@ else
PIECES:Record({"models/propper/dingles_modular_streets/street2048x512.mdl", "#", "#", 2, "", "0, 1024,0", "0,90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street2048x768.mdl", "#", "#", 1, "", "0,-1024,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street2048x768.mdl", "#", "#", 2, "", "0, 1024,0", "0,90,0"})
--[[
models/propper/dingles_modular_streets/street128x512_crosswalk.mdl
models/propper/dingles_modular_streets/street128x768_crosswalk.mdl
]]
PIECES:Record({"models/propper/dingles_modular_streets/street512_endcap_fancy1.mdl", "#", "#", 1, "", "0,-128,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street512_endcap_fancy2.mdl", "#", "#", 1, "", "0,-128,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street512_endcap_simple1.mdl", "#", "#", 1, "", "0,-64,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street512_endcap_simple2.mdl", "#", "#", 1, "", "0,-64,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768_endcap_fancy1.mdl", "#", "#", 1, "", "0,-192,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768_endcap_fancy2.mdl", "#", "#", 1, "", "0,-192,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768_endcap_simple1.mdl", "#", "#", 1, "", "0,-64,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768_endcap_simple2.mdl", "#", "#", 1, "", "0,-64,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768x768_concrete_to_stone_connector1.mdl", "#", "#", 1, "", "0,-384,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768x768_concrete_to_stone_connector1.mdl", "#", "#", 2, "", "0, 384,0", "0,90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768x768_concrete_to_stone_connector2.mdl", "#", "#", 1, "", "0,-384,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768x768_concrete_to_stone_connector2.mdl", "#", "#", 2, "", "0, 384,0", "0,90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_512_to_768_connector1.mdl", "#", "#", 1, "", "0,-256,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_512_to_768_connector1.mdl", "#", "#", 2, "", "384, 0, 0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_512_to_768_connector1.mdl", "#", "#", 3, "", "0, 256,0", "0,90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_512_to_768_connector2.mdl", "#", "#", 1, "", "0, 256,0", "0,90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_512_to_768_connector2.mdl", "#", "#", 2, "", "-384,0,0", "0,180,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_512_to_768_connector2.mdl", "#", "#", 3, "", "0,-256,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_512_to_768_connector2.mdl", "#", "#", 4, "", "384,0,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_tjunction512x512.mdl", "#", "#", 1, "", "0,-256,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_tjunction512x512.mdl", "#", "#", 2, "", "256, 0, 0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_tjunction512x512.mdl", "#", "#", 3, "", "-256, 0, 0", "0,180,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_tjunction768x768.mdl", "#", "#", 1, "", "0,-384,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_tjunction768x768.mdl", "#", "#", 2, "", "384, 0, 0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_tjunction768x768.mdl", "#", "#", 3, "", "-384,0,0", "0,180,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_turn512x512.mdl", "#", "#", 1, "", "0,-256,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_turn512x512.mdl", "#", "#", 2, "", "256, 0, 0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_turn768x768.mdl", "#", "#", 1, "", "0,-384,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_turn768x768.mdl", "#", "#", 2, "", "384, 0, 0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_4wayintersection512x512.mdl", "#", "#", 1, "", "0, 256,0", "0,90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_4wayintersection512x512.mdl", "#", "#", 2, "", "-256,0,0", "0,180,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_4wayintersection512x512.mdl", "#", "#", 3, "", "0,-256,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_4wayintersection512x512.mdl", "#", "#", 4, "", "256,0,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_4wayintersection768x768.mdl", "#", "#", 1, "", "0, 384,0", "0,90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_4wayintersection768x768.mdl", "#", "#", 2, "", "-384,0,0", "0,180,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_4wayintersection768x768.mdl", "#", "#", 3, "", "0,-384,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street_4wayintersection768x768.mdl", "#", "#", 4, "", "384,0,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768_fork.mdl", "#", "#", 1, "", "0,-655,0", "0,-90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768_fork.mdl", "#", "#", 2, "", " 994,655,-0", "0,90,0"})
PIECES:Record({"models/propper/dingles_modular_streets/street768_fork.mdl", "#", "#", 3, "", "-994,655,0", "0,90,0"})
if(gsMoDB == "SQL") then sqlCommit() end
end

Expand Down

0 comments on commit b611f1b

Please sign in to comment.