Ver código fonte

Minor updates.
* Added Cryptura Academy monster spawns, commented until the scripts are implemented. Does not include monsters from job quests.
* Fixed two label errors in Wizard job quest. (bugreport:8590)
http://rathena.org/board/tracker/issue-8590-wizard-job-quest-label-error/
* Updated AUTHORS file. (credits to AnnieRuru and Keyworld for providing some missing names)
* Uncommented a mapflag in custom 'mvp_ladder' script. (credits: AnnieRuru)

Signed-off-by: Euphy <euphy.raliel@rathena.org>

Euphy 11 anos atrás
pai
commit
0724d1ebab

+ 8 - 0
AUTHORS

@@ -5,6 +5,7 @@ Thank you for all your hard work.
 3CeAM Dev Team
 Athena Dev Team
 eAthena Dev Team
+Freya Dev Team
 Hercules Dev Team
 Project YARE Team
 rAthena Dev Team
@@ -122,6 +123,7 @@ Katrinn
 Kayla
 Kenpachi
 Kevin
+KeyWorld
 killercube
 Kisuka
 KitsuneStarwind
@@ -184,6 +186,7 @@ non
 npc
 nsstrunks
 nyankochan
+orn
 p
 Paradox924X
 Peter Kieser
@@ -205,9 +208,11 @@ Sanasol
 Sapientia
 Sara
 Sel
+Seventh
 shadow
 shadoweathena
 shadowlady
+Shazeya
 Shinigami
 shinomori
 Shinryo
@@ -233,8 +238,10 @@ Tharis
 Theia
 theultramage
 tk44
+ToastOfDoom
 toms
 Toshi^2
+Trancid
 Trojal
 Tsuyuki
 V&S
@@ -246,6 +253,7 @@ Wizputer
 Wolf
 Xantara
 Xgear
+Yhn
 Yommy
 Yor
 Yuuki

+ 1 - 1
db/re/mob_db.txt

@@ -1549,7 +1549,7 @@
 //2395,SEIREN
 //2396,POSEIDON
 //2397,KRAKEN_BABY
-//2398,LITTLE_PORING
+2398,LITTLE_PORING,Little Poring,Little Poring,1,40,1,18,10,1,8,9,2,5,6,1,1,0,6,5,10,12,0,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,9000,1202,100,938,1000,512,5000,507,1000,512,500,507,1000,0,0,0,0,4545,1
 //2399,E_MINI_DEMON
 //2400,E_DIABOLIC
 2401,G_PORING,Poring,Poring,1,60,1,0,0,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,480,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

+ 1 - 1
npc/custom/events/mvp_ladder.txt

@@ -300,7 +300,7 @@ OnInit:
 		mf_nomemo,
 		mf_noteleport,
 //		mf_nopenalty, // disable exp loss
-//		mf_noreturn,
+		mf_noreturn,
 //		mf_nobranch,
 //		mf_nomobloot, // disable monster drop loots,
 //		mf_nomvploot, // 2 of these

+ 2 - 2
npc/jobs/2-1/wizard.txt

@@ -1414,7 +1414,7 @@ OnTimer60000:
 	end;
 
 OnTimer61000:
-	donpcevent "Room of Earth#Failed::OnEnable";
+	enablenpc "Room of Earth#Failed";
 	end;
 
 OnTimer62000:
@@ -1520,7 +1520,7 @@ OnTimer183000:
 	end;
 
 OnTimer184000:
-	donpcevent "Room of Fire#Failed::OnEnable";
+	enablenpc"Room of Fire#Failed";
 	end;
 
 OnTimer185000:

+ 101 - 0
npc/re/mobs/academy.txt

