Skip to content

Update for Villains Set #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benhurqc wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Update for Villains Set #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b1e9269
Update for Villains Set
Jul 11, 2014
3062c49
Added Villains Set
Jul 11, 2014
51527d1
New and modified icons
benhurqc Jul 12, 2014
ccb1250
Added Allies from Villains
Jul 13, 2014
8b22573
added Commanders from Villains
Jul 13, 2014
e7a78af
Added Villains' Plots
Jul 13, 2014
c4b288c
Added Villains Set
Jul 13, 2014
bc1df9b
Update Sets.java
Jul 13, 2014
0885214
Added Villains Adversaries and Backup adversaries
Jul 13, 2014
ae43c45
Update henchmen.xml
Jul 13, 2014
f9789a6
Update Mastermind.java
Jul 13, 2014
e734977
Update for Villains Set
Jul 14, 2014
55a10b8
Update schemes.xml
Jul 14, 2014
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
Binary file modified img_src/col_covert.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/col_instinct.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/col_ranged.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/col_strength.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/col_tech.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file added img_src/ct_heroes_allies.xcf
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/exp_ffour.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/exp_paint_red.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file added img_src/exp_villains.xcf
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/team_avengers.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file added img_src/team_brotherhood.xcf
View file
Open in desktop
Binary file not shown.
Binary file added img_src/team_crimesyndicate.xcf
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/team_ffour.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file added img_src/team_foesofasgard.xcf
View file
Open in desktop
Binary file not shown.
Binary file added img_src/team_hydra.xcf
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/team_marvelknights.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/team_shield.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file added img_src/team_sinister6.xcf
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/team_spiderfriends.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/team_xforce.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified img_src/team_xmen.xcf
100644 → 100755
View file
Open in desktop
Binary file not shown.
7 changes: 6 additions & 1 deletion res/values/henchmen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@

<string name="hen_goons">Maggia Goons</string>
<string name="hen_phalanx">Phalanx</string>
</resources>

<string name="hen_asgardian_warrior">Asgardian Warrior</string>
<string name="hen_multiple_man">Multiple Man</string>
<string name="hen_assault_squad">S.H.I.E.L.D. Assault Squad</string>
<string name="hen_cops">Cops</string>
</resources>
29 changes: 27 additions & 2 deletions res/values/schemes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,30 @@
<string name="sc_clone_saga_short">The Clone Saga</string>

<string name="sc_weave_lies">to <b>Weave a Web of Lies</b></string>
<string name="sc_weave_lies_short">Weave a Web of Lies</string>
</resources>
<string name="sc_weave_lies_short">Weave a Web of Lies</string>


<string name="sc_build_megavault">to <b>Build an Underground Mega-Vault Prison</b></string>
<string name="sc_build_megavault_short">Build an Underground Mega-Vault Prison</string>

<string name="sc_cage_villains">to <b>Cage Villains in Power-Suppressing Cells</b></string>
<string name="sc_cage_villains_short">Cage Villains in Power-Suppressing Cells</string>

<string name="sc_crown_thor">to <b>Crown Thor King of Asgard</b></string>
<string name="sc_crown_thor">Crown Thor King of Asgard</string>

<string name="sc_crush_hydra">to <b>Crush Hydra</b></string>
<string name="sc_crush_hydra">Crush Hydra</string>

<string name="sc_graduation_academy"><b>Graduation at Xavier's X-Academy</b></string>
<string name="sc_graduation_academy">Graduation at Xavier's X-Academy</string>

<string name="sc_infiltrate_lair">to <b>Infiltrate the Lair with Spies</b></string>
<string name="sc_infiltrate_lair_short">Infiltrate the Lair with Spies</string>

<string name="sc_mass_produce_armor">to <b>Mass Produce War Machine Armor</b></string>
<string name="sc_mass_produce_armor_short">Mass Produce War Machine Armor</string>

