diff options
| author | Haru <haru@dotalux.com> | 2019-08-26 01:05:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-26 01:05:53 +0200 |
| commit | 4d3fce2f301950f6c205c5722ffc44e00f3a1642 (patch) | |
| tree | 842da0dcdf7951e9e3881047d081c3f7cf501523 /src/map | |
| parent | 0045fb6fb5e40fec84721f912172ea2d9b3463b1 (diff) | |
| parent | 48bc050f9c127fddb0caca65185b265867625667 (diff) | |
| download | hercules-4d3fce2f301950f6c205c5722ffc44e00f3a1642.tar.gz hercules-4d3fce2f301950f6c205c5722ffc44e00f3a1642.tar.bz2 hercules-4d3fce2f301950f6c205c5722ffc44e00f3a1642.tar.xz hercules-4d3fce2f301950f6c205c5722ffc44e00f3a1642.zip | |
Merge pull request #2516 from Emistry/status_elemental_resist_potion
Added Elemental Resist Status Icon
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/status.c | 4 | ||||
| -rw-r--r-- | src/map/status.h | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/map/status.c b/src/map/status.c index 63e71c9dc..83434996e 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8847,7 +8847,9 @@ static int status_change_start(struct block_list *src, struct block_list *bl, en case SC_KAIZEL: val2 = 10*val1; //% of life to be revived with break; - // case SC_ARMORPROPERTY: + case SC_ARMORPROPERTY: + clif->status_change(bl, (val1 > 0 ? SI_RESIST_PROPERTY_WATER : (val2 > 0 ? SI_RESIST_PROPERTY_GROUND : (val3 > 0 ? SI_RESIST_PROPERTY_FIRE : (val4 > 0 ? SI_RESIST_PROPERTY_WIND : SI_BLANK)))), 1, tick, 0, 0, 0); + break; // case SC_ARMOR_RESIST: // Mod your resistance against elements: // val1 = water | val2 = earth | val3 = fire | val4 = wind diff --git a/src/map/status.h b/src/map/status.h index 853a7a1a6..dc7629dea 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -1772,10 +1772,10 @@ enum si_type { //SI_ATTACK_PROPERTY_TELEKINESIS = 905, //SI_ATTACK_PROPERTY_UNDEAD = 906, //SI_RESIST_PROPERTY_NOTHING = 907, - //SI_RESIST_PROPERTY_WATER = 908, - //SI_RESIST_PROPERTY_GROUND = 909, - //SI_RESIST_PROPERTY_FIRE = 910, - //SI_RESIST_PROPERTY_WIND = 911, + SI_RESIST_PROPERTY_WATER = 908, + SI_RESIST_PROPERTY_GROUND = 909, + SI_RESIST_PROPERTY_FIRE = 910, + SI_RESIST_PROPERTY_WIND = 911, //SI_RESIST_PROPERTY_POISON = 912, //SI_RESIST_PROPERTY_SAINT = 913, //SI_RESIST_PROPERTY_DARKNESS = 914, |