mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 12:18:00 +00:00
- Kor Skyfisher should not be able to target the manapool anymore.
- New quest pricelist?\127?\127?\127?\127?\127?\127.
This commit is contained in:
@@ -11396,6 +11396,13 @@ public class CardFactory_Creatures {
|
||||
public void execute() {
|
||||
PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
|
||||
CardList choice = new CardList(play.getCards());
|
||||
choice = choice.filter(new CardListFilter()
|
||||
{
|
||||
public boolean addCard(Card c)
|
||||
{
|
||||
return !c.getName().equals("Mana Pool");
|
||||
}
|
||||
});
|
||||
AllZone.InputControl.setInput(CardFactoryUtil.input_targetSpecific(ability, choice,
|
||||
"Select a permanent you control.", false, false));
|
||||
ButtonUtil.disableAll();
|
||||
|
||||
@@ -231,6 +231,7 @@ public class Gui_CardShop extends JFrame implements CardContainer, DeckDisplay,
|
||||
|
||||
for(int i = 0; i < shopList.size(); i++) {
|
||||
Card c = AllZone.CardFactory.getCard(shopList.get(i).toString(), "");
|
||||
|
||||
c.setValue(map.get(c.getName()));
|
||||
c.setRarity(pack.getRarity(c.getName()));
|
||||
shop.add(c);
|
||||
@@ -242,8 +243,20 @@ public class Gui_CardShop extends JFrame implements CardContainer, DeckDisplay,
|
||||
|
||||
for(int i = 0; i < list.size(); i++) {
|
||||
Card c = AllZone.CardFactory.getCard(list.get(i).toString(), "");
|
||||
c.setValue(map.get(c.getName()));
|
||||
|
||||
c.setRarity(pack.getRarity(c.getName()));
|
||||
if (map.containsKey(c.getName()))
|
||||
c.setValue(map.get(c.getName()));
|
||||
else //card is not on pricelist
|
||||
{
|
||||
System.out.println("Card " + c.getName() + " is not in the price list.");
|
||||
if (c.getRarity().equals("Common"))
|
||||
c.setValue(10);
|
||||
else if (c.getRarity().equals("Uncommon"))
|
||||
c.setValue(50);
|
||||
else if (c.getRarity().equals("Rare"))
|
||||
c.setValue(200);
|
||||
}
|
||||
owned.add(c);
|
||||
}
|
||||
|
||||
|
||||
@@ -41,7 +41,8 @@ public class ReadPriceList implements NewConstants {
|
||||
String s[] = line.split("=");
|
||||
String name = s[0].trim();
|
||||
String price = s[1].trim();
|
||||
|
||||
|
||||
//System.out.println("Name: " + name + ", Price: " + price);
|
||||
|
||||
try {
|
||||
long val = Long.parseLong(price.trim());
|
||||
|
||||
Reference in New Issue
Block a user