-Fix for issue 710 (can't tap mana in story mode). Update your rules and campaigns folders!

-- Zeth, please verify that I didn't break your mods if you have time
-- The test suite does NOT pass in this revision (see issue 711), but I verified that the problem does not come from my change, so we need to dig
-- Campaigns creators will have to update their campaigns to make them compatible with Wagic 0.16. It consists in adding "include mtg.txt" at the top of each one of their rules.txt file.

projects/mtg/bin/Res/campaigns/01.Where it all begins/attack/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/campaigns/01.Where it all begins/block/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 player=2

projects/mtg/bin/Res/campaigns/01.Where it all begins/cast_spell_1/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/campaigns/01.Where it all begins/cast_spell_2/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/campaigns/01.Where it all begins/first_duel/rules.txt

@@ -1,3 +1,3 @@
-include mtg.txt
+include classic.txt
 [INIT]
 mode=mtg

projects/mtg/bin/Res/campaigns/01.Where it all begins/tap_mana/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/campaigns/Game Manual/attack/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/campaigns/Game Manual/block/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 player=2

projects/mtg/bin/Res/campaigns/Game Manual/cast_spell_1/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/campaigns/Game Manual/cast_spell_2/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/campaigns/Game Manual/interrupt/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 player=2

projects/mtg/bin/Res/campaigns/Game Manual/play_land/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/campaigns/Game Manual/play_target/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER2]

projects/mtg/bin/Res/campaigns/Game Manual/tap_mana/rules.txt

@@ -1,3 +1,4 @@
+include mtg.txt
 [INIT]
 mode=mtg
 [PLAYER1]

projects/mtg/bin/Res/rules/classic.txt

@@ -3,6 +3,10 @@ name=Classic
 [INIT]
 mode=mtg
 
+[PLAYERS]
+auto=shuffle
+auto=draw:7
+
 [PLAYER1]
 #Tutorial is an ability that works like all others, but it is only activated once for a given player
 #Therefore triggering it with somthing such as @each... will actually only work once

projects/mtg/bin/Res/rules/momir.txt

@@ -4,4 +4,6 @@ unlock=prx_rimom
 [INIT]
 mode=momir
 [PLAYERS]
-life:24
+life:24
+auto=shuffle
+auto=draw:7

projects/mtg/bin/Res/rules/mtg.txt

@@ -1,4 +1,7 @@
-#If you change this file, be sure to report your changes into testsuite.txt!
+# This is the basic rules for MTG.
+# Do not add any "Draw X cards at startup" or "shuffle" here, as the story mode and the test suite rely on this
+# file, and they usually don't expect the draw rule or shuffle to happen
+# If you want shuffle or draw events, put them directly in your own rules file that includes this file, see clasic.txt for example 
 hidden
 [INIT]
 mode=mtg
@@ -6,8 +9,6 @@ mode=mtg
 life:20
 offerinterruptonphase=draw
 auto=sethand:7
-auto=shuffle
-auto=draw:7
 auto=@each my draw:draw:1
 auto=maxPlay(land)1
 

projects/mtg/bin/Res/rules/random1.txt

@@ -2,4 +2,8 @@ include mtg.txt
 name=Random 1 Color
 unlock=prx_rnddeck
 [INIT]
-mode=random1
+mode=random1
+
+[PLAYERS]
+auto=shuffle
+auto=draw:7

projects/mtg/bin/Res/rules/random2.txt

@@ -2,4 +2,8 @@ include mtg.txt
 name=Random 2 Colors
 unlock=prx_rnddeck
 [INIT]
-mode=random2
+mode=random2
+
+[PLAYERS]
+auto=shuffle
+auto=draw:7

projects/mtg/bin/Res/rules/stonehewer.txt

@@ -5,5 +5,7 @@ unlock=prx_rewehenots
 mode=stonehewer
 [PLAYERS]
 life:15
-auto=draw:1
+auto=shuffle
+auto=draw:8
 auto=sethand:8
+

projects/mtg/bin/Res/rules/testsuite.txt

@@ -1,33 +1,4 @@
-#make sure this file always looks like mtg.txt, minus the initial shuffle and draw
+include mtg.txt
 hidden
 [INIT]
 mode=mtg
-[PLAYERS]
-life:20
-auto=sethand:7
-auto=@each my draw:draw:1
-auto=maxPlay(land)1
-
-#Lands Mana Rules
-auto=lord(Plains|MyBattlefield) {T}:Add{W}
-auto=lord(Island|MyBattlefield) {T}:Add{U}
-auto=lord(Swamp|MyBattlefield) {T}:Add{B}
-auto=lord(Mountains|MyBattlefield) {T}:Add{R}
-auto=lord(Forest|MyBattlefield) {T}:Add{G}
-
-#Mana Empties from manapool at the end of each phase
-auto=@each untap:removeMana(*)
-auto=@each upkeep:removeMana(*)
-auto=@each draw:removeMana(*)
-auto=@each firstmain:removeMana(*)
-auto=@each combatbegins:removeMana(*)
-auto=@each attackers:removeMana(*)
-auto=@each blockers:removeMana(*)
-auto=@each combatdamage:removeMana(*)
-auto=@each combatEnds:removeMana(*)
-auto=@each secondmain:removeMana(*)
-auto=@each end:removeMana(*)
-auto=@each cleanup:removeMana(*)
-
-#reset Creature damage at the cleanup phase
-auto=@each cleanup:all(*|myBattlefield) resetDamage