News update, Bug fixes, Monster Drop Changes for Gems

fixed a few things from previous git commits on branch, updated news

6 files changed, 46 insertions, 28 deletions

diff --git a/db/mob_db.txt b/db/mob_db.txt
index dce14a05..dc2b439c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -4,8 +4,8 @@
 1004,	RedScorpion,	Red Scorpion,	90,	550,	0,	0,	145,	1,	50,	55,	4,	6,	8,	8,	10,	10,	30,	10,	1,	1,	1,	0,	20,	129,	1000,	1872,	672,	480,	517,	2000,		509,	100,		518,	500,		1200,	10,		1199,	760,		1201,	540,		524,	25,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		50
 1005,	GreenSlime,	Green Slime,	40,	300,	0,	0,	8,	1,	25,	30,	2,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,	131,	1500,	1872,	672,	480,	502,	200,		513,	100,		501,	100,		521,	100,		522,	190,		526,	10,		503,	500,		535,	750,		0,	0,	0,	0,	,	,	,	,	,	,	1,		20
 1006,	GiantMaggot,	Giant Maggot,	80,	500,	0,	0,	16,	2,	45,	75,	2,	7,	8,	6,	2,	1,	22,	1,	2,	2,	1,	0,	41,	129,	2000,	1872,	672,	480,	1199,	900,		519,	100,		518,	750,		501,	5000,		502,	3000,		503,	11,		526,	20,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		25
-1007,	YellowSlime,	Yellow Slime,	60,	400,	0,	0,	2,	1,	35,	40,	2,	7,	9,	6,	2,	1,	34,	1,	1,	1,	1,	0,	21,	131,	1400,	1800,	672,	480,	534,	200,		519,	100,		501,	350,		502,	250,		522,	10,		640,	450,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		20
-1008,	RedSlime,	Red Slime,	70,	450,	0,	0,	56,	1,	40,	45,	2,	7,	12,	8,	2,	1,	25,	1,	1,	1,	1,	0,	21,	135,	1300,	1500,	672,	480,	1201,	300,		509,	110,		521,	200,		523,	80,		525,	80,		535,	750,		528,	250,		531,	150,		0,	0,	0,	0,	,	,	,	,	,	,	2,		20
+1007,	YellowSlime,	Yellow Slime,	60,	400,	0,	0,	2,	1,	35,	40,	2,	7,	9,	6,	2,	1,	34,	1,	1,	1,	1,	0,	21,	131,	1400,	1800,	672,	480,	534,	200,		519,	100,		501,	350,		502,	250,		522,	10,		640,	450,		4006,	20,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		20
+1008,	RedSlime,	Red Slime,	70,	450,	0,	0,	56,	1,	40,	45,	2,	7,	12,	8,	2,	1,	25,	1,	1,	1,	1,	0,	21,	135,	1300,	1500,	672,	480,	1201,	300,		509,	110,		521,	200,		4003,	20,		525,	80,		535,	750,		528,	250,		531,	150,		0,	0,	0,	0,	,	,	,	,	,	,	2,		20
 1009,	BlackScorpion,	Black Scorpion,	100,	600,	0,	0,	70,	1,	60,	100,	4,	6,	16,	30,	10,	10,	35,	10,	1,	1,	1,	0,	20,	133,	1000,	1500,	672,	480,	523,	150,		509,	100,		518,	800,		709,	800,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		50
 1010,	Snake,		Snake,		115,	850,	0,	0,	100,	1,	75,	90,	4,	6,	20,	11,	10,	10,	35,	10,	1,	1,	1,	0,	20,	133,	900,	1300,	672,	480,	524,	300,		0,	0,		714,	400,		714,	400,		710,	500,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
 1011,	FireGoblin,	Fire Goblin,	20,	220,	0,	0,	2,	1,	15,	20,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	23,	129,	800,	1872,	672,	480,	505,	800,		501,	150,		518,	800,		502,	150,		521,	70,		522,	10,		701,	500,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