@@ -0,0 +1,101 @@
+//===== rAthena Script =======================================
+//= Cryptura Academy Monster Spawn Script
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= rAthena Project
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+//==================================================
+// prt_fild08 - Prontera Field 
+//==================================================
+prt_fild08,0,0,0,0	monster	Poring	1002,110,5000,0,0
+prt_fild08,0,0,0,0	monster	Lunatic	1063,100,5000,0,0
+prt_fild08,0,0,0,0	monster	Fabre	1007,100,5000,0,0
+prt_fild08,0,0,0,0	monster	Little Poring	2398,30,50000,0,0
+prt_fild08a,0,0,0,0	monster	Poring	1002,110,5000,110,0,0
+prt_fild08a,0,0,0,0	monster	Lunatic	1063,100,5000,0,0
+prt_fild08a,0,0,0,0	monster	Fabre	1007,100,5000,0,0
+prt_fild08a,0,0,0,0	monster	Little Poring	2398,30,50000,0,0
+prt_fild08b,0,0,0,0	monster	Poring	1002,110,5000,110,0,0
+prt_fild08b,0,0,0,0	monster	Lunatic	1063,100,5000,0,0
+prt_fild08b,0,0,0,0	monster	Fabre	1007,100,5000,0,0
+prt_fild08b,0,0,0,0	monster	Little Poring	2398,30,50000,0,0
+prt_fild08c,0,0,0,0	monster	Poring	1002,110,5000,110,0,0
+prt_fild08c,0,0,0,0	monster	Lunatic	1063,100,5000,0,0
+prt_fild08c,0,0,0,0	monster	Fabre	1007,100,5000,0,0
+prt_fild08c,0,0,0,0	monster	Little Poring	2398,30,50000,0,0
+prt_fild08d,0,0,0,0	monster	Poring	1002,110,5000,110,0,0
+prt_fild08d,0,0,0,0	monster	Lunatic	1063,100,5000,0,0
+prt_fild08d,0,0,0,0	monster	Fabre	1007,100,5000,0,0
+prt_fild08d,0,0,0,0	monster	Little Poring	2398,30,50000,0,0
+
+//==================================================
+// treasure_n1 - Izlude Sunken Ship 1F
+//==================================================
+treasure_n1,0,0,0,0	monster	Red Mushroom	1085,10,50000,0,0
+treasure_n1,0,0,0,0	monster	Black Mushroom	1084,10,50000,0,0
+treasure_n1,160,54,13,13	monster	Red Mushroom	1085,10,50000,0,0
+treasure_n1,160,54,13,13	monster	Black Mushroom	1084,10,50000,0,0
+treasure_n1,160,54,13,13	monster	Dead Plankton	2404,10,50000,0,0
+treasure_n1,0,0,0,0	monster	Red Plant	1078,5,50000,0,0
+treasure_n1,0,0,0,0	monster	Green Plant	1080,5,50000,0,0
+treasure_n1,0,0,0,0	monster	Yellow Plant	1081,5,50000,0,0
+treasure_n1,0,0,0,0	monster	Blue Plant	1079,5,50000,0,0
+treasure_n1,0,0,0,0	monster	White Plant	1082,5,50000,0,0
+treasure_n1,0,0,0,0	monster	Zombie	1015,1,100000,0,0
+treasure_n1,0,0,0,0	monster	Zombie	1015,1,100000,0,0
+treasure_n1,68,47,9,9	monster	Weak Skeleton	2405,4,8000,0,0
+treasure_n1,106,42,9,9	monster	Roda Frog	1012,3,60000,0,0
+treasure_n1,32,37,9,9	monster	Roda Frog	1012,6,60000,0,0
+treasure_n1,69,112,9,9	monster	Spore	1014,3,20000,0,0
+treasure_n1,35,112,9,9	monster	Spore	1014,3,20000,0,0
+treasure_n1,35,112,9,9	monster	Roda Frog	1012,3,20000,0,0
+treasure_n1,111,111,9,9	monster	Roda Frog	1012,3,60000,0,0
+treasure_n1,111,111,9,9	monster	Dead Plankton	2404,5,60000,0,0
+treasure_n1,69,174,9,9	monster	Dead Plankton	2404,7,120000,0,0
+treasure_n1,82,155,9,9	monster	Spore	1014,4,60000,0,0
+treasure_n1,55,155,9,9	monster	Spore	1014,2,60000,0,0
+treasure_n1,22,160,0,0	monster	Weak Skeleton	2405,3,8000,0,0
+treasure_n1,163,155,13,13	monster	Weak Skeleton	2405,5,8000,0,0
+treasure_n1,163,155,13,13	monster	Zombie	1015,1,8000,0,0
+
+//==================================================
+// treasure_n2 - Izlude Sunken Ship 2F
+//==================================================
+treasure_n2,0,0,0,0	monster	Red Mushroom	1085,10,50000,0,0
+treasure_n2,0,0,0,0	monster	Black Mushroom	1084,10,50000,0,0
+treasure_n2,150,40,13,13	monster	Weak Soldier Skeleton	2406,3,50000,0,0
+treasure_n2,150,40,13,13	monster	Weak Skeleton	2405,5,50000,0,0
+treasure_n2,0,0,0,0	monster	Red Plant	1078,5,50000,0,0
+treasure_n2,0,0,0,0	monster	Green Plant	1080,5,50000,0,0
+treasure_n2,0,0,0,0	monster	Yellow Plant	1081,5,50000,0,0
+treasure_n2,0,0,0,0	monster	Blue Plant	1079,5,50000,0,0
+treasure_n2,0,0,0,0	monster	White Plant	1082,5,50000,0,0
+treasure_n2,100,50,13,13	monster	Weak Skeleton	2405,7,30000,0,0
+treasure_n2,100,50,13,13	monster	Dead Plankton	2404,5,30000,0,0
+treasure_n2,50,40,13,13	monster	Weak Soldier Skeleton	2406,3,50000,0,0
+treasure_n2,50,40,13,13	monster	Weak Skeleton	2405,5,50000,0,0
+treasure_n2,40,75,5,3	monster	Zombie	1015,2,60000,0,0
+treasure_n2,40,75,5,5	monster	Dead Plankton	2404,4,60000,0,0
+treasure_n2,50,140,5,5	monster	Weak Skeleton	2405,10,60000,0,0
+treasure_n2,50,140,5,5	monster	Weak Soldier Skeleton	2406,5,60000,0,0
+treasure_n2,160,140,5,5	monster	Weak Skeleton	2405,5,60000,0,0
+treasure_n2,160,140,5,5	monster	Weak Soldier Skeleton	2406,3,60000,0,0
+treasure_n2,160,140,5,2	monster	Zombie	1015,3,60000,0,0
+treasure_n2,160,70,13,13	monster	Weak Skeleton	2405,5,30000,0,0
+treasure_n2,160,70,13,13	monster	Dead Plankton	2404,7,30000,0,0
+treasure_n2,155,40,9,9	monster	Zombie	1015,3,120000,0,0
+treasure_n2,100,85,13,13	monster	Weak Soldier Skeleton	2406,2,50000,0,0
+treasure_n2,100,160,13,13	monster	Weak Soldier Skeleton	2406,5,120000,0,0
+treasure_n2,100,160,13,13	monster	Weak Skeleton	2405,7,200000,0,0
+treasure_n2,100,160,13,13	monster	Dead Plankton	2404,4,60000,0,0
+
+//==================================================
+// new_1-3 - Novice Training Grounds
+//==================================================
+new_1-3,0,0,0,0	monster	Little Poring	2398,30,50000,0,0

