Updated Arch Bishop skills from kRO maintenance (#3258)
* Fixes #3231. * Updated Arch Bishop skills from kRO maintenance: http://ro.gnjoy.com/news/update/View.asp?seq=222&curpage=1. * Added two new skills: Vituperatum and Convenio. Thanks to @secretdataz, @Rytech2, @Angelic234, @ecdarreola, @redlightliu, @laziem, @xTakami, @admkakaroto, @Tokeiburu, and @flamefury!
This commit is contained in:
Aleos
GitHub
parent
fd4f7ccd5c
commit
d699defa74
@ -999,7 +999,7 @@
|
||||
// AB Arch Bishop
|
||||
2038,11,8,1,6,0x2,1,5,-3,yes,0,0,0,magic,0,0x0, AB_JUDEX,Judex
|
||||
2039,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0, AB_ANCILLA,Ancilla
|
||||
2040,11,8,1,6,0,0,10,-10,yes,0,0,0,magic,0,0x0, AB_ADORAMUS,Adoramus
|
||||
2040,11,8,1,6,0x2,1:1:1:1:1:1:2:2:2:2,10,-10,yes,0,0,0,magic,0,0x0, AB_ADORAMUS,Adoramus
|
||||
2041,0,6,4,0,0x3,3:7:15,3,1,yes,0,0,0,magic,0,0x0, AB_CLEMENTIA,Crementia
|
||||
2042,0,6,4,0,0x3,3:7:15,3,1,yes,0,0,0,magic,0,0x0, AB_CANTO,Canto Candidus
|
||||
2043,0,6,4,6,0x3,3:7:15,3,1,yes,0,0,0,magic,0,0x0, AB_CHEAL,Coluceo Heal
|
||||
@ -1008,15 +1008,15 @@
|
||||
2046,0,6,4,6,0x3,15,10,1,yes,0,0,0,magic,0,0x0, AB_ORATIO,Oratio
|
||||
2047,0,6,4,6,0x3,15,4,1,yes,0,0,0,magic,0,0x0, AB_LAUDAAGNUS,Lauda Agnus
|
||||
2048,0,6,4,6,0x3,15,4,1,yes,0,0,0,magic,0,0x0, AB_LAUDARAMUS,Lauda Ramus
|
||||
2049,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, AB_EUCHARISTICA,Eucharistica
|
||||
2050,11,6,16,6,0x1,0,1,1,yes,0,0,0,magic,0,0x0, AB_RENOVATIO,Renovatio
|
||||
2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0,0x0, AB_HIGHNESSHEAL,Highness Heal //CHECK Info shows this has magic attack.
|
||||
2049,0,0,0,0,0,0,0,0,no,0,0,0,none,0,0x0, AB_EUCHARISTICA,Eucharistica // Removed on kRO
|
||||
2050,11,6,4,6,0x1,15,1,1,yes,0,0,0,magic,0,0x0, AB_RENOVATIO,Renovatio
|
||||
2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0,0x0, AB_HIGHNESSHEAL,Highness Heal
|
||||
2052,11,6,1,0,0x1,0,5,1,yes,0,0x400,0,magic,0,0x10020, AB_CLEARANCE,Clearance
|
||||
2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members?
|
||||
2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0,0x0, AB_DUPLELIGHT,Duple Light //CHECK Had issues adding a skill level check to make the % go higher with the skills level. Will do later.
|
||||
2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, AB_EXPIATIO,Expiatio
|
||||
2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0,0x0, AB_DUPLELIGHT,Duple Light
|
||||
2055,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0, AB_DUPLELIGHT_MELEE,Duple Light Melee
|
||||
2056,-1,6,1,0,0,0,10,1,no,0,0,0,magic,0,0x0, AB_DUPLELIGHT_MAGIC,Duple Light Magic
|
||||
2057,0,6,4,6,0x3,4:5:6:7:8,5,1,yes,0,0,0,magic,0,0x0, AB_SILENTIUM,Silentium //CHECk Marked magic attack as well. Hmmmm....
|
||||
2057,0,6,4,6,0x3,4:5:6:7:8,5,1,yes,0,0,0,magic,0,0x0, AB_SILENTIUM,Silentium
|
||||
|
||||
2515,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, AB_SECRAMENT,Secrament
|
||||
|
||||
@ -1402,6 +1402,10 @@
|
||||
5064,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, WE_ONEFOREVER,One Forever
|
||||
5065,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, WE_CHEERUP,Cheer Up
|
||||
|
||||
// New Arch Bishop Skills
|
||||
5072,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, AB_VITUPERATUM,Vituperatum
|
||||
5073,0,0,0,0,0,0,1,0,no,0,0,0,none,0,0x0, AB_CONVENIO,Convenio
|
||||
|
||||
//****
|
||||
// Homunculus S
|
||||
8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, HLIF_HEAL,Healing Touch
|
||||
|
||||
@ -630,7 +630,7 @@
|
||||
//****
|
||||
// AB Arch Bishop
|
||||
2038,0,0,20:23:26:29:32,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_JUDEX
|
||||
2039,0,0,30,0,-30,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ANCILLA
|
||||
2039,0,0,30,0,-10,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ANCILLA
|
||||
2040,0,0,22:28:34:40:46:52:58:64:70:76,0,0,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ADORAMUS
|
||||
2041,0,0,280:320:360,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_CLEMENTIA
|
||||
2042,0,0,200:220:240,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_CANTO
|
||||
|
||||
@ -2577,7 +2577,6 @@
|
||||
4057,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio#
|
||||
4057,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus#
|
||||
4057,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus#
|
||||
4057,2049,10,2044,1,2053,1,0,0,0,0,0,0 //AB_EUCHARISTICA#Eucharistica#
|
||||
4057,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio#
|
||||
4057,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal#
|
||||
4057,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance#
|
||||
@ -2924,7 +2923,6 @@
|
||||
4063,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio#
|
||||
4063,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus#
|
||||
4063,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus#
|
||||
4063,2049,10,2044,1,2053,1,0,0,0,0,0,0 //AB_EUCHARISTICA#Eucharistica#
|
||||
4063,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio#
|
||||
4063,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal#
|
||||
4063,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance#
|
||||
@ -4580,7 +4578,6 @@
|
||||
4099,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio#
|
||||
4099,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus#
|
||||
4099,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus#
|
||||
4099,2049,10,2044,1,2053,1,0,0,0,0,0,0 //AB_EUCHARISTICA#Eucharistica#
|
||||
4099,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio#
|
||||
4099,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal#
|
||||
4099,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance#
|
||||
|
||||
@ -1778,7 +1778,7 @@
|
||||
2566,Half_Asprika,Half Asprika,4,20,,0,,20,,0,0xFFFFFFFF,63,2,4,,47,0,0,{ bonus bMdef,2; bonus3 bSubEle,Ele_Neutral,15,BF_SHORT; bonus3 bSubEle,Ele_Water,15,BF_SHORT; bonus3 bSubEle,Ele_Earth,15,BF_SHORT; bonus3 bSubEle,Ele_Fire,15,BF_SHORT; bonus3 bSubEle,Ele_Wind,15,BF_SHORT; bonus3 bSubEle,Ele_Poison,15,BF_SHORT; bonus3 bSubEle,Ele_Holy,15,BF_SHORT; bonus3 bSubEle,Ele_Dark,15,BF_SHORT; bonus3 bSubEle,Ele_Ghost,15,BF_SHORT; bonus3 bSubEle,Ele_Undead,15,BF_SHORT; bonus bFlee,15; skill "AL_TELEPORT",1; bonus bUnbreakableGarment; },{},{}
|
||||
2567,Academy_Manteau,Academy Manteau,4,0,,600,,3,,1,73,7,2,4,,0,1,0,{},{},{}
|
||||
2568,Muffler_Of_Roki,Loki's Muffler,4,20,,400,,10,,0,0xFFFFFFFF,63,2,4,,100,0,0,{ bonus bAgi,1; bonus2 bSkillAtk,"ASC_BREAKER",5; bonus2 bSkillAtk,"GC_CROSSIMPACT",5; },{},{}
|
||||
2569,Shawl_Of_Affection,Shawl Of Affection,4,20,,400,,12,,0,0x00000100,63,2,4,,100,1,0,{ bonus bFlee2,5; bonus5 bAutoSpellWhenHit,"AB_RENOVATIO",1,30,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"AB_RENOVATIO",1,40,BF_MAGIC,0; },{},{}
|
||||
2569,Shawl_Of_Affection,Shawl Of Affection,4,20,,400,,12,,0,0x00000100,63,2,4,,100,1,0,{ bonus bFlee2,5; autobonus2 "{ bonus2 bHPRegenRate,1000,5000; }",300,90000,BF_WEAPON; autobonus2 "{ bonus2 bHPRegenRate,1000,5000; }",400,90000,BF_MAGIC; },{},{}
|
||||
2570,Shawl_Of_Judgement,Shawl Of Judgement,4,20,,400,,12,,0,0x00000100,63,2,4,,100,1,0,{ bonus bFlee,5; .@i = max(2,getskilllv("AB_ORATIO")); bonus5 bAutoSpellWhenHit,"AB_ORATIO",.@i,30,BF_WEAPON,0; bonus5 bAutoSpellWhenHit,"AB_ORATIO",.@i,40,BF_MAGIC,0; },{},{}
|
||||
2571,Para_Team_Manteau2,Eden Team Manteau II,4,0,,0,,18,,0,0xFFFFFFFF,63,2,4,,60,0,0,{ bonus bFlee,12; bonus2 bSubEle,Ele_Neutral,10; },{},{}
|
||||
2572,Katabart_Sholder,Katabart Sholder,4,20,,3000,,4,,1,0xFFFFFFFF,63,2,4,,70,1,0,{},{},{}
|
||||
@ -2177,7 +2177,7 @@
|
||||
2987,Snake_Pendant,Snake Pendant,4,20,,100,,3,,1,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAgi,3; bonus bLuk,2; bonus bMdef,3; },{},{}
|
||||
2988,Winged_Ring_Of_Newoz,Oz's New Wing Ring,4,20,,100,,0,,1,0x00080000,56,1,136,,130,,,{ bonus bVariableCastrate,-25; },{},{}
|
||||
2989,Floral_Bracelet_Of_Igu,Bloody Floral Decoration Bracelet,4,20,,100,,0,,1,0x00080000,56,0,136,,130,,,{ bonus bVariableCastrate,-25; },{},{}
|
||||
2990,Pendant_Of_Harmony,Pendant of Harmony,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bMatkRate,6; bonus bHPrecovRate,50; bonus bSPrecovRate,50; bonus2 bSubEle,Ele_Holy,5; bonus5 bAutoSpell,"AB_RENOVATIO",1,100,BF_NORMAL,0; bonus4 bAutoSpellWhenHit,"PR_SANCTUARY",3,100,0; bonus bStr,-5; },{},{}
|
||||
2990,Pendant_Of_Harmony,Pendant of Harmony,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus bMatkRate,6; bonus bHPrecovRate,50; bonus bSPrecovRate,50; bonus2 bSubEle,Ele_Holy,5; autobonus "{ bonus2 bHPRegenRate,1000,5000; }",100,90000,BF_NORMAL; bonus4 bAutoSpellWhenHit,"PR_SANCTUARY",3,100,0; bonus bStr,-5; },{},{}
|
||||
2991,Pendant_Of_Chaos,Pendant of Chaos,4,20,,100,,0,,0,0xFFFFFFFF,63,2,136,,130,,,{ bonus2 bAddClass,Class_All,6; bonus2 bSubEle,Ele_Dark,5; bonus2 bResEff,Eff_Confusion,10000; bonus2 bAddEff,Eff_Confusion,500; bonus3 bAutoSpellWhenHit,"NPC_WIDECONFUSE",2,30; bonus bInt,-5; },{},{}
|
||||
2992,Pendant_Of_Maelstorm,Pendant of Maelstrom,4,20,,100,,0,,1,0xFFFFFFFF,63,2,136,,130,,,{ bonus2 bAddClass,Class_All,6; bonus bMatkRate,6; bonus bAllStats,1; bonus5 bAutoSpellWhenHit,"SC_MAELSTROM",1,100,BF_MAGIC,0; },{},{}
|
||||
2995,Supplement_Part_Dex,Supplement Part Dex,4,25000,,100,,0,,1,0x00000400,56,2,136,,100,0,0,{ bonus bUseSPrate,-10; bonus bDelayrate,-10; bonus bVariableCastrate,-10; bonus2 bSkillCooldown,"NC_AXEBOOMERANG",-2000; },{},{}
|
||||
@ -6557,7 +6557,7 @@
|
||||
12330,Recall_FemaleGM,Summon Female GameMaster Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ mercenary_create 2001,1800000; },{},{}
|
||||
12331,Ginseng,Ginseng,0,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 6,0; },{},{}
|
||||
12332,Fruit_Juice,Fruit Juice,0,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 0,6; },{},{}
|
||||
12333,Ansila,Ancilla,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 0,15; },{},{}
|
||||
12333,Ansila,Ancilla,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 0,15; sc_start SC_ANCILLA,60000,1; },{},{}
|
||||
12334,Cherish_Box,Treasure Edition Helm Box,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getrandgroupitem(IG_Cherish_Box,1); },{},{}
|
||||
12335,Yummy_Skewered_Dish,Grilled Delicious Skewer,0,1000,,350,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 60,60; },{},{}
|
||||
12336,Baked_Mushroom,Grilled Mushroom,0,500,,300,,,,,0xFFFFFFFF,63,2,,,,,,{ percentheal 30,30; },{},{}
|
||||
|
||||
@ -1201,6 +1201,10 @@
|
||||
2057,4000,0,0,20000:30000:40000:50000:60000,0,15000,-1
|
||||
//-- AB_OFFERTORIUM
|
||||
5011,5000:4000:3000:2000:1000,500,0,90000,0,0,-1
|
||||
//-- AB_VITUPERATUM
|
||||
5072,1000,1000,0,600000,0,5000,3000:2500:2000:1500:1000
|
||||
//-- AB_CONVENIO
|
||||
5073,2000,1000,0,0,0,5000,2000
|
||||
//==========================================
|
||||
|
||||
//===== Warlock ============================
|
||||
|
||||
@ -1005,7 +1005,7 @@
|
||||
// AB Arch Bishop
|
||||
2038,11,8,1,6,0x2,1,5,-3,yes,0,0,0,magic,0,0x0, AB_JUDEX,Judex
|
||||
2039,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0, AB_ANCILLA,Ancilla
|
||||
2040,11,8,1,6,0,0,10,-10,yes,0,0,0,magic,0,0x0, AB_ADORAMUS,Adoramus
|
||||
2040,11,8,1,6,0x2,1:1:1:1:1:1:2:2:2:2,10,-10,yes,0,0,0,magic,0,0x0, AB_ADORAMUS,Adoramus
|
||||
2041,0,6,4,0,0x3,3:7:15,3,1,yes,0,0,0,magic,0,0x0, AB_CLEMENTIA,Crementia
|
||||
2042,0,6,4,0,0x3,3:7:15,3,1,yes,0,0,0,magic,0,0x0, AB_CANTO,Canto Candidus
|
||||
2043,0,6,4,6,0x3,3:7:15,3,1,yes,0,0,0,magic,0,0x0, AB_CHEAL,Coluceo Heal
|
||||
@ -1014,15 +1014,15 @@
|
||||
2046,0,6,4,6,0x3,15,10,1,yes,0,0,0,magic,0,0x0, AB_ORATIO,Oratio
|
||||
2047,0,6,4,6,0x3,15,4,1,yes,0,0,0,magic,0,0x0, AB_LAUDAAGNUS,Lauda Agnus
|
||||
2048,0,6,4,6,0x3,15,4,1,yes,0,0,0,magic,0,0x0, AB_LAUDARAMUS,Lauda Ramus
|
||||
2049,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, AB_EUCHARISTICA,Eucharistica
|
||||
2050,11,6,16,6,0x1,0,1,1,yes,0,0,0,magic,0,0x0, AB_RENOVATIO,Renovatio
|
||||
2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0,0x0, AB_HIGHNESSHEAL,Highness Heal //CHECK Info shows this has magic attack.
|
||||
2049,0,0,0,0,0,0,0,0,no,0,0,0,none,0,0x0, AB_EUCHARISTICA,Eucharistica // Removed on kRO
|
||||
2050,11,6,4,6,0x1,15,1,1,yes,0,0,0,magic,0,0x0, AB_RENOVATIO,Renovatio
|
||||
2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0,0x0, AB_HIGHNESSHEAL,Highness Heal
|
||||
2052,11,6,1,0,0x1,0,5,1,yes,0,0x400,0,magic,0,0x10020, AB_CLEARANCE,Clearance
|
||||
2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, AB_EXPIATIO,Expiatio //CHECK Does this also give the buff to party members?
|
||||
2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0,0x0, AB_DUPLELIGHT,Duple Light //CHECK Had issues adding a skill level check to make the % go higher with the skills level. Will do later.
|
||||
2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, AB_EXPIATIO,Expiatio
|
||||
2054,0,6,4,6,0x1,0,10,1,yes,0,0,0,none,0,0x0, AB_DUPLELIGHT,Duple Light
|
||||
2055,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0, AB_DUPLELIGHT_MELEE,Duple Light Melee
|
||||
2056,-1,6,1,0,0,0,10,1,no,0,0,0,magic,0,0x0, AB_DUPLELIGHT_MAGIC,Duple Light Magic
|
||||
2057,0,6,4,6,0x3,4:5:6:7:8,5,1,yes,0,0,0,magic,0,0x0, AB_SILENTIUM,Silentium //CHECk Marked magic attack as well. Hmmmm....
|
||||
2057,0,6,4,6,0x3,4:5:6:7:8,5,1,yes,0,0,0,magic,0,0x0, AB_SILENTIUM,Silentium
|
||||
|
||||
2515,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, AB_SECRAMENT,Secrament
|
||||
|
||||
@ -1456,8 +1456,8 @@
|
||||
5065,1,6,4,0,0x3,3,1,1,yes,0,0x4,0,none,0,0, WE_CHEERUP,Cheer Up
|
||||
|
||||
// New Arch Bishop Skills
|
||||
5072,11,0,1,0,0,0,5,0,yes,0,0,0,none,0,0, AB_VITUPERATUM,Vituperatum
|
||||
5073,0,0,4,0,0,0,1,0,yes,0,0,0,none,0,0, AB_CONVENIO,Convenio
|
||||
5072,9,6,1,0,0x3,1:1:1:2:2,5,0,yes,0,0,0,magic,0,0x0, AB_VITUPERATUM,Vituperatum
|
||||
5073,0,6,4,0,0x1,0,1,0,yes,0,0,0,none,0,0x0, AB_CONVENIO,Convenio
|
||||
|
||||
//****
|
||||
// Homunculus S
|
||||
|
||||
@ -629,7 +629,7 @@
|
||||
//****
|
||||
// AB Arch Bishop
|
||||
2038,0,0,20:23:26:29:32,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_JUDEX
|
||||
2039,0,0,30,0,-30,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ANCILLA
|
||||
2039,0,0,30,0,-10,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ANCILLA
|
||||
2040,0,0,22:28:34:40:46:52:58:64:70:76,0,0,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ADORAMUS
|
||||
2041,0,0,280:320:360,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_CLEMENTIA
|
||||
2042,0,0,200:220:240,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_CANTO
|
||||
@ -1053,7 +1053,7 @@
|
||||
5065,0,0,50,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP
|
||||
|
||||
// New Arch Bishop Skills
|
||||
5072,0,0,144:120:106:92:78,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_VITUPERATUM##
|
||||
5072,0,0,144:120:106:92:78,0,0,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_VITUPERATUM##
|
||||
5073,0,0,70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_CONVENIO##
|
||||
|
||||
8001,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,545,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL
|
||||
|
||||
@ -2602,7 +2602,6 @@
|
||||
4057,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio#
|
||||
4057,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus#
|
||||
4057,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus#
|
||||
4057,2049,10,2044,1,2053,1,0,0,0,0,0,0 //AB_EUCHARISTICA#Eucharistica#
|
||||
4057,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio#
|
||||
4057,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal#
|
||||
4057,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance#
|
||||
@ -2612,6 +2611,8 @@
|
||||
4057,2515,5,2044,1,2053,1,0,0,0,0,0,0 //AB_SECRAMENT#Secrament#
|
||||
4057,5011,5,2051,2,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
|
||||
4057,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
|
||||
4057,5072,5,2044,1,2053,1,0,0,0,0,0,0 //AB_VITUPERATUM#Vituperatum#
|
||||
4057,5073,1,2039,1,2046,5,0,0,0,0,0,0 //AB_CONVENIO#Convenio#
|
||||
//Mechanic (Regular)
|
||||
4058,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
|
||||
4058,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
|
||||
@ -2949,7 +2950,6 @@
|
||||
4063,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio#
|
||||
4063,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus#
|
||||
4063,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus#
|
||||
4063,2049,10,2044,1,2053,1,0,0,0,0,0,0 //AB_EUCHARISTICA#Eucharistica#
|
||||
4063,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio#
|
||||
4063,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal#
|
||||
4063,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance#
|
||||
@ -2959,6 +2959,8 @@
|
||||
4063,2515,5,2044,1,2053,1,0,0,0,0,0,0 //AB_SECRAMENT#Secrament#
|
||||
4063,5011,5,2051,2,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
|
||||
4063,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
|
||||
4063,5072,5,2044,1,2053,1,0,0,0,0,0,0 //AB_VITUPERATUM#Vituperatum#
|
||||
4063,5073,1,2039,1,2046,5,0,0,0,0,0,0 //AB_CONVENIO#Convenio#
|
||||
//Mechanic (Trans)
|
||||
4064,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
|
||||
4064,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
|
||||
@ -4608,7 +4610,6 @@
|
||||
4099,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio#
|
||||
4099,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus#
|
||||
4099,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus#
|
||||
4099,2049,10,2044,1,2053,1,0,0,0,0,0,0 //AB_EUCHARISTICA#Eucharistica#
|
||||
4099,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio#
|
||||
4099,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal#
|
||||
4099,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance#
|
||||
@ -4619,6 +4620,8 @@
|
||||
4099,5011,5,2051,2,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
|
||||
4099,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle#
|
||||
4099,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up#
|
||||
4099,5072,5,2044,1,2053,1,0,0,0,0,0,0 //AB_VITUPERATUM#Vituperatum#
|
||||
4099,5073,1,2039,1,2046,5,0,0,0,0,0,0 //AB_CONVENIO#Convenio#
|
||||
//Baby Mechanic
|
||||
4100,1,9,0,0,0,0,0,0,0,0,0,0 //NV_BASIC#Basic Skill#
|
||||
4100,142,1,0,0,0,0,0,0,0,0,0,0 //NV_FIRSTAID#First Aid#
|
||||
|
||||
3
sql-files/upgrades/upgrade_20180830.sql
Normal file
3
sql-files/upgrades/upgrade_20180830.sql
Normal file
@ -0,0 +1,3 @@
|
||||
UPDATE `char` ch, `skill` sk SET ch.`skill_point` = ch.`skill_point + sk.`lv` WHERE sk.`id` = 2049 AND ch.`char_id` = sk.`char_id`;
|
||||
|
||||
DELETE FROM `skill` WHERE `id` = 2049;
|
||||
@ -3876,7 +3876,7 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
|
||||
skillratio += 100 * (skill_lv - 1);
|
||||
break;
|
||||
case AB_DUPLELIGHT_MELEE:
|
||||
skillratio += 10 * skill_lv;
|
||||
skillratio += 50 + 15 * skill_lv;
|
||||
break;
|
||||
case RA_ARROWSTORM:
|
||||
skillratio += 900 + 80 * skill_lv;
|
||||
@ -5836,9 +5836,6 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
|
||||
case PF_SOULBURN:
|
||||
ad.damage = tstatus->sp * 2;
|
||||
break;
|
||||
case AB_RENOVATIO:
|
||||
ad.damage = status_get_lv(src) * 10 + sstatus->int_;
|
||||
break;
|
||||
default: {
|
||||
if (sstatus->matk_max > sstatus->matk_min) {
|
||||
MATK_ADD(sstatus->matk_min+rnd()%(sstatus->matk_max-sstatus->matk_min));
|
||||
@ -6000,14 +5997,16 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
|
||||
#endif
|
||||
case AB_JUDEX:
|
||||
skillratio += 200 + 20 * skill_lv;
|
||||
if (skill_lv == 5)
|
||||
skillratio += 170;
|
||||
RE_LVL_DMOD(100);
|
||||
break;
|
||||
case AB_ADORAMUS:
|
||||
skillratio += 400 + 100 * skill_lv;
|
||||
skillratio += 230 + 70 * skill_lv;
|
||||
RE_LVL_DMOD(100);
|
||||
break;
|
||||
case AB_DUPLELIGHT_MAGIC:
|
||||
skillratio += 100 + 20 * skill_lv;
|
||||
skillratio += 300 + 40 * skill_lv;
|
||||
break;
|
||||
case WL_SOULEXPANSION:
|
||||
skillratio += -100 + (skill_lv + 4) * 100 + status_get_int(src);
|
||||
@ -6285,6 +6284,14 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
|
||||
if(tsc && tsc->data[SC_ASSUMPTIO])
|
||||
mdef <<= 1; // only eMDEF is doubled
|
||||
#endif
|
||||
if (sc && sc->data[SC_EXPIATIO]) {
|
||||
i = 5 * sc->data[SC_EXPIATIO]->val1; // 5% per level
|
||||
|
||||
i = min(i, 100); //cap it to 100 for 5 mdef min
|
||||
mdef -= mdef * i / 100;
|
||||
//mdef2 -= mdef2 * i / 100;
|
||||
}
|
||||
|
||||
if(sd) {
|
||||
i = sd->ignore_mdef_by_race[tstatus->race] + sd->ignore_mdef_by_race[RC_ALL];
|
||||
i += sd->ignore_mdef_by_class[tstatus->class_] + sd->ignore_mdef_by_class[CLASS_ALL];
|
||||
|
||||
@ -1513,6 +1513,7 @@
|
||||
export_constant(SC_GLASTHEIM_STATE);
|
||||
export_constant(SC_GLASTHEIM_ITEMDEF);
|
||||
export_constant(SC_GLASTHEIM_HPSP);
|
||||
export_constant(SC_ANCILLA);
|
||||
#ifdef RENEWAL
|
||||
export_constant(SC_EXTREMITYFIST2);
|
||||
#endif
|
||||
|
||||
@ -527,7 +527,9 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, uint16 sk
|
||||
if (tsc->data[SC_EXTRACT_WHITE_POTION_Z])
|
||||
hp_bonus += tsc->data[SC_EXTRACT_WHITE_POTION_Z]->val1;
|
||||
if (tsc->data[SC_GLASTHEIM_HEAL])
|
||||
hp_bonus += sc->data[SC_GLASTHEIM_HEAL]->val2;
|
||||
hp_bonus += tsc->data[SC_GLASTHEIM_HEAL]->val2;
|
||||
if (tsc->data[SC_ANCILLA])
|
||||
hp_bonus += tsc->data[SC_ANCILLA]->val1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4910,6 +4912,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
case NPC_JACKFROST:
|
||||
case RK_IGNITIONBREAK:
|
||||
case AB_JUDEX:
|
||||
case AB_ADORAMUS:
|
||||
case WL_SOULEXPANSION:
|
||||
case WL_CRIMSONROCK:
|
||||
case WL_JACKFROST:
|
||||
@ -5199,8 +5202,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
|
||||
case NJ_KOUENKA:
|
||||
case NJ_HYOUSENSOU:
|
||||
case NJ_HUUJIN:
|
||||
case AB_ADORAMUS:
|
||||
case AB_RENOVATIO:
|
||||
case AB_HIGHNESSHEAL:
|
||||
case AB_DUPLELIGHT_MAGIC:
|
||||
case WM_METALICSOUND:
|
||||
@ -6110,7 +6111,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
case AL_HEAL:
|
||||
case ALL_RESURRECTION:
|
||||
case PR_ASPERSIO:
|
||||
case AB_RENOVATIO:
|
||||
case AB_HIGHNESSHEAL:
|
||||
//Apparently only player casted skills can be offensive like this.
|
||||
if (sd && battle_check_undead(tstatus->race,tstatus->def_ele)) {
|
||||
@ -6648,7 +6648,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
case NPC_INVINCIBLE:
|
||||
case NPC_INVINCIBLEOFF:
|
||||
case RK_DEATHBOUND:
|
||||
case AB_RENOVATIO:
|
||||
case AB_EXPIATIO:
|
||||
case AB_DUPLELIGHT:
|
||||
case AB_SECRAMENT:
|
||||
@ -9239,9 +9238,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
break;
|
||||
|
||||
case AB_PRAEFATIO:
|
||||
if( !sd || sd->status.party_id == 0 || flag&1 )
|
||||
clif_skill_nodamage(bl, bl, skill_id, skill_lv, sc_start4(src, bl, type, 100, skill_lv, 0, 0, (sd && sd->status.party_id ? party_foreachsamemap(party_sub_count, sd, 0) : 1 ), skill_get_time(skill_id, skill_lv)));
|
||||
else if( sd )
|
||||
case AB_RENOVATIO:
|
||||
if( !sd || sd->status.party_id == 0 || flag&1 ) {
|
||||
if (skill_id == AB_PRAEFATIO)
|
||||
clif_skill_nodamage(bl, bl, skill_id, skill_lv, sc_start4(src, bl, type, 100, skill_lv, 0, 0, (sd && sd->status.party_id ? party_foreachsamemap(party_sub_count, sd, 0) : 1 ), skill_get_time(skill_id, skill_lv)));
|
||||
else
|
||||
clif_skill_nodamage(bl, bl, skill_id, skill_lv, sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv)));
|
||||
} else if( sd )
|
||||
party_foreachsamemap(skill_area_sub, sd, skill_get_splash(skill_id, skill_lv), src, skill_id, skill_lv, tick, flag|BCT_PARTY|1, skill_castend_nodamage_id);
|
||||
break;
|
||||
|
||||
@ -9280,8 +9283,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
if( flag&1 || !sd || !sd->status.party_id ) {
|
||||
if( tsc && (tsc->data[SC_FREEZE] || tsc->data[SC_STONE] || tsc->data[SC_BLIND] ||
|
||||
tsc->data[SC_BURNING] || tsc->data[SC_FREEZING] || tsc->data[SC_CRYSTALIZE])) {
|
||||
// Success Chance: (40 + 10 * Skill Level) %
|
||||
if( rnd()%100 > 40+10*skill_lv ) break;
|
||||
// Success Chance: (60 + 10 * Skill Level) %
|
||||
if( rnd()%100 > 60+10*skill_lv ) break;
|
||||
status_change_end(bl, SC_FREEZE, INVALID_TIMER);
|
||||
status_change_end(bl, SC_STONE, INVALID_TIMER);
|
||||
status_change_end(bl, SC_BLIND, INVALID_TIMER);
|
||||
@ -9299,8 +9302,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
case AB_LAUDARAMUS:
|
||||
if( flag&1 || !sd || !sd->status.party_id ) {
|
||||
if( tsc && (tsc->data[SC_SLEEP] || tsc->data[SC_STUN] || tsc->data[SC_MANDRAGORA] || tsc->data[SC_SILENCE] || tsc->data[SC_DEEPSLEEP]) ){
|
||||
// Success Chance: (40 + 10 * Skill Level) %
|
||||
if( rnd()%100 > 40+10*skill_lv ) break;
|
||||
// Success Chance: (60 + 10 * Skill Level) %
|
||||
if( rnd()%100 > 60+10*skill_lv ) break;
|
||||
status_change_end(bl, SC_SLEEP, INVALID_TIMER);
|
||||
status_change_end(bl, SC_STUN, INVALID_TIMER);
|
||||
status_change_end(bl, SC_MANDRAGORA, INVALID_TIMER);
|
||||
@ -10938,6 +10941,49 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
|
||||
}
|
||||
break;
|
||||
|
||||
case AB_VITUPERATUM:
|
||||
if (flag&1)
|
||||
clif_skill_nodamage(src, bl, skill_id, skill_lv, sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv)));
|
||||
else {
|
||||
map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill_castend_nodamage_id);
|
||||
clif_skill_nodamage(src, bl, skill_id, skill_lv, 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case AB_CONVENIO:
|
||||
if (sd) {
|
||||
party_data *p = party_search(sd->status.party_id);
|
||||
int i = 0, count = 0;
|
||||
|
||||
// Only usable in party
|
||||
if (p == nullptr) {
|
||||
clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
|
||||
break;
|
||||
}
|
||||
|
||||
// Only usable as party leader.
|
||||
ARR_FIND(0, MAX_PARTY, i, p->data[i].sd == sd);
|
||||
if (i == MAX_PARTY || !p->party.member[i].leader) {
|
||||
clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
|
||||
break;
|
||||
}
|
||||
|
||||
// Do the teleport part
|
||||
for (i = 0; i < MAX_PARTY; ++i) {
|
||||
map_session_data *pl_sd = pl_sd = p->data[i].sd;
|
||||
|
||||
if (pl_sd == nullptr || pl_sd == sd || pl_sd->status.party_id != p->party.party_id || pc_isdead(pl_sd) ||
|
||||
sd->bl.m != pl_sd->bl.m)
|
||||
continue;
|
||||
if (!(map_getmapflag(sd->bl.m, MF_NOTELEPORT) || map_getmapflag(sd->bl.m, MF_PVP) || map_getmapflag(sd->bl.m, MF_BATTLEGROUND) || map_flag_gvg2(sd->bl.m))) {
|
||||
pc_setpos(pl_sd, map_id2index(sd->bl.m), sd->bl.x, sd->bl.y, CLR_TELEPORT);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
if (!count)
|
||||
clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
ShowWarning("skill_castend_nodamage_id: Unknown skill used:%d\n",skill_id);
|
||||
clif_skill_nodamage(src,bl,skill_id,skill_lv,1);
|
||||
@ -15305,19 +15351,6 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i
|
||||
}
|
||||
}
|
||||
break;
|
||||
/**
|
||||
* Keeping as a note:
|
||||
* Bug Report #17 provides a link to a sep-2011 changelog that shows this requirement was removed
|
||||
*/
|
||||
//case AB_LAUDAAGNUS:
|
||||
//case AB_LAUDARAMUS:
|
||||
// if( !sd->status.party_id ) {
|
||||
// clif_skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
|
||||
// return false;
|
||||
// }
|
||||
// break;
|
||||
|
||||
|
||||
case AB_ADORAMUS: // bugreport:7647 mistress card DOES remove requirements for gemstones from Adoramus and Comet -helvetica
|
||||
case WL_COMET:
|
||||
if( skill_check_pc_partner(sd,skill_id,&skill_lv,1,0) <= 0 && require.itemid[0]
|
||||
|
||||
@ -1425,7 +1425,7 @@ enum e_skill {
|
||||
AB_ORATIO,
|
||||
AB_LAUDAAGNUS,
|
||||
AB_LAUDARAMUS,
|
||||
AB_EUCHARISTICA,
|
||||
AB_EUCHARISTICA, // Removed on kRO
|
||||
AB_RENOVATIO,
|
||||
AB_HIGHNESSHEAL,
|
||||
AB_CLEARANCE,
|
||||
|
||||
@ -668,13 +668,14 @@ void initChangeTables(void)
|
||||
set_sc( AB_EPICLESIS , SC_EPICLESIS , EFST_EPICLESIS , SCB_MAXHP );
|
||||
add_sc( AB_PRAEFATIO , SC_KYRIE );
|
||||
set_sc_with_vfx( AB_ORATIO , SC_ORATIO , EFST_ORATIO , SCB_NONE );
|
||||
set_sc( AB_LAUDAAGNUS , SC_LAUDAAGNUS , EFST_LAUDAAGNUS , SCB_VIT );
|
||||
set_sc( AB_LAUDARAMUS , SC_LAUDARAMUS , EFST_LAUDARAMUS , SCB_LUK );
|
||||
set_sc( AB_LAUDAAGNUS , SC_LAUDAAGNUS , EFST_LAUDAAGNUS , SCB_MAXHP );
|
||||
set_sc( AB_LAUDARAMUS , SC_LAUDARAMUS , EFST_LAUDARAMUS , SCB_ALL );
|
||||
set_sc( AB_RENOVATIO , SC_RENOVATIO , EFST_RENOVATIO , SCB_REGEN );
|
||||
set_sc( AB_EXPIATIO , SC_EXPIATIO , EFST_EXPIATIO , SCB_NONE );
|
||||
set_sc( AB_DUPLELIGHT , SC_DUPLELIGHT , EFST_DUPLELIGHT , SCB_NONE );
|
||||
set_sc( AB_SECRAMENT , SC_SECRAMENT , EFST_AB_SECRAMENT, SCB_NONE );
|
||||
set_sc( AB_OFFERTORIUM , SC_OFFERTORIUM , EFST_OFFERTORIUM , SCB_NONE );
|
||||
add_sc( AB_VITUPERATUM , SC_AETERNA );
|
||||
|
||||
/* Warlock */
|
||||
add_sc( WL_WHITEIMPRISON , SC_WHITEIMPRISON );
|
||||
@ -1166,6 +1167,8 @@ void initChangeTables(void)
|
||||
StatusIconChangeTable[SC_GLASTHEIM_ITEMDEF] = EFST_GLASTHEIM_ITEMDEF;
|
||||
StatusIconChangeTable[SC_GLASTHEIM_HPSP] = EFST_GLASTHEIM_HPSP;
|
||||
|
||||
StatusIconChangeTable[SC_ANCILLA] = EFST_ANCILLA;
|
||||
|
||||
/* Other SC which are not necessarily associated to skills */
|
||||
StatusChangeFlagTable[SC_ASPDPOTION0] |= SCB_ASPD;
|
||||
StatusChangeFlagTable[SC_ASPDPOTION1] |= SCB_ASPD;
|
||||
@ -3067,6 +3070,8 @@ static int status_get_hpbonus(struct block_list *bl, enum e_status_bonus type) {
|
||||
bonus += sc->data[SC_CURSED_SOIL_OPTION]->val2;
|
||||
if(sc->data[SC_UPHEAVAL_OPTION])
|
||||
bonus += sc->data[SC_UPHEAVAL_OPTION]->val2;
|
||||
if(sc->data[SC_LAUDAAGNUS])
|
||||
bonus += 2 + (sc->data[SC_LAUDAAGNUS]->val1 * 2);
|
||||
|
||||
//Decreasing
|
||||
if(sc->data[SC_VENOMBLEED])
|
||||
@ -4106,16 +4111,6 @@ int status_calc_pc_sub(struct map_session_data* sd, enum e_status_calc_opt opt)
|
||||
sd->magic_addrace[RC_DRAGON]+=skill;
|
||||
sd->subrace[RC_DRAGON]+=skill;
|
||||
}
|
||||
if((skill = pc_checkskill(sd, AB_EUCHARISTICA)) > 0) {
|
||||
sd->right_weapon.addrace[RC_DEMON] += skill;
|
||||
sd->right_weapon.addele[ELE_DARK] += skill;
|
||||
sd->left_weapon.addrace[RC_DEMON] += skill;
|
||||
sd->left_weapon.addele[ELE_DARK] += skill;
|
||||
sd->magic_addrace[RC_DEMON] += skill;
|
||||
sd->magic_addele[ELE_DARK] += skill;
|
||||
sd->subrace[RC_DEMON] += skill;
|
||||
sd->subele[ELE_DARK] += skill;
|
||||
}
|
||||
|
||||
if(sc->count) {
|
||||
if(sc->data[SC_CONCENTRATE]) { // Update the card-bonus data
|
||||
@ -4210,6 +4205,8 @@ int status_calc_pc_sub(struct map_session_data* sd, enum e_status_calc_opt opt)
|
||||
sd->ignore_mdef_by_race[RC_UNDEAD] += sc->data[SC_GLASTHEIM_ATK]->val1;
|
||||
sd->ignore_mdef_by_race[RC_DEMON] += sc->data[SC_GLASTHEIM_ATK]->val1;
|
||||
}
|
||||
if (sc->data[SC_LAUDARAMUS])
|
||||
sd->bonus.crit_atk_rate += 5 * sc->data[SC_LAUDARAMUS]->val1;
|
||||
}
|
||||
status_cpy(&sd->battle_status, base_status);
|
||||
|
||||
@ -4524,8 +4521,12 @@ void status_calc_regen(struct block_list *bl, struct status_data *status, struct
|
||||
if( (skill=pc_checkskill(sd,WM_LESSON)) > 0 )
|
||||
val += 3 + 3 * skill;
|
||||
|
||||
if (sc && sc->count && sc->data[SC_SHRIMPBLESSING])
|
||||
val += 150 / 100;
|
||||
if (sc && sc->count) {
|
||||
if (sc->data[SC_SHRIMPBLESSING])
|
||||
val += 150 / 100;
|
||||
if (sc->data[SC_ANCILLA])
|
||||
val += sc->data[SC_ANCILLA]->val2 / 100;
|
||||
}
|
||||
|
||||
sregen->sp = cap_value(val, 0, SHRT_MAX);
|
||||
|
||||
@ -5629,8 +5630,6 @@ static unsigned short status_calc_vit(struct block_list *bl, struct status_chang
|
||||
vit += sc->data[SC_MARIONETTE2]->val3&0xFF;
|
||||
if(sc->data[SC_SPIRIT] && sc->data[SC_SPIRIT]->val2 == SL_HIGH)
|
||||
vit += sc->data[SC_SPIRIT]->val3&0xFF;
|
||||
if(sc->data[SC_LAUDAAGNUS])
|
||||
vit += 4 + sc->data[SC_LAUDAAGNUS]->val1;
|
||||
if(sc->data[SC_MINOR_BBQ])
|
||||
vit += sc->data[SC_MINOR_BBQ]->val1;
|
||||
if(sc->data[SC_INSPIRATION])
|
||||
@ -5864,8 +5863,6 @@ static unsigned short status_calc_luk(struct block_list *bl, struct status_chang
|
||||
luk -= sc->data[SC_STOMACHACHE]->val1;
|
||||
if(sc->data[SC_KYOUGAKU])
|
||||
luk -= sc->data[SC_KYOUGAKU]->val2;
|
||||
if(sc->data[SC_LAUDARAMUS])
|
||||
luk += 4 + sc->data[SC_LAUDARAMUS]->val1;
|
||||
if(sc->data[SC_2011RWC_SCROLL])
|
||||
luk += sc->data[SC_2011RWC_SCROLL]->val1;
|
||||
if(sc->data[SC__STRIPACCESSORY] && bl->type != BL_PC)
|
||||
@ -11173,6 +11170,10 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
|
||||
val1 = 10000; // HP bonus
|
||||
val2 = 1000; // SP bonus
|
||||
break;
|
||||
case SC_ANCILLA:
|
||||
val1 = 15; // Heal Power rate bonus
|
||||
val2 = 30; // SP Recovery rate bonus
|
||||
break;
|
||||
|
||||
default:
|
||||
if( calc_flag == SCB_NONE && StatusSkillChangeTable[type] == -1 && StatusIconChangeTable[type] == EFST_BLANK ) {
|
||||
@ -13164,7 +13165,7 @@ TIMER_FUNC(status_change_timer){
|
||||
|
||||
case SC_RENOVATIO:
|
||||
if( --(sce->val4) >= 0 ) {
|
||||
int heal = status->max_hp * 3 / 100;
|
||||
int heal = status->max_hp * 5 / 100;
|
||||
if( sc && sc->data[SC_AKAITSUKI] && heal )
|
||||
heal = ~heal + 1;
|
||||
status_heal(bl, heal, 0, 3);
|
||||
|
||||
@ -853,6 +853,8 @@ enum sc_type : int16 {
|
||||
SC_GLASTHEIM_ITEMDEF,
|
||||
SC_GLASTHEIM_HPSP,
|
||||
|
||||
SC_ANCILLA,
|
||||
|
||||
#ifdef RENEWAL
|
||||
SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user