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

Follow up 6e9796b also as bugreport:8473 http://rathena.org/board/tracker/issue-8473-plagi-bug/

Browse Source 
Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
This commit is contained in:
Cydh Ramdh 2014-01-13 12:40:06 +07:00
parent 2f45d8c7ea
commit f3bb209e92
3 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/map/skill.c
View File

@ -455,7 +455,7 @@ static char skill_isCopyable (struct map_session_data *sd, uint16 skill_id) {
int idx = skill_get_index(skill_id); int idx = skill_get_index(skill_id);
// Only copy skill that player doesn't have or the skill is old clone // Only copy skill that player doesn't have or the skill is old clone
if (sd->status.skill[skill_id].id != 0 && sd->status.skill[skill_id].flag != SKILL_FLAG_PLAGIARIZED) if (sd->status.skill[idx].id != 0 && sd->status.skill[idx].flag != SKILL_FLAG_PLAGIARIZED)
return 0; return 0;
// Never copy NPC/Wedding Skills // Never copy NPC/Wedding Skills
@ -483,11 +483,11 @@ static char skill_isCopyable (struct map_session_data *sd, uint16 skill_id) {
} }
//Plagiarism only able to copy skill while SC_PRESERVE is not active and skill is copyable by Plagiarism //Plagiarism only able to copy skill while SC_PRESERVE is not active and skill is copyable by Plagiarism
if (skill_db[idx].copyable.plagiarism && pc_checkskill(sd,RG_PLAGIARISM) && !sd->sc.data[SC_PRESERVE]) if (skill_db[idx].copyable.option&1 && pc_checkskill(sd,RG_PLAGIARISM) && !sd->sc.data[SC_PRESERVE])
return 1; return 1;
//Reproduce can copy skill if SC__REPRODUCE is active and the skill is copyable by Reproduce //Reproduce can copy skill if SC__REPRODUCE is active and the skill is copyable by Reproduce
if (skill_db[idx].copyable.reproduce && pc_checkskill(sd,SC_REPRODUCE) && (&sd->sc && sd->sc.data[SC__REPRODUCE] && sd->sc.data[SC__REPRODUCE]->val1)) if (skill_db[idx].copyable.option&2 && pc_checkskill(sd,SC_REPRODUCE) && &sd->sc && sd->sc.data[SC__REPRODUCE] && sd->sc.data[SC__REPRODUCE]->val1)
return 2; return 2;
return 0; return 0;
@ -2484,7 +2484,10 @@ void skill_combo(struct block_list* src,struct block_list *dsrc, struct block_li
static void skill_do_copy(struct block_list* src,struct block_list *bl, uint16 skill_id, uint16 skill_lv){ static void skill_do_copy(struct block_list* src,struct block_list *bl, uint16 skill_id, uint16 skill_lv){
TBL_PC *tsd = BL_CAST(BL_PC,bl); TBL_PC *tsd = BL_CAST(BL_PC,bl);
if (!tsd || !pc_checkskill(tsd,RG_PLAGIARISM) || !pc_checkskill(tsd,SC_REPRODUCE)) if (!tsd || (!pc_checkskill(tsd,RG_PLAGIARISM) && !pc_checkskill(tsd,SC_REPRODUCE)))
return;
//If SC_PRESERVE is active and SC__REPRODUCE is not active, nothing to do
else if (&tsd->sc && tsd->sc.data[SC_PRESERVE] && !tsd->sc.data[SC__REPRODUCE])
return; return;
else { else {
short copy_flag; short copy_flag;
@ -2877,10 +2880,8 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
map_freeblock_lock(); map_freeblock_lock();
//Cannot copy skills if the blow will kill you. [Skotlex] if (bl->type == BL_PC && skill_id && skill_get_index(skill_id) >= 0 && skill_db[skill_get_index(skill_id)].copyable.option && //Only copy skill that copyable [Cydh]
if (skill_id && skill_get_index(skill_id) >= 0 && dmg.flag&BF_SKILL && dmg.damage+dmg.damage2 > 0 && damage < status_get_hp(bl)) //Cannot copy skills if the blow will kill you. [Skotlex]
dmg.damage+dmg.damage2 > 0 && dmg.flag&BF_SKILL &&
damage < status_get_hp(bl))
skill_do_copy(src,bl,skill_id,skill_lv); skill_do_copy(src,bl,skill_id,skill_lv);
if (dmg.dmg_lv >= ATK_MISS && (type = skill_get_walkdelay(skill_id, skill_lv)) > 0) if (dmg.dmg_lv >= ATK_MISS && (type = skill_get_walkdelay(skill_id, skill_lv)) > 0)
@ -19018,28 +19019,29 @@ static bool skill_parse_row_magicmushroomdb(char* split[], int column, int curre
} }
static bool skill_parse_row_copyabledb(char* split[], int column, int current) { static bool skill_parse_row_copyabledb(char* split[], int column, int current) {
uint16 skill_id = skill_name2id(split[0]), idx; int16 id;
uint8 option; uint8 option;
if (!skill_get_index(skill_id)) { trim(split[0]);
if(ISDIGIT(split[0][0]))
id = atoi(split[0]);
else
id = skill_name2id(split[0]);
if ((id = skill_get_index(id)) < 0) {
ShowError("skill_parse_row_copyabledb: Invalid skill '%s'\n",split[0]); ShowError("skill_parse_row_copyabledb: Invalid skill '%s'\n",split[0]);
return false; return false;
} }
if (!(option = atoi(split[1]))) { if ((option = atoi(split[1])) < 0 || option > 3) {
ShowError("skill_parse_row_copyabledb: Invalid option %d\n",option); ShowError("skill_parse_row_copyabledb: Invalid option '%s'\n",split[1]);
return false; return false;
} }
idx = skill_get_index(skill_id);
//skill that can be copied by plagiarism
skill_db[idx].copyable.plagiarism = (option&1) ? true : false;
//skill that can be copied by reproduce
skill_db[idx].copyable.reproduce = (option&2) ? true : false;
skill_db[idx].copyable.joballowed = (atoi(split[2])) ? cap_value(atoi(split[2]),1,63) : 63;
skill_db[idx].copyable.req_opt = cap_value(atoi(split[3]),0,(0x2000)-1);
skill_db[id].copyable.option = option;
skill_db[id].copyable.joballowed = 63;
if (atoi(split[2]))
skill_db[id].copyable.joballowed = cap_value(atoi(split[2]),1,63);
skill_db[id].copyable.req_opt = cap_value(atoi(split[3]),0,(0x2000)-1);
return true; return true;
} }

2
src/map/skill.h
View File

@ -173,7 +173,7 @@ struct s_skill_db {
struct s_skill_damage damage; struct s_skill_damage damage;
#endif #endif
struct s_copyable { // [Cydh] struct s_copyable { // [Cydh]
bool plagiarism, reproduce; uint8 option;
uint16 joballowed, req_opt; uint16 joballowed, req_opt;
} copyable; } copyable;
}; };

2
src/map/status.h
View File

@ -1739,7 +1739,7 @@ struct status_data {
unsigned char unsigned char
def_ele, ele_lv, def_ele, ele_lv,
size, race, size, race,
class_; class_; /// Class_Normal, Class_Boss, Class_Guardian
struct weapon_atk rhw, lhw; //Right Hand/Left Hand Weapon. struct weapon_atk rhw, lhw; //Right Hand/Left Hand Weapon.
}; };