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

Corrected Enchant Arms status icon (#3661)

Browse Source 
* Enchant Arms should display a status icon depending on the element (skill level) being used.
Thanks to @mrjnumber1!
This commit is contained in:
Aleos
2019-04-19 21:30:03 -04:00
committed by GitHub
parent 53f5013149
commit ce1508a01c
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/skill.cpp
View File

@@ -6596,9 +6596,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
break;
case ITEM_ENCHANTARMS:
clif_skill_nodamage(src,bl,skill_id,skill_lv,
sc_start2(src,bl,type,100,skill_lv,
skill_get_ele(skill_id,skill_lv), skill_get_time(skill_id,skill_lv)));
clif_skill_nodamage(src, bl, skill_id, skill_lv, sc_start(src, bl, type, 100, skill_get_ele(skill_id, skill_lv), skill_get_time(skill_id, skill_lv)));
break;
case TK_SEVENWIND:
@@ -13035,7 +13033,7 @@ struct skill_unit_group *skill_unitsetting(struct block_list *src, uint16 skill_
else if (ele == -1) {
val1 = status->rhw.ele;
if (sc && sc->data[SC_ENCHANTARMS])
val1 = sc->data[SC_ENCHANTARMS]->val2;
val1 = sc->data[SC_ENCHANTARMS]->val1;
}
switch (val1) {
@@ -17749,7 +17747,7 @@ int skill_maelstrom_suction(struct block_list *bl, va_list ap)
void skill_enchant_elemental_end(struct block_list *bl, int type)
{
struct status_change *sc;
const enum sc_type scs[] = { SC_ENCPOISON, SC_ASPERSIO, SC_FIREWEAPON, SC_WATERWEAPON, SC_WINDWEAPON, SC_EARTHWEAPON, SC_SHADOWWEAPON, SC_GHOSTWEAPON, SC_ENCHANTARMS };
const enum sc_type scs[] = { SC_ENCPOISON, SC_ASPERSIO, SC_FIREWEAPON, SC_WATERWEAPON, SC_WINDWEAPON, SC_EARTHWEAPON, SC_SHADOWWEAPON, SC_GHOSTWEAPON };
int i;
nullpo_retv(bl);
@@ -17758,6 +17756,7 @@ void skill_enchant_elemental_end(struct block_list *bl, int type)
if (!sc->count)
return;
status_change_end(bl, SC_ENCHANTARMS, INVALID_TIMER); // Should always end
for (i = 0; i < ARRAYLENGTH(scs); i++)
if (type != scs[i] && sc->data[scs[i]])
status_change_end(bl, scs[i], INVALID_TIMER);