Remove uneeded stuff

5 files changed, 0 insertions, 641 deletions

diff --git a/src/mra.patch b/src/mra.patch
deleted file mode 100644
index b8ae365..0000000
--- a/src/mra.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -u -r athena/src/map/clif.c athenanew/src/map/clif.c
---- athena/src/map/clif.c	2005-04-16 17:07:03.000000000 +0000
-+++ athenanew/src/map/clif.c	2005-05-21 18:25:01.121659080 +0000
-@@ -3208,17 +3208,19 @@
-  * アイテム追加成功/失敗
-  *------------------------------------------
-  */
--int clif_tradeitemok(struct map_session_data *sd,int index,int fail)
-+int clif_tradeitemok(struct map_session_data *sd,int index,int amount,int fail)
- {
- 	int fd;
- 
- 	nullpo_retr(0, sd);
- 
- 	fd=sd->fd;
--	WFIFOW(fd,0)=0xea;
-+    WFIFOW(fd,0)=0x1b1;
-+	//WFIFOW(fd,0)=0xea;
- 	WFIFOW(fd,2)=index;
--	WFIFOB(fd,4)=fail;
--	WFIFOSET(fd,packet_len_table[0xea]);
-+	WFIFOW(fd,4)=amount;
-+    WFIFOB(fd,6)=fail;
-+	WFIFOSET(fd,packet_len_table[0x1b1]);
- 
- 	return 0;
- }
-diff -u -r athena/src/map/clif.h athenanew/src/map/clif.h
---- athena/src/map/clif.h	2005-04-16 17:06:56.000000000 +0000
-+++ athenanew/src/map/clif.h	2005-05-21 18:25:33.040806632 +0000
-@@ -97,7 +97,7 @@
- int clif_traderequest(struct map_session_data *sd,char *name);
- int clif_tradestart(struct map_session_data *sd,int type);
- int clif_tradeadditem(struct map_session_data *sd,struct map_session_data *tsd,int index,int amount);
--int clif_tradeitemok(struct map_session_data *sd,int index,int fail);
-+int clif_tradeitemok(struct map_session_data *sd,int index,int amount,int fail);
- int clif_tradedeal_lock(struct map_session_data *sd,int fail);
- int clif_tradecancelled(struct map_session_data *sd);
- int clif_tradecompleted(struct map_session_data *sd,int fail);
-diff -u -r athena/src/map/trade.c athenanew/src/map/trade.c
---- athena/src/map/trade.c	2005-04-16 17:08:06.000000000 +0000
-+++ athenanew/src/map/trade.c	2005-05-21 18:26:46.750601040 +0000
-@@ -98,7 +98,7 @@
- 				if(sd->deal_item_amount[trade_i] == 0){
- 					trade_weight+=sd->inventory_data[index-2]->weight*amount;
- 					if(target_sd->weight + trade_weight > target_sd->max_weight){
--						clif_tradeitemok(sd,index,1); //fail to add item -- the player was over weighted.
-+						clif_tradeitemok(sd,index,0,1); //fail to add item -- the player was over weighted.
-                                                 amount = 0; // [MouseJstr]
- 					}else{
- 						for(c=0; c==trade_i-1;c++){ // re-deal exploit protection [Valaris]
-@@ -109,7 +109,7 @@
- 						}
- 						sd->deal_item_index[trade_i] =index;
- 						sd->deal_item_amount[trade_i]+=amount;
--						clif_tradeitemok(sd,index,0); //success to add item
-+						clif_tradeitemok(sd,index,amount,0); //success to add item
- 						clif_tradeadditem(sd,target_sd,index,amount);
- 					}
- 					break;
-@@ -143,7 +143,7 @@
- 	
- 	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
- 		sd->deal_locked=1;
--		clif_tradeitemok(sd,0,0);
-+		clif_tradeitemok(sd,0,0,0);
- 		clif_tradedeal_lock(sd,0);
- 		clif_tradedeal_lock(target_sd,1);
- 	}
diff --git a/src/tmw-athena.patch b/src/tmw-athena.patch
deleted file mode 100644
index 8104073..0000000
--- a/src/tmw-athena.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff -ru athena/src/char/char.c athena-tmw/src/char/char.c
---- athena/src/char/char.c	2007-11-15 18:19:02.000000000 +0100
-+++ athena-tmw/src/char/char.c	2007-11-15 17:58:30.000000000 +0100
-@@ -91,7 +91,7 @@
- int autosave_interval = DEFAULT_AUTOSAVE_INTERVAL;
- int start_zeny = 500;
- int start_weapon = 1201;
--int start_armor = 2301;
-+int start_armor = 1202;
- 
- // Initial position (it's possible to set it in conf file)
- struct point start_point = {"new_1-1.gat", 53, 111};
-@@ -768,7 +768,7 @@
- 	if (dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29] != 5*6 || // stats
- 	    dat[30] >= 9 || // slots (dat[30] can not be negativ)
- 	    dat[33] <= 0 || dat[33] >= 20 || // hair style
--	    dat[31] >= 9) { // hair color (dat[31] can not be negativ)
-+	    dat[31] >= 12) { // hair color (dat[31] can not be negativ)
- 		char_log("Make new char error (invalid values): (connection #%d, account: %d) slot %d, name: %s, stats: %d+%d+%d+%d+%d+%d=%d, hair: %d, hair color: %d" RETCODE,
- 		         fd, sd->account_id, dat[30], dat, dat[24], dat[25], dat[26], dat[27], dat[28], dat[29], dat[24] + dat[25] + dat[26] + dat[27] + dat[28] + dat[29], dat[33], dat[31]);
- 		return -1;
-diff -ru athena/src/login/login.c athena-tmw/src/login/login.c
---- athena/src/login/login.c	2007-11-15 18:19:02.000000000 +0100
-+++ athena-tmw/src/login/login.c	2007-11-15 17:58:24.000000000 +0100
-@@ -1036,7 +1036,7 @@
- 		if (newaccount) {
- 			login_log("Attempt of creation of an already existant account (account: %s_%c, pass: %s, received pass: %s, ip: %s)" RETCODE,
- 			          account->userid, account->userid[len+1], auth_dat[i].pass, account->passwd, ip);
--			return 1; // 1 = Incorrect Password
-+			return 9; // 9 = Account already exists
- 		}
- 		ld = session[fd]->session_data;
- #ifdef PASSWORDENC
-diff -ru athena/src/map/clif.c athena-tmw/src/map/clif.c
---- athena/src/map/clif.c	2007-11-15 18:19:02.000000000 +0100
-+++ athena-tmw/src/map/clif.c	2007-11-15 17:59:24.000000000 +0100
-@@ -3208,17 +3208,19 @@
-  * アイテム追加成功/失敗
-  *------------------------------------------
-  */
--int clif_tradeitemok(struct map_session_data *sd,int index,int fail)
-+int clif_tradeitemok(struct map_session_data *sd,int index,int amount,int fail)
- {
- 	int fd;
- 
- 	nullpo_retr(0, sd);
- 
- 	fd=sd->fd;
--	WFIFOW(fd,0)=0xea;
-+    WFIFOW(fd,0)=0x1b1;
-+	//WFIFOW(fd,0)=0xea;
- 	WFIFOW(fd,2)=index;
--	WFIFOB(fd,4)=fail;
--	WFIFOSET(fd,packet_len_table[0xea]);
-+	WFIFOW(fd,4)=amount;
-+    WFIFOB(fd,6)=fail;
-+	WFIFOSET(fd,packet_len_table[0x1b1]);
- 
- 	return 0;
- }
-@@ -7887,8 +7889,11 @@
- 	if(sd->sc_data && ( sd->sc_data[SC_BLADESTOP].timer!=-1 || sd->sc_data[SC_BERSERK].timer!=-1 )) return;
- 
- 	if(sd->status.inventory[index].identify != 1) {		// 未鑑定
--		clif_equipitemack(sd,index,0,0);	// fail
--		return;
-+		// Bjorn: Auto-identify items when equipping them as there
-+		//  is no nice way to do this in the client yet.
-+		sd->status.inventory[index].identify = 1;
-+		//clif_equipitemack(sd,index,0,0);	// fail
-+		//return;
- 	}
- 	//ペット用装備であるかないか
- 	if(sd->inventory_data[index]) {
-diff -ru athena/src/map/clif.h athena-tmw/src/map/clif.h
---- athena/src/map/clif.h	2007-11-15 18:19:16.000000000 +0100
-+++ athena-tmw/src/map/clif.h	2007-11-15 17:59:18.000000000 +0100
-@@ -97,7 +97,7 @@
- int clif_traderequest(struct map_session_data *sd,char *name);
- int clif_tradestart(struct map_session_data *sd,int type);
- int clif_tradeadditem(struct map_session_data *sd,struct map_session_data *tsd,int index,int amount);
--int clif_tradeitemok(struct map_session_data *sd,int index,int fail);
-+int clif_tradeitemok(struct map_session_data *sd,int index,int amount,int fail);
- int clif_tradedeal_lock(struct map_session_data *sd,int fail);
- int clif_tradecancelled(struct map_session_data *sd);
- int clif_tradecompleted(struct map_session_data *sd,int fail);
-diff -ru athena/src/map/map.c athena-tmw/src/map/map.c
---- athena/src/map/map.c	2007-11-15 18:19:02.000000000 +0100
-+++ athena-tmw/src/map/map.c	2007-11-15 17:59:25.000000000 +0100
-@@ -1390,10 +1390,10 @@
-  *------------------------------------------
-  */
- static int map_readmap(int m,char *fn, char *alias) {
--	unsigned char *gat="";
-+    unsigned char *gat = "";
- 	int s;
- 	int x,y,xs,ys;
--	struct gat_1cell {float high[4]; int type;} *p=NULL;
-+	struct gat_1cell {char type;} *p;
- 	int wh;
- 	size_t size;
- 
-@@ -1401,28 +1401,34 @@
- 	gat=grfio_read(fn);
- 	if(gat==NULL)
- 		return -1;
--
-+	
- 	printf("\rLoading Maps [%d/%d]: %-50s  ",m,map_num,fn);
- 	fflush(stdout);
- 
- 	map[m].m=m;
--	xs=map[m].xs=*(int*)(gat+6);
--	ys=map[m].ys=*(int*)(gat+10);
--	map[m].gat = (unsigned char *)aCalloc(s = map[m].xs * map[m].ys,sizeof(unsigned char));
-+	xs=map[m].xs=*(short*)(gat);
-+	ys=map[m].ys=*(short*)(gat+2);
-+	printf("\n%i %i\n", xs, ys);
-+	map[m].gat = calloc(s = map[m].xs * map[m].ys, 1);
-+	if(map[m].gat==NULL){
-+		printf("out of memory : map_readmap gat\n");
-+		exit(1);
-+	}
-+
- 	map[m].npc_num=0;
- 	map[m].users=0;
- 	memset(&map[m].flag,0,sizeof(map[m].flag));
- 	if(battle_config.pk_mode) map[m].flag.pvp = 1; // make all maps pvp for pk_mode [Valaris]
- 	wh=map_waterheight(map[m].name);
- 	for(y=0;y<ys;y++){
--		p=(struct gat_1cell*)(gat+y*xs*20+14);
-+		p=(struct gat_1cell*)(gat+y*xs+4);
- 		for(x=0;x<xs;x++){
--			if(wh!=NO_WATER && p->type==0){
-+			/*if(wh!=NO_WATER && p->type==0){
- 				// 水場判定
- 				map[m].gat[x+y*xs]=(p->high[0]>wh || p->high[1]>wh || p->high[2]>wh || p->high[3]>wh) ? 3 : 0;
--			} else {
-+			} else {*/
- 				map[m].gat[x+y*xs]=p->type;
--			}
-+			//}
- 			p++;
- 		}
- 	}
-@@ -1431,12 +1437,36 @@
- 	map[m].bxs=(xs+BLOCK_SIZE-1)/BLOCK_SIZE;
- 	map[m].bys=(ys+BLOCK_SIZE-1)/BLOCK_SIZE;
- 	size = map[m].bxs * map[m].bys * sizeof(struct block_list*);
--	map[m].block = (struct block_list **)aCalloc(1,size);
--	map[m].block_mob = (struct block_list **)aCalloc(1,size);
-+
-+	map[m].block = calloc(size, 1);
-+	if(map[m].block == NULL){
-+		printf("out of memory : map_readmap block\n");
-+		exit(1);
-+	}
-+
-+	map[m].block_mob = calloc(size, 1);
-+	if (map[m].block_mob == NULL) {
-+		printf("out of memory : map_readmap block_mob\n");
-+		exit(1);
-+	}
-+
- 	size = map[m].bxs*map[m].bys*sizeof(int);
--	map[m].block_count = (int *)aCalloc(1,size);
--	map[m].block_mob_count=(int *)aCalloc(1,size);
--           strdb_insert(map_db,map[m].name,&map[m]);
-+
-+	map[m].block_count = calloc(size, 1);
-+	if(map[m].block_count==NULL){
-+		printf("out of memory : map_readmap block\n");
-+		exit(1);
-+	}
-+	memset(map[m].block_count,0,size);
-+
-+	map[m].block_mob_count=calloc(size, 1);
-+	if(map[m].block_mob_count==NULL){
-+		printf("out of memory : map_readmap block_mob\n");
-+		exit(1);
-+	}
-+	memset(map[m].block_mob_count,0,size);
-+
-+	strdb_insert(map_db,map[m].name,&map[m]);
- 
- //	printf("%s read done\n",fn);
- 
-diff -ru athena/src/map/pc.c athena-tmw/src/map/pc.c
---- athena/src/map/pc.c	2007-11-15 18:19:02.000000000 +0100
-+++ athena-tmw/src/map/pc.c	2007-11-15 17:59:19.000000000 +0100
-@@ -6110,6 +6110,7 @@
- 	nameid = sd->status.inventory[n].nameid;
- 	id = sd->inventory_data[n];
- 	pos = pc_equippoint(sd,n);
-+
- 	if(battle_config.battle_log)
- 		printf("equip %d(%d) %x:%x\n",nameid,n,id->equip,pos);
- 	if(!pc_isequip(sd,n) || !pos || sd->status.inventory[n].broken==1 ) { // [Valaris]
-diff -ru athena/src/map/trade.c athena-tmw/src/map/trade.c
---- athena/src/map/trade.c	2007-11-15 18:19:02.000000000 +0100
-+++ athena-tmw/src/map/trade.c	2007-11-15 17:59:18.000000000 +0100
-@@ -98,7 +98,7 @@
- 				if(sd->deal_item_amount[trade_i] == 0){
- 					trade_weight+=sd->inventory_data[index-2]->weight*amount;
- 					if(target_sd->weight + trade_weight > target_sd->max_weight){
--						clif_tradeitemok(sd,index,1); //fail to add item -- the player was over weighted.
-+						clif_tradeitemok(sd,index,0,1); //fail to add item -- the player was over weighted.
-                                                 amount = 0; // [MouseJstr]
- 					}else{
- 						for(c=0; c==trade_i-1;c++){ // re-deal exploit protection [Valaris]
-@@ -109,7 +109,7 @@
- 						}
- 						sd->deal_item_index[trade_i] =index;
- 						sd->deal_item_amount[trade_i]+=amount;
--						clif_tradeitemok(sd,index,0); //success to add item
-+						clif_tradeitemok(sd,index,amount,0); //success to add item
- 						clif_tradeadditem(sd,target_sd,index,amount);
- 					}
- 					break;
-@@ -143,7 +143,7 @@
- 	
- 	if((target_sd = map_id2sd(sd->trade_partner)) != NULL){
- 		sd->deal_locked=1;
--		clif_tradeitemok(sd,0,0);
-+		clif_tradeitemok(sd,0,0,0);
- 		clif_tradedeal_lock(sd,0);
- 		clif_tradedeal_lock(target_sd,1);
- 	}
diff --git a/src/tmw-server.dev b/src/tmw-server.dev
deleted file mode 100644
index 69fe2e9..0000000
--- a/src/tmw-server.dev
+++ /dev/null
@@ -1,169 +0,0 @@
-[Project]
-FileName=tmw-server.dev
-Name=tmw-server
-UnitCount=12
-Type=0
-Ver=1
-ObjFiles=
-Includes=
-Libs=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=
-Linker=
-IsCpp=1
-Icon=
-ExeOutput=
-ObjectOutput=
-OverrideOutput=0
-OverrideOutputName=
-HostApplication=
-Folders=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=
-
-[Unit1]
-FileName=src\char\char.c
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=src\char\char.h
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=src\char\int_guild.c
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=src\char\int_guild.h
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=src\char\int_party.c
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=src\char\int_party.h
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=src\char\int_pet.c
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit8]
-FileName=src\char\int_pet.h
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit9]
-FileName=src\char\int_storage.c
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=src\char\int_storage.h
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=src\char\inter.c
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=src\char\inter.h
-CompileCpp=1
-Folder=tmw-server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
diff --git a/src/tmw-server.layout b/src/tmw-server.layout
deleted file mode 100644
index 32cd14a..0000000
--- a/src/tmw-server.layout
+++ /dev/null
@@ -1,43 +0,0 @@
-[Editor_0]
-CursorCol=23
-CursorRow=94
-TopLine=85
-LeftChar=1
-Open=0
-Top=0
-[Editors]
-Focused=-1
-Order=
-[Editor_1]
-Open=0
-Top=0
-[Editor_2]
-Open=0
-Top=0
-[Editor_3]
-Open=0
-Top=0
-[Editor_4]
-Open=0
-Top=0
-[Editor_5]
-Open=0
-Top=0
-[Editor_6]
-Open=0
-Top=0
-[Editor_7]
-Open=0
-Top=0
-[Editor_8]
-Open=0
-Top=0
-[Editor_9]
-Open=0
-Top=0
-[Editor_10]
-Open=0
-Top=0
-[Editor_11]
-Open=0
-Top=0
diff --git a/src/xand1_1.patch b/src/xand1_1.patch
deleted file mode 100644
index 5715664..0000000
--- a/src/xand1_1.patch
+++ /dev/null
@@ -1,132 +0,0 @@
---- npc/tulimshar/monster_guide.txt	2005-08-05 23:03:44.144096000 +0200
-+++ npc/tulimshar/monster_guide.txt.new	2005-08-08 14:03:51.154608000 +0200
-@@ -1,91 +1,3 @@
--new_3-1.gat,53,185,0	script	ConquestMob0	-1,{
--OnInit:
--// all monsters ingame by 31.Jul 2005 sorted by map, monsterID
--areamonster "new_1-1.gat",15,17,105,103,"RedScorpion",1004, 1,"ConquestMob-new_1-1::OnGuardianDied1004";
--areamonster "new_1-1.gat",15,17,105,103,"GreenSlime",1005, 50,"ConquestMob-new_1-1::OnGuardianDied1005";
--areamonster "new_1-1.gat",15,17,105,103,"GiantMaggot",1006, 30,"ConquestMob-new_1-1::OnGuardianDied1006";
--areamonster "new_2-1.gat",31,31,90,97,"RedSlime",1008, 24,"ConquestMob-new_2-1::OnGuardianDied1008";
--areamonster "new_2-1.gat",53,34,96,36,"RedSlime",1008, 6,"ConquestMob-new_2-1::OnGuardianDied1008b";
--areamonster "new_2-1.gat",31,31,90,97,"BlackScorpion",1009, 15,"ConquestMob-new_2-1::OnGuardianDied1009";
--areamonster "new_2-1.gat",84,52,93,91,"BlackScorpion",1009, 5,"ConquestMob-new_2-1::OnGuardianDied1009a";
--areamonster "new_3-1.gat",22,42,142,79,"Maggot",1002, 35,"ConquestMob-new_3-1::OnGuardianDied1002";
--areamonster "new_3-1.gat",22,42,142,79,"Scorpion",1003, 10,"ConquestMob-new_3-1::OnGuardianDied1003";
--areamonster "new_5-1.gat",32,32,90,100,"YellowSlime",1007, 20,"ConquestMob-new_5-1::OnGuardianDied1007";
--areamonster "new_5-1.gat",88,33,98,42,"RedSlime",1008, 3,"ConquestMob-new_5-1::OnGuardianDied1008a";
--areamonster "new_5-1.gat",32,32,90,100,"Spider",1012, 8,"ConquestMob-new_5-1::OnGuardianDied1012";
--areamonster "new_5-1.gat",81,32,85,38,"Spider",1012, 2,"ConquestMob-new_5-1::OnGuardianDied1012a";
--areamonster "new_7-1.gat",22,27,176,174,"Snake",1010, 15,"ConquestMob-new_7-1::OnGuardianDied1010";
--break;
--}
--new_1-1.gat,53,185,0	script	ConquestMob-new_1-1	-1,{
--// event when mob dies
--OnGuardianDied1004:
--	if (MPQUEST == 1) set Mobpt,Mobpt+42;
--	areamonster "new_1-1.gat",15,17,105,103,"RedScorpion",1004, 1,"ConquestMob-new_1-1::OnGuardianDied1004";
--	break;
--OnGuardianDied1005:
--	if (MPQUEST == 1) set Mobpt,Mobpt+5;
--	areamonster "new_1-1.gat",15,17,105,103,"GreenSlime",1005, 1,"ConquestMob-new_1-1::OnGuardianDied1005";
--	break;
--OnGuardianDied1006:
--	if (MPQUEST == 1) set Mobpt,Mobpt+14;
--	areamonster "new_1-1.gat",15,17,105,103,"GiantMaggot",1006, 1,"ConquestMob-new_1-1::OnGuardianDied1006";
--	break;
--}
--new_2-1.gat,53,185,0	script	ConquestMob-new_2-1	-1,{
--OnGuardianDied1008:
--	if (MPQUEST == 1) set Mobpt,Mobpt+18;
--	areamonster "new_2-1.gat",31,31,90,97,"RedSlime",1008, 1,"ConquestMob-new_2-1::OnGuardianDied1008";
--	break;
--OnGuardianDied1008b:
--	if (MPQUEST == 1) set Mobpt,Mobpt+18;
--	areamonster "new_2-1.gat",53,34,96,36,"RedSlime",1008, 1,"ConquestMob-new_2-1::OnGuardianDied1008b";
--	break;
--OnGuardianDied1009:
--	if (MPQUEST == 1) set Mobpt,Mobpt+45;
--	areamonster "new_2-1.gat",31,31,90,97,"BlackScorpion",1009, 1,"ConquestMob-new_2-1::OnGuardianDied1009";
--	break;
--OnGuardianDied1009a:
--	if (MPQUEST == 1) set Mobpt,Mobpt+45;
--	areamonster "new_2-1.gat",84,52,93,91,"BlackScorpion",1009, 1,"ConquestMob-new_2-1::OnGuardianDied1009a";
--	break;
--}
--new_3-1.gat,53,185,0	script	ConquestMob-new_3-1	-1,{
--OnGuardianDied1002:
--	if (MPQUEST == 1) set Mobpt,Mobpt+1;
--	areamonster "new_3-1.gat",22,42,142,79,"Maggot",1002, 1,"ConquestMob-new_3-1::OnGuardianDied1002";
--	break;
--OnGuardianDied1003:
--	if (MPQUEST == 1) set Mobpt,Mobpt+2;
--	areamonster "new_3-1.gat",22,42,142,79,"Scorpion",1003, 1,"ConquestMob-new_3-1::OnGuardianDied1003";
--	break;
--}
--new_5-1.gat,53,185,0	script	ConquestMob-new_5-1	-1,{
--OnGuardianDied1007:
--	if (MPQUEST == 1) set Mobpt,Mobpt+9;
--	areamonster "new_5-1.gat",32,32,90,100,"YellowSlime",1007, 1,"ConquestMob-new_5-1::OnGuardianDied1007";
--	break;
--// 3 Red Slimes guard treasure
--OnGuardianDied1008a:
--	if (MPQUEST == 1) set Mobpt,Mobpt+18;
--	areamonster "new_5-1.gat",88,33,98,42,"RedSlime",1008, 1,"ConquestMob-new_5-1::OnGuardianDied1008a";
--	break;
--OnGuardianDied1012:
--	if (MPQUEST == 1) set Mobpt,Mobpt+56;
--	areamonster "new_5-1.gat",32,32,90,100,"Spider",1012, 1,"ConquestMob-new_5-1::OnGuardianDied1012";
--	break;
--// 2 spiders guard entrance to treasure
--OnGuardianDied1012a:
--	if (MPQUEST == 1) set Mobpt,Mobpt+56;
--	areamonster "new_5-1.gat",81,32,85,38,"Spider",1012, 1,"ConquestMob-new_5-1::OnGuardianDied1012a";
--	break;
--}
--new_7-1.gat,53,185,0	script	ConquestMob-new_7-1	-1,{
--OnGuardianDied1010:
--	if (MPQUEST == 1) set Mobpt,Mobpt+51;
--	areamonster "new_7-1.gat",22,27,176,174,"Snake",1010, 1,"ConquestMob-new_7-1::OnGuardianDied1010";
--	break;
--}
- new_3-1.gat,46,66,0	script	MonsterGuide	102,{
- if(MPQUEST == 0) goto Register;
- 	mes "[Monster Guide]";
---- conf/map_athena.conf	2005-07-18 14:57:41.000000000 +0200
-+++ conf/map_athena.conf.new	2005-08-08 14:03:04.888080000 +0200
-@@ -57,7 +57,6 @@
- 
- // NPCs
- 
--npc: npc/tulimshar/monsters.txt
- npc: npc/tulimshar/barber.txt
- npc: npc/tulimshar/monster_guide.txt
- npc: npc/tulimshar/ptsrewards.txt
-@@ -68,10 +67,15 @@
- npc: npc/tulimshar/warps.txt
- npc: npc/tulimshar/shop.txt
- 
-+npc: npc/monsters/monsters-new_1-1.txt
-+npc: npc/monsters/monsters-new_2-1.txt
-+npc: npc/monsters/monsters-new_3-1.txt
-+npc: npc/monsters/monsters-new_5-1.txt
-+npc: npc/monsters/monsters-new_7-1.txt
-+
- npc: npc/tonori/cave.txt
- npc: npc/tonori/miners.txt
- npc: npc/tonori/warps.txt
--npc: npc/tonori/monsters.txt
- 
- npc: npc/guide.txt
- npc: npc/nekkio.txt
---- db/mob_db.txt	2005-07-15 10:25:21.000000000 +0200
-+++ db/mob_db.txt.new	2005-08-08 14:23:23.680617600 +0200
-@@ -10,6 +10,7 @@
- 1007,Yellow_slime,Yellow Slime,1,400,0,20,2,1,20,25,2,7,10,8,2,1,34,1,1,1,1,0,20,131,1400,1800,672,480,534,200,519,100,501,350,502,250,522,10,909,0,909,0,0,0,0,0,0,0,,,,,,
- 1008,Red_slime,Red Slime,1,400,0,65,56,1,30,50,2,7,15,10,2,1,25,1,1,1,1,0,20,135,1300,1500,672,480,1201,300,509,110,521,200,523,40,525,80,535,750,528,250,531,150,0,0,0,0,,,,,,
- 1009,BlackScorpion,Black Scorpion,1,1100,0,200,70,1,80,90,4,6,20,20,10,10,35,10,1,1,1,0,20,133,1000,1500,672,480,523,150,509,100,518,800,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
--1010,Snake,Snake,1,2000,0,172,70,1,150,80,4,6,20,20,10,10,35,10,2,1,1,0,20,133,1000,1500,672,480,0,0,0,0,0,0,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
-+1010,Snake,Snake,1,2200,0,250,120,1,150,80,4,6,15,25,10,10,45,5,2,1,1,0,20,133,1000,1500,672,480,524,50,527,500,0,0,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
- 1011,Fire_Goblin,Fire Goblin,1,50,0,3,2,1,7,10,0,5,1,1,1,0,6,30,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,800,502,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
- 1012,Spider,Spider,1,2000,0,230,90,1,150,80,4,6,20,20,10,10,35,10,2,1,1,0,25,175,1000,1500,672,480,537,500,535,100,0,0,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,
-+1013,SpiderRage,Raging Spider,1,3000,0,450,170,1,230,150,5,2,35,30,10,2,40,10,2,1,1,0,25,175,700,1500,672,480,537,1000,535,5000,0,0,909,0,909,0,909,0,909,0,0,0,0,0,0,0,,,,,,