Merge remote branch 'wombat/master'

2 files changed, 29 insertions, 12 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 960b3b9c..1c895454 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -261,15 +261,15 @@
 //759,	PaladinsHelmet,			Paladin's Helmet,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
 //760,	OverlordsHelmet,		Overlord's Helmet,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
 //761,	DesertHelmet,			Desert Helmet,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//762,	TerraniteArrow,			Terranite Arrow,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//763,	TerraniteOre,			Terranite Ore,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//764,	SailorHat,			Sailor Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//765,	CaptainsHat,			Captain's Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//766,	TerraniteHelmet,		Terranite Helmet,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//767,	TerraniteChestArmor,		Terranite Chest Armor,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//768,	TerraniteLegsArmor,		Terranite Legs Armor,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//769,	GuyFawkesMask,			Guy Fawkes' Mask,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
-//770,	FairyHat,			Fairy Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
+762,	TerraniteArrow,			Terranite Arrow,		10,	800,	400,	1,	35,	0,	0,	0,	0,	2,	32768,	,	,	0,	{},					{bonus bAtkRange,  1;}
+763,	TerraniteOre,			Terranite Ore,			3,	500,	250,	40,	,	,	,	,	,	,	,	,	,	,	{},					{}										
+//764,	SailorHat,			Sailor Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}										
+//765,	CaptainsHat,			Captain's Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}										
+766,	TerraniteHelmet,		Terranite Helmet,		5,	30000,	3000,	300,	,	15,	,	-12,	0,	2,	256,	,	0,	0,	{},					{}
+767,	TerraniteChestArmor,		Terranite Chest Armor,		5,	100000,	3000,	800,	,	15,	,	70,	0,	2,	512,	,	0,	0,	{},					{ bonus bDex,1; }
+768,	TerraniteLegsArmor,		Terranite Legs Armor,		5,	10000,	3000,	30,	,	5,	,	-8,	0,	2,	1,	,	0,	0,	{},					{ bonus bAgi,1; }
+//769,	GuyFawkesMask,			Guy Fawkes' Mask,		,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}										
+//770,	FairyHat,			Fairy Hat,			,	,	,	,	,	,	,	,	,	,	,	,	,	,	{},					{}										
 771,	Miniskirt,			Miniskirt,			5,	1000,	500,	8,	,	4,	,	-8,	0,	2,	1,	,	1,	0,	{},					{}																						
 772,	WispPowder,			Wisp Powder,			3,	700,	350,	3,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
 773,	SpectrePowder,			Spectre Powder,			3,	700,	350,	3,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
@@ -514,4 +514,19 @@
 2197,	OrangeRabbitEars,		Orange Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}																						
 2198,	PurpleRabbitEars,		Purple Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}																						
 2199,	DarkGreenRabbitEars,		Dark Green Rabbit Ears,		5,	7000,	5000,	15,	,	5,	,	4,	0,	2,	256,	,	1,	0,	{},					{}																						
-4000,	AngryScorpionStinger,		Angry Scorpion Stinger,		3,	50,	25,	1,	,	,	,	,	,	,	,	,	,	,	{},					{}																						
+4000,	AngryScorpionStinger,		Angry Scorpion Stinger,		3,	50,	25,	1,	,	,	,	,	,	,	,	,	,	,	{},					{}			
+4001,	Coal,				Coal,				3,	250,	100,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}
+4002,	GemRawWhite,			Diamond,			3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4003,	GemRawRed,			Ruby,				3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4004,	GemRawGreen,			Emerald,			3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4005,	GemRawBlue,			Sapphire,			3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4006,	GemRawYellow,			Topaz,				3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4007,	GemRawPurple,			Amethyst,			3,	5000,	2500,	20,	,	,	,	,	,	,	,	,	,	,	{},					{}																				
+4008,	RingGemWhite,			Diamond Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4009,	RingGemRed,			Ruby Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4010,	RingGemGreen,			Emerald Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4011,	RingGemBlue,			Sapphire Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4012,	RingGemYellow,			Topaz Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4013,	RingGemPurple,			Amethyst Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4014,	RingSimple,			Simple Ring,			5,	5000,	2500,	1,	,	0,	,	0,	0,	2,	128,	,	0,	0,	{},					{}										
+4015,	IngotIron,			Iron Ingot,			3,	500,	250,	200,	,	,	,	,	,	,	,	,	,	,	{},					{}										
diff --git a/db/mob_db.txt b/db/mob_db.txt
index d6624b82..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,3 +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,	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