<string name="sc_resurect_heroes">to <b>Resurect Heroes with the Norn Stones</b></string>
<string name="sc_resurect_heroes_short">Resurect Heroes with the Norn Stones</string>
</resources>
10 changes: 9 additions & 1 deletion res/values/villains.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,12 @@
<string name="vil_max_carnage">Maximum Carnage</string>
<string name="vil_sinister_six">Sinister Six</string>

</resources>
<string name="vil_mavengers">Avengers</string>
<string name="vil_uncanny_avengers">Uncanny Avengers</string>
<string name="vil_spider_friends">Spider-Friends</string>
<string name="vil_marvel_knights">Marvel Knights</string>
<string name="vil_defenders">Defenders</string>
<string name="vil_x_men_first_class">X-Men First Class</string>
<string name="vil_uncanny_x_men">Uncanny X-Men</string>

</resources>
20 changes: 20 additions & 0 deletions src/net/threedoubloons/legendaryrandomiser/data/Hero.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ final class T {
static final int SPIDER = R.drawable.team_spiderfriends;
static final int XMEN = R.drawable.team_xmen;
static final int XFORCE = R.drawable.team_xforce;
static final int BROTHERHOOD = R.drawable.team_brotherhood;
static final int FASGARD = R.drawable.team_foesofasgard;
static final int SIN6 = R.drawable.team_sinister6;
static final int SYNDICATE = R.drawable.team_crimesyndicate;
}

