[arthea] r469 committed - added prompts, updates to combat, added vitals class, fixed a bug in c...

[art...@googlecode.com]

Revision: 469
Author: c0der78
Date: Wed Apr 20 17:02:20 2011
Log: added prompts, updates to combat, added vitals class, fixed a bug
in color parse
http://code.google.com/p/arthea/source/detail?r=469

Modified:
/trunk/ArtheaEngine/Color.cs
/trunk/ArtheaEngine/Combat.cs
/trunk/ArtheaEngine/Dice.cs
/trunk/ArtheaEngine/Extensions.cs
/trunk/ArtheaEngine/Model/Account.cs
/trunk/ArtheaEngine/Model/Area.cs
/trunk/ArtheaEngine/Model/Character.cs
/trunk/ArtheaEngine/Model/Player.cs
/trunk/ArtheaEngine/Model/Reset.cs
/trunk/ArtheaEngine/Model/Room.cs
/trunk/ArtheaEngine/UpdateManager.cs
/trunk/ArtheaEngine.Tests/ExtensionsTest.cs
/trunk/ArtheaServer/Commands/KillCommand.cs
/trunk/ArtheaServer/Commands/LookCommand.cs
/trunk/ArtheaServer/MainForm.cs
/trunk/ArtheaServer/TelnetConnection.cs
/trunk/arthea.sql

=======================================
--- /trunk/ArtheaEngine/Color.cs Tue Apr 19 15:57:05 2011
+++ /trunk/ArtheaEngine/Color.cs Wed Apr 20 17:02:20 2011
@@ -334,7 +334,7 @@
buf.Append(text.Substring(lastIndex, index - lastIndex));

// increment, and check for trailing codes
- if (++index > text.Length)
+ if (++index >= text.Length)
{
buf.Append(Color.Code);
break;
=======================================
--- /trunk/ArtheaEngine/Combat.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaEngine/Combat.cs Wed Apr 20 17:02:20 2011
@@ -1,39 +1,79 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using ArtheaEngine.Model;
-
-namespace ArtheaEngine
-{
+namespace ArtheaEngine
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Text;
+
+ using ArtheaEngine.Model;
+
public class Combat : ITickable
{
+ #region Constructors
+
public Combat(Character ch, Character victim)
{
Attacker = ch;
Victim = victim;
}
- public int TickInterval { get { return 1000; } }
+
+ #endregion Constructors
+
+ #region Properties
+
+ public Character Attacker
+ {
+ get; private set;
+ }
+
+ public int TickInterval
+ {
+ get { return 1000; }
+ }
+
+ public Character Victim
+ {
+ get; private set;
+ }
+
+ #endregion Properties
+
+ #region Methods

public void Tick()
{
int[] attacks = Attacker.Attack.RollAgainst(Victim.Defense);

- foreach (var attack in attacks)
- {
- var damages = Attacker.Attack.RollAgainst(Victim.Defense);
-
- var damage = 0;
-
- Array.ForEach(attacks, x => damage += x);
+ foreach (var bonus in attacks)
+ {
+ var damage =
Attacker.Attack.RollAgainstValue(Victim.Defense);
+
+ damage += bonus;
+
+ Victim.Vitals.Life -= damage;

Attacker.Act("You hit {0} for {1} damage!", Victim,
damage);
Victim.Act("{0} hits you for {1} damage!", Attacker,
damage);
- Victim.Room.Act("{0} hits {1} for {2} damage!", Attacker,
Victim, damage);
+ Victim.Room.Act(new[]{Attacker, Victim}, "{0} hits {1} for
{2} damage!", Attacker, Victim, damage);
+
+ if (Victim.Vitals.Life <= 0)
+ {
+ Victim.WriteLine("~RYou are DEAD!~x");
+ Attacker.WriteLine("{0} is ~RDEAD!~x", Victim);
+ Victim.Room.Act(new []{Attacker,Victim}, "{0} is
dead", Victim);
+ UpdateManager.Remove(Attacker.Fighting);
+ UpdateManager.Remove(Victim.Fighting);
+ return;
+ }
+ }
+
+ if (Attacker is Player)
+ {
+ Attacker.WriteLine();
+ (Attacker as Player).DisplayPrompt();
}
}

- public Character Attacker { get; private set; }
- public Character Victim { get; private set; }
+ #endregion Methods
}
}
=======================================
--- /trunk/ArtheaEngine/Dice.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaEngine/Dice.cs Wed Apr 20 17:02:20 2011
@@ -64,6 +64,21 @@
}
return values.ToArray();
}
+
+ public int RollAgainstValue(Dice dice)
+ {
+ int value = 0;
+
+ foreach (var a in Roll())
+ {
+ foreach (var b in dice.Roll())
+ {
+ if (a >= b)
+ value += a;
+ }
+ }
+ return value;
+ }

#endregion Methods
}
=======================================
--- /trunk/ArtheaEngine/Extensions.cs Tue Apr 19 15:57:05 2011
+++ /trunk/ArtheaEngine/Extensions.cs Wed Apr 20 17:02:20 2011
@@ -348,19 +348,6 @@
{
return IsPrefixOf(mString, value, true);
}
-
- /// <summary>
- /// Joins the specified separator.
- /// </summary>
- /// <param name="separator">The separator.</param>
- /// <param name="value">The value.</param>
- /// <returns></returns>
- public static string JoinWith(this String[] value, string
separator)
- {
- var newValue = new string[value.Length];
- value.CopyTo(newValue, 0);
- return String.Join(separator, newValue);
- }

public static object LastInsertId(this IDbConnection conn)
{
=======================================
--- /trunk/ArtheaEngine/Model/Account.cs Tue Apr 19 15:57:05 2011
+++ /trunk/ArtheaEngine/Model/Account.cs Wed Apr 20 17:02:20 2011
@@ -185,7 +185,7 @@

public virtual void Write(string format, params object[] args)
{
- Connection.WriteLine(format, args);
+ Connection.Write(format, args);
}

public virtual void Write(byte[] value)
=======================================
--- /trunk/ArtheaEngine/Model/Area.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaEngine/Model/Area.cs Wed Apr 20 17:02:20 2011
@@ -73,11 +73,6 @@
get; set;
}

- public int TickInterval
- {
- get;
- set;
- }
public ObservableCollection<Object> Objects
{
get; set;
@@ -87,6 +82,12 @@
{
get; set;
}
+
+ public int TickInterval
+ {
+ get;
+ set;
+ }

public World World
{
=======================================
--- /trunk/ArtheaEngine/Model/Character.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaEngine/Model/Character.cs Wed Apr 20 17:02:20 2011
@@ -14,16 +14,6 @@

#region Enumerations

- /*
- [Flags]
- public enum ActType
- {
- Char,
- Room,
- NotChar,
- World
- }*/
-
public enum Position
{
Dead,
@@ -137,8 +127,10 @@
}
});

- Attack = new Dice(1, 2);
- Defense = new Dice(1, 2);
+ Attack = new Dice(2, 4);
+ Defense = new Dice(2, 4);
+
+ Vitals = new Vitals();
}

