Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small correction in item_db_etc.yml (#5833)

Browse Source 
* Replaced getequiprefinerycnt(EQI_COMPOUND_ON) by getrefine()
* Fixed #5831 

Thanks to @Melk3000 !
This commit is contained in:
Atemo 2021-04-06 00:35:53 +02:00 committed by GitHub
parent 8399a0371c
commit c14be67dff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
db/re/item_db_etc.yml
View File

@ -41439,7 +41439,7 @@ Body:
Name: Modification Orb(Defense)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
if (.@r>8) {
bonus bDef,45;
}
@ -41454,7 +41454,7 @@ Body:
Name: Modification Orb(Magic Defense)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
if (.@r>8) {
bonus bMdef,8;
}
@ -41475,7 +41475,7 @@ Body:
Name: Modification Orb(Spirit)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
bonus bMaxSPrate,5;
if (.@r>8) {
bonus bMaxSP,250;
@ -41488,7 +41488,7 @@ Body:
Name: Modification Orb(Stamina)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
bonus bMaxHPrate,5;
if (.@r>8) {
bonus bMaxHP,1250;
@ -41507,7 +41507,7 @@ Body:
Name: Modification Orb(Heal)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
if (.@r>8) {
bonus bHealPower,15;
}
@ -41522,7 +41522,7 @@ Body:
Name: Modification Orb(Attack Power)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
bonus2 bAddClass,Class_All,5;
if (.@r>8) {
bonus bBaseAtk,50;
@ -41535,7 +41535,7 @@ Body:
Name: Modification Orb(Magic Power)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
bonus bMatkRate,5;
if (.@r>8) {
bonus bMatk,25;
@ -41548,7 +41548,7 @@ Body:
Name: Modification Orb(Sharpshooter)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
if (.@r>8) {
bonus bLongAtkRate,7;
}
@ -41563,7 +41563,7 @@ Body:
Name: Modification Orb(Swift)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
bonus bAspd,1;
if (.@r>8) {
bonus bAspdRate,6;
@ -41576,7 +41576,7 @@ Body:
Name: Modification Orb(Caster)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
if (.@r>8) {
bonus bVariableCastrate,-11;
}
@ -41591,7 +41591,7 @@ Body:
Name: Modification Orb(Critical)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
bonus bCritical,10;
if (.@r>8) {
bonus bCritAtkRate,10;
@ -41604,7 +41604,7 @@ Body:
Name: Modification Orb(After Skill Delay)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
if (.@r>8) {
bonus bDelayRate,-15;
}
@ -41619,7 +41619,7 @@ Body:
Name: Modification Orb(Fixed Casting Time)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
if (.@r>8) {
bonus bFixedCast,-700;
}
@ -41634,7 +41634,7 @@ Body:
Name: Modification Orb(Above All)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
.@val = 5;
if (.@r>6) {
bonus2 bSubSize,Size_Small,5;
@ -41709,7 +41709,7 @@ Body:
Name: Modification Orb(Lucky Strike)
Type: Card
Script: |
.@r = getequiprefinerycnt(EQI_COMPOUND_ON);
.@r = getrefine();
if (.@r>9) {
bonus bLuk,50;
}

2
doc/script_commands.txt
View File

@ -2624,7 +2624,7 @@ on the invoking character or the specified equipment slot. If nothing is
equipped there, it returns -1.
Valid equipment slots are:
EQI_COMPOUND_ON (-1) - Item slot that calls this script (In context of item script)
EQI_COMPOUND_ON (-1) - Item slot that calls this script (In context of item script) - exclusive to getequipid
EQI_ACC_L (0) - Accessory 1
EQI_ACC_R (1) - Accessory 2
EQI_SHOES (2) - Footgear (shoes, boots)

30
sql-files/item_db_re_etc.sql
View File

@ -4088,22 +4088,22 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VAL
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29522,'AssacrossStone_Middle_','Assassin Cross Stone (Middle)','Card','bonus bBaseAtk,getskilllv("AS_LEFT")*2;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29523,'AssacrossStone_Bottom_','Assassin Cross Stone (Bottom)','Card','bonus2 bSkillAtk,"AS_SONICBLOW",20;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29524,'GuillcrossStone_Robe_','Assassin Cross Stone (Garment)','Card','bonus2 bSkillAtk,"GC_ROLLINGCUTTER",15;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29527,'Improve_Orb_Def','Modification Orb(Defense)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nif (.@r>8) {\n bonus bDef,45;\n}\nelse if (.@r>6) {\n bonus bDef,35;\n}\nelse {\n bonus bDef,25;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29528,'Improve_Orb_Mdef','Modification Orb(Magic Defense)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nif (.@r>8) {\n bonus bMdef,8;\n}\nelse if (.@r>6) {\n bonus bMdef,5;\n}\nelse {\n bonus bMdef,2;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29527,'Improve_Orb_Def','Modification Orb(Defense)','Card','.@r = getrefine();\nif (.@r>8) {\n bonus bDef,45;\n}\nelse if (.@r>6) {\n bonus bDef,35;\n}\nelse {\n bonus bDef,25;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29528,'Improve_Orb_Mdef','Modification Orb(Magic Defense)','Card','.@r = getrefine();\nif (.@r>8) {\n bonus bMdef,8;\n}\nelse if (.@r>6) {\n bonus bMdef,5;\n}\nelse {\n bonus bMdef,2;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29529,'Improve_Orb_HealHP','Modification Orb(HP Recovery)','Card','bonus bHPrecovRate,20;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29530,'Improve_Orb_Spirit','Modification Orb(Spirit)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nbonus bMaxSPrate,5;\nif (.@r>8) {\n bonus bMaxSP,250;\n}\nelse if (.@r>6) {\n bonus bMaxSP,100;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29531,'Improve_Orb_Health','Modification Orb(Stamina)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nbonus bMaxHPrate,5;\nif (.@r>8) {\n bonus bMaxHP,1250;\n}\nelse if (.@r>6) {\n bonus bMaxHP,500;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29530,'Improve_Orb_Spirit','Modification Orb(Spirit)','Card','.@r = getrefine();\nbonus bMaxSPrate,5;\nif (.@r>8) {\n bonus bMaxSP,250;\n}\nelse if (.@r>6) {\n bonus bMaxSP,100;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29531,'Improve_Orb_Health','Modification Orb(Stamina)','Card','.@r = getrefine();\nbonus bMaxHPrate,5;\nif (.@r>8) {\n bonus bMaxHP,1250;\n}\nelse if (.@r>6) {\n bonus bMaxHP,500;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29532,'Improve_Orb_HealSP','Modification Orb(SP Recovery)','Card','bonus bSPrecovRate,20;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29533,'Improve_Orb_Heal','Modification Orb(Heal)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nif (.@r>8) {\n bonus bHealPower,15;\n}\nelse if (.@r>6) {\n bonus bHealPower,10;\n}\nelse {\n bonus bHealPower,5;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29534,'Improve_Orb_Atk','Modification Orb(Attack Power)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nbonus2 bAddClass,Class_All,5;\nif (.@r>8) {\n bonus bBaseAtk,50;\n}\nelse if (.@r>6) {\n bonus bBaseAtk,25;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29535,'Improve_Orb_Matk','Modification Orb(Magic Power)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nbonus bMatkRate,5;\nif (.@r>8) {\n bonus bMatk,25;\n}\nelse if (.@r>6) {\n bonus bMatk,25;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29536,'Improve_Orb_Archer','Modification Orb(Sharpshooter)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nif (.@r>8) {\n bonus bLongAtkRate,7;\n}\nelse if (.@r>6) {\n bonus bLongAtkRate,5;\n}\nelse {\n bonus bLongAtkRate,3;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29537,'Improve_Orb_Speed','Modification Orb(Swift)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nbonus bAspd,1;\nif (.@r>8) {\n bonus bAspdRate,6;\n}\nelse if (.@r>6) {\n bonus bAspdRate,3;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29538,'Improve_Orb_Cast','Modification Orb(Caster)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nif (.@r>8) {\n bonus bVariableCastrate,-11;\n}\nelse if (.@r>6) {\n bonus bVariableCastrate,-8;\n}\nelse {\n bonus bVariableCastrate,-5;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29539,'Improve_Orb_Cri','Modification Orb(Critical)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nbonus bCritical,10;\nif (.@r>8) {\n bonus bCritAtkRate,10;\n}\nelse if (.@r>6) {\n bonus bCritAtkRate,5;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29540,'Improve_Orb_Delay','Modification Orb(After Skill Delay)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nif (.@r>8) {\n bonus bDelayRate,-15;\n}\nelse if (.@r>6) {\n bonus bDelayRate,-10;\n}\nelse {\n bonus bDelayRate,-5;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29541,'Improve_Orb_Fix','Modification Orb(Fixed Casting Time)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nif (.@r>8) {\n bonus bFixedCast,-700;\n}\nelse if (.@r>6) {\n bonus bFixedCast,-500;\n}\nelse {\n bonus bFixedCast,-300;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29542,'Improve_Orb_Above','Modification Orb(Above All)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\n.@val = 5;\nif (.@r>6) {\n bonus2 bSubSize,Size_Small,5;\n bonus2 bSubSize,Size_Medium,5;\n bonus2 bSubSize,Size_Large,5;\n bonus2 bMagicSubSize,Size_Small,-5;\n bonus2 bMagicSubSize,Size_Medium,-5;\n bonus2 bMagicSubSize,Size_Large,-5;\n if (.@r>8) {\n .@val += 5;\n }\n}\nbonus2 bSubDefEle,Ele_All,.@val;\nbonus3 bSubEle,Ele_All,.@val,BF_MAGIC;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29533,'Improve_Orb_Heal','Modification Orb(Heal)','Card','.@r = getrefine();\nif (.@r>8) {\n bonus bHealPower,15;\n}\nelse if (.@r>6) {\n bonus bHealPower,10;\n}\nelse {\n bonus bHealPower,5;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29534,'Improve_Orb_Atk','Modification Orb(Attack Power)','Card','.@r = getrefine();\nbonus2 bAddClass,Class_All,5;\nif (.@r>8) {\n bonus bBaseAtk,50;\n}\nelse if (.@r>6) {\n bonus bBaseAtk,25;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29535,'Improve_Orb_Matk','Modification Orb(Magic Power)','Card','.@r = getrefine();\nbonus bMatkRate,5;\nif (.@r>8) {\n bonus bMatk,25;\n}\nelse if (.@r>6) {\n bonus bMatk,25;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29536,'Improve_Orb_Archer','Modification Orb(Sharpshooter)','Card','.@r = getrefine();\nif (.@r>8) {\n bonus bLongAtkRate,7;\n}\nelse if (.@r>6) {\n bonus bLongAtkRate,5;\n}\nelse {\n bonus bLongAtkRate,3;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29537,'Improve_Orb_Speed','Modification Orb(Swift)','Card','.@r = getrefine();\nbonus bAspd,1;\nif (.@r>8) {\n bonus bAspdRate,6;\n}\nelse if (.@r>6) {\n bonus bAspdRate,3;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29538,'Improve_Orb_Cast','Modification Orb(Caster)','Card','.@r = getrefine();\nif (.@r>8) {\n bonus bVariableCastrate,-11;\n}\nelse if (.@r>6) {\n bonus bVariableCastrate,-8;\n}\nelse {\n bonus bVariableCastrate,-5;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29539,'Improve_Orb_Cri','Modification Orb(Critical)','Card','.@r = getrefine();\nbonus bCritical,10;\nif (.@r>8) {\n bonus bCritAtkRate,10;\n}\nelse if (.@r>6) {\n bonus bCritAtkRate,5;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29540,'Improve_Orb_Delay','Modification Orb(After Skill Delay)','Card','.@r = getrefine();\nif (.@r>8) {\n bonus bDelayRate,-15;\n}\nelse if (.@r>6) {\n bonus bDelayRate,-10;\n}\nelse {\n bonus bDelayRate,-5;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29541,'Improve_Orb_Fix','Modification Orb(Fixed Casting Time)','Card','.@r = getrefine();\nif (.@r>8) {\n bonus bFixedCast,-700;\n}\nelse if (.@r>6) {\n bonus bFixedCast,-500;\n}\nelse {\n bonus bFixedCast,-300;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29542,'Improve_Orb_Above','Modification Orb(Above All)','Card','.@r = getrefine();\n.@val = 5;\nif (.@r>6) {\n bonus2 bSubSize,Size_Small,5;\n bonus2 bSubSize,Size_Medium,5;\n bonus2 bSubSize,Size_Large,5;\n bonus2 bMagicSubSize,Size_Small,-5;\n bonus2 bMagicSubSize,Size_Medium,-5;\n bonus2 bMagicSubSize,Size_Large,-5;\n if (.@r>8) {\n .@val += 5;\n }\n}\nbonus2 bSubDefEle,Ele_All,.@val;\nbonus3 bSubEle,Ele_All,.@val,BF_MAGIC;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29543,'Improve_Orb_Life','Modification Orb(Life Drain)','Card','bonus2 bHPDrainRate,20,2;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29544,'Improve_Orb_Soul','Modification Orb(Soul Drain)','Card','bonus2 bSPDrainRate,10,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29545,'Improve_Orb_M_Heal','Modification Orb(Magic Healing)','Card','autobonus "{ bonus2 bHPRegenRate,400,500; }",20,10000,BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }";');
@ -4113,7 +4113,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VAL
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29549,'Improve_Orb_L_DEX','Modification Orb(Firing Shot)','Card','autobonus "{ bonus bDex,50; bonus bLongAtkRate,10; bonus2 bSPLossRate,1,20000; }",30,10000,BF_NORMAL,"{ specialeffect2 EF_POTION_BERSERK; }";');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29550,'Improve_Orb_L_STR','Modification Orb(Over Power)','Card','autobonus "{ bonus bStr,50; bonus2 bAddClass,Class_All,15; bonus bMatkRate,-15; }",30,10000,BF_NORMAL,"{ specialeffect2 EF_POTION_BERSERK; }";');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29551,'Improve_Orb_L_AGI','Modification Orb(Fatal Flash)','Card','autobonus "{ bonus bAgi,50; bonus bCritAtkRate,10; bonus2 bHPLossRate,1,300000; }",30,10000,BF_NORMAL,"{ specialeffect2 EF_POTION_BERSERK; }";');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29552,'Improve_Orb_L_LUK','Modification Orb(Lucky Strike)','Card','.@r = getequiprefinerycnt(EQI_COMPOUND_ON);\nif (.@r>9) {\n bonus bLuk,50;\n}\nif (.@r>4) {\n .@r2 = .@r-4;\n autobonus "{ bonus bLuk,50; }",(8+(.@r2*5)),(4+(.@r2*3))*1000,BF_NORMAL;\n autobonus "{ bonus bLuk,50; }",(8+(.@r2*5)),(4+(.@r2*3))*1000,BF_MAGIC;\n}\nelse {\n autobonus "{ bonus bLuk,50; }",8,4000,BF_NORMAL;\n autobonus "{ bonus bLuk,50; }",8,4000,BF_MAGIC;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (29552,'Improve_Orb_L_LUK','Modification Orb(Lucky Strike)','Card','.@r = getrefine();\nif (.@r>9) {\n bonus bLuk,50;\n}\nif (.@r>4) {\n .@r2 = .@r-4;\n autobonus "{ bonus bLuk,50; }",(8+(.@r2*5)),(4+(.@r2*3))*1000,BF_NORMAL;\n autobonus "{ bonus bLuk,50; }",(8+(.@r2*5)),(4+(.@r2*3))*1000,BF_MAGIC;\n}\nelse {\n autobonus "{ bonus bLuk,50; }",8,4000,BF_NORMAL;\n autobonus "{ bonus bLuk,50; }",8,4000,BF_MAGIC;\n}');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`) VALUES (29579,'Racing_SG_1','Racing (Star Gladiator) 1Lv','Card',20);
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`) VALUES (29580,'Racing_SG_2','Racing (Star Gladiator) 2Lv','Card',20);
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`) VALUES (29581,'Racing_SG_3','Racing (Star Gladiator) 3Lv','Card',20);