From 04134b959b47e2fc7f7ecd49e2ee384fb4c92699 Mon Sep 17 00:00:00 2001
From: benhurqc <bhamelin@pptc.gc.ca>
Date: Thu, 10 Jul 2014 17:04:47 -0400
Subject: [PATCH 1/5] Starting to add cards from Villains

Starting to add cards from Villains set. Not sure at this point if ally or hero is the prefix to use. programatically I think it would be easier to continue with hero as they are compatible but for now I've put ally just in case.
---
 res/values/heroes.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/res/values/heroes.xml b/res/values/heroes.xml
index d654951..ff62ca9 100644
--- a/res/values/heroes.xml
+++ b/res/values/heroes.xml
@@ -44,4 +44,19 @@
     <string name="hero_moon_knight">Moon Knight</string>
     <string name="hero_scarlet_spider">Scarlet Spider</string>
     <string name="hero_spider_woman">Spider-Woman</string>
-</resources>
\ No newline at end of file
+    
+    <string name="ally_bullseye">Bullseye</string>
+    <string name="ally_dr_octopus">Dr. Octopus</string>
+    <string name="ally_electro">Electro</string>
+    <string name="ally_enchantress">Enchantress</string>
+    <string name="ally_green_goblin">Green Goblin</string>
+    <string name="ally_juggernaut">Juggernaut</string>
+    <string name="ally_kingpin">Kingpin</string>
+    <string name="ally_kraven">Kraven</string>
+    <string name="ally_loki">Loki</string>
+    <string name="ally_magneto">Magneto</string>
+    <string name="ally_mysterio">Mysterio</string>
+    <string name="ally_mystique">Mystique</string>
+    <string name="ally_sabretooth">Sabretooth</string>
+    <string name="ally_ultron">Ultron</string>
+    <string name="ally_venom">Venom</string>

From 36ed2b8f50ca23ea3c7e0231ca5d9a2df528170d Mon Sep 17 00:00:00 2001
From: benhurqc <bhamelin@pptc.gc.ca>
Date: Thu, 10 Jul 2014 17:16:44 -0400
Subject: [PATCH 2/5] Update to Sets to include Villains

---
 res/values/sets.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/values/sets.xml b/res/values/sets.xml
index 6837567..fcdf2d6 100644
--- a/res/values/sets.xml
+++ b/res/values/sets.xml
@@ -5,6 +5,7 @@
         <item >@string/set_darkcity</item>
         <item >@string/set_ffour</item>
         <item >@string/set_paint_red</item>
+        <item >@string/set_villains</item>
     </string-array>
     
     <array
@@ -13,10 +14,12 @@
         <item>@drawable/exp_darkcity</item>
         <item>@drawable/exp_ffour</item>
         <item>@drawable/exp_paint_red</item>
+        <item>@drawable/exp_villains</item>
     </array>
     
     <string name="set_core">Core Set</string>
     <string name="set_darkcity">Dark City</string>
     <string name="set_ffour">Fantastic Four</string>
     <string name="set_paint_red">Paint the Town Red</string>
-</resources>
\ No newline at end of file
+    <string name="set_villains">Villains</string>
+</resources>

From 7b400aea3497fc63aa18b8a5fbb89f55190fcfb3 Mon Sep 17 00:00:00 2001
From: benhurqc <bhamelin@pptc.gc.ca>
Date: Thu, 10 Jul 2014 17:18:43 -0400
Subject: [PATCH 3/5] Proposed changes for Villains

Proposed changes to include terminology for combined play with the Villains Set
---
 res/values/card_types.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values/card_types.xml b/res/values/card_types.xml
index c4d8055..fd9a9a5 100644
--- a/res/values/card_types.xml
+++ b/res/values/card_types.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="ct_bystander">Bystander</string>
-    <string name="ct_master_strike">Master Strike</string>
-    <string name="ct_hero">Hero card</string>
-    <string name="ct_scheme">Scheme Twist</string>
+    <string name="ct_master_strike">Master/Command Strike</string>
+    <string name="ct_hero">Hero/Ally card</string>
+    <string name="ct_scheme">Scheme/Plot Twist</string>
     
 </resources>

From e9ae437a6755f59f4c5a1952ea1965a66a3e9c6e Mon Sep 17 00:00:00 2001
From: benhurqc <bhamelin@pptc.gc.ca>
Date: Thu, 10 Jul 2014 17:21:19 -0400
Subject: [PATCH 4/5] proposed changes for Villains

Proposed changes to integrate Villains Set terminology for combined game play.
---
 res/values/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index eec9bd4..8f84bfa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,22 +10,22 @@
     <string name="leading_label">leading the combined forces of</string>
     <string name="also_leading_label">and</string>
     <string name="scheme_label">who is planning</string>
-    <string name="villaindeck_label">Add the following cards to the Villain deck:</string>
-    <string name="herodeck_label">Add the following cards to the Hero deck:</string>
-    <string name="heroes_label">Joining your side are these heroes</string>
+    <string name="villaindeck_label">Add the following cards to the Villain/Adversary deck:</string>
+    <string name="herodeck_label">Add the following cards to the Hero/Ally deck:</string>
+    <string name="heroes_label">Joining your side are these heroes/allies</string>
     <string name="notes_label">Additional notes</string>
     <string name="reroll_action_label">Reroll</string>
-    <string name="mastermind_setup_label">Mastermind:</string>
+    <string name="mastermind_setup_label">Mastermind/Commander:</string>
     <string name="scheme_setup_label">Scheme:</string>
     <string name="pref_sets_title">Sets available</string>
     <string name="lil_expansion_icon_desc">Expansion Icon</string>
     <string name="lil_affiliation_icon_desc">Affiliation Icon</string>
     <string name="default_sets">0x0000000000000001</string>
     <string name="colour_content_description">Colour</string>
-    <string name="show_colours_action_label">Show hero colours</string>
+    <string name="show_colours_action_label">Show hero/ally colours</string>
     <string name="show_affiliation_action_label">Show affiliation</string>
     <string name="pref_stayawake_summary_on">Screen will not lock while you set up the game</string>
     <string name="pref_stayawake_title">Keep screen on</string>
     <string name="use_advanced_setup_rules">Use advanced setup rules</string>
 
-</resources>
\ No newline at end of file
+</resources>

From f8df9d29f99458c42d2df349d79a8a5f9a7c8d5a Mon Sep 17 00:00:00 2001
From: benhurqc <bhamelin@pptc.gc.ca>
Date: Thu, 10 Jul 2014 17:37:19 -0400
Subject: [PATCH 5/5] Update for Villains Set

Added Commanders of the Villains Set which are equivalent to Mastermind
---
 res/values/masterminds.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/values/masterminds.xml b/res/values/masterminds.xml
index 6acc91e..421a994 100644
--- a/res/values/masterminds.xml
+++ b/res/values/masterminds.xml
@@ -15,5 +15,10 @@
     <string name="mm_moleman">Mole Man</string>
     
     <string name="mm_carnage">Carnage</string>
-    <string name="mm_mysterio">Mysterio</string>
-</resources>
\ No newline at end of file
+    <string name="mm_mysterio">Mysterio</string>   
+    
+    <string name="mm_dr_strange">Dr. Strange</string>
+    <string name="mm_nick_fury">Nick Fury</string>
+    <string name="mm_odin">Odin</string>
+    <string name="mm_professor_x">Professor X</string>
+</resources>