Erwan

- InGame Text display is now an option 
- Fixed *Duos in SHM, benalish knight, beeligerent hatchling, removed demigod of revenge (needs extensive testing)
- added "ueot" for p/t and abilities gaining in the parser, as part as the fix for safehold duo

projects/mtg/src/GameStateOptions.cpp

@@ -29,6 +29,7 @@ void GameStateOptions::Start()
   optionsList->Add(NEW OptionItem(OPTIONS_SFXVOLUME, "SFX volume", 100, 10));
   optionsList->Add(NEW OptionItem(OPTIONS_INTERRUPTMYSPELLS, "interrupt my spells"));
   optionsList->Add(NEW OptionItem(OPTIONS_INTERRUPTMYABILITIES, "interrupt my abilities"));
+  optionsList->Add(NEW OptionItem(OPTIONS_OSD, "Display InGame extra information"));
   // WALDORF - added next line
   optionsList->Add(NEW OptionItem(OPTIONS_INTERRUPT_SECONDS, "Seconds to pause for an Interrupt", 20, 1));
   if (GameOptions::GetInstance()->values[OPTIONS_DIFFICULTY_MODE_UNLOCKED].getIntValue()) {

projects/mtg/src/MTGAbility.cpp

@@ -545,13 +545,15 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
     return NULL;
   }
 
-
+  int forceUEOT = 0;
+  found = s.find("ueot");
+  if (found!= string::npos) forceUEOT = 1;
  
   //Change Power/Toughness
   int power, toughness;
   if ( parsePowerToughness(s,&power, &toughness)){
     if (!activated){
-      if(card->hasType("instant") || card->hasType("sorcery")){
+      if(card->hasType("instant") || card->hasType("sorcery") || forceUEOT){
         return NEW AInstantPowerToughnessModifierUntilEOT(id, card, target,power,toughness);
       }
       return NEW APowerToughnessModifier(id, card, target,power,toughness);
@@ -578,7 +580,9 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
       int modifier = 1;
       if (found > 0 && s[found-1] == '-') modifier = 0;
       if (!activated){
-        if(card->hasType("instant") || card->hasType("sorcery") ) return NEW AInstantBasicAbilityModifierUntilEOT(id, card,target, j,modifier);   
+        if(card->hasType("instant") || card->hasType("sorcery")  || forceUEOT){ 
+           return NEW AInstantBasicAbilityModifierUntilEOT(id, card,target, j,modifier);
+        }
         return NEW ABasicAbilityModifier(id, card,target, j,modifier);
       }
       return NEW ABasicAbilityAuraModifierUntilEOT(id, card,target, NULL,j,modifier);

projects/mtg/src/MTGCardInstance.cpp

@@ -342,6 +342,7 @@ int MTGCardInstance::canBlock(){
   if (tapped) return 0;
   if (basicAbilities[Constants::CANTBLOCK]) return 0;
   if (!isACreature())return 0;
+  if (!isInPlay()) return 0;
   return 1;
 }
 

projects/mtg/src/MTGRules.cpp

@@ -1,6 +1,7 @@
 #include "../include/config.h"
 #include "../include/MTGRules.h"
 #include "../include/Translate.h"
+#include "../include/GameOptions.h"
 
 MTGPutInPlayRule::MTGPutInPlayRule(int _id):MTGAbility(_id, NULL){
   aType=MTGAbility::PUT_INTO_PLAY;
@@ -371,6 +372,7 @@ int HUDDisplay::receiveEvent(WEvent * event){
   return 0;
 }
 void HUDDisplay::Render(){
+  if (!GameOptions::GetInstance()->values[OPTIONS_OSD].getIntValue()) return;
   if (!events.size()) return;
 
   f->SetColor(ARGB(255,255,255,255));