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

Amass Tokens not using the appropriate names for images

Browse Source
This commit is contained in:
friarsol
2024-01-30 20:49:08 -05:00
committed by Chris H
parent af3b1c19c7
commit a4cec7ab4d
14 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-ai/src/main/java/forge/ai/ability/AmassAi.java
View File

@@ -32,9 +32,11 @@ public class AmassAi extends SpellAbilityAi {
if (!aiArmies.isEmpty()) { if (!aiArmies.isEmpty()) {
return Iterables.any(aiArmies, CardPredicates.canReceiveCounters(CounterEnumType.P1P1)); return Iterables.any(aiArmies, CardPredicates.canReceiveCounters(CounterEnumType.P1P1));
} }
final String tokenScript = "b_0_0_army";
final int amount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Num", "1"), sa);
final String type = sa.getParam("Type"); final String type = sa.getParam("Type");
StringBuilder sb = new StringBuilder("b_0_0_");
sb.append(type.toLowerCase()).append("_army");
final String tokenScript = sb.toString();
final int amount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Num", "1"), sa);
Card token = TokenInfo.getProtoType(tokenScript, sa, ai, false); Card token = TokenInfo.getProtoType(tokenScript, sa, ai, false);

5
forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java
View File

@@ -62,7 +62,10 @@ public class AmassEffect extends TokenEffectBase {
CardZoneTable triggerList = new CardZoneTable(); CardZoneTable triggerList = new CardZoneTable();
MutableBoolean combatChanged = new MutableBoolean(false); MutableBoolean combatChanged = new MutableBoolean(false);
final Card result = TokenInfo.getProtoType("b_0_0_army", sa, activator, false); StringBuilder sb = new StringBuilder("b_0_0_");
sb.append(type.toLowerCase()).append("_army");
final Card result = TokenInfo.getProtoType(sb.toString(), sa, activator, false);
// need to alter the token to add the Type from the Parameter // need to alter the token to add the Type from the Parameter
result.setCreatureTypes(Lists.newArrayList(type, "Army")); result.setCreatureTypes(Lists.newArrayList(type, "Army"));
result.setName(type + " Army Token"); result.setName(type + " Army Token");

4
forge-gui/res/editions/Commander Masters.txt
View File

@@ -1077,8 +1077,8 @@ ScryfallCode=CMM
[tokens] [tokens]
avacyn avacyn
b_0_0_phyrexian_germ b_0_0_phyrexian_germ
b_0_0_army b_0_0_zombie_army
b_0_0_army b_0_0_zombie_army
b_1_1_assassin_deathtouch_haste b_1_1_assassin_deathtouch_haste
b_1_1_rat b_1_1_rat
b_1_1_thrull b_1_1_thrull

2
forge-gui/res/editions/Innistrad Midnight Hunt Commander.txt
View File

@@ -195,7 +195,7 @@ ScryfallCode=MIC
187 U Unclaimed Territory @Dimitar Marinski 187 U Unclaimed Territory @Dimitar Marinski
[tokens] [tokens]
b_0_0_army b_0_0_zombie_army
b_2_2_zombie b_2_2_zombie
b_2_2_zombie_decayed b_2_2_zombie_decayed
c_0_1_eldrazi_spawn_sac c_0_1_eldrazi_spawn_sac

2
forge-gui/res/editions/Modern Horizons 2.txt
View File

@@ -592,7 +592,7 @@ ScryfallCode=MH2
[tokens] [tokens]
b_0_0_phyrexian_germ b_0_0_phyrexian_germ
b_0_0_army b_0_0_zombie_army
b_2_2_zombie b_2_2_zombie
bg_1_1_insect bg_1_1_insect
c_0_0_a_construct_total_artifacts c_0_0_a_construct_total_artifacts

2
forge-gui/res/editions/Starter Commander Decks.txt
View File

@@ -360,7 +360,7 @@ ScryfallCode=SCD
352 L Forest @Titus Lunter 352 L Forest @Titus Lunter
[tokens] [tokens]
b_0_0_army b_0_0_zombie_army
b_2_2_zombie b_2_2_zombie
b_2_2_zombie_knight_menace b_2_2_zombie_knight_menace
b_x_x_demon_flying b_x_x_demon_flying

4
forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth.txt
View File

@@ -866,8 +866,8 @@ A103 R A-Orcish Bowmasters @Maxim Kostin
A246 M A-The One Ring @Veli Nyström A246 M A-The One Ring @Veli Nyström
[tokens] [tokens]
b_0_0_army b_0_0_orc_army
b_0_0_army b_0_0_orc_army
ballistic_boulder ballistic_boulder
c_a_food_sac c_a_food_sac
c_a_food_sac c_a_food_sac

6
forge-gui/res/editions/War of the Spark.txt
View File

@@ -330,9 +330,9 @@ A221 R A-Teferi, Time Raveler @Chris Rallis
[tokens] [tokens]
all_2_2_citizen all_2_2_citizen
b_0_0_army b_0_0_zombie_army
b_0_0_army b_0_0_zombie_army
b_0_0_army b_0_0_zombie_army
b_1_1_assassin_deathtouch_pwdestroy b_1_1_assassin_deathtouch_pwdestroy
b_2_2_zombie b_2_2_zombie
b_4_4_zombie_warrior_vigilance b_4_4_zombie_warrior_vigilance

2
forge-gui/res/puzzle/PS_LTR2.pzl
View File

@@ -15,4 +15,4 @@ p0hand=The Battle of Bywater|Set:LTR|Art:2;Ranger's Firebrand|Set:LTR|Art:1;Glam
p0battlefield=Riders of Rohan|Set:LTC|Art:2;T:r_2_2_human_knight_trample_haste;T:r_2_2_human_knight_trample_haste;Forge Anew|Set:LTR|Art:3;Plains|Set:LTR|Art:2;Plains|Set:LTR|Art:2;Plains|Set:LTR|Art:2;Mountain|Set:LTR|Art:2;Mountain|Set:LTR|Art:2;Mountain|Set:LTR|Art:2 p0battlefield=Riders of Rohan|Set:LTC|Art:2;T:r_2_2_human_knight_trample_haste;T:r_2_2_human_knight_trample_haste;Forge Anew|Set:LTR|Art:3;Plains|Set:LTR|Art:2;Plains|Set:LTR|Art:2;Plains|Set:LTR|Art:2;Mountain|Set:LTR|Art:2;Mountain|Set:LTR|Art:2;Mountain|Set:LTR|Art:2
p1life=16 p1life=16
p1numringtemptedyou=0 p1numringtemptedyou=0
p1battlefield=Saruman of Many Colors|Set:LTR|Art:4;t:Orc Army Token,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Orc-Army,Keywords:,Image:b_0_0_army_ltr|Counters:P1P1=2 p1battlefield=Saruman of Many Colors|Set:LTR|Art:4;t:Orc Army Token,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Orc-Army,Keywords:,Image:b_0_0_orc_army_ltr|Counters:P1P1=2

2
forge-gui/res/puzzle/PS_M204.pzl
View File

@@ -13,6 +13,6 @@ activeplayer=human
activephase=MAIN1 activephase=MAIN1
humanhand=Bleeding Edge;Maximize Altitude;Price of Betrayal;Enter the God-Eternals humanhand=Bleeding Edge;Maximize Altitude;Price of Betrayal;Enter the God-Eternals
humanlibrary=Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt humanlibrary=Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt
humanbattlefield=Tetsuko Umezawa, Fugitive;Teferi, Time Raveler|Counters:LOYALTY=3;Yarok's Fenlurker;Watery Grave|NoETBTrigs;Watery Grave|NoETBTrigs;Watery Grave|NoETBTrigs;Hallowed Fountain|NoETBTrigs;Hallowed Fountain|NoETBTrigs;Hallowed Fountain|NoETBTrigs;t:Zombie Army,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Zombie-Army,Keywords:Trample,Image:b_0_0_army3_war|Counters:P1P1=2 humanbattlefield=Tetsuko Umezawa, Fugitive;Teferi, Time Raveler|Counters:LOYALTY=3;Yarok's Fenlurker;Watery Grave|NoETBTrigs;Watery Grave|NoETBTrigs;Watery Grave|NoETBTrigs;Hallowed Fountain|NoETBTrigs;Hallowed Fountain|NoETBTrigs;Hallowed Fountain|NoETBTrigs;t:Zombie Army,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Zombie-Army,Keywords:Trample,Image:b_0_0_zombie_army3_war|Counters:P1P1=2
aibattlefield=Shifting Ceratops;Apostle of Purifying Light;Hungering Hydra|Counters:P1P1=4;Ashes of the Abhorrent aibattlefield=Shifting Ceratops;Apostle of Purifying Light;Hungering Hydra|Counters:P1P1=4;Ashes of the Abhorrent
aipersistentmana=C C G aipersistentmana=C C G

2
forge-gui/res/puzzle/PS_WAR0.pzl
View File

@@ -14,7 +14,7 @@ activeplayer=human
activephase=MAIN1 activephase=MAIN1
humanhand=Eternal Skylord;Clifftop Retreat;Maximize Velocity;Deputy of Detention;Act of Treason humanhand=Eternal Skylord;Clifftop Retreat;Maximize Velocity;Deputy of Detention;Act of Treason
humanlibrary=Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate humanlibrary=Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate
humanbattlefield=Eternal Skylord;t:Zombie Army,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Zombie-Army,Keywords:Flying,Image:b_0_0_army|Counters:P1P1=4;Benalish Marshal;Mentor of the Meek;Azorius Guildgate;Azorius Guildgate;Azorius Guildgate;Azorius Guildgate;Mountain;Mountain;Mountain;Mountain;Mountain;Mountain;Mountain humanbattlefield=Eternal Skylord;t:Zombie Army,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Zombie-Army,Keywords:Flying,Image:b_0_0_zombie_army|Counters:P1P1=4;Benalish Marshal;Mentor of the Meek;Azorius Guildgate;Azorius Guildgate;Azorius Guildgate;Azorius Guildgate;Mountain;Mountain;Mountain;Mountain;Mountain;Mountain;Mountain
aihand=Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate aihand=Boros Guildgate;Boros Guildgate;Boros Guildgate;Boros Guildgate
aibattlefield=Chamber Sentry|Counters:P1P1=5;Cold-Water Snapper;Cold-Water Snapper;Scuttlegator;Kumena's Speaker;Tishana, Voice of Thunder aibattlefield=Chamber Sentry|Counters:P1P1=5;Cold-Water Snapper;Cold-Water Snapper;Scuttlegator;Kumena's Speaker;Tishana, Voice of Thunder
aipersistentmana=C C C C C aipersistentmana=C C C C C

2
forge-gui/res/puzzle/PS_WAR1.pzl
View File

@@ -12,5 +12,5 @@ turn=1
activeplayer=human activeplayer=human
activephase=MAIN1 activephase=MAIN1
humanhand=Martyr for the Cause;Spark Harvest;Dreadhorde Twins;Resolute Watchdog humanhand=Martyr for the Cause;Spark Harvest;Dreadhorde Twins;Resolute Watchdog
humanbattlefield=Dreadhorde Twins;t:Zombie Army,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Zombie-Army,Image:b_0_0_army3_war,Keywords:|Id:7|Counters:P1P1=2;Dreadhorde Twins;Clifftop Retreat|NoETBTrigs;Plains;Swamp;Swamp;Forebear's Blade|AttachedTo:7 humanbattlefield=Dreadhorde Twins;t:Zombie Army,P:0,T:0,Cost:no cost,Color:B,Types:Creature-Zombie-Army,Image:b_0_0_zombie_army3_war,Keywords:|Id:7|Counters:P1P1=2;Dreadhorde Twins;Clifftop Retreat|NoETBTrigs;Plains;Swamp;Swamp;Forebear's Blade|AttachedTo:7
aibattlefield=Domri, Anarch of Bolas|Counters:LOYALTY=2;Dire Fleet Daredevil;Dire Fleet Daredevil;Dire Fleet Daredevil;Evolution Sage aibattlefield=Domri, Anarch of Bolas|Counters:LOYALTY=2;Dire Fleet Daredevil;Dire Fleet Daredevil;Dire Fleet Daredevil;Evolution Sage

6
forge-gui/res/tokenscripts/b_0_0_orc_army.txt Normal file
View File

@@ -0,0 +1,6 @@
Name:Orc Army Token
ManaCost:no cost
Types:Creature Orc Army
Colors:black
PT:0/0
Oracle:

6
forge-gui/res/tokenscripts/b_0_0_zombie_army.txt Normal file
View File

@@ -0,0 +1,6 @@
Name:Zombie Army Token
ManaCost:no cost
Types:Creature Zombie Army
Colors:black
PT:0/0
Oracle: