diff options
| -rw-r--r-- | db/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/item_db.txt | 4 | ||||
| -rw-r--r-- | npc/Changelog.txt | 2 | ||||
| -rw-r--r-- | npc/quests/eye_of_hellion.txt | 10 | ||||
| -rw-r--r-- | npc/warps/fields/man_fild.txt | 4 | ||||
| -rw-r--r-- | npc/warps/fields/spl_fild.txt | 7 |
6 files changed, 17 insertions, 12 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt index 03c07f8f0..8a62e5484 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -44,6 +44,8 @@ ======================= 2008/05/31 + * Rev. 12750 Fixed Slotted Grand cross not enabling TU 3. (bugreport:1563) [L0ne_W0lf] + * Fixed assassin robe set checking for the wrong item. (bugreport:1576) * Rev. 12749 Implemented some of the 13.1 equipment (no weapons yet.) [L0ne_W0lf] * Added sprite ID and names for the 13.1 monsters. (no stats) 2008/05/28 diff --git a/db/item_db.txt b/db/item_db.txt index cdb57c3c8..c7f3cdd33 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -769,7 +769,7 @@ 1537,Quadrille_C,Refined Quadrille,4,,0,0,193,,1,0,0x00008110,7,2,2,4,1,0,8,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddEle,Ele_Earth,10; },{},{} 1538,Spike_,Spike,4,,10,700,85,,1,2,0x00008110,7,2,2,4,40,1,8,{ bonus bCritical,40; bonus bDefRate,-67; bonus bDef2Rate,-67; },{},{} 1539,Golden_Mace_,Golden Mace,4,,10,800,110,,1,2,0x00008110,7,2,2,4,40,1,8,{ bonus2 bAddRace,RC_Undead,10; bonus bUnbreakableWeapon,0; },{},{} -1540,Grand_Cross_,Grand Cross,4,,10,1500,140,,1,1,0x00008110,7,2,2,4,40,1,8,{ bonus bAtkEle,Ele_Holy; bonus3 bAutoSpell,77,3,100; bonus2 bSPDrainValueRace,RC_Undead,1; bonus2 bSPGainRace,RC_Undead,3; },{},{} +1540,Grand_Cross_,Grand Cross,4,,10,1500,140,,1,1,0x00008110,7,2,2,4,40,1,8,{ bonus bAtkEle,Ele_Holy; skill 77,3; bonus3 bAutoSpell,77,3,100; bonus2 bSPDrainValueRace,RC_Undead,1; bonus2 bSPGainRace,RC_Undead,3; },{},{} 1541,Nemesis,Nemesis,4,,,900,120,,1,3,0x00008110,7,2,2,4,60,1,8,{ bonus3 bAutoSpell,32,1+getrefine(),100; bonusautoscript "{ sc_start SC_INCBASEATK,20000,50; }",10; },{},{} 1542,Millitant_Morning_Star,Millitant Morning Star,4,,0,0,105,,1,0,0x0004C5B3,7,2,2,3,80,1,8,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; },{},{} 1543,Millitant_Morning_Star_,Millitant Morning Star,4,,0,0,105,,1,0,0x0004C5B3,7,2,2,3,80,1,8,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; },{},{} @@ -1199,7 +1199,7 @@ 2375,Lucifer_Armor,Diablos Armor,5,20,,600,,7,,1,0x000654E2,2,2,16,0,0,1,0,{ bonus bStr,2; bonus bDex,1; bonus bMaxHP,150; bonus2 bResEff,Eff_Stun,500; bonus2 bResEff,Eff_Stone,500; if (isequipped(2729)) bonus bAtkRate,3; bonus bMatkRate,3; },{},{} 2376,General's_Plate_Mail,General's Plate Mail,5,,,0,,7,,1,0x006444A2,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bVit,3; bonus bMaxHPRate,12; bonus2 bAddItemHealRate,IG_Recovery,10; bonusautoscript "{ sc_start4 SC_HPREGEN,10000,600,1,0,0; }",10,BF_WEAPON; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{} 2377,Elite_Engineer's_Armor,Elite Engineer's Armor,5,,,0,,7,,1,0x00040420,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,42,20; bonus2 bSkillHeal,231,10; bonus bUnbreakableArmor,0; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{} -2378,Assassin's_Robe,Assassin's Robe,5,,,0,,7,,1,0x00021040,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bAgi,3; bonus bCritical,3; bonus bMaxHPRate,12; bonusautoscript "{ sc_start4 SC_HPREGEN,10000,300,1,0,0; }",10,BF_WEAPON; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{} +2378,Assassin's_Robe,Assassin's Robe,5,,,0,,7,,1,0x00021040,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bAgi,3; bonus bCritical,3; bonus bMaxHPRate,12; bonusautoscript "{ sc_start4 SC_HPREGEN,10000,300,1,0,0; }",10,BF_WEAPON; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{} 2379,Wolong's_Battle_Robe,Wolong's Battle Robe,5,,,0,,3,,1,0x00010204,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; bonus2 bAddEffWhenHit,Eff_Stone,100; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{} 2380,Robe_of_Order,Robe of Order,5,,,0,,3,,1,0x00008110,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bcastRate,156,-50; bonus2 bSkillHeal,28,6; bonus2 bSkillHeal,70,6; bonus2 bAddEffWhenHit,Eff_Stone,100; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{} 2381,Elite_Marksman_Suit,Elite Marksman Suit,5,,,0,,3,,1,0x00180808,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{} diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 9cad8ee04..47ea2dbcd 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,8 @@ Date Added ====== 2008/05/31 + * Rev. 12750 Fixed bug in eye of hellion quests (bugreport:1581) [L0ne_W0lf] + * Fixed the position of one of the Splendid (spl) warps. (Bugreport:1585) * Rev. 12749 Small update to the novice grounds, by Kisuka. [L0ne_W0lf] * Corrected some typos errors in Gunslinger Quest. (bugreport:1549) [Samuray22] * Corrected some "mes" without the getitemname in Sage Quest. (bugreport:1564) diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 7cb76b69c..49adbaaf0 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -18,6 +18,7 @@ //= Tracking variable is not backwards compatable meaning //= you can again repeat this quest from the start. //= 1.6 Fixed issue with #prt_key-1-1. [L0ne_W0lf] +//= 1.7 Corrected reminants from aegis conversion. [L0en_w0lf] //============================================================ morocc_in,116,101,3 script Old Scholar Tyus#hellion 735,3,3,{ @@ -665,8 +666,7 @@ morocc_in,116,101,3 script Old Scholar Tyus#hellion 735,3,3,{ mes "You still have the Hellion's Eye."; mes "I can see the pain in your eyes."; mes "Let me lighten your burden. It will be better this way."; - set eyes,v[Eye_Of_Hellion]; - delitem 7337,eyes; //Eye_Of_Hellion + delitem 7337,countitem(7337); //Eye_Of_Hellion next; mes "[Sir Chilias'Tyus]"; mes "May God bless you."; @@ -1143,7 +1143,7 @@ OnTouch: mes "didn't get it:^4D4DFF 3847147298^000000."; mes "Don't forget it, adventurer."; next; - mes "["+ name +"]"; + mes "["+ strcharinfo(0) +"]"; mes "Wait... What does"; mes "this all mean? Won't"; mes "you tell me more?"; @@ -1159,7 +1159,7 @@ OnTouch: else if (HELLIONQ == 41) set HELLIONQ,43; next; - mes "["+ name +"]"; + mes "["+ strcharinfo(0) +"]"; mes "Holy cow..."; mes "This is all"; mes "really cloak and"; diff --git a/npc/warps/fields/man_fild.txt b/npc/warps/fields/man_fild.txt index 778dd2d27..f61c1d29c 100644 --- a/npc/warps/fields/man_fild.txt +++ b/npc/warps/fields/man_fild.txt @@ -1,5 +1,5 @@ //===== eAthena Script ======================================= -//= Another World Warp Script +//= Manuk Field Warp Script //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= -//= Warp Points for Another World +//= Warp Points for Manuk Field //===== Additional Comments: ================================= //= 1.0 First Version. //============================================================ diff --git a/npc/warps/fields/spl_fild.txt b/npc/warps/fields/spl_fild.txt index 47f2fbc45..a11ed0016 100644 --- a/npc/warps/fields/spl_fild.txt +++ b/npc/warps/fields/spl_fild.txt @@ -1,5 +1,5 @@ //===== eAthena Script ======================================= -//= Another World Warp Script +//= Splendid Field Warp Script //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== @@ -7,16 +7,17 @@ //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= -//= Warp Points for Another World +//= Warp Points for Splendid //===== Additional Comments: ================================= //= 1.0 First Version. +//= 1.1 Fixed misplaced warp. [L0ne_W0lf] //============================================================ mid_camp,12,142,0 warp spl_fild02-1 1,1,spl_fild02,378,144 spl_fild02,382,144,0 warp spl_fild02-2 1,1,mid_camp,16,142 mid_camp,9,216,0 warp spl_fild02-3 1,1,spl_fild02,378,215 spl_fild02,382,215,0 warp spl_fild02-4 1,1,mid_camp,16,216 -spl_fild02,295,5,0 warp spl_fild02-5 1,1,spl_fild03,205,375 +spl_fild02,295,5,0 warp spl_fild02-5 1,1,spl_fild03,305,375 spl_fild02,97,24,0 warp spl_fild02-6 1,1,spl_fild03,105,369 spl_fild03,305,379,0 warp spl_fild03-1 1,1,spl_fild02,298,9 spl_fild03,105,373,0 warp spl_fild03-2 1,1,spl_fild02,97,29 |