Skip to content

Patch 1 #2

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 5 commits into
base: master
Choose a base branch
from
Open

Patch 1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04134b9
Starting to add cards from Villains
Jul 10, 2014
36ed2b8
Update to Sets to include Villains
Jul 10, 2014
7b400ae
Proposed changes for Villains
Jul 10, 2014
e9ae437
proposed changes for Villains
Jul 10, 2014
f8df9d2
Update for Villains Set
Jul 10, 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
6 changes: 3 additions & 3 deletions res/values/card_types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
17 changes: 16 additions & 1 deletion res/values/heroes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<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>
9 changes: 7 additions & 2 deletions res/values/masterminds.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,10 @@
<string name="mm_moleman">Mole Man</string>

<string name="mm_carnage">Carnage</string>
<string name="mm_mysterio">Mysterio</string>
</resources>
<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>
5 changes: 4 additions & 1 deletion res/values/sets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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>
<string name="set_villains">Villains</string>
</resources>
12 changes: 6 additions & 6 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</resources>