Merge commit 'origin/master' into magic

19 files changed, 153 insertions, 114 deletions

diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 474fcfd3..a4806bec 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -75,20 +75,20 @@ attribute_recover: yes
 item_auto_get: no
 
 // How long does it take for an item to disappear from the floor after it is dropped? (in miliseconds) 
-flooritem_lifetime: 60000
+flooritem_lifetime: 120000
 
 // How long before the first person who did the most damage to a monster can get the item? (in milliseconds)
-item_first_get_time: 3000
+item_first_get_time: 15000
 
 // How long before the second person who did the second most damage to a monster can get the item? (in milliseconds)
 // (It Adds Time From The First Persons Time)
 // So, It Is Like First Person's Time + Second Person's Time  = Time Before Second Person Can Get The Items
-item_second_get_time: 1000
+item_second_get_time: 10000
 
 // How long before the third person who did the third most/least damage to a monster can get the item? (in milliseconds)
 // (It Adds Time From The First Persons Time And Second Persons Time)
 // So, It Is Like First Person's Time + Second Person's Time + Third Person's Time  = Time Before Third Person Can Get The Items
-item_third_get_time: 1000
+item_third_get_time: 5000
 
 // How long before the first person who did the most damage to a MVP can get the item? (in milliseconds)
 mvp_item_first_get_time: 10000
@@ -723,3 +723,6 @@ spam_threshold: 10
 
 // Maximum line lengt, if a message is above chat_maxline, its dropped [1-512]. Default 255.
 chat_maxline: 512
+
+// local settings for this server in this file
+import: conf/battle_local.conf
diff --git a/conf/battle_local.conf.example b/conf/battle_local.conf.example
new file mode 100644
index 00000000..c9ba222c
--- /dev/null
+++ b/conf/battle_local.conf.example
@@ -0,0 +1 @@
+// Nothing needs to be done here.
diff --git a/data/005-1.wlk b/data/005-1.wlk
index fe816a52..e5ff4e9c 100644
--- a/data/005-1.wlk
+++ b/data/005-1.wlk
diff --git a/data/007-1.wlk b/data/007-1.wlk
index cae67d2e..431d5e3b 100644
--- a/data/007-1.wlk
+++ b/data/007-1.wlk
diff --git a/db/item_db.txt b/db/item_db.txt
index cf164c25..f617c7e4 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -224,7 +224,12 @@
 732,	DruidTreeBranch,	Druid Tree Branch,		3,	0,	0,	2,	,	,	,	,	,	10477567,	,	,	,	,	,	{},					{}
 733,	PurificationPotion,	Purification Potion,		0,	0,	0,	5,	,	,	,	,	,	10477567,	,	,	,	,	,	{ callfunc "PurificationPotion"; },	{}
 734,	BlackBoots,		Black Boots,			5,	20000,	3000,	35,	,	4,	,	-10,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
-735,	WhiteCottonBoots,	WhiteCottonBoots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
+735,	WhiteCottonBoots,	White Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
+736,	WhiteCake,		WhiteCake,			0,	500,	100,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 10,0; },			{}
+737,	ChocolateCake,		ChocolateCake,			0,	550,	125,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 11,0; },			{}
+738,	OrangeCake,		OrangeCake,			0,	600,	150,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 12,0; },			{}
+739,	AppleCake,		AppleCake,			0,	600,	150,	10,	,	,	,	,	,	10477567,	2,	,	,	0,	,	{ itemheal 12,0; },			{}
+
 
 #ID,	Name,			Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Job,		Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}		
 1198,	JackOSoul,		Jack O Soul,			3,	100000,	1,	1,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
@@ -369,7 +374,7 @@
 2149,	DarkGreenCottonHeadBand,	Dark Green Cotton Head Band,	5,	3000,	500,	5,	,	2,	,	0,	0,	10477567,	2,	256,	,	0,	0,	{},					{}
 
 #ID,	Name,			Label,				Type,	Price,	Sell,	Weight,	ATK,	DEF,	Range,	Mbonus,	Slot,	Job,		Gender,	Loc,	wLV,	eLV,	View,	{UseScript},				{EquipScript}		
