Erwan

- Adding M10 todo.dat
- removed dead code

projects/mtg/bin/Res/sets/M10/_cards.dat

@@ -0,0 +1,12 @@
+[card]
+id=189884
+name=Air Elemental
+mana={3}{U}{U}
+type=Creature
+subtype=Elemental
+power=4
+toughness=4
+text=Flying
+abilities=flying
+rarity=U
+[/card]

projects/mtg/include/MTGAbility.h

@@ -157,20 +157,6 @@ class ListMaintainerAbility:public MTGAbility{
   virtual ostream& toString(ostream& out) const;
 };
 
-/* An attempt to globalize triggered abilities as much as possible 
-class MTGAbilityBasicFeatures{
- public:
-  Targetable * target;
-  GameObserver * game;
-  MTGCardInstance * source;
-  MTGAbilityBasicFeatures();
-  MTGAbilityBasicFeatures(MTGCardInstance * _source, Targetable * _target = NULL);
-  void init(MTGCardInstance * _source, Targetable * _target = NULL);
-};
-
-*/
-
-
 class TriggerAtPhase:public TriggeredAbility{
  public:
   int phaseId;
@@ -189,42 +175,6 @@ class TriggerNextPhase:public TriggerAtPhase{
 
 };
 
-/*
-
-class TriggeredEvent:public MTGAbilityBasicFeatures{
- public:
-   TriggeredEvent();
-   TriggeredEvent(MTGCardInstance * source, Targetable * target = NULL);
-  virtual int resolve()=0;
-};
-
-class DrawEvent:public TriggeredEvent{
- public:
-  Player * player;
-  int nbcards;
-  DrawEvent(Player * _player, int _nbcards);
-  int resolve();
-};
-
-class BuryEvent: public TriggeredEvent{
- public:
-  int resolve();
-};
-
-class DamageEvent:public TriggeredEvent{
-  public:
-    int damage;
-    DamageEvent(MTGCardInstance * _source, Damageable * _target, int _damage);
-    int resolve();
-};
-
-
-
-class DestroyCondition:public MTGAbilityBasicFeatures{
- public:
-  virtual int testDestroy();
-};
-*/
 
 class GenericTriggeredAbility:public TriggeredAbility{
  public:

projects/mtg/src/MTGAbility.cpp

@@ -2337,59 +2337,6 @@ ostream& ListMaintainerAbility::toString(ostream& out) const
 }
 
 
-/* An attempt to globalize triggered abilities as much as possible 
-
-MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(){
-  game = GameObserver::GetInstance();
-}
-MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(MTGCardInstance * _source, Targetable * _target):target(_target),source(_source){
-  if (!target) target = source;
-  game = GameObserver::GetInstance();
-}
-void MTGAbilityBasicFeatures::init(MTGCardInstance * _source, Targetable * _target){
-  source = source;
-  target=_target;
-  if (!target) target = source;
-}
-
-TriggeredEvent::TriggeredEvent():MTGAbilityBasicFeatures(){}
-
-TriggeredEvent::TriggeredEvent(MTGCardInstance * _source, Targetable * _target):MTGAbilityBasicFeatures(_source, _target){}
-
-DamageEvent::DamageEvent(MTGCardInstance * _source, Damageable * _target, int _damage):TriggeredEvent(_source,_target),damage(_damage){
-}
-
-int DamageEvent::resolve(){
-  Damageable * _target = (Damageable *)target;
-  game->mLayers->stackLayer()->addDamage(source,_target, damage);
-  return damage;
-}
-
-DrawEvent::DrawEvent(Player * _player, int _nbcards):TriggeredEvent(),player(_player),nbcards(_nbcards){
-}
-
-int DrawEvent::resolve(){
-  game->mLayers->stackLayer()->addDraw(player,nbcards);
-  return nbcards;
-}
-
-int BuryEvent::resolve(){
-  MTGCardInstance * _target = (MTGCardInstance *) target;
-  _target->controller()->game->putInGraveyard(_target);
-  return 1;
-}
-
-int DestroyCondition::testDestroy(){
-  if (!game->isInPlay(source)){
-    return 1;
-  }
-  if (target && !game->isInPlay((MTGCardInstance *)target)){
-    source->controller()->game->putInGraveyard(source);//TODO put this in a better place ???
-    return 1;
-  }
-  return 0;
-}
-*/
 
 TriggerAtPhase::TriggerAtPhase(int id, MTGCardInstance * source, Targetable * target,int _phaseId):TriggeredAbility(id, source,target),phaseId(_phaseId){
   GameObserver * g = GameObserver::GetInstance();