summaryrefslogblamecommitdiff
path: root/src/xand1_1.patch
blob: 5715664802c2c2d2563e3f91b779156cf3762778 (plain) (tree)



































































































































                                                                                                                                                                                   
--- 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,,,,,,