From d5ca6b020710f069ad60b1ba7583ebc8f9d91269 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Fri, 22 Oct 2010 21:23:47 +0000 Subject: [PATCH] added a few subtypes to exclude from changeling, noticed subtypes that are not true MTG subtypes. in the future can we please try to refrain from making up fake subtypes, for exsample "level" and "levelup" are NOT MTG subtypes --- projects/mtg/include/AllAbilities.h | 3 ++- projects/mtg/src/CardPrimitive.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 190f5fd89..22613dd47 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -3272,7 +3272,8 @@ public: { if(s == "") break; if(s.find(" ") != string::npos) continue; - if(s == "Nothing" || s == "Swamp" || s == "Plains" || s == "Mountain" || s == "Forest" || s == "Island") + if(s == "Nothing" || s == "Swamp" || s == "Plains" || s == "Mountain" || s == "Forest" || s == "Island" || s == "Shrine" || s == "Basic" || s == "Colony" || s == "Desert" || s == "Dismiss" || s == "Equipment" + || s == "Everglades" || s == "Grasslands" || s == "Lair" || s == "Level" || s == "Levelup" || s == "Mine" || s == "Oasis" || s == "World" || s == "Aura") {//dont add "nothing" or land type to this card. }else{ types.push_back(i); diff --git a/projects/mtg/src/CardPrimitive.cpp b/projects/mtg/src/CardPrimitive.cpp index f83fd956e..2dfdedefb 100644 --- a/projects/mtg/src/CardPrimitive.cpp +++ b/projects/mtg/src/CardPrimitive.cpp @@ -194,7 +194,8 @@ void CardPrimitive::setSubtype(const string& value){ { if(s == "") break; if(s.find(" ") != string::npos) continue; - if(s == "Nothing" || s == "Swamp" || s == "Plains" || s == "Mountain" || s == "Forest" || s == "Island") + if(s == "Nothing" || s == "Swamp" || s == "Plains" || s == "Mountain" || s == "Forest" || s == "Island" || s == "Shrine" || s == "Basic" || s == "Colony" || s == "Desert" || s == "Dismiss" || s == "Equipment" + || s == "Everglades" || s == "Grasslands" || s == "Lair" || s == "Level" || s == "Levelup" || s == "Mine" || s == "Oasis" || s == "World" || s == "Aura") {//dont add "nothing" or land type to this card. }else{ addType(i);