diff --git a/res/quest/all-prices.txt b/res/quest/all-prices.txt index 1fd4cabff4e..2c4598a900e 100644 --- a/res/quest/all-prices.txt +++ b/res/quest/all-prices.txt @@ -3223,7 +3223,7 @@ Forcemage Advocate =8 Foresee =25 Foreshadow =25 Foresight =12 -Forest =15 +Forest =5 Forest Bear =100 Forethought Amulet =199 Forfend =17 @@ -4473,7 +4473,7 @@ Irradiate =25 Irrigation Ditch =17 Isamaru, Hound of Konda =266 Isao, Enlightened Bushi =10 -Island =3 +Island =5 Island Fish Jasconius =25 Island of Wak-Wak =2117 Island Sanctuary =50 @@ -6644,7 +6644,7 @@ Plague Wind =10 Plague Witch =25 Plaguebearer =3 Plagued Rusalka =6 -Plains =17 +Plains =5 Planar Birth =156 Planar Cleansing =51 Planar Collapse =125 @@ -8963,7 +8963,7 @@ Svogthos, the Restless Tomb =27 Svyelunite Priest =4 Svyelunite Temple =25 Swallowing Plague =25 -Swamp =7 +Swamp =5 Swamp Mosquito =23 Swans of Bryn Argoll =109 Swarm of Rats =15 diff --git a/src/forge/ReadBoosterPack.java b/src/forge/ReadBoosterPack.java index 31819fd2f28..ec0f0c18dd1 100644 --- a/src/forge/ReadBoosterPack.java +++ b/src/forge/ReadBoosterPack.java @@ -161,6 +161,24 @@ public class ReadBoosterPack implements NewConstants { for(int i = 0; i < numberCommons; i++) list.add(getRandomCard(commonList)); + for (int i = 0;i<10;i++) + { + list.add(AllZone.CardFactory.getCard("Forest", Constant.Player.Human)); + list.add(AllZone.CardFactory.getCard("Island", Constant.Player.Human)); + list.add(AllZone.CardFactory.getCard("Plains", Constant.Player.Human)); + list.add(AllZone.CardFactory.getCard("Mountain", Constant.Player.Human)); + list.add(AllZone.CardFactory.getCard("Swamp", Constant.Player.Human)); + } + + for (int i = 0;i<5;i++) + { + list.add(AllZone.CardFactory.getCard("Snow-Covered Forest", Constant.Player.Human)); + list.add(AllZone.CardFactory.getCard("Snow-Covered Island", Constant.Player.Human)); + list.add(AllZone.CardFactory.getCard("Snow-Covered Plains", Constant.Player.Human)); + list.add(AllZone.CardFactory.getCard("Snow-Covered Mountain", Constant.Player.Human)); + list.add(AllZone.CardFactory.getCard("Snow-Covered Swamp", Constant.Player.Human)); + } + return list; } diff --git a/src/forge/gui/game/CardDetailPanel.java b/src/forge/gui/game/CardDetailPanel.java index e9bcedb2815..7c46912ef4d 100644 --- a/src/forge/gui/game/CardDetailPanel.java +++ b/src/forge/gui/game/CardDetailPanel.java @@ -123,12 +123,16 @@ public class CardDetailPanel extends JPanel implements CardContainer { //LEVEL [0-9]+\+ String regex = "LEVEL [0-9]+-[0-9]+ "; - String output = text.replaceAll(regex,"$0\r\n"); + text = text.replaceAll(regex,"$0\r\n"); regex = "LEVEL [0-9]+\\+ "; - output = output.replaceAll(regex,"\r\n$0\r\n"); + text = text.replaceAll(regex,"\r\n$0\r\n"); - area.append(output); + //displays keywords that have dots in them a little better: + regex = "., "; + text = text.replaceAll(regex,"\r\n"); + + area.append(text); } //counter text