diff options
author | Michieru <Michieru@users.noreply.github.com> | 2014-10-25 18:14:59 +0200 |
---|---|---|
committer | Michieru <Michieru@users.noreply.github.com> | 2014-10-25 18:14:59 +0200 |
commit | a5c0636f74a2177839aec9153b542afd8c36850a (patch) | |
tree | bf4f9b1e09113b4a3bcd6b02b705b3b2e9980ae2 /src/map/skill.c | |
parent | 3e1fe0d3842aab1c85f4dfd8e3533ca6631fc4e5 (diff) | |
download | hercules-a5c0636f74a2177839aec9153b542afd8c36850a.tar.gz hercules-a5c0636f74a2177839aec9153b542afd8c36850a.tar.bz2 hercules-a5c0636f74a2177839aec9153b542afd8c36850a.tar.xz hercules-a5c0636f74a2177839aec9153b542afd8c36850a.zip |
Sight Blaster and other skill fixes, magic reflect, crash, trap display and monster behavior fixes
- Fixed cast time of Sightrasher in pre-renewal (700ms -> 500ms)
- Official Sight Blaster behavior (bugreport:6945, partially bugreport:144)
* Sight Blaster's AoE is now 3x3 even in pre-renewal (it was originally larger so it hits traps before they trigger)
* Sight Blaster will now prevent traps from triggering as long as they are knocked back
* Fixed a bug that caused Sight Blaster to not work on traps and ice walls at all
* Sight Blaster will no longer expire when the attack was reflected
* Sight Blaster will now expire when hitting an ice wall
* Sight Blaster will now properly protect you from being attacked from its AoE range
- Sight, Ruwach and Sight Blaster will now check for a target every 20ms (previously every 250ms)
- Step action will now be canceled when being knocked back (skills won't be executed anymore when knocked out of range)
- When knock back magic is reflected it will no longer lead to the caster being knocked back (related to bugreport:6945)
- Activated traps can no longer be hit
- Fixed a problem that left "trap ghosts" forever on the screen when a trap was knocked out of the screen
- Monster behavior fixes
* Monsters will no longer be able to do normal attacks when hiding
* If out of any reason a monster on "attack" state can't move and can't do normal attacks, it will now use "attack" state skills
* The order of monster thought processing is now equal to official servers
- Fixed some potential map server crashes
Mega thanks to Playtester (rathena b88e95381d6a7)
Diffstat (limited to 'src/map/skill.c')
-rw-r--r-- | src/map/skill.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 5ea5cc424..2c52f24ac 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2120,6 +2120,7 @@ int skill_magic_reflect(struct block_list* src, struct block_list* bl, int type) * packet shouldn't display a skill animation) * flag&0x2000 is used to signal that the skill_lv should be passed as -1 to the * client (causes player characters to not scream skill name) + * flag&0x4000 - Return 0 if damage was reflected *-------------------------------------------------------------------------*/ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag) { struct Damage dmg; @@ -2791,6 +2792,9 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr map->freeblock_unlock(); + if ((flag&0x4000) && rmdamage == 1)
+ return 0; //Should return 0 when damage was reflected + return (int)cap_value(damage,INT_MIN,INT_MAX); } |