From 19a56fd4f87cd4f0832df75e6b78b6180de3eee7 Mon Sep 17 00:00:00 2001 From: daegaladh Date: Sat, 21 Jul 2012 14:09:55 +0000 Subject: Follow up r16459, enabled Warlock quest Bradium Golem and Naga on pre-re mob_db and moved the spawns to the warlock quest script. (bugreport:6290) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16463 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/pre-re/mob_db.txt | 4 ++-- npc/pre-re/mobs/fields/splendide.txt | 2 -- npc/re/jobs/3-1/warlock.txt | 5 ++++- npc/re/mobs/fields/splendide.txt | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/db/pre-re/mob_db.txt b/db/pre-re/mob_db.txt index db0bcf384..28f87d707 100644 --- a/db/pre-re/mob_db.txt +++ b/db/pre-re/mob_db.txt @@ -1104,9 +1104,9 @@ 2045,MAGICDECOY_EARTH,Magic Decoy,Magic Decoy,100,2500,0,0,0,7,150,150,16,60,10,10,10,100,50,10,10,12,1,0,22,0x84,2000,504,1020,360,0,0,0,0,0,0,0,999,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 2046,MAGICDECOY_WIND,Magic Decoy,Magic Decoy,100,2500,0,0,0,7,150,150,16,60,10,10,10,100,50,10,10,12,1,0,24,0x84,2000,504,1020,360,0,0,0,0,0,0,0,999,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -//2047,W_NAGA,Naga,Naga,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,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 +2047,W_NAGA,Naga,Naga,99,46708,0,0,0,3,492,605,61,15,113,42,30,18,122,13,10,12,2,2,42,0x3695,150,400,864,432,0,0,0,0,0,0,0,0,0,0,0,0,0,926,5000,0,0,0,0,0,0,0,0,0,0,0,0 //2048,W_PINGUICULA_D,Dark Pinguicula,Dark Pinguicula,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,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 -//2049,W_BRADIUM_GOLEM,Bradium Golem,Bradium Golem,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,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 +2049,W_BRADIUM_GOLEM,Bradium Golem,Bradium Golem,99,45200,0,0,0,1,720,886,125,18,0,10,82,2,60,12,10,12,2,0,42,0x3895,300,1008,1200,540,0,0,0,0,0,0,0,0,0,0,0,6090,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2050,W_AQUA_ELEMENTAL,Aqua Elemental,Aqua Elemental,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,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 //2051,E_BAPHOMET,Baphomet,Baphomet,1,1,0,0,0,1,1,2,1,0,1,1,1,1,1,1,10,12,2,6,20,0x120,100,768,768,576,0,0,0,0,0,0,0,12396,5000,12397,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2052,E_DARK_LORD,Dark Lord,Dark Lord,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,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 diff --git a/npc/pre-re/mobs/fields/splendide.txt b/npc/pre-re/mobs/fields/splendide.txt index cdd36fdec..fa7e850cb 100644 --- a/npc/pre-re/mobs/fields/splendide.txt +++ b/npc/pre-re/mobs/fields/splendide.txt @@ -22,8 +22,6 @@ spl_fild01,0,0,0,0 monster Cornus 1992,25,5000,0,0 // spl_fild02 - Splendide Field //================================================== spl_fild02,0,0,0,0 monster Pinguicula 1995,75,5000,0,0 -spl_fild02,0,0,0,0 monster Bradium Golem 2024,20,5000,0,0 -spl_fild02,0,0,0,0 monster Naga 1993,20,5000,0,0 spl_fild02,0,0,0,0 monster Luciola Vespa 1994,15,5000,0,0 //================================================== diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 8c517c991..5ccfdd1aa 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -2106,4 +2106,7 @@ job3_war01,1,2,0 script ??? 66,{ close; } } -*/ \ No newline at end of file +*/ + +spl_fild02,0,0,0,0 monster Bradium Golem 2049,20,5000,0,0 +spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0 \ No newline at end of file diff --git a/npc/re/mobs/fields/splendide.txt b/npc/re/mobs/fields/splendide.txt index a3f6bc057..c9f41b1e7 100644 --- a/npc/re/mobs/fields/splendide.txt +++ b/npc/re/mobs/fields/splendide.txt @@ -22,8 +22,6 @@ spl_fild01,0,0,0,0 monster Cornus 1992,25,5000,0,0 // spl_fild02 - Splendide Field //================================================== spl_fild02,0,0,0,0 monster Pinguicula 1995,75,5000,0,0 -spl_fild02,0,0,0,0 monster Bradium Golem 2024,20,5000,0,0 -spl_fild02,0,0,0,0 monster Naga 1993,20,5000,0,0 spl_fild02,0,0,0,0 monster Luciola Vespa 1994,15,5000,0,0 //================================================== -- cgit v1.2.3-70-g09d2