From 96963fc5ac00e791f154c60ce8d3641abcdb5c82 Mon Sep 17 00:00:00 2001 From: "wagic.laurent" Date: Mon, 15 Jun 2009 23:46:47 +0000 Subject: [PATCH] Laurent - AI deck update - Added some cards (Sudden impact (10E,TMP,LEG), colossus of Sardia (10E), etc...) --- projects/mtg/bin/Res/ai/baka/deck11.txt | 5 +- projects/mtg/bin/Res/ai/baka/deck3.txt | 7 +- projects/mtg/bin/Res/ai/baka/deck4.txt | 121 +++++++++++++---------- projects/mtg/bin/Res/ai/baka/deck5.txt | 2 +- projects/mtg/bin/Res/sets/10E/_cards.dat | 20 ++++ projects/mtg/bin/Res/sets/10E/todo.dat | 32 +----- projects/mtg/bin/Res/sets/EVE/_cards.dat | 19 ++++ projects/mtg/bin/Res/sets/EVE/todo.dat | 17 ---- projects/mtg/bin/Res/sets/LEG/_cards.dat | 10 ++ projects/mtg/bin/Res/sets/LEG/todo.dat | 8 -- projects/mtg/bin/Res/sets/MIR/_cards.dat | 13 +++ projects/mtg/bin/Res/sets/MIR/todo.dat | 30 ------ projects/mtg/bin/Res/sets/TMP/_cards.dat | 10 ++ projects/mtg/bin/Res/sets/TMP/todo.dat | 8 -- projects/mtg/src/MTGAbility.cpp | 45 ++++++++- 15 files changed, 197 insertions(+), 150 deletions(-) diff --git a/projects/mtg/bin/Res/ai/baka/deck11.txt b/projects/mtg/bin/Res/ai/baka/deck11.txt index 6bc138038..caf9a92ec 100644 --- a/projects/mtg/bin/Res/ai/baka/deck11.txt +++ b/projects/mtg/bin/Res/ai/baka/deck11.txt @@ -1,5 +1,8 @@ #NAME:Alliance -#DESC:Green/Blue/White small creatures +#DESC:In the Castel of Bant, +#DESC:the call to battle +#DESC:echoes the prayer of Asha. +#DESC:Prepare to face Bant's light #4x unsummon 1229 1229 diff --git a/projects/mtg/bin/Res/ai/baka/deck3.txt b/projects/mtg/bin/Res/ai/baka/deck3.txt index 9b36dae54..19d20de08 100644 --- a/projects/mtg/bin/Res/ai/baka/deck3.txt +++ b/projects/mtg/bin/Res/ai/baka/deck3.txt @@ -1,6 +1,9 @@ #NAME:Savannah -#DESC:Ol'good RV green/white -#DESC:small creatures deck +#DESC:United against the terrible +#DESC:Phyrexian Fate, +#DESC:there is no time for dispute +#DESC:or rivalries, +#DESC:in Eladamri and Gerarrd's army #2x Black Vise 1097 1097 diff --git a/projects/mtg/bin/Res/ai/baka/deck4.txt b/projects/mtg/bin/Res/ai/baka/deck4.txt index 2809727a7..a754491f3 100644 --- a/projects/mtg/bin/Res/ai/baka/deck4.txt +++ b/projects/mtg/bin/Res/ai/baka/deck4.txt @@ -1,63 +1,84 @@ -#NAME:Elemental -#DESC:Red/white creature deck -#DESC:With elemental/Serra and small creatures -1389 -1390 -1391 -1389 -1390 -1391 -1389 -1390 -1391 -1389 -1390 -1391 -1395 -1396 -1397 -1395 -1396 -1397 -1395 -1396 -1397 -1395 -1396 -1397 -1097 -1097 -1139 -1139 -1287 -1287 -1287 +#NAME:Plateau +#DESC:In the highland of Borros +#DESC:Angels,elementals and Goblin +#DESC:are preparing for battle. +#DESC:Beware, the crusade is coming... +#4x Lightning Helix {W}{R} - does 3 damage and you gain 3 life replacement for #2x Black Vise (1097) and #2x The Rack (1139) +87908 +87908 +87908 +87908 +#2x Bull Cerodon replacement for #3x Earth Elementat {3}{R}{R} -4/5 (1287) +174952 +174952 +#2x Fire Elemental {3}{R}{R} - 5/4 1290 1290 -1290 -1290 -1296 -1296 -1295 -1295 -1297 -1297 -1310 +#2 x Nobilis of War {RW}{RW}{RW}{RW}{RW} replacement for 2x Fire elemental (1290) +154258 +154258 +#2x Goblin king (replaced Rv version 1296 with 10E) +129578 +129578 +#4 x Boros Recruit - {WR} - Goblin 1/1 first strike - Replace 2x Goblin Baloon brigade (1295) and 2 x Benalish Hero {W} -1/1 banding (1330) +88992 +88992 +88992 +88992 +#1x Mons Goblin Raide (1308) 1308 +#2x Skyknight Legionnaire replacement for #2x Granite Gargoyle {2}{R} - 2/2 flying {R}:0/1 1297 +109082 +109082 +#1x Orcish Oriflame +1310 +#2x Castle {3}{W} - untapped creature get 0/2 1334 1334 +#1x Crusade White creature get +1/+1 {W}{W} 1341 -1356 -1356 +#2x Cerodon Yearling {R}{W} vigilance haste 2/2 replacement for pearled Unicord 2/2 {2}{W} (1356) +180604 +180604 +#2x Serra Angel {3}{W}{W} - 4/4 flying,vigilance 1366 1366 +#2x Wall of sword {3}{W} 3/5 flying defender 1369 1369 +#2x White knight 2/2 first strike, protection from black 1370 1370 -1330 -1330 -1328 -1301 +#1x Hill Giant {3}{R} - 3/3 1299 -1300 +#2x Hearthfire Hobgoblin replacement for - 1x Hurloon Minotaur - {1}{R}{R} - 2/3 - 1300 and 1xEarth Elementat {3}{R}{R} -4/5 - 1287 +157201 +157201 +#1x Keldon Warlord +1301 +#Moutains +1389 +1389 +1389 +1389 +1390 +1390 +1390 +1390 +1391 +1391 +1391 +1391 +#Plains +1395 +1395 +1395 +1395 +1396 +1396 +1396 +1396 +1397 +1397 +1397 +1397 diff --git a/projects/mtg/bin/Res/ai/baka/deck5.txt b/projects/mtg/bin/Res/ai/baka/deck5.txt index b95cbf935..59d962647 100644 --- a/projects/mtg/bin/Res/ai/baka/deck5.txt +++ b/projects/mtg/bin/Res/ai/baka/deck5.txt @@ -1,4 +1,4 @@ -#NAME:Death Army +#NAME:Badlands #DESC:Dangerous foes await you. #DESC:Both Undead, Goblins and other #DESC:Abominations will fight you diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat index 80accc531..c96b544a6 100644 --- a/projects/mtg/bin/Res/sets/10E/_cards.dat +++ b/projects/mtg/bin/Res/sets/10E/_cards.dat @@ -2412,6 +2412,15 @@ subtype=Human Rebel toughness=2 [/card] [card] +text=Each player loses 1 life for each creature he or she controls. +id=135197 +name=Stronghold Discipline +rarity=U +color=Black +type=Sorcery +mana={2}{B}{B} +[/card] +[card] text=Target creature can't block this turn. Draw a card. id=134755 name=Stun @@ -2435,6 +2444,17 @@ color=Land type=Land [/card] [card] +text=Sudden Impact deals damage equal to the number of cards in target player's hand to that player. +id=129750 +target=player +target=player +name=Sudden Impact +rarity=U +color=Red +type=Instant +mana={3}{R} +[/card] +[card] text=Flying (This creature can't be blocked except by creatures with flying or reach.) abilities=flying id=129753 diff --git a/projects/mtg/bin/Res/sets/10E/todo.dat b/projects/mtg/bin/Res/sets/10E/todo.dat index 2439f32e6..a489f31bd 100644 --- a/projects/mtg/bin/Res/sets/10E/todo.dat +++ b/projects/mtg/bin/Res/sets/10E/todo.dat @@ -246,18 +246,6 @@ type=Artifact mana={5} [/card] [card] -text=Trample (If this creature would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.) Colossus of Sardia doesn't untap during your untap step. {9}: Untap Colossus of Sardia. Play this ability only during your upkeep. -id=135268 -name=Colossus of Sardia -rarity=R -color=Artifact -type=Artifact Creature -mana={9} -power=9 -subtype=Golem -toughness=9 -[/card] -[card] text=Look at the top five cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order. id=130521 name=Commune with Nature @@ -1236,24 +1224,6 @@ type=Enchantment mana={1}{W}{W} [/card] [card] -text=Each player loses 1 life for each creature he or she controls. -id=135197 -name=Stronghold Discipline -rarity=U -color=Black -type=Sorcery -mana={2}{B}{B} -[/card] -[card] -text=Sudden Impact deals damage equal to the number of cards in target player's hand to that player. -id=129750 -name=Sudden Impact -rarity=U -color=Red -type=Instant -mana={3}{R} -[/card] -[card] text=At the beginning of each player's upkeep, that player returns a creature he or she controls to its owner's hand. id=129509 name=Sunken Hope @@ -1262,7 +1232,6 @@ color=Blue type=Enchantment mana={3}{U}{U} [/card] - [card] text=Your opponents play with their hands revealed. id=129761 @@ -1316,6 +1285,7 @@ text={1}{B}, Sacrifice Thrull Surgeon: Look at target player's hand and choose a id=136282 name=Thrull Surgeon rarity=U +auto={1}{B}{S}:moveto(graveyard) target(*|opponentHand) color=Black type=Creature mana={1}{B} diff --git a/projects/mtg/bin/Res/sets/EVE/_cards.dat b/projects/mtg/bin/Res/sets/EVE/_cards.dat index 56b5885c3..ec6f6b556 100644 --- a/projects/mtg/bin/Res/sets/EVE/_cards.dat +++ b/projects/mtg/bin/Res/sets/EVE/_cards.dat @@ -10,6 +10,16 @@ power=3 subtype=Scarecrow toughness=3 [/card] +text=Remove target card in a graveyard from the game. Put a 1/1 white and black Spirit creature token with flying into play. +target=*|graveyard +auto=moveTo(removedfromgame) +auto=token(Spirit,Token Spirit Creature, 1/1,white black flying) +id=157415 +name=Beckon Apparition +rarity=C +type=Instant +mana={WB} +[/card] [card] text={T}: Add {1} to your mana pool. {UR}, {T}: Add {U}{U}, {U}{R}, or {R}{R} to your mana pool. auto={T}: Add {1} @@ -328,6 +338,15 @@ subtype=Spirit toughness=2 [/card] [card] +text=When Rise of the Hobgoblins comes into play, you may pay {X}. If you do, put X 1/1 red and white Goblin Soldier creature tokens into play. {RW}: Red creatures and white creatures you control gain first strike until end of turn. +id=151114 +auto={RW}:lord(creature[white;red]|myinplay) first strike +name=Rise of the Hobgoblins +rarity=R +type=Enchantment +mana={X}{RW}{RW} +[/card] +[card] text={T}: Add {1} to your mana pool. {RW}, {T}: Add {R}{R}, {R}{W}, or {W}{W} to your mana pool. auto={T}: Add {1} auto={RW}{T}: Add {R}{R} diff --git a/projects/mtg/bin/Res/sets/EVE/todo.dat b/projects/mtg/bin/Res/sets/EVE/todo.dat index 841c4941f..0a8bd508b 100644 --- a/projects/mtg/bin/Res/sets/EVE/todo.dat +++ b/projects/mtg/bin/Res/sets/EVE/todo.dat @@ -95,15 +95,6 @@ type=Instant mana={1}{WB} [/card] [card] -text=Remove target card in a graveyard from the game. Put a 1/1 white and black Spirit creature token with flying into play. -auto=moveTo(ownerremovedfromgame) target(*|graveyard) -auto=token(Spirit,Token Spirit Creature, 1/1,flying white,black) -id=157415 -name=Beckon Apparition -rarity=C -type=Instant -mana={WB} -[/card] [card] text=First strike Belligerent Hatchling comes into play with four -1/-1 counters on it. Whenever you play a red spell, remove a -1/-1 counter from Belligerent Hatchling. Whenever you play a white spell, remove a -1/-1 counter from Belligerent Hatchling. abilities=first strike @@ -1049,14 +1040,6 @@ type=Sorcery mana={2}{R}{R} [/card] [card] -text=When Rise of the Hobgoblins comes into play, you may pay {X}. If you do, put X 1/1 red and white Goblin Soldier creature tokens into play. {RW}: Red creatures and white creatures you control gain first strike until end of turn. -id=151114 -name=Rise of the Hobgoblins -rarity=R -type=Enchantment -mana={RW}{RW} -[/card] -[card] text=Whenever you play a spell that's both blue and red, Riverfall Mimic becomes 3/3 and is unblockable until end of turn. id=151068 name=Riverfall Mimic diff --git a/projects/mtg/bin/Res/sets/LEG/_cards.dat b/projects/mtg/bin/Res/sets/LEG/_cards.dat index 14f9b449d..29c41849d 100644 --- a/projects/mtg/bin/Res/sets/LEG/_cards.dat +++ b/projects/mtg/bin/Res/sets/LEG/_cards.dat @@ -1154,6 +1154,16 @@ type=Enchantment subtype=Aura [/card] [card] +text=Storm Seeker deals damage equal to the number of cards in target player's hand to that player. +id=1545 +target=player +alias=129750 +name=Storm Seeker +rarity=U +type=Instant +mana={3}{G} +[/card] +[card] text=Legendary {T}: Add {2} to your mana pool. id=1687 name=Sunastian Falconer diff --git a/projects/mtg/bin/Res/sets/LEG/todo.dat b/projects/mtg/bin/Res/sets/LEG/todo.dat index ce4293639..ad289c23b 100644 --- a/projects/mtg/bin/Res/sets/LEG/todo.dat +++ b/projects/mtg/bin/Res/sets/LEG/todo.dat @@ -1449,14 +1449,6 @@ subtype=Human Warrior toughness=4 [/card] [card] -text=Storm Seeker deals damage equal to the number of cards in target player's hand to that player. -id=1545 -name=Storm Seeker -rarity=U -type=Instant -mana={3}{G} -[/card] -[card] text=At the beginning of each player's upkeep, Storm World deals X damage to that player, where X is 4 minus the number of cards in his or her hand. id=1591 name=Storm World diff --git a/projects/mtg/bin/Res/sets/MIR/_cards.dat b/projects/mtg/bin/Res/sets/MIR/_cards.dat index e916cece5..254c79a9c 100644 --- a/projects/mtg/bin/Res/sets/MIR/_cards.dat +++ b/projects/mtg/bin/Res/sets/MIR/_cards.dat @@ -447,6 +447,19 @@ subtype=Island rarity=L [/card] [card] +text={1}{G}{T}: Put a 0/1 green Plant Wall creature token with defender into play. Sacrifice a Plant Wall token: Add {R} to your mana pool. +id=3392 +auto={1}{G}{T}:token(Plant Wal,creature Plant Wall, 0/1,green defender) +auto={S(Plant wall|myinplay)}:add {R} +name=Jungle Patrol +rarity=R +type=Creature +mana={3}{G} +power=3 +subtype=Human Soldier +toughness=2 +[/card] +[card] text={R}: Regenerate {G}: Regenerate id=3540 name=Jungle Troll diff --git a/projects/mtg/bin/Res/sets/MIR/todo.dat b/projects/mtg/bin/Res/sets/MIR/todo.dat index b5d9fd609..613f341aa 100644 --- a/projects/mtg/bin/Res/sets/MIR/todo.dat +++ b/projects/mtg/bin/Res/sets/MIR/todo.dat @@ -1110,14 +1110,6 @@ subtype=Goblin Warrior toughness=2 [/card] [card] -text=Put three 1/1 red Goblin Scout creature tokens with mountainwalk into play. -id=3449 -name=Goblin Scouts -rarity=U -type=Sorcery -mana={3}{R}{R} -[/card] -[card] text={R}, {T}, Sacrifice a Goblin: Red creatures get +1/+1 until end of turn. id=3450 name=Goblin Soothsayer @@ -1411,28 +1403,6 @@ type=Instant mana={2}{U} [/card] [card] -text={1}{G}, {T}: Put a 0/1 green Plant Wall creature token with defender into play. Sacrifice a Plant Wall token: Add {R} to your mana pool. -id=3392 -name=Jungle Patrol -rarity=R -type=Creature -mana={3}{G} -power=3 -subtype=Human Soldier -toughness=2 -[/card] -[card] -text={R}: Regenerate Jungle Troll. {G}: Regenerate Jungle Troll. -id=3540 -name=Jungle Troll -rarity=U -type=Creature -mana={1}{R}{G} -power=2 -subtype=Troll -toughness=1 -[/card] -[card] text=Kaervek's Hex deals 1 damage to each nonblack creature and an additional 1 damage to each green creature. id=3299 name=Kaervek's Hex diff --git a/projects/mtg/bin/Res/sets/TMP/_cards.dat b/projects/mtg/bin/Res/sets/TMP/_cards.dat index a9bbd5d65..01feb8684 100644 --- a/projects/mtg/bin/Res/sets/TMP/_cards.dat +++ b/projects/mtg/bin/Res/sets/TMP/_cards.dat @@ -1089,6 +1089,16 @@ rarity=R type=Land [/card] [card] +text=Sudden Impact deals damage equal to the number of cards in target player's hand to that player. +id=4852 +target=player +alias=129750 +name=Sudden Impact +rarity=U +type=Instant +mana={3}{R} +[/card] +[card] text=Flying {B}: Pit Imp gets +1/+0 until end of turn. Play this ability no more than twice each turn. id=4677 name=Pit Imp diff --git a/projects/mtg/bin/Res/sets/TMP/todo.dat b/projects/mtg/bin/Res/sets/TMP/todo.dat index ab128f390..da80aee43 100644 --- a/projects/mtg/bin/Res/sets/TMP/todo.dat +++ b/projects/mtg/bin/Res/sets/TMP/todo.dat @@ -1595,14 +1595,6 @@ subtype=Licid toughness=1 [/card] [card] -text=Sudden Impact deals damage equal to the number of cards in target player's hand to that player. -id=4852 -name=Sudden Impact -rarity=U -type=Instant -mana={3}{R} -[/card] -[card] text=Enchant creature Enchanted creature gets +3/+0 as long as it's attacking. Otherwise, it gets -2/-1. id=4853 name=Tahngarth's Rage diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 59504a212..79618014e 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1688,7 +1688,7 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ } //Addons Legends - case 1427: //Abomination + case 1427: //Abomination (does not work make the game crash) { game->addObserver(NEW AAbomination(_id,card)); break; @@ -1732,7 +1732,6 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ break; } - //Addons ICE-AGE Cards case 2660: //Word of Blasting @@ -1903,6 +1902,38 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ break; } + case 129750: //Sudden Impact + { + Damageable * target = spell->getNextDamageableTarget(); + Player * p = spell->getNextPlayerTarget(); + MTGHand * hand = p->game->hand; + int damage = hand->nb_cards; + game->mLayers->stackLayer()->addDamage(card, target, damage); + break; + } + + case 135268: //Colossus of Sardia + { + int cost[] = {Constants::MTG_COLOR_ARTIFACT, 9}; + game->addObserver(NEW AUntapManaBlocker(_id, card, NEW ManaCost(cost,1))); + break; + } + + case 135197: //Stronghold Discipline + { + GameObserver * game = GameObserver::GetInstance(); + for (int i = 0; i < 2 ; i++){ + for (int j = 0; j < game->players[i]->game->inPlay->nb_cards; j++){ + MTGCardInstance * current = game->players[i]->game->inPlay->cards[j]; + if (current->hasType("Creature")){ + current->controller()->life-= 1; + } + } + } + break; + } + + //--- addon shm--- case 146013: //Corrupt @@ -1925,7 +1956,17 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){ } break; } +//--- addon Eventide ---- + case 151114: //Rise of the Hobgoblins + { + int x = spell->cost->getConvertedCost() - 2; + ATokenCreator * tok = NEW ATokenCreator(id,card,NEW ManaCost(),"Goblin Soldier","creature Goblin Soldier",1,1,"red white",0); + for (int i=0; i < x; i++){ + tok->resolve(); + } + break; + } // --- addon Lorwynn--- case 139676: // Elvish Promenade