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

-update stSetPT to handle 2 altConditions; now it can be used for Level creatures (level creatures can then use stPumpSelf to be fully keyworded)

Browse Source 
-convert Halimar Wavewatch as an example
This commit is contained in:
jendave
2011-08-06 13:20:34 +00:00
parent 6744d09bf5
commit 860d4ba112
4 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/cardsfolder/halimar_wavewatch.txt
View File

@@ -1,8 +1,10 @@
Name:Halimar Wavewatch
ManaCost:1 U
Types:Creature Merfolk Soldier
Text:LEVEL 1-4 0/6 LEVEL 5+ 6/6 Islandwalk
Text:no text
PT:0/3
K:stSetPT:0:3:LevelGE1:0:6:LevelGE5:6:6:LEVEL 1-4 0/6 LEVEL 5+ 6/6 Islandwalk
K:stPumpSelf:Creature.countersGE5LEVEL:0/0/Islandwalk:No Condition:no text
K:Level up:2
K:maxLevel:5
SVar:Rarity:Common

3
src/forge/Card.java
View File

@@ -824,7 +824,8 @@ public class Card extends MyObservable {
if (!k[4].contains("no text")) sbLong.append(k[4]).append("\r\n");
} else if (keyword.get(i).toString().contains("stSetPT")) {
String k[] = keyword.get(i).split(":");
if(k.length > 5) sbLong.append(k[6]).append("\r\n");
if(k.length > 8) sbLong.append(k[9]).append("\r\n");
else if(k.length > 5) sbLong.append(k[6]).append("\r\n");
else sbLong.append(k[3]).append("\r\n");
} else if (keyword.get(i).toString().contains("Protection:")) {
String k[] = keyword.get(i).split(":");

73
src/forge/GameActionUtil.java
View File

@@ -12576,7 +12576,11 @@ public class GameActionUtil {
public static Command stSetPT = new Command() {
/*
* Syntax: K:stSetPT:<power>:<toughness>:condition:altPower:altToughness:SpellDescription
* Syntax: K:stSetPT:power:toughness:Description
* or (for Angry Mob/Gaea's Liege)
* K:stSetPT:power:toughness:condition:altPower:altToughness:Description
* or (for Levels)
* K:stSetPT:power:toughness:condition:altPower:altToughness:condition2:altPower2:altToughness2:Description
*/
private static final long serialVersionUID = -8019071015309088017L;
@@ -12597,17 +12601,38 @@ public class GameActionUtil {
for(int x = 0; x < a.size(); x++) {
if(a.get(x).toString().startsWith("stSetPT")) {
String parse = card.getKeyword().get(x).toString();
boolean altCondition = false;
String k[] = parse.split(":");
for(int z = 0; z < k.length; z++) {
System.out.println("k["+z+"]: "+k[z]);
}
if(k.length < 2) {
System.out.println("Error in stSetPT for: "+card.getName());
}
else {
//TODO - add some checking here...?
int power = k[1].matches("[0-9][0-9]?") ? Integer.parseInt(k[1]) : CardFactoryUtil.xCount(card,k[1]);
int toughness = k[2].matches("[0-9][0-9]?") ? Integer.parseInt(k[2]) : CardFactoryUtil.xCount(card,k[2]);
int power = 0;
int toughness = 0;
int altPower = 0;
int altToughness = 0;
boolean altCondition = false;
int altPower2 = 0;
int altToughness2 = 0;
boolean altCondition2 = false;
//double condition (for level creatures)
if(k.length > 6) {
String condition2 = k[6];
if(condition2.startsWith("LevelGE")) {
condition2 = condition2.replace("LevelGE", "");
int levelReq = Integer.parseInt(condition2);
System.out.println("condition2, got level: "+levelReq);
if(card.getCounters(Counters.LEVEL) >= levelReq) {
altCondition2 = true;
}
}
}
//single condition (for Gaea's Liege/Angry Mob)
if(k.length > 3) {
String condition = k[3];
if(condition.equals("isAttacking")
@@ -12618,17 +12643,36 @@ public class GameActionUtil {
&& AllZone.Phase.isPlayerTurn(card.getController())) {
altCondition = true;
}
else if(condition.startsWith("LevelGE")) {
condition = condition.replace("LevelGE", "");
int levelReq = Integer.parseInt(condition);
System.out.println("condition, got level: "+levelReq);
if(card.getCounters(Counters.LEVEL) >= levelReq) {
altCondition = true;
}
}
}
if(k.length > 4) {
altPower = k[4].matches("[0-9][0-9]?") ? Integer.parseInt(k[4]) : CardFactoryUtil.xCount(card,k[4]);
if(altCondition2) {
if(k.length > 6) {
altPower2 = k[7].matches("[0-9][0-9]?") ? Integer.parseInt(k[7]) : CardFactoryUtil.xCount(card,k[7]);
}
if(k.length > 7) {
altToughness2 = k[8].matches("[0-9][0-9]?") ? Integer.parseInt(k[8]) : CardFactoryUtil.xCount(card,k[8]);
}
card.setBaseAttack(altPower2);
card.setBaseDefense(altToughness2);
}
if(k.length > 5) {
altToughness = k[5].matches("[0-9][0-9]?") ? Integer.parseInt(k[5]) : CardFactoryUtil.xCount(card,k[5]);
}
if(altCondition) {
else if(altCondition) {
//System.out.println("In alt condition");
//System.out.println("Setting power for ("+card.getName()+") to: "+altPower);
//System.out.println("Setting toughness for ("+card.getName()+") to: "+altToughness);
if(k.length > 4) {
altPower = k[4].matches("[0-9][0-9]?") ? Integer.parseInt(k[4]) : CardFactoryUtil.xCount(card,k[4]);
}
if(k.length > 5) {
altToughness = k[5].matches("[0-9][0-9]?") ? Integer.parseInt(k[5]) : CardFactoryUtil.xCount(card,k[5]);
}
card.setBaseAttack(altPower);
card.setBaseDefense(altToughness);
}
@@ -12636,6 +12680,8 @@ public class GameActionUtil {
//use the base power/toughness to calculate
//System.out.println("Setting power for ("+card.getName()+") to: "+power);
//System.out.println("Setting toughness for ("+card.getName()+") to: "+toughness);
power = k[1].matches("[0-9][0-9]?") ? Integer.parseInt(k[1]) : CardFactoryUtil.xCount(card,k[1]);
toughness = k[2].matches("[0-9][0-9]?") ? Integer.parseInt(k[2]) : CardFactoryUtil.xCount(card,k[2]);
card.setBaseAttack(power);
card.setBaseDefense(toughness);
}
@@ -13377,7 +13423,7 @@ public class GameActionUtil {
}
}
};
/*
public static Command Halimar_Wavewatch = new Command() {
private static final long serialVersionUID = 117755207922239944L;
@@ -13407,6 +13453,7 @@ public class GameActionUtil {
}
}
};
*/
/*
* Level up 2 B
@@ -15976,7 +16023,7 @@ public class GameActionUtil {
//commands.put("Guul_Draz_Vampire", Guul_Draz_Vampire);
commands.put("Hada_Spy_Patrol", Hada_Spy_Patrol);
commands.put("Halimar_Wavewatch", Halimar_Wavewatch);
//commands.put("Halimar_Wavewatch", Halimar_Wavewatch);
//commands.put("Heedless_One", Heedless_One);
commands.put("Homarid", Homarid);

2
src/forge/StaticEffects.java
View File

@@ -53,7 +53,7 @@ public class StaticEffects
//cardToEffectsList.put("Guul Draz Vampire", new String[] {"Guul_Draz_Vampire"});
cardToEffectsList.put("Hada Spy Patrol", new String[] {"Hada_Spy_Patrol"});
cardToEffectsList.put("Halimar Wavewatch", new String[] {"Halimar_Wavewatch"});
//cardToEffectsList.put("Halimar Wavewatch", new String[] {"Halimar_Wavewatch"});
//cardToEffectsList.put("Heedless One", new String[] {"Heedless_One"});
cardToEffectsList.put("Homarid", new String[] {"Homarid"});