From 8f28519593b20a6f35029308991781c3780f206b Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 28 Dec 2008 21:03:52 +0000
Subject: Update mobs for 006-3

---
 data/005-1.wlk                            | Bin 26004 -> 26004 bytes
 npc/006-3_Desert_mountain_caves/_mobs.txt |  15 +++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/data/005-1.wlk b/data/005-1.wlk
index fe816a52..e5ff4e9c 100644
Binary files a/data/005-1.wlk and b/data/005-1.wlk differ
diff --git a/npc/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3_Desert_mountain_caves/_mobs.txt
index 1c7bf5e9..b4712448 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -6,6 +6,7 @@
 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,65,71,31,35	monster	Mountain Snake	1026,20,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
@@ -19,14 +20,28 @@
 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,122,98,10,16	monster	Spider	1012,6,0,0,Mob006-3::On1012
+006-3.gat,112,104,7,13	monster	Spider	1012,2,0,0,Mob006-3::On1012
+006-3.gat,103,108,9,9	monster	Spider	1012,2,0,0,Mob006-3::On1012
+006-3.gat,83,107,13,14	monster	Yellow slime	1007,7,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";
-- 
cgit v1.2.3-70-g09d2


From c65acac2430a26707ce157e044e33811184b2e24 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 1 Jan 2009 10:01:01 +0000
Subject: Adjust floor item timers

New drop protection timers are 15, 10, 5 seconds
New floor time is 120 seconds
---
 conf/battle_athena.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 3419fc80..f4a74f6c 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
-- 
cgit v1.2.3-70-g09d2


From 38ff33a5d555f28d5a6b4f660544d66f4d92208f Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 1 Jan 2009 11:27:26 +0000
Subject: Adjust Mouboo and Fluffy a bit

---
 db/mob_db.txt | 79 ++++++++++++++++++++++++++---------------------------------
 1 file changed, 35 insertions(+), 44 deletions(-)

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
-- 
cgit v1.2.3-70-g09d2


From ac9e5aaf0f9cd9b5fed3070ca0f66e7b10b18b51 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 3 Jan 2009 22:22:26 +0000
Subject: Add more maggots and a Giant Maggot in Tulimshar

Maggots added to cattle skulls
---
 npc/001-1_Tulimshar/_mobs.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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;
 }
-- 
cgit v1.2.3-70-g09d2


From 22ea4ebad973289bfbf54b41e87f51c9fad2c9ba Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 3 Jan 2009 22:23:36 +0000
Subject: Adjust mobs on map 007-1

---
 npc/007-1_Woodland/_mobs.txt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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";
-- 
cgit v1.2.3-70-g09d2


From e48f8cec1048f9031523deb086ff20c4c77b9019 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 3 Jan 2009 22:24:01 +0000
Subject: Adjust spawn timers for Mountain Snakes

---
 npc/002-3_Desert_mines/_mobs.txt          | 4 ++--
 npc/006-3_Desert_mountain_caves/_mobs.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3_Desert_mountain_caves/_mobs.txt
index b4712448..a6dfd23c 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -4,7 +4,7 @@
 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,109,78,12,9	monster	Mountain Snake	1026,2,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,65,71,31,35	monster	Mountain Snake	1026,20,0,0,Mob006-3::On1026
 006-3.gat,57,105,27,30	monster	Mountain Snake	1026,15,0,0,Mob006-3::On1026
-- 
cgit v1.2.3-70-g09d2


From 91fd827c1f0fa7fdbedbcb3be048207b13a79b68 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 3 Jan 2009 22:25:09 +0000
Subject: Add a missing collision to 007-1

---
 data/007-1.wlk | Bin 17860 -> 17860 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/007-1.wlk b/data/007-1.wlk
index cae67d2e..431d5e3b 100644
Binary files a/data/007-1.wlk and b/data/007-1.wlk differ
-- 
cgit v1.2.3-70-g09d2


From b27c02633e0edc7627d4ce0533b70605292af25e Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 3 Jan 2009 22:31:02 +0000
Subject: Adjust drop and exp rates to be 10x normal

---
 conf/battle_athena.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index f4a74f6c..21191154 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -106,22 +106,22 @@ mvp_item_third_get_time: 2000
 // Item drop rates (Note 2)
 
 // The rate the common items are droped (Items that are in the ETC tab, besides card)
