im forced to do this commit in whole instead of parts as originally planned, and before my beta test period of the changes is complete BECAUSE there are people doing "clean up" and the MASSIVE amount of conflicts i have to resolve from it is WAY too much for me to take on after nearly 200 hours of coding this patch. i cant seem to get enough respect to have people hold off on "clean up" so this brings me to being forced to do a full commit before playtest period is done, so they can go ahead with there *super important* clean up.
ok i WAS going to write a full change log with code exsamples ect, but since im rushed you will get the short version of this log.
first bug fixes, and there were many,
indestructible creature bug fixed
halimar execavator *embearessing youtube video" bug is fixed
token text now displays source name and tokens abilities
fixed a card view null pointer in an iterator when code used combinations of foreach and aslongas with CD.
epic struggle bug fixed, aslongas was only parsing one space to the right of the operator.
extra cost containing targetting fixed, cards can now have multiple extra cost in all mana...this includes giving a card 2 targeted sacrifices as its main cost.
angelic chorus bug fixed, the card will be soft coded now.
and many other minor bugs fixed, hard to remember all which were fixed.
now, new abilities = words
"legendarylandwalk",
"desertlandwalk",
"snowforestlandwalk",
"snowplainslandwalk",
"snowmountainlandwalk",
"snowislandlandwalk",
"snowswamplandwalk",
"snowlandwalk",
"nonbasiclandwalk",
"strong",//cant be blocked by creature with less power
"weak",//cant block creatures with more power
"phasing",
all true landwalks will now be supported.
new cost types:
morph which is coded as follows
[card]
name=Bloodstoke Howler
facedown={3}
autofacedown={6}{R}:morph
autofaceup=3/0 all(beast|mybattlefield))
text=Morph {6}{R} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.) -- When Bloodstoke Howler is turned
face up, Beast creatures you control get +3/+0 until end of turn.
mana={5}{R}
type=Creature
subtype=Beast
power=3
toughness=4
[/card]
you will notice new auto lines autofaceup and autofacedown
these are abilities the cards will have when theyre in that state.
the cost is coded as
facedown={cost}
when a card is faced up it gains auto= lines also.
tho is played normally it will NOT gain autofaceup=lines
card restrictions:
cards can now have restrictions placed on them the restrictions are.
all previous restrictions usable in activated abilities
with the follow additions
control two or more vampires
control less creatures
control snow land
casted a spell
one of a kind
fourth turn
before battle damage
after battle
during battle
[card]
name=Blood Frenzy
target=creature[attacking;blocking]
restriction=before battle damage
auto=4/0
auto=treason
text=Cast Blood Frenzy only before the combat damage step. -- Target attacking or blocking creature gets +4/+0 until end of turn. Destroy that creature
at the beginning of the next end step.
mana={1}{R}
type=Instant
[/card]
other cost now can have specail restrictions also:
otherrestriction=mytypemin:1 type(swamp),opponenttypemin:1 opponenttype(plains)
these are minimums required inplay of a type
it can be just you, or you and opponent or just opponent
you can also use the words "more" and "less" and * to compare the 2 players fields.
[card]
name=Cho-Arrim Legate
abilities=protection from black
other={0}
otherrestriction=mytypemin:1 type(swamp) , opponenttypemin:1 opponenttype(plains)
text=Protection from black -- If an opponent controls a Swamp and you control a Plains, you may cast Cho-Arrim Legate without paying its mana cost.
mana={2}{W}
type=Creature
subtype=Human Soldier
power=1
toughness=2
[/card]
activated ability gained a new restriction "opponentturnonly"
variables will now be recalculated during the resolve of the major abilities to produce the most current number.
{x}:draw:x <----
new number variables words:
using draw as an exsample
draw:auras <--auras on a creature
draw:type:ally <---counts the allys in your field. self explanitory
draw:thatmuch <--mostly a triggered effects number.
when you take damage draw that much
draw:lifelost
draw:oplifelost
these return the value of the life lost that turn.
new TRIGGER restricitions
sourcenottap
sourceTap
foelostthree<--card cycle uses opponent lost life
foelosttwo<--same as above
once<--this trigger will only ever trigger one time and never again.
new card discriptor words
[multicolor]
[leveler]
[enchanted]
[blackandgreen]
[blackandwhite]
[redandblue]
[blueandgreen]
[redandwhite]
CD will now recalculate the number again on resolve
meaning {x}:target(CreatureTargetChooser[manacost <=x]) will work, with an added bonus {x}:target(CreatureTargetChooser[manacost <=any word variable])
new this(:
this(tapped)<--for strange case cards.
this(untapped)
this(auras)
new MTGAbility keywords
(blink)
(blink)forsrc <--stay blinked while source inplay
hand(blink <---adding hand to the front makes it target hand.
livingweapon
this is an extension of token, simple attach the words "livingweapon" to the front of token( and it will autoamtically token that and attach the card to it.
token( gained:
"targetcontroller" targetting.
"battleready" if put in the tokens abilities it will be a attacker and tapped as it is entering play.
phaseout <--self explanitory
spiritlink <--stacking lifelink style effect that benifits the OWNER of the card.
combatspiritlink same as above.
stacking flanking, requires 2 abilities unfortunately
[card]
name=Agility
target=creature
auto=teach(creature) flanker
auto=teach(creature) flanking
text=Enchant creature -- Enchanted creature gets +1/+1 and has flanking. (Whenever a creature without flanking blocks this creature, the blocking
creature gets -1/-1 until end of turn.)
mana={1}{R}
type=Enchantment
subtype=Aura
[/card]
removeallcounters(number/number,name)
removes all counters of the type from a card, can all be
"all"
vampire hexmage effect.
added new tools for transforms
,setpower=number
,settoughness=number
removetypes
morph
autofacedown={0}:morph
eradicate <---same as the card name.
cumulativeupcost[ <--self explanitory
upcostmulti[ <--an upcost that will resolve with a && ability
phaseaction[ phase name ] ability
an ability that will trigger on the stated phase name.
also support for phaseactionmulti[
new triggers added:
@vampired( <--sengir vampire effect
@targeted(
@lifeloss(
@lifed(
add a special ability builder called dynamicability
it acts alot like a choose your own adventure book
dynamicability<! variable 1, variable 2, variable 3,variable 4!> optional ability targetting the original target.
variable list 1:
this is the primary amount source
source
mytgt
myself
myfoe
variable list 2:
this is the variable we're after, or the amount
power
toughness
manacost
colors
age
charge
oneonecounters
thatmuch
variable list 3:
this is the main effect
strike
draw
lifeloss
lifegain
pumppow
pumptough
pumpboth
deplete
countersoneone
variable list 4:
how it will do this effect to.
itself
eachother
targetcontroller
targetopponent
tosrc
srccontroller
srcopponent
the best way to explain its usage is to look at cards coded with this ability. or experiment with combinations.
new gameoption
First turn player:player, opponent, random
who takes the first turn
added poisoned status, tho not complete since MBS hasnt spoiled enough cards to see where this variable will be used.
taught ai how to counter spell
improved ai, it will now cast instants during interupts and during your turn.
previously ai treated instant cards the same as it treated sorceries, which was not fair to the ai.
im sure there is some messed items, but the rev directly before this one had formatting in the code that created hundreds of conflicts with this one, so i had to dig this info out of red and green sections.
cards and test are coming soon, i ask PLEASE do not alter these new additions until the test are commited.
im commiting without the test because instead of allowing me to proceed with my beta test period, there are some that wish to rush me into a commit. if you do not like this commit revert it, i absolutely on no grounds give permission to recommit afterwards. and i will not recommit if a revert is called.
This commit is contained in:
@@ -26,217 +26,213 @@ public:
|
||||
TARGET_FROM,
|
||||
};
|
||||
int type; //Deprecated, use dynamic casting instead
|
||||
WEvent(int type = NOT_SPECIFIED);
|
||||
virtual ~WEvent() {};
|
||||
virtual std::ostream& toString(std::ostream& out) const;
|
||||
virtual int getValue()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
;
|
||||
virtual Targetable * getTarget(int target)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
;
|
||||
WEvent(int type = NOT_SPECIFIED);
|
||||
virtual ~WEvent() {};
|
||||
virtual std::ostream& toString(std::ostream& out) const;
|
||||
virtual int getValue() {return 0;};
|
||||
virtual Targetable * getTarget(int target) {return 0;};
|
||||
};
|
||||
|
||||
struct WEventZoneChange: public WEvent
|
||||
{
|
||||
MTGCardInstance * card;
|
||||
MTGGameZone * from;
|
||||
MTGGameZone * to;
|
||||
WEventZoneChange(MTGCardInstance * card, MTGGameZone * from, MTGGameZone *to);
|
||||
virtual ~WEventZoneChange() {};
|
||||
virtual std::ostream& toString(std::ostream& out) const;
|
||||
struct WEventZoneChange : public WEvent {
|
||||
MTGCardInstance * card;
|
||||
MTGGameZone * from;
|
||||
MTGGameZone * to;
|
||||
WEventZoneChange(MTGCardInstance * card, MTGGameZone * from, MTGGameZone *to);
|
||||
virtual ~WEventZoneChange() {};
|
||||
virtual std::ostream& toString(std::ostream& out) const;
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
struct WEventDamage : public WEvent {
|
||||
Damage * damage;
|
||||
WEventDamage(Damage * damage);
|
||||
virtual std::ostream& toString(std::ostream& out) const;
|
||||
virtual int getValue();
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
struct WEventLife : public WEvent {
|
||||
Player * player;
|
||||
int amount;
|
||||
int Ltype;
|
||||
WEventLife(Player * player,int amount,int Ltype = 0);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
struct WEventDamage: public WEvent
|
||||
{
|
||||
Damage * damage;
|
||||
WEventDamage(Damage * damage);
|
||||
virtual std::ostream& toString(std::ostream& out) const;
|
||||
virtual int getValue();
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventDamageStackResolved : public WEvent {
|
||||
WEventDamageStackResolved();
|
||||
};
|
||||
|
||||
struct WEventDamageStackResolved: public WEvent
|
||||
{
|
||||
WEventDamageStackResolved();
|
||||
struct WEventPhaseChange : public WEvent {
|
||||
Phase * from;
|
||||
Phase * to;
|
||||
WEventPhaseChange(Phase * from, Phase * to);
|
||||
};
|
||||
|
||||
struct WEventPhaseChange: public WEvent
|
||||
{
|
||||
Phase * from;
|
||||
Phase * to;
|
||||
WEventPhaseChange(Phase * from, Phase * to);
|
||||
};
|
||||
|
||||
//Abstract class of event when a card's status changes
|
||||
struct WEventCardUpdate: public WEvent
|
||||
{
|
||||
MTGCardInstance * card;
|
||||
WEventCardUpdate(MTGCardInstance * card);
|
||||
struct WEventCardUpdate : public WEvent {
|
||||
MTGCardInstance * card;
|
||||
WEventCardUpdate(MTGCardInstance * card);
|
||||
};
|
||||
|
||||
//creature damaged was killed, triggers effects targetter
|
||||
struct WEventVampire : public WEventCardUpdate {
|
||||
MTGCardInstance * card;
|
||||
MTGCardInstance * source;
|
||||
MTGCardInstance * victem;
|
||||
WEventVampire(MTGCardInstance * card,MTGCardInstance * source,MTGCardInstance * victem);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//creature became the target of a spell or ability
|
||||
struct WEventTarget : public WEventCardUpdate {
|
||||
MTGCardInstance * card;
|
||||
MTGCardInstance * source;
|
||||
WEventTarget(MTGCardInstance * card,MTGCardInstance * source);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//Event when a card gains/looses types
|
||||
struct WEventCardChangeType: public WEventCardUpdate
|
||||
{
|
||||
int type;
|
||||
bool before;
|
||||
bool after;
|
||||
WEventCardChangeType(MTGCardInstance * card, int type, bool before, bool after);
|
||||
struct WEventCardChangeType : public WEventCardUpdate {
|
||||
int type;
|
||||
bool before;
|
||||
bool after;
|
||||
WEventCardChangeType(MTGCardInstance * card, int type, bool before, bool after);
|
||||
};
|
||||
|
||||
//Event when a card is tapped/untapped
|
||||
struct WEventCardTap: public WEventCardUpdate
|
||||
{
|
||||
bool before;
|
||||
bool after;
|
||||
WEventCardTap(MTGCardInstance * card, bool before, bool after);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardTap : public WEventCardUpdate {
|
||||
bool before;
|
||||
bool after;
|
||||
WEventCardTap(MTGCardInstance * card, bool before, bool after);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
struct WEventCardTappedForMana: public WEventCardUpdate
|
||||
{
|
||||
bool before;
|
||||
bool after;
|
||||
WEventCardTappedForMana(MTGCardInstance * card, bool before, bool after);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardTappedForMana : public WEventCardUpdate {
|
||||
bool before;
|
||||
bool after;
|
||||
WEventCardTappedForMana(MTGCardInstance * card, bool before, bool after);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
|
||||
//Event when a card's "attacker" status changes
|
||||
//before:Player/Planeswalker that card was attacking previously
|
||||
//after: Player/Planeswalker that card is attacking now
|
||||
struct WEventCreatureAttacker: public WEventCardUpdate
|
||||
{
|
||||
Targetable * before;
|
||||
Targetable * after;
|
||||
WEventCreatureAttacker(MTGCardInstance * card, Targetable * from, Targetable * to);
|
||||
struct WEventCreatureAttacker : public WEventCardUpdate {
|
||||
Targetable * before;
|
||||
Targetable * after;
|
||||
WEventCreatureAttacker(MTGCardInstance * card, Targetable * from, Targetable * to);
|
||||
};
|
||||
|
||||
//event when card attacks.
|
||||
struct WEventCardAttacked: public WEventCardUpdate
|
||||
{
|
||||
WEventCardAttacked(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardAttacked : public WEventCardUpdate {
|
||||
WEventCardAttacked(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//event when card attacks alone.
|
||||
struct WEventCardAttackedAlone: public WEventCardUpdate
|
||||
{
|
||||
WEventCardAttackedAlone(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardAttackedAlone : public WEventCardUpdate {
|
||||
WEventCardAttackedAlone(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//event when card attacks but is not blocked.
|
||||
struct WEventCardAttackedNotBlocked: public WEventCardUpdate
|
||||
{
|
||||
WEventCardAttackedNotBlocked(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardAttackedNotBlocked : public WEventCardUpdate {
|
||||
WEventCardAttackedNotBlocked(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//event when card attacks but is blocked.
|
||||
struct WEventCardAttackedBlocked: public WEventCardUpdate
|
||||
{
|
||||
WEventCardAttackedBlocked(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardAttackedBlocked : public WEventCardUpdate {
|
||||
WEventCardAttackedBlocked(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//event when card blocked.
|
||||
struct WEventCardBlocked: public WEventCardUpdate
|
||||
{
|
||||
WEventCardBlocked(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardBlocked : public WEventCardUpdate {
|
||||
WEventCardBlocked(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//event when card is sacrificed.
|
||||
struct WEventCardSacrifice: public WEventCardUpdate
|
||||
{
|
||||
WEventCardSacrifice(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardSacrifice : public WEventCardUpdate {
|
||||
WEventCardSacrifice(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//event when card is discarded.
|
||||
struct WEventCardDiscard: public WEventCardUpdate
|
||||
{
|
||||
WEventCardDiscard(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
struct WEventCardDiscard : public WEventCardUpdate {
|
||||
WEventCardDiscard(MTGCardInstance * card);
|
||||
virtual Targetable * getTarget(int target);
|
||||
};
|
||||
|
||||
//Event when a card's "defenser" status changes
|
||||
//before : attacker that card was blocking previously
|
||||
//after: attacker that card is blocking now
|
||||
struct WEventCreatureBlocker: public WEventCardUpdate
|
||||
{
|
||||
MTGCardInstance * before;
|
||||
MTGCardInstance * after;
|
||||
WEventCreatureBlocker(MTGCardInstance * card, MTGCardInstance * from, MTGCardInstance * to);
|
||||
struct WEventCreatureBlocker : public WEventCardUpdate {
|
||||
MTGCardInstance * before;
|
||||
MTGCardInstance * after;
|
||||
WEventCreatureBlocker(MTGCardInstance * card,MTGCardInstance * from,MTGCardInstance * to);
|
||||
};
|
||||
|
||||
//Event sent when attackers have been chosen and they
|
||||
//cannot be changed any more.
|
||||
struct WEventAttackersChosen: public WEvent
|
||||
{
|
||||
struct WEventAttackersChosen : public WEvent {
|
||||
};
|
||||
|
||||
//Event sent when blockers have been chosen and they
|
||||
//cannot be changed any more.
|
||||
struct WEventBlockersChosen: public WEvent
|
||||
{
|
||||
struct WEventBlockersChosen : public WEvent {
|
||||
};
|
||||
|
||||
struct WEventcardDraw: public WEvent
|
||||
{
|
||||
WEventcardDraw(Player * player, int nb_cards);
|
||||
Player * player;
|
||||
int nb_cards;
|
||||
virtual Targetable * getTarget(Player * player);
|
||||
struct WEventcardDraw : public WEvent {
|
||||
WEventcardDraw(Player * player,int nb_cards);
|
||||
Player * player;
|
||||
int nb_cards;
|
||||
virtual Targetable * getTarget(Player * player);
|
||||
};
|
||||
|
||||
//Event when a blocker is reordered
|
||||
//exchangeWith: exchange card's position with exchangeWith's position
|
||||
//attacker:both card and exchangeWith *should* be in attacker's "blockers" list.
|
||||
struct WEventCreatureBlockerRank: public WEventCardUpdate
|
||||
{
|
||||
MTGCardInstance * exchangeWith;
|
||||
MTGCardInstance * attacker;
|
||||
WEventCreatureBlockerRank(MTGCardInstance * card, MTGCardInstance * exchangeWith, MTGCardInstance * attacker);
|
||||
struct WEventCreatureBlockerRank : public WEventCardUpdate {
|
||||
MTGCardInstance * exchangeWith;
|
||||
MTGCardInstance * attacker;
|
||||
WEventCreatureBlockerRank(MTGCardInstance * card,MTGCardInstance * exchangeWith, MTGCardInstance * attacker);
|
||||
};
|
||||
|
||||
//Event when a combat phase step ends
|
||||
struct WEventCombatStepChange: public WEvent
|
||||
struct WEventCombatStepChange : public WEvent
|
||||
{
|
||||
CombatStep step;
|
||||
WEventCombatStepChange(CombatStep);
|
||||
CombatStep step;
|
||||
WEventCombatStepChange(CombatStep);
|
||||
};
|
||||
|
||||
|
||||
//Event when a mana is engaged
|
||||
//color : color
|
||||
struct WEventEngageMana: public WEvent
|
||||
{
|
||||
int color;
|
||||
MTGCardInstance* card;
|
||||
ManaPool * destination;
|
||||
WEventEngageMana(int color, MTGCardInstance* card, ManaPool * destination);
|
||||
struct WEventEngageMana : public WEvent {
|
||||
int color;
|
||||
MTGCardInstance* card;
|
||||
ManaPool * destination;
|
||||
WEventEngageMana(int color, MTGCardInstance* card, ManaPool * destination);
|
||||
};
|
||||
|
||||
//Event when a mana is consumed
|
||||
//color : color
|
||||
struct WEventConsumeMana: public WEvent
|
||||
{
|
||||
int color;
|
||||
ManaPool * source;
|
||||
WEventConsumeMana(int color, ManaPool * source);
|
||||
struct WEventConsumeMana : public WEvent {
|
||||
int color;
|
||||
ManaPool * source;
|
||||
WEventConsumeMana(int color, ManaPool * source);
|
||||
};
|
||||
|
||||
//Event when a manapool is emptied
|
||||
//color : color
|
||||
struct WEventEmptyManaPool: public WEvent
|
||||
{
|
||||
ManaPool * source;
|
||||
WEventEmptyManaPool(ManaPool * source);
|
||||
struct WEventEmptyManaPool : public WEvent {
|
||||
ManaPool * source;
|
||||
WEventEmptyManaPool(ManaPool * source);
|
||||
};
|
||||
|
||||
std::ostream& operator<<(std::ostream&, const WEvent&);
|
||||
|
||||
Reference in New Issue
Block a user