+ 1 - 0
npc/re/scripts_monsters.conf

@@ -2,6 +2,7 @@
 // -                   Renewal Monster Scripts                  -
 // --------------------------------------------------------------
 
+//npc: npc/re/mobs/academy.txt
 npc: npc/re/mobs/citycleaners.txt
 npc: npc/re/mobs/towns.txt
 

+ 1 - 1
sql-files/mob_db_re.sql

@@ -1615,7 +1615,7 @@ REPLACE INTO `mob_db_re` VALUES (2380,'XMAS_SMOKEY_GIFT','Smokey Gift','Smokey G
 #2395,SEIREN
 #2396,POSEIDON
 #2397,KRAKEN_BABY
-#2398,LITTLE_PORING
+REPLACE INTO `mob_db_re` VALUES (2398,'LITTLE_PORING','Little Poring','Little Poring',1,40,1,18,10,1,8,9,2,5,6,1,1,0,6,5,10,12,0,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,909,9000,1202,100,938,1000,512,5000,507,1000,512,500,507,1000,0,0,0,0,4545,1);
 #2399,E_MINI_DEMON
 #2400,E_DIABOLIC
 REPLACE INTO `mob_db_re` VALUES (2401,'G_PORING','Poring','Poring',1,60,1,0,0,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,480,672,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);