Skip to content
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

Jump to bottom

Indicate cards that require two bunnies #62

Merged
merged 1 commit into from
Oct 4, 2018
Merged

Indicate cards that require two bunnies #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions bunnies/src/main/java/com/fueledbycaffeine/bunnypedia/database/model/BunnyRequirement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ enum class BunnyRequirement {
NOT_APPLICABLE,
NO,
PLAY,
PLAY_X2,
PLAY_AND_SAVE,
;

val description: Int @StringRes get() {
return when (this) {
PLAY -> R.string.bunny_required_to_play
PLAY_X2 -> R.string.bunny_required_to_play_x2
PLAY_AND_SAVE -> R.string.bunny_required_to_play_and_save
else -> R.string.no
}
Expand Down
1 change: 1 addition & 0 deletions bunnies/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
<string name="section_rank">Rank</string>
<string name="rank_pay_grade">%1$s (%2$s)</string>
<string name="bunny_required_to_play">Yes</string>
<string name="bunny_required_to_play_x2">Yes (requires 2 bunnies)</string>
<string name="bunny_required_to_play_and_save">Yes (to play and keep saved)</string>
<string name="section_pawn">Pawn</string>
<string name="red">Red</string>
Expand Down
2 changes: 1 addition & 1 deletion database/deck_orange.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
"title": "F-18 Hornet",
"deck": "ORANGE",
"type": "ROAMING_RED_RUN",
"bunnyRequirement": "PLAY",
"bunnyRequirement": "PLAY_X2",
"dice": ["CLEAR"],
"weaponLevel": "18",
"rules": [
Expand Down
2 changes: 1 addition & 1 deletion database/deck_pumpkin_spice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@
"title": "Tivy Telos",
"type": "RUN",
"deck": "PUMPKIN_SPICE",
"bunnyRequirement": "PLAY",
"bunnyRequirement": "PLAY_X2",
"dice": ["CLEAR"],
"rules": [
{"title": "Card Text", "text": "May be used once by a player to end the game immediately if he can roll a 2, 10, 12, or 20 on the die. Any opponent may pay the player the amount rolled to counteract Tivy Telos and continue the game."},
Expand Down