summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-11-02 02:27:37 +0100
committerHaru <haru@dotalux.com>2014-11-02 02:29:06 +0100
commit5722534bc46f9f1c6314e93a28f1a759e993f902 (patch)
treed26a79682fdaefd32a7db6b828fbc03c75c0697f
parentc62b4c3e8e178f8ba1de240b9d67a664ef128ace (diff)
downloadhercules-5722534bc46f9f1c6314e93a28f1a759e993f902.tar.gz
hercules-5722534bc46f9f1c6314e93a28f1a759e993f902.tar.bz2
hercules-5722534bc46f9f1c6314e93a28f1a759e993f902.tar.xz
hercules-5722534bc46f9f1c6314e93a28f1a759e993f902.zip
Replaced 'set' with direct assignment where applicable (item db)
This also includes various other tweaks to the item db scripts, including the newly introduced min() and max() commands. Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--db/pre-re/item_db.conf30
-rw-r--r--db/re/item_db.conf194
2 files changed, 112 insertions, 112 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
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c5bb01d3e..984549b55 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1908,7 +1908,7 @@ item_db: (
Weight: 20
Upper: 63
BuyingStore: true
- Script: <" set Zeny,Zeny+rand(1000,10000); ">
+ Script: <" Zeny += rand(1000,10000); ">
},
{
Id: 669
@@ -6214,12 +6214,12 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,25;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,1);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(), 14)-3,2);
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;
}
">
},
@@ -8040,7 +8040,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
@@ -8074,7 +8074,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bCriticalAddRace,RC_DemiHuman,5;
}
if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
@@ -8371,8 +8371,8 @@ item_db: (
Script: <"
bonus bBaseAtk,(getrefine()*5);
bonus bCritAtkRate,getrefine();
- set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
- if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+ .@val = min(BaseLevel/10, 12);
+ if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
">
},
{
@@ -8581,7 +8581,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
bonus bAspdRate,5;
}
@@ -9425,7 +9425,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,25;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-3,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
bonus3 bAutoSpell,NPC_CRITICALWOUND,1,50;
}
@@ -9807,8 +9807,8 @@ item_db: (
Script: <"
bonus bUnbreakableWeapon,0;
bonus bBaseAtk,(getrefine()*7);
- set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
- if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+ .@val = min(BaseLevel/10, 12);
+ if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
">
},
// 1-Handed Spears
@@ -10339,7 +10339,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
bonus bAspdRate,10;
}
@@ -11310,7 +11310,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,25;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -11492,8 +11492,8 @@ item_db: (
View: 5
Script: <"
bonus bBaseAtk,(getrefine()*6);
- set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
- if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+ .@val = min(BaseLevel/10, 12);
+ if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
">
},
{
@@ -12440,7 +12440,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
bonus bAspdRate,5;
}
@@ -13084,7 +13084,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,25;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) autobonus "{ bonus bBaseAtk,200; }",30,3000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
@@ -13386,8 +13386,8 @@ item_db: (
bonus bUnbreakableWeapon,0;
bonus bBaseAtk,(getrefine()*5);
bonus bMatk,(getrefine()*2);
- set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
- if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+ .@val = min(BaseLevel/10, 12);
+ if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
">
},
{
@@ -14335,7 +14335,7 @@ item_db: (
bonus bUnbreakableWeapon,0;
if(getrefine() > 5) {
bonus2 bIgnoreMdefRate,RC_DemiHuman,5;
- bonus bHealPower,5+(((getrefine()>14)?14:getrefine())-5)*2;
+ bonus bHealPower,5+(min(getrefine(),14)-5)*2;
}
if(getrefine() > 8) bonus5 bAutoSpellOnSkill,AL_HEAL,AL_HEAL,10,100,1;
if(getrefine() > 9) {
@@ -14508,7 +14508,7 @@ item_db: (
Script: <"
bonus bAtkEle,Ele_Holy;
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;
">
},
{
@@ -14845,12 +14845,12 @@ item_db: (
Script: <"
bonus bUnbreakableWeapon,0;
bonus bMatk,30*(getrefine()/3);
- if(getrefine()>=7) {
- set .@i,1;
- bonus4 bAutoSpell,"HW_MAGICPOWER",1,10,0;
+ if (getrefine()>=7) {
+ .@val = 1;
+ bonus4 bAutoSpell,HW_MAGICPOWER,1,10,0;
}
if (getrefine()>=4) {
- set .@rate,5*(.@i+1);
+ .@rate = 5*(.@val+1);
bonus2 bMagicAddRace,RC_Boss,.@rate;
bonus2 bMagicAddRace,RC_NonBoss,.@rate;
}
@@ -15680,7 +15680,7 @@ item_db: (
bonus bCritAtkRate,getrefine() * 2;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) bonus2 bSkillAtk,AC_DOUBLE,20;
@@ -16687,7 +16687,7 @@ item_db: (
bonus bInt,1;
bonus2 bAddRace,RC_DemiHuman,95;
bonus2 bVariableCastrate,MO_EXTREMITYFIST,-25;
- autobonus "{ bonus2 bVariableCastrate,\"MO_EXTREMITYFIST\",-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
+ autobonus "{ bonus2 bVariableCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
bonus bUnbreakableWeapon,0;
">
},
@@ -16741,7 +16741,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -16778,7 +16778,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -17505,7 +17505,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) bonus4 bAutoSpellOnSkill,CG_ARROWVULCAN,CG_TAROTCARD,5,100;
@@ -18255,7 +18255,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) bonus4 bAutoSpellOnSkill,CG_ARROWVULCAN,CG_TAROTCARD,5,100;
@@ -18462,8 +18462,8 @@ item_db: (
bonus2 bIgnoreMdefRate,RC_DemiHuman,25;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bMagicAddRace,RC_DemiHuman,(((getrefine()>14)?14:getrefine())-5)*2;
- bonus2 bIgnoreMdefRate,RC_DemiHuman,5+(((getrefine()>14)?14:getrefine())-5)*2;
+ bonus2 bMagicAddRace,RC_DemiHuman,(min(getrefine(),14)-5)*2;
+ bonus2 bIgnoreMdefRate,RC_DemiHuman,5+(min(getrefine(),14)-5)*2;
}
if(getrefine()>8) {
bonus5 bAutoSpellOnSkill,WZ_STORMGUST,MG_SAFETYWALL,10,200,1;
@@ -18855,8 +18855,8 @@ item_db: (
if(BaseJob==Job_Wizard) bonus bMatk,15;
else if(BaseJob==Job_Sage) bonus bMatk,10;
bonus bMatk,(getrefine()*5);
- set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
- if(.@i>2) bonus bMatk,((.@i-2)*5);
+ .@val = min(BaseLevel/10, 12);
+ if (.@val > 2) bonus bMatk,((.@val-2)*5);
">
},
// Shields
@@ -20034,7 +20034,7 @@ item_db: (
Upper: 63
Loc: 32
View: 1
- Script: <" if (getrefine()>5) bonus2 bSubEle,Ele_Neutral,((getrefine()>12)?12:getrefine())-5; ">
+ Script: <" if (getrefine()>5) bonus2 bSubEle,Ele_Neutral,min(getrefine(),12)-5; ">
},
{
Id: 2169
@@ -24605,7 +24605,7 @@ item_db: (
EquipLv: 100
Script: <"
bonus bMaxSP,40;
- bonus bAgi,-7+(getequiprefinerycnt(EQI_SHOES)>8)?8:getequiprefinerycnt(EQI_SHOES);
+ bonus bAgi,-7+min(getequiprefinerycnt(EQI_SHOES),8);
">
},
{
@@ -25623,7 +25623,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;
">
},
{
@@ -26104,9 +26104,9 @@ item_db: (
EquipLv: 100
Script: <"
bonus bFlee,5;
- set .@i,(getskilllv("AB_ORATIO")<2)?2:getskilllv("AB_ORATIO");
- bonus5 bAutoSpellWhenHit,"AB_ORATIO",.@i,30,BF_WEAPON,0;
- bonus5 bAutoSpellWhenHit,"AB_ORATIO",.@i,40,BF_MAGIC,0;
+ .@val = max(getskilllv(AB_ORATIO), 2);
+ bonus5 bAutoSpellWhenHit,AB_ORATIO,.@val,30,BF_WEAPON,0;
+ bonus5 bAutoSpellWhenHit,AB_ORATIO,.@val,40,BF_MAGIC,0;
">
},
{
@@ -36913,7 +36913,7 @@ item_db: (
Loc: 4
Script: <"
bonus bLuk,getrefine()-5;
- bonus bCritical,(getrefine()>10?10:getrefine());
+ bonus bCritical,min(getrefine(),10);
">
},
{
@@ -37319,7 +37319,7 @@ item_db: (
Weight: 10
Loc: 16
Script: <"
- bonus bMagicDamageReturn,(getrefine()>10?10:getrefine())*2;
+ bonus bMagicDamageReturn,min(getrefine(),10)*2;
if(BaseClass==Job_Mage) bonus bMdef,3;
">
},
@@ -38044,7 +38044,7 @@ item_db: (
Loc: 769
Script: <"
bonus bHealPower,4;
- bonus2 bSkillUseSP,"AL_HEAL",-15;
+ bonus2 bSkillUseSP,AL_HEAL,-15;
">
},
{
@@ -38321,7 +38321,7 @@ item_db: (
Weight: 10
Loc: 64
Script: <"
- set .@rate,((getrefine()>14)?7:5);
+ .@rate = (getrefine() > 14) ? 7 : 5);
bonus bMaxHPrate,.@rate;
bonus bMaxSPrate,.@rate;
bonus2 bHPRegenRate,50,10000;
@@ -38360,7 +38360,7 @@ item_db: (
Weight: 10
Loc: 16
Script: <"
- set .@rate,((getrefine()>14)?30:20);
+ .@rate = (getrefine() > 14) ? 30 : 20;
bonus2 bAddEle,Ele_Holy,.@rate;
bonus2 bAddEle,Ele_Dark,.@rate;
bonus2 bAddRace,RC_Angel,.@rate;
@@ -38513,7 +38513,7 @@ item_db: (
noauction: true
}
Script: <"
- set .@rate, ((getrefine()>14)?15:10);
+ .@rate = (getrefine() > 14) ? 15 : 10;
bonus2 bAddRace,RC_NonBoss,.@rate;
bonus2 bAddRace,RC_Boss,.@rate;
bonus3 bAutoSpell,SM_MAGNUM,10,15;
@@ -39196,7 +39196,7 @@ item_db: (
Script: <"
bonus bMatkRate,((getrefine()>14)?8:5);
bonus bMaxSPrate,-50;
- set .@rate,((getrefine()>14)?33:25);
+ .@rate = (getrefine() > 14) ? 33 : 25;
bonus2 bMagicAddRace,RC_Angel,.@rate;
bonus2 bMagicAddRace,RC_DemiHuman,.@rate;
">
@@ -39217,7 +39217,7 @@ item_db: (
noauction: true
}
Script: <"
- set .@rate, ((getrefine()>14)?350:250);
+ .@rate = (getrefine() > 14) ? 350 : 250;
bonus3 bAddEff,Eff_Stun,.@rate,ATF_SHORT;
bonus3 bAddEff,Eff_Curse,.@rate,ATF_SHORT;
bonus3 bAddEff,Eff_Silence,.@rate,ATF_SHORT;
@@ -39500,7 +39500,7 @@ item_db: (
Loc: 16
Script: <"
bonus bInt,4;
- bonus5 bAutoSpellWhenHit,"NPC_WIDESLEEP",3,2500,BF_MAGIC,0;
+ bonus5 bAutoSpellWhenHit,NPC_WIDESLEEP,3,2500,BF_MAGIC,0;
">
},
{
@@ -39526,7 +39526,7 @@ item_db: (
Loc: 16
Script: <"
bonus bVit,4;
- bonus5 bAutoSpellWhenHit,"NPC_WIDESTONE",3,2500,BF_MAGIC,0;
+ bonus5 bAutoSpellWhenHit,NPC_WIDESTONE,3,2500,BF_MAGIC,0;
">
},
// Armor Enchant System
@@ -47849,7 +47849,7 @@ item_db: (
noselltonpc: true
nogstorage: true
}
- Script: <" bonus3 bAutoSpell,"SA_FROSTWEAPON",1,5; ">
+ Script: <" bonus3 bAutoSpell,SA_FROSTWEAPON,1,5; ">
},
{
Id: 5381
@@ -52241,7 +52241,7 @@ item_db: (
Script: <"
bonus bAspdRate,3;
bonus2 bSubEle,Ele_Earth,5;
- if(getrefine()>6) bonus3 bAutoSpell,"MO_BALKYOUNG",1,50;
+ if(getrefine()>6) bonus3 bAutoSpell,MO_BALKYOUNG,1,50;
">
},
{
@@ -55301,11 +55301,11 @@ item_db: (
bonus bStr,2;
bonus2 bAddMonsterDropItem,574,500;
bonus2 bAddItemHealRate,574,5;
- set .@rate,(getrefine()>10)?10:getrefine();
+ .@rate = min(getrefine(),10);
bonus bMaxHPrate,.@rate;
bonus bMaxSPrate,.@rate;
- bonus3 bAutoSpellWhenHit,"AL_INCAGI",.@rate,10;
- bonus3 bAutoSpell,"AL_INCAGI",.@rate,10;
+ bonus3 bAutoSpellWhenHit,AL_INCAGI,.@rate,10;
+ bonus3 bAutoSpell,AL_INCAGI,.@rate,10;
">
},
{
@@ -76151,7 +76151,7 @@ item_db: (
Upper: 63
Script: <"
if(gettime(5)!=MDiceCone) {
- set MDiceCone,gettime(5);
+ MDiceCone = gettime(5);
percentheal 50,50;
}
">
@@ -76164,7 +76164,7 @@ item_db: (
Buy: 1
Weight: 10
Upper: 63
- Script: <" set Zeny,Zeny+rand(1000,10000); ">
+ Script: <" Zeny += rand(1000,10000); ">
},
{
Id: 12135
@@ -77554,7 +77554,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;
@@ -84580,7 +84580,7 @@ item_db: (
Type: 2
Buy: 0
Upper: 63
- Script: <" set SlotChange, SlotChange + 1; ">
+ Script: <" SlotChange += 1; ">
},
{
Id: 12787
@@ -84617,7 +84617,7 @@ item_db: (
Type: 2
Buy: 0
Upper: 63
- Script: <" set CharRename, CharRename + 1; ">
+ Script: <" CharRename += 1; ">
},
{
Id: 12791
@@ -87311,7 +87311,7 @@ item_db: (
bonus3 bAutoSpell,PR_LEXDIVINA,1,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) bonus4 bAutoSpellOnSkill,RG_RAID,NPC_WIDEBLEEDING,1,250;
@@ -87703,7 +87703,7 @@ item_db: (
Script: <"
bonus2 bSkillAtk,SC_FATALMENACE,30;
if(getrefine() >= 6) {
- bonus2 bSkillAtk,"SC_FATALMENACE",(getrefine()-5)*2;
+ bonus2 bSkillAtk,SC_FATALMENACE,(getrefine()-5)*2;
bonus bMatk,(getrefine()-5)*3;
}
">
@@ -88060,8 +88060,8 @@ item_db: (
Script: <"
bonus bBaseAtk,(getrefine()*5);
bonus bMatk,(getrefine()*2);
- set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
- if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+ .@val = min(BaseLevel/10, 12);
+ if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
">
},
{
@@ -88101,11 +88101,11 @@ item_db: (
bonus bBaseAtk,20*(getrefine()/3);
bonus bMatk,20*(getrefine()/3);
if(getrefine()>=9) {
- set .@i,1;
+ .@val = 1;
bonus4 bAutoSpell,BS_WEAPONPERFECT,1,20,0;
}
if(getrefine()>=6) {
- set .@rate,5*(.@i+1);
+ .@rate = 5*(.@val+1);
bonus2 bAddRace,RC_Boss,.@rate;
bonus2 bAddRace,RC_NonBoss,.@rate;
bonus2 bMagicAddRace,RC_Boss,.@rate;
@@ -88344,7 +88344,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -88503,8 +88503,8 @@ item_db: (
EquipLv: 99
View: 17
Script: <"
- bonus2 bSkillAtk,"GS_DESPERADO",20;
- bonus2 bSkillAtk,"RL_FALLEN_ANGEL",20;
+ bonus2 bSkillAtk,GS_DESPERADO,20;
+ bonus2 bSkillAtk,RL_FALLEN_ANGEL,20;
">
},
{
@@ -89151,7 +89151,7 @@ item_db: (
bonus2 bSkillAtk,GS_TRIPLEACTION,30;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -89189,7 +89189,7 @@ item_db: (
bonus2 bSkillAtk,GS_TRIPLEACTION,30;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),10)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -89228,7 +89228,7 @@ item_db: (
bonus2 bSkillAtk,GS_TRIPLEACTION,30;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),10)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -89266,7 +89266,7 @@ item_db: (
bonus2 bSkillAtk,GS_TRIPLEACTION,30;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>10)?10:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),10)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -89382,7 +89382,7 @@ item_db: (
Script: <"
bonus bHit,10;
bonus bCriticalRate,15;
- bonus4 bAutoSpell,"AL_DECAGI",1,500,0;
+ bonus4 bAutoSpell,AL_DECAGI,1,500,0;
">
},
{
@@ -89426,7 +89426,7 @@ item_db: (
Script: <"
bonus bHit,-10;
bonus bDelayrate,-10;
- bonus3 bAutoSpell,"MG_THUNDERSTORM",5,500;
+ bonus3 bAutoSpell,MG_THUNDERSTORM,5,500;
">
},
{
@@ -89467,7 +89467,7 @@ item_db: (
Script: <"
bonus bHit,10;
bonus bCriticalRate,15;
- bonus4 bAutoSpell,"AL_DECAGI",1,10,0;
+ bonus4 bAutoSpell,AL_DECAGI,1,10,0;
">
},
{
@@ -90674,7 +90674,7 @@ item_db: (
autobonus "{ bonus2 bSkillAtk,NJ_HUUMA,100; bonus2 bSkillAtk,NJ_ISSEN,100; }",50,10000;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-3,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-3,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>8) {
@@ -90830,7 +90830,7 @@ item_db: (
Script: <"
bonus bMatk,50;
bonus bAtkEle,Ele_Water;
- bonus3 bAutoSpell,NJ_HYOUSYOURAKU,(getskilllv(NJ_HYOUSYOURAKU)?getskilllv(NJ_HYOUSYOURAKU):1),30;
+ bonus3 bAutoSpell,NJ_HYOUSYOURAKU,max(getskilllv(NJ_HYOUSYOURAKU),1),30;
">
},
{
@@ -90852,7 +90852,7 @@ item_db: (
Script: <"
bonus bMatk,50;
bonus bAtkEle,Ele_Wind;
- bonus3 bAutoSpell,NJ_RAIGEKISAI,(getskilllv(NJ_RAIGEKISAI)?getskilllv(NJ_RAIGEKISAI):1),30;
+ bonus3 bAutoSpell,NJ_RAIGEKISAI,max(getskilllv(NJ_RAIGEKISAI),1),30;
">
},
{
@@ -91287,7 +91287,7 @@ item_db: (
bonus2 bIgnoreDefRate,RC_DemiHuman,20;
bonus bUnbreakableWeapon,0;
if(getrefine()>5) {
- bonus2 bAddRace,RC_DemiHuman,pow(((getrefine()>14)?14:getrefine())-4,2);
+ bonus2 bAddRace,RC_DemiHuman,pow(min(getrefine(),14)-4,2);
bonus2 bIgnoreDefRate,RC_DemiHuman,5;
}
if(getrefine()>6) bonus bAspdRate,5;
@@ -106631,7 +106631,7 @@ item_db: (
EquipLv: 100
Script: <"
bonus bLuk,3;
- bonus3 bAutoSpell,ASC_METEORASSAULT,(getskilllv(ASC_METEORASSAULT)?getskilllv(ASC_METEORASSAULT):1),20;
+ bonus3 bAutoSpell,ASC_METEORASSAULT,max(getskilllv(ASC_METEORASSAULT),1),20;
">
},
{
@@ -106664,7 +106664,7 @@ item_db: (
Loc: 16
EquipLv: 50
Script: <"
- set .@rate,(getrefine()>10)?10:getrefine();
+ .@rate = min(getrefine(), 10);
bonus bHit,.@rate;
bonus bFlee,.@rate;
">
@@ -107432,7 +107432,7 @@ item_db: (
View: 8
Script: <"
bonus bAtkEle,Ele_Dark;
- bonus3 bAutoSpell,WL_HELLINFERNO,1,(getrefine()?getrefine()*20:20);
+ bonus3 bAutoSpell,WL_HELLINFERNO,1,max(getrefine(),1)*20;
">
},
{
@@ -107564,8 +107564,8 @@ item_db: (
Script: <"
bonus bUnbreakableWeapon,0;
bonus bBaseAtk,(getrefine()*5);
- set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
- if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+ .@val = min(BaseLevel/10, 12);
+ if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
">
},
{
@@ -111402,8 +111402,8 @@ item_db: (
if(BaseJob==Job_Hunter && Upper!=2) bonus bBaseAtk,10;
bonus bBaseAtk,(getrefine()*3);
bonus bLongAtkRate,getrefine();
- set .@i,((BaseLevel/10)>12)?12:(BaseLevel/10);
- if(.@i>2) bonus bBaseAtk,((.@i-2)*5);
+ .@val = max(BaseLevel/10, 12);
+ if (.@val > 2) bonus bBaseAtk,((.@val-2)*5);
">
},
{
@@ -112047,7 +112047,7 @@ item_db: (
bonus bAtkRate,5;
bonus bDelayrate,-1;
bonus bMaxHP,0+(getrefine()*100);
- bonus2 bSkillAtk,"MC_MAMMONITE",20;
+ bonus2 bSkillAtk,MC_MAMMONITE,20;
">
},
{
@@ -112248,7 +112248,7 @@ item_db: (
Upper: 63
Loc: 256
View: 721
- Script: <" skill "AL_INCAGI",2; ">
+ Script: <" skill AL_INCAGI,2; ">
},
{
Id: 18548
@@ -114136,7 +114136,7 @@ item_db: (
EquipLv: 30
View: 836
Script: <"
- bonus3 bAutoSpell,"AL_INCAGI",10,50;
+ bonus3 bAutoSpell,AL_INCAGI,10,50;
bonus2 bAddItemHealRate,Carrot,2000;
">
},
@@ -117958,7 +117958,7 @@ item_db: (
Script: <"
skill ALL_CATCRY, 1;
bonus bUnbreakableShoes,0;
- autobonus3 "{ }",1000,7000,"ALL_CATCRY","{ montransform 1505,420000; }";
+ autobonus3 "{ }",1000,7000,ALL_CATCRY,"{ montransform 1505,420000; }";
">
},
{
@@ -118208,7 +118208,7 @@ item_db: (
Weight: 10
Upper: 63
Script: <"
- set .@r, rand(1,3);
+ .@r = rand(1,3);
if (.@r == 1) {
specialeffect2 EF_DEVIL;
warp "niflheim",193,186;
@@ -118262,7 +118262,7 @@ item_db: (
WeaponLv: 4
EquipLv: 141
View: 21
- Script: <" bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50; ">
+ Script: <" bonus3 bAutoSpell,GC_CROSSIMPACT,1,50; ">
},
{
Id: 28202
@@ -118280,7 +118280,7 @@ item_db: (
WeaponLv: 4
EquipLv: 141
View: 21
- Script: <" bonus3 bAutoSpell,"GC_CROSSIMPACT",1,50; ">
+ Script: <" bonus3 bAutoSpell,GC_CROSSIMPACT,1,50; ">
},
{
Id: 28203
@@ -118301,7 +118301,7 @@ item_db: (
bonus bHit,8;
bonus bCritical,8;
bonus2 bAddRace,RC_DemiHuman,30;
- bonus2 bVariableCastrate,"GS_TRACKING",-20;
+ bonus2 bVariableCastrate,GS_TRACKING,-20;
bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
bonus bUnbreakableWeapon,0;
">