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

make the "SVar=" part optional for SubAbility$ (now that all old-style drawbacks have been removed)

Browse Source
This commit is contained in:
jendave
2011-08-07 01:19:25 +00:00
parent 69ecdbed57
commit 0be7fd81de
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/forge/card/abilityFactory/AbilityFactory.java
View File

@@ -745,22 +745,24 @@ public class AbilityFactory {
public Ability_Sub getSubAbility(){ public Ability_Sub getSubAbility(){
Ability_Sub abSub = null; Ability_Sub abSub = null;
String sSub = getMapParams().get("SubAbility"); String sSub = getMapParams().get("SubAbility");
if (sSub.startsWith("SVar="))
sSub = getHostCard().getSVar(sSub.split("=")[1]);
if (sSub.startsWith("DB$"))
{
AbilityFactory afDB = new AbilityFactory();
abSub = (Ability_Sub)afDB.getAbility(sSub, getHostCard());
}
else{
// Older style Drawback doesn't create an abSub
// on Resolution use getMapParams().get("SubAbility"); to call Drawback
}
return abSub; if(sSub.startsWith("SVar=")) {
sSub = sSub.replace("SVar=", "");
}
sSub = getHostCard().getSVar(sSub);
if(!sSub.equals("")) {
// Older style Drawback no longer supported
AbilityFactory afDB = new AbilityFactory();
abSub = (Ability_Sub)afDB.getAbility(sSub, getHostCard());
}
else {
System.out.println("SubAbility not found for: "+getHostCard());
}
return abSub;
} }
public SpellAbility_Restriction buildRestrictions(SpellAbility SA){ public SpellAbility_Restriction buildRestrictions(SpellAbility SA){