From f3e84999b45ac3750c166891fa207a969b9a9c0f Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Thu, 27 Sep 2007 20:49:08 +0000
Subject: Ported monster database.

---
 ChangeLog                          |   5 ++
 accountserver.cbp                  |  20 +----
 data/monsters.xml                  | 152 ++++++++++++++++++++++++++++++++++++-
 gameserver.cbp                     |  30 +++++---
 src/game-server/monstermanager.cpp |   2 +-
 5 files changed, 174 insertions(+), 35 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b30666ca..1f8f1832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-27  Eugenio Favalli  <elvenprogrammer@gmail.com>
+
+	* accountserver.cbp, data/monsters.xml, gameserver.cbp,
+	src/game-server/monstermanager.cpp: Ported monster database.
+
 2007-09-23  Guillaume Melquiond  <guillaume.melquiond@gmail.com>
 
 	* src/game-server/state.hpp, src/game-server/state.cpp: Changed
diff --git a/accountserver.cbp b/accountserver.cbp
index 331ba480..8262afe5 100644
--- a/accountserver.cbp
+++ b/accountserver.cbp
@@ -164,11 +164,11 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\configuration.cpp">
+		<Unit filename="src\common\configuration.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\configuration.h">
+		<Unit filename="src\common\configuration.hpp">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
@@ -308,22 +308,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\resourcemanager.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\resourcemanager.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\utils\countedptr.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\utils\functors.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
diff --git a/data/monsters.xml b/data/monsters.xml
index d08483b0..0572bab1 100644
--- a/data/monsters.xml
+++ b/data/monsters.xml
@@ -1,7 +1,151 @@
 <?xml version="1.0"?>
-<monsters>
-    <monster id="1002">
-        <drop item="505" percent="8"/>
-        <drop item="518" percent="4"/>
+  <monsters>
+    <monster id="1002" name="Maggot">
+        <drop item="505" percent="80"/>
+        <drop item="518" percent="40"/>
+        <drop item="501" percent="15"/>
+        <drop item="533" percent="15"/>
+        <drop item="502" percent="7"/>
+        <drop item="522" percent="1"/>
+    </monster>
+    <monster id="1003" name="Scorpion">
+        <drop item="507" percent="70"/>
+        <drop item="510" percent="10"/>
+        <drop item="509" percent="5"/>
+        <drop item="518" percent="70"/>
+    </monster>
+    <monster id="1004" name="Red scorpion">
+        <drop item="517" percent="200"/>
+        <drop item="509" percent="10"/>
+        <drop item="518" percent="50"/>
+        <drop item="1200" percent="1"/>
+        <drop item="1199" percent="76"/>
+        <drop item="1201" percent="54"/>
+        <drop item="524" percent="1"/>
+    </monster>
+    <monster id="1005" name="Green slime">
+        <drop item="502" percent="20"/>
+        <drop item="513" percent="10"/>
+        <drop item="501" percent="10"/>
+        <drop item="521" percent="10"/>
+        <drop item="522" percent="19"/>
+        <drop item="526" percent="1"/>
+        <drop item="503" percent="50"/>
+        <drop item="535" percent="75"/>
+    </monster>
+    <monster id="1006" name="Giant maggot">
+        <drop item="1199" percent="90"/>
+        <drop item="519" percent="10"/>
+        <drop item="518" percent="75"/>
+        <drop item="501" percent="500"/>
+        <drop item="502" percent="300"/>
+        <drop item="503" percent="1"/>
+        <drop item="526" percent="1"/>
+    </monster>
+    <monster id="1007" name="Yellow slime">
+        <drop item="534" percent="20"/>
+        <drop item="519" percent="10"/>
+        <drop item="501" percent="35"/>
+        <drop item="502" percent="25"/>
+        <drop item="522" percent="1"/>
+    </monster>
+    <monster id="1008" name="Red slime">
+        <drop item="1201" percent="30"/>
+        <drop item="509" percent="11"/>
+        <drop item="521" percent="20"/>
+        <drop item="523" percent="4"/>
+        <drop item="525" percent="8"/>
+        <drop item="535" percent="75"/>
+        <drop item="528" percent="25"/>
+        <drop item="531" percent="15"/>
+    </monster>
+    <monster id="1009" name="Black scorpion">
+        <drop item="523" percent="15"/>
+        <drop item="509" percent="10"/>
+        <drop item="518" percent="80"/>
+    </monster>
+    <monster id="1010" name="Snake">
+        <drop item="524" percent="30"/>
+    </monster>
+    <monster id="1011" name="Fire goblin">
+        <drop item="505" percent="80"/>
+        <drop item="501" percent="15"/>
+        <drop item="518" percent="80"/>
+        <drop item="502" percent="15"/>
+        <drop item="521" percent="7"/>
+        <drop item="522" percent="1"/>
+    </monster>
+    <monster id="1012" name="Spider">
+        <drop item="537" percent="50"/>
+        <drop item="535" percent="10"/>
+    </monster>
+    <monster id="1013" name="Evil mushroom">
+        <drop item="535" percent="50"/>
+        <drop item="540" percent="1"/>
+        <drop item="534" percent="10"/>
+        <drop item="566" percent="50"/>
+    </monster>
+    <monster id="1014" name="Sleep flower">
+        <drop item="535" percent="10"/>
+        <drop item="540" percent="1"/>
+        <drop item="1199" percent="10"/>
+        <drop item="526" percent="40"/>
+        <drop item="565" percent="50"/>
+    </monster>
+    <monster id="1015" name="Santa slime">
+        <drop item="512" percent="80"/>
+        <drop item="513" percent="70"/>
+        <drop item="514" percent="60"/>
+        <drop item="519" percent="50"/>
+        <drop item="527" percent="40"/>
+        <drop item="538" percent="50"/>
+    </monster>
+    <monster id="1016" name="Rudolph slime">
+        <drop item="504" percent="80"/>
+        <drop item="506" percent="50"/>
+        <drop item="508" percent="20"/>
+        <drop item="509" percent="30"/>
+        <drop item="510" percent="60"/>
+        <drop item="515" percent="80"/>
+        <drop item="516" percent="50"/>
+    </monster>
+    <monster id="1017" name="Bat">
+        <drop item="505" percent="80"/>
+        <drop item="501" percent="15"/>
+        <drop item="518" percent="40"/>
+        <drop item="533" percent="15"/>
+        <drop item="521" percent="7"/>
+        <drop item="522" percent="1"/>
+    </monster>
+    <monster id="1018" name="Violet">
+        <drop item="614" percent="80"/>
+    </monster>
+    <monster id="1019" name="Shroom">
+        <drop item="567" percent="80"/>
+        <drop item="501" percent="15"/>
+        <drop item="518" percent="5"/>
+        <drop item="613" percent="15"/>
+    </monster>
+    <monster id="1020" name="Fluffy">
+        <drop item="611" percent="80"/>
+        <drop item="527" percent="15"/>
+        <drop item="535" percent="40"/>
+    </monster>
+    <monster id="1021" name="Lamp snake">
+        <drop item="612" percent="80"/>
+        <drop item="610" percent="1"/>
+    </monster>
+    <monster id="1022" name="Ghost pumpkin">
+    </monster>
+    <monster id="1023" name="Fire skull">
+        <drop item="621" percent="1"/>
+        <drop item="540" percent="15"/>
+    </monster>
+    <monster id="1024" name="Poison skull">
+        <drop item="621" percent="1"/>
+        <drop item="540" percent="15"/>
+    </monster>
+    <monster id="1025" name="Stumpy">
+        <drop item="569" percent="200"/>
     </monster>
 </monsters>
