Skip to content

Commit

Permalink
Add almond crisp
Browse files Browse the repository at this point in the history
  • Loading branch information
joshfriend committed Aug 9, 2024
1 parent 55751df commit 9a2bbb7
Show file tree
Hide file tree
Showing 6 changed files with 847 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ enum class Deck {
LA_DI_DA_LONDON,
CAKE_BATTER,
RADIOACTIVE_ROBOTS,
ALMOND_CRISP,
;

val color: Int @ColorRes get() {
Expand Down Expand Up @@ -57,6 +58,7 @@ enum class Deck {
LA_DI_DA_LONDON -> R.color.deck_la_di_da_london
CAKE_BATTER -> R.color.deck_cake_batter
RADIOACTIVE_ROBOTS -> R.color.deck_radioactive_robots
ALMOND_CRISP -> R.color.deck_almond_crisp
}
}

Expand Down Expand Up @@ -87,6 +89,7 @@ enum class Deck {
LA_DI_DA_LONDON -> R.string.deck_la_di_da_london_booster
CAKE_BATTER -> R.string.deck_cake_batter
RADIOACTIVE_ROBOTS -> R.string.deck_radioactive_robots
ALMOND_CRISP -> R.string.deck_almond_crisp
}
}

Expand Down
2 changes: 2 additions & 0 deletions bunnies/src/main/res/values/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<item>@string/deck_la_di_da_london_booster</item>
<item>@string/deck_cake_batter</item>
<item>@string/deck_radioactive_robots</item>
<item>@string/deck_almond_crisp</item>
</string-array>

<!-- These should match the enum names in Deck.kt -->
Expand Down Expand Up @@ -55,6 +56,7 @@
<item>LA_DI_DA_LONDON</item>
<item>CAKE_BATTER</item>
<item>RADIOACTIVE_ROBOTS</item>
<item>ALMOND_CRISP</item>
</string-array>

<string-array name="pref_all_view_type_names">
Expand Down
1 change: 1 addition & 0 deletions bunnies/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<color name="deck_la_di_da_london">@color/deck_blue</color>
<color name="deck_cake_batter">@color/deck_yellow</color>
<color name="deck_radioactive_robots">@color/deck_steel</color>
<color name="deck_almond_crisp">@color/deck_khaki</color>

<color name="zodiac_element_fire">@color/deck_red</color>
<color name="zodiac_element_earth">@color/deck_green</color>
Expand Down
1 change: 1 addition & 0 deletions bunnies/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<string name="deck_la_di_da_london_booster">La-Di-Da London Booster</string>
<string name="deck_cake_batter">Cake Batter Booster</string>
<string name="deck_radioactive_robots">Radioactive Robots</string>
<string name="deck_almond_crisp">Almond Crisp</string>
<string name="card_type_kaballa_dolla">Kaballa Dolla</string>
<string name="card_type_rank">Rank</string>
<string name="section_ftb_requirements">Food Units Required</string>
Expand Down
3 changes: 2 additions & 1 deletion database/deck15_conquest_blue.json
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,8 @@
{"title": "Card Text", "text": "May be placed under any bunny and protects it from all harm, hunger, misfortune and abduction. A bunny with Angel Wings may, however, defect, be auctioned, be exchanged or gambled."},
{"title": "Additional Rules", "text": "Once assigned to a bunny, Angel Wings cannot be moved to another bunny. If the bunny with Angel Wings changes owners, then the Halo goes with it. If a player runs Angel Wings card but has no bunny in The Bunny Circle, then he may either place it on any opponent's bunny in The Bunny Circle or simply discard the card.<br><br>Angel Wings is a Modifier card, and by itself is not a bunny. Angel Wings protects any one bunny from all harm (Weapons), hunger (<a href=\"bunnypedia://cards/0024\">Feed The Bunny</a> or <a href=\"bunnypedia://cards/0127\">Gorge The Bunny</a>), misfortune (Terrible) and abduction (<a href=\"bunnypedia://cards/0049\">Area 51</a> or the <a href=\"bunnypedia://cards/0299\">Mothership</a>). A bunny with Angel Wings may, however, defect (<a href=\"bunnypedia://cards/0055\">Defector Detector</a>), be auctioned (<a href=\"bunnypedia://cards/0135\">Bunny Block Bid</a>), be exchanged (<a href=\"bunnypedia://cards/0240\">Bunny Exchange</a>) or gambled (<a href=\"bunnypedia://cards/0065\">Poverty Poker</a> and <a href=\"bunnypedia://cards/0834\">Texas Let Go</a>).<br><br>If a player's only bunny has Angel Wings, then he may not play any Aggressive cards (cards that have a Pink rectangular box). Remember that <a href=\"bunnypedia://cards/0016\">Choose A Carrot</a> cards are not Aggressive cards even though they have the Pink rectangular box."},
{"title": "Counter-Clock Warlock", "text": "<a href=\"bunnypedia://cards/1146\">Counter-Clock Warlock</a> may be used to move Angel Wings to another Bunny in The Bunny Circle."},
{"title": "Under Blunder", "text": "<a href=\"bunnypedia://cards/1247\">Under Blunder</a> may be used to remove Angel Wings from a Bunny."}
{"title": "Under Blunder", "text": "<a href=\"bunnypedia://cards/1247\">Under Blunder</a> may be used to remove Angel Wings from a Bunny."},
{"title": "Demonic barbecue Sauce", "text": "<a href=\"bunnypedia://cards/1454\">Demonic barbecue Saucer</a> may be used to move Angel Wings to another Bunny in The Bunny Circle."}
]
},
{
Expand Down
Loading

0 comments on commit 9a2bbb7

Please sign in to comment.