From 782cdcdd397424c7ad49cdaf24067c52c583ee3c Mon Sep 17 00:00:00 2001 From: halestom15 Date: Fri, 3 Apr 2026 16:38:40 -0400 Subject: [PATCH 01/17] Ben Changes --- mod/src/StarWarsLegion.lua | 8 ++++---- mod/src/StarWarsLegion/TABLE.3a3ed9.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/src/StarWarsLegion.lua b/mod/src/StarWarsLegion.lua index 2ddaa696..df762f4c 100644 --- a/mod/src/StarWarsLegion.lua +++ b/mod/src/StarWarsLegion.lua @@ -152,20 +152,20 @@ function onload(saveData) templateInfo.moveTemplate[1].colorTint = {1,1,1} templateInfo.moveTemplate[1].shortBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778007615968/4EE8D2332DCB6F4837551255CE5B1F240937BBE5/" templateInfo.moveTemplate[1].longBundle = "http://cloud-3.steamusercontent.com/ugc/1848161512056297932/A762E187E43177F01CD89D1348F51B1E3C1C744D/" - templateInfo.moveTemplate[1].sharedBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009533333/AD7C02CEE53FB4B2EA823B3DFE570674F8998019/" + templateInfo.moveTemplate[1].sharedBundle = "https://steamusercontent-a.akamaihd.net/ugc/14063680635734530221/FCD291B71472CA8636D00D0B82B1BA02671FF414/" templateInfo.moveTemplate[2] = {} templateInfo.moveTemplate[2].colorTint = {0.5,0.5,0.5} templateInfo.moveTemplate[2].shortBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009510155/77119B471FE3C51B06443F8ABE1C1B522431DF9B/" templateInfo.moveTemplate[2].longBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009510102/15B368A8D753AB35E1D60F7A377AE273EBEC0145/" - templateInfo.moveTemplate[2].sharedBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009533401/0FBA682D7D5AA7DA1A7EFC18B33C71EB1C0898E4/" - + templateInfo.moveTemplate[2].sharedBundle = "https://steamusercontent-a.akamaihd.net/ugc/10737538167305927398/637135B07177CA895B71593EB85563FEFD0567D7/" + templateInfo.moveTemplate[3] = {} templateInfo.moveTemplate[3].colorTint = {1,0.2,0.2} templateInfo.moveTemplate[3].shortBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009510243/26BA9DD7881AF63E1A19EB6BF9802630D792F836/" templateInfo.moveTemplate[3].longBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009510200/6723334F35444B547AA1382AE80F12E3FE9B72B1/" - templateInfo.moveTemplate[3].sharedBundle = "http://cloud-3.steamusercontent.com/ugc/1761462778009533447/E5D1D5169F0DB6025808BEE8C9647B3E7057BDB9/" + templateInfo.moveTemplate[3].sharedBundle = "https://steamusercontent-a.akamaihd.net/ugc/14511655092146905869/6D223BCC7D94DBDD342B6F887F7C777CE47D5585/" --This is actually diameter... just saying templateInfo.baseRadius = { diff --git a/mod/src/StarWarsLegion/TABLE.3a3ed9.json b/mod/src/StarWarsLegion/TABLE.3a3ed9.json index 49494d71..40aef82e 100644 --- a/mod/src/StarWarsLegion/TABLE.3a3ed9.json +++ b/mod/src/StarWarsLegion/TABLE.3a3ed9.json @@ -35,7 +35,7 @@ "HideWhenFaceDown": false, "Hands": false, "CustomAssetbundle": { - "AssetbundleURL": "https://steamusercontent-a.akamaihd.net/ugc/9562901817362450638/0D1D2A8AE25E903CD94C8BE040B2E4DD7F1E4B9E/", + "AssetbundleURL": "https://steamusercontent-a.akamaihd.net/ugc/10056915662299769833/848514DAF6FBC6488078EA9E0A4EB8C4582FCADF/", "AssetbundleSecondaryURL": "", "MaterialIndex": 0, "TypeIndex": 0, From 5fb307a479aeb76286bbe9d6aad92cc77a5fa1ad Mon Sep 17 00:00:00 2001 From: halestom15 Date: Sun, 5 Apr 2026 15:35:56 -0400 Subject: [PATCH 02/17] Update ShadowCollectiveUnits.json --- contrib/cards/ShadowCollective/ShadowCollectiveUnits.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json b/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json index 6d56a546..7ae50cfd 100644 --- a/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json +++ b/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json @@ -110,6 +110,9 @@ }, { "content": "contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json" + }, + { + "content": "contrib/cards/ShadowCollective/WeequayPiratesUnit.json" } ], "Special Forces": [ From 46f99b17271824200805ea85f9879399e1ff86cc Mon Sep 17 00:00:00 2001 From: halestom15 Date: Mon, 6 Apr 2026 00:03:38 -0400 Subject: [PATCH 03/17] Update official.json --- contrib/cards/official.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 028b5978..a2935f8b 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -4329,22 +4329,6 @@ } } ], - "Squad Leader": [ - { - "name": "Jedi Guardian", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59215140638617630/9AB204944DB662D2D15FC2FA5E50F02138AD1FD6/", - "mini": { - "bundle": "https://steamusercontent-a.akamaihd.net/ugc/16426912929621400/CC4D94EDC24D933D7333F5A35308606846A9B550/", - "secondary": "https://steamusercontent-a.akamaihd.net/ugc/16426912929621469/4B200440B54994D37A5B3667E04769CD92DE4F32/" - }, - "points": 22, - "restrictions": { - "include": { - "faction": ["Republic"] - } - } - } - ], "Training": [ { "name": "Security Detail", From a3268ae33e715fec0b14ce935da4f873d41fef30 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 20:02:01 -0400 Subject: [PATCH 04/17] Empire Changes + Ewok Correction --- contrib/cards/Empire/EmpireUnits.json | 48 ++++++++++++------------- contrib/cards/Rebel/RebelUnits.json | 19 ++++------ contrib/cards/official.json | 51 ++++++++++++++++++++++++--- 3 files changed, 78 insertions(+), 40 deletions(-) diff --git a/contrib/cards/Empire/EmpireUnits.json b/contrib/cards/Empire/EmpireUnits.json index 076e237f..4ab0a774 100644 --- a/contrib/cards/Empire/EmpireUnits.json +++ b/contrib/cards/Empire/EmpireUnits.json @@ -833,30 +833,6 @@ } ] }, - { - "name": "Scout Troopers", - "title": "Strike Team", - "displayName": "Scout Troopers (Strike Team)", - "heavyWeaponTeam": true, - "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384863628/C90F310AB2FFFFB744B68B2A0D3B0C657FA8ABA4/", - "size": "small", - "type": "Trooper", - "points": 20, - "speed": 2, - "upgrades": { - "Heavy Weapon": 1, - "Training": 1, - "Comms": 1, - "Gear": 1, - "Grenades": 1 - }, - "minis": [ - { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541911155/36E8C01A67E5E7A4188FC619261E0BAB0DF438C1/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/950714557093539603/6584D58DCD3135C901F302599C304E2D7044AD4B/" - } - ] - }, { "name": "Imperial Death Troopers", "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385139667689/20539A9EAB988308E299A3DE18818D7B9FBA63C9/", @@ -1027,6 +1003,30 @@ } ] }, + { + "name": "Scout Troopers", + "title": "Strike Team", + "displayName": "Scout Troopers (Strike Team)", + "heavyWeaponTeam": true, + "image": "https://steamusercontent-a.akamaihd.net/ugc/11473212592953545707/1E52D2488DA72C302214A5A1B55D64D36BFFE757/", + "size": "small", + "type": "Trooper", + "points": 22, + "speed": 2, + "upgrades": { + "Heavy Weapon": 1, + "Training": 1, + "Comms": 1, + "Gear": 1, + "Grenades": 1 + }, + "minis": [ + { + "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541911155/36E8C01A67E5E7A4188FC619261E0BAB0DF438C1/", + "diffuse": "http://cloud-3.steamusercontent.com/ugc/950714557093539603/6584D58DCD3135C901F302599C304E2D7044AD4B/" + } + ] + }, { "name": "Range Troopers", "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385139672651/467BD8F23216F7AE5274DC84837483AE40571B02/", diff --git a/contrib/cards/Rebel/RebelUnits.json b/contrib/cards/Rebel/RebelUnits.json index f53c92b4..2bdf343f 100644 --- a/contrib/cards/Rebel/RebelUnits.json +++ b/contrib/cards/Rebel/RebelUnits.json @@ -280,17 +280,14 @@ "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133208061/787C79B49789528F2EF54F1668B0BF28EBD6635C/", "size": "small", "type": "Trooper", - "points": 75, + "points": 64, "speed": 2, "upgrades": { - "Command": 1, - "Training": 1, - "Gear": 1 + "Training": 3 }, "minis": [ { - "mesh": "http://cloud-3.steamusercontent.com/ugc/951848302305475778/55B558E631655D0430BAF76E71C93899AAECA7A1/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/951848302305475871/06400240648CC39F933BE504C74DA9BEF4D006C4/" + "bundle": "http://cloud-3.steamusercontent.com/ugc/2023850162090106066/B6E661CAB8049A1B1CE975B53BB57B337E2C5DEE/" } ], "commands": [ @@ -317,17 +314,15 @@ "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133207972/4E2F553BC1FBA06D841591067D3D5E2AED2BF4E5/", "size": "small", "type": "Trooper", - "points": 90, + "points": 45, "speed": 2, "upgrades": { - "Training": 2, - "Gear": 1, - "Armament": 1 + "Command": 1, + "Training": 3 }, "minis": [ { - "mesh": "http://cloud-3.steamusercontent.com/ugc/773996263556990389/C38E9CAD7E5BA5496E1A211CA799E9ACBAC51D00/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/770611701143191344/5CAA4F0CE9A3FBE89A81560221ADCDDB5A801CC3/" + "bundle": "http://cloud-3.steamusercontent.com/ugc/2008089545867129309/3D6C219F243BDE984C42BB3444B01DB09B522CBB/" } ] }, diff --git a/contrib/cards/official.json b/contrib/cards/official.json index a2935f8b..70521fda 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -1556,6 +1556,49 @@ } ], "Heavy Weapon": [ + { + "name": "Imperial Probe Droid", + "image": "https://steamusercontent-a.akamaihd.net/ugc/12096037766204385743/C1C46E710472C45972A1CA308269B91EE9E691B0/", + "mini": { + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/14972533488140369423/D390682F502B9999AE930DA6A78817DDE5D97027/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15762532285823663057/2254B8B0FBA723C3F840CDB6DB639404B0DA9DB1/" + }, + "points": 10, + "restrictions": { + "include": { + "faction": ["Empire"], + "rank": ["Corps", "Special Forces", "Support"] + } + } + }, + { + "name": "Seventh Sister", + "image": "https://steamusercontent-a.akamaihd.net/ugc/12786414084835381664/A059896EB0382A23E79AC5B4A93BB1B80CB47DA8/", + "mini": { + "bundle": "https://steamusercontent-a.akamaihd.net/ugc/10804385137011773/5377A3D119B96061C7EFAF2F8469BD5E889F3F13/" + }, + "leader": true, + "points": 30, + "restrictions": { + "include": { + "unit": ["Imperial Special Forces"] + } + } + }, + { + "name": "Fifth Brother", + "image": "https://steamusercontent-a.akamaihd.net/ugc/14099995001149120961/E9E1ACB414FFC071E6B08B9F268040166D5D5C35/", + "mini": { + "bundle": "steamusercontent-a.akamaihd.net/ugc/2456221571853672166/B86F663B609267644D837B4F18C59614C6785229/" + }, + "leader": true, + "points": 32, + "restrictions": { + "include": { + "unit": ["Stormtrooper Riot Squad"] + } + } + }, { "name": "Long Rifle Pirate", "image": "https://steamusercontent-a.akamaihd.net/ugc/12069676993247554413/429E3382BCE4E5FB5A38F8E4E43DAE97DD7C3587/", @@ -1895,12 +1938,12 @@ }, { "name": "DLT-19X Sniper", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103101/607C9BEDEB2C3780F1AE58D72DEE649F941A7CAD/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15525633462179263891/86D8A2EF8EBA4D9BF3DD245487375FB807A7E8B3/", "mini": { "mesh": "http://cloud-3.steamusercontent.com/ugc/770610077943667377/92306C3BFB675310563691C3C582BF5B9FC9ACD4/", "diffuse": "http://cloud-3.steamusercontent.com/ugc/770610077943667167/66F3188269E49FE5DAD649E771D799F2593263FF/" }, - "points": 28, + "points": 20, "restrictions": { "include": { "unit": ["Scout Troopers"] @@ -2289,12 +2332,12 @@ { "name": "Sonic Charge Saboteur", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103507/922568C5FAACC25FCE80574BE5459CB511022824/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15530089580724049994/20B4C2D6907EBDEC74CEF88C5B10B71ED016F94B/", "mini": { "mesh": "http://cloud-3.steamusercontent.com/ugc/950714557093539716/6A0D63306F505A074395AFA61EB990280DB8995D/", "diffuse": "http://cloud-3.steamusercontent.com/ugc/950714557093539899/FF7A535E91BF79D4C3E0D55E874C1ACEB6FBF434/" }, - "points": 23, + "points": 17, "restrictions": { "include": { "unit": ["Scout Troopers"] From 2723b0e9f8c030a1bad6724335358395e32965fd Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 20:14:53 -0400 Subject: [PATCH 05/17] Rebel Changes --- contrib/cards/Rebel/RebelUnits.json | 50 +++++++++++++------------- contrib/cards/official.json | 56 +++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 31 deletions(-) diff --git a/contrib/cards/Rebel/RebelUnits.json b/contrib/cards/Rebel/RebelUnits.json index 2bdf343f..ee07950c 100644 --- a/contrib/cards/Rebel/RebelUnits.json +++ b/contrib/cards/Rebel/RebelUnits.json @@ -958,7 +958,7 @@ "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133198280/BA9DB93D2D168B835C95075E8B1C52C79E044286/", "size": "small", "type": "Trooper", - "points": 48, + "points": 42, "speed": 2, "upgrades": { "Heavy Weapon": 1, @@ -986,30 +986,6 @@ } ] }, - { - "name": "Rebel Commandos", - "displayName": "Rebel Commandos (Strike Team)", - "title": "Strike Team", - "heavyWeaponTeam": true, - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133197589/A51BFFE52ED2FAE9DACE45BF774C7F5FE12CBC07/", - "size": "small", - "type": "Trooper", - "points": 20, - "speed": 2, - "upgrades": { - "Heavy Weapon": 1, - "Training": 1, - "Comms": 1, - "Gear": 1, - "Grenades": 1 - }, - "minis": [ - { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173156/D637683F992DD0C4488252BE266EEEA1F26006B0/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541172655/B10522A40482843AF69A3F321BD091B0ECF52C6B/" - } - ] - }, { "name": "Wookiee Warriors", "title": "Freedom Fighters", @@ -1274,6 +1250,30 @@ } ] }, + { + "name": "Rebel Commandos", + "displayName": "Rebel Commandos (Strike Team)", + "title": "Strike Team", + "heavyWeaponTeam": true, + "image": "https://steamusercontent-a.akamaihd.net/ugc/15391478724315537430/D37281FE62D2FB944EF610EB01C66232CA9BB8EA/", + "size": "small", + "type": "Trooper", + "points": 20, + "speed": 2, + "upgrades": { + "Heavy Weapon": 1, + "Training": 1, + "Comms": 1, + "Gear": 1, + "Grenades": 1 + }, + "minis": [ + { + "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173156/D637683F992DD0C4488252BE266EEEA1F26006B0/", + "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541172655/B10522A40482843AF69A3F321BD091B0ECF52C6B/" + } + ] + }, { "name": "Tauntaun Riders", "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081133194939/65297606E28367C04BF4BB4DE3474EAB723F4416/", diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 70521fda..9d9e7fb7 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -1556,6 +1556,51 @@ } ], "Heavy Weapon": [ + { + "name": "Luke Skywalker", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10466047961901782395/2898B46094ACFC7D44564F3E1B650BC01D8FA0C9/", + "mini": { + "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540537100371/0B15B2810ABEBE5429E4A24852D96BAC2DC28BF7/", + "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540537079134/11A17263AD81DC9D4271B7C6BD809B69141DCB61/" + }, + "leader": true, + "points": 25, + "restrictions": { + "include": { + "unit": ["Rebel Veterans", "Rebel Troopers"] + } + } + }, + { + "name": "Jyn Erso", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16079811724149638991/B0AED05E50E5EC32550F8970C8F7C6AA412ADB18/", + "mini": { + "mesh": "http://cloud-3.steamusercontent.com/ugc/951848302305475778/55B558E631655D0430BAF76E71C93899AAECA7A1/", + "diffuse": "http://cloud-3.steamusercontent.com/ugc/951848302305475871/06400240648CC39F933BE504C74DA9BEF4D006C4/" + }, + "leader": true, + "points": 22, + "restrictions": { + "include": { + "unit": ["Rebel Commandos", "Rebel Troopers", "Guerilla Troopers"] + } + } + }, + { + "name": "Chewbacca", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15050970341342733786/8231EFDD964C904D2B3F2B170525EA2B5AECE9AC/", + "mini": { + "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540540669973/90DD9EA44756CCF9B2473302DC644F3AEEED07B4/", + "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540540670117/5AA04499FC8CC467864F9F335601E6335C03326D/" + }, + "leader": true, + "points": 40, + "restrictions": { + "include": { + "type": ["Wookiee Trooper"] + } + } + }, { "name": "Imperial Probe Droid", "image": "https://steamusercontent-a.akamaihd.net/ugc/12096037766204385743/C1C46E710472C45972A1CA308269B91EE9E691B0/", @@ -1896,12 +1941,12 @@ }, { "name": "DH-447 Sniper", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140084953/59EB5B5BADDFEACF7BA997C247F16A54080A6E31/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16916821861583515066/6783DCC4833EAE22DCA9EDB9C8F585AE29BA13A3/", "mini": { "mesh": "http://cloud-3.steamusercontent.com/ugc/785234780862776611/B8222AA4A3B680E969DC106C8A281D11845994EB/", "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234780862776974/21649563BC0CB84E12C0B249C720919F528596D3/" }, - "points": 38, + "points": 20, "restrictions": { "include": { "unit": ["Rebel Commandos"] @@ -2233,12 +2278,12 @@ }, { "name": "Proton Charge Saboteur", - "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384857685/BBFA286A722F4FD50AB0DADDBF343A6CBC9EB79F/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11476891187215628852/91F18B14DEB61395ADFE0900F2CB5C658414C7F6/", "mini": { "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173465/8193FD1F0862270CD23BA9243679840BE6324DC6/", "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541173570/3C100E92F0DEDEF117D3A0392D3271951BC90DD0/" }, - "points": 20, + "points": 14, "restrictions": { "include": { "unit": ["Rebel Commandos"] @@ -2342,8 +2387,7 @@ "include": { "unit": ["Scout Troopers"] } - }, - "additionalObjects": ["Proton Charge Token"] + } }, { "name": "T-21 Stormtrooper", From efc7ce4bf940c1f1485b3f3ef3e3136cf58e9225 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 20:43:41 -0400 Subject: [PATCH 06/17] GAR Changes --- contrib/cards/Republic/RepublicUnits.json | 144 ++++++++++++++++++---- contrib/cards/official.json | 64 +++++++++- 2 files changed, 181 insertions(+), 27 deletions(-) diff --git a/contrib/cards/Republic/RepublicUnits.json b/contrib/cards/Republic/RepublicUnits.json index e268f142..9a5d76e6 100644 --- a/contrib/cards/Republic/RepublicUnits.json +++ b/contrib/cards/Republic/RepublicUnits.json @@ -1,5 +1,55 @@ { "Commander": [ + { + "name": "Ki Adi Mundi", + "title": "Jedi Council", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11929402197203734988/9CF2A7578A3EB20BA278864950D163A26901C4F5/", + "size": "small", + "type": "Trooper", + "points": 0, + "speed": 2, + "upgrades": {}, + "minis": [ + { + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/12461470789103203864/DACD5524454E91F35C586DDEABAD420ED4E1FF46/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17297173129004280551/384F67D13FCA3EBA539BD8D3818F5A0E5A8F2A0B/" + } + ], + "commands": [ + { + "name": "Force of Will", + "image": "https://steamusercontent-a.akamaihd.net/ugc/18170241117176866803/0C12349B15161AD068F2BFD1AB13681EB31255FD/", + "pip": 3 + } + ] + }, + { + "name": "Mace Windu", + "title": "Jedi Council", + "image": "https://steamusercontent-a.akamaihd.net/ugc/12731488793753419264/4F069455F4652D7D87B92F26C1EB7C0888C7D48E/", + "size": "small", + "type": "Trooper", + "points": 165, + "speed": 2, + "upgrades": { + "Command": 1, + "Force": 3, + "Training": 2 + }, + "minis": [ + { + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/12925628276853873664/6E5E101942F74FC183F7154481D3EB5CFEAAAD65/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/18287494378041429592/02BB80E1E8A06309E2424A0AD83A7A68E9A42FD6/" + } + ], + "commands": [ + { + "name": "This Party's Over", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11977462417526561880/68CB1C0EABB464F67AF434BE84666B6FF126E6CD/", + "pip": 1 + } + ] + }, { "name": "Ahsoka Tano", "title": "Padawan Commander", @@ -323,6 +373,52 @@ { "content": "contrib/cards/ShadowCollective/HondoUnit.json" }, + { + "name": "Shaak Ti", + "title": "Jedi Council", + "image": "https://steamusercontent-a.akamaihd.net/ugc/17555033359148455110/D2F1B99C8AB43C8B73071DAED15D378AC38F65C5/", + "size": "small", + "type": "Trooper", + "points": 0, + "speed": 2, + "upgrades": {}, + "minis": [ + { + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/18026057114183857483/0D959FB4A356818AA1FA6D8034166916BB6EA84B/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9607653251760381402/E7F70FBA0C514FFA35DB2213F1F958835192D473/" + } + ], + "commands": [ + { + "name": "Unity Wins Wars", + "image": "https://steamusercontent-a.akamaihd.net/ugc/17101391156956704931/3299D62F86B634A6850085F40EA1DD60DC3BDEDE/", + "pip": 3 + } + ] + }, + { + "name": "Plo Koon", + "title": "Jedi Council", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11338358295243396609/72E584709E6C16445AFBDB6820E58449092839EF/", + "size": "small", + "type": "Trooper", + "points": 0, + "speed": 2, + "upgrades": {}, + "minis": [ + { + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/10428072234539757120/3154697B7EB8A5076E1CB4C312068560C7B3DE19/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16082411658181568841/AC55908D9B799DAEE652A7505DD8E06857464614/" + } + ], + "commands": [ + { + "name": "I Don't Believe in Chance", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15864173543972429126/27FCE434351A715B9DDDC4B033C3DE79B0260000/", + "pip": 2 + } + ] + }, { "name": "Jedi Knight", "title": "Keeper of the Peace", @@ -563,30 +659,6 @@ } ] }, - { - "name": "Arc Troopers", - "title": "Strike Team", - "displayName": "Arc Troopers (Strike Team)", - "heavyWeaponTeam": true, - "image": "https://steamusercontent-a.akamaihd.net/ugc/2495640747384861099/0BF691267928341734741CDF04AAE59A41E5E20B/", - "size": "small", - "type": "Clone Trooper", - "points": 24, - "speed": 2, - "upgrades": { - "Heavy Weapon": 1, - "Training": 1, - "Comms": 1, - "Gear": 2, - "Grenades": 1 - }, - "minis": [ - { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457802621/01F605D855048F823A0ECA6C46D2A62B56C04124/", - "secondary": "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/" - } - ] - }, { "name": "ARF Troopers", "image": "https://steamusercontent-a.akamaihd.net/ugc/59215140638617511/EF41D3B9F89F86EC4E803863C17D1549052C8B55/", @@ -714,6 +786,30 @@ } ], "Support": [ + { + "name": "Arc Troopers", + "title": "Strike Team", + "displayName": "Arc Troopers (Strike Team)", + "heavyWeaponTeam": true, + "image": "https://steamusercontent-a.akamaihd.net/ugc/11640734367175082150/31600D0C168D48D5E353E7E0A6D60C4935531D62/", + "size": "small", + "type": "Clone Trooper", + "points": 23, + "speed": 2, + "upgrades": { + "Heavy Weapon": 1, + "Training": 1, + "Comms": 1, + "Gear": 2, + "Grenades": 1 + }, + "minis": [ + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457802621/01F605D855048F823A0ECA6C46D2A62B56C04124/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/" + } + ] + }, { "name": "BARC Speeder", "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135357592/ED3AA636CBB456AA395C1694D27B84A296DD406B/", diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 9d9e7fb7..76eca2ce 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -1926,13 +1926,27 @@ } }, { - "name": "DC-15X ARC Trooper", - "image": "https://steamusercontent-a.akamaihd.net/ugc/9724672671096889082/B22903B590FA5B6D2AAEC2988AA0F9826C9D1EB2/", + "name": "DC-15X ARC Trooper Sniper", + "image": "https://steamusercontent-a.akamaihd.net/ugc/9340306715371279306/77343FF20A60FEBDE4596D9E73806219B98BFB74/", "mini": { "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457800878/34EC84D7ECD99E073417866A9BEC4288E00F5359/", "secondary": "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/" }, - "points": 37, + "points": 26, + "restrictions": { + "include": { + "unit": ["ARC Troopers"] + } + } + }, + { + "name": "DC-15X ARC Trooper Gunner", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15700525996033034674/C04F340906CF0532B3825D5C67357C094FA10B29/", + "mini": { + "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457800878/34EC84D7ECD99E073417866A9BEC4288E00F5359/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/773995200348530664/5E248091F8CC37B1023257338D4947E4ADFE48AB/" + }, + "points": 26, "restrictions": { "include": { "unit": ["ARC Troopers"] @@ -2812,6 +2826,35 @@ } ], "Squad Leader": [ + { + "name": "Obi-Wan Kenobi", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16739187061396312294/0BFA142DE447B3EAFC7447BBDBE40BB10C51A844/", + "mini": { + "mesh": "http://cloud-3.steamusercontent.com/ugc/785236717873394134/94407058FBA842AD0FDCC0BBB8AB613EA9A739C2/", + "diffuse": "http://cloud-3.steamusercontent.com/ugc/785236717873394267/272C1C9A8C15C36DC5C10DD62D5EFCEF9BFF4496/" + }, + "points": 25, + "leader": true, + "restrictions": { + "include": { + "unit": ["ARF Troopers"] + } + } + }, + { + "name": "Clone Commander Cody", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16353428824806788196/B2AEE50E55B08A53411690988BCE579A7EBFE4A8/", + "mini": { + "bundle": "http://cloud-3.steamusercontent.com/ugc/2174736446813135529/6A6C874DBCA77E800A77C20FD36C2F223661CD10/" + }, + "points": 28, + "leader": true, + "restrictions": { + "include": { + "unit": ["ARF Troopers", "Clone Trooper Marksmen"] + } + } + }, { "name": "Clone Captain Rex", "image": "https://steamusercontent-a.akamaihd.net/ugc/17837568269244781354/A462DDBE46166711CD3E69DD3F6F6947D25AEF3F/", @@ -2963,6 +3006,21 @@ } ], "Personnel": [ + { + "name": "Shaak Ti", + "image": "https://steamusercontent-a.akamaihd.net/ugc/12779783962834644042/1D8FF74F712A51FB40C0B25B0EE6DC5183FD8D60/", + "mini": { + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/18026057114183857483/0D959FB4A356818AA1FA6D8034166916BB6EA84B/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9607653251760381402/E7F70FBA0C514FFA35DB2213F1F958835192D473/" + }, + "points": 22, + "restrictions": { + "include": { + "faction": ["Republic"] + } + }, + "leader": true + }, { "name": "Weequay Pirate Squad", "image": "https://steamusercontent-a.akamaihd.net/ugc/17099305818157449093/AB25320EE6C23F1CFA10608400AA0881A83EFCB4/", From c60dcfac070d9fcd30ea71e5fbed5af1a84d9c98 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 21:01:58 -0400 Subject: [PATCH 07/17] CIS Updates --- contrib/cards/Separatist/SeparatistUnits.json | 89 +++++++++++-------- contrib/cards/official.json | 38 +++++++- 2 files changed, 86 insertions(+), 41 deletions(-) diff --git a/contrib/cards/Separatist/SeparatistUnits.json b/contrib/cards/Separatist/SeparatistUnits.json index 59e173cd..49740196 100644 --- a/contrib/cards/Separatist/SeparatistUnits.json +++ b/contrib/cards/Separatist/SeparatistUnits.json @@ -325,6 +325,29 @@ } ], "Operative": [ + { + "name": "Savage Opress", + "title": "Dooku's Apprentice", + "image": "https://steamusercontent-a.akamaihd.net/ugc/13168414506047365764/A8CEC8BB31ACD5D20F2472F1FE2A1C0BE1179F34/", + "size": "small", + "type": "Trooper", + "points": 0, + "speed": 2, + "upgrades": {}, + "minis": [ + { + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11082776058831308047/3A974FCF53960CCBBC537A4134AD12242D4DDF89/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17875535680143582051/1C009264C71FD35359145238DFA2CBD5D1872CD4/" + } + ], + "commands": [ + { + "name": "We Shall Start With Revenge", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10750064270635517385/492A552BB4056A4CBF9CD01FB5195521104C9F9E/", + "pip": 1 + } + ] + }, { "name": "Super Tactical Command Droid", "title": "Auxiliary Command Droid", @@ -607,30 +630,6 @@ } ] }, - { - "name": "BX-Series Droid Commandos", - "title": "Strike Team", - "displayName": "BX-Series Commandos (Strike Team)", - "heavyWeaponTeam": true, - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131430807/F260EA4E79ACB29C3C635836A3EF7E7C632E4FB6/", - "size": "small", - "type": "Droid Trooper", - "points": 20, - "speed": 2, - "upgrades": { - "Heavy Weapon": 1, - "Training": 1, - "Comms": 1, - "Armament": 1, - "Grenades": 1 - }, - "minis": [ - { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457847081/F7D4E8D3EC85BAEEB5C1B5B913B7F484CC28FC10/", - "secondary": "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/" - } - ] - }, { "name": "DRK-1 Sith Probe Droids", "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131432071/495850F5BE28D1D1551D13D5B86F473D8EB154EC/", @@ -744,20 +743,40 @@ } ], "Support": [ + { + "name": "BX-Series Droid Commandos", + "title": "Strike Team", + "displayName": "BX-Series Commandos (Strike Team)", + "heavyWeaponTeam": true, + "image": "https://steamusercontent-a.akamaihd.net/ugc/9315317574108774179/CDF58FFA2BD16DDB0B5DEFDBC073AF2AE2D91F65/", + "size": "small", + "type": "Droid Trooper", + "points": 20, + "speed": 2, + "upgrades": { + "Heavy Weapon": 1, + "Training": 1, + "Comms": 1, + "Armament": 1, + "Grenades": 1 + }, + "minis": [ + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457847081/F7D4E8D3EC85BAEEB5C1B5B913B7F484CC28FC10/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/" + } + ] + }, { "name": "Droidekas", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131432109/A0B45534B85F46D38A4F372B04041A5193B31426/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/17494420314363813844/3FE04FCFAF3815AA2DE9E9C52101B5038AB6F892/", "size": "medium", - "type": "Ground Vehicle", - "points": 60, + "type": "Emplacement Trooper", + "points": 67, "speed": 1, "upgrades": { "Comms": 1 }, - "silhouette": { - "height": 1.85, - "offset": 0.0 - }, "minis": [ { "bundle": "http://cloud-3.steamusercontent.com/ugc/1686023445067168845/FBADA8EDE2ED248CA7F50C1DB3BFF46215E0360B/", @@ -914,19 +933,15 @@ }, { "name": "Aqua Droids", - "image": "https://steamusercontent-a.akamaihd.net/ugc/1794100632571587/D3308B09BB6167322BFFB83C1A7E420C431D2396/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15835541998063761576/AFCAE9EC6C8FD26B11D7E2D3391F8242C7D4CFF0/", "size": "medium", - "type": "Ground Vehicle", + "type": "Emplacement Trooper", "points": 65, "speed": 1, "upgrades": { "Heavy Weapon": 1, "Comms": 1 }, - "silhouette": { - "height": 1.85, - "offset": 0.0 - }, "minis": [ { "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16428277771257521/99A8ACEC9864DE29C7CE97006E86248BB2A89554/", diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 76eca2ce..9f2f106b 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -1556,6 +1556,36 @@ } ], "Heavy Weapon": [ + { + "name": "Assajj Ventress", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15926262740421549818/7F23F097083233A0C9348C3215BF09DB072C58E6/", + "mini": { + "mesh": "http://cloud-3.steamusercontent.com/ugc/785234780869167436/AAA2C61A17BB43F2673AF16D30BD0478B9AAAD2A/", + "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234780869167571/EF86CBDA5F361282AD077D61FA81ABF0FEE061A0/" + }, + "leader": true, + "points": 26, + "restrictions": { + "include": { + "unit": ["B1 Battle Droids", "BX-Series Droid Commandos"] + } + } + }, + { + "name": "General Grievous", + "image": "https://steamusercontent-a.akamaihd.net/ugc/13889602850013621809/37188B84F5B6D6E49F5A9C62942D33562B65CF9E/", + "mini": { + "mesh": "http://cloud-3.steamusercontent.com/ugc/785234780869167436/AAA2C61A17BB43F2673AF16D30BD0478B9AAAD2A/", + "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234780869167571/EF86CBDA5F361282AD077D61FA81ABF0FEE061A0/" + }, + "leader": true, + "points": 36, + "restrictions": { + "include": { + "unit": ["B1 Battle Droids", "IG-100 MagnaGuard"] + } + } + }, { "name": "Luke Skywalker", "image": "https://steamusercontent-a.akamaihd.net/ugc/10466047961901782395/2898B46094ACFC7D44564F3E1B650BC01D8FA0C9/", @@ -1830,12 +1860,12 @@ }, { "name": "BX-Series Droid Sniper", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927410/552314F29830D4A8A63F5B8238699336F17ECD92/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11012640175296329862/0E3952E994DB7BDA80F0614E3539909EAEC0049D/", "mini": { "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457847963/0EA6BE014DA494689FF32F9570C6A73CD88F1894/", "secondary": "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/" }, - "points": 40, + "points": 20, "restrictions": { "include": { "unit": ["BX-Series Droid Commandos"] @@ -2073,12 +2103,12 @@ }, { "name": "Dioxis Mine Saboteur", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927460/BE9022FA696C172E68110895A9DDCDDD635E2AB3/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16211846897932945944/4A7D6789318AB8E685AF487F02231CC291248FAB/", "mini": { "bundle": "http://cloud-3.steamusercontent.com/ugc/1009315641457847567/079157D001A1520085C6A30620750817C6C01BFF/", "secondary": "http://cloud-3.steamusercontent.com/ugc/773995528924546789/8774CBBDC3C4F18B11A444CC96EA5FE7F00DB48F/" }, - "points": 28, + "points": 20, "restrictions": { "include": { "unit": ["BX-Series Droid Commandos"] From 20762095a20bdb2a242dbf8a250990139b8cb545 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 21:09:09 -0400 Subject: [PATCH 08/17] SC updates --- .../ShadowCollectiveUnits.json | 23 +++++++++++++ contrib/cards/official.json | 32 +++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json b/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json index 7ae50cfd..79dda81c 100644 --- a/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json +++ b/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json @@ -97,6 +97,29 @@ } ] }, + { + "name": "Savage Opress", + "title": "Maul's Enforcer", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10520678764152114554/0350C3463ADCAF50D1936AC3893348C12F0A5A62/", + "size": "small", + "type": "Trooper", + "points": 0, + "speed": 2, + "upgrades": {}, + "minis": [ + { + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11082776058831308047/3A974FCF53960CCBBC537A4134AD12242D4DDF89/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17875535680143582051/1C009264C71FD35359145238DFA2CBD5D1872CD4/" + } + ], + "commands": [ + { + "name": "We Shall Start With Revenge", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10750064270635517385/492A552BB4056A4CBF9CD01FB5195521104C9F9E/", + "pip": 1 + } + ] + }, { "content": "contrib/cards/ShadowCollective/CadBaneUnit.json" }, diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 9f2f106b..0e527921 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -3036,6 +3036,38 @@ } ], "Personnel": [ + { + "name": "Pyke Syndicate Foot Soldier Squad", + "image": "https://steamusercontent-a.akamaihd.net/ugc/14983704573819999353/9B2E64176C2D5134C74D77CBC58E19E05B68481C/", + "minis": [ + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845646/BE0DEED782F96BD44C389DEDEA41EBEA0C7A6D04/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/" + }, + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845697/15B6DCCA8D8D76E1CB78219C58790E40DDD7CE8A/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/" + }, + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845389/0D7DFE0C5BF5CDD527A619B75A25A2177D417BD0/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/" + }, + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845389/0D7DFE0C5BF5CDD527A619B75A25A2177D417BD0/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/" + }, + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845389/0D7DFE0C5BF5CDD527A619B75A25A2177D417BD0/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143543/CBAC94E0D1731CB8D1034D24F58987E854A8596A/" + } + ], + "points": 38, + "restrictions": { + "include": { + "unit": ["Pyke Syndicate Foot Soldiers"] + } + } + }, { "name": "Shaak Ti", "image": "https://steamusercontent-a.akamaihd.net/ugc/12779783962834644042/1D8FF74F712A51FB40C0B25B0EE6DC5183FD8D60/", From 0417f4b92156039eaebb68e05e7f27e36302adb2 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 21:12:44 -0400 Subject: [PATCH 09/17] Welcome Screen --- contrib/cards/Rebel/RebelUnits.json | 3 ++- mod/src/includes/ui/Welcome.xml | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contrib/cards/Rebel/RebelUnits.json b/contrib/cards/Rebel/RebelUnits.json index ee07950c..52952d09 100644 --- a/contrib/cards/Rebel/RebelUnits.json +++ b/contrib/cards/Rebel/RebelUnits.json @@ -530,7 +530,8 @@ }, "minis": [ { - "bundle": "http://cloud-3.steamusercontent.com/ugc/2174736446809186599/4B154E18EF2C0ADE6C347FC4B15AD856D00546DF/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/14052244614810856390/56285EFFD6CBC4799ADAA95830EB2F10E4120F69/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15565584712668003223/F742EEF3DC4CAE87C9E9D5974891C2A445C48649/" } ], "commands": [ diff --git a/mod/src/includes/ui/Welcome.xml b/mod/src/includes/ui/Welcome.xml index 89df1e22..3c9abccd 100644 --- a/mod/src/includes/ui/Welcome.xml +++ b/mod/src/includes/ui/Welcome.xml @@ -37,7 +37,7 @@ - Welcome to Star Wars: Legion for TTS, v8.0.16-beta. + Welcome to Star Wars: Legion for TTS, v8.0.17-beta. This is a beta release . @@ -46,9 +46,11 @@ CHANGELOG (Since last Beta) - - Add: Imperial High Command - - Add: Weequay Pirates - - Fix: WLO Tank Spawns in SC + - Add: Jedi Council + - Add: New April Upgrades + - Add: Strike Team Changes + - Add: Savage Opress + - Fix: Logray, Sabine, Wicket Models From 08e4ad8a810220ffe51a2998dccdfdc983a4a93a Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 21:29:16 -0400 Subject: [PATCH 10/17] inq fix --- contrib/cards/Republic/RepublicUnits.json | 2 +- contrib/cards/official.json | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/cards/Republic/RepublicUnits.json b/contrib/cards/Republic/RepublicUnits.json index 9a5d76e6..99f61bd2 100644 --- a/contrib/cards/Republic/RepublicUnits.json +++ b/contrib/cards/Republic/RepublicUnits.json @@ -1,7 +1,7 @@ { "Commander": [ { - "name": "Ki Adi Mundi", + "name": "Ki-Adi-Mundi", "title": "Jedi Council", "image": "https://steamusercontent-a.akamaihd.net/ugc/11929402197203734988/9CF2A7578A3EB20BA278864950D163A26901C4F5/", "size": "small", diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 0e527921..f3e30bb9 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -1650,7 +1650,7 @@ "name": "Seventh Sister", "image": "https://steamusercontent-a.akamaihd.net/ugc/12786414084835381664/A059896EB0382A23E79AC5B4A93BB1B80CB47DA8/", "mini": { - "bundle": "https://steamusercontent-a.akamaihd.net/ugc/10804385137011773/5377A3D119B96061C7EFAF2F8469BD5E889F3F13/" + "bundle": "https://steamusercontent-a.akamaihd.net/ugc/2446090001278329724/E8E229E0E3FB6230D9F5A1823C71032A0FC9F2D0/" }, "leader": true, "points": 30, @@ -1664,7 +1664,7 @@ "name": "Fifth Brother", "image": "https://steamusercontent-a.akamaihd.net/ugc/14099995001149120961/E9E1ACB414FFC071E6B08B9F268040166D5D5C35/", "mini": { - "bundle": "steamusercontent-a.akamaihd.net/ugc/2456221571853672166/B86F663B609267644D837B4F18C59614C6785229/" + "bundle": "https://steamusercontent-a.akamaihd.net/ugc/2456221571853672166/B86F663B609267644D837B4F18C59614C6785229/" }, "leader": true, "points": 32, @@ -4948,6 +4948,11 @@ "image": "https://steamusercontent-a.akamaihd.net/ugc/17800273845434794252/84425184A9FA3237F85342B84FD168824FBF90C8/", "pip": 1 }, + { + "name": "A Disturbance in the Force", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15573825798028976140/1303767C2A7775954093FE0105F0E9B2985AA64B/", + "pip": 2 + }, { "name": "Air Support", "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385134030778/90E5CEF9833FED1C5F926FB8878BDBCD5B5099F6/", From e4480afa0e0e7730ee35680224acbbae8207e45c Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 21:34:34 -0400 Subject: [PATCH 11/17] Update official.json --- contrib/cards/official.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/cards/official.json b/contrib/cards/official.json index f3e30bb9..1c6fe01b 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -1557,7 +1557,7 @@ ], "Heavy Weapon": [ { - "name": "Assajj Ventress", + "name": "Asajj Ventress", "image": "https://steamusercontent-a.akamaihd.net/ugc/15926262740421549818/7F23F097083233A0C9348C3215BF09DB072C58E6/", "mini": { "mesh": "http://cloud-3.steamusercontent.com/ugc/785234780869167436/AAA2C61A17BB43F2673AF16D30BD0478B9AAAD2A/", From 6deaf7cb6127c72a336e421497358908a2aec3d1 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 22 Apr 2026 21:37:20 -0400 Subject: [PATCH 12/17] Update official.json --- contrib/cards/official.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 1c6fe01b..70101b98 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -1560,8 +1560,7 @@ "name": "Asajj Ventress", "image": "https://steamusercontent-a.akamaihd.net/ugc/15926262740421549818/7F23F097083233A0C9348C3215BF09DB072C58E6/", "mini": { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234780869167436/AAA2C61A17BB43F2673AF16D30BD0478B9AAAD2A/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234780869167571/EF86CBDA5F361282AD077D61FA81ABF0FEE061A0/" + "bundle": "http://cloud-3.steamusercontent.com/ugc/2022718494181455957/4BB3E42AA412A7ED2ED6F26BFDFA25414F127B71/" }, "leader": true, "points": 26, From 42ed899012852412ad392459c16dcfe888a11251 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Thu, 23 Apr 2026 20:52:41 -0400 Subject: [PATCH 13/17] Improv and Arm Alphabetical From b4430646480362790d34cf82e6dd429e7fe2bde0 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Thu, 23 Apr 2026 20:53:25 -0400 Subject: [PATCH 14/17] improv and arm alphabetical --- contrib/cards/official.json | 294 ++++++++++++++++++------------------ 1 file changed, 147 insertions(+), 147 deletions(-) diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 70101b98..3b809e7e 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -10,204 +10,198 @@ "upgrades": { "Armament": [ { - "name": "Heavy Arm Cannon", - "image": "https://steamusercontent-a.akamaihd.net/ugc/9491942057538415219/C158C02B7135405F2EC1E5B21BC2FB09876E21F8/", - "points": 20, - "restrictions": { - "include": { - "unit": ["Super Tactical Command Droid"] - } - } - }, - { - "name": "Electrostaff", - "image": "https://steamusercontent-a.akamaihd.net/ugc/18437389315593431740/A0F53051C57B1167C6C2A631755BD8D4F0AFCB9B/", - "points": 10, + "name": "A-180 Pistol Config", + "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137779/795B34FF0E53DA5355EA7952A034C6A4CFD003D0/", + "flip": { + "name": "A-180 Rifle Config", + "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137807/208481F3DC8BE18ED10D2A17F12F35869213235C/" + }, + "points": 0, "restrictions": { "include": { - "unit": ["Super Tactical Command Droid"] + "unit": ["Jyn Erso"] } } }, { - "name": "Twin Lightsabers", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10644823733316041135/289BDD492BB3E295276192F60944E251986DAAAF/", + "name": "A-300 Long Range Config", + "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137867/156C35C00A49AC23AE84E5ACCF35ADD6D7CBD820/", + "flip": { + "name": "A-300 Short Range Config", + "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137938/8B2FA2C71505CA93AB086154658132C221BEBE1D/" + }, "points": 0, "restrictions": { "include": { - "unit": ["Jedi Knight Genral", "Jedi Knight"] + "unit": ["Rebel Pathfinders"] } } }, { - "name": "Lightsaber", - "image": "https://steamusercontent-a.akamaihd.net/ugc/9358476422022162198/D59B90B25355B223E8D91DF23E233DFCB591B3F7/", + "name": "A280, Pistol Config", + "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140081077/A5B040BCD34352C6E5375640DE539E526067DBFE/", + "flip": { + "name": "A280, Rifle Config", + "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140081159/19C93D73F4F86E9D7531E2CD784F5492772ED28F/" + }, "points": 0, "restrictions": { "include": { - "unit": ["Jedi Knight Genral", "Jedi Knight"] + "unit": ["Cassian Andor"] } } }, { - "name": "Double-Bladed Lightsaber", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10386689818644119201/B5A0C4C02D76641FFCF96A105E27DFE48C9DEDA9/", - "points": 0, + "name": "Beskar Spear", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639488/EDE8AA68D0589BFB956D68E2A08B31715C5F9D61/", + "points": 15, "restrictions": { "include": { - "unit": ["Jedi Knight Genral", "Jedi Knight"] + "unit": ["Din Djarin"] } } }, { - "name": "Heavy Blaster Pistol (Rebel)", - "image": "https://steamusercontent-a.akamaihd.net/ugc/16982319690732285379/8FA680F434D4EF30BB0DCDB8835BABFB8C90B16F/", - "points": 5, + "name": "BX Deflector Shields", + "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927385/CD3E586656B39D35246C84BAFD6ADB12B665E5E5/", + "points": 18, "restrictions": { "include": { - "unit": ["Rebel Officer", "Rebel Agent"] + "unit": ["BX-Series Droid Commandos"] } } }, { - "name": "Repeating Blaster", - "image": "https://steamusercontent-a.akamaihd.net/ugc/13484211657005252288/0AFB1BBC7DA74BA6713EDCA6869C28E2522C7128/", - "points": 25, + "name": "BX Vibroswords", + "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927392/0B4491CA615FAA34F7EFEDCE08BAD5A06571BE90/", + "points": 6, "restrictions": { "include": { - "unit": ["Rebel Officer", "Rebel Agent"] + "unit": ["BX-Series Droid Commandos"] } } }, { - "name": "Vibro Axe", - "image": "https://steamusercontent-a.akamaihd.net/ugc/12824619755788191989/83D29D8C052D145897BAEF171074D066C4CB143A/", - "points": 8, + "name": "CR-24 Flame Rifle", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140106922/DC1ED64816ECD4A7AB128F05D70EF97408305AAF/", + "points": 10, "restrictions": { "include": { - "unit": ["Rebel Officer", "Rebel Agent"] + "unit": ["Dewback Rider"] } } }, { - "name": "Heavy Blaster Pistol (Empire)", - "image": "https://steamusercontent-a.akamaihd.net/ugc/16148048905111619924/4146F9FBD1CE36B93A82B0403DB3E956510A7271/", - "points": 5, + "name": "DC-17m ICWS Config", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135385953/007D0426E485963714BCBE0B74B2B8AE5B7F1869/", + "flip": { + "name": "DC-17m ICWS Config", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135386003/EB0729A53546B70CB9054BAF5306E3F5368FC9DF/" + }, + "points": 0, "restrictions": { "include": { - "unit": ["Imperial Officer", "Imperial Agent"] + "unit": ["Clone Commandos", "Clone Commandos Delta Squad"] } } }, { - "name": "Stun Baton", - "image": "https://steamusercontent-a.akamaihd.net/ugc/11788115204668483271/6494041D37500BD80CE8CB640CC058D4CDB7C5DD/", - "points": 8, + "name": "Double-Bladed Lightsaber", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10386689818644119201/B5A0C4C02D76641FFCF96A105E27DFE48C9DEDA9/", + "points": 0, "restrictions": { "include": { - "unit": ["Imperial Officer", "Imperial Agent"] + "unit": ["Jedi Knight Genral", "Jedi Knight"] } } }, { - "name": "Z-6 Riot Baton", - "image": "https://steamusercontent-a.akamaihd.net/ugc/11921155978538693026/3426025D9984B223902084BA7DA742C27DEC0D63/", - "points": 8, + "name": "Din's Amban Rifle", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639183/C2D75F184A5F66EA154C4DF44AADA7A9443A9468/", + "points": 10, "restrictions": { "include": { - "unit": ["Imperial Officer", "Imperial Agent"] + "unit": ["Din Djarin"] } } }, { - "name": "A-180 Rifle Config", - "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137807/208481F3DC8BE18ED10D2A17F12F35869213235C/", - "flip": { - "name": "A-180 Pistol Config", - "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137779/795B34FF0E53DA5355EA7952A034C6A4CFD003D0/" - }, - "points": 0, + "name": "Electro Gauntlets", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639059/89380FD599DD6819950BB21C5F940A9074C34A51/", + "points": 10, "restrictions": { "include": { - "unit": ["Jyn Erso"] + "unit": ["Cad Bane"] } } }, { - "name": "A-300 Long Range Config", - "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137867/156C35C00A49AC23AE84E5ACCF35ADD6D7CBD820/", - "flip": { - "name": "A-300 Short Range Config", - "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568137938/8B2FA2C71505CA93AB086154658132C221BEBE1D/" - }, - "points": 0, + "name": "Electrostaff", + "image": "https://steamusercontent-a.akamaihd.net/ugc/18437389315593431740/A0F53051C57B1167C6C2A631755BD8D4F0AFCB9B/", + "points": 10, "restrictions": { "include": { - "unit": ["Rebel Pathfinders"] + "unit": ["Super Tactical Command Droid"] } } }, { - "name": "A280, Rifle Config", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140081159/19C93D73F4F86E9D7531E2CD784F5492772ED28F/", + "name": "E-11D Focused Fire Config", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103278/AC9A32D518E9E70AF6ABBA41F7E10DF58DADFF20/", "flip": { - "name": "A280, Pistol Config", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140081077/A5B040BCD34352C6E5375640DE539E526067DBFE/" + "name": "E-11D Grenade Launcher Config", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103366/FB39C5636706702276566978A5EDD34907C1D8DB/" }, "points": 0, "restrictions": { "include": { - "unit": ["Cassian Andor"] + "unit": ["Imperial Death Troopers"] } } }, { - "name": "CR-24 Flame Rifle", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140106922/DC1ED64816ECD4A7AB128F05D70EF97408305AAF/", - "points": 10, + "name": "Heavy Arm Cannon", + "image": "https://steamusercontent-a.akamaihd.net/ugc/9491942057538415219/C158C02B7135405F2EC1E5B21BC2FB09876E21F8/", + "points": 20, "restrictions": { "include": { - "unit": ["Dewback Rider"] + "unit": ["Super Tactical Command Droid"] } } }, { - "name": "BX Deflector Shields", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927385/CD3E586656B39D35246C84BAFD6ADB12B665E5E5/", - "points": 18, + "name": "Heavy Blaster Pistol (Empire)", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16148048905111619924/4146F9FBD1CE36B93A82B0403DB3E956510A7271/", + "points": 5, "restrictions": { "include": { - "unit": ["BX-Series Droid Commandos"] + "unit": ["Imperial Officer", "Imperial Agent"] } } }, { - "name": "E-11D Focused Fire Config", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103278/AC9A32D518E9E70AF6ABBA41F7E10DF58DADFF20/", - "flip": { - "name": "E-11D Grenade Launcher Config", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140103366/FB39C5636706702276566978A5EDD34907C1D8DB/" - }, - "points": 0, + "name": "Heavy Blaster Pistol (Rebel)", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16982319690732285379/8FA680F434D4EF30BB0DCDB8835BABFB8C90B16F/", + "points": 5, "restrictions": { "include": { - "unit": ["Imperial Death Troopers"] + "unit": ["Rebel Officer", "Rebel Agent"] } } }, { - "name": "Electro Gauntlets", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639059/89380FD599DD6819950BB21C5F940A9074C34A51/", - "points": 10, + "name": "Iden's DLT-20A Rifle", + "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568142679/5583B4B2E96BA55F3A4D2DE46EBF31B130AAA757/", + "points": 15, "restrictions": { "include": { - "unit": ["Cad Bane"] + "unit": ["Iden Versio"] } } }, { - "name": "Iden's DLT-20A Rifle", - "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568142679/5583B4B2E96BA55F3A4D2DE46EBF31B130AAA757/", + "name": "Iden's TL-50 Repeater", + "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568142734/E13169C3DF9153C7196A29DB82578DE1FD659F6D/", "points": 15, "restrictions": { "include": { @@ -249,6 +243,16 @@ } } }, + { + "name": "Lightsaber", + "image": "https://steamusercontent-a.akamaihd.net/ugc/9358476422022162198/D59B90B25355B223E8D91DF23E233DFCB591B3F7/", + "points": 0, + "restrictions": { + "include": { + "unit": ["Jedi Knight Genral", "Jedi Knight"] + } + } + }, { "name": "Looted E-5 Blaster", "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568143554/AAE0C21ACF5E130BCCD15B21BDC1027613DC26BA/", @@ -260,18 +264,18 @@ } }, { - "name": "RT-97C Blaster Rifle", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140107008/1524B081B7155F22B18F85E7789813478AE6EA3C/", - "points": 5, + "name": "Repeating Blaster", + "image": "https://steamusercontent-a.akamaihd.net/ugc/13484211657005252288/0AFB1BBC7DA74BA6713EDCA6869C28E2522C7128/", + "points": 25, "restrictions": { "include": { - "unit": ["Dewback Rider"] + "unit": ["Rebel Officer", "Rebel Agent"] } } }, { - "name": "T-21 Blaster Rifle", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140107073/9B787B4695966A18D0659B28A979EBEFFA1C29BD/", + "name": "RT-97C Blaster Rifle", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140107008/1524B081B7155F22B18F85E7789813478AE6EA3C/", "points": 5, "restrictions": { "include": { @@ -280,126 +284,122 @@ } }, { - "name": "Iden's TL-50 Repeater", - "image": "http://cloud-3.steamusercontent.com/ugc/1680393865568142734/E13169C3DF9153C7196A29DB82578DE1FD659F6D/", + "name": "Saxon's Galar-90 Rifle", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638360/9640DCEEFC8C952C5828F120F9527886B6AD1AEB/", "points": 15, "restrictions": { "include": { - "unit": ["Iden Versio"] + "unit": ["Gar Saxon"] } } }, { - "name": "The Darksaber", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140090412/816EE4F5B469EC8334D0E84042E5C008FC67B04B/", - "points": 15, + "name": "Saxon's Jetpack Rockets", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638324/2B2554057A17324B946ADF61B44CFB94081A770D/", + "points": 10, "restrictions": { "include": { - "unit": ["Sabine Wren"] + "unit": ["Gar Saxon"] } } }, { - "name": "BX Vibroswords", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081139927392/0B4491CA615FAA34F7EFEDCE08BAD5A06571BE90/", - "points": 6, + "name": "Saxon's ZX Flame Projector", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638292/3120A41DA39C3D76C2B2584CB20390E4D8FE90D4/", + "points": 5, "restrictions": { "include": { - "unit": ["BX-Series Droid Commandos"] + "unit": ["Gar Saxon"] } } }, { - "name": "Saxon's Jetpack Rockets", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638324/2B2554057A17324B946ADF61B44CFB94081A770D/", - "points": 10, + "name": "Stun Baton", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11788115204668483271/6494041D37500BD80CE8CB640CC058D4CDB7C5DD/", + "points": 8, "restrictions": { "include": { - "unit": ["Gar Saxon"] + "unit": ["Imperial Officer", "Imperial Agent"] } } }, { - "name": "Saxon's Galar-90 Rifle", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638360/9640DCEEFC8C952C5828F120F9527886B6AD1AEB/", - "points": 15, + "name": "Super Commando Jetpack Rockets", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638126/810C46F8A1B873A7CFFBDC1DDDEE400DFC3AF388/", + "points": 8, "restrictions": { "include": { - "unit": ["Gar Saxon"] + "unit": ["Mandalorian Super Commandos"] } } }, { - "name": "Saxon's ZX Flame Projector", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638292/3120A41DA39C3D76C2B2584CB20390E4D8FE90D4/", + "name": "T-21 Blaster Rifle", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385140107073/9B787B4695966A18D0659B28A979EBEFFA1C29BD/", "points": 5, "restrictions": { "include": { - "unit": ["Gar Saxon"] + "unit": ["Dewback Rider"] } } }, { - "name": "The Darksaber (Maul)", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148637945/3B49E86E68EBCB65154B12ECD4336463F7400B95/", - "points": 10, + "name": "The Darksaber", + "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140090412/816EE4F5B469EC8334D0E84042E5C008FC67B04B/", + "points": 15, "restrictions": { "include": { - "unit": ["Maul"] + "unit": ["Sabine Wren"] } } }, { - "name": "Super Commando Jetpack Rockets", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638126/810C46F8A1B873A7CFFBDC1DDDEE400DFC3AF388/", - "points": 8, + "name": "The Darksaber (Gideon)", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16625983135926386325/491ADB4AF793015C774CBB05E327DFBB53A59E7B/", + "points": 15, "restrictions": { "include": { - "unit": ["Mandalorian Super Commandos"] + "unit": ["Moff Gideon"] } } }, { - "name": "Din's Amban Rifle", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639183/C2D75F184A5F66EA154C4DF44AADA7A9443A9468/", + "name": "The Darksaber (Maul)", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148637945/3B49E86E68EBCB65154B12ECD4336463F7400B95/", "points": 10, "restrictions": { "include": { - "unit": ["Din Djarin"] + "unit": ["Maul"] } } }, { - "name": "Beskar Spear", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639488/EDE8AA68D0589BFB956D68E2A08B31715C5F9D61/", - "points": 15, + "name": "Twin Lightsabers", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10644823733316041135/289BDD492BB3E295276192F60944E251986DAAAF/", + "points": 0, "restrictions": { "include": { - "unit": ["Din Djarin"] + "unit": ["Jedi Knight Genral", "Jedi Knight"] } } }, { - "name": "The Darksaber (Gideon)", - "image": "https://steamusercontent-a.akamaihd.net/ugc/16625983135926386325/491ADB4AF793015C774CBB05E327DFBB53A59E7B/", - "points": 15, + "name": "Vibro Axe", + "image": "https://steamusercontent-a.akamaihd.net/ugc/12824619755788191989/83D29D8C052D145897BAEF171074D066C4CB143A/", + "points": 8, "restrictions": { "include": { - "unit": ["Moff Gideon"] + "unit": ["Rebel Officer", "Rebel Agent"] } } }, { - "name": "DC-17m ICWS Config", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135385953/007D0426E485963714BCBE0B74B2B8AE5B7F1869/", - "flip": { - "name": "DC-17m ICWS Config", - "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385135386003/EB0729A53546B70CB9054BAF5306E3F5368FC9DF/" - }, - "points": 0, + "name": "Z-6 Riot Baton", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11921155978538693026/3426025D9984B223902084BA7DA742C27DEC0D63/", + "points": 8, "restrictions": { "include": { - "unit": ["Clone Commandos", "Clone Commandos Delta Squad"] + "unit": ["Imperial Officer", "Imperial Agent"] } } } @@ -422,7 +422,7 @@ }, { "name": "Improvised Orders", - "image": "https://steamusercontent-a.akamaihd.net/ugc/9869682046426627943/152512DE2EE5592159A7D5A4E9BB7111A0C729B5/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/16226117530699489950/0082F67676066542C5BA5DA1D970DD18CFAFCCA1/", "points": 5 }, { From d349a8c868ae664df314991a71186e91d89b76c1 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Thu, 23 Apr 2026 21:03:12 -0400 Subject: [PATCH 15/17] Rebel Commando Change --- contrib/cards/Rebel/RebelUnits.json | 20 ++++++++++---------- contrib/cards/official.json | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/cards/Rebel/RebelUnits.json b/contrib/cards/Rebel/RebelUnits.json index 52952d09..85c3ba24 100644 --- a/contrib/cards/Rebel/RebelUnits.json +++ b/contrib/cards/Rebel/RebelUnits.json @@ -970,20 +970,20 @@ }, "minis": [ { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173156/D637683F992DD0C4488252BE266EEEA1F26006B0/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541172655/B10522A40482843AF69A3F321BD091B0ECF52C6B/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/17504878929475056902/7D83CFA0BD23993580F90863A33AD5743E8FC778/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9547146995441004401/223F75C5260F31457426962BDE853215FD2E4696/" }, { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541172497/B3E1593143504101920CC6419BE7C2EAEF52993F/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541188141/6E23E29BB42963B94A0B7DFE01C4C49D776D9657/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11486357574412562426/7547BC81C08E0B15022770FF6FBF33FA66D1DB43/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9789374328584101623/2B3AABFCECA29D3EBA6B87F1D33C1913A3FB3FAE//" }, { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173253/155BAA01BA51A8EB524DD434A3C512D8C0B3A04B/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541172655/B10522A40482843AF69A3F321BD091B0ECF52C6B/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/17377233370710228946/0A4A965CB67E1E6B4B2A58A0E949D588D41AAD6B/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14988427562404509763/03DF88DCE5809143B7DEA0C3ADD9F756DA86B23E/" }, { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173354/3483C6FB73C66481BC6CCC398BAB8E796F7EC076/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541188141/6E23E29BB42963B94A0B7DFE01C4C49D776D9657/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16097408999552065934/9F18078D897B967B552FCE7B9D7F198FC50B58E4/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9566804180720822422/B4A75666546AF78CC290D4030754377548983638/" } ] }, @@ -1270,8 +1270,8 @@ }, "minis": [ { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173156/D637683F992DD0C4488252BE266EEEA1F26006B0/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541172655/B10522A40482843AF69A3F321BD091B0ECF52C6B/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16453620303646761666/4D8DBD4999B75F314799A70F47115CAA5BE658E2/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/17012966922360507699/78F075440D9D93CD87119353FA24E886EEBBAB3A/" } ] }, diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 3b809e7e..604904d7 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -1986,8 +1986,8 @@ "name": "DH-447 Sniper", "image": "https://steamusercontent-a.akamaihd.net/ugc/16916821861583515066/6783DCC4833EAE22DCA9EDB9C8F585AE29BA13A3/", "mini": { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234780862776611/B8222AA4A3B680E969DC106C8A281D11845994EB/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234780862776974/21649563BC0CB84E12C0B249C720919F528596D3/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16764529609771011077/213762EEF0A83B94E394EC2F3F0C200D5A335C58/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/11792523840308175523/31EE56B2C0FEE8CE25150EADE79C5AA483182889/" }, "points": 20, "restrictions": { @@ -2323,8 +2323,8 @@ "name": "Proton Charge Saboteur", "image": "https://steamusercontent-a.akamaihd.net/ugc/11476891187215628852/91F18B14DEB61395ADFE0900F2CB5C658414C7F6/", "mini": { - "mesh": "http://cloud-3.steamusercontent.com/ugc/785234540541173465/8193FD1F0862270CD23BA9243679840BE6324DC6/", - "diffuse": "http://cloud-3.steamusercontent.com/ugc/785234540541173570/3C100E92F0DEDEF117D3A0392D3271951BC90DD0/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/10169115375508355169/2616D215477E25CD2E74B2F11C39CB911461A989/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/14732946777135222961/B81F98352131D2B5ED40D18272103E8E127C9964/" }, "points": 14, "restrictions": { From 12b115eed7af133544fafd8092ba6ac7ad9b54d7 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Thu, 23 Apr 2026 21:26:53 -0400 Subject: [PATCH 16/17] BSE new models --- .../ShadowCollective/BlackSunEnforcersUnit.json | 15 ++++++++------- .../cards/ShadowCollective/BlackSunVigoUnit.json | 3 ++- contrib/cards/official.json | 15 ++++++++------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json b/contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json index 4a232376..c5c7e7d9 100644 --- a/contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json +++ b/contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json @@ -13,19 +13,20 @@ }, "minis": [ { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1745728387706845475/01738B0D52E2D9C2870D6E33A2D05ECD12201C85/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/15119947962689322389/8EC382E90223BC184162C54AFF3EDAE1436DA2AA/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/18136160122757222499/97D7733312EE4677B4694F72C21A61FD8365690E/" }, { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143724/48B5A35E10B4977E255D889A8FCAEA8C980A11A9/", - "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/11857728936195634014/66FB83A411E5A561A9A5927C0FDEB396DAF6AE20/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16452722805588228328/EDA05A0B40EFFA898015BE31588B19E6BB72B4A2/" }, { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143724/48B5A35E10B4977E255D889A8FCAEA8C980A11A9/", - "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13538216675182514309/80D3D2926D6723131723E027151D80E807BA1FF4/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15549057142882936018/8E3A2116FFD18C5122767F9038D43FF549248278/" }, { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143724/48B5A35E10B4977E255D889A8FCAEA8C980A11A9/", - "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/16839420302039891942/3031489A090A438C10C4B37690E4E5B507DD4913/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/13883212304201737617/9B792D3CE9B23D2354F80B2B159F4FD13728A98F/" } ] } diff --git a/contrib/cards/ShadowCollective/BlackSunVigoUnit.json b/contrib/cards/ShadowCollective/BlackSunVigoUnit.json index 9ed7b4a8..b817a460 100644 --- a/contrib/cards/ShadowCollective/BlackSunVigoUnit.json +++ b/contrib/cards/ShadowCollective/BlackSunVigoUnit.json @@ -11,7 +11,8 @@ }, "minis": [ { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143763/E93BA6716A05CA95AE2EA3B7C0DFD8AF145D5C22/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13653552510521459623/B060AC4F7AE0132A573CF92984494FDF2C4640F2/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9553158029415913253/8761E25E4B155BE4124E8B1A5B922C6941A153A3/" } ] } diff --git a/contrib/cards/official.json b/contrib/cards/official.json index 604904d7..aa0c69d6 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -2631,8 +2631,8 @@ "name": "Mag-Det Enforcer", "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638823/D41C1DD1A9B63A173D667167C2CA1E79D0BA2F1E/", "mini": { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143649/BBBA0D26FB46EAD96421C4B77FE779B5F0F848AA/", - "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/12110813277322191269/AD4182EA4619D0E4B9DA7F6F12F70BEAFD8D6D02/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/11212068194581458113/33DF944B89A6B7DBC0DE2141A800CCF5950553E6/" }, "points": 16, "restrictions": { @@ -2645,8 +2645,8 @@ "name": "Scatter Gun Enforcer", "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148638229/542B7031B727D74585CE7FA38EEA086252152001/", "mini": { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143685/C75388115AFCF42ACC79E2C16FEF36755C975AA0/", - "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13391993677710573883/836E63E52F681D338B1DBCF19D7EB431E0491BCD/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15016334003745601497/65BF4564688C26E8ECC5EE615C195320B0BFA978/" }, "points": 28, "restrictions": { @@ -3989,8 +3989,8 @@ "name": "Black Sun Enforcer", "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639440/31A3527F3D9D8579BDBD433D5F30F1EF973A47C8/", "mini": { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143724/48B5A35E10B4977E255D889A8FCAEA8C980A11A9/", - "secondary": "http://cloud-3.steamusercontent.com/ugc/1856061112420143328/3D6F3C2E8DFB78B9B748FFC8F339B9C568D7408E/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13538216675182514309/80D3D2926D6723131723E027151D80E807BA1FF4/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15549057142882936018/8E3A2116FFD18C5122767F9038D43FF549248278/" }, "points": 11, "restrictions": { @@ -4003,7 +4003,8 @@ "name": "Black Sun Vigo", "image": "https://steamusercontent-a.akamaihd.net/ugc/10804385148639389/E73718337CFAD8FD65CD341B6CF649BA181707AD/", "mini": { - "bundle": "http://cloud-3.steamusercontent.com/ugc/1856061112420143763/E93BA6716A05CA95AE2EA3B7C0DFD8AF145D5C22/" + "mesh": "https://steamusercontent-a.akamaihd.net/ugc/13653552510521459623/B060AC4F7AE0132A573CF92984494FDF2C4640F2/", + "diffuse": "https://steamusercontent-a.akamaihd.net/ugc/9553158029415913253/8761E25E4B155BE4124E8B1A5B922C6941A153A3/" }, "leader": true, "points": 20, From 8af1ff91715cf5bb7a5d9cf1723322aef9cb48a5 Mon Sep 17 00:00:00 2001 From: halestom15 Date: Wed, 20 May 2026 00:24:12 -0400 Subject: [PATCH 17/17] Mercenary + Errata Change from ShadowCollective nomenclature to Mercenary to add Ohnaka Gang. Add Geo Engineers. Delete in mod maps. Add Heavy Droid Trooper unit type --- contrib/cards/Empire/EmpireUnits.json | 22 ++++---- .../BlackSunEnforcersUnit.json | 0 .../BlackSunVigoUnit.json | 0 .../BosskUnit.json | 0 .../CadBaneUnit.json | 0 .../DinUnit.json | 0 .../HondoUnit.json | 0 .../IG11Unit.json | 0 .../MercenaryUnits.json} | 21 ++++---- .../PykeSyndicateCapoUnit.json | 0 .../PykeSyndicateFootSoldiersUnit.json | 0 .../SwoopBikeRidersUnit.json | 0 .../WLO5SpeederTankUnit.json | 0 .../WeequayPiratesUnit.json | 0 contrib/cards/Rebel/RebelUnits.json | 16 +++--- contrib/cards/Republic/RepublicUnits.json | 12 ++--- contrib/cards/Separatist/SeparatistUnits.json | 50 +++++++++++++++---- contrib/cards/official.json | 23 +++++++-- contrib/maps/skirmish.json | 23 +-------- mod/schema/deps/UnitTypes.json | 2 + mod/src/StarWarsLegion.lua | 48 +++++++++--------- mod/src/includes/Deck.ttslua | 2 +- mod/src/includes/SpawnList.ttslua | 2 +- mod/src/includes/data/ListBuilderNew.ttslua | 2 +- mod/src/includes/ui/Welcome.xml | 6 +-- 25 files changed, 127 insertions(+), 102 deletions(-) rename contrib/cards/{ShadowCollective => Mercenary}/BlackSunEnforcersUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/BlackSunVigoUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/BosskUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/CadBaneUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/DinUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/HondoUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/IG11Unit.json (100%) rename contrib/cards/{ShadowCollective/ShadowCollectiveUnits.json => Mercenary/MercenaryUnits.json} (89%) rename contrib/cards/{ShadowCollective => Mercenary}/PykeSyndicateCapoUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/PykeSyndicateFootSoldiersUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/SwoopBikeRidersUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/WLO5SpeederTankUnit.json (100%) rename contrib/cards/{ShadowCollective => Mercenary}/WeequayPiratesUnit.json (100%) diff --git a/contrib/cards/Empire/EmpireUnits.json b/contrib/cards/Empire/EmpireUnits.json index 4ab0a774..7194d350 100644 --- a/contrib/cards/Empire/EmpireUnits.json +++ b/contrib/cards/Empire/EmpireUnits.json @@ -331,10 +331,10 @@ ] }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json" }, { - "content": "contrib/cards/ShadowCollective/BlackSunVigoUnit.json" + "content": "contrib/cards/Mercenary/BlackSunVigoUnit.json" } ], "Operative": [ @@ -387,10 +387,10 @@ "additionalObjects": ["Victory Token"] }, { - "content": "contrib/cards/ShadowCollective/BosskUnit.json" + "content": "contrib/cards/Mercenary/BosskUnit.json" }, { - "content": "contrib/cards/ShadowCollective/CadBaneUnit.json" + "content": "contrib/cards/Mercenary/CadBaneUnit.json" }, { "name": "Darth Vader", @@ -481,13 +481,13 @@ "additionalObjects": ["Victory Token"] }, { - "content": "contrib/cards/ShadowCollective/DinUnit.json" + "content": "contrib/cards/Mercenary/DinUnit.json" }, { - "content": "contrib/cards/ShadowCollective/IG11Unit.json" + "content": "contrib/cards/Mercenary/IG11Unit.json" }, { - "content": "contrib/cards/ShadowCollective/HondoUnit.json" + "content": "contrib/cards/Mercenary/HondoUnit.json" }, { "name": "Fifth Brother", @@ -790,13 +790,13 @@ ] }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json" }, { - "content": "contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json" + "content": "contrib/cards/Mercenary/BlackSunEnforcersUnit.json" }, { - "content": "contrib/cards/ShadowCollective/WeequayPiratesUnit.json" + "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json" } ], "Special Forces": [ @@ -1197,7 +1197,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json" + "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json" } ] } diff --git a/contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json b/contrib/cards/Mercenary/BlackSunEnforcersUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json rename to contrib/cards/Mercenary/BlackSunEnforcersUnit.json diff --git a/contrib/cards/ShadowCollective/BlackSunVigoUnit.json b/contrib/cards/Mercenary/BlackSunVigoUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/BlackSunVigoUnit.json rename to contrib/cards/Mercenary/BlackSunVigoUnit.json diff --git a/contrib/cards/ShadowCollective/BosskUnit.json b/contrib/cards/Mercenary/BosskUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/BosskUnit.json rename to contrib/cards/Mercenary/BosskUnit.json diff --git a/contrib/cards/ShadowCollective/CadBaneUnit.json b/contrib/cards/Mercenary/CadBaneUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/CadBaneUnit.json rename to contrib/cards/Mercenary/CadBaneUnit.json diff --git a/contrib/cards/ShadowCollective/DinUnit.json b/contrib/cards/Mercenary/DinUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/DinUnit.json rename to contrib/cards/Mercenary/DinUnit.json diff --git a/contrib/cards/ShadowCollective/HondoUnit.json b/contrib/cards/Mercenary/HondoUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/HondoUnit.json rename to contrib/cards/Mercenary/HondoUnit.json diff --git a/contrib/cards/ShadowCollective/IG11Unit.json b/contrib/cards/Mercenary/IG11Unit.json similarity index 100% rename from contrib/cards/ShadowCollective/IG11Unit.json rename to contrib/cards/Mercenary/IG11Unit.json diff --git a/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json b/contrib/cards/Mercenary/MercenaryUnits.json similarity index 89% rename from contrib/cards/ShadowCollective/ShadowCollectiveUnits.json rename to contrib/cards/Mercenary/MercenaryUnits.json index 79dda81c..4a2d32e4 100644 --- a/contrib/cards/ShadowCollective/ShadowCollectiveUnits.json +++ b/contrib/cards/Mercenary/MercenaryUnits.json @@ -38,10 +38,10 @@ ] }, { - "content": "contrib/cards/ShadowCollective/BlackSunVigoUnit.json" + "content": "contrib/cards/Mercenary/BlackSunVigoUnit.json" }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json" } ], "Operative": [ @@ -121,21 +121,24 @@ ] }, { - "content": "contrib/cards/ShadowCollective/CadBaneUnit.json" + "content": "contrib/cards/Mercenary/CadBaneUnit.json" }, { - "content": "contrib/cards/ShadowCollective/BosskUnit.json" + "content": "contrib/cards/Mercenary/BosskUnit.json" + }, + { + "content": "contrib/cards/Mercenary/HondoUnit.json" } ], "Corps": [ { - "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json" }, { - "content": "contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json" + "content": "contrib/cards/Mercenary/BlackSunEnforcersUnit.json" }, { - "content": "contrib/cards/ShadowCollective/WeequayPiratesUnit.json" + "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json" } ], "Special Forces": [ @@ -172,7 +175,7 @@ ], "Support": [ { - "content": "contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json" + "content": "contrib/cards/Mercenary/SwoopBikeRidersUnit.json" } ], "Heavy": [ @@ -200,7 +203,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json" + "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json" } ] } diff --git a/contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json b/contrib/cards/Mercenary/PykeSyndicateCapoUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json rename to contrib/cards/Mercenary/PykeSyndicateCapoUnit.json diff --git a/contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json b/contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json rename to contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json diff --git a/contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json b/contrib/cards/Mercenary/SwoopBikeRidersUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json rename to contrib/cards/Mercenary/SwoopBikeRidersUnit.json diff --git a/contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json b/contrib/cards/Mercenary/WLO5SpeederTankUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json rename to contrib/cards/Mercenary/WLO5SpeederTankUnit.json diff --git a/contrib/cards/ShadowCollective/WeequayPiratesUnit.json b/contrib/cards/Mercenary/WeequayPiratesUnit.json similarity index 100% rename from contrib/cards/ShadowCollective/WeequayPiratesUnit.json rename to contrib/cards/Mercenary/WeequayPiratesUnit.json diff --git a/contrib/cards/Rebel/RebelUnits.json b/contrib/cards/Rebel/RebelUnits.json index 85c3ba24..4ddc021e 100644 --- a/contrib/cards/Rebel/RebelUnits.json +++ b/contrib/cards/Rebel/RebelUnits.json @@ -242,7 +242,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json" }, { "name": "Rebel Officer", @@ -345,7 +345,7 @@ ], "Operative": [ { - "content": "contrib/cards/ShadowCollective/HondoUnit.json" + "content": "contrib/cards/Mercenary/HondoUnit.json" }, { "name": "Han Solo", @@ -721,10 +721,10 @@ ] }, { - "content": "contrib/cards/ShadowCollective/DinUnit.json" + "content": "contrib/cards/Mercenary/DinUnit.json" }, { - "content": "contrib/cards/ShadowCollective/IG11Unit.json" + "content": "contrib/cards/Mercenary/IG11Unit.json" }, { "name": "Ahsoka Tano", @@ -908,10 +908,10 @@ ] }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json" }, { - "content": "contrib/cards/ShadowCollective/WeequayPiratesUnit.json" + "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json" }, { "name": "Ewok Skirmishers", @@ -1298,7 +1298,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json" + "content": "contrib/cards/Mercenary/SwoopBikeRidersUnit.json" } ], "Heavy": [ @@ -1410,7 +1410,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json" + "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json" } ] } diff --git a/contrib/cards/Republic/RepublicUnits.json b/contrib/cards/Republic/RepublicUnits.json index 99f61bd2..c837017f 100644 --- a/contrib/cards/Republic/RepublicUnits.json +++ b/contrib/cards/Republic/RepublicUnits.json @@ -330,7 +330,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json" }, { "name": "Clone Commander Cody", @@ -371,7 +371,7 @@ ], "Operative": [ { - "content": "contrib/cards/ShadowCollective/HondoUnit.json" + "content": "contrib/cards/Mercenary/HondoUnit.json" }, { "name": "Shaak Ti", @@ -618,10 +618,10 @@ ] }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json" }, { - "content": "contrib/cards/ShadowCollective/WeequayPiratesUnit.json" + "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json" } ], "Special Forces": [ @@ -876,7 +876,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json" + "content": "contrib/cards/Mercenary/SwoopBikeRidersUnit.json" }, { "name": "Raddaugh Gnasp Fluttercraft", @@ -1042,7 +1042,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json" + "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json" } ] } diff --git a/contrib/cards/Separatist/SeparatistUnits.json b/contrib/cards/Separatist/SeparatistUnits.json index 49740196..cb363bbc 100644 --- a/contrib/cards/Separatist/SeparatistUnits.json +++ b/contrib/cards/Separatist/SeparatistUnits.json @@ -282,10 +282,10 @@ ] }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateCapoUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateCapoUnit.json" }, { - "content": "contrib/cards/ShadowCollective/BlackSunVigoUnit.json" + "content": "contrib/cards/Mercenary/BlackSunVigoUnit.json" }, { "name": "Poggle the Lesser", @@ -383,13 +383,13 @@ ] }, { - "content": "contrib/cards/ShadowCollective/HondoUnit.json" + "content": "contrib/cards/Mercenary/HondoUnit.json" }, { - "content": "contrib/cards/ShadowCollective/CadBaneUnit.json" + "content": "contrib/cards/Mercenary/CadBaneUnit.json" }, { - "content": "contrib/cards/ShadowCollective/BosskUnit.json" + "content": "contrib/cards/Mercenary/BosskUnit.json" }, { "name": "Maul", @@ -556,13 +556,13 @@ ] }, { - "content": "contrib/cards/ShadowCollective/PykeSyndicateFootSoldiersUnit.json" + "content": "contrib/cards/Mercenary/PykeSyndicateFootSoldiersUnit.json" }, { - "content": "contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json" + "content": "contrib/cards/Mercenary/BlackSunEnforcersUnit.json" }, { - "content": "contrib/cards/ShadowCollective/WeequayPiratesUnit.json" + "content": "contrib/cards/Mercenary/WeequayPiratesUnit.json" }, { "name": "Geonosian Warriors", @@ -594,6 +594,34 @@ "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/" } ] + }, + { + "name": "Geonosian Warriors", + "title": "Geonosian Engineers", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11895799947387687406/705B68582845528AF5FD5EEED97415BB9B36F748/", + "size": "small", + "type": "Trooper", + "points": 45, + "speed": 2, + "upgrades": {}, + "minis": [ + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/2058763770177202081/37F68E146C49B315AA46E15BE88DDB56AE97646C/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/" + }, + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/2058763770177201554/7AEA5B0A98A298731F6BE51591401BBF095A5797/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/" + }, + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/2058763770177201933/E0DBF0D812FFF4F7F3A77CF1E4EAB84F78B8C49E/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/" + }, + { + "bundle": "http://cloud-3.steamusercontent.com/ugc/2058763770177202012/76CB0371503304D5AAF562E5E2F04961CD206090/", + "secondary": "http://cloud-3.steamusercontent.com/ugc/2058763770177195881/84020A8311904050DC9309FE9109D47BC41FE4AA/" + } + ] } ], "Special Forces": [ @@ -769,7 +797,7 @@ }, { "name": "Droidekas", - "image": "https://steamusercontent-a.akamaihd.net/ugc/17494420314363813844/3FE04FCFAF3815AA2DE9E9C52101B5038AB6F892/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15998077387230471508/D99F8B4E4B7AF5FE30C23F4528F776797333B602/", "size": "medium", "type": "Emplacement Trooper", "points": 67, @@ -813,7 +841,7 @@ }, { "name": "STAP Riders", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131433789/32FE5B587A5DD8D208101FCE74CD2BE690483F37/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/15661631464886192384/E464BADECADC111B8100A6E02301597C467FDD72/", "size": "medium", "type": "Repulsor Vehicle", "points": 80, @@ -958,7 +986,7 @@ ] }, { - "content": "contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json" + "content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json" } ] } diff --git a/contrib/cards/official.json b/contrib/cards/official.json index aa0c69d6..2800596f 100644 --- a/contrib/cards/official.json +++ b/contrib/cards/official.json @@ -4,7 +4,7 @@ "Empire": "Empire/EmpireUnits.json", "Republic": "Republic/RepublicUnits.json", "Separatist": "Separatist/SeparatistUnits.json", - "ShadowCollective": "ShadowCollective/ShadowCollectiveUnits.json" + "Mercenary": "Mercenary/MercenaryUnits.json" }, "upgrades": { @@ -437,7 +437,7 @@ }, { "name": "Trusted Agent", - "image": "https://steamusercontent-a.akamaihd.net/ugc/17954061666704112600/9401A70D88A98BA9FC5B5D8E56B0FA7F3B95961B/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/13647228434712340827/31340C9F16017CEC33FF34C97256BFBEE7AB7AAF/", "points": 5 }, { @@ -4764,7 +4764,7 @@ }, { "name": "Insatiable Curiosity", - "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081140100414/E3E6C5563CD533DC0560C50590B8A989E382E7BC/", + "image": "https://steamusercontent-a.akamaihd.net/ugc/17077726437706151926/A1FAE61CD17F3A228082987AF90699FBEDF7F7E3/", "points": 8, "restrictions": { "include": { @@ -5040,6 +5040,23 @@ "image": "https://steamusercontent-a.akamaihd.net/ugc/59218081131527719/02ACE80E8D14CF7DC017156A128F34A09F725CF2/", "pip": 3 } + ], + "Mercenary": [ + { + "name": "Insolence?! We are Pirates!", + "image": "https://steamusercontent-a.akamaihd.net/ugc/17838958063167701144/B10D335A59FFE4CEB954585E0DB0E42DB67DE339/", + "pip": 1 + }, + { + "name": "Speak Softly and Drive a Big Tank", + "image": "https://steamusercontent-a.akamaihd.net/ugc/10689439603598113404/87E51EEC4B2D75528FA0277BA78C5F52DAF9886A/", + "pip": 2 + }, + { + "name": "I Smell Profit", + "image": "https://steamusercontent-a.akamaihd.net/ugc/11974419819645442132/21863ABAA56F91ACFBEDC358ECC81A9D01D80BAE/", + "pip": 3 + } ] }, diff --git a/contrib/maps/skirmish.json b/contrib/maps/skirmish.json index 96726aa2..93d51406 100644 --- a/contrib/maps/skirmish.json +++ b/contrib/maps/skirmish.json @@ -1,22 +1 @@ -[ - { - "name": "Bespin Traffic Stop", - "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340767532/E7561682A2D59D5A4B2B1BFB991A1814CAF03756/" - }, - { - "name": "Desert Crossroads", - "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340768205/3722DCA70A4EA409752FA48547017EE6DF6E5CE4/" - }, - { - "name": "Imperial Checkpoint", - "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340768629/101233D6B377074CD1ECFC0A77D9AAED275A9737/" - }, - { - "name": "Woodland Battle", - "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340768989/2F91C4693A43C4D4F5940A58FB414C84FC74B8DF/" - }, - { - "name": "Woodland Landing Pad", - "url": "http://cloud-3.steamusercontent.com/ugc/1754683015340769304/E7C01A86D916B57FF2189D15E864EA085913FBDF/" - } -] +[{}] diff --git a/mod/schema/deps/UnitTypes.json b/mod/schema/deps/UnitTypes.json index aff4f3db..3330ac0e 100644 --- a/mod/schema/deps/UnitTypes.json +++ b/mod/schema/deps/UnitTypes.json @@ -11,6 +11,8 @@ "Creature Trooper", "Emplacement Trooper", "Ground Vehicle", + "Heavy Trooper", + "Heavy Droid Trooper", "Repulsor Vehicle", "Trooper", "Wookiee Trooper" diff --git a/mod/src/StarWarsLegion.lua b/mod/src/StarWarsLegion.lua index 9f41cc30..58659bb7 100644 --- a/mod/src/StarWarsLegion.lua +++ b/mod/src/StarWarsLegion.lua @@ -435,12 +435,12 @@ function onload(saveData) commandTokenData.red.republicSupport = commandTokenData.red.sup commandTokenData.red.republicHeavy = commandTokenData.red.heavy - commandTokenData.red.shadowcollectiveCommander = commandTokenData.red.com - commandTokenData.red.shadowcollectiveOperative = commandTokenData.red.op - commandTokenData.red.shadowcollectiveCorps = commandTokenData.red.corps - commandTokenData.red.shadowcollectiveSpecialforces = commandTokenData.red.sf - commandTokenData.red.shadowcollectiveSupport = commandTokenData.red.sup - commandTokenData.red.shadowcollectiveHeavy = commandTokenData.red.heavy + commandTokenData.red.mercenaryCommander = commandTokenData.red.com + commandTokenData.red.mercenaryOperative = commandTokenData.red.op + commandTokenData.red.mercenaryCorps = commandTokenData.red.corps + commandTokenData.red.mercenarySpecialforces = commandTokenData.red.sf + commandTokenData.red.mercenarySupport = commandTokenData.red.sup + commandTokenData.red.mercenaryHeavy = commandTokenData.red.heavy commandTokenData.blue = {} @@ -479,12 +479,12 @@ function onload(saveData) commandTokenData.blue.republicSupport = commandTokenData.blue.sup commandTokenData.blue.republicHeavy = commandTokenData.blue.heavy - commandTokenData.blue.shadowcollectiveCommander = commandTokenData.blue.com - commandTokenData.blue.shadowcollectiveOperative = commandTokenData.blue.op - commandTokenData.blue.shadowcollectiveCorps = commandTokenData.blue.corps - commandTokenData.blue.shadowcollectiveSpecialforces = commandTokenData.blue.sf - commandTokenData.blue.shadowcollectiveSupport = commandTokenData.blue.sup - commandTokenData.blue.shadowcollectiveHeavy = commandTokenData.blue.heavy + commandTokenData.blue.mercenaryCommander = commandTokenData.blue.com + commandTokenData.blue.mercenaryOperative = commandTokenData.blue.op + commandTokenData.blue.mercenaryCorps = commandTokenData.blue.corps + commandTokenData.blue.mercenarySpecialforces = commandTokenData.blue.sf + commandTokenData.blue.mercenarySupport = commandTokenData.blue.sup + commandTokenData.blue.mercenaryHeavy = commandTokenData.blue.heavy commandTokenTrayData = {} commandTokenTrayData.red = {} @@ -513,12 +513,12 @@ function onload(saveData) commandTokenTrayData.red.separatistSpecialforces = "abb909" commandTokenTrayData.red.separatistSupport = "ce9be9" commandTokenTrayData.red.separatistHeavy = "f68963" - commandTokenTrayData.red.shadowcollectiveCommander = "071592" - commandTokenTrayData.red.shadowcollectiveOperative = "369fa9" - commandTokenTrayData.red.shadowcollectiveCorps = "af4c28" - commandTokenTrayData.red.shadowcollectiveSpecialforces = "abb909" - commandTokenTrayData.red.shadowcollectiveSupport = "ce9be9" - commandTokenTrayData.red.shadowcollectiveHeavy = "f68963" + commandTokenTrayData.red.mercenaryCommander = "071592" + commandTokenTrayData.red.mercenaryOperative = "369fa9" + commandTokenTrayData.red.mercenaryCorps = "af4c28" + commandTokenTrayData.red.mercenarySpecialforces = "abb909" + commandTokenTrayData.red.mercenarySupport = "ce9be9" + commandTokenTrayData.red.mercenaryHeavy = "f68963" commandTokenTrayData.red.stack = "e2202d" commandTokenTrayData.blue = {} @@ -547,12 +547,12 @@ function onload(saveData) commandTokenTrayData.blue.separatistSpecialforces = "3832c6" commandTokenTrayData.blue.separatistSupport = "d2c857" commandTokenTrayData.blue.separatistHeavy = "6d221d" - commandTokenTrayData.blue.shadowcollectiveCommander = "57ab78" - commandTokenTrayData.blue.shadowcollectiveOperative = "b30914" - commandTokenTrayData.blue.shadowcollectiveCorps = "e5e8df" - commandTokenTrayData.blue.shadowcollectiveSpecialforces = "3832c6" - commandTokenTrayData.blue.shadowcollectiveSupport = "d2c857" - commandTokenTrayData.blue.shadowcollectiveHeavy = "6d221d" + commandTokenTrayData.blue.mercenaryCommander = "57ab78" + commandTokenTrayData.blue.mercenaryOperative = "b30914" + commandTokenTrayData.blue.mercenaryCorps = "e5e8df" + commandTokenTrayData.blue.mercenarySpecialforces = "3832c6" + commandTokenTrayData.blue.mercenarySupport = "d2c857" + commandTokenTrayData.blue.mercenaryHeavy = "6d221d" commandTokenTrayData.blue.stack = "c9f9d0" -- standby tokens diff --git a/mod/src/includes/Deck.ttslua b/mod/src/includes/Deck.ttslua index 79953fc9..a51b79db 100644 --- a/mod/src/includes/Deck.ttslua +++ b/mod/src/includes/Deck.ttslua @@ -484,7 +484,7 @@ function Deck:_isUpgradeValidFor(upgrade, unit) if unitAlignment == "LIGHT" then return unit.faction:upper() == "REBEL" or unit.faction:upper() == "REPUBLIC" elseif unitAlignment == "DARK" then - return unit.faction:upper() == "EMPIRE" or unit.faction:upper() == "SEPARATIST" or unit.faction:upper() == "SHADOWCOLLECTIVE" + return unit.faction:upper() == "EMPIRE" or unit.faction:upper() == "SEPARATIST" or unit.faction:upper() == "MERCENARY" end end end diff --git a/mod/src/includes/SpawnList.ttslua b/mod/src/includes/SpawnList.ttslua index e361cb7b..33902579 100644 --- a/mod/src/includes/SpawnList.ttslua +++ b/mod/src/includes/SpawnList.ttslua @@ -317,7 +317,7 @@ local function initListSpawner(params) rebel = 1, separatist = 1, republic = 1, - shadowcollective = 1, + mercenary = 1, })[faction:lower()] then faction = "Imperial" end diff --git a/mod/src/includes/data/ListBuilderNew.ttslua b/mod/src/includes/data/ListBuilderNew.ttslua index 411ea83a..064943a3 100644 --- a/mod/src/includes/data/ListBuilderNew.ttslua +++ b/mod/src/includes/data/ListBuilderNew.ttslua @@ -524,7 +524,7 @@ end function _loadArmyFromJson(data) _clearZone() if data.armyFaction == "" then - data.armyFaction = "shadowcollective" + data.armyFaction = "mercenary" end _setSelectedScenario(data.battlefieldDeck.scenario) local spawn = initListSpawner({ diff --git a/mod/src/includes/ui/Welcome.xml b/mod/src/includes/ui/Welcome.xml index 3c9abccd..47e68d21 100644 --- a/mod/src/includes/ui/Welcome.xml +++ b/mod/src/includes/ui/Welcome.xml @@ -46,11 +46,7 @@ CHANGELOG (Since last Beta) - - Add: Jedi Council - - Add: New April Upgrades - - Add: Strike Team Changes - - Add: Savage Opress - - Fix: Logray, Sabine, Wicket Models + - Merc Test 1