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

Merge branch 'Marek14/forge-master'

Browse Source 
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/canal_monitor.txt
#	forge-gui/res/cardsfolder/upcoming/daring_buccaneer.txt
#	forge-gui/res/cardsfolder/upcoming/goblin_trailblazer.txt
#	forge-gui/res/cardsfolder/upcoming/impale.txt
#	forge-gui/res/cardsfolder/upcoming/orazca_raptor.txt
#	forge-gui/res/cardsfolder/upcoming/sadistic_skymarcher.txt
#	forge-gui/res/cardsfolder/upcoming/siegehorn_ceratops.txt
#	forge-gui/res/cardsfolder/upcoming/vampire_revenant.txt
This commit is contained in:
Agetian
2018-01-09 16:56:27 +03:00
parent ee29d4289c 4d718177b6
commit 9757fdb16b
81 changed files with 655 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
View File

@@ -287,6 +287,22 @@ public class TokenEffect extends SpellAbilityEffect {
}
}
// Grant SVars
if (this.tokenSVars != null) {
for (final String s : this.tokenSVars) {
String actualSVar = AbilityUtils.getSVar(root, s);
String name = s;
if (actualSVar.startsWith("SVar")) {
actualSVar = actualSVar.split("SVar:")[1];
name = actualSVar.split(":")[0];
actualSVar = actualSVar.split(":")[1];
}
for (final Card c : tokens) {
c.setSVar(name, actualSVar);
}
}
}
// Grant abilities
if (this.tokenAbilities != null) {
for (final String s : this.tokenAbilities) {
@@ -313,22 +329,6 @@ public class TokenEffect extends SpellAbilityEffect {
}
}
// Grant SVars
if (this.tokenSVars != null) {
for (final String s : this.tokenSVars) {
String actualSVar = AbilityUtils.getSVar(root, s);
String name = s;
if (actualSVar.startsWith("SVar")) {
actualSVar = actualSVar.split("SVar:")[1];
name = actualSVar.split(":")[0];
actualSVar = actualSVar.split(":")[1];
}
for (final Card c : tokens) {
c.setSVar(name, actualSVar);
}
}
}
// Grant static abilities
if (this.tokenStaticAbilities != null) {
for (final String s : this.tokenStaticAbilities) {

2
forge-game/src/main/java/forge/game/card/CounterType.java
View File

@@ -209,6 +209,8 @@ public enum CounterType {
POLYP("POLYP", 236, 185, 198),
PREY("PREY", 240, 0, 0),
PUPA("PUPA", 0, 223, 203),
P0P1("+0/+1", "+0/+1", 96, 226, 23),