-item_rate_common: 100
+item_rate_common: 10000
 item_drop_common_min: 1
 item_drop_common_max: 10000
 
 // The rate healing items are droped (items that restore HP or SP)
-item_rate_heal: 100
+item_rate_heal: 10000
 item_drop_heal_min: 1
 item_drop_heal_max: 10000
 
 // The rate at which usable items (in the item tab) other then healing items are droped.
-item_rate_use: 100
+item_rate_use: 10000
 item_drop_use_min: 1
 item_drop_use_max: 10000
 
 // The rate at which equipment is droped.
-item_rate_equip: 100
+item_rate_equip: 10000
 item_drop_equip_min: 1
 item_drop_equip_max: 10000
 
@@ -137,10 +137,10 @@ item_drop_mvp_max: 10000
 drop_rate0item: no
 
 // Rate at which exp. is given. (Note 2)
-base_exp_rate: 100
+base_exp_rate: 10000
 
 // Rate at which job exp. is given. (Note 2)
-job_exp_rate: 100
+job_exp_rate: 10000
 
 // PVP exp.  Do players get exp during pvp
 pvp_exp: yes
-- 
cgit v1.2.3-70-g09d2


From 14de64fd211023d5701cb96f9e0f8657a62448e3 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 30 Dec 2008 21:10:47 +0000
Subject: Remove extra monsters from 002-4 (cherry picked from commit
 40e97c2eb3332d608684e476ee1f6fa849e7fcae)

---
 npc/002-4_Desert_mines/_import.txt  |  1 -
 npc/002-4_Desert_mines/monsters.txt | 20 --------------------
 2 files changed, 21 deletions(-)
 delete mode 100644 npc/002-4_Desert_mines/monsters.txt

diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
index cb715b3d..bad205b9 100644
--- a/npc/002-4_Desert_mines/_import.txt
+++ b/npc/002-4_Desert_mines/_import.txt
@@ -3,4 +3,3 @@ npc: npc/002-4_Desert_mines/_mobs.txt
 npc: npc/002-4_Desert_mines/_warps.txt
 npc: npc/002-4_Desert_mines/chest.txt
 npc: npc/002-4_Desert_mines/miners.txt
