[arthea] r473 committed - [No log message]
art...@googlecode.com
Author: c0der78
Date: Sun May 29 11:10:54 2011
Log: [No log message]
http://code.google.com/p/arthea/source/detail?r=473
Modified:
/trunk/ArtheaEngine/Dice.cs
/trunk/ArtheaEngine/Model/Forum.cs
/trunk/arthea.sql
=======================================
--- /trunk/ArtheaEngine/Dice.cs Wed Apr 20 17:02:20 2011
+++ /trunk/ArtheaEngine/Dice.cs Sun May 29 11:10:54 2011
@@ -53,10 +53,12 @@
public int[] RollAgainst(Dice dice)
{
Collection<int> values = new Collection<int>();
-
- foreach (var a in Roll())
- {
- foreach (var b in dice.Roll())
+ var roll1 = Roll();
+ var roll2 = dice.Roll();
+
+ foreach (var a in roll1)
+ {
+ foreach (var b in roll2)
{
if (a >= b)
values.Add(a);
=======================================
--- /trunk/ArtheaEngine/Model/Forum.cs Fri Apr 22 09:57:31 2011
+++ /trunk/ArtheaEngine/Model/Forum.cs Sun May 29 11:10:54 2011
@@ -232,6 +232,8 @@
var cmd = conn.CreateCommand("read_forum");
cmd.AddParameter("@id", DbType.Int32, Id);
+ Note.ReadAll(this);
+
return this.Load(cmd);
}
=======================================
--- /trunk/arthea.sql Thu Apr 21 17:19:32 2011
+++ /trunk/arthea.sql Sun May 29 11:10:54 2011
@@ -1,8 +1,8 @@
--- MySQL dump 10.13 Distrib 5.5.11, for Win64 (x86)
+-- MySQL dump 10.13 Distrib 5.5.10, for Win32 (x86)
--
-- Host: localhost Database: arthea
-- ------------------------------------------------------
--- Server version 5.5.11
+-- Server version 5.5.10
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -47,7 +47,7 @@
`flags` tinytext,
PRIMARY KEY (`account_id`),
UNIQUE KEY `login_UNIQUE` (`login`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -84,23 +84,6 @@
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
---
--- Table structure for table `board`
---
-
-DROP TABLE IF EXISTS `board`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `board` (
- `board_id` int(11) NOT NULL,
- `name` varchar(45) DEFAULT NULL,
- `description` varchar(145) DEFAULT NULL,
- `read_permission` varchar(145) DEFAULT NULL,
- `write_permission` varchar(145) DEFAULT NULL,
- PRIMARY KEY (`board_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
--
-- Table structure for table `char_object`
--
@@ -134,7 +117,7 @@
`position` varchar(45) DEFAULT NULL,
`sex` varchar(45) DEFAULT NULL,
PRIMARY KEY (`char_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -172,6 +155,23 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `forum`
+--
+
+DROP TABLE IF EXISTS `forum`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `forum` (
+ `forum_id` int(11) NOT NULL,
+ `name` varchar(45) DEFAULT NULL,
+ `description` varchar(145) DEFAULT NULL,
+ `read_permission` varchar(145) DEFAULT NULL,
+ `write_permission` varchar(145) DEFAULT NULL,
+ PRIMARY KEY (`forum_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
--
-- Table structure for table `help`
--
@@ -246,9 +246,9 @@
`from` varchar(100) NOT NULL,
`subject` varchar(100) NOT NULL,
`when` datetime NOT NULL,
- `board_id` bigint(20) NOT NULL,
+ `forum_id` int(11) NOT NULL,
`original_id` bigint(20) DEFAULT NULL,
- PRIMARY KEY (`note_id`,`board_id`)
+ PRIMARY KEY (`note_id`,`forum_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -405,7 +405,7 @@
`name` varchar(45) DEFAULT NULL,
`port` smallint(6) DEFAULT '4000',
PRIMARY KEY (`world_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
@@ -501,25 +501,6 @@
BEGIN
DELETE FROM `arthea`.`area` WHERE `area_id` = `id` LIMIT 1;
END */;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `delete_board` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode
= 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `delete_board`(`@id` int)
-BEGIN
- DELETE FROM `arthea`.`board` WHERE `board_id` = `@id` LIMIT 1;
-END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -614,6 +595,25 @@
AND `direction` = `@dir`
LIMIT 1;
END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `delete_forum` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode
= 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `delete_forum`(`@id` int)
+BEGIN
+ DELETE FROM `arthea`.`forum` WHERE `forum_id` = `@id` LIMIT 1;
+END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -965,25 +965,6 @@
BEGIN
SELECT * FROM `arthea`.`area` WHERE `area_id` = `@id` LIMIT 1;
END */;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `read_board` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode
= 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `read_board`(`@id` int)
-BEGIN
- SELECT * FROM `arthea`.`board` WHERE `board_id` = `@id` LIMIT 1;
-END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1034,6 +1015,25 @@
AND `direction` = `@dir`
LIMIT 1;
END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `read_forum` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode
= 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `read_forum`(`@id` int)
+BEGIN
+ SELECT * FROM `arthea`.`forum` WHERE `forum_id` = `@id` LIMIT 1;
+END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1440,49 +1440,6 @@
`credits` = `@credits`,
`world_id` = `@world`;
END */;;
-DELIMITER ;
-/*!50003 SET sql_mode = @saved_sql_mode */ ;
-/*!50003 SET character_set_client = @saved_cs_client */ ;
-/*!50003 SET character_set_results = @saved_cs_results */ ;
-/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `save_board` */;
-/*!50003 SET @saved_cs_client = @@character_set_client */ ;
-/*!50003 SET @saved_cs_results = @@character_set_results */ ;
-/*!50003 SET @saved_col_connection = @@collation_connection */ ;
-/*!50003 SET character_set_client = utf8 */ ;
-/*!50003 SET character_set_results = utf8 */ ;
-/*!50003 SET collation_connection = utf8_general_ci */ ;
-/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
-/*!50003 SET sql_mode
= 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
-DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `save_board`(
- `@id` int,
- `@name` varchar(45),
- `@descr` varchar(145),
- `@read_perms` varchar(145),
- `@write_perms` varchar(145)
-)
-BEGIN
- INSERT INTO `arthea`.`board` (
- `board_id`,
- `name`,
- `description`,
- `read_permission`,
- `write_permission`
- ) VALUES (
- `@id`,
- `@name`,
- `@descr`,
- `@read_perms`,
- `@write_perms`
- )
- ON DUPLICATE KEY
- UPDATE
- `name` = `@name`,
- `description` = `@descr`,
- `read_permission` = `@read_perms`,
- `write_permission` = `@write_perms`;
-END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -1661,6 +1618,49 @@
`keyword` = `@keyword`,
`description` = `@descr`;
END */;;
+DELIMITER ;
+/*!50003 SET sql_mode = @saved_sql_mode */ ;
+/*!50003 SET character_set_client = @saved_cs_client */ ;
+/*!50003 SET character_set_results = @saved_cs_results */ ;
+/*!50003 SET collation_connection = @saved_col_connection */ ;
+/*!50003 DROP PROCEDURE IF EXISTS `save_forum` */;
+/*!50003 SET @saved_cs_client = @@character_set_client */ ;
+/*!50003 SET @saved_cs_results = @@character_set_results */ ;
+/*!50003 SET @saved_col_connection = @@collation_connection */ ;
+/*!50003 SET character_set_client = utf8 */ ;
+/*!50003 SET character_set_results = utf8 */ ;
+/*!50003 SET collation_connection = utf8_general_ci */ ;
+/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
+/*!50003 SET sql_mode
= 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
+DELIMITER ;;
+/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `save_forum`(
+ `@id` int,
+ `@name` varchar(45),
+ `@descr` varchar(145),
+ `@read_perms` varchar(145),
+ `@write_perms` varchar(145)
+)
+BEGIN
+ INSERT INTO `arthea`.`forum` (
+ `forum_id`,
+ `name`,
+ `description`,
+ `read_permission`,
+ `write_permission`
+ ) VALUES (
+ `@id`,
+ `@name`,
+ `@descr`,
+ `@read_perms`,
+ `@write_perms`
+ )
+ ON DUPLICATE KEY
+ UPDATE
+ `name` = `@name`,
+ `description` = `@descr`,
+ `read_permission` = `@read_perms`,
+ `write_permission` = `@write_perms`;
+END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -2395,7 +2395,7 @@
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `select_board_notes` */;
+/*!50003 DROP PROCEDURE IF EXISTS `select_char_objects` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -2405,18 +2405,18 @@
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode
= 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `select_board_notes`(
+/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `select_char_objects`(
`@id` bigint
)
BEGIN
- SELECT * FROM `arthea`.`note` WHERE `board_id` = `@id`;
+ SELECT * FROM `arthea`.`char_object` WHERE `char_id` = `@id`;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `select_char_objects` */;
+/*!50003 DROP PROCEDURE IF EXISTS `select_forum_notes` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
/*!50003 SET @saved_col_connection = @@collation_connection */ ;
@@ -2426,11 +2426,11 @@
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode
= 'STRICT_TRANS_TABLES,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
-/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `select_char_objects`(
+/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `select_forum_notes`(
`@id` bigint
)
BEGIN
- SELECT * FROM `arthea`.`char_object` WHERE `char_id` = `@id`;
+ SELECT * FROM `arthea`.`note` WHERE `forum_id` = `@id`;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -2611,4 +2611,4 @@
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
--- Dump completed on 2011-04-21 17:18:44
+-- Dump completed on 2011-05-29 11:07:32