Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
- Magic 2010 Rule: removed Manaburn
- Magic 2010 Rule: manapools empty at the end of each step
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-06-14 09:21:49 +00:00
parent 56193a7656
commit f1a3895fc6
7 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/Res/test/circle_of_protection.txt
+3 -3
View File
@@ -4,8 +4,7 @@ COMBATATTACKERS
[PLAYER1] [PLAYER1]
inplay:1166 inplay:1166
[PLAYER2] [PLAYER2]
inplay:1335 inplay:1335,plains
manapool:{1}
[DO] [DO]
1166 1166
next next
@@ -16,6 +15,7 @@ no
no no
#interrupt the actual damage #interrupt the actual damage
yes yes
plains
1335 1335
1166 1166
endinterrupt endinterrupt
@@ -28,7 +28,7 @@ inplay:1166
manapool:{0} manapool:{0}
life:20 life:20
[PLAYER2] [PLAYER2]
inplay:1335 inplay:1335,plains
manapool:{0} manapool:{0}
life:20 life:20
[END] [END]
projects/mtg/bin/Res/test/fledgling_imp2.txt
+3 -2
View File
@@ -5,13 +5,13 @@ COMBATATTACKERS
[PLAYER1] [PLAYER1]
inplay:air elemental inplay:air elemental
[PLAYER2] [PLAYER2]
inplay:fledgling imp inplay:fledgling imp,swamp
hand:grizzly bears hand:grizzly bears
manapool:{B}
[DO] [DO]
air elemental air elemental
next next
#blockers #blockers
swamp
fledgling imp fledgling imp
choice 1 choice 1
grizzly bears grizzly bears
@@ -26,5 +26,6 @@ COMBATEND
inplay:air elemental inplay:air elemental
[PLAYER2] [PLAYER2]
graveyard:grizzly bears,fledgling imp graveyard:grizzly bears,fledgling imp
inplay:swamp
manapool:{0} manapool:{0}
[END] [END]
projects/mtg/bin/Res/test/force_of_nature2.txt
+1 -3
View File
@@ -1,6 +1,6 @@
#Testing That Force of nature accept GGGG to be paid #Testing That Force of nature accept GGGG to be paid
[INIT] [INIT]
UNTAP UPKEEP
[PLAYER1] [PLAYER1]
life:20 life:20
inplay:1245 inplay:1245
@@ -8,8 +8,6 @@ manapool:{G}{G}{G}{G}
[PLAYER2] [PLAYER2]
life:20 life:20
[DO] [DO]
next
#upkeep
1245 1245
next next
#draw #draw
projects/mtg/bin/Res/test/rootwalla.txt
+2 -2
View File
@@ -1,5 +1,5 @@
#Does the limit work well on Rootwalla's ability ? #Does the limit work well on Rootwalla's ability ?
#player 1 tries to activate it twice. Does he get the manaburn because of the one time that didn't work ? #player 1 tries to activate it twice.
#does player 2 get 4 damages ? #does player 2 get 4 damages ?
[INIT] [INIT]
FIRSTMAIN FIRSTMAIN
@@ -24,7 +24,7 @@ next
[ASSERT] [ASSERT]
COMBATEND COMBATEND
[PLAYER1] [PLAYER1]
life:18 life:20
inplay:129707 inplay:129707
manapool:{0} manapool:{0}
[PLAYER2] [PLAYER2]
projects/mtg/include/Player.h
-1
View File
@@ -29,7 +29,6 @@ class Player: public Damageable, public Targetable{
void unTapPhase(); void unTapPhase();
MTGInPlay * inPlay(); MTGInPlay * inPlay();
ManaCost * getManaPool(); ManaCost * getManaPool();
int manaBurn();
void cleanupPhase(); void cleanupPhase();
virtual int Act(float dt){return 0;}; virtual int Act(float dt){return 0;};
virtual int isAI(){return 0;}; virtual int isAI(){return 0;};
projects/mtg/src/GameObserver.cpp
+3 -8
View File
@@ -93,14 +93,9 @@ void GameObserver::nextGamePhase(){
mLayers->actionLayer()->Update(0); mLayers->actionLayer()->Update(0);
return nextGamePhase(); return nextGamePhase();
} }
//manaBurn
if (currentGamePhase == Constants::MTG_PHASE_UNTAP || for (int i=0; i < 2; i++){
currentGamePhase == Constants::MTG_PHASE_FIRSTMAIN || players[i]->getManaPool()->init();
currentGamePhase == Constants::MTG_PHASE_COMBATBEGIN ||
currentGamePhase == Constants::MTG_PHASE_SECONDMAIN ||
currentGamePhase == Constants::MTG_PHASE_ENDOFTURN
){
currentPlayer->manaBurn();
} }
//After End of turn //After End of turn
projects/mtg/src/Player.cpp
-7
View File
@@ -59,13 +59,6 @@ ManaCost * Player::getManaPool(){
return manaPool; return manaPool;
} }
int Player::manaBurn(){
int burn = manaPool->getConvertedCost();
life -= burn;
manaPool->init();
return burn;
}
int Player::testLife(){ int Player::testLife(){
if (life <=0){ if (life <=0){