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

- Fixed Morph costs not being displayed on the cards.

Browse Source 
- Little name change in ComputerUtil.
This commit is contained in:
Sloth
2011-11-16 16:19:34 +00:00
parent 7471d249b7
commit 4f31c2d258
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/cardsfolder/b/break_open.txt
View File

@@ -3,7 +3,8 @@ ManaCost:1 R
Types:Instant Types:Instant
Text:no text Text:no text
A:SP$ SetState | Cost$ 1 R | ValidTgts$ Creature.faceDown+YouDontCtrl | TgtPrompt$ Select target facedown creature you don't control. | Mode$ TurnFace | SpellDescription$ Turn target face-down creature an opponent controls face up. A:SP$ SetState | Cost$ 1 R | ValidTgts$ Creature.faceDown+YouDontCtrl | TgtPrompt$ Select target facedown creature you don't control. | Mode$ TurnFace | SpellDescription$ Turn target face-down creature an opponent controls face up.
SVar:Rarity:Rare SVar:RemRandomDeck:True
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/break_open.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/break_open.jpg
SetInfo:ONS|Common|http://magiccards.info/scans/en/on/190.jpg SetInfo:ONS|Common|http://magiccards.info/scans/en/on/190.jpg
Oracle:Turn target face-down creature an opponent controls face up. Oracle:Turn target face-down creature an opponent controls face up.

2
src/main/java/forge/Card.java
View File

@@ -2152,7 +2152,7 @@ public class Card extends GameEntity implements Comparable<Card> {
|| keyword.get(i).startsWith("Echo") || keyword.get(i).startsWith("Fading") || keyword.get(i).startsWith("Echo") || keyword.get(i).startsWith("Fading")
|| keyword.get(i).startsWith("Ripple") || keyword.get(i).startsWith("Unearth") || keyword.get(i).startsWith("Ripple") || keyword.get(i).startsWith("Unearth")
|| keyword.get(i).startsWith("Vanishing") || keyword.get(i).startsWith("Madness") || keyword.get(i).startsWith("Vanishing") || keyword.get(i).startsWith("Madness")
|| keyword.get(i).startsWith("Devour")) { || keyword.get(i).startsWith("Devour") || keyword.get(i).startsWith("Morph")) {
String k = keyword.get(i); String k = keyword.get(i);
k = k.replace(":", " "); k = k.replace(":", " ");
sbLong.append(k).append("\r\n"); sbLong.append(k).append("\r\n");

6
src/main/java/forge/ComputerAIGeneral.java
View File

@@ -73,7 +73,7 @@ public class ComputerAIGeneral implements Computer {
private void playCards(final String phase) { private void playCards(final String phase) {
final SpellAbility[] sp = phase.equals(Constant.Phase.MAIN1) ? this.getMain1() : this.getMain2(); final SpellAbility[] sp = phase.equals(Constant.Phase.MAIN1) ? this.getMain1() : this.getMain2();
final boolean nextPhase = ComputerUtil.playAbilities(sp); final boolean nextPhase = ComputerUtil.playSpellAbilities(sp);
if (nextPhase) { if (nextPhase) {
AllZone.getPhase().passPriority(); AllZone.getPhase().passPriority();
@@ -519,7 +519,7 @@ public class ComputerAIGeneral implements Computer {
boolean pass = (sas.length == 0) boolean pass = (sas.length == 0)
|| AllZone.getPhase().is(Constant.Phase.END_OF_TURN, AllZone.getComputerPlayer()); || AllZone.getPhase().is(Constant.Phase.END_OF_TURN, AllZone.getComputerPlayer());
if (!pass) { // Each AF should check the phase individually if (!pass) { // Each AF should check the phase individually
pass = ComputerUtil.playAbilities(sas); pass = ComputerUtil.playSpellAbilities(sas);
} }
if (pass) { if (pass) {
@@ -556,7 +556,7 @@ public class ComputerAIGeneral implements Computer {
if (sas.length > 0) { if (sas.length > 0) {
// Spell not Countered // Spell not Countered
if (!ComputerUtil.playAbilities(sas)) { if (!ComputerUtil.playSpellAbilities(sas)) {
return; return;
} }
} }

4
src/main/java/forge/ComputerUtil.java
View File

@@ -39,7 +39,7 @@ public class ComputerUtil {
* objects. * objects.
* @return a boolean. * @return a boolean.
*/ */
public static boolean playAbilities(final SpellAbility[] all) { public static boolean playSpellAbilities(final SpellAbility[] all) {
// not sure "playing biggest spell" matters? // not sure "playing biggest spell" matters?
ComputerUtil.sortSpellAbilityByCost(all); ComputerUtil.sortSpellAbilityByCost(all);
// MyRandom.shuffle(all); // MyRandom.shuffle(all);
@@ -102,7 +102,7 @@ public class ComputerUtil {
for (int i = 0; i < sas.length; i++) { for (int i = 0; i < sas.length; i++) {
sas[i] = all.get(i); sas[i] = all.get(i);
} }
return ComputerUtil.playAbilities(sas); return ComputerUtil.playSpellAbilities(sas);
} // playCards() } // playCards()
/** /**

1
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -5050,7 +5050,6 @@ public class CardFactoryUtil {
card.setPrevType(card.getType()); card.setPrevType(card.getType());
final String parse = card.getKeyword().get(n).toString(); final String parse = card.getKeyword().get(n).toString();
card.removeIntrinsicKeyword(parse);
card.setCanMorph(true); card.setCanMorph(true);
final String[] k = parse.split(":"); final String[] k = parse.split(":");