From 8cb1f0cc7cbed9853f9c9f11e81ad767f3103f1f Mon Sep 17 00:00:00 2001
From: "omegablast2002@yahoo.com"
 <omegablast2002@yahoo.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Sat, 23 Oct 2010 23:48:02 +0000
Subject: [PATCH] moved the level varible from MTGcard to MTGprimitive.

---
 projects/mtg/include/CardPrimitive.h |  3 +++
 projects/mtg/include/MTGCard.h       |  3 ---
 projects/mtg/src/AIPlayer.cpp        |  4 ++--
 projects/mtg/src/CardPrimitive.cpp   |  9 +++++++++
 projects/mtg/src/MTGCard.cpp         | 10 ----------
 projects/mtg/src/MTGDeck.cpp         |  4 ++--
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/projects/mtg/include/CardPrimitive.h b/projects/mtg/include/CardPrimitive.h
index 8e63ba7d5..656a7eb33 100644
--- a/projects/mtg/include/CardPrimitive.h
+++ b/projects/mtg/include/CardPrimitive.h
@@ -29,6 +29,7 @@ class CardPrimitive {
   string spellTargetType;
   int power;
   int toughness;
+	int level;
   vector<int>types;
   CardPrimitive();
   CardPrimitive(CardPrimitive * source);
@@ -74,6 +75,8 @@ class CardPrimitive {
   int getPower();
   void setToughness(int _toughness);
   int getToughness();
+	void setMaxLevel(int _level);
+  int getMaxLevel();
 
   const vector<string>& formattedText();
 };
diff --git a/projects/mtg/include/MTGCard.h b/projects/mtg/include/MTGCard.h
index 1949e08b9..7713f6452 100644
--- a/projects/mtg/include/MTGCard.h
+++ b/projects/mtg/include/MTGCard.h
@@ -26,7 +26,6 @@ class MTGCard {
   int  init();
 
  public:
-	int LevelUp;
   int setId;
   CardPrimitive * data;
  
@@ -36,13 +35,11 @@ class MTGCard {
 
   void setMTGId(int id);
   void setRarity(char _rarity);
-	void setLevelcap(int _levelupcap);
   //void setImageName( char * value);
   void setPrimitive(CardPrimitive * cp);
 
   int getMTGId() const;
   int getId() const;
-	int getLevelcap() const;
   char getRarity() const;
   char * getImageName();
 };
diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp
index 4911b40d9..165c58acd 100644
--- a/projects/mtg/src/AIPlayer.cpp
+++ b/projects/mtg/src/AIPlayer.cpp
@@ -247,8 +247,8 @@ int AIAction::getEfficiency(){
 			 	 currentlevel = targetCounter->nb;
 				 }
 				}
-				if (currentlevel < _target->LevelUp){
-          efficiency = 65;
+				if (currentlevel < _target->level){
+          efficiency = 85;
 					efficiency += currentlevel;//increase the efficeincy of leveling up by a small amount equal to current level.
 				}
         break;
diff --git a/projects/mtg/src/CardPrimitive.cpp b/projects/mtg/src/CardPrimitive.cpp
index 2dfdedefb..a980a03a3 100644
--- a/projects/mtg/src/CardPrimitive.cpp
+++ b/projects/mtg/src/CardPrimitive.cpp
@@ -31,6 +31,7 @@ CardPrimitive::CardPrimitive(CardPrimitive * source){
 
   power = source->power;
   toughness = source->toughness;
+	level = source->level;
 
   magicText = source->magicText;
   for(map<string,string>::const_iterator it = source->magicTexts.begin(); it != source->magicTexts.end(); ++it)
@@ -330,3 +331,11 @@ void CardPrimitive::setToughness(int _toughness){
 int CardPrimitive::getToughness(){
   return toughness;
 }
+
+void CardPrimitive::setMaxLevel(int _levelcap){
+  level = _levelcap;
+}
+
+int CardPrimitive::getMaxLevel(){
+  return level;
+}
\ No newline at end of file
diff --git a/projects/mtg/src/MTGCard.cpp b/projects/mtg/src/MTGCard.cpp
index a42f67367..31610442f 100644
--- a/projects/mtg/src/MTGCard.cpp
+++ b/projects/mtg/src/MTGCard.cpp
@@ -26,7 +26,6 @@ MTGCard::MTGCard(int set_id){
 MTGCard::MTGCard(MTGCard * source){
 
   strcpy(image_name, source->image_name);
-	LevelUp = source->LevelUp;
   rarity = source->rarity;
   mtgid = source->mtgid;
   setId = source->setId;
@@ -38,7 +37,6 @@ int MTGCard::init(){
   mtgid = 0;
   data = NULL;
   rarity = Constants::RARITY_C;
-	LevelUp = 0;
   return 1;
 }
 
@@ -66,14 +64,6 @@ void MTGCard::setRarity(char _rarity){
   rarity = _rarity;
 }
 
-int MTGCard::getLevelcap() const{
-  return LevelUp;
-}
-
-void MTGCard::setLevelcap(int levelupcap){
-  LevelUp = levelupcap;
-}
-
 char * MTGCard::getImageName() {
   return image_name;
 }
diff --git a/projects/mtg/src/MTGDeck.cpp b/projects/mtg/src/MTGDeck.cpp
index 0c467ca9c..30f508326 100644
--- a/projects/mtg/src/MTGDeck.cpp
+++ b/projects/mtg/src/MTGDeck.cpp
@@ -112,8 +112,8 @@ int MTGAllCards::processConfLine(string &s, MTGCard *card, CardPrimitive * primi
       break;
 
 		case 'l': //Levelup, this is just to give Ai an idea when to stop leveling a creature.
-		if(!card) card = NEW MTGCard();
-			card->setLevelcap(atoi(val));
+      if (!primitive) primitive = NEW CardPrimitive();
+			primitive->setMaxLevel(atoi(val));
       break;
 
     case 'o': //othercost