-npc: npc/002-4_Desert_mines/monsters.txt
diff --git a/npc/002-4_Desert_mines/monsters.txt b/npc/002-4_Desert_mines/monsters.txt
deleted file mode 100644
index 17d5cdee..00000000
--- a/npc/002-4_Desert_mines/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 002-4
-// This is the Desert Mines south of Tulimshar -- level 2.
-//
-
-002-4.gat,0,0,0,0	monster	Spider		1012,10,2500,0,Mob5::OnSpider
-002-4.gat,0,0,0,0	monster	YellowSlime	1007,25,2500,0,Mob5::OnYellowSlime
-
-002-4.gat,0,0,0	script	Mob5	-1,{
-OnSpider:
-	set @mobID, 1012;
-	callfunc "MobPoints";
-	break;
-
-OnYellowSlime:
-	set @mobID, 1007;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
-- 
cgit v1.2.3-70-g09d2


From a884e009e0a8978cbe0b14ce318184461c903844 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 30 Dec 2008 21:28:41 +0000
Subject: Update walkmap for 018-1 to open up a ledge (cherry picked from
 commit e693ea0cffe8d632cfd74a5106ef1158bc2bceb0)

---
 data/018-1.wlk | Bin 24004 -> 24004 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/018-1.wlk b/data/018-1.wlk
index 8d1e57ec..38c24166 100644
Binary files a/data/018-1.wlk and b/data/018-1.wlk differ
-- 
cgit v1.2.3-70-g09d2


From fca3097d6dc5ba49d057926730858d7fe25537f6 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 5 Jan 2009 13:26:07 +0000
Subject: Adjust respawn HP and SP to be 100%

---
 conf/battle_athena.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 21191154..c9bd2b28 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -162,11 +162,11 @@ zeny_penalty: 0
 
 // The amount of HP a player will respawn with, 0 is default.
 // (Unit is in percentage of total HP, 100 is full heal of HP, 0 is respawn with 1HP total.)
-restart_hp_rate: 0
+restart_hp_rate: 100
 
 // The amount of SP a player will respawn with, 0 is default.
 // (Unit is in percentage of total SP, 100 is full heal of SP, 0 is respawn with 1SP total.)
-restart_sp_rate: 0
+restart_sp_rate: 100
 
 // [MVP] Summoned monsters HP rate, that is, monsters summoned by an MVP will have this much HP. (Note 2)
 mvp_hp_rate: 100
-- 
cgit v1.2.3-70-g09d2


From 61bfda15dc17b8936b0c0bdb003df4ba14140fbe Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 5 Jan 2009 13:33:35 +0000
Subject: Fix exp and drop rates

---
 conf/battle_athena.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index c9bd2b28..f40d2b7d 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -106,22 +106,22 @@ mvp_item_third_get_time: 2000
 // Item drop rates (Note 2)
 
 // The rate the common items are droped (Items that are in the ETC tab, besides card)
-item_rate_common: 10000
+item_rate_common: 1000
 item_drop_common_min: 1
 item_drop_common_max: 10000
 
 // The rate healing items are droped (items that restore HP or SP)
-item_rate_heal: 10000
+item_rate_heal: 1000
 item_drop_heal_min: 1
 item_drop_heal_max: 10000
 
 // The rate at which usable items (in the item tab) other then healing items are droped.
-item_rate_use: 10000
+item_rate_use: 1000
 item_drop_use_min: 1
 item_drop_use_max: 10000
 
 // The rate at which equipment is droped.
-item_rate_equip: 10000
+item_rate_equip: 1000
 item_drop_equip_min: 1
 item_drop_equip_max: 10000
 
@@ -137,10 +137,10 @@ item_drop_mvp_max: 10000
 drop_rate0item: no
 
 // Rate at which exp. is given. (Note 2)
-base_exp_rate: 10000
+base_exp_rate: 1000
 
 // Rate at which job exp. is given. (Note 2)
-job_exp_rate: 10000
+job_exp_rate: 1000
 
 // PVP exp.  Do players get exp during pvp
 pvp_exp: yes
-- 
cgit v1.2.3-70-g09d2


From 2825827eb127c5d40605083a5a649bc1b5b1d6db Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 5 Jan 2009 19:09:59 +0000
Subject: Reduce spawn counts in the desert mountains

---
 npc/006-1_Desert_mountains/_mobs.txt      | 26 ++++++++---------
 npc/006-3_Desert_mountain_caves/_mobs.txt | 46 +++++++++++++++----------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
index 093bc3bc..6f526d4f 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,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,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,55,37,27,23	monster	Mountain Snake	1026,3,0,0,Mob006-1::On1026
+006-1.gat,89,26,33,13	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
+006-1.gat,118,43,22,40	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
+006-1.gat,115,49,6,3	monster	Mountain Snake	1026,3,0,0,Mob006-1::On1026
+006-1.gat,88,47,36,11	monster	Mountain Snake	1026,3,0,0,Mob006-1::On1026
+006-1.gat,105,72,25,16	monster	Mountain Snake	1026,3,0,0,Mob006-1::On1026
+006-1.gat,75,106,16,22	monster	Mountain Snake	1026,4,0,0,Mob006-1::On1026
+006-1.gat,102,97,36,29	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
+006-1.gat,65,65,49,30	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
+006-1.gat,95,120,38,13	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
+006-1.gat,54,120,29,7	monster	Mountain Snake	1026,4,0,0,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 a6dfd23c..ab8d8974 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -1,29 +1,29 @@
 // 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,2,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,65,71,31,35	monster	Mountain Snake	1026,20,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,108,25,36,8	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
+006-3.gat,99,50,14,13	monster	Mountain Snake	1026,1,0,0,Mob006-3::On1026
+006-3.gat,89,63,14,11	monster	Mountain Snake	1026,2,0,0,Mob006-3::On1026
+006-3.gat,86,90,29,9	monster	Mountain Snake	1026,3,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,4,0,0,Mob006-3::On1026
+006-3.gat,65,71,31,35	monster	Mountain Snake	1026,10,0,0,Mob006-3::On1026
+006-3.gat,57,105,27,30	monster	Mountain Snake	1026,8,0,0,Mob006-3::On1026
+006-3.gat,73,120,16,5	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
+006-3.gat,117,54,11,9	monster	Mountain Snake	1026,4,0,0,Mob006-3::On1026
+006-3.gat,123,62,10,5	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
+006-3.gat,84,27,5,7	monster	Mountain Snake	1026,1,0,0,Mob006-3::On1026
+006-3.gat,40,40,36,28	monster	Mountain Snake	1026,8,0,0,Mob006-3::On1026
+006-3.gat,34,60,27,11	monster	Mountain Snake	1026,3,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,122,98,10,16	monster	Spider	1012,6,0,0,Mob006-3::On1012
-006-3.gat,112,104,7,13	monster	Spider	1012,2,0,0,Mob006-3::On1012
-006-3.gat,103,108,9,9	monster	Spider	1012,2,0,0,Mob006-3::On1012
-006-3.gat,83,107,13,14	monster	Yellow slime	1007,7,0,0,Mob006-3::On1007
+006-3.gat,120,76,9,21	monster	Red Slime	1008,3,0,0,Mob006-3::On1008
+006-3.gat,101,85,14,8	monster	Red Slimes	1008,4,0,0,Mob006-3::On1008
+006-3.gat,44,124,29,7	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
+006-3.gat,90,125,17,7	monster	Mountain Snake	1026,5,0,0,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,{
-- 
cgit v1.2.3-70-g09d2


From a6973b55b26f389bf71193865d6a38d65d6a3cee Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 6 Jan 2009 15:34:05 +0000
Subject: Add spawn timers to desert mountain snakes

---
 npc/006-1_Desert_mountains/_mobs.txt      | 24 +++++++++----------
 npc/006-3_Desert_mountain_caves/_mobs.txt | 38 +++++++++++++++----------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
index 6f526d4f..f1f813d5 100644
--- a/npc/006-1_Desert_mountains/_mobs.txt
+++ b/npc/006-1_Desert_mountains/_mobs.txt
@@ -2,18 +2,18 @@
 
 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,0,0,Mob006-1::On1026
-006-1.gat,55,37,27,23	monster	Mountain Snake	1026,3,0,0,Mob006-1::On1026
-006-1.gat,89,26,33,13	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
-006-1.gat,118,43,22,40	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
-006-1.gat,115,49,6,3	monster	Mountain Snake	1026,3,0,0,Mob006-1::On1026
-006-1.gat,88,47,36,11	monster	Mountain Snake	1026,3,0,0,Mob006-1::On1026
-006-1.gat,105,72,25,16	monster	Mountain Snake	1026,3,0,0,Mob006-1::On1026
-006-1.gat,75,106,16,22	monster	Mountain Snake	1026,4,0,0,Mob006-1::On1026
-006-1.gat,102,97,36,29	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
-006-1.gat,65,65,49,30	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
-006-1.gat,95,120,38,13	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
-006-1.gat,54,120,29,7	monster	Mountain Snake	1026,4,0,0,Mob006-1::On1026
+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 ab8d8974..ca5996b9 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -1,24 +1,24 @@
 // 006-3 Desert mountain caves mobs
 
-006-3.gat,108,25,36,8	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
-006-3.gat,99,50,14,13	monster	Mountain Snake	1026,1,0,0,Mob006-3::On1026
-006-3.gat,89,63,14,11	monster	Mountain Snake	1026,2,0,0,Mob006-3::On1026
-006-3.gat,86,90,29,9	monster	Mountain Snake	1026,3,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,4,0,0,Mob006-3::On1026
-006-3.gat,65,71,31,35	monster	Mountain Snake	1026,10,0,0,Mob006-3::On1026
-006-3.gat,57,105,27,30	monster	Mountain Snake	1026,8,0,0,Mob006-3::On1026
-006-3.gat,73,120,16,5	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
-006-3.gat,117,54,11,9	monster	Mountain Snake	1026,4,0,0,Mob006-3::On1026
-006-3.gat,123,62,10,5	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
-006-3.gat,84,27,5,7	monster	Mountain Snake	1026,1,0,0,Mob006-3::On1026
-006-3.gat,40,40,36,28	monster	Mountain Snake	1026,8,0,0,Mob006-3::On1026
-006-3.gat,34,60,27,11	monster	Mountain Snake	1026,3,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,3,0,0,Mob006-3::On1008
-006-3.gat,101,85,14,8	monster	Red Slimes	1008,4,0,0,Mob006-3::On1008
-006-3.gat,44,124,29,7	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,90,125,17,7	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
+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
-- 
cgit v1.2.3-70-g09d2


From be320f8d8e11c1b71c226f4d3f792d1ff8de1666 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Date: Mon, 19 Jan 2009 12:34:53 +0100
Subject: Fixed barber mixing up hair styles

Long and curly and pigtails were mixed up. Reported on IRC by meway.
---
 npc/functions/barber.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.3-70-g09d2


From 603911e22d65bde062a6b8331616701fbc111d7d Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 19 Jan 2009 09:26:41 +0000
Subject: Add a battle_local conf file

---
 conf/battle_athena.conf        | 3 +++
 conf/battle_local.conf.example | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 conf/battle_local.conf.example

diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index 474fcfd3..79c9de58 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -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.
-- 
cgit v1.2.3-70-g09d2


From a3886681f3f0cc492eb2af0130525bf509659cfc Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 19 Jan 2009 10:31:31 +0000
Subject: Reset rates in battle conf to ease merging

---
 conf/battle_athena.conf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf/battle_athena.conf b/conf/battle_athena.conf
index f85e880f..a4806bec 100644
--- a/conf/battle_athena.conf
+++ b/conf/battle_athena.conf
@@ -106,22 +106,22 @@ mvp_item_third_get_time: 2000
 // Item drop rates (Note 2)
 
 // The rate the common items are droped (Items that are in the ETC tab, besides card)
-item_rate_common: 1000
+item_rate_common: 100
 item_drop_common_min: 1
 item_drop_common_max: 10000
 
 // The rate healing items are droped (items that restore HP or SP)
-item_rate_heal: 1000
+item_rate_heal: 100
 item_drop_heal_min: 1
 item_drop_heal_max: 10000
 
 // The rate at which usable items (in the item tab) other then healing items are droped.
-item_rate_use: 1000
+item_rate_use: 100
 item_drop_use_min: 1
 item_drop_use_max: 10000
 
 // The rate at which equipment is droped.
-item_rate_equip: 1000
+item_rate_equip: 100
 item_drop_equip_min: 1
 item_drop_equip_max: 10000
 
@@ -137,10 +137,10 @@ item_drop_mvp_max: 10000
 drop_rate0item: no
 
 // Rate at which exp. is given. (Note 2)
-base_exp_rate: 1000
+base_exp_rate: 100
 
 // Rate at which job exp. is given. (Note 2)
-job_exp_rate: 1000
+job_exp_rate: 100
 
 // PVP exp.  Do players get exp during pvp
 pvp_exp: yes
@@ -162,11 +162,11 @@ zeny_penalty: 0
 
 // The amount of HP a player will respawn with, 0 is default.
 // (Unit is in percentage of total HP, 100 is full heal of HP, 0 is respawn with 1HP total.)
-restart_hp_rate: 100
+restart_hp_rate: 0
 
 // The amount of SP a player will respawn with, 0 is default.
 // (Unit is in percentage of total SP, 100 is full heal of SP, 0 is respawn with 1SP total.)
-restart_sp_rate: 100
+restart_sp_rate: 0
 
 // [MVP] Summoned monsters HP rate, that is, monsters summoned by an MVP will have this much HP. (Note 2)
 mvp_hp_rate: 100
-- 
cgit v1.2.3-70-g09d2


From 0036a4d7a816e35d7cd5365fac2d68204f07ad45 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 19 Jan 2009 10:42:25 +0000
Subject: Make cotton boots buyable

---
 npc/001-1_Tulimshar/merchant.txt   | 2 +-
 npc/009-2_Hurnscald/shops.txt      | 2 +-
 npc/010-2_Dimonds_Cove/dimonds.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt
index ebd9f767..3492e90a 100644
--- a/npc/009-2_Hurnscald/shops.txt
+++ b/npc/009-2_Hurnscald/shops.txt
@@ -31,4 +31,4 @@
 
 // General Store
 // Sells various things, many not sold elsewhere
-009-2.gat,32,99,0	shop	General Store	112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000
+009-2.gat,32,99,0	shop	General Store	112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000,528:-1
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]";
-- 
cgit v1.2.3-70-g09d2


From fc2874832c68cb3528818f5fb1b98b4c7ad40ba2 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 19 Jan 2009 12:11:48 +0000
Subject: Add news entry for enigma merges.

Other recent changes are also included.
---
 news.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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
  
-- 
cgit v1.2.3-70-g09d2


From bc28270697811e50b2eba82d6220625b7e76759c Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 20 Jan 2009 13:48:22 +0000
Subject: Remove extra shoes in Hurnscald General Store

---
 npc/009-2_Hurnscald/shops.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt
index 3492e90a..ebd9f767 100644
--- a/npc/009-2_Hurnscald/shops.txt
+++ b/npc/009-2_Hurnscald/shops.txt
@@ -31,4 +31,4 @@
 
 // General Store
 // Sells various things, many not sold elsewhere
-009-2.gat,32,99,0	shop	General Store	112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000,528:-1
+009-2.gat,32,99,0	shop	General Store	112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000
-- 
cgit v1.2.3-70-g09d2


From c47a15aff2bc378349613f0db955bf8ed51e2b68 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 20 Jan 2009 13:49:36 +0000
Subject: Fix some desert miners

---
 npc/002-3_Desert_mines/miners.txt | 4 ++--
 npc/002-4_Desert_mines/miners.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/npc/002-3_Desert_mines/miners.txt b/npc/002-3_Desert_mines/miners.txt
index 2ee99b26..9c7d0eca 100644
--- a/npc/002-3_Desert_mines/miners.txt
+++ b/npc/002-3_Desert_mines/miners.txt
@@ -9,9 +9,9 @@
 	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 ont he left.\"";
+	mes "You can get there using the passage on the left.\"";
 	close;
 }
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;
 }
