Skip to content

Commit 4ee4a9c

Browse files
nashjaeenashjaee
authored
Bugfixes (#154)
* list builders now support spawning asset bundles * Added ARC and BX droid models * Add latest bits from the Iden & Cassian previews (#150) * Add command cards, upgrades, unit cards. * Fix entries. * Fix mis-spelling. * Add the droids. * Fix ID10. * Fix SE-14. * Move the PC back. * Close army creator. * Update model/mesh to fix broke URLs. * Replace cards with hidden backs. * Fix command card issues. * Fix command card issues. * Added currently spoiled cards from the ARC and BX expansions * Fix saving error related to Jyn's and Iden's sidearms. * Fix BX Strike Team cost * Fix BX Strike Team unit leader designation * Fix ARC Strike Team unit leader designation * Fix typos * Fix ARC and BX colliders
1 parent c613f94 commit 4ee4a9c

File tree

2 files changed

+284
-253
lines changed

2 files changed

+284
-253
lines changed

‎mod/StarWarsLegion.json‎

Lines changed: 202 additions & 202 deletions
Large diffs are not rendered by default.

‎mod/src/~global.lua‎

Lines changed: 82 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2581,46 +2581,62 @@ function onLoad()
25812581
local bxDroidMaterials = "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/"
25822582
miniInfo.bxCommandoDroidLeader = {
25832583
type = "assetbundle",
2584-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995200343625397/794BB64E12EAE05677A947AA239C9427DA42E6B9/",
2584+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458223304/7326FD79D12145FC469CF03129C85FEE54C779E3/",
25852585
assetbundle_secondary = bxDroidMaterials,
25862586
scale = {1,1,1},
25872587
name = "BX Commando Droid Leader"
25882588
}
25892589
miniInfo.bxCommandoDroid1 = {
25902590
type = "assetbundle",
2591-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/772869147448003959/2759D7C018FF74BB42DFACB35EDF63CF886CF7A9/",
2591+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458222260/A09D06A410B15CBBC84AA3370A4B7D5A72988631/",
25922592
assetbundle_secondary = bxDroidMaterials,
25932593
scale = {1,1,1},
25942594
name = "BX Commando Droid"
25952595
}
25962596
miniInfo.bxCommandoDroid2 = {
25972597
type = "assetbundle",
2598-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/772869147448200879/45CBE522591E4C309A0081BDAAD2FE5AFA7CA288/",
2598+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458222573/D45453C3FF8D0DB7F0BCAAAD43FD6119BCDCE348/",
25992599
assetbundle_secondary = bxDroidMaterials,
26002600
scale = {1,1,1},
26012601
name = "BX Commando Droid"
26022602
}
26032603
miniInfo.bxCommandoDroid3 = {
26042604
type = "assetbundle",
2605-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995200343559181/CE785E82220DD6CF5A2192DC14D271754EC53BB3/",
2605+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458222901/DA5D5894B853BAF9AC5751B4BF447104809B6815/",
26062606
assetbundle_secondary = bxDroidMaterials,
26072607
scale = {1,1,1},
26082608
name = "BX Commando Droid"
26092609
}
26102610
miniInfo.bxCommandoDroidSniper = {
26112611
type = "assetbundle",
2612-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/772869147450171187/560575083BD2EF9E76BE7D7FBBE800BF90C56791/",
2612+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458224242/3051E6833933AB71E307BD680B61FC941B759F2F/",
26132613
assetbundle_secondary = bxDroidMaterials,
26142614
scale = {1,1,1},
26152615
name = "BX Commando Droid Sniper"
26162616
}
2617+
miniInfo.bxCommandoDroidSniperLeader = {
2618+
type = "assetbundle",
2619+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458224242/3051E6833933AB71E307BD680B61FC941B759F2F/",
2620+
assetbundle_secondary = bxDroidMaterials,
2621+
scale = {1,1,1},
2622+
name = "BX Commando Droid Sniper",
2623+
leader = true
2624+
}
26172625
miniInfo.bxCommandoDroidSaboteur = {
26182626
type = "assetbundle",
2619-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/772869147450247142/B4744762DF24FF57B1C7A41F753248D8D13B54F4/",
2627+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458223814/30BEBCAF40626B33286D49A9019126846E2C10F6/",
26202628
assetbundle_secondary = bxDroidMaterials,
26212629
scale = {1,1,1},
26222630
name = "BX Commando Droid Saboteur"
26232631
}
2632+
miniInfo.bxCommandoDroidSaboteurLeader = {
2633+
type = "assetbundle",
2634+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458223814/30BEBCAF40626B33286D49A9019126846E2C10F6/",
2635+
assetbundle_secondary = bxDroidMaterials,
2636+
scale = {1,1,1},
2637+
name = "BX Commando Droid Saboteur",
2638+
leader = true
2639+
}
26242640
miniInfo.droidekaLeader = {
26252641
mesh = "http://cloud-3.steamusercontent.com/ugc/785235151812759044/95037BEC00715812E918EC16919526DADE6F523F/",
26262642
collider = "http://cloud-3.steamusercontent.com/ugc/785234540540671597/B477FDC4D3200384E974945C2974ABFEFA566166/",
@@ -2814,53 +2830,77 @@ function onLoad()
28142830
local arcMaterials = "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/"
28152831
miniInfo.arcTrooperLeader = {
28162832
type = "assetbundle",
2817-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995200348527130/6E9DC1AFED6DA5065A02CADF3B888A2E9D151B93/",
2833+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458201558/7ACAAC795FA4E9F633B4F27B57B88E94972B5C38/",
28182834
assetbundle_secondary = arcMaterials,
28192835
scale = {1,1,1},
28202836
name = "ARC Trooper Leader"
28212837
}
28222838
miniInfo.arcTrooper1 = {
28232839
type = "assetbundle",
2824-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995200348525616/368CF25329C7D45C5B166AC3DB55DB9F20CCA3D9/",
2840+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458198820/1A215B4F1D04D540C7A7FDD39E67C4762C1C1F2C/",
28252841
assetbundle_secondary = arcMaterials,
28262842
scale = {1,1,1},
28272843
name = "ARC Trooper"
28282844
}
28292845
miniInfo.arcTrooper2 = {
28302846
type = "assetbundle",
2831-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995528924831478/0032DBBC5023F49637D7D6EC5540AAE941DA1E0A/",
2847+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458199107/55263324F6AF3D84514A9B303F485645D2DA0EFA/",
28322848
assetbundle_secondary = arcMaterials,
28332849
scale = {1,1,1},
28342850
name = "ARC Trooper"
28352851
}
28362852
miniInfo.arcTrooper3 = {
28372853
type = "assetbundle",
2838-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995528924831700/4B03D05035EF48BDA95C5AD5865AAAEAA4983536/",
2854+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458199385/7AEBCE9D5A2D006885D1B017E29BE1A80560D682/",
28392855
assetbundle_secondary = arcMaterials,
28402856
scale = {1,1,1},
28412857
name = "ARC Trooper"
28422858
}
28432859
miniInfo.arcTrooperDC15x = {
28442860
type = "assetbundle",
2845-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995528924832002/9ADEFCC86900264474D84DECA46B3448A7AEBB91//",
2861+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458199878/B15BAFEFF5562FEAA35B5820D1A1A89AA6EECCBE/",
28462862
assetbundle_secondary = arcMaterials,
28472863
scale = {1,1,1},
28482864
name = "DC-15x ARC Trooper"
28492865
}
2866+
miniInfo.arcTrooperDC15xLeader = {
2867+
type = "assetbundle",
2868+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458199878/B15BAFEFF5562FEAA35B5820D1A1A89AA6EECCBE/",
2869+
assetbundle_secondary = arcMaterials,
2870+
scale = {1,1,1},
2871+
name = "DC-15x ARC Trooper",
2872+
leader = true
2873+
}
28502874
miniInfo.echo = {
28512875
type = "assetbundle",
2852-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995200348526703/D7DBD3C6C32065D575868B311F1A04B4186062AE/",
2876+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458200162/E55BBA8A57D2917D65EF5E674B7720C6AA3E691D/",
28532877
assetbundle_secondary = arcMaterials,
28542878
scale = {1,1,1},
28552879
name = "Echo"
28562880
}
2881+
miniInfo.echoLeader = {
2882+
type = "assetbundle",
2883+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458200162/E55BBA8A57D2917D65EF5E674B7720C6AA3E691D/",
2884+
assetbundle_secondary = arcMaterials,
2885+
scale = {1,1,1},
2886+
name = "Echo",
2887+
leader = true
2888+
}
28572889
miniInfo.fives = {
28582890
type = "assetbundle",
2859-
assetbundle = "http://cloud-3.steamusercontent.com/ugc/773995200348526933/4C93A4696742087E33688294E32478AA0048E8AF/",
2891+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458200740/50B08207CC80DEDAC7B79960E62DC7D3404C11A0/",
28602892
assetbundle_secondary = arcMaterials,
28612893
scale = {1,1,1},
28622894
name = "Fives"
28632895
}
2896+
miniInfo.fivesLeader = {
2897+
type = "assetbundle",
2898+
assetbundle = "http://cloud-3.steamusercontent.com/ugc/776248565458200740/50B08207CC80DEDAC7B79960E62DC7D3404C11A0/",
2899+
assetbundle_secondary = arcMaterials,
2900+
scale = {1,1,1},
2901+
name = "Fives",
2902+
leader = true
2903+
}
28642904
miniInfo.barcSpeeder = {
28652905
mesh = "http://cloud-3.steamusercontent.com/ugc/785236717873394399/018F8CC63E0D90F58AADA6328DF1709D4D1DF796/",
28662906
collider = "http://cloud-3.steamusercontent.com/ugc/785234540540671597/B477FDC4D3200384E974945C2974ABFEFA566166/",
@@ -3018,19 +3058,11 @@ function onLoad()
30183058
varName = "b2HATrooper"
30193059
}
30203060

3021-
cardInfo.upgradeCards.bxCommandoDroidSniper = {
3022-
name = "BX-Series Droid Sniper",
3023-
ptCost = 30,
3024-
miniInfo = miniInfo.bxCommandoDroidSniper,
3025-
varName = "bxCommandoDroidSniper"
3026-
}
3061+
cardInfo.upgradeCards.bxCommandoDroidSniper = { name = "BX-Series Droid Sniper", ptCost = 30, miniInfo = miniInfo.bxCommandoDroidSniper, varName = "bxCommandoDroidSniper" }
3062+
cardInfo.upgradeCards.bxCommandoDroidSniperLeader = { name = "BX-Series Droid Sniper", ptCost = 30, miniInfo = miniInfo.bxCommandoDroidSniperLeader, varName = "bxCommandoDroidSniperLeader" }
30273063

3028-
cardInfo.upgradeCards.bxCommandoDroidSaboteur = {
3029-
name = "BX-Series Droid Saboteur",
3030-
ptCost = 100,
3031-
miniInfo = miniInfo.bxCommandoDroidSaboteur,
3032-
varName = "bxCommandoDroidSaboteur"
3033-
}
3064+
cardInfo.upgradeCards.bxCommandoDroidSaboteur = { name = "BX-Series Droid Saboteur", ptCost = 100, miniInfo = miniInfo.bxCommandoDroidSaboteur, varName = "bxCommandoDroidSaboteur" }
3065+
cardInfo.upgradeCards.bxCommandoDroidSaboteurLeader = { name = "BX-Series Droid Saboteur", ptCost = 100, miniInfo = miniInfo.bxCommandoDroidSaboteurLeader, varName = "bxCommandoDroidSaboteurLeader" }
30343066

30353067
cardInfo.upgradeCards.dp23PhaseITrooper = {name = "DP-23 Phase I Trooper", guid = "d90tug5a", ptCost = 27, miniGUID = "j7816", miniInfo = miniInfo.dp23PhaseITrooper,varName="dp23PhaseITrooper"}
30363068
cardInfo.upgradeCards.rps6PhaseITrooper = {name = "RPS-6 Phase I Trooper", guid = "d8h7jgg5a", ptCost = 26, miniGUID = "1jguk6", miniInfo = miniInfo.rps6PhaseITrooper,varName="rps6PhaseITrooper"}
@@ -3057,26 +3089,14 @@ function onLoad()
30573089
varName = "mortarPhaseIITrooper"
30583090
}
30593091

3060-
cardInfo.upgradeCards.arcTrooperDC15x = {
3061-
name = "DC-15x ARC Trooper",
3062-
ptCost = 31,
3063-
miniInfo = miniInfo.arcTrooperDC15x,
3064-
varName = "arcTrooperDC15x"
3065-
}
3092+
cardInfo.upgradeCards.arcTrooperDC15x = { name = "DC-15x ARC Trooper", ptCost = 31, miniInfo = miniInfo.arcTrooperDC15x, varName = "arcTrooperDC15x" }
3093+
cardInfo.upgradeCards.arcTrooperDC15xLeader = { name = "DC-15x ARC Trooper", ptCost = 31, miniInfo = miniInfo.arcTrooperDC15xLeader, varName = "arcTrooperDC15xLeader" }
30663094

3067-
cardInfo.upgradeCards.echo = {
3068-
name = "Echo",
3069-
ptCost = 99,
3070-
miniInfo = miniInfo.echo,
3071-
varName = "echo"
3072-
}
3095+
cardInfo.upgradeCards.echo = { name = "Echo", ptCost = 99, miniInfo = miniInfo.echo, varName = "echo" }
3096+
cardInfo.upgradeCards.echoLeader = { name = "Echo", ptCost = 99, miniInfo = miniInfo.echoLeader, varName = "echoLeader" }
30733097

3074-
cardInfo.upgradeCards.fives = {
3075-
name = "Fives",
3076-
ptCost = 99,
3077-
miniInfo = miniInfo.fives,
3078-
varName = "fives"
3079-
}
3098+
cardInfo.upgradeCards.fives = { name = "Fives", ptCost = 99, miniInfo = miniInfo.fives, varName = "fives" }
3099+
cardInfo.upgradeCards.fivesLeader = { name = "Fives", ptCost = 99, miniInfo = miniInfo.fivesLeader, varName = "fivesLeader" }
30803100

30813101
cardInfo.upgradeCards.pao = {name = "Pao", guid = "d8e9ggd5a", ptCost = 22, miniGUID = "gadfr", miniInfo = miniInfo.pao,varName="pao"}
30823102
cardInfo.upgradeCards.bistan = {name = "Bistan", guid = "dgfsgd5a", ptCost = 32, miniGUID = "ggfr", miniInfo = miniInfo.bistan,varName="bistan"}
@@ -3189,10 +3209,10 @@ function onLoad()
31893209
-- sidearm
31903210
cardInfo.upgradeCards.a300 = {name = "A-300", guid = "ag3gg0fg", ptCost = 0, varName = "a300"}
31913211
cardInfo.upgradeCards.a180 = {name = "A-180", guid = "aggfg0fg", ptCost = 0, varName = "a180"}
3192-
cardInfo.upgradeCards.jynsSE14 = {name = "Jyn's SE-14 Blaster", ptCost = 10, varName = "a180"}
3212+
cardInfo.upgradeCards.jynsSE14 = {name = "Jyns SE-14 Blaster", ptCost = 10, varName = "jynsSE14"}
31933213
cardInfo.upgradeCards.a280CFESniperConfig = {name = "A-280-CFE Sniper Config", ptCost = 10, varName = "a280CFESniperConfig"}
3194-
cardInfo.upgradeCards.idensDLT20ARifle = {name = "Iden's DLT-20A Rifle", ptCost = 15, varName = "idensDLT20ARifle"}
3195-
cardInfo.upgradeCards.idensTL50Repeater = {name = "Iden's TL-50 Repeater", ptCost = 15, varName = "idensTL50Repeater"}
3214+
cardInfo.upgradeCards.idensDLT20ARifle = {name = "Idens DLT-20A Rifle", ptCost = 15, varName = "idensDLT20ARifle"}
3215+
cardInfo.upgradeCards.idensTL50Repeater = {name = "Idens TL-50 Repeater", ptCost = 15, varName = "idensTL50Repeater"}
31963216
cardInfo.upgradeCards.e11D = {name = "E-11D", guid = "aggrgg0fg", ptCost = 8, varName = "e11D"}
31973217
cardInfo.upgradeCards.theDarksaber = {name = "The Darksaber", guid = "aghgfg3ggg0fg", ptCost = 25, varName = "theDarksaber"}
31983218
cardInfo.upgradeCards.dt57Annihilator = {name = 'DT-57 "Annihilator"', guid = "agggg0fg", ptCost = 12, varName = "dt57Annihilator"}
@@ -3292,6 +3312,11 @@ function onLoad()
32923312
-- cardInfo.upgradeCards.bxCommandoDroidSaboteur
32933313
}
32943314

3315+
cardInfo.upgradeMenu.separatist.bxCommandoDroidSpecialistLeader = {
3316+
cardInfo.upgradeCards.bxCommandoDroidSniperLeader,
3317+
-- cardInfo.upgradeCards.bxCommandoDroidSaboteurLeader
3318+
}
3319+
32953320
cardInfo.upgradeMenu.separatist.bxCommandoDroidSideArm = {
32963321
cardInfo.upgradeCards.vibroswords,
32973322
cardInfo.upgradeCards.deflectorShields
@@ -3379,6 +3404,12 @@ function onLoad()
33793404
-- cardInfo.upgradeCards.fives
33803405
}
33813406

3407+
cardInfo.upgradeMenu.republic.arcTroopersSpecialistLeader = {
3408+
cardInfo.upgradeCards.arcTrooperDC15xLeader,
3409+
-- cardInfo.upgradeCards.echoLeader,
3410+
-- cardInfo.upgradeCards.fiveLeaders
3411+
}
3412+
33823413
cardInfo.upgradeMenu.republic.barcSpeederCrew = {
33833414
cardInfo.upgradeCards.barcTwinLaserGunner,
33843415
cardInfo.upgradeCards.barcRPS6Gunner,
@@ -3832,16 +3863,16 @@ function onLoad()
38323863
}
38333864
cardInfo.unitCards.bxCommandoDroidsStrikeTeam = {
38343865
guid = "2h6de",
3835-
ptCost = 100,
3866+
ptCost = 22,
38363867
availableUpgrades = {
3837-
cardInfo.upgradeMenu.separatist.bxCommandoDroidSpecialist,
3868+
cardInfo.upgradeMenu.separatist.bxCommandoDroidSpecialistLeader,
38383869
cardInfo.upgradeMenu.separatist.tactics,
38393870
cardInfo.upgradeMenu.separatist.bxCommandoDroidSideArm,
38403871
cardInfo.upgradeMenu.separatist.comms,
38413872
cardInfo.upgradeMenu.separatist.grenade
38423873
},
38433874
miniInfo = {
3844-
miniInfo.bxCommandoDroidLeader
3875+
miniInfo.bxCommandoDroid1
38453876
},
38463877
tokenName = "Separatist Special Forces Command Token",
38473878
fullName = "BX Commando Droids Strike Team",
@@ -3998,15 +4029,15 @@ function onLoad()
39984029
guid = "244g4de",
39994030
ptCost = 21,
40004031
availableUpgrades = {
4001-
cardInfo.upgradeMenu.republic.arcTroopersSpecialist,
4032+
cardInfo.upgradeMenu.republic.arcTroopersSpecialistLeader,
40024033
cardInfo.upgradeMenu.republic.tactics,
40034034
cardInfo.upgradeMenu.republic.comms,
40044035
cardInfo.upgradeMenu.republic.arcTech,
40054036
cardInfo.upgradeMenu.republic.arcTech,
40064037
cardInfo.upgradeMenu.republic.grenade
40074038
},
40084039
miniInfo = {
4009-
miniInfo.arcTrooperLeader
4040+
miniInfo.arcTrooper1
40104041
},
40114042
tokenName = "Republic Special Forces Command Token",
40124043
fullName = "ARC Troopers Strike Team",

0 commit comments

Comments
 (0)