summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-03-24 00:19:31 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-03-24 00:19:31 +0000
commitcd855784481681184a9ea7b161cd9ba60ae3c872 (patch)
tree756128570e0b88e99996f05e1fcf56d5c6f2c023
parent038bebe6e1d78029a9828a359fbe9574d2e26d7f (diff)
downloadhercules-cd855784481681184a9ea7b161cd9ba60ae3c872.tar.gz
hercules-cd855784481681184a9ea7b161cd9ba60ae3c872.tar.bz2
hercules-cd855784481681184a9ea7b161cd9ba60ae3c872.tar.xz
hercules-cd855784481681184a9ea7b161cd9ba60ae3c872.zip
* Fixed a couple bugs in the episode 13.x quests.
- Fixed Half-buried Gem#1 not re-enabling. (bugreport:4129) - Changed missed killmonsterall to killmonster. (bugreport:4131) * More bugfixing here, too! - Corrected the mode of the crystal monsters (removed MD_CANATTRACK). (bugreport:3962) - Implemented the full ice pick effect on the BG assassin damascus. (bugreport:4137) - Updated nagan_c, ballista_c, and Muramasa_c, and harp_of_nepenthes. (bugreport:4138) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14269 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/Changelog.txt5
-rw-r--r--db/item_db.txt10
-rw-r--r--db/mob_db.txt18
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/quests/quests_13_1.txt3
-rw-r--r--npc/quests/quests_13_2.txt7
6 files changed, 29 insertions, 18 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 715709df4..c10eb32fb 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -8,6 +8,11 @@
1475 Equestrian's Spear: NEED INFO.
13005 Angelic Wing Dagger: NEED INFO.
=======================
+2010/03/23
+ * Rev. 14269 More bugfixing here, too! [L0ne_W0lf]
+ - Corrected the mode of the crystal monsters (removed MD_CANATTRACK). (bugreport:3962)
+ - Implemented the full ice pick effect on the BG assassin damascus. (bugreport:4137)
+ - Updated nagan_c, ballista_c, and Muramasa_c, and harp_of_nepenthes. (bugreport:4138)
2010/03/11
* Rev. 14261 Corrected SP requirement for Poison React (bugreport:4116) [L0ne_W0lf]
2010/03/03
diff --git a/db/item_db.txt b/db/item_db.txt
index 1b0b40f46..5c47053c9 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -523,7 +523,7 @@
1170,Katzbalger,Katzbalger,4,20,,2000,175,,1,0,0x00004082,7,2,34,4,48,1,3,{ bonus bVit,5; bonus bDef,10; },{},{}
1171,Zweihander_,Zweihander,4,20,,2200,200,,1,2,0x00004082,7,2,34,4,48,1,3,{ bonus bUnbreakableWeapon,0; },{},{}
1172,Claymore_,Claymore,4,74000,,2500,180,,1,2,0x00004080,7,2,34,3,33,1,3,{},{},{}
-1173,Muramasa_C,Refined Muramasa,4,1,,0,204,,1,0,0x00004082,7,2,34,4,1,0,3,{ bonus bCritical,30; bonus bAspdRate,8; bonus2 bAddEff2,Eff_Curse,10; },{},{}
+1173,Muramasa_C,Refined Muramasa,4,1,,0,204,,1,0,0x00004082,7,2,34,4,1,0,3,{ bonus bCritical,30; bonus bAspdRate,8; },{},{}
1174,Executioner_C,Refined Executioner,4,2,,0,190,,1,0,0x00004082,7,2,34,4,1,0,3,{ bonus bIgnoreDefRace,RC_DemiHuman; bonus2 bAddRace,RC_DemiHuman,20; bonus2 bSubRace,RC_DemiHuman,-10; bonus bAtkEle,Ele_Dark; },{},{}
1175,Altas_Weapon,Blade of Atroce,4,20,,2000,200,,1,1,0x00004082,2,2,34,4,55,1,3,{ bonus bCritical,10; if(readparam(bStr)>=80) bonus bBreakArmorRate,500; },{},{}
1176,Muscle_Cutter,Muscle Cutter,4,20,,2200,160,,1,2,0x00004082,2,2,34,4,55,1,3,{ bonus2 bAddEff,Eff_Bleeding,800; bonus3 bAutoSpell,"AL_DECAGI",1,30; },{},{}
@@ -911,7 +911,7 @@
1725,Bow_Of_Minstrel,Minstrel Bow,4,20,,1700,120,,5,1,0x00080800,7,2,34,4,70,1,11,{ bonus bInt,2; bonus bSPrecovRate,10; },{},{}
1726,Hunter_Bow_,Hunter Bow,4,64000,,1500,125,,5,1,0x00000800,7,2,34,3,33,1,11,{},{},{}
1727,Balistar_,Ballista,4,124000,,3500,145,,5,1,0x00080800,7,2,34,4,77,1,11,{},{},{}
-1728,Balistar_C,Refined Ballista,4,1,,0,194,,5,0,0x00080800,7,2,34,4,1,0,11,{},{},{}
+1728,Balistar_C,Refined Ballista,4,1,,0,194,,5,0,0x00080800,7,2,34,4,1,0,11,{ bonus bLongAtkRate,40; },{},{}
1729,Bow_Of_Rudra_C,Refined Rudra Bow,4,2,,0,185,,5,0,0x000A0808,7,2,34,4,1,0,11,{ bonus bAtkEle,Ele_Holy; bonus bInt,5; skill "AL_CURE",1; skill "AL_HEAL",1; },{},{}
1730,Burning_Bow,Burning Bow,4,20,,1400,95,,5,1,0x000A0808,7,2,34,3,55,1,11,{ bonus2 bSubEle,Ele_Fire,10; if(isequipped(1752)) bonus bLongAtkRate,25; },{},{}
1731,Frozen_Bow,Freezing Bow,4,20,,1400,100,,5,1,0x000A0808,7,2,34,3,55,1,11,{ bonus2 bAddEff,Eff_Freeze,1000; if(isequipped(1754)) bonus bLongAtkRate,25; },{},{}
@@ -1009,7 +1009,7 @@
1923,BF_Instrument1,Valorous Battlefield Guitar,4,0,,0,50,,1,0,0x00080000,7,1,2,3,80,1,13,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
1924,BF_Instrument2,Brave Battlefield Guitar,4,0,,0,50,,1,0,0x00080000,7,1,2,3,80,1,13,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bSkillAtk,"CG_ARROWVULCAN",20; bonus bUnbreakableWeapon,0; },{},{}
1925,Chello,Cello,4,20,,700,110,,1,3,0x00080000,2,1,002,3,70,1,13,{ bonus bAgi,2; bonus bDex,3; bonus2 bAddSkillBlow,"BA_MUSICALSTRIKE",2; bonus2 bAddSkillBlow,"CG_ARROWVULCAN",3; },{},{}
-1926,Harp_Of_Nepenthes,Harp of Nepentis,4,20,,1000,120,,1,2,0x00080000,2,1,2,4,60,1,13,{ bonus bInt,2; bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,100; if( getrefine() >= 9 ) { bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,200; } },{},{}
+1926,Harp_Of_Nepenthes,Harp of Nepentis,4,20,,1000,120,,1,2,0x00080000,2,1,2,4,60,1,13,{ bonus bInt,2; bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,100; if( getrefine() > 9 ) { bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,200; } },{},{}
1927,Krieger_Instrument1,Glorious Guitar,4,0,,0,50,,1,0,0x00180000,7,1,2,4,80,1,13,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-4)*(getrefine()-4); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"CG_ARROWVULCAN","CG_TAROTCARD",5,100; },{},{}
1928,Berserk_Guitar_I,Berserk Guitar,4,0,,0,40,,1,0,0x00080000,2,1,2,4,0,1,13,{ bonus bAspdRate,100; bonus bHPrecovRate,-100; bonus2 bHPLossRate,50,5000; bonus bDex,-readparam(bDex); },{},{}
1929,Guitar_C,Guitar,4,0,,0,177,,1,0,0x00080000,7,1,2,3,1,0,13,{ bonus2 bAddSize,0,40; bonus2 bAddSize,1,40; bonus2 bAddSize,2,40; },{},{}
@@ -4491,7 +4491,7 @@
13034,Twilight_Desert,Desert Twilight,4,20,,600,130,,1,2,0x00001000,2,2,2,2,70,1,1,{ if (isequipped(13035)) { bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,2,30; autobonus "{ bonus bAspdRate,100; }",1,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; } },{},{}
13035,Sandstorm,Sandstorm,4,20,,600,50,,1,4,0x00001000,2,2,2,2,70,1,1,{},{},{}
13036,BF_Dagger1,Brave Assassin's Damascus,4,0,,0,120,,1,0,0x028F5EEF,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15; },{},{}
-13037,BF_Dagger2,Valorous Assassin's Damascus,4,0,,0,120,,1,0,0x029E7CEB,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; autobonus "{ bonus bDefRatioAtkRace,RC_NonBoss; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15; },{},{}
+13037,BF_Dagger2,Valorous Assassin's Damascus,4,0,,0,120,,1,0,0x029E7CEB,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; autobonus "{ bonus bDefRatioAtkRace,RC_Boss; bonus bDefRatioAtkRace,RC_NonBoss; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15; },{},{}
13038,Dagger_Of_Hunter,Dagger of Hunter,4,20,,700,120,,1,3,0x00020000,2,2,2,3,70,1,1,{ bonus bStr,1; bonus bAgi,2; bonus bDex,1; bonus4 bAutoSpellOnSkill,"RG_BACKSTAP","SM_BASH",100,10; bonus2 bSkillAtk,"RG_BACKSTAP",20; },{},{}
13039,Ivory_Knife,Ivory Knife,4,20,,700,130,,1,2,0x000F5EEE,2,2,2,3,50,1,1,{ bonus bAgi,2; bonus bAspdRate,3; bonus2 bAddEff,Eff_Bleeding,300; bonus3 bAutoSpell,"NPC_CRITICALWOUNDS",1,30;},{},{}
13040,N_Cutter,Novice Cutter,4,1,,0,50,,1,0,0xFE9F7EEF,7,2,2,1,1,0,1,{},{},{}
@@ -4584,7 +4584,7 @@
13404,Platinum_Shotel,Platinum Shotel,4,20,,1500,130,,1,1,0x000654E2,7,2,2,4,55,1,2,{ bonus bCritical,50; },{},{}
13405,Curved_Sword,Curved Blade,4,20,,800,125,,1,2,0x000654E2,7,2,2,4,55,1,2,{ bonus bAspdRate,10; bonus2 bAddEff,Eff_Curse,300; },{},{}
13406,Edger,Edger,4,20,,0,120,,1,0,0x000654E3,7,2,2,1,2,1,2,{ bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50; },{},{}
-13407,Nagan_C,Refined Nagan,4,,,0,148,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bDoubleRate,40; bonus2 bAddRace,RC_DemiHuman,5; },{},{}
+13407,Nagan_C,Refined Nagan,4,,,0,148,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bDoubleRate,25; bonus2 bAddRace,RC_DemiHuman,40; },{},{}
13408,Fire_Brand_C,Refined Fireblend,4,,,0,120,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Fire; bonus bInt,2; skill "MG_FIREBOLT",5; bonus3 bAutoSpell,"MG_FIREBOLT",5,100; },{},{}
13409,Immaterial_Sword_C,Refined Immaterial Sword,4,,,0,160,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Ghost; bonus2 bSPVanishRate,45,30; bonus bSPDrainValue,-1; bonus bUnbreakableWeapon,0; },{},{}
13410,BF_Sword1,Valorous Gladiator Blade,4,0,,0,115,,1,0,0x000654E3,7,2,2,3,80,1,2,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index f225182ff..11e0ce583 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -396,10 +396,10 @@
1392,ROTAR_ZAIRO,Rotar Zairo,Rotar Zairo,25,1209,0,351,215,10,109,137,4,34,1,62,45,26,55,5,10,12,2,0,44,0x2085,155,2416,2016,432,0,0,0,0,0,0,0,0,7126,500,2312,1,7053,1000,999,450,984,1,912,2500,910,5500,0,0,0,0,4192,1
1393,G_MUMMY,Mummy,Mummy,37,5176,0,0,0,1,305,360,0,10,28,19,32,0,63,20,10,12,1,1,49,0x3885,300,1772,72,384,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,0
1394,G_ZOMBIE,Zombie,Zombie,15,534,0,0,0,1,67,79,0,10,1,8,7,0,15,0,10,12,1,1,29,0x3885,400,2612,912,288,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,0
-1395,CRYSTAL_1,Wind Crystal,Wind Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,5097,7000,532,6500,558,5000,607,200,0,0,0,0
-1396,CRYSTAL_2,Earth Crystal,Earth Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,667,4900,5097,7000,531,6500,558,5000,608,250,0,0,0,0
-1397,CRYSTAL_3,Fire Crystal,Fire Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,5097,7000,534,6500,558,5000,604,300,0,0,0,0
-1398,CRYSTAL_4,Water Crystal,Water Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,5097,7000,533,6500,558,5000,603,100,0,0,0,0
+1395,CRYSTAL_1,Wind Crystal,Wind Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,5097,7000,532,6500,558,5000,607,200,0,0,0,0
+1396,CRYSTAL_2,Earth Crystal,Earth Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,667,4900,5097,7000,531,6500,558,5000,608,250,0,0,0,0
+1397,CRYSTAL_3,Fire Crystal,Fire Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,5097,7000,534,6500,558,5000,604,300,0,0,0,0
+1398,CRYSTAL_4,Water Crystal,Water Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,5097,7000,533,6500,558,5000,603,100,0,0,0,0
1399,EVENT_BAPHO,Baphomet,Baphomet,68,1264000,0,87250,27895,3,1847,2267,35,45,1,152,96,85,120,95,10,12,2,6,67,0x37B5,130,768,768,576,43625,10000,607,5500,526,5000,732,5000,1417,550,1306,680,1145,480,2110,640,2327,1500,2111,500,2621,1720,2256,1550,0,0,0,0
1400,KARAKASA,Karakasa,Karakasa,30,3092,0,489,322,1,141,183,1,5,1,45,12,20,49,60,10,12,1,0,60,0x81,155,1638,2016,576,0,0,0,0,0,0,0,0,7151,5000,7150,4268,1019,3200,7111,2200,912,4074,746,30,13012,5,0,0,0,0,4286,1
1401,SHINOBI,Shinobi,Shinobi,69,12700,0,4970,3010,2,460,1410,34,21,85,85,25,25,100,100,10,12,1,7,67,0x3695,150,1003,1152,336,0,0,0,0,0,0,0,0,7156,5335,2337,2,7053,2200,2654,100,2336,1,7157,2000,13013,5,0,0,0,0,4230,1
@@ -911,7 +911,7 @@
1874,BEELZEBUB_,Beelzebub,Beelzebub,98,6666666,0,6666666,6666666,2,10000,13410,40,40,6,110,200,250,166,66,10,12,2,6,88,0x37B5,100,212,504,432,3333333,10000,607,5500,617,5000,617,5000,7754,9000,2423,2000,1565,2000,2000,2000,2702,2000,985,5432,742,5500,0,0,0,0,4145,1
1875,TRISTAN_3RD,Tristan III,Dead King,80,43000,0,1,1,2,1366,1626,25,30,5,10,10,69,70,1,10,12,1,1,89,0x3695,175,1816,1152,360,0,0,0,0,0,0,0,0,7754,9000,938,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1876,E_LORD_OF_DEATH,Lord of the Dead,Lord of the Dead,99,99000000,0,131343,43345,3,3430,4232,75,73,120,120,120,169,150,106,10,12,2,6,67,0x37B5,180,1446,1296,360,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,0
-1877,CRYSTAL_5,Crystal,Crystal,1,15,0,0,0,0,0,10,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,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,0,0,0,0
+1877,CRYSTAL_5,Crystal,Crystal,1,15,0,0,0,0,0,10,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,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,0,0,0,0
1878,E_SHINING_PLANT,Shining Plant,Shining Plant,1,20,0,0,0,1,1,1,100,99,0,0,0,0,0,90,7,12,0,3,26,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,7864,3000,906,1500,511,500,507,2000,508,1500,914,500,0,0,0,0,0,0,0,0
1879,ECLIPSE_P,Eclipse Pet,Eclipse,6,1800,0,0,0,1,20,26,0,40,1,36,6,0,11,80,10,12,1,2,60,0x37B5,200,1456,456,336,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,0
// Moscovia monsters
@@ -991,10 +991,10 @@
1949,B_S_GUARDIAN_,Camp Guardian,Camp Guardian,86,152533,0,0,0,2,7590,1550,60,33,110,40,54,65,125,65,14,16,2,7,80,0x20A5,170,140,384,288,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,0
1950,B_B_GUARDIAN_,Camp Guardian,Camp Guardian,80,80404,0,0,0,12,1840,680,40,62,95,80,33,90,165,55,14,16,2,7,80,0x20A5,170,76,384,288,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,0
// Ravies Sister's 'Valyrie's Gift' monsters.
-1951,CRYSTAL_6,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,0,0,532,6500,558,5000,607,200,0,0,0,0
-1952,CRYSTAL_7,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,667,4900,0,0,531,6500,558,5000,608,250,0,0,0,0
-1953,CRYSTAL_8,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,0,0,534,6500,558,5000,604,300,0,0,0,0
-1954,CRYSTAL_9,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,0,0,533,6500,558,5000,603,100,0,0,0,0
+1951,CRYSTAL_6,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,665,4900,0,0,532,6500,558,5000,607,200,0,0,0,0
+1952,CRYSTAL_7,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,667,4900,0,0,531,6500,558,5000,608,250,0,0,0,0
+1953,CRYSTAL_8,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,664,4900,0,0,534,6500,558,5000,604,300,0,0,0,0
+1954,CRYSTAL_9,Crystal,Crystal,1,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x161,190,0,0,0,0,0,0,0,0,0,0,0,539,3800,530,4500,561,5000,666,4900,0,0,533,6500,558,5000,603,100,0,0,0,0
// ?
1955,TREASURE_BOX_I,Treasure Chest,Treasure Chest,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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,0
// Endless Tower
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 68b5cf3b6..36c88d854 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
Date Added
======
+2010/03/23
+ * Rev. 14269 Fixed a couple bugs in the episode 13.x quests. [L0ne_W0lf]
+ - Fixed Half-buried Gem#1 not re-enabling. (bugreport:4129)
+ - Changed missed killmonsterall to killmonster. (bugreport:4131)
2010/03/22
* Removed unnecessary event call on a missing event. (bugreport:4140) [Paradox924X]
2010/03/13
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 4715f79ac..8bd0f22f5 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -30,6 +30,7 @@
//= 1.2 Fixed missing ends, wrong label and some typos [Gepard]
//= 1.3 Added the two remaining 13.1 quests. [L0ne_W0lf]
//= Cat Hand Agents no longer ignore you with 300+ points.
+//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
//============================================================
// Onward to the New World
@@ -13530,7 +13531,7 @@ OnDisable:
end;
OnTimer600000:
- killmonsterall "spl_fild02";
+ killmonster "spl_fild02","ep13_spl_fild02_mon_edq::OnMyMobDead";
stopnpctimer;
donpcevent "ep13_spl_fild02_mon_edq::OnEnable";
end;
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index e3d6d28ee..88282b2f2 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -13,6 +13,7 @@
//===== Additional Comments: =================================
//= 1.0 First version
//= 1.1 Fixed unidentified_coin -> unidentified_mineral. (bugreport:4086)
+//= 1.2 Fixed Half-buried Gem#1 not re-enabling. (bugreport:4129)
//============================================================
// Cat Hand Addition. (Leads to 13.2 areas)
@@ -3691,11 +3692,11 @@ spl_fild02,27,218,0 script Half-buried Gem#1 844,{
OnInit:
- hideoffnpc "Half-buried Gem#ep132_rhea04";
+ hideoffnpc "Half-buried Gem#1";
end;
OnEnable:
- hideoffnpc "Half-buried Gem#ep132_rhea04";
+ hideoffnpc "Half-buried Gem#1";
stopnpctimer;
end;