Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed "City's Blessing" macros, fixed "Jared Carthalion, True Heir", added new keyoword "noncombatvigor" for cards such as "Stormwild Capridor".

Browse Source
This commit is contained in:
Vittorio Alfieri
2021-08-19 15:45:30 +02:00
parent d3167bb4f4
commit bdba322558
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/bin/Res/sets/primitives/_macros.txt
View File

@@ -110,10 +110,10 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
#AUTO_DEFINE _SOULSHIFT_($c) @movedTo(this|myGraveyard) from(battlefield):may moveTo(myHand) target(creature[spirit;manacost<=$c]|myGraveyard) #AUTO_DEFINE _SOULSHIFT_($c) @movedTo(this|myGraveyard) from(battlefield):may moveTo(myHand) target(creature[spirit;manacost<=$c]|myGraveyard)
# Ascend, Set XLN # Ascend, Set XLN
#AUTO_DEFINE _ASCEND_ if type(*[City's_blessing]|mybattlefield)~lessthan~1 then transforms((,newability[if type(*|mybattlefield)~morethan~9 then token(City's_blessing^notrigger)])) oneshot #AUTO_DEFINE _ASCEND_ if type(City's Blessing|mybattlefield)~lessthan~1 then transforms((,newability[if type(*|mybattlefield)~morethan~9 then token(City's Blessing^notrigger)])) oneshot
# Effect with the City's blessing, Set XLN # Effect with the City's blessing, Set XLN
#AUTO_DEFINE _CITY'S_BLESSING_ aslongas(*[City's_blessing]|mybattlefield)>0 #AUTO_DEFINE _CITY'S_BLESSING_ aslongas(City's Blessing|mybattlefield)>0
# Monarch # Monarch
#AUTO_DEFINE _MONARCH_CONTROLLER_ if type(The Monarch|battlefield)~lessthan~1 then token(The Monarch) else all(The Monarch|battlefield) moveto(mybattlefield) and!( transforms((,newability[becomesmonarch controller])) forever )! #AUTO_DEFINE _MONARCH_CONTROLLER_ if type(The Monarch|battlefield)~lessthan~1 then token(The Monarch) else all(The Monarch|battlefield) moveto(mybattlefield) and!( transforms((,newability[becomesmonarch controller])) forever )!

4
projects/mtg/bin/Res/sets/primitives/borderline.txt
View File

@@ -33087,7 +33087,6 @@ type=Artifact
[/card] [/card]
[card] [card]
name=Jared Carthalion, True Heir name=Jared Carthalion, True Heir
abilities=haste
auto=_MONARCH_OPPONENT_ auto=_MONARCH_OPPONENT_
auto=emblem transforms((,newability[@becomesmonarchof(player):name(You can't become the monarch) _MONARCH_OPPONENT_])) ueot auto=emblem transforms((,newability[@becomesmonarchof(player):name(You can't become the monarch) _MONARCH_OPPONENT_])) ueot
auto=this(variable{pmonarch}>0) vigor auto=this(variable{pmonarch}>0) vigor
@@ -61324,8 +61323,7 @@ toughness=5
[/card] [/card]
[card] [card]
name=Stormwild Capridor name=Stormwild Capridor
abilities=flying abilities=flying,noncombatvigor
auto=@damaged(this) from(NoncombatDamage):all(trigger[to]) vigor
text=Flying -- If noncombat damage would be dealt to Stormwild Capridor, prevent that damage. Put a +1/+1 counter on Stormwild Capridor for each 1 damage prevented this way. text=Flying -- If noncombat damage would be dealt to Stormwild Capridor, prevent that damage. Put a +1/+1 counter on Stormwild Capridor for each 1 damage prevented this way.
mana={2}{W} mana={2}{W}
type=Creature type=Creature

3
projects/mtg/include/MTGDefinitions.h
View File

@@ -316,7 +316,8 @@ class Constants
DUNGEONCOMPLETED = 189, DUNGEONCOMPLETED = 189,
PERPETUALLIFELINK = 190, PERPETUALLIFELINK = 190,
PERPETUALDEATHTOUCH = 191, PERPETUALDEATHTOUCH = 191,
NB_BASIC_ABILITIES = 192, NONCOMBATVIGOR = 192,
NB_BASIC_ABILITIES = 193,
RARITY_S = 'S', //Special Rarity RARITY_S = 'S', //Special Rarity
RARITY_M = 'M', //Mythics RARITY_M = 'M', //Mythics

8
projects/mtg/src/Damage.cpp
View File

@@ -116,6 +116,14 @@ int Damage::resolve()
} }
damage = 0; damage = 0;
} }
if ((_target)->has(Constants::NONCOMBATVIGOR) && typeOfDamage != DAMAGE_COMBAT)
{
for (int j = damage; j > 0; j--)
{
(_target)->counters->addCounter(1, 1);
}
damage = 0;
}
if ((_target)->has(Constants::HYDRA)) if ((_target)->has(Constants::HYDRA))
{ {
for (int j = damage; j > 0; j--) for (int j = damage; j > 0; j--)

3
projects/mtg/src/MTGDefinitions.cpp
View File

@@ -222,7 +222,8 @@ const char* Constants::MTGBasicAbilities[] = {
"counterdeath", //It gains a 1/1 counter when it returns from graveyard (to use with inplaydeath and inplaytapdeath)" "counterdeath", //It gains a 1/1 counter when it returns from graveyard (to use with inplaydeath and inplaytapdeath)"
"dungeoncompleted", //This dungeon has been completed "dungeoncompleted", //This dungeon has been completed
"perpetuallifelink", //It gains lifelink perpetually "perpetuallifelink", //It gains lifelink perpetually
"perpetualdeathtouch" //It gains deathtouch perpetually "perpetualdeathtouch", //It gains deathtouch perpetually
"noncombatvigor" //instead of taking non-combat damage the source gains +1/+1 counters (e.g. "Stormwild Capridor")
}; };
map<string,int> Constants::MTGBasicAbilitiesMap; map<string,int> Constants::MTGBasicAbilitiesMap;