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

Moved some CARDNAME handling to Ability_Mana, fixed a TODO in "add {X} for each".

Browse Source
This commit is contained in:
jendave
2011-08-06 03:31:32 +00:00
parent b2be1cf91a
commit c1dcb3729e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/forge/Ability_Mana.java
View File

@@ -54,7 +54,7 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria
*/ */
this.sourceCard = sourceCard; this.sourceCard = sourceCard;
this.orig = orig; this.orig = (sourceCard.getName().isEmpty() ? orig : orig.replaceAll(sourceCard.getName(), "CARDNAME"));
setDescription(orig); setDescription(orig);
/* /*
@@ -79,7 +79,6 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria
String[] parts = orig.split(":"); String[] parts = orig.split(":");
Mana = parts[1]; Mana = parts[1];
Mana = Mana.replaceAll(" add ", ""); Mana = Mana.replaceAll(" add ", "");
setStackDescription("Add " + Mana + " to your mana pool.");
Mana = Mana.replaceAll(" ", ""); Mana = Mana.replaceAll(" ", "");
String cost = parts[0]; String cost = parts[0];
@@ -204,11 +203,12 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria
public String Mana() { public String Mana() {
if(!orig.contains("for each")) return Mana; if(!orig.contains("for each")) return Mana;
else { else {
String[] manaPart = orig.split(":"); /*String[] manaPart = orig.split(": add ");
String m = manaPart[1]; String m = manaPart[1];
m = m.replaceAll(" add ", ""); m = m.replaceAll(" add ", "");
//TODO: make this handle "multiple-mana symbol" cases, if they are ever needed //TOhaveDOne: make this handle "multiple-mana symbol" cases, if they are ever needed
m = m.substring(0, 2); m = m.substring(0, 2);*/
String m = orig.split(": add ")[1].split(" to ")[0];
String[] parts = orig.split(" for each "); String[] parts = orig.split(" for each ");
int index = parts[1].indexOf(' '); int index = parts[1].indexOf(' ');

2
src/forge/Card.java
View File

@@ -1322,7 +1322,7 @@ public class Card extends MyObservable {
public void addExtrinsicKeyword(String s) { public void addExtrinsicKeyword(String s) {
//if(!getKeyword().contains(s)){ //if(!getKeyword().contains(s)){
if(s.startsWith("tap: add")) manaAbility.add(new Ability_Mana(this, (getName().isEmpty() ? s : s.replaceAll(getName(), "CARDNAME"))) { if(s.startsWith("tap: add")) manaAbility.add(new Ability_Mana(this, s) {
private static final long serialVersionUID = 221124403788942412L; private static final long serialVersionUID = 221124403788942412L;
}); });
else extrinsicKeyword.add((getName().isEmpty() ? s :s.replaceAll(getName(), "CARDNAME"))); else extrinsicKeyword.add((getName().isEmpty() ? s :s.replaceAll(getName(), "CARDNAME")));