[PlaneShift-svn] SF.net SVN: planeshift:[8807] trunk/src/server

[<lpa...@us...>]

Revision: 8807
          http://sourceforge.net/p/planeshift/code/8807
Author:   lpancallo
Date:     2013-09-18 11:01:37 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
Added example of minigame with 'specific piece' rule.

Modified Paths:
--------------
    trunk/src/server/database/mysql/action_locations.sql
    trunk/src/server/database/mysql/gameboards.sql
    trunk/src/server/minigamemanager.h

Modified: trunk/src/server/database/mysql/action_locations.sql
===================================================================
--- trunk/src/server/database/mysql/action_locations.sql	2013-09-18 09:38:06 UTC (rev 8806)
+++ trunk/src/server/database/mysql/action_locations.sql	2013-09-18 11:01:37 UTC (rev 8807)
@@ -34,4 +34,5 @@
 INSERT INTO `action_locations` VALUES (10,0,'ownedbox','NPCroom','npc1_woodplank',0,0,0,0,4294967295,5,'SELECT','EXAMINE','<Examine>\n<Container ID=\'82\'/>\n<Description>A Box owned by the merchant</Description>\n</Examine>','Y');
 INSERT INTO `action_locations` VALUES (11,0,'Tic Tac Toe','NPCroom','npc1_Box09',0,-1.69,0.89,-217.21,4294967295,4,'SELECT','EXAMINE','<Examine><GameBoard Name=\'Tic Tac Toe\' EndGame=\'Yes\' Script=\'minigame_win\' /><Description>Tic Tac Toe Board Game with $$$ prizes $$$.</Description></Examine>','Y');
 INSERT INTO `action_locations` VALUES (12,0,'Rainmaker game','NPCroom','npc1_Box08',0,-9.00,0.79,-217.21,4294967295,4,'SELECT','EXAMINE','<Examine><GameBoard Name=\'Weather game\' EndGame=\'Yes\' Script=\'rain\' /><Description>Magic puzzle that makes it rain. Make a simple r shape with the game pieces.</Description></Examine>','Y');
+INSERT INTO `action_locations` VALUES (13,0,'One Two Three','NPCroom','npc1_Box07',0,-16.17,0.70,-217.06,4294967295,4,'SELECT','EXAMINE','<Examine><GameBoard Name=\'One Two Three\' EndGame=\'Yes\' Script=\'rain\' /><Description>Tests specific pieces rule. Put tile 1 in 0,0, tile 2 in 1,0 and tile 3 in 2,0</Description></Examine>','Y');
 

Modified: trunk/src/server/database/mysql/gameboards.sql
===================================================================
--- trunk/src/server/database/mysql/gameboards.sql	2013-09-18 09:38:06 UTC (rev 8806)
+++ trunk/src/server/database/mysql/gameboards.sql	2013-09-18 11:01:37 UTC (rev 8807)
@@ -46,4 +46,5 @@
 INSERT INTO `gameboards` VALUES ('Test Game 2', 6, 6, 'FF00FFF0000F000000000000F0000FFF00FF', '123456789ABCDE', 1, 'White,Checked', '', '');
 INSERT INTO `gameboards` VALUES ('Tic Tac Toe', 3, 3, '000000000', '12', 2, 'White,Plain', '<GameRules><Rules PlayerTurns=\"StrictOrdered\" MoveType=\"PlaceOnly\" MoveTo=\"Vacancy\" /></GameRules>', '<MGEndGame><EndGame Coords=\"relative\" SourceTile=\"A\"><Coord Col=\"1\" Row=\"0\" Tile=\"F\" /><Coord Col=\"2\" Row=\"0\" Tile=\"F\" /></EndGame><EndGame Coords=\"relative\" SourceTile=\"A\"><Coord Col=\"0\" Row=\"1\" Tile=\"F\" /><Coord Col=\"0\" Row=\"2\" Tile=\"F\" /></EndGame><EndGame Coords=\"relative\" SourceTile=\"A\"><Coord Col=\"1\" Row=\"1\" Tile=\"F\" /><Coord Col=\"2\" Row=\"2\" Tile=\"F\" /></EndGame><EndGame Coords=\"relative\" SourceTile=\"A\"><Coord Col=\"-1\" Row=\"1\" Tile=\"F\" /><Coord Col=\"-2\" Row=\"2\" Tile=\"F\" /></EndGame></MGEndGame>');
 INSERT INTO `gameboards` VALUES ('Weather game', 3, 3, '000000000', '1', 1, 'Black,Plain', '', '<MGEndGame><EndGame Coords=\"absolute\"><Coord Col=\"0\" Row=\"0\" Tile=\"A\" /><Coord Col=\"1\" Row=\"0\" Tile=\"A\" /><Coord Col=\"2\" Row=\"0\" Tile=\"A\" /><Coord Col=\"0\" Row=\"1\" Tile=\"A\" /><Coord Col=\"0\" Row=\"2\" Tile=\"A\" /></EndGame></MGEndGame>');
+INSERT INTO `gameboards` VALUES ('One Two Three', 3, 3, '000000000', '123', 1, 'Black,Plain', '', '<MGEndGame><EndGame Coords=\"absolute\"><Coord Col=\"0\" Row=\"0\" Tile=\"S\" Piece=\"1\" /><Coord Col=\"1\" Row=\"0\" Tile=\"S\" Piece=\"2\" /><Coord Col=\"2\" Row=\"0\" Tile=\"S\" Piece=\"3\" /></EndGame></MGEndGame>');
 

Modified: trunk/src/server/minigamemanager.h
===================================================================
--- trunk/src/server/minigamemanager.h	2013-09-18 09:38:06 UTC (rev 8806)
+++ trunk/src/server/minigamemanager.h	2013-09-18 11:01:37 UTC (rev 8807)
@@ -97,11 +97,11 @@
  * - endgames: 
  *  <MGEndGame>
  *   <EndGame Coords="relative"/"absolute" [SourceTile="T"] [Winner="T"]>
- *    <Coord Col="0-15" Row="0-15" Tile="T" />
+ *    <Coord Col="0-15" Row="0-15" Tile="T" [Piece="X"] />
  *   </EndGame>
  *  </MGEndGame>
  *  where T : A = any valid piece / W = any white piece / B = any black piece
- *            E = empty tile / F = follows source piece
+ *            E = empty tile / F = follows source piece / S = specific pieces
  *  Each <EndGame> has 1 or more <Coord> spec.
  *  Each <MGEndGame> has 1 or more <EndGame>.
  *  Endgames can be left blank.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.