diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-20 02:18:26 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-12-20 02:18:26 +0000 |
| commit | 6da12f840490b958f7e770a4ce699ec38828e97d (patch) | |
| tree | 102f4f7e9f3600fc82859d7ec361742e696865e6 /db | |
| parent | 300f20998ac8012373024b3a3d7d88b80de7e040 (diff) | |
| download | hercules-6da12f840490b958f7e770a4ce699ec38828e97d.tar.gz hercules-6da12f840490b958f7e770a4ce699ec38828e97d.tar.bz2 hercules-6da12f840490b958f7e770a4ce699ec38828e97d.tar.xz hercules-6da12f840490b958f7e770a4ce699ec38828e97d.zip | |
* Follow-up r17030: documented and added bMagicAtkEle to item_combo_db (bugreport:6943).
* Follow-up r17029: moved 'clearinventory' alias to atcommand_athena.conf.
* Custom Quest Shop updated to v1.5, which replaces categories with shop IDs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17031 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
| -rw-r--r-- | db/re/item_combo_db.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt index 431f97f15..e3fa00492 100644 --- a/db/re/item_combo_db.txt +++ b/db/re/item_combo_db.txt @@ -49,14 +49,14 @@ 1776:18114,{ bonus bLongAtkRate,20; } 2001:2677,{ bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; } 2001:2711,{ bonus bMatkRate,10; bonus bDex,2; bonus2 bSubRace,RC_Demon,10; bonus2 bSubRace,RC_Undead,10; } -2007:2467:2859:15025,{ bonus2 bSubEle,Ele_Earth,-50; } -2008:2468:2860:15026,{ bonus2 bSubEle,Ele_Wind,-50; } -2009:2469:2861:15027,{ bonus2 bSubEle,Ele_Water,-50; } -2010:2470:2862:15028,{ bonus2 bSubEle,Ele_Fire,-50; } -2011:2467:2859:15025,{ bonus2 bSubEle,Ele_Earth,-50; } -2012:2468:2860:15026,{ bonus2 bSubEle,Ele_Wind,-50; } -2013:2469:2861:15027,{ bonus2 bSubEle,Ele_Water,-50; } -2014:2470:2862:15028,{ bonus2 bSubEle,Ele_Fire,-50; } +2007:2467:2859:15025,{ bonus2 bMagicAtkEle,Ele_Wind,40; bonus2 bMagicAtkEle,Ele_Earth,-30; bonus2 bSubEle,Ele_Earth,-50; } +2008:2468:2860:15026,{ bonus2 bMagicAtkEle,Ele_Water,40; bonus2 bMagicAtkEle,Ele_Wind,-30; bonus2 bSubEle,Ele_Wind,-50; } +2009:2469:2861:15027,{ bonus2 bMagicAtkEle,Ele_Fire,40; bonus2 bMagicAtkEle,Ele_Water,-30; bonus2 bSubEle,Ele_Water,-50; } +2010:2470:2862:15028,{ bonus2 bMagicAtkEle,Ele_Earth,40; bonus2 bMagicAtkEle,Ele_Fire,-30; bonus2 bSubEle,Ele_Fire,-50; } +2011:2467:2859:15025,{ bonus2 bMagicAtkEle,Ele_Wind,60; bonus2 bMagicAtkEle,Ele_Earth,-60; bSubEle,Ele_Earth,-50; } +2012:2468:2860:15026,{ bonus2 bMagicAtkEle,Ele_Water,60; bonus2 bMagicAtkEle,Ele_Wind,-60; bonus2 bSubEle,Ele_Wind,-50; } +2013:2469:2861:15027,{ bonus2 bMagicAtkEle,Ele_Fire,60; bonus2 bMagicAtkEle,Ele_Water,-60; bonus2 bSubEle,Ele_Water,-50; } +2014:2470:2862:15028,{ bonus2 bMagicAtkEle,Ele_Earth,60; bonus2 bMagicAtkEle,Ele_Fire,-60; bonus2 bSubEle,Ele_Fire,-50; } 2109:2717:2239,{ bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; } 2114:2353:5122,{ bonus bStr,2; bonus bDef,5; bonus bMdef,5; if(BaseClass==Job_Swordman) bonus bDef,6; } 2115:2353:5124,{ bonus bDef,2-getequiprefinerycnt(EQI_HAND_L)-getequiprefinerycnt(EQI_HEAD_TOP); bonus bMdef,5+getequiprefinerycnt(EQI_HAND_L)+getequiprefinerycnt(EQI_HEAD_TOP); } |