-2150,	RedCottonBoots,		Red Cotton Boots,			5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
+2150,	RedCottonBoots,		Red Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
 2151,	GreenCottonBoots,	Green Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
 2152,	DarkBlueCottonBoots,	Dark Blue Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
 2153,	YellowCottonBoots,	Yellow Cotton Boots,		5,	2000,	500,	10,	,	1,	,	1,	0,	10477567,	2,	64,	,	0,	0,	{},					{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 59d90ecd..a542b43e 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1,44 +1,35 @@
-#-- Regular mobs --
-# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per, mut_nr, mut_str%
-1002,	Maggot,		Maggot,			5,	50,	0,	10,	2,	1,	5,	10,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	21,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		400,		533,		150,		502,		70,		522,		10,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
-1003,	Scorpion,	Scorpion,		10,	100,	0,	20,	4,	1,	10,	15,	0,	5,	1,	1,	1,	0,	15,	30,	1,	1,	1,	3,	20,		129,	2000,	1872,	672,		480,		507,		700,		510,		100,		509,		50,		518,		700,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
-1017,	Bat,		Bat,			20,	150,	0,	25,	2,	1,	7,	10,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	24,		129,	800,	1872,	672,		480,		505,		800,		501,		150,		518,		400,		533,		150,		521,		70,		522,		1,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	50
-1011,	FireGoblin,	Fire Goblin,		20,	220,	0,	35,	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,	,	,		,	,		,	,	 1,	20
-1019,	SpikyMushroom,	Spiky Mushroom,		30,	300,	0,	50,	4,	1,	10,	13,	0,	5,	1,	1,	1,	0,	10,	10,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		567,		800,		501,		150,		518,		50,		613,		150,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	25
-1020,	Fluffy,		Fluffy,			30,	500,	0,	60,	3,	1,	10,	12,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		611,		800,		527,		150,		535,		400,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	20
-1005,	GreenSlime,	Green Slime,		40,	300,	0,	70,	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,	,	,		,	,		,	,	 2,	20
-1016,	RudolphSlime,	Rudolph Slime,		50,	350,	0,	95,	16,	1,	30,	35,	10,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,		131,	1000,	1872,	672,		480,		504,		800,		506,		500,		508,		200,		509,		300,		510,		600,		515,		800,		516,		500,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	50
-1007,	YellowSlime,	Yellow Slime,		60,	400,	0,	95,	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,		150,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
-1008,	RedSlime,	Red Slime,		70,	450,	0,	120,	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,	30
-
-# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per, mut_nr, mut_str%
-1006,	GiantMaggot,	Giant Maggot,		80,	500,	0,	130,	16,	2,	45,	50,	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,	,	,		,	,		,	,	 2,	40
-1004,	RedScorpion,	Red Scorpion,		90,	550,	0,	145,	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,	60
-1009,	BlackScorpion,	Black Scorpion,		100,	600,	0,	170,	70,	1,	60,	65,	4,	6,	16,	12,	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
-1014,	Flower,		Flower,			115,	700,	0,	170,	110,	2,	70,	75,	0,	5,	16,	12,	20,	20,	20,	20,	2,	2,	1,	3,	22,		128,	800,	800,	672,		480,		535,		100,		540,		10,		1199,		100,		526,		400,		565,		500,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	10
-1013,	EvilMushroom,	Evil Mushroom,		110,	650,	0,	200,	110,	1,	65,	70,	4,	6,	16,	12,	10,	10,	35,	10,	1,	1,	1,	3,	22,		137,	800,	1800,	672,		480,		535,		500,		540,		10,		534,		100,		566,		500,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
-1015,	SantaSlime,	Santa Slime,		120,	750,	0,	225,	0,	1,	75,	80,	2,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,		161,	1500,	1872,	672,		480,		512,		800,		513,		700,		514,		600,		519,		500,		527,		400,		538,		500,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	40
-1012,	Spider,		Spider,			125,	800,	0,	235,	280,	1,	70,	85,	4,	6,	14,	13,	10,	10,	35,	10,	1,	1,	1,	0,	25,		175,	1000,	1500,	672,		480,		537,		500,		535,		100,		638,		20,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 3,	50
-1010,	Snake,		Snake,			115,	850,	0,	250,	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,	,	,		,	,		,	,	 3,	40
-1026,	MountainSnake,	Mountain Snake,		130,	900,	0,	300,	100,	1,	80,	95,	4,	6,	20,	11,	10,	10,	35,	10,	1,	1,	1,	0,	20,		133,	1000,	1500,	672,		480,		532,		20,		641,		150,		715,		400,		715,		400,		711,		500,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 3,	40
-1034,	GrassSnake,	Grass Snake,		140,	1000,	0,	450,	100,	1,	80,	120,	2,	10,	20,	40,	10,	10,	40,	50,	1,	1,	1,	0,	20,		133,	500,	1100,	672,		480,		716,		400,		716,		400,		712,		500,		676,		500,		660,		350,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 3,	50
-
-# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per, mut_nr, mut_str%
-1023,	FireSkull,	Fire Skull,		180,	5000,	0,	2500,	100,	2,	100,	175,	35,	15,	30,	30,	20,	20,	25,	10,	1,	1,	1,	3,	23,		175,	600,	1600,	672,		480,		631,		1000,		701,		5000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
-1024,	PoisonSkull,	Poison Skull,		180,	5000,	0,	2500,	100,	2,	100,	175,	35,	15,	30,	30,	20,	20,	25,	10,	1,	1,	1,	3,	25,		175,	600,	1600,	672,		480,		631,		1000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	30
-1022,	JackO,		Jack O,			250,	10000,	0,	10000,	5000,	2,	150,	220,	40,	20,	35,	40,	25,	25,	35,	15,	1,	1,	1,	0,	20,		133,	250,	1500,	672,		480,		617,		300,		622,		400,		624,		400,		620,		400,		615,		300,		1203,		400,		1198,		10000,		616,		600,		0,	0,	0,	0,	,	,		,	,		,	,	 4,	20
-
-
-#-- Resource mobs --
-# ID,	Name,		JName,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,	Mode,	Speed,	ADelay,	AMotion,	DMotion,	Drop1id,	Drop1per,	Drop2id,	Drop2per,	Drop3id,	Drop3per,	Drop4id,	Drop4per,	Drop5id,	Drop5per,	Drop6id,	Drop6per,	Drop7id,	Drop7per,	Drop8id,	Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,	MVP2id,	MVP2per,	MVP3id,	MVP3per, mut_nr, mut_str%
-1027,	EasterFluffy,	Easter Fluffy,		30,	500,	0,	45,	3,	1,	10,	12,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		1208,		2000,		1209,		2000,		1210,		2000,		1211,		1000,		1212,		1000,		1213,		200,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	50
-1018,	Pinkie,		Pinkie,			30,	500,	0,	60,	3,	2,	7,	10,	0,	5,	1,	1,	1,	0,	20,	25,	2,	2,	1,	3,	20,		129,	800,	1872,	672,		480,		614,		800,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	30
-1021,	CaveSnake,	Cave Snake,		30,	1000,	0,	125,	5,	1,	20,	15,	1,	5,	10,	1,	1,	0,	10,	10,	1,	1,	1,	3,	20,		129,	800,	1872,	672,		480,		612,		800,		610,		40,		713,		500,		717,		400,		717,		400,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	40
-1025,	LogHead,	Log Head,		30,	500,	0,	100,	30,	1,	7,	10,	50,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	22,		129,	800,	1872,	672,		480,		569,		2000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	30
-1033,	SeaSlime,	Sea Slime,		70,	600,	0,	100,	9,	1,	30,	40,	3,	7,	1,	25,	1,	0,	30,	30,	1,	1,	1,	0,	41,		131,	1500,	1872,	672,		480,		535,		800,		657,		800,		518,		500,		510,		1000,		700,		100,		1199,		5000,		568,		100,		541,		50,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	60
-1029,	MauvePlant,	Mauve Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		680,		3000,		680,		3000,		680,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
-1030,	CobaltPlant,	Cobalt Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		681,		3000,		681,		3000,		681,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
-1031,	GambogePlant,	Gamboge Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		682,		3000,		682,		3000,		682,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
-1032,	AlizarinPlant,	Alizarin Plant,		1,	1,	0,	1,	1,	1,	0,	0,	100,	100,	0,	0,	0,	0,	0,	0,	1,	1,	1,	3,	22,		0,	800,	800,	672,		480,		683,		3000,		683,		3000,		683,		3000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 0,	0
-1035,	Silkworm,	Silkworm,		20,	1,	0,	1,	1,	1,	0,	0,	2,	10,	20,	11,	10,	10,	40,	10,	1,	1,	1,	0,	20,		129,	1300,	1100,	672,		480,		718,		5000,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 1,	40
-1028,	Mouboo,		Mouboo,			85,	1200,	0,	350,	40,	2,	55,	75,	40,	5,	15,	5,	15,	0,	25,	10,	2,	2,	1,	3,	20,		129,	600,	1872,	672,		480,		660,		200,		660,		100,		541,		750,		660,		10,		0,		0,		0,		0,		0,		0,		0,		0,		0,	0,	0,	0,	,	,		,	,		,	,	 2,	40
+# ID,Name,Jname,LV,HP,SP,EXP,JEXP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Mode,Speed,Adelay,Amotion,Dmotion,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Item1,Item2,MEXP,ExpPer,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,mutiation count,mutation strength
+1002,Maggot,Maggot,5,50,0,0,2,1,5,10,0,5,1,1,1,0,6,5,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,502,70,522,10,0,0,0,0,0,0,0,0,,,,,,,0,0
+1003,Scorpion,Scorpion,10,100,0,0,4,1,10,15,0,5,1,1,1,0,15,5,1,1,1,3,20,129,2000,1872,672,480,507,700,510,100,509,50,518,700,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
+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,150,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
+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
+1012,Spider,Spider,125,800,0,0,280,1,70,85,4,6,14,13,10,10,35,10,1,1,1,0,25,175,1000,1500,672,480,537,500,535,100,638,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,40
+1013,EvilMushroom,Evil Mushroom,110,650,0,0,110,1,65,80,4,6,16,12,10,10,35,10,1,1,1,3,22,137,800,1800,672,480,535,500,540,10,534,100,566,500,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,60
+1014,Flower,Flower,115,700,0,0,110,2,70,75,0,5,16,12,20,20,20,50,2,2,1,3,22,128,800,800,672,480,535,100,540,10,1199,100,526,400,565,500,0,0,0,0,0,0,0,0,0,0,,,,,,,2,50
+1015,SantaSlime,Santa Slime,120,750,0,0,0,1,75,80,2,7,1,20,1,0,30,30,1,1,1,0,21,161,1500,1872,672,480,512,800,513,700,514,600,519,500,527,400,538,500,0,0,0,0,0,0,0,0,,,,,,,1,10
+1016,RudolphSlime,Rudolph Slime,50,350,0,0,16,1,30,35,10,7,1,20,1,0,30,30,1,1,1,0,21,131,1000,1872,672,480,504,800,506,500,508,200,509,300,510,600,515,800,516,500,0,0,0,0,0,0,,,,,,,2,30
+1017,Bat,Bat,20,150,0,0,2,1,5,25,0,5,1,1,1,0,20,25,1,1,1,3,24,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,0,0,0,0,0,0,0,0,,,,,,,2,40
+1018,Pinkie,Pinkie,30,500,0,0,3,2,7,15,0,5,1,1,1,0,20,25,2,2,1,3,20,129,800,1872,672,480,614,800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,3,50
+1019,SpikyMushroom,Spiky Mushroom,30,300,0,0,4,1,10,13,0,5,1,1,1,0,10,10,1,1,1,3,20,129,800,1872,672,480,567,800,501,150,518,50,613,150,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,3,40
+1020,Fluffy,Fluffy,30,500,0,0,3,1,6,10,1,5,1,2,1,0,20,25,1,1,1,3,20,129,800,1600,672,480,611,800,527,150,535,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,3,40
+1021,CaveSnake,Cave Snake,30,1000,0,0,5,1,20,15,1,5,10,1,1,0,5,20,1,1,1,3,20,129,800,1872,672,480,612,800,610,40,713,500,717,400,717,400,0,0,0,0,0,0,0,0,0,0,,,,,,,3,50
+1022,JackO,Jack O,250,10000,0,0,5000,2,100,500,40,20,35,40,25,25,35,50,1,1,1,0,20,133,250,1500,672,480,617,300,622,400,624,400,620,400,615,300,1203,400,1198,10000,616,600,0,0,0,0,,,,,,,2,30
+1023,FireSkull,Fire Skull,180,5000,0,0,100,2,75,175,35,15,30,30,20,20,25,60,1,1,1,3,23,175,600,1600,672,480,631,1000,701,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,30
+1024,PoisonSkull,Poison Skull,180,5000,0,0,100,2,75,175,35,15,30,30,20,20,25,60,1,1,1,3,25,175,600,1600,672,480,631,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,4,20
+1025,LogHead,Log Head,30,500,0,0,30,1,7,20,50,5,1,1,1,0,20,25,1,1,1,3,22,129,800,1872,672,480,569,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,50
+1026,MountainSnake,Mountain Snake,130,900,0,0,100,1,80,125,4,6,20,40,10,10,35,45,1,1,1,0,20,133,1000,1500,672,480,532,20,641,150,715,400,715,400,711,500,0,0,0,0,0,0,0,0,0,0,,,,,,,1,30
+1027,EasterFluffy,Easter Fluffy,30,500,0,0,3,1,10,12,0,5,1,1,1,0,20,25,1,1,1,3,20,129,800,1872,672,480,1208,2000,1209,2000,1210,2000,1211,1000,1212,1000,1213,200,0,0,0,0,0,0,0,0,,,,,,,1,40
+1028,Mouboo,Mouboo,85,1200,0,0,40,2,30,75,65,5,15,5,15,0,40,10,2,2,1,3,20,129,600,1872,672,480,660,200,660,100,541,750,660,10,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,30
+1029,MauvePlant,Mauve Plant,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,680,3000,680,3000,680,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,60
+1030,CobaltPlant,Cobalt Plant,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,681,3000,681,3000,681,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
+1031,GambogePlant,Gamboge Plant,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,682,3000,682,3000,682,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
+1032,AlizarinPlant,Alizarin Plant,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,683,3000,683,3000,683,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
+1033,SeaSlime,Sea Slime,70,600,0,0,9,1,30,50,3,7,1,25,1,0,30,30,1,1,1,0,41,131,1500,1872,672,480,535,800,657,800,518,500,510,1000,700,100,1199,5000,568,100,541,50,0,0,0,0,,,,,,,0,0
+1034,GrassSnake,Grass Snake,140,1000,0,0,100,1,80,120,2,10,20,40,10,10,40,50,1,1,1,0,20,133,500,1100,672,480,716,400,716,400,712,500,676,500,660,350,0,0,0,0,0,0,0,0,0,0,,,,,,,1,40
+1035,Silkworm,Silkworm,20,1,0,0,1,1,0,0,2,10,20,11,10,10,40,10,1,1,1,0,20,129,1300,1100,672,480,718,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,40
diff --git a/news.txt b/news.txt
index f7dd2f13..763e9e75 100644
--- a/news.txt
+++ b/news.txt
@@ -1,3 +1,22 @@
+##3 Rebalancing
+##3 2009-01-19
+ 
+##0 The rebalancing done on enigma (our official
+##0 test server) is now on our main server. Work is
+##0 being done on getting the next testing period
+##0 ready. All monsters have been rebalanced and
+##0 the desert especially has different monster
+##0 positions. Monster exp has been reworked as
+##0 well.
+ 
+##0 The cotton boots are finally available in
+##0 certain shops. Also, as most of you have already
+##0 seen, hair styles have been reorganized so both
+##0 genders can use all styles. Note that only 0.0.27
+##0 can see them all. Older clients will only see the
+##0 male styles. New hair colors are in the works as
+##0 well.
+ 
 ##3 Open Testing on Official Test Server
 ##3 2009-01-04 through 2009-01-11
  
diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1_Tulimshar/_mobs.txt
index a24fe7c5..ef4c17be 100644
--- a/npc/001-1_Tulimshar/_mobs.txt
+++ b/npc/001-1_Tulimshar/_mobs.txt
@@ -10,6 +10,16 @@
 001-1.gat,115,25,8,4	monster	Maggot	1002,3,0,0,Mob001-1::On1002
 001-1.gat,124,53,15,13	monster	Maggot	1002,10,0,0,Mob001-1::On1002
 001-1.gat,120,64,15,13	monster	Maggot	1002,11,0,0,Mob001-1::On1002
+001-1.gat,63,24,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,72,64,3,2	monster	Maggots	1002,2,0,0,Mob001-1::On1002
+001-1.gat,97,80,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,134,61,3,2	monster	Maggots	1002,2,0,0,Mob001-1::On1002
+001-1.gat,112,47,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,129,37,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,89,31,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,19,78,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,122,59,17,22	monster	Giant Maggot	1006,1,0,0,Mob001-1::On1006
+001-1.gat,130,22,1,1	monster	Fire Goblin	1011,1,61000,60000,Mob001-1::On1011
 
 
 001-1.gat,0,0,0	script	Mob001-1	-1,{
@@ -23,5 +33,15 @@ On1003:
 	callfunc "MobPoints";
 	break;
 
+On1006:
+	set @mobID, 1006;
+	callfunc "MobPoints";
+	break;
+
+On1011:
+	set @mobID, 1011;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/001-1_Tulimshar/merchant.txt b/npc/001-1_Tulimshar/merchant.txt
index cd7ecd02..a664e74a 100644
--- a/npc/001-1_Tulimshar/merchant.txt
+++ b/npc/001-1_Tulimshar/merchant.txt
@@ -1,3 +1,3 @@
 //
 
-001-1.gat,39,52,0	shop	Neko	101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000
+001-1.gat,39,52,0	shop	Neko	101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000,735:-1
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
index 3e223b09..acb84bb4 100644
--- a/npc/002-3_Desert_mines/_import.txt
+++ b/npc/002-3_Desert_mines/_import.txt
@@ -2,4 +2,3 @@ map: 002-3.gat
 npc: npc/002-3_Desert_mines/_mobs.txt
 npc: npc/002-3_Desert_mines/_warps.txt
 npc: npc/002-3_Desert_mines/miners.txt
-npc: npc/002-3_Desert_mines/monsters.txt
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
index 63150759..185351b5 100644
--- a/npc/002-3_Desert_mines/_mobs.txt
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -1,7 +1,7 @@
 // 002-3 Desert mines mobs
 
-002-3.gat,38,38,9,9	monster	Red Slime	1008,1,0,0,Mob002-3::On1008
-002-3.gat,82,92,9,9	monster	Black Scorpion	1009,1,0,0,Mob002-3::On1009
+002-3.gat,38,38,9,9	monster	Red Slime	1008,10,0,0,Mob002-3::On1008
+002-3.gat,82,92,9,9	monster	Black Scorpion	1009,10,0,0,Mob002-3::On1009
 
 
 002-3.gat,0,0,0	script	Mob002-3	-1,{
diff --git a/npc/002-3_Desert_mines/miners.txt b/npc/002-3_Desert_mines/miners.txt
index 7f120598..8f69c47d 100644
--- a/npc/002-3_Desert_mines/miners.txt
+++ b/npc/002-3_Desert_mines/miners.txt
@@ -17,7 +17,7 @@ L_message:
 	close;
 }
 
-002-3-1.gat,85,97,6	script	Naem	109,{
+002-3.gat,85,97,6	script	Naem	109,{
 	mes "[Naem the Miner]";
 	mes "\"We discovered an underground palace.";
 	mes "You can get there using the passage on the left.\"";
diff --git a/npc/002-3_Desert_mines/monsters.txt b/npc/002-3_Desert_mines/monsters.txt
deleted file mode 100644
index 550b3d17..00000000
--- a/npc/002-3_Desert_mines/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_2-1
-// This is the Desert mines south of Tulimshar -- level 1.
-//
-
-002-3.gat,0,0,0,0	monster	RedSlime	1008,30,2500,0,Mob2::OnRedSlime
-002-3.gat,0,0,0,0	monster	BlackScorpion	1009,15,2500,0,Mob2::OnBlackScorpion
-
-002-3.gat,0,0,0	script	Mob2	-1,{
-OnRedSlime:
-	set @mobID, 1008;
-	callfunc "MobPoints";
-	break;
-
-OnBlackScorpion:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/002-4_Desert_mines/miners.txt b/npc/002-4_Desert_mines/miners.txt
index 9e67c1ec..90cf4068 100644
--- a/npc/002-4_Desert_mines/miners.txt
+++ b/npc/002-4_Desert_mines/miners.txt
@@ -1,7 +1,7 @@
 //
 
-002-4.gat,32,94,6	script	Naem	109,{
-	mes "[Naem the Miner]";
+002-4.gat,32,94,6	script	Sema	109,{
+	mes "[Sema the Miner]";
 	mes "\"This place is odd.\"";
 	close;
 }
diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
index 093bc3bc..f1f813d5 100644
--- a/npc/006-1_Desert_mountains/_mobs.txt
+++ b/npc/006-1_Desert_mountains/_mobs.txt
@@ -1,19 +1,19 @@
 // 006-1 Desert mountains mobs
 
-006-1.gat,25,34,12,31	monster	Snake	1010,5,0,0,Mob006-1::On1010
-006-1.gat,36,29,9,16	monster	Snake	1010,2,0,0,Mob006-1::On1010
-006-1.gat,34,41,4,6	monster	Mountain Snake	1026,1,0,0,Mob006-1::On1026
-006-1.gat,55,37,27,23	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
-006-1.gat,89,26,33,13	monster	Mountain Snake	1026,10,0,0,Mob006-1::On1026
-006-1.gat,118,43,22,40	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
-006-1.gat,115,49,6,3	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
-006-1.gat,88,47,36,11	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
-006-1.gat,105,72,25,16	monster	Mountain Snake	1026,6,0,0,Mob006-1::On1026
-006-1.gat,75,106,16,22	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
-006-1.gat,102,97,36,29	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
-006-1.gat,65,65,49,30	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
-006-1.gat,95,120,38,13	monster	Mountain Snake	1026,10,0,0,Mob006-1::On1026
-006-1.gat,54,120,29,7	monster	Mountain Snake	1026,7,0,0,Mob006-1::On1026
+006-1.gat,25,34,12,31	monster	Snake	1010,3,0,0,Mob006-1::On1010
+006-1.gat,36,29,9,16	monster	Snake	1010,1,0,0,Mob006-1::On1010
+006-1.gat,34,41,4,6	monster	Mountain Snake	1026,1,15000,10000,Mob006-1::On1026
+006-1.gat,55,37,27,23	monster	Mountain Snake	1026,3,15000,10000,Mob006-1::On1026
+006-1.gat,89,26,33,13	monster	Mountain Snake	1026,5,15000,10000,Mob006-1::On1026
+006-1.gat,118,43,22,40	monster	Mountain Snake	1026,8,15000,10000,Mob006-1::On1026
+006-1.gat,115,49,6,3	monster	Mountain Snake	1026,3,15000,10000,Mob006-1::On1026
+006-1.gat,88,47,36,11	monster	Mountain Snake	1026,3,15000,10000,Mob006-1::On1026
+006-1.gat,105,72,25,16	monster	Mountain Snake	1026,3,15000,10000,Mob006-1::On1026
+006-1.gat,75,106,16,22	monster	Mountain Snake	1026,4,15000,10000,Mob006-1::On1026
+006-1.gat,102,97,36,29	monster	Mountain Snake	1026,8,15000,10000,Mob006-1::On1026
+006-1.gat,65,65,49,30	monster	Mountain Snake	1026,8,15000,10000,Mob006-1::On1026
+006-1.gat,95,120,38,13	monster	Mountain Snake	1026,5,15000,10000,Mob006-1::On1026
+006-1.gat,54,120,29,7	monster	Mountain Snake	1026,4,15000,10000,Mob006-1::On1026
 006-1.gat,36,98,33,35	monster	Scorpion	1003,10,0,0,Mob006-1::On1003
 
 
diff --git a/npc/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3_Desert_mountain_caves/_mobs.txt
index 1c7bf5e9..ca5996b9 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -1,32 +1,47 @@
 // 006-3 Desert mountain caves mobs
 
-006-3.gat,108,25,36,8	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,99,50,14,13	monster	Mountain Snake	1026,2,0,0,Mob006-3::On1026
-006-3.gat,89,63,14,11	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
-006-3.gat,86,90,29,9	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,109,78,12,9	monster	Mountain Snake	1026,1,0,0,Mob006-3::On1026
-006-3.gat,119,117,15,14	monster	Mountain Snake	1026,7,0,0,Mob006-3::On1026
-006-3.gat,57,105,27,30	monster	Mountain Snake	1026,15,0,0,Mob006-3::On1026
-006-3.gat,73,120,16,5	monster	Mountain Snake	1026,6,0,0,Mob006-3::On1026
-006-3.gat,117,54,11,9	monster	Mountain Snake	1026,7,0,0,Mob006-3::On1026
-006-3.gat,123,62,10,5	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,84,27,5,7	monster	Mountain Snake	1026,2,0,0,Mob006-3::On1026
-006-3.gat,40,40,36,28	monster	Mountain Snake	1026,15,0,0,Mob006-3::On1026
-006-3.gat,34,60,27,11	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,87,74,26,9	monster	Red Slime	1008,1,0,0,Mob006-3::On1008
-006-3.gat,120,76,9,21	monster	Red Slime	1008,6,0,0,Mob006-3::On1008
-006-3.gat,101,85,14,8	monster	Red Slimes	1008,7,0,0,Mob006-3::On1008
-006-3.gat,44,124,29,7	monster	Mountain Snake	1026,10,0,0,Mob006-3::On1026
-006-3.gat,90,125,17,7	monster	Mountain Snake	1026,10,0,0,Mob006-3::On1026
-006-3.gat,30,88,13,20	monster	Red Slime	1008,5,0,0,Mob006-3::On1008
+006-3.gat,108,25,36,8	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,99,50,14,13	monster	Mountain Snake	1026,1,15000,10000,Mob006-3::On1026
+006-3.gat,89,63,14,11	monster	Mountain Snake	1026,2,15000,10000,Mob006-3::On1026
+006-3.gat,86,90,29,9	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,109,78,12,9	monster	Mountain Snake	1026,1,15000,10000,Mob006-3::On1026
+006-3.gat,119,117,15,14	monster	Mountain Snake	1026,4,15000,10000,Mob006-3::On1026
+006-3.gat,65,71,31,35	monster	Mountain Snake	1026,10,15000,10000,Mob006-3::On1026
+006-3.gat,57,105,27,30	monster	Mountain Snake	1026,8,15000,10000,Mob006-3::On1026
+006-3.gat,73,120,16,5	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,117,54,11,9	monster	Mountain Snake	1026,4,15000,10000,Mob006-3::On1026
+006-3.gat,123,62,10,5	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,84,27,5,7	monster	Mountain Snake	1026,1,15000,10000,Mob006-3::On1026
+006-3.gat,40,40,36,28	monster	Mountain Snake	1026,8,15000,10000,Mob006-3::On1026
+006-3.gat,34,60,27,11	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,87,74,26,9	monster	Red Slime	1008,1,15000,10000,Mob006-3::On1008
+006-3.gat,120,76,9,21	monster	Red Slime	1008,3,15000,10000,Mob006-3::On1008
+006-3.gat,101,85,14,8	monster	Red Slimes	1008,4,15000,10000,Mob006-3::On1008
+006-3.gat,44,124,29,7	monster	Mountain Snake	1026,5,15000,10000,Mob006-3::On1026
+006-3.gat,90,125,17,7	monster	Mountain Snake	1026,5,15000,10000,Mob006-3::On1026
+006-3.gat,30,88,13,20	monster	Red Slime	1008,3,0,0,Mob006-3::On1008
+006-3.gat,122,98,10,16	monster	Spider	1012,3,0,0,Mob006-3::On1012
+006-3.gat,112,104,7,13	monster	Spider	1012,1,0,0,Mob006-3::On1012
+006-3.gat,103,108,9,9	monster	Spider	1012,1,0,0,Mob006-3::On1012
+006-3.gat,83,107,13,14	monster	Yellow slime	1007,6,0,0,Mob006-3::On1007
 
 
 006-3.gat,0,0,0	script	Mob006-3	-1,{
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
 On1008:
 	set @mobID, 1008;
 	callfunc "MobPoints";
 	break;
 
+On1012:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
 On1026:
 	set @mobID, 1026;
 	callfunc "MobPoints";
diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt
index b4653078..bc5aa9d1 100644
--- a/npc/007-1_Woodland/_mobs.txt
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -1,7 +1,8 @@
 // 007-1 Woodland mobs
 
-007-1.gat,119,66,9,9	monster	Fluffy	1020,1,0,0,Mob007-1::On1020
-007-1.gat,96,35,9,9	monster	Sleep Flower	1014,1,0,0,Mob007-1::On1014
+007-1.gat,53,46,67,53	monster	Flower	1014,15,0,0,Mob007-1::On1014
+007-1.gat,105,57,53,74	monster	Fluffy	1020,20,0,0,Mob007-1::On1020
+007-1.gat,105,48,55,51	monster	Spiky Mushroom	1019,10,0,0,Mob007-1::On1019
 
 
 007-1.gat,0,0,0	script	Mob007-1	-1,{
@@ -10,6 +11,11 @@ On1014:
 	callfunc "MobPoints";
 	break;
 
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
 On1020:
 	set @mobID, 1020;
 	callfunc "MobPoints";
diff --git a/npc/010-2_Dimonds_Cove/dimonds.txt b/npc/010-2_Dimonds_Cove/dimonds.txt
index 713b0d69..8f82fc97 100644
--- a/npc/010-2_Dimonds_Cove/dimonds.txt
+++ b/npc/010-2_Dimonds_Cove/dimonds.txt
@@ -115,7 +115,7 @@
 
 010-2.gat,85,41,0	shop	Blacksmith	146,545:20000,529:5,625:20000,626:50000,603:-1
 
-010-2.gat,65,41,0	shop	General Store	137,586:1000,524:1600,544:10000,632:10000,528:1000
+010-2.gat,65,41,0	shop	General Store	137,586:1000,524:1600,544:10000,632:10000,528:1000,735:-1
 
 010-2.gat,75,68,0	script	Basil	107,{
 	set @npcName$, "[Basil the Inn Keeper]";
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 57c3c598..ceba8fd8 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -20,8 +20,8 @@ L_Style:
 		"Center parting/Short and slick", -,
 		"Long and slick", -,
 		"Short and curly", -,
-		"Long and curly", -,
 		"Pigtails", -,
+		"Long and curly", -,
 		"Parted", -,
 		"Supprise me", -,
 		"Nah, I'm fine", L_Done;