Added 5 infect creature cards.

launch4j/Readme.txt

@@ -15,18 +15,30 @@ Magarena supports the following keyboard shortcuts :
 - Enter : switch between graphical and text mode
 
 The UI of Magarena can be customized with downloadable themes coming in zip files.
-A theme pack with seven themes can be downloaded on the project page.
+A theme pack with five color themes can be downloaded on the project page.
 The theme pack should be unzipped into the mods folder of the Magarena data folder.
+There are also separate themes like the moon and mystic theme which can be placed directly into the mods folder.
 It is best to restart the application each time after switching to one of these themes in preferences.
 Thanks to epiko for creating the very nice Magarena splash screen and the amazing color themes.
 
-Thanks to singularita for creating the scripts to add 320 additional creature cards to Magarena.
+Thanks to singularita for creating the scripts to add over 300 additional creature cards to Magarena.
 You can play with these cards by selecting the singularita cube in the "New duel" dialog. 
 
 Recommended difficulty level for the best balance of AI speed and strength is the default 6.
 
 Have fun!
 
+Release 1.9 (March, 2011)
+===========
+
+- ubeefx cube (540 cards)
+- singularita cube (860 cards)
+
+- added extra settings to themes
+- added support for infect keyword and poison counters
+
+- fixed handing of invalid avatars
+
 Release 1.8 (March 13, 2011)
 ===========
 

resources/magic/data/cards2.txt

@@ -1279,7 +1279,7 @@ toughness=1
 timing=fmain
 
 >Giant Spider
-value=1
+value=3
 ability=reach
 rarity=1
 type=Creature
@@ -4037,3 +4037,68 @@ power=2
 toughness=3
 ability=mountainwalk
 timing=main
+
+>Priests of Norn
+value=2
+ability=vigilance,infect
+rarity=1
+type=Creature
+subtype=Cleric
+color=w
+converted=3
+cost={2}{W}
+power=1
+toughness=4
+timing=main
+
+>Flensermite
+value=2
+ability=infect,lifelink
+rarity=1
+type=Creature
+subtype=Gremlin
+color=b
+converted=2
+cost={1}{B}
+power=1
+toughness=1
+timing=main
+
+>Blightwidow
+value=3
+ability=reach,infect
+rarity=1
+type=Creature
+subtype=Spider
+color=g
+converted=4
+cost={3}{G}
+power=2
+toughness=4
+timing=main
+
+>Contagious Nim
+value=2
+ability=infect
+rarity=1
+type=Creature
+subtype=Zombie
+color=b
+converted=3
+cost={2}{B}
+power=2
+toughness=2
+timing=main
+
+>Cystbearer
+value=2
+ability=infect
+rarity=1
+type=Creature
+subtype=Beast
+color=g
+converted=3
+cost={2}{G}
+power=2
+toughness=3
+timing=main

resources/magic/data/images.txt

@@ -944,6 +944,11 @@ Phyrexian Vatmother.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiver
 Plague Stinger.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=208261&type=card
 Skithiryx, the Blight Dragon.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=212249&type=card
 Phyrexian Juggernaut.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=214038&type=card
+Priests of Norn.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213814&type=card
+Flensermite.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213817&type=card
+Blightwidow.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=213820&type=card
+Contagious Nim.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=194150&type=card
+Cystbearer.jpg;http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=205477&type=card
 >hqcards
 Absorb.jpg;http://magiccards.info/scans/en/in/226.jpg
 Accorder Paladin.jpg;http://magiccards.info/scans/en/mbs/1.jpg
@@ -1804,4 +1809,9 @@ Phyrexian Crusader.jpg;http://magiccards.info/scans/en/mbs/50.jpg
 Phyrexian Vatmother.jpg;http://magiccards.info/scans/en/mbs/52.jpg
 Plague Stinger.jpg;http://magiccards.info/scans/en/som/75.jpg
 Skithiryx, the Blight Dragon.jpg;http://magiccards.info/scans/en/som/79.jpg
-Phyrexian Juggernaut.jpg;http://magiccards.info/scans/en/mbs/121.jpg
+Phyrexian Juggernaut.jpg;http://magiccards.info/scans/en/mbs/121.jpg
+Priests of Norn.jpg;http://magiccards.info/scans/en/mbs/16.jpg
+Flensermite.jpg;http://magiccards.info/scans/en/mbs/41.jpg
+Blightwidow.jpg;http://magiccards.info/scans/en/mbs/77.jpg
+Contagious Nim.jpg;http://magiccards.info/scans/en/som/58.jpg
+Cystbearer.jpg;http://magiccards.info/scans/en/som/117.jpg

resources/magic/data/singularita_cube.txt

@@ -852,4 +852,9 @@ Phyrexian Crusader
 Phyrexian Vatmother
 Plague Stinger
 Skithiryx, the Blight Dragon
-Phyrexian Juggernaut
+Phyrexian Juggernaut
+Priests of Norn
+Flensermite
+Blightwidow
+Contagious Nim
+Cystbearer

src/magic/test/TestGameBuilder.java

@@ -117,18 +117,15 @@ public class TestGameBuilder {
 		addToLibrary(opponent,"Island",10);
 		addToGraveyard(player,"Mogg Fanatic",2);
 		addToGraveyard(opponent,"Island",2);
-		addToHand(player,"Lightning Bolt",1);
-		addToHand(player,"Phyrexian Juggernaut",1);
-		addToHand(player,"Septic Rats",1);
-		addToHand(player,"Phyrexian Crusader",1);
-		addToHand(player,"Phyrexian Vatmother",1);
-		addToHand(player,"Plague Stinger",1);
-		addToHand(player,"Skithiryx, the Blight Dragon",1);
+		addToHand(player,"Priests of Norn",1);
+		addToHand(player,"Flensermite",1);
+		addToHand(player,"Blightwidow",1);
+		addToHand(player,"Contagious Nim",1);
+		addToHand(player,"Cystbearer",1);
 
 		createPermanent(game,player,"Watchwolf",false,1);
 		createPermanent(game,player,"Rupture Spire",false,6);
 		createPermanent(game,opponent,"Bloodrock Cyclops",false,1);
-		createPermanent(game,opponent,"Platinum Angel",false,1);
 
 		return game;
 	}

src/magic/ui/viewer/CardListViewer.java

@@ -16,6 +16,7 @@ import magic.model.MagicCard;
 import magic.model.MagicCardDefinition;
 import magic.model.MagicCardList;
 import magic.ui.GameController;
+import magic.ui.theme.Theme;
 import magic.ui.theme.ThemeFactory;
 import magic.ui.widget.CostPanel;
 import magic.ui.widget.FontsAndBorders;
@@ -75,6 +76,7 @@ public abstract class CardListViewer extends JPanel implements ChoiceViewer {
 		final MagicCardList cardList=getCardList();
 		
 		final JPanel cardPanel=new JPanel();
+		cardPanel.setBackground(ThemeFactory.getInstance().getCurrentTheme().getColor(Theme.COLOR_VIEWER_BACKGROUND));
 		cardPanel.setBorder(FontsAndBorders.BLACK_BORDER);
 		cardPanel.setLayout(new GridLayout(cardList.size(),1));