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

- Added Sygg, River Guide and Laquatus's Champion.

Browse Source 
- Wordly Tutor / Sylvan Tutor and Eladamri's Call will now show the which creature the AI picked.
- Relentless Rats P/T are set correctly according to all others in play now.
- Added in a hack which should prevent lifegain from Essence Warden and Soul Warden together with some of the creature lands.
- Removed text from the creaturelands' abilities, and added them correctly as the ability's description.
This commit is contained in:
jendave
2011-08-06 02:52:47 +00:00
parent 42453e316d
commit e01a177a09
7 changed files with 238 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
res/cards.txt
View File

@@ -1,3 +1,17 @@
Laquatus's Champion
4 B B
Creature Nightmare Horror
When Laquatus's Champion enters the battlefield, target player loses 6 life. When Laquatus's Champion leaves the battlefield, that player gains 6 life.
6/3
RegenerateMe:B
Sygg, River Guide
W U
Legendary Creature Merfolk Wizard
no text
2/2
Islandwalk
Boggart Birth Rite
B
Tribal Sorcery Goblin
@@ -2343,7 +2357,7 @@ Flame Jet
1 R
Sorcery
no text
spDamageTgtP:3
spDamageP:3
Cycling:2
Slippery Bogle
@@ -4286,7 +4300,7 @@ Ember Shot
6 R
Instant
Draw a card.
spDamageTgtCP:3
spDamageCP:3
Cantrip
Noble Steeds
@@ -4299,7 +4313,7 @@ Zap
2 R
Instant
Draw a card.
spDamageTgtCP:1
spDamageCP:1
Cantrip
Black Lotus
@@ -5283,7 +5297,7 @@ Breath of Malfegor
3 B R
Instant
no text
spDamageTgtP:5
spDamageP:5
Cerodon Yearling
R W
@@ -5970,7 +5984,7 @@ Flame Javelin
2/R 2/R 2/R
Instant
no text
spDamageTgtCP:4
spDamageCP:4
Wilt-Leaf Cavaliers
GW GW GW
@@ -6855,7 +6869,7 @@ Lava Axe
4 R
Sorcery
no text
spDamageTgtP:5
spDamageP:5
Norwood Archers
3 G
@@ -6995,56 +7009,56 @@ Bee Sting
3 G
Sorcery
no text
spDamageTgtCP:2
spDamageCP:2
Cinder Storm
6 R
Sorcery
no text
spDamageTgtCP:7
spDamageCP:7
Fire Ambush
1 R
Sorcery
no text
spDamageTgtCP:3
spDamageCP:3
Ghostfire
2 R
Instant
no text
spDamageTgtCP:3
spDamageCP:3
Ghostfire is colorless.
Lightning Blast
3 R
Instant
no text
spDamageTgtCP:4
spDamageCP:4
Scorching Spear
R
Sorcery
no text
spDamageTgtCP:1
spDamageCP:1
Searing Wind
8 R
Instant
no text
spDamageTgtCP:10
spDamageCP:10
Tarfire
R
Tribal Instant Goblin
no text
spDamageTgtCP:2
spDamageCP:2
Unyaro Bee Sting
3 G
Sorcery
no text
spDamageTgtCP:2
spDamageCP:2
Blistering Firecat
1 R R R
@@ -7059,7 +7073,7 @@ Lava Spike
R
Sorcery
no text
spDamageTgtP:3
spDamageP:3
Caldera Hellion
3 R R
@@ -7143,19 +7157,19 @@ Lightning Bolt
R
Instant
no text
spDamageTgtCP:3
spDamageCP:3
Volcanic Hammer
1 R
Sorcery
no text
spDamageTgtCP:3
spDamageCP:3
Shock
R
Instant
no text
spDamageTgtCP:2
spDamageCP:2
Imperial Hellkite
5 R R
@@ -11639,19 +11653,19 @@ At the beginning of your upkeep, if you control 10 or more Elves, you win the ga
Treetop Village
G
Land
Treetop Village comes into play tapped. 1G: Treetop Village becomes a 3/3 green Ape creature with trample until end of turn. It's still a land.
Treetop Village comes into play tapped.
tap: add G
Forbidding Watchtower
W
Land
Forbidding Watchtower comes into play tapped. 1W: Forbidding Watchtower becomes a 1/5 white Soldier creature until end of turn. It's still a land.
Forbidding Watchtower comes into play tapped.
tap: add W
Faerie Conclave
no cost
Land
Faerie Conclave comes into play tapped. 1U: Faerie Conclave becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land.
Faerie Conclave comes into play tapped.
tap: add U
Empty the Warrens

2
res/main.properties
View File

@@ -1,6 +1,6 @@
program/mail=mtgerror@yahoo.com
program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26
program/version=MTG Forge -- official beta: 09/11/25, SVN revision: 107
program/version=MTG Forge -- official beta: 09/11/25, SVN revision: 117
tokens--file=AllTokens.txt

23
src/forge/CardFactory.java
View File

