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

Added skill_duration mapflag. (#2171)

Browse Source 
* Added skill_duration mapflag.
* This mapflag sets a skill unit time limit to n% of original duration.
* Implemented mapflags for Hunter's Traps in GVG, BG, and Novice Guild maps.

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
This commit is contained in:
Jittapan Pluemsumran
2018-10-26 19:52:49 +07:00
committed by Aleos
parent 2140722743
commit 84b4f09874
15 changed files with 797 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/map/map.cpp
View File

@@ -3569,6 +3569,7 @@ void map_flags_init(void){
// Clear adjustment data, will be reset after loading NPC
mapdata->damage_adjust = {};
mapdata->skill_damage.clear();
mapdata->skill_duration.clear();
map_free_questinfo(mapdata);
if (instance_start && i >= instance_start)
@@ -3594,6 +3595,7 @@ void map_data_copy(struct map_data *dst_map, struct map_data *src_map) {
dst_map->flag.insert(src_map->flag.begin(), src_map->flag.end());
dst_map->skill_damage.insert(src_map->skill_damage.begin(), src_map->skill_damage.end());
dst_map->skill_duration.insert(src_map->skill_duration.begin(), src_map->skill_duration.end());
dst_map->zone = src_map->zone;
dst_map->qi_count = 0;
@@ -4457,6 +4459,19 @@ void map_skill_damage_add(struct map_data *m, uint16 skill_id, int rate[SKILLDMG
m->skill_damage.insert({ skill_id, entry });
}
/**
* Add new skill duration adjustment entry for a map
* @param mapd: Map data
* @param skill_id: Skill ID to adjust
* @param per: Skill duration adjustment value in percent
*/
void map_skill_duration_add(struct map_data *mapd, uint16 skill_id, uint16 per) {
if (mapd->skill_duration.find(skill_id) != mapd->skill_duration.end()) // Entry exists
mapd->skill_duration[skill_id] += per;
else // Update previous entry
mapd->skill_duration.insert({ skill_id, per });
}
/**
* PvP timer handling (starting)
* @param bl: Player block object
@@ -4833,6 +4848,16 @@ bool map_setmapflag_sub(int16 m, enum e_mapflag mapflag, bool status, union u_ma
}
mapdata->flag[mapflag] = status;
break;
case MF_SKILL_DURATION:
if (!status)
mapdata->skill_duration.clear();
else {
nullpo_retr(false, args);
map_skill_duration_add(mapdata, args->skill_duration.skill_id, args->skill_duration.per);
}
mapdata->flag[mapflag] = status;
break;
default:
mapdata->flag[mapflag] = status;
break;