public enum Hero implements ICardBase {
Expand Down Expand Up @@ -74,6 +78,22 @@ public enum Hero implements ICardBase {
moonKnight(R.string.hero_moon_knight, R.drawable.hero_moon_knight, T.KNIGHTS, new int[]{C.INSTINCT, C.TECH, C.TECH, C.INSTINCT}, Sets.PaintRed),
scarletSpider(R.string.hero_scarlet_spider, R.drawable.hero_scarlet_spider, T.SPIDER, new int[]{C.STRENGTH, C.INSTINCT, C.COVERT, C.STRENGTH}, Sets.PaintRed),
spiderWoman(R.string.hero_spider_woman, R.drawable.hero_spider_woman, T.SPIDER, new int[]{C.STRENGTH, C.RANGED, C.RANGED, C.COVERT}, Sets.PaintRed),

bullseye(R.string.hero_bullseye, R.drawable.hero_bullseye, T.SYNDICATE, new int[]{C.INSTINCT, C.RANGED, C.COVERT, C.RANGED}, Sets.Villains),
kingpin(R.string.hero_kingpin, R.drawable.hero_kingpin, T.SYNDICATE, new int[]{C.STRENGTH, C.COVERT, C.TECH, C.STRENGTH}, Sets.Villains),
ultron(R.string.hero_ultron, R.drawable.hero_ultron, T.NONE, new int[]{C.TECH, C.TECH, C.TECH, C.TECH}, Sets.Villains),
loki(R.string.hero_loki, R.drawable.hero_loki, T.FASGARD, new int[]{C.COVERT, C.RANGED, C.COVERT, C.COVERT}, Sets.Villains),
enchantress(R.string.hero_enchantress, R.drawable.hero_enchantress, T.FASGARD, new int[]{C.RANGED, C.COVERT, C.COVERT, C.COVERT}, Sets.Villains),
sabretooth(R.string.hero_sabretooth, R.drawable.hero_sabretooth, T.BROTHERHOOD, new int[]{C.INSTINCT, C.INSTINCT, C.COVERT, C.STRENGTH}, Sets.Villains),
mystique(R.string.hero_mystique, R.drawable.hero_mystique, T.BROTHERHOOD, new int[]{C.COVERT, C.TECH, C.INSTINCT, C.COVERT}, Sets.Villains),
magneto(R.string.hero_magneto, R.drawable.hero_magneto, T.BROTHERHOOD, new int[]{C.RANGED, C.STRENGTH, C.RANGED, C.RANGED}, Sets.Villains),
juggernaut(R.string.hero_juggernaut, R.drawable.hero_juggernaut, T.BROTHERHOOD, new int[]{C.STRENGTH, C.STRENGTH, C.STRENGTH, C.STRENGTH}, Sets.Villains),
venom(R.string.hero_venom, R.drawable.hero_venom, T.SIN6, new int[]{C.STRENGTH, C.INSTINCT, C.STRENGTH, C.INSTINCT}, Sets.Villains),
mysterio(R.string.hero_mysterio, R.drawable.hero_mysterio, T.SIN6, new int[]{C.COVERT, C.RANGED, C.TECH, C.INSTINCT}, Sets.Villains),
kraven(R.string.hero_kraven, R.drawable.hero_kraven, T.SIN6, new int[]{C.INSTINCT, C.COVERT, C.STRENGTH, C.INSTINCT}, Sets.Villains),
greenGoblin(R.string.hero_green_goblin, R.drawable.hero_green_goblin, T.SIN6, new int[]{C.TECH, C.TECH, C.INSTINCT, C.TECH}, Sets.Villains),
drOctopus(R.string.hero_drOctopus, R.drawable.hero_drOctopus, T.FSIN6, new int[]{C.TECH, C.TECH, C.STRENGTH, C.TECH}, Sets.Villains),
electro(R.string.hero_electro, R.drawable.hero_electro, T.SIN6, new int[]{C.RANGED, C.RANGED, C.RANGED, C.RANGED}, Sets.Villains),
;

private final CardBase card;
Expand Down
8 changes: 7 additions & 1 deletion src/net/threedoubloons/legendaryrandomiser/data/Mastermind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ public enum Mastermind implements ICardBase {
// Paint the Town Red
carnage(R.string.mm_carnage, R.drawable.mm_carnage, Villain.maxCarnage, Sets.PaintRed),
mysterio(R.string.mm_mysterio, R.drawable.mm_mysterio, Villain.sinisterSix, Sets.PaintRed),

// Villains
drStrange(R.string.mm_dr_strange, R.drawable.mm_dr_strange, Villain.defenders, Sets.Villains),
nickFury(R.string.mm_nick_fury, R.drawable.mm_nick_fury, Villain.avengers, Sets.Villains),
odin(R.string.mm_odin, R.drawable.mm_odin, Villain.asgardianWarriors, Sets.Villains),
professorX(R.string.mm_professor_x, R.drawable.mm_professor_x, Villain.xmenFirstClass, Sets.Villains),
;
private final Villain alwaysLeads;
private final CardBase card;
Expand Down Expand Up @@ -72,4 +78,4 @@ public static void initialiseAllList(EnumSet<Sets> activeSets) {
public final static List<Mastermind> getAll() {
return all;
}
}
}
52 changes: 52 additions & 0 deletions src/net/threedoubloons/legendaryrandomiser/data/Scheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ public enum Scheme implements ICardBase {
spliceDNA(R.string.sc_splice_dna, R.string.sc_splice_dna_short, Sets.PaintRed),
cloneSaga(R.string.sc_clone_saga, R.string.sc_clone_saga_short, Sets.PaintRed),
weaveLies(R.string.sc_weave_lies, R.string.sc_weave_lies_short, Sets.PaintRed),

// Villains
resurectHeroes(R.string.sc_resurect_heroes, R.string.sc_resurect_heroes_short, Sets.Villains),
megaVault(R.string.sc_build_megavault, R.string.sc_build_megavault_short, Sets.Villains),
cageVillains(R.string.sc_cage_villains, R.string.sc_cage_villains_short, Sets.Villains),
crownThor(R.string.sc_crown_thor, R.string.sc_crown_thor_short, Sets.Villains),
crushHydra(R.string.sc_crush_hydra, R.string.sc_crush_hydra_short, Sets.Villains),
graduation(R.string.sc_graduation_academy, R.string.sc_graduation_academy_short, Sets.Villains),
infiltrateLair(R.string.sc_infiltrate_lair, R.string.sc_infiltrate_lair_short, Sets.Villains),
massArmor(R.string.sc_mass_produce_armor, R.string.sc_mass_produce_armor_short, Sets.Villains),
;
private final CardBase card;
private final int longName;
Expand Down Expand Up @@ -252,5 +262,47 @@ public void apply(GameDetails details) {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 7);
}});
schemeActions.put("massArmor", new SchemeAction() {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 8);
if (!details.addPreferredHenchman(Villain.assaultSquad)) {
details.addError("Scheme requires the S.H.I.E.L.D. Assault Squad backup adversary group");
}
}});
schemeActions.put("resurectHeroes", new SchemeAction() {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 8);
}});
schemeActions.put("megaVault", new SchemeAction() {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 8);
if (details.getNumPlayers() < 5) {
details.addNote(String.format("Use only %d Bindings cards", details.getNumPlayers() * 5));
}
}});
schemeActions.put("cageVillains", new SchemeAction() {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 8);
details.addNote(String.format("Place %d Cops cards next to the plot", details.getNumPlayers() * 2));
}});
schemeActions.put("crownThor", new SchemeAction() {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 8);
details.addNote("Place the Thor adversary next to the plot");
}});
schemeActions.put("crushHydra", new SchemeAction() {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 8);
}});
schemeActions.put("graduation", new SchemeAction() {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 8);
details.addNote("Place 8 Bystanders next to the plot");
}});
schemeActions.put("infiltrateLair", new SchemeAction() {
public void apply(GameDetails details) {
details.setVillainDeckContentsForCardType(CardType.schemeTwist, 8);
details.addNote("Place 21 Bystanders next to the plot");
}});
}
}
1 change: 1 addition & 0 deletions src/net/threedoubloons/legendaryrandomiser/data/Sets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public enum Sets {
DarkCity(R.drawable.exp_darkcity, R.string.set_darkcity),
FantasticFour(R.drawable.exp_ffour, R.string.set_ffour),
PaintRed(R.drawable.exp_paint_red, R.string.set_paint_red),
Villains(R.drawable.exp_villains, R.string.set_villains),
;

private final int symbol;
Expand Down
15 changes: 15 additions & 0 deletions src/net/threedoubloons/legendaryrandomiser/data/Villain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ public enum Villain implements ICardBase {
// Paint the Town Red
maxCarnage(R.string.vil_max_carnage, R.drawable.vil_max_carnage, false, Sets.PaintRed),
sinisterSix(R.string.vil_sinister_six, R.drawable.vil_sinister_six, false, Sets.PaintRed),

// Villains
avengers(R.string.vil_avengers, R.drawable.vil_avengers, false, Sets.Villains),
defenders(R.string.vil_defenders, R.drawable.vil_defenders, false, Sets.Villains),
marvelKnights(R.string.vil_marvelKnights, R.drawable.vil_marvelKnights, false, Sets.Villains),
spiderFriends(R.string.vil_spider_friends, R.drawable.vil_spider_friends, false, Sets.DarkCity),
uncannyAvengers(R.string.vil_uncanny_avengers, R.drawable.vil_uncanny_avengers, false, Sets.Villains),
uncannyXmen(R.string.vil_uncanny_xmen, R.drawable.vil_uncanny_xmen, false, Sets.Villains),
xmenFirstClass(R.string.vil_xmen1Class, R.drawable.vil_xmen1Class, false, Sets.Villains),


handNinja(R.string.hen_hand_ninja, R.drawable.hen_hand_ninja, true),
Expand All @@ -42,6 +51,12 @@ public enum Villain implements ICardBase {
//Dark city
maggiaGoons(R.string.hen_goons, R.drawable.hen_goons, true, Sets.DarkCity),
phalanx(R.string.hen_phalanx, R.drawable.hen_phalanx, true, Sets.DarkCity),

//Villains
asgardianWarrior(R.string.hen_asgardian_warrior, R.drawable.hen_asgardian_warrior, true, Sets.Villains),
cops(R.string.hen_cops, R.drawable.hen_cops, true, Sets.Villains),
multipleMan(R.string.hen_multiple_man, R.drawable.hen_multiple_man, true, Sets.Villains),
assaultSquad(R.string.hen_assault_squad, R.drawable.hen_assault_squad, true, Sets.Villains),
;

private CardBase card;
Expand Down