diff --git a/gameserver.cbp b/gameserver.cbp
index 4ffedc49..15e1d472 100644
--- a/gameserver.cbp
+++ b/gameserver.cbp
@@ -37,11 +37,11 @@
 			<Add library="winmm"/>
 			<Add library="lua"/>
 		</Linker>
-		<Unit filename="src\configuration.cpp">
+		<Unit filename="src\common\configuration.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\configuration.h">
+		<Unit filename="src\common\configuration.hpp">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
@@ -107,6 +107,12 @@
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\game-server\eventlistener.hpp">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\game-server\gamehandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -241,6 +247,16 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
+		<Unit filename="src\game-server\resourcemanager.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="default"/>
+		</Unit>
+		<Unit filename="src\game-server\resourcemanager.hpp">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="default"/>
+		</Unit>
 		<Unit filename="src\game-server\spawnarea.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
@@ -351,16 +367,6 @@
 			<Option link="0"/>
 			<Option target="default"/>
 		</Unit>
-		<Unit filename="src\resourcemanager.cpp">
-			<Option compilerVar="CPP"/>
-			<Option target="default"/>
-		</Unit>
-		<Unit filename="src\resourcemanager.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="default"/>
-		</Unit>
 		<Unit filename="src\scripting\lua.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="default"/>
diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp
index 7a25b6ae..efdb4420 100644
--- a/src/game-server/monstermanager.cpp
+++ b/src/game-server/monstermanager.cpp
@@ -59,7 +59,7 @@ void MonsterManager::reload()
 
     if (!doc)
     {
-        LOG_ERROR("Monster Manager: Error while parsing item database ("
+        LOG_ERROR("Monster Manager: Error while parsing monster database ("
                   << monsterReferenceFile << ")!");
         return;
     }
-- 
cgit v1.2.3-60-g2f50