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

Corrected Feint Bomb infinite status (#4550)

Browse Source 
* Fixes #4508.
* Resolves an issue where Feint Bomb was giving users infinite duration from AoE statuses.
Thanks to @laziem!
This commit is contained in:
Aleos
2020-01-23 16:09:52 -05:00
committed by GitHub
parent 921b3e2c3e
commit 271489960a
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/pre-re/skill_unit_db.txt
View File

@@ -134,7 +134,7 @@
2301,0xce, , 2, 0,1000,all, 0xA00E //SC_CHAOSPANIC
2302,0xcf, , 2, 0, -1,all, 0xA002 //SC_MAELSTROM
2303,0xd0, , 3, 0, -1,all, 0xA058 //SC_BLOODYLUST
2304,0xd1, , 0, 2, 500,enemy, 0x018 //SC_FEINTBOMB
2304,0xd1, , 0, 2, -1,enemy, 0x018 //SC_FEINTBOMB
2319,0xec, , 0, 3,5000,all, 0x000 //LG_BANDING

2
db/re/skill_unit_db.txt
View File

@@ -137,7 +137,7 @@
2301,0xce, , 2, 0,1000,all, 0xA00E //SC_CHAOSPANIC
2302,0xcf, , 2, 0, -1,all, 0xA002 //SC_MAELSTROM
2303,0xd0, , 3, 0, -1,all, 0xA058 //SC_BLOODYLUST
2304,0xd1, , 0, 2, 500,enemy, 0x018 //SC_FEINTBOMB
2304,0xd1, , 0, 2, -1,enemy, 0x018 //SC_FEINTBOMB
2319,0xec, , 0, 3,5000,all, 0x000 //LG_BANDING

2
src/map/pc.hpp
View File

@@ -920,7 +920,7 @@ extern struct s_job_info job_info[CLASS_COUNT];
#define pc_isfalcon(sd) ( (sd)->sc.option&OPTION_FALCON )
#define pc_isriding(sd) ( (sd)->sc.option&OPTION_RIDING )
#define pc_isinvisible(sd) ( (sd)->sc.option&OPTION_INVISIBLE && !((sd)->sc.data && (sd)->sc.data[SC__FEINTBOMB]) )
#define pc_isinvisible(sd) ( (sd)->sc.option&OPTION_INVISIBLE )
#define pc_is50overweight(sd) ( (sd)->weight * 100 >= (sd)->max_weight * battle_config.natural_heal_weight_rate )
#define pc_is70overweight(sd) ( (sd)->weight * 100 >= (sd)->max_weight * battle_config.natural_heal_weight_rate_renewal )
#define pc_is90overweight(sd) ( (sd)->weight * 10 >= (sd)->max_weight * 9 )

1
src/map/skill.cpp
View File

@@ -12313,7 +12313,6 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
return 1;
}
map_foreachinallrange(unit_changetarget, src, AREA_SIZE, BL_MOB, src, &group->unit->bl); // Release all targets against the caster
pc_setinvincibletimer(sd, skill_get_time(skill_id, skill_lv));
skill_blown(src, src, skill_get_blewcount(skill_id, skill_lv), unit_getdir(src), BLOWN_IGNORE_NO_KNOCKBACK); // Don't stop the caster from backsliding if special_state.no_knockback is active
clif_skill_nodamage(src,src,skill_id,skill_lv,sc_start(src,src,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));
}