@@ -10059,6 +10059,10 @@ public class CardFactory implements NewConstants {
//move to top of library
AllZone.Computer_Library.remove(c);
AllZone.Computer_Library.add(c, 0);
CardList list = new CardList();
list.add(c);
AllZone.Display.getChoiceOptional("Computer picked:", list.toArray());
}
}//computerResolve()
public void humanResolve()
@@ -11675,13 +11679,18 @@ public class CardFactory implements NewConstants {
CardList list = new CardList(library);
list = list.getType("Creature");
//pick best creature
Card c = CardFactoryUtil.AI_getBestCreature(list);
if(c == null)
c = library[0];
AllZone.Computer_Library.remove(c);
AllZone.Computer_Hand.add(c);
if (list.size() > 0)
{
//pick best creature
Card c = CardFactoryUtil.AI_getBestCreature(list);
if(c == null)
c = list.get(0);
AllZone.Computer_Library.remove(c);
AllZone.Computer_Hand.add(c);
CardList cl = new CardList();
cl.add(c);
AllZone.Display.getChoiceOptional("Computer picked:", cl.toArray());
}
}
public boolean canPlay()
{

10
src/forge/CardFactoryUtil.java
View File

@@ -2504,6 +2504,16 @@ public class CardFactoryUtil
return false;
}
public static ArrayList<String> getCreatureLandNames()
{
String[] creatureLands = {"Faerie Conclave","Forbidding Watchtower","Treetop Village","Ghitu Encampment","Blinkmoth Nexus",
"Mishra's Factory"};
final ArrayList<String> list = new ArrayList<String>();
for(int i = 0; i < creatureLands.length; i++)
list.add(creatureLands[i]);
return list;
}
//may return null
static public Card getRandomCard(CardList list)
{

145
src/forge/CardFactory_Creatures.java
View File

@@ -1,7 +1,6 @@
package forge;
import java.util.ArrayList;
import java.util.HashMap;
public class CardFactory_Creatures {
@@ -14406,6 +14405,14 @@ public class CardFactory_Creatures {
}
public boolean canPlay()
{
SpellAbility sa;
for (int i=0; i<AllZone.Stack.size(); i++)
{
sa = AllZone.Stack.peek(i);
if (sa.getSourceCard().equals(card))
return false;
}
String controller = card.getController();
PlayerZone play = AllZone.getZone(Constant.Zone.Play, controller);
@@ -17200,6 +17207,140 @@ public class CardFactory_Creatures {
ability.setDescription("tap: Draw a card.");
ability.setStackDescription(card.getName() + " - draw a card.");
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if(cardName.equals("Sygg, River Guide"))
{
final HashMap<Card, String[]> creatureMap = new HashMap<Card, String[]>();
final Ability ability = new Ability(card, "1 W")
{
public void resolve()
{
Card c = getTargetCard();
String color = new String();
if (AllZone.GameAction.isCardInPlay(c) && CardFactoryUtil.canTarget(card,c)){
Object o = AllZone.Display.getChoice("Choose mana color",Constant.Color.Colors);
color = (String)o;
c.addExtrinsicKeyword("Protection from " +color);
if (creatureMap.containsKey(c)) {
int size = creatureMap.get(c).length;
String[] newString = new String[size+1];
for (int i=0;i<size;i++)
{
newString[i] = creatureMap.get(c)[i];
}
newString[size] = color;
creatureMap.put(c, newString);
}
else
creatureMap.put(c, new String[] {color});
final Card crd = c;
final Command atEOT = new Command()
{
private static final long serialVersionUID = 8630868536866681014L;
public void execute()
{
//if(AllZone.GameAction.isCardInPlay(c))
// c.removeExtrinsicKeyword("Protection from "+color);
if (AllZone.GameAction.isCardInPlay(crd))
{
String[] colors = creatureMap.get(crd);
for (String col : colors)
{
crd.removeExtrinsicKeyword("Protection from " + col);
}
}
}
};//Command
AllZone.EndOfTurn.addUntil(atEOT);
}
}
};
Input runtime = new Input()
{
private static final long serialVersionUID = -2171146532836387392L;
public void showMessage()
{
CardList creats = new CardList(AllZone.getZone(Constant.Zone.Play, card.getController()).getCards());
creats = creats.getType("Merfolk");
stopSetNext(CardFactoryUtil.input_targetSpecific(ability, creats, "Select a target Merfolk",true));
}
};
ability.setDescription("1 W: Target Merfolk you control gains protection from the color of your choice until end of turn.");
ability.setBeforePayMana(runtime);
card.addSpellAbility(ability);
}//*************** END ************ END **************************
//*************** START *********** START **************************
else if (cardName.equals("Laquatus's Champion"))
{
final SpellAbility abilityComes = new Ability(card, "0")
{
public void resolve()
{
AllZone.GameAction.getPlayerLife(getTargetPlayer()).subtractLife(6);
}//resolve()
};
final Input inputComes = new Input()
{
private static final long serialVersionUID = -2666229064706311L;
public void showMessage()
{
stopSetNext(CardFactoryUtil.input_targetPlayer(abilityComes));
ButtonUtil.disableAll();//to disable the Cancel button
}
};
Command commandComes = new Command()
{
private static final long serialVersionUID = -4246229185669164581L;
public void execute()
{
if(card.getController().equals(Constant.Player.Human))
AllZone.InputControl.setInput(inputComes);
else //computer
{
abilityComes.setTargetPlayer(Constant.Player.Human);
AllZone.Stack.add(abilityComes);
}//else
}//execute()
};//CommandComes
Command commandLeavesPlay = new Command()
{
private static final long serialVersionUID = 9172348861441804625L;
public void execute()
{
//System.out.println(abilityComes.getTargetCard().getName());
SpellAbility ability = new Ability(card, "0")
{
public void resolve()
{
String player = abilityComes.getTargetPlayer();
AllZone.GameAction.getPlayerLife(player).addLife(6);
}//resolve()
};//SpellAbility
ability.setStackDescription("Laquatus's Champion - " +abilityComes.getTargetPlayer() +" regains 6 life.");
AllZone.Stack.add(ability);
}//execute()
};//Command
card.addComesIntoPlayCommand(commandComes);
card.addLeavesPlayCommand(commandLeavesPlay);
}//*************** END ************ END **************************
// Cards with Cycling abilities
// -1 means keyword "Cycling" not found

4
src/forge/CardFactory_Lands.java
View File

@@ -214,7 +214,7 @@ class CardFactory_Lands {
card.clearSpellKeepManaAbility();
card.addSpellAbility(a1);
a1.setDescription("1U: Faerie Conclave becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land.");
a1.setDescription("1 U: Faerie Conclave becomes a 2/1 blue Faerie creature with flying until end of turn. It's still a land.");
a1.setStackDescription(card +" becomes a 2/1 creature with flying until EOT");
Command paid1 = new Command() {
@@ -280,6 +280,7 @@ class CardFactory_Lands {
card.clearSpellKeepManaAbility();
card.addSpellAbility(a1);
a1.setDescription("1 W: Forbidding Watchtower becomes a 1/5 white Soldier creature until end of turn. It's still a land.");
a1.setStackDescription(card +" becomes a 1/5 creature until EOT");
Command paid1 = new Command() {
@@ -349,6 +350,7 @@ class CardFactory_Lands {
card.clearSpellKeepManaAbility();
card.addSpellAbility(a1);
a1.setStackDescription(card +" becomes a 3/3 creature with trample until EOT");
a1.setDescription("1 G: Treetop Village becomes a 3/3 green Ape creature with trample until end of turn. It's still a land.");
Command paid1 = new Command() {
private static final long serialVersionUID = -6800983290478844750L;

41
src/forge/GameActionUtil.java
View File

@@ -7206,8 +7206,18 @@ public class GameActionUtil
CardList current = new CardList();
current.addAll(AllZone.Human_Play.getCards());
current.addAll(AllZone.Computer_Play.getCards());
current = current.getType("Creature");
final ArrayList<String> list = CardFactoryUtil.getCreatureLandNames();
current = current.filter(new CardListFilter()
{
public boolean addCard(Card c)
{
return c.isCreature() && !list.contains(c.getName());
}
});
// Holds Essence Warden's in play
CardList wardenList = current.getName("Essence Warden");
@@ -7246,11 +7256,9 @@ public class GameActionUtil
// Gain life for new Essence Wardens
n[0] += newWarden.size();
final PlayerLife life = AllZone.GameAction
.getPlayerLife(wardenList.get(outer).getController());
final PlayerLife life = AllZone.GameAction.getPlayerLife(wardenList.get(outer).getController());
SpellAbility ability = new Ability(new Card(), "0")
{
public void resolve()
{
life.addLife(n[0]);
@@ -7285,7 +7293,17 @@ public class GameActionUtil
CardList current = new CardList();
current.addAll(AllZone.Human_Play.getCards());
current.addAll(AllZone.Computer_Play.getCards());
current = current.getType("Creature");
//current = current.getType("Creature");
final ArrayList<String> list = CardFactoryUtil.getCreatureLandNames();
current = current.filter(new CardListFilter()
{
public boolean addCard(Card c)
{
return c.isCreature() && !list.contains(c.getName());
}
});
// Holds Soul Warden's in play
CardList wardenList = current.getName("Soul Warden");
@@ -7325,8 +7343,7 @@ public class GameActionUtil
// Gain life for new Soul Wardens
n[0] += newWarden.size();
final PlayerLife life = AllZone.GameAction
.getPlayerLife(wardenList.get(outer).getController());
final PlayerLife life = AllZone.GameAction.getPlayerLife(wardenList.get(outer).getController());
SpellAbility ability = new Ability(new Card(), "0")
{
@@ -8442,12 +8459,12 @@ public class GameActionUtil
private int countOtherRats(Card c)
{
PlayerZone play = AllZone.getZone(Constant.Zone.Play, c
.getController());
CardList rats = new CardList(play.getCards());
PlayerZone hplay = AllZone.getZone(Constant.Zone.Play, Constant.Player.Human);
PlayerZone cplay = AllZone.getZone(Constant.Zone.Play, Constant.Player.Computer);
CardList rats = new CardList(hplay.getCards());
rats.addAll(cplay.getCards());
rats = rats.getName("Relentless Rats");
return rats.size()-1;
}
public void execute()