diff options
author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-08-26 22:47:28 +0000 |
---|---|---|
committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-08-26 22:47:28 +0000 |
commit | f83fd90579f5258ff145f9685499b67c5cd1fc68 (patch) | |
tree | 3160a65314e936898791cd2705d952f4241c8dc4 /db | |
parent | 829350723346e4dda27c4eaf3395c3d36f12c409 (diff) | |
download | hercules-f83fd90579f5258ff145f9685499b67c5cd1fc68.tar.gz hercules-f83fd90579f5258ff145f9685499b67c5cd1fc68.tar.bz2 hercules-f83fd90579f5258ff145f9685499b67c5cd1fc68.tar.xz hercules-f83fd90579f5258ff145f9685499b67c5cd1fc68.zip |
* instance_npcname will now error if the NPC being looked up is not found, care of ramsey.
* delitem/2 will now send the close button when failing to find all neccecary items to delete.
- Still do to, items should not be deleted as-found, and should be deleted once counted
and in the event of delitem failure, nothing should be consumed. This is a design flaw
in eathena, and should be fixed as soon as possible.
* Implemented the Endless Tower instance.
* Updated announces and dialogs in KVM.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14395 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r-- | db/item_db.txt | 2 | ||||
-rw-r--r-- | db/quest_db.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/db/item_db.txt b/db/item_db.txt index 0ba2c20a1..310a02d54 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -1289,7 +1289,7 @@ 2380,Medic_Robe,Medic's Robe,5,0,,0,,3,,1,0x00008110,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539,2436)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bCastrate,156,-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }; },{},{} 2381,Elite_Archer_Suit,Elite Archer Suit,5,0,,0,,3,,1,0x00080808,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539,2436)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }; },{},{} 2382,Elite_Shooter_Suit,Elite Shooter Suit,5,0,,0,,3,,1,0x01000000,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2540,2437)) { bonus2 bSubRace,RC_NonDemiHuman,-300; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }; },{},{} -2383,Brynhild,Brynhild,5,0,,400,,,,0,0xFFFFFFFF,7,2,16,,94,0,0,{ bonus bMdef,10; bonus bMaxHP,20*BaseLevel; bonus bMaxSP,5*BaseLevel; bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatkRate,10; bonus bUnbreakableArmor,0; bonus bNoKnockback,0; },{},{} +2383,Brynhild,Brynhild,5,0,,400,,10,,0,0xFFFFFFFF,7,2,16,,94,0,0,{ bonus bMdef,10; bonus bMaxHP,20*BaseLevel; bonus bMaxSP,5*BaseLevel; bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatkRate,10; bonus bUnbreakableArmor,0; bonus bNoKnockback,0; },{},{} 2384,Spritual_Tunic,Spiritual Tunic,5,20,,0,,10,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus bMaxHP,800; bonus2 bResEff,Eff_Freeze,10000; bonus2 bSubEle,Ele_Earth,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Wind,20; bonus2 bSubEle,Ele_Poison,20; bonus2 bSubEle,Ele_Holy,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Ghost,20; bonus2 bSubEle,Ele_Undead,20; },{},{} 2385,Recuperative_Armor,Recuperative Armor,5,20,,0,,12,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus bNoRegen,1; bonus bNoRegen,2; bonus bHPGainValue,60; bonus bSPGainValue,6; bonus bMagicHPGainValue,60; bonus bMagicSPGainValue,6; },{},{ heal 0,-100; } 2386,Chameleon_Armor,Chameleon Armor,5,20,,1700,,5,,0,0x000FDF80,2,2,16,,70,1,0,{ bonus bMaxHP,(BaseLevel*7); bonus bMaxSP,(BaseLevel/2); autobonus2 "{ bonus bNoMagicDamage,100; }",10,2000,BF_MAGIC,"{ specialeffect2 EF_ENERGYCOAT; }"; if( BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte ) bonus bMdef,5; else if( BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief ) bonus bDef,3; },{},{} diff --git a/db/quest_db.txt b/db/quest_db.txt index cafed9de9..f196f8a02 100644 --- a/db/quest_db.txt +++ b/db/quest_db.txt @@ -1409,8 +1409,8 @@ 60189,0,1365,100,0,0,0,0,"Hunting Apocalypse" 60190,0,1365,150,0,0,0,0,"Hunting Apocalypse" // -60200,0,0,0,0,0,0,0,"Endless Tower Effect" -60201,0,0,0,0,0,0,0,"Endless Tower Time Limit" +60200,604800,0,0,0,0,0,0,"Endless Tower Effect" +60201,14400,0,0,0,0,0,0,"Endless Tower Time Limit" 60301,0,1155,100,0,0,0,0,"Dragon Hunting" 60302,0,1155,200,0,0,0,0,"Dragon Hunting" 60303,0,1714,100,0,0,0,0,"Dragon Hunting" |