diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /db/pre-re/item_db.conf | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'db/pre-re/item_db.conf')
| -rw-r--r-- | db/pre-re/item_db.conf | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index ea08825cb..925a149fd 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -1757,7 +1757,7 @@ item_db: ( Buy: 0 Weight: 20 BuyingStore: true - Script: <" set Zeny,Zeny+rand(1000,10000); "> + Script: <" Zeny += rand(1000,10000); "> }, { Id: 669 @@ -5957,8 +5957,8 @@ item_db: ( bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine()>8) { - bonus3 bAutoSpell,LK_CONCENTRATION,getskilllv(LK_CONCENTRATION)>1?getskilllv(LK_CONCENTRATION):1,30; - bonus3 bAutoSpell,LK_AURABLADE,getskilllv(LK_AURABLADE)>1?getskilllv(LK_AURABLADE):1,30; + bonus3 bAutoSpell,LK_CONCENTRATION,max(getskilllv(LK_CONCENTRATION),1),30; + bonus3 bAutoSpell,LK_AURABLADE,max(getskilllv(LK_AURABLADE),1),30; } "> @@ -13061,7 +13061,7 @@ item_db: ( bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bInt,4; - bonus4 bAutoSpellOnSkill,AL_HEAL,AL_BLESSING,getskilllv(AL_BLESSING)>1?getskilllv(AL_BLESSING):1,20; + bonus4 bAutoSpellOnSkill,AL_HEAL,AL_BLESSING,max(getskilllv(AL_BLESSING),1),20; "> }, { @@ -14713,7 +14713,7 @@ item_db: ( bonus bInt,1; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bCastrate,MO_EXTREMITYFIST,-25; - autobonus "{ bonus2 bCastrate,\"MO_EXTREMITYFIST\",-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }"; + autobonus "{ bonus2 bCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }"; bonus bUnbreakableWeapon,0; "> }, @@ -21442,7 +21442,7 @@ item_db: ( EquipLv: 70 Script: <" bonus bMdef,3; - bonus3 bAutoSpellWhenHit,AL_HEAL,getskilllv(AL_HEAL)?getskilllv(AL_HEAL):1,20; + bonus3 bAutoSpellWhenHit,AL_HEAL,max(getskilllv(AL_HEAL),1),20; "> }, { @@ -40983,10 +40983,10 @@ item_db: ( nogstorage: true } Script: <" - bonus2 bSkillAtk, "WZ_HEAVENDRIVE", 15 + getequiprefinerycnt(EQI_HAND_R); - bonus2 bSkillAtk, "WZ_EARTHSPIKE", 15 + getequiprefinerycnt(EQI_HAND_R); - bonus2 bCastrate, "WZ_HEAVENDRIVE", -25; - bonus2 bCastrate, "WZ_EARTHSPIKE", -25; + bonus2 bSkillAtk, WZ_HEAVENDRIVE, 15 + getequiprefinerycnt(EQI_HAND_R); + bonus2 bSkillAtk, WZ_EARTHSPIKE, 15 + getequiprefinerycnt(EQI_HAND_R); + bonus2 bCastrate, WZ_HEAVENDRIVE, -25; + bonus2 bCastrate, WZ_EARTHSPIKE, -25; ; "> }, @@ -63116,7 +63116,7 @@ item_db: ( Weight: 80 Script: <" if(gettime(5)!=MDiceCone) { - set MDiceCone,gettime(5); + MDiceCone = gettime(5); percentheal 50,50; } @@ -63129,7 +63129,7 @@ item_db: ( Type: 2 Buy: 1 Weight: 10 - Script: <" set Zeny,Zeny+rand(1000,10000); "> + Script: <" Zeny += rand(1000,10000); "> }, { Id: 12135 @@ -64431,7 +64431,7 @@ item_db: ( sitting: true } Script: <" - set .@type,getiteminfo(getequipid(EQI_HAND_R),11); + .@type = getiteminfo(getequipid(EQI_HAND_R),11); if (.@type==6||.@type==7||.@type==8) { skilleffect BS_ADRENALINE,0; sc_start SC_ADRENALINE,150000,5; @@ -69852,14 +69852,14 @@ item_db: ( AegisName: "Change_Slot_Card" Name: "Character Position Change Coupon" Type: 2 - Script: <" set SlotChange, SlotChange + 1; "> + Script: <" SlotChange += 1; "> }, { Id: 12790 AegisName: "Change_Name_Card" Name: "Name Change Coupon" Type: 2 - Script: <" set CharRename, CharRename + 1; "> + Script: <" CharRename += 1; "> }, { Id: 12848 |