-- 
cgit v1.2.3-70-g09d2


From 479bfcc5c761f6477e07945ae37187aaa62fa146 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 20 Jan 2009 20:28:04 +0000
Subject: Remove extra tab from red cotton boots entry

---
 db/item_db.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/item_db.txt b/db/item_db.txt
index 4cce8027..02556ada 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -366,7 +366,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,	{},					{}
-- 
cgit v1.2.3-70-g09d2


From 8a96b9f192d67db0ccbb80f8dde0847cac52be9a Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 20 Jan 2009 20:28:43 +0000
Subject: Remove extra monsters from desert mines L1

---
 npc/002-3_Desert_mines/_import.txt  |  1 -
 npc/002-3_Desert_mines/monsters.txt | 20 --------------------
 2 files changed, 21 deletions(-)
 delete mode 100644 npc/002-3_Desert_mines/monsters.txt

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/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;
-}
-- 
cgit v1.2.3-70-g09d2


From 5f9639645880b44cabf5d2400a1f835dc04881c4 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 22 Jan 2009 12:44:13 +0000
Subject: Fix name of white cotton boots

---
 db/item_db.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/item_db.txt b/db/item_db.txt
index 02556ada..5c56579d 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -221,7 +221,7 @@
 731,	AssassinPants,		Assassin Pants,			5,	10000,	3000,	10,	,	5,	,	-5,	0,	10477567,	2,	1,	,	0,	0,	{},					{}
 // RESERVED
 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,	{},					{}
 
 #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,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
-- 
cgit v1.2.3-70-g09d2


From 96352cdf87009db08ca68a3c3deee577a981adb8 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Thu, 22 Jan 2009 12:46:32 +0000
Subject: Add some cakes: white, chocolate, orange, & apple

---
 db/item_db.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/db/item_db.txt b/db/item_db.txt
index 5c56579d..7045d954 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -222,6 +222,11 @@
 // RESERVED
 734,	BlackBoots,		Black Boots,			5,	20000,	3000,	35,	,	4,	,	-10,	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,	,	,	,	,	,	,		,	,	,	,	,	{},					{}
-- 
cgit v1.2.3-70-g09d2