@@ -58,5 +58,5 @@
 1058,	IceGoblin,	Ice Goblin,	25,	330,	0,	0,	2,	1,	20,	25,	0,	5,	5,	5,	1,	0,	6,	30,	1,	1,	1,	3,	23,	133,	700,	1872,	672,	480,	505,	800,		501,	150,		518,	800,		502,	150,		521,	70,		522,	10,		701,	500,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
 1059,	GCMaggot,    Giant Cave Maggot,	90,	2000,	0,	0,	16,	2,	60,	80,	2,	7,	10,	10,	2,	1,	22,	1,	2,	2,	1,	0,	41,	133,	1000,	1872,	672,	480,	727,	10000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		25
 1060,	Archant,	Archant,	30,	400,	0,	0,	200,	1,	20,	30,	4,	6,	10,	5,	1,	0,	12,	10,	1,	1,	1,	0,	25,	133,	1000,	1500,	672,	480,	537,	300,		535,	100,		640,	40,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
-1061,	Moggun,		Moggun,		60,	800,	0,	0,	100,	1,	70,	90,	20,	10,	50,	40,	10,	10,	10,	10,	1,	1,	1,	0,	25,	137,	600,	1500,	672,	480,	611,	600,		4001,	600,		4002,	40,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
-1062,	Terranite,	Terranite,	110,	6000,	0,	0,	1000,	1,	200,	300,	20,	40,	60,	40,	40,	30,	60,	40,	1,	1,	1,	0,	29,	133,	400,	872,	672,	900,	4001,	1000,		4004,	50,		4005,	50,		4007,	50,		763,	500,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
+1061,	Moggun,		Moggun,		60,	800,	0,	0,	100,	1,	70,	90,	20,	10,	50,	40,	10,	10,	10,	10,	1,	1,	1,	0,	25,	137,	600,	1500,	672,	480,	611,	600,		4001,	600,		4002,	20,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
+1062,	Terranite,	Terranite,	110,	6000,	0,	0,	1000,	1,	200,	300,	20,	40,	60,	40,	40,	30,	60,	40,	1,	1,	1,	0,	29,	133,	400,	872,	672,	900,	4001,	600,		4004,	20,		4005,	20,		4007,	20,		763,	500,		640,	500,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
diff --git a/news.txt b/news.txt
index 679b9fc5..9825fa21 100644
--- a/news.txt
+++ b/news.txt
@@ -1,25 +1,41 @@
+##3 Tulimshar Imposes Trade Regulations
+##3 2010-08-29
+##0 Throughout Argaes, new trade regulations from
+##0 Tulimshar have concentrated wealth and power
+##0 inside Tonori's largest city.  The primary 
+##0 resource of Argaes, iron ore, now must be 
+##0 refined into ingots within Tulimshar's
+##0 imperial capital.
+##0
+##0 Argaes miners, in search of new iron deposits,
+##0 have discovered a hostile mine north east of
+##0 the woodland town of Hurnscald.  More details
+##0 are coming in about this mine.
+##0
 ##3 Tulimshar's Power Expands
 ##3 2010-08-18
-##0 The impact of the Great Earthquake has brought a
-##0 rising evil to the land.  After much debate
-##0 Tulimshar's Wizard Council has begun to expand its
-##0 influence in the world to meet the new challenges
-##0 presented.
-
+##0 The impact of the Great Earthquake has brought
+##0 a rising evil to the land.  After much debate
+##0 Tulimshar's Wizard Council has begun to expand 
+##0 its influence in the world to meet the new 
+##0 challenges presented.
+##0
 ##0 While still slow to act, Tulimshar has begun 
-##0 monitoring the changing monster threat in the sandstorm
-##0 and sent agents into Argaes.  The landbridge that long 
-##0 united Argaes with Tonori has fallen into the sea,
-##0 prompting Tulimshar's merchants to charge a hefty fee
-##0 for trade and travel between the two continents.
-
-##0 Something sinister has happened to Taro, Nivalis and
-##0 the magical connection Kaizei had with Argaes.  Some
-##0 speculate it has something to do with the evil while
-##0 others think Nivalis and the Sages of Kaizei want to
-##0 isolate themselves from Tulimshar's influence.
-##0 Either way, all portals to Kaizei have been closed.
-
+##0 monitoring the changing monster threat in the
+##0 sandstorm and sent agents into Argaes.  The 
+##0 landbridge that long united Argaes with Tonori
+##0 has fallen into the sea, prompting Tulimshar's 
+##0 merchants to charge a hefty fee for trade and 
+##0 travel between the two continents.
+##0
+##0 Something sinister has happened to Taro, Nivalis 
+##0 and the magical connection Kaizei had with Argaes.
+##0 Some speculate it has something to do with the
+##0 evil while others think Nivalis and the Sages of
+##0 Kaizei want to isolate themselves from Tulimshar's
+##0 influence.  Either way, all portals to Kaizei have
+##0 been closed.
+##0
 ##3 The Candor Challenge 
 ##3 2010-08-18
 ##0