#endregion Constructors
@@ -169,6 +161,12 @@
{
get; set;
}
+
+ public Combat Fighting
+ {
+ get;
+ set;
+ }

public long Id
{
@@ -209,6 +207,11 @@
{
get; set;
}
+
+ public Vitals Vitals
+ {
+ get; set;
+ }

public abstract World World
{
@@ -229,6 +232,7 @@
{
return List.OfType<T>().FirstOrDefault(x =>
x.Name.HasWord(name));
}
+
/*
public virtual void Act(ActType type, string format, params
object[] args)
{
@@ -360,9 +364,7 @@
Description = reader.GetStringOrNull(i++);
Level = reader.GetInt16(i++);

- if (!reader.IsDBNull(i))
- Race = Race.Lookup(reader.GetInt32(i++));
- else i++;
+ Race = Race.Lookup(reader.GetInt32(i++));
if (Race == null)
Race = new UniqueRace();
Size = reader.GetFloat(i++);
@@ -536,4 +538,64 @@

#endregion Methods
}
-}
+
+ public class Vitals
+ {
+ #region Fields
+
+ public int MaxLife;
+
+ #endregion Fields
+
+ #region Constructors
+
+ public Vitals()
+ {
+ Life = MaxLife=100;
+ Mana = MaxMana = 100;
+ Energy = MaxEnergy = 100;
+ WillPower = MaxWillPower = 100;
+ }
+
+ #endregion Constructors
+
+ #region Properties
+
+ public int Energy
+ {
+ get; set;
+ }
+
+ public int Life
+ {
+ get; set;
+ }
+
+ public int Mana
+ {
+ get; set;
+ }
+
+ public int MaxEnergy
+ {
+ get; set;
+ }
+
+ public int MaxMana
+ {
+ get; set;
+ }
+
+ public int MaxWillPower
+ {
+ get; set;
+ }
+
+ public int WillPower
+ {
+ get; set;
+ }
+
+ #endregion Properties
+ }
+}
=======================================
--- /trunk/ArtheaEngine/Model/Player.cs Tue Apr 19 15:57:05 2011
+++ /trunk/ArtheaEngine/Model/Player.cs Wed Apr 20 17:02:20 2011
@@ -34,6 +34,8 @@
public Player()
{
LastNote = new Dictionary<int, DateTime>();
+ Prompt = "~R%l/%L ~M%m/%M ~B%e/%E~x";
+ CombatPrompt = Prompt;
}

#endregion Constructors
@@ -54,11 +56,23 @@
{
get; set;
}
+
+ public string CombatPrompt
+ {
+ get;
+ set;
+ }

public Dictionary<int, DateTime> LastNote
{
get; private set;
}
+
+ public string Prompt
+ {
+ get;
+ set;
+ }

public string Title
{
@@ -81,6 +95,56 @@

return cmd.ExecuteNonQuery() == 1 && base.Delete(conn);
}
+
+ public void DisplayPrompt()
+ {
+ var pos = Prompt.IndexOf('%');
+
+ if (pos == -1)
+ {
+ Write(Prompt);
+ return;
+ }
+
+ var buf = new StringBuilder();
+ var last = 0;
+
+ do
+ {
+ buf.Append(Prompt.Substring(last, pos - last));
+
+ switch (Prompt[++pos])
+ {
+ case 'l':
+ buf.Append(Vitals.Life);
+ break;
+ case 'L':
+ buf.Append(Vitals.MaxLife);
+ break;
+ case 'm':
+ buf.Append(Vitals.Mana);
+ break;
+ case 'M':
+ buf.Append(Vitals.MaxMana);
+ break;
+ case 'e':
+ buf.Append(Vitals.Energy);
+ break;
+ case 'E':
+ buf.Append(Vitals.MaxEnergy);
+ break;
+ }
+
+ last = ++pos;
+
+ pos = Prompt.IndexOf('%', last);
+ }
+ while (pos != -1);
+
+ buf.Append(Prompt.Substring(last));
+
+ Write(buf);
+ }

public override void Dispose()
{
=======================================
--- /trunk/ArtheaEngine/Model/Reset.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaEngine/Model/Reset.cs Wed Apr 20 17:02:20 2011
@@ -4,21 +4,25 @@
using System.Collections.ObjectModel;
using System.Data;
using System.Data.Odbc;
+ using System.IO;
using System.Linq;
+ using System.Text.RegularExpressions;

using ArtheaEngine;

using LuaInterface;

using NLog;
- using System.IO;
- using System.Text.RegularExpressions;

public class Reset : IEntity<long>, IPersistent
{
+ #region Fields
+
NonPlayer lastNPC;
Object lastOBJ;

+ #endregion Fields
+
#region Constructors

public Reset(Room room)
@@ -58,7 +62,14 @@
return cmd.ExecuteNonQuery() == 1;
}

- public void EquipReset(string[] args)//long id, WearLocation loc)
+ public void EchoReset(string msg)
+ {
+ foreach (var ch in Room.Characters)
+ ch.WriteLine(msg);
+ }
+
+ //long id, WearLocation loc)
+ public void EquipReset(string[] args)
{
if (lastNPC == null) return;

@@ -84,7 +95,7 @@

for(var line = reader.ReadLine(); line != null; line =
reader.ReadLine())
{
- var args = line.Split(new []{'(', ',', ')'},
StringSplitOptions.RemoveEmptyEntries);
+ var args = line.Split(new []{'(', ',', ')', ' ',},
StringSplitOptions.RemoveEmptyEntries);

switch (args[0].ToLower())
{
@@ -100,9 +111,11 @@
case "put":
PutReset(args);
break;
+ case "echo":
+ EchoReset(line.Substring(line.IndexOf(' ')+1));
+ break;
}
}
-
}

public void GiveReset(string[] args)
@@ -173,7 +186,6 @@
lastNPC = NonPlayer.Load(id);

Room.Characters.Add(lastNPC);
-
}

public void ObjReset(string[] args)
@@ -240,7 +252,6 @@

return res;
}
-

#endregion Methods
}
=======================================
--- /trunk/ArtheaEngine/Model/Room.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaEngine/Model/Room.cs Wed Apr 20 17:02:20 2011
@@ -207,7 +207,7 @@

MapRow(reader);
}
-
+
return true;
}

=======================================
--- /trunk/ArtheaEngine/UpdateManager.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaEngine/UpdateManager.cs Wed Apr 20 17:02:20 2011
@@ -2,18 +2,29 @@
{
using System;
using System.Collections.Generic;
+ using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Timers;

using ArtheaEngine.Model;
- using System.Collections.ObjectModel;

public interface ITickable
{
+ #region Properties
+
+ int TickInterval
+ {
+ get;
+ }
+
+ #endregion Properties
+
+ #region Methods
+
void Tick();

- int TickInterval { get; }
+ #endregion Methods
}

public static class UpdateManager
@@ -26,14 +37,6 @@

#region Methods

- public static void Remove(ITickable ticker)
- {
- if (!_timers.ContainsKey(ticker)) return;
-
- _timers[ticker].Stop();
-
- _timers.Remove(ticker);
- }
public static void Add(ITickable ticker)
{
var timer = new Timer { Interval = ticker.TickInterval,
Enabled = true };
@@ -47,6 +50,15 @@

timer.Start();
}
+
+ public static void Remove(ITickable ticker)
+ {
+ if (!_timers.ContainsKey(ticker)) return;
+
+ _timers[ticker].Stop();
+
+ _timers.Remove(ticker);
+ }

#endregion Methods
}
=======================================
--- /trunk/ArtheaEngine.Tests/ExtensionsTest.cs Tue Apr 19 15:57:05 2011
+++ /trunk/ArtheaEngine.Tests/ExtensionsTest.cs Wed Apr 20 17:02:20 2011
@@ -188,16 +188,6 @@

Assert.IsFalse(str.Is("Test"));
}
-
- [Test]
- public void JoinWithTest()
- {
- var data = new string[] { "this", "is", "a", "test" };
-
- var str = data.JoinWith(".");
-
- Assert.AreEqual("this.is.a.test", str);
- }

[Test]
public void StripColorTest()
=======================================
--- /trunk/ArtheaServer/Commands/KillCommand.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaServer/Commands/KillCommand.cs Wed Apr 20 17:02:20 2011
@@ -1,17 +1,25 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using ArtheaEngine.Model;
-using ArtheaEngine;
-
-namespace ArtheaServer.Commands
-{
+namespace ArtheaServer.Commands
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Text;
+
+ using ArtheaEngine;
+ using ArtheaEngine.Model;
+
public class KillCommand : Command
{
+ #region Constructors
+
public KillCommand()
: base("kill", "Attacks another character in the game.", 1)
- { }
+ {
+ }
+
+ #endregion Constructors
+
+ #region Methods

public override void Execute(Character ch, Argument argument)
{
@@ -23,9 +31,15 @@
return;
}

- var combat = new Combat(ch, victim);
-
- UpdateManager.Add(combat);
- }
+ ch.Fighting = new Combat(ch, victim);
+
+ UpdateManager.Add(ch.Fighting);
+
+ victim.Fighting = new Combat(victim, ch);
+
+ UpdateManager.Add(victim.Fighting);
+ }
+
+ #endregion Methods
}
}
=======================================
--- /trunk/ArtheaServer/Commands/LookCommand.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaServer/Commands/LookCommand.cs Wed Apr 20 17:02:20 2011
@@ -1,17 +1,25 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using ArtheaEngine.Model;
-using ArtheaEngine;
-
-namespace ArtheaServer.Commands
-{
+namespace ArtheaServer.Commands
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Text;
+
+ using ArtheaEngine;
+ using ArtheaEngine.Model;
+
public class LookCommand : Command
{
+ #region Constructors
+
public LookCommand()
: base("look", "Examines a room, person or object.", 1)
- { }
+ {
+ }
+
+ #endregion Constructors
+
+ #region Methods

public override void Execute(Character ch, Argument argument)
{
@@ -41,7 +49,6 @@
{
ch.WriteLine();

-
foreach (var rch in ch.Room.Characters)
{
if (rch == ch) continue;
@@ -61,5 +68,7 @@
}
}
}
+
+ #endregion Methods
}
}
=======================================
--- /trunk/ArtheaServer/MainForm.cs Wed Apr 20 15:25:46 2011
+++ /trunk/ArtheaServer/MainForm.cs Wed Apr 20 17:02:20 2011
@@ -27,6 +27,25 @@
using NLog.Targets;

using Thought.Net.Telnet;
+
+ public class ConnectionConfig
+ {
+ #region Properties
+
+ public string PlayerName
+ {
+ get;
+ set;
+ }
+
+ public SocketInformation SockInfo
+ {
+ get;
+ set;
+ }
+
+ #endregion Properties
+ }

public partial class MainForm : Form
{
@@ -198,25 +217,6 @@

#endregion Methods
}
-
- public class ConnectionConfig
- {
- #region Properties
-
- public string PlayerName
- {
- get;
- set;
- }
-
- public SocketInformation SockInfo
- {
- get;
- set;
- }
-
- #endregion Properties
- }

public sealed class RTLogTarget : TargetWithLayout
{
=======================================
--- /trunk/ArtheaServer/TelnetConnection.cs Tue Apr 19 15:57:05 2011
+++ /trunk/ArtheaServer/TelnetConnection.cs Wed Apr 20 17:02:20 2011
@@ -150,7 +150,7 @@
}

WriteLine();
- Write("> ");
+ Playing.DisplayPrompt();
}

/// <summary>
=======================================
--- /trunk/arthea.sql Wed Apr 20 00:25:42 2011
+++ /trunk/arthea.sql Wed Apr 20 17:02:20 2011
@@ -1,8 +1,8 @@
--- MySQL dump 10.13 Distrib 5.5.10, for Win32 (x86)
+-- MySQL dump 10.13 Distrib 5.5.11, for Win64 (x86)
--
-- Host: localhost Database: arthea
-- ------------------------------------------------------
--- Server version 5.5.10
+-- Server version 5.5.11

/*!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=8 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

--
@@ -81,7 +81,7 @@
`credits` varchar(75) DEFAULT NULL,
`world_id` bigint(20) DEFAULT NULL,
PRIMARY KEY (`area_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

--
@@ -134,7 +134,7 @@
`position` varchar(45) DEFAULT NULL,
`sex` varchar(45) DEFAULT NULL,
PRIMARY KEY (`char_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

--
@@ -324,7 +324,7 @@
`code` mediumtext,
`room_id` bigint(20) NOT NULL,
PRIMARY KEY (`reset_id`,`room_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

--
@@ -342,7 +342,7 @@
`terrain` varchar(45) DEFAULT NULL,
`flags` tinytext,
PRIMARY KEY (`room_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

--
@@ -399,7 +399,7 @@
`name` varchar(45) DEFAULT NULL,
`port` smallint(6) DEFAULT '4000',
PRIMARY KEY (`world_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

--
@@ -1065,8 +1065,8 @@
/*!50003 CREATE*/ /*!50020 DEFINER=`arthea`@`localhost`*/ /*!50003
PROCEDURE `read_nonplayer`(
`@id` bigint)
BEGIN
- SELECT * FROM `arthea`.`nonplayer`
- NATURAL JOIN `arthea`.`character`
+ SELECT * FROM `arthea`.`character`
+ NATURAL JOIN `arthea`.`nonplayer`
WHERE `char_id` = `@id` LIMIT 1;
END */;;
DELIMITER ;
@@ -1497,7 +1497,10 @@
`@name` varchar(45),
`@descr` text,
`@level` smallint,
- `@race` int
+ `@race` int,
+ `@size` float,
+ `@position` varchar(45),
+ `@sex` varchar(45)
)
BEGIN
INSERT INTO `arthea`.`character` (
@@ -1505,19 +1508,28 @@
`name`,
`description`,
`level`,
- `race_id`
+ `race_id`,
+ `size`,
+ `position`,
+ `sex`
) VALUES (
`@id`,
`@name`,
`@descr`,
`@level`,
- `@race`
+ `@race`,
+ `@size`,
+ `@position`,
+ `@sex`
)
ON DUPLICATE KEY UPDATE
`name` = `@name`,
`description` = `@descr`,
`level` = `@level`,
- `race_id` = `@race`;
+ `race_id` = `@race`,
+ `size` = `@size`,
+ `position` = `@position`,
+ `sex` = `@sex`;
END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@@ -2474,6 +2486,27 @@
BEGIN
SELECT * FROM `arthea`.`help_related` WHERE `help_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_room_reset` */;
+/*!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 `select_room_reset`(
+ `@id` bigint
+)
+BEGIN
+ SELECT * FROM `arthea`.`reset` WHERE `room_id` = `@id` LIMIT 1;
+END */;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
/*!50003 SET character_set_client = @saved_cs_client */ ;
@@ -2549,4 +2582,4 @@
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

--- Dump completed on 2011-04-20 7:07:58
+-- Dump completed on 2011-04-20 16:58:56