Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions contrib/cards/Empire/EmpireUnits.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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/",
Expand Down Expand Up @@ -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/",
Expand Down Expand Up @@ -1197,7 +1197,7 @@
]
},
{
"content": "contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json"
"content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json"
}
]
}
32 changes: 32 additions & 0 deletions contrib/cards/Mercenary/BlackSunEnforcersUnit.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"name": "Black Sun Enforcers",
"image": "https://steamusercontent-a.akamaihd.net/ugc/10804385139718139/222491782E56EAECE8B93E78E946F308211DC049/",
"size": "small",
"type": "Trooper",
"points": 50,
"speed": 2,
"upgrades": {
"Heavy Weapon": 1,
"Personnel": 1,
"Gear": 1,
"Grenades": 1
},
"minis": [
{
"mesh": "https://steamusercontent-a.akamaihd.net/ugc/15119947962689322389/8EC382E90223BC184162C54AFF3EDAE1436DA2AA/",
"diffuse": "https://steamusercontent-a.akamaihd.net/ugc/18136160122757222499/97D7733312EE4677B4694F72C21A61FD8365690E/"
},
{
"mesh": "https://steamusercontent-a.akamaihd.net/ugc/11857728936195634014/66FB83A411E5A561A9A5927C0FDEB396DAF6AE20/",
"diffuse": "https://steamusercontent-a.akamaihd.net/ugc/16452722805588228328/EDA05A0B40EFFA898015BE31588B19E6BB72B4A2/"
},
{
"mesh": "https://steamusercontent-a.akamaihd.net/ugc/13538216675182514309/80D3D2926D6723131723E027151D80E807BA1FF4/",
"diffuse": "https://steamusercontent-a.akamaihd.net/ugc/15549057142882936018/8E3A2116FFD18C5122767F9038D43FF549248278/"
},
{
"mesh": "https://steamusercontent-a.akamaihd.net/ugc/16839420302039891942/3031489A090A438C10C4B37690E4E5B507DD4913/",
"diffuse": "https://steamusercontent-a.akamaihd.net/ugc/13883212304201737617/9B792D3CE9B23D2354F80B2B159F4FD13728A98F/"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -98,18 +98,47 @@
]
},
{
"content": "contrib/cards/ShadowCollective/CadBaneUnit.json"
"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/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/Mercenary/BlackSunEnforcersUnit.json"
},
{
"content": "contrib/cards/ShadowCollective/BlackSunEnforcersUnit.json"
"content": "contrib/cards/Mercenary/WeequayPiratesUnit.json"
}
],
"Special Forces": [
Expand Down Expand Up @@ -146,7 +175,7 @@
],
"Support": [
{
"content": "contrib/cards/ShadowCollective/SwoopBikeRidersUnit.json"
"content": "contrib/cards/Mercenary/SwoopBikeRidersUnit.json"
}
],
"Heavy": [
Expand Down Expand Up @@ -174,7 +203,7 @@
]
},
{
"content": "contrib/cards/ShadowCollective/WLO5SpeederTankUnit.json"
"content": "contrib/cards/Mercenary/WLO5SpeederTankUnit.json"
}
]
}
Loading
Loading