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

Correction of the target for support skills for slave clone

Browse Source 
* the slave clone now targets MST_MASTER, friendly clone targets MST_FRIEND
Fixed an issue where skills and conditions were duplicated
* ms for INF_SUPPORT_SKILL was modified and the same data was pushed twice
Fixed an issue where db->skill could exceed MAX_MOBSKILL+1
* the data was pushed once in INF_SUPPORT_SKILL then again later, without re-checking the size
This commit is contained in:
Atemo 2023-10-21 22:23:07 +02:00
parent c35a262f37
commit 560f8afd9b
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/map/mob.cpp
View File

@ -4056,10 +4056,8 @@ int mob_clone_spawn(map_session_data *sd, int16 m, int16 x, int16 y, const char
} }
if (mode > MD_NONE) //User provided mode. if (mode > MD_NONE) //User provided mode.
status->mode = mode; status->mode = mode;
else if (flag&1) //Friendly Character, remove looting. else if (flag&2)// Clone follows the creator
status->mode = static_cast<enum e_mode>(status->mode&(~MD_LOOTER)); status->mode = MONSTER_TYPE_24;
else if (flag&2) // Clone follows the creator, add MD_NORANDOMWALK
status->mode = static_cast<enum e_mode>(status->mode|MD_NORANDOMWALK);
status->hp = status->max_hp; status->hp = status->max_hp;
status->sp = status->max_sp; status->sp = status->max_sp;
memcpy(&db->vd, &sd->vd, sizeof(struct view_data)); memcpy(&db->vd, &sd->vd, sizeof(struct view_data));
@ -4122,6 +4120,7 @@ int mob_clone_spawn(map_session_data *sd, int16 m, int16 x, int16 y, const char
ms->msg_id = 0; ms->msg_id = 0;
inf = skill_get_inf(skill_id); inf = skill_get_inf(skill_id);
bool is_also_self = false;
if (inf&INF_ATTACK_SKILL) { if (inf&INF_ATTACK_SKILL) {
ms->target = MST_TARGET; ms->target = MST_TARGET;
ms->cond1 = MSC_ALWAYS; ms->cond1 = MSC_ALWAYS;
@ -4163,8 +4162,14 @@ int mob_clone_spawn(map_session_data *sd, int16 m, int16 x, int16 y, const char
ms->delay = 5000; //With a minimum of 5 secs. ms->delay = 5000; //With a minimum of 5 secs.
} }
} else if (inf&INF_SUPPORT_SKILL) { } else if (inf&INF_SUPPORT_SKILL) {
ms->target = MST_FRIEND; if (master_id > 0 && (flag&2)) {
ms->cond1 = MSC_FRIENDHPLTMAXRATE; ms->target = MST_MASTER;
ms->cond1 = MSC_MASTERHPLTMAXRATE;
}
else {
ms->target = MST_FRIEND;
ms->cond1 = MSC_FRIENDHPLTMAXRATE;
}
ms->cond2 = 90; ms->cond2 = 90;
if (skill_id == AL_HEAL) if (skill_id == AL_HEAL)
ms->permillage = 5000; //Higher skill rate usage for heal. ms->permillage = 5000; //Higher skill rate usage for heal.
@ -4175,11 +4180,7 @@ int mob_clone_spawn(map_session_data *sd, int16 m, int16 x, int16 y, const char
if (ms->delay < 2000) if (ms->delay < 2000)
ms->delay = 2000; //With a minimum of 2 secs. ms->delay = 2000; //With a minimum of 2 secs.
if (db->skill.size() < MAX_MOBSKILL) { //duplicate this so it also triggers on self. is_also_self = true;
ms->target = MST_SELF;
ms->cond1 = MSC_MYHPLTMAXRATE;
db->skill.push_back(ms);
}
} else { } else {
switch (skill_id) { //Certain Special skills that are passive, and thus, never triggered. switch (skill_id) { //Certain Special skills that are passive, and thus, never triggered.
case MO_TRIPLEATTACK: case MO_TRIPLEATTACK:
@ -4201,6 +4202,38 @@ int mob_clone_spawn(map_session_data *sd, int16 m, int16 x, int16 y, const char
ms->delay = ms->delay*battle_config.mob_skill_delay/100; ms->delay = ms->delay*battle_config.mob_skill_delay/100;
db->skill.push_back(ms); db->skill.push_back(ms);
// Duplicate INF_SUPPORT_SKILL so it also triggers on self.
if (is_also_self && db->skill.size() < MAX_MOBSKILL) {
std::shared_ptr<s_mob_skill> ms = std::make_shared<s_mob_skill>();
ms->skill_id = skill_id;
ms->skill_lv = sd->status.skill[sk_idx].lv;
ms->state = MSS_ANY;
ms->permillage = 500*battle_config.mob_skill_rate/100; //Default chance of all skills: 5%
ms->emotion = -1;
ms->cancel = 0;
ms->casttime = skill_castfix(&sd->bl,skill_id, ms->skill_lv);
ms->delay = 5000+skill_delayfix(&sd->bl,skill_id, ms->skill_lv);
ms->msg_id = 0;
ms->target = MST_SELF;
ms->cond1 = MSC_MYHPLTMAXRATE;
ms->cond2 = 90;
if (skill_id == AL_HEAL)
ms->permillage = 5000; //Higher skill rate usage for heal.
else if (skill_id == ALL_RESURRECTION)
ms->cond2 = 1;
//Delay: Remove the stock 5 secs and add half of the support time.
ms->delay += -5000 +(skill_get_time(skill_id, ms->skill_lv) + skill_get_time2(skill_id, ms->skill_lv))/2;
if (ms->delay < 2000)
ms->delay = 2000; //With a minimum of 2 secs.
if (battle_config.mob_skill_rate!= 100)
ms->permillage = ms->permillage*battle_config.mob_skill_rate/100;
if (battle_config.mob_skill_delay != 100)
ms->delay = ms->delay*battle_config.mob_skill_delay/100;
db->skill.push_back(ms);
}
} }
} }