@@ -32,7 +48,7 @@
 ##0 In other news, you may also have run into an  
 ##0 evil obelisk, trader of strange items, a water
 ##0 pump, a flood and some new insect life recently!
-
+##0
 ##3 The End is not nigh
 ##3 2010-06-09
 
diff --git a/npc/001-1_Tulimshar/bernard.txt b/npc/001-1_Tulimshar/bernard.txt
index 44965d27..1c5ee328 100644
--- a/npc/001-1_Tulimshar/bernard.txt
+++ b/npc/001-1_Tulimshar/bernard.txt
@@ -54,7 +54,7 @@ L_Progress:
 	if (countitem("RoastedMaggot") < 1) goto L_NotEnough;
 	mes "[Bernard]";
 	mes "\"Oooh, perfect! It's perfect!";
-	mes "You brought me my Roasted Maggot!  Here, have some cake for your troubles.\"";
+	mes "You brought me my [Roasted Maggot]!  Here, have some cake for your troubles.\"";
 	getinventorylist;
 	if (@inventorylist_count - (countitem("RoastedMaggot") == 1) > 99 - (countitem("CherryCake") == 0) ) goto L_TooMany;
 	delitem "RoastedMaggot", 1;
@@ -67,7 +67,7 @@ L_Progress2:
         if (countitem("MaggotSlime") < 3) goto L_NotEnough1;
         mes "[Bernard]";
         mes "\"Nice!  They're perfect, just perfect!";           
-        mes "You brought me the 3 maggot slimes!  Here, have some beer as reward.\"";
+        mes "You brought me the 3 [Maggot Slimes]!  Here, have some beer as reward.\"";
         getinventorylist;             
         if ((@inventorylist_count - (countitem("MaggotSlime") == 3) > 99  - (countitem("Beer") == 0) )) goto L_TooMany;
         delitem "MaggotSlime", 3;
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 29f92b28..d3347259 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -82,7 +82,7 @@ L_Progress:
 	mes "\"Excellent!";
 	mes "You brought me 5 [Scorpion Stinger]s!\"";
 	getinventorylist;
-	if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) - (countitem("Arrow") == 0) > 99)) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem(ScorpionStinger) > 5) goto L_TooMany;
 	delitem "ScorpionStinger", 5;
 	getitem "Bow", 1;
 	getitem "Arrow", 100;
diff --git a/npc/002-1_Sandstorm/lieutenant_dausen.txt b/npc/002-1_Sandstorm/lieutenant_dausen.txt
index e2e406d6..69502cf6 100644
--- a/npc/002-1_Sandstorm/lieutenant_dausen.txt
+++ b/npc/002-1_Sandstorm/lieutenant_dausen.txt
@@ -22,7 +22,7 @@ L_LD_Get_Rep_First:
 	mes "\"Hello.  I am Lieutenant Dausen.  I monitor the monster threat around the city to ensure the safety of its citizens.\"";
         next;
 	mes "[Lieutenant Dausen]";
-	mes "\"I may have a job for you, stranger, but first I would like to learn more about you. Go walk among the citizens of Tulimshar, see if any of them could use some help. Once you have established a good reputation, word will get to me.\";
+	mes "\"I may have a job for you, stranger, but first I would like to learn more about you. Go walk among the citizens of Tulimshar, see if any of them could use some help. Once you have established a good reputation, word will get to me.\"";
 	close;
 
 L_LD_Start:
diff --git a/npc/functions/mob_points.txt b/npc/functions/mob_points.txt
index c594fae2..768b874d 100644
--- a/npc/functions/mob_points.txt
+++ b/npc/functions/mob_points.txt
@@ -62,6 +62,8 @@ function	script	MobPoints	{
 		5, // Ice Goblin
 		8, // Archant
 		36, // Giant Cave Maggot
+		40, // Moggun
+		100, // Terranite
 		// Add more here		
 		0; // END