diff options
| author | Hercules.ws <Hercules@efficiently.awesome> | 2014-06-06 14:52:56 +0200 |
|---|---|---|
| committer | HerculesWSAPI <Hercules@efficiently.awesome> | 2014-06-06 14:52:56 +0200 |
| commit | 64660a7643ebdb45c45534807fcd6b38204939f3 (patch) | |
| tree | e9297d6b369442948a8808282cd20761c0f7668e /src | |
| parent | 197d401dc57fd4c02009915816354b2205f17654 (diff) | |
| download | hercules-64660a7643ebdb45c45534807fcd6b38204939f3.tar.gz hercules-64660a7643ebdb45c45534807fcd6b38204939f3.tar.bz2 hercules-64660a7643ebdb45c45534807fcd6b38204939f3.tar.xz hercules-64660a7643ebdb45c45534807fcd6b38204939f3.zip | |
HPM Hooks Update
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 106 |
2 files changed, 54 insertions, 54 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index ddd5cb73e..e6032394b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2436,7 +2436,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr case EL_ROCK_CRUSHER_ATK: case EL_HURRICANE: case EL_HURRICANE_ATK: - case EL_TYPOON_MIS:
+ case EL_TYPOON_MIS: case EL_TYPOON_MIS_ATK: case KO_BAKURETSU: case NC_MAGMA_ERUPTION: diff --git a/src/map/status.c b/src/map/status.c index a05f50748..1bd9d0d84 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8830,34 +8830,34 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t case SC_STONE_SHIELD_OPTION: val2 = 100; // Elemental modifier. break; - case SC_TROPIC:
- case SC_CHILLY_AIR:
- case SC_WILD_STORM:
- case SC_UPHEAVAL:
- val2 += 10;
- case SC_HEATER:
- case SC_COOLER:
- case SC_BLAST:
- case SC_CURSED_SOIL:
- val2 += 10;
- case SC_PYROTECHNIC:
- case SC_AQUAPLAY:
- case SC_GUST:
- case SC_PETROLOGY:
- val2 += 5;
- val3 += 9000;
- case SC_CIRCLE_OF_FIRE:
- case SC_WATER_SCREEN:
- case SC_WIND_STEP:
- case SC_SOLID_SKIN:
- case SC_FIRE_CLOAK:
- case SC_WATER_DROP:
- case SC_WIND_CURTAIN:
- case SC_STONE_SHIELD:
- val2 += 5;
- val3 += 1000;
- val4 = tick;
- tick_time = val3;
+ case SC_TROPIC: + case SC_CHILLY_AIR: + case SC_WILD_STORM: + case SC_UPHEAVAL: + val2 += 10; + case SC_HEATER: + case SC_COOLER: + case SC_BLAST: + case SC_CURSED_SOIL: + val2 += 10; + case SC_PYROTECHNIC: + case SC_AQUAPLAY: + case SC_GUST: + case SC_PETROLOGY: + val2 += 5; + val3 += 9000; + case SC_CIRCLE_OF_FIRE: + case SC_WATER_SCREEN: + case SC_WIND_STEP: + case SC_SOLID_SKIN: + case SC_FIRE_CLOAK: + case SC_WATER_DROP: + case SC_WIND_CURTAIN: + case SC_STONE_SHIELD: + val2 += 5; + val3 += 1000; + val4 = tick; + tick_time = val3; break; case SC_WATER_BARRIER: val2 = 40; // Increasement. Mdef1 ??? @@ -11143,31 +11143,31 @@ int status_change_timer(int tid, int64 tick, int id, intptr_t data) { } break; - case SC_TROPIC:
- case SC_CHILLY_AIR:
- case SC_WILD_STORM:
- case SC_UPHEAVAL:
- case SC_HEATER:
- case SC_COOLER:
- case SC_BLAST:
- case SC_CURSED_SOIL:
- case SC_PYROTECHNIC:
- case SC_AQUAPLAY:
- case SC_GUST:
- case SC_PETROLOGY:
- case SC_CIRCLE_OF_FIRE:
- case SC_WATER_SCREEN:
- case SC_WIND_STEP:
- case SC_SOLID_SKIN:
- case SC_FIRE_CLOAK:
- case SC_WATER_DROP:
- case SC_WIND_CURTAIN:
- case SC_STONE_SHIELD:
- if(status->charge(bl, 0, sce->val2) && (sce->val4==-1 || (sce->val4-=sce->val3)>=0))
- sc_timer_next(sce->val3 + tick, status->change_timer, bl->id, data);
- else
- if (bl->type == BL_ELEM)
- elemental->change_mode(BL_CAST(BL_ELEM,bl),MAX_ELESKILLTREE);
+ case SC_TROPIC: + case SC_CHILLY_AIR: + case SC_WILD_STORM: + case SC_UPHEAVAL: + case SC_HEATER: + case SC_COOLER: + case SC_BLAST: + case SC_CURSED_SOIL: + case SC_PYROTECHNIC: + case SC_AQUAPLAY: + case SC_GUST: + case SC_PETROLOGY: + case SC_CIRCLE_OF_FIRE: + case SC_WATER_SCREEN: + case SC_WIND_STEP: + case SC_SOLID_SKIN: + case SC_FIRE_CLOAK: + case SC_WATER_DROP: + case SC_WIND_CURTAIN: + case SC_STONE_SHIELD: + if(status->charge(bl, 0, sce->val2) && (sce->val4==-1 || (sce->val4-=sce->val3)>=0)) + sc_timer_next(sce->val3 + tick, status->change_timer, bl->id, data); + else + if (bl->type == BL_ELEM) + elemental->change_mode(BL_CAST(BL_ELEM,bl),MAX_ELESKILLTREE); return 0; case SC_STOMACHACHE: |