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

Fixed several item scripts (#7316)

Browse Source
This commit is contained in:
Atemo 2022-10-04 16:05:28 +02:00 committed by GitHub
parent 19fe27932f
commit edc7137176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
db/re/item_combos.yml
View File

@ -4835,8 +4835,6 @@ Body:
bonus2 bAddSize,Size_Large,15; bonus2 bAddSize,Size_Large,15;
bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Medium,5;
bonus2 bSubSize,Size_Large,5; bonus2 bSubSize,Size_Large,5;
bonus2 bMagicSubSize,Size_Medium,5;
bonus2 bMagicSubSize,Size_Large,5;
- Combos: - Combos:
- Combo: - Combo:
- Sarah_Card - Sarah_Card
@ -14040,9 +14038,7 @@ Body:
- C_Khaliz_Knight_Card - C_Khaliz_Knight_Card
Script: | Script: |
bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Medium,5;
bonus2 bMagicSubSize,Size_Medium,5;
bonus2 bSubSize,Size_Large,5; bonus2 bSubSize,Size_Large,5;
bonus2 bMagicSubSize,Size_Large,5;
bonus2 bMagicAddSize,Size_Medium,5; bonus2 bMagicAddSize,Size_Medium,5;
bonus2 bMagicAddSize,Size_Large,5; bonus2 bMagicAddSize,Size_Large,5;
- Combos: - Combos:
@ -14412,10 +14408,8 @@ Body:
bonus bMdef,15; bonus bMdef,15;
bonus bDef,80; bonus bDef,80;
bonus2 bSubSize,Size_Medium,(readparam(bVit)/30); bonus2 bSubSize,Size_Medium,(readparam(bVit)/30);
bonus2 bMagicSubSize,Size_Medium,(readparam(bVit)/30);
bonus2 bSubSize,Size_Large,(readparam(bVit)/30); bonus2 bSubSize,Size_Large,(readparam(bVit)/30);
bonus2 bMagicSubSize,Size_Large,(readparam(bVit)/30); autobonus2 "{ bonus2 bSubSize,Size_All,7; if (readparam(bVit) >= 120) { bonus2 bSubSize,Size_All,5; } }",1+(readparam(bVit) >= 120),10000,BF_MAGIC|BF_WEAPON;
autobonus2 "{ bonus2 bSubSize,Size_All,7; bonus2 bMagicSubSize,Size_All,7; if (readparam(bVit) >= 120) { bonus2 bSubSize,Size_All,5; bonus2 bMagicSubSize,Size_All,5; } }",1+(readparam(bVit) >= 120),10000,BF_MAGIC|BF_WEAPON;
if (.@sum >= 33) { if (.@sum >= 33) {
bonus bAspdRate,20; bonus bAspdRate,20;
bonus bDelayrate,-25; bonus bDelayrate,-25;
@ -22276,7 +22270,6 @@ Body:
- Dragonic_Slayer_LT - Dragonic_Slayer_LT
Script: | Script: |
bonus2 bSubSize,Size_All,10; bonus2 bSubSize,Size_All,10;
bonus2 bMagicSubSize,Size_All,10;
if (getequiprefinerycnt(EQI_HAND_R) >= 10) { if (getequiprefinerycnt(EQI_HAND_R) >= 10) {
bonus bLongAtkRate,10; bonus bLongAtkRate,10;
bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",10; bonus2 bSkillAtk,"RK_DRAGONBREATH_WATER",10;
@ -23314,9 +23307,7 @@ Body:
bonus2 bMagicAddRace,RC_Dragon,15; bonus2 bMagicAddRace,RC_Dragon,15;
if (@r >= 11) { if (@r >= 11) {
bonus2 bSubSize,Size_Medium,15; bonus2 bSubSize,Size_Medium,15;
bonus2 bMagicSubSize,Size_Medium,15;
bonus2 bSubSize,Size_Large,15; bonus2 bSubSize,Size_Large,15;
bonus2 bMagicSubSize,Size_Large,15;
} }
} }
} }
@ -23331,9 +23322,7 @@ Body:
bonus bMatk,50; bonus bMatk,50;
bonus bBaseAtk,50; bonus bBaseAtk,50;
bonus2 bSubSize,Size_Medium,15; bonus2 bSubSize,Size_Medium,15;
bonus2 bMagicSubSize,Size_Medium,15;
bonus2 bSubSize,Size_Large,15; bonus2 bSubSize,Size_Large,15;
bonus2 bMagicSubSize,Size_Large,15;
- Combos: - Combos:
- Combo: - Combo:
- aegis_490180 - aegis_490180

22
db/re/item_db_equip.yml
View File

@ -68755,15 +68755,12 @@ Body:
.@val = 10; .@val = 10;
if (.@r>6) { if (.@r>6) {
bonus2 bSubSize,Size_Large,10; bonus2 bSubSize,Size_Large,10;
bonus2 bMagicSubSize,Size_Large,10;
if (.@r>8) { if (.@r>8) {
.@val += 5; .@val += 5;
} }
} }
bonus2 bSubSize,Size_Small,.@val; bonus2 bSubSize,Size_Small,.@val;
bonus2 bMagicSubSize,Size_Small,.@val;
bonus2 bSubSize,Size_Medium,.@val; bonus2 bSubSize,Size_Medium,.@val;
bonus2 bMagicSubSize,Size_Medium,.@val;
- Id: 15345 - Id: 15345
AegisName: ArmorOfSeadragonBR AegisName: ArmorOfSeadragonBR
Name: Blue Dragon Armor # !todo check english name Name: Blue Dragon Armor # !todo check english name
@ -112410,17 +112407,14 @@ Body:
Refineable: true Refineable: true
Script: | Script: |
bonus2 bSubSize,Size_All,2; bonus2 bSubSize,Size_All,2;
/*bonus2 bMagicSubSize,Size_All,2;*/
.@r = getrefine(); .@r = getrefine();
bonus bMaxHP,.@r*10; bonus bMaxHP,.@r*10;
bonus bDef,.@r*10; bonus bDef,.@r*10;
if (.@r >= 7) { if (.@r >= 7) {
bonus2 bSubSize,Size_All,2; bonus2 bSubSize,Size_All,2;
/*bonus2 bMagicSubSize,Size_All,2;*/
} }
if (.@r >= 9) { if (.@r >= 9) {
bonus2 bSubSize,Size_All,3; bonus2 bSubSize,Size_All,3;
/*bonus2 bMagicSubSize,Size_All,3;*/
} }
- Id: 24427 - Id: 24427
AegisName: S_M_Exo_Co_Weapon AegisName: S_M_Exo_Co_Weapon
@ -117709,7 +117703,6 @@ Body:
bonus2 bAddSize,Size_All,(.@r/3); bonus2 bAddSize,Size_All,(.@r/3);
bonus2 bMagicAddSize,Size_All,(.@r/3); bonus2 bMagicAddSize,Size_All,(.@r/3);
bonus2 bSubSize,Size_All,(.@r/3); bonus2 bSubSize,Size_All,(.@r/3);
bonus2 bMagicSubSize,Size_All,(.@r/3);
if (.@r==10) if (.@r==10)
bonus bNoSizeFix; bonus bNoSizeFix;
- Id: 24734 - Id: 24734
@ -121392,8 +121385,6 @@ Body:
} }
bonus2 bSubSize,Size_Medium,.@red; bonus2 bSubSize,Size_Medium,.@red;
bonus2 bSubSize,Size_Large,.@red; bonus2 bSubSize,Size_Large,.@red;
bonus2 bMagicSubSize,Size_Medium,.@red;
bonus2 bMagicSubSize,Size_Large,.@red;
- Id: 28137 - Id: 28137
AegisName: Evt_Avenger AegisName: Evt_Avenger
Name: Sealed Avenger Name: Sealed Avenger
@ -121520,9 +121511,7 @@ Body:
Script: | Script: |
.@r = getrefine(); .@r = getrefine();
bonus2 bSubSize,Size_Medium,10; bonus2 bSubSize,Size_Medium,10;
bonus2 bMagicSubSize,Size_Medium,10;
bonus2 bSubSize,Size_Large,10; bonus2 bSubSize,Size_Large,10;
bonus2 bMagicSubSize,Size_Large,10;
bonus bAtkRate,5; bonus bAtkRate,5;
bonus bUnbreakableWeapon; bonus bUnbreakableWeapon;
bonus bLongAtkRate,.@r; bonus bLongAtkRate,.@r;
@ -128299,7 +128288,6 @@ Body:
Script: | Script: |
.@r = getrefine(); .@r = getrefine();
bonus2 bSubSize,Size_All,2*(.@r/3); bonus2 bSubSize,Size_All,2*(.@r/3);
bonus2 bMagicSubSize,Size_All,2*(.@r/3);
if (.@r>=7) { if (.@r>=7) {
bonus bMaxHPrate,5; bonus bMaxHPrate,5;
bonus bMaxSPrate,5; bonus bMaxSPrate,5;
@ -170938,7 +170926,6 @@ Body:
bonus bVariableCastrate,-10; bonus bVariableCastrate,-10;
if (.@r>=9) { if (.@r>=9) {
bonus2 bSubSize,Size_All,15; bonus2 bSubSize,Size_All,15;
bonus2 bMagicSubSize,Size_All,15;
bonus bLongAtkRate,15; bonus bLongAtkRate,15;
if (.@r>=11) { if (.@r>=11) {
bonus bDelayrate,-7; bonus bDelayrate,-7;
@ -171034,9 +171021,7 @@ Body:
bonus2 bSkillAtk,"RK_STORMBLAST",25; bonus2 bSkillAtk,"RK_STORMBLAST",25;
if (.@r>=11) { if (.@r>=11) {
bonus2 bSubSize,Size_Small,25; bonus2 bSubSize,Size_Small,25;
bonus2 bMagicSubSize,Size_Small,25;
bonus2 bSubSize,Size_Medium,25; bonus2 bSubSize,Size_Medium,25;
bonus2 bMagicSubSize,Size_Medium,25;
} }
} }
} }
@ -172535,14 +172520,10 @@ Body:
.@r = getrefine(); .@r = getrefine();
bonus bUnbreakableWeapon; bonus bUnbreakableWeapon;
bonus2 bSubSize,Size_Medium,15; bonus2 bSubSize,Size_Medium,15;
bonus2 bMagicSubSize,Size_Medium,15;
bonus2 bSubSize,Size_Large,15; bonus2 bSubSize,Size_Large,15;
bonus2 bMagicSubSize,Size_Large,15;
if (.@r>=7) { if (.@r>=7) {
bonus2 bSubSize,Size_Medium,15; bonus2 bSubSize,Size_Medium,15;
bonus2 bMagicSubSize,Size_Medium,15;
bonus2 bSubSize,Size_Large,15; bonus2 bSubSize,Size_Large,15;
bonus2 bMagicSubSize,Size_Large,15;
bonus bAtkRate,5; bonus bAtkRate,5;
if (.@r>=9) { if (.@r>=9) {
bonus bLongAtkRate,15; bonus bLongAtkRate,15;
@ -176126,7 +176107,6 @@ Body:
bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",30; bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",30;
if (.@r>=11) { if (.@r>=11) {
bonus2 bSubSize,Size_All,20; bonus2 bSubSize,Size_All,20;
bonus2 bMagicSubSize,Size_All,20;
bonus2 bAddEle,Ele_All,15; bonus2 bAddEle,Ele_All,15;
} }
} }
@ -176778,7 +176758,6 @@ Body:
} }
if (.@r>=7) { if (.@r>=7) {
bonus2 bSubSize,Size_All,20; bonus2 bSubSize,Size_All,20;
bonus2 bMagicSubSize,Size_All,20;
bonus2 bSkillAtk,"RL_FIREDANCE",25; bonus2 bSkillAtk,"RL_FIREDANCE",25;
if (.@r>=9) { if (.@r>=9) {
bonus bAtkRate,7; bonus bAtkRate,7;
@ -177935,7 +177914,6 @@ Body:
if (.@r>=11) { if (.@r>=11) {
bonus2 bAddSize,Size_All,15; bonus2 bAddSize,Size_All,15;
bonus2 bSubSize,Size_All,20; bonus2 bSubSize,Size_All,20;
bonus2 bMagicSubSize,Size_All,20;
} }
} }
} }

17
db/re/item_db_etc.yml
View File

@ -11476,8 +11476,6 @@ Body:
bonus bDef,20; bonus bDef,20;
bonus2 bSubSize,Size_Medium,25; bonus2 bSubSize,Size_Medium,25;
bonus2 bSubSize,Size_Large,25; bonus2 bSubSize,Size_Large,25;
bonus2 bMagicSubSize,Size_Medium,25;
bonus2 bMagicSubSize,Size_Large,25;
- Id: 4610 - Id: 4610
AegisName: Sarah_Card AegisName: Sarah_Card
Name: Sarah Card Name: Sarah Card
@ -12029,8 +12027,6 @@ Body:
Script: | Script: |
bonus2 bSubSize,Size_Small,5; bonus2 bSubSize,Size_Small,5;
bonus2 bSubSize,Size_Medium,5; bonus2 bSubSize,Size_Medium,5;
bonus2 bMagicSubSize,Size_Small,5;
bonus2 bMagicSubSize,Size_Medium,5;
- Id: 4661 - Id: 4661
AegisName: Basilisk2_Card AegisName: Basilisk2_Card
Name: Charge Basilisk Card Name: Charge Basilisk Card
@ -12045,9 +12041,6 @@ Body:
bonus2 bSubSize,Size_Medium,20; bonus2 bSubSize,Size_Medium,20;
bonus2 bSubSize,Size_Large,20; bonus2 bSubSize,Size_Large,20;
bonus2 bSubSize,Size_Small,-15; bonus2 bSubSize,Size_Small,-15;
bonus2 bMagicSubSize,Size_Medium,20;
bonus2 bMagicSubSize,Size_Large,20;
bonus2 bMagicSubSize,Size_Small,-15;
- Id: 4662 - Id: 4662
AegisName: Big_Eggring_Card AegisName: Big_Eggring_Card
Name: Big Eggring Card Name: Big Eggring Card
@ -41041,9 +41034,7 @@ Body:
Script: | Script: |
bonus bMdef,10; bonus bMdef,10;
bonus2 bSubSize,Size_Medium,25; bonus2 bSubSize,Size_Medium,25;
bonus2 bMagicSubSize,Size_Medium,25;
bonus2 bSubSize,Size_Large,25; bonus2 bSubSize,Size_Large,25;
bonus2 bMagicSubSize,Size_Large,25;
- Id: 27386 - Id: 27386
AegisName: C_Raydric_Card AegisName: C_Raydric_Card
Name: Cursed Raydric Card Name: Cursed Raydric Card
@ -43792,7 +43783,6 @@ Body:
bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_All,5;
if (.@r>=7) { if (.@r>=7) {
bonus2 bSubSize,Size_All,5; bonus2 bSubSize,Size_All,5;
bonus2 bMagicSubSize,Size_All,5;
if (.@r>=9) { if (.@r>=9) {
bonus2 bSubRace,RC_All,5; bonus2 bSubRace,RC_All,5;
bonus2 bSubRace,RC_Player_Human,-5; bonus2 bSubRace,RC_Player_Human,-5;
@ -48172,7 +48162,6 @@ Body:
bonus2 bMagicSubDefEle,Ele_Earth,15; bonus2 bMagicSubDefEle,Ele_Earth,15;
bonus2 bSubRace,RC_Insect,15; bonus2 bSubRace,RC_Insect,15;
bonus2 bWeaponSubSize,Size_Small,15; bonus2 bWeaponSubSize,Size_Small,15;
bonus2 bMagicSubSize,Size_Small,15;
- Id: 300374 - Id: 300374
AegisName: aegis_300374 AegisName: aegis_300374
Name: Hallucigenia Card Name: Hallucigenia Card
@ -48287,7 +48276,6 @@ Body:
bonus2 bSubRace,RC_Player_Doram,-15; bonus2 bSubRace,RC_Player_Doram,-15;
.@rate = (getrefine() < 12) ? -25 : 25; .@rate = (getrefine() < 12) ? -25 : 25;
bonus2 bSubSize,Size_All,.@rate; bonus2 bSubSize,Size_All,.@rate;
bonus2 bMagicSubSize,Size_All,.@rate;
if (getequiparmorlv() == 2) { if (getequiparmorlv() == 2) {
bonus bRes,50; bonus bRes,50;
bonus bMRes,50; bonus bMRes,50;
@ -48881,7 +48869,6 @@ Body:
bonus2 bSubClass,Class_Boss,7; bonus2 bSubClass,Class_Boss,7;
if (.@r>=9) { if (.@r>=9) {
bonus2 bSubSize,Size_All,7; bonus2 bSubSize,Size_All,7;
bonus2 bMagicSubSize,Size_All,7;
if (.@r>=11) { if (.@r>=11) {
bonus2 bSubRace,RC_All,7; bonus2 bSubRace,RC_All,7;
bonus2 bSubRace,RC_Player_Human,-7; bonus2 bSubRace,RC_Player_Human,-7;
@ -52551,7 +52538,6 @@ Body:
bonus2 bSubEle,Ele_All,3; bonus2 bSubEle,Ele_All,3;
if (.@r>=9) { if (.@r>=9) {
bonus2 bSubSize,Size_All,3; bonus2 bSubSize,Size_All,3;
bonus2 bMagicSubSize,Size_All,3;
if (.@r>=11) { if (.@r>=11) {
bonus2 bSubRace,RC_All,3; bonus2 bSubRace,RC_All,3;
bonus2 bSubRace,RC_Player_Human,-3; bonus2 bSubRace,RC_Player_Human,-3;
@ -52572,7 +52558,6 @@ Body:
bonus2 bSubEle,Ele_All,5; bonus2 bSubEle,Ele_All,5;
if (.@r>=9) { if (.@r>=9) {
bonus2 bSubSize,Size_All,5; bonus2 bSubSize,Size_All,5;
bonus2 bMagicSubSize,Size_All,5;
if (.@r>=11) { if (.@r>=11) {
bonus2 bSubRace,RC_All,5; bonus2 bSubRace,RC_All,5;
bonus2 bSubRace,RC_Player_Human,-5; bonus2 bSubRace,RC_Player_Human,-5;
@ -52593,7 +52578,6 @@ Body:
bonus2 bSubEle,Ele_All,7; bonus2 bSubEle,Ele_All,7;
if (.@r>=9) { if (.@r>=9) {
bonus2 bSubSize,Size_All,7; bonus2 bSubSize,Size_All,7;
bonus2 bMagicSubSize,Size_All,7;
if (.@r>=11) { if (.@r>=11) {
bonus2 bSubRace,RC_All,7; bonus2 bSubRace,RC_All,7;
bonus2 bSubRace,RC_Player_Human,-7; bonus2 bSubRace,RC_Player_Human,-7;
@ -56962,7 +56946,6 @@ Body:
bonus2 bSubEle,Ele_All,7; bonus2 bSubEle,Ele_All,7;
if (.@r>=9) { if (.@r>=9) {
bonus2 bSubSize,Size_All,7; bonus2 bSubSize,Size_All,7;
bonus2 bMagicSubSize,Size_All,7;
if (.@r>=11) { if (.@r>=11) {
bonus2 bSubRace,RC_All,7; bonus2 bSubRace,RC_All,7;
bonus2 bSubRace,RC_Player_Human,-7; bonus2 bSubRace,RC_Player_Human,-7;