external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Kor Skyfisher should not be able to target the manapool anymore.

Browse Source 
- New quest pricelist?\127?\127?\127?\127?\127?\127.
This commit is contained in:
jendave
2011-08-06 03:45:36 +00:00
parent 138586838b
commit 64706eb84c
6 changed files with 10598 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -54,6 +54,7 @@ res/pics_link/card-pictures_w.txt -text svneol=native#text/plain
res/pics_link/card-pictures_x.txt -text svneol=native#text/plain
res/pics_link/card-pictures_y.txt -text svneol=native#text/plain
res/pics_link/card-pictures_z.txt -text svneol=native#text/plain
res/quest/all-prices.txt -text svneol=native#text/plain
res/quest/common.txt -text svneol=native#text/plain
res/quest/easy.txt -text svneol=native#text/plain
res/quest/hard.txt -text svneol=native#text/plain

10573
res/quest/all-prices.txt Normal file
View File

File diff suppressed because it is too large Load Diff

2
res/quest/quest.properties
View File

@@ -2,7 +2,7 @@ common--file=common.txt
uncommon--file=uncommon.txt
rare--file=rare.txt
price--file=price.txt
price--file=all-prices.txt
easy--file=easy.txt
medium--file=medium.txt

7
src/forge/CardFactory_Creatures.java
View File

@@ -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();

15
src/forge/Gui_CardShop.java
View File

@@ -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);
}

1
src/forge/ReadPriceList.java
View File

@@ -42,6 +42,7 @@ public class ReadPriceList implements NewConstants {
String name = s[0].trim();
String price = s[1].trim();
//System.out.println("Name: " + name + ", Price: " + price);
try {
long val = Long.parseLong(price.trim());