From 22b54b7420404e83932114aae63acd54c06d4991 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Mar 2016 17:14:29 +0300 Subject: Copy child adoption functions to plugin and remove job and rings checks. --- src/emap/init.c | 2 ++ src/emap/pc.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/emap/pc.h | 8 ++++++ 3 files changed, 95 insertions(+) diff --git a/src/emap/init.c b/src/emap/init.c index 021fcf2..906b4b3 100644 --- a/src/emap/init.c +++ b/src/emap/init.c @@ -171,6 +171,8 @@ HPExport void plugin_init (void) addHookPre("atcommand->msgsd", eatcommand_msgsd); addHookPre("bg->team_warp", ebg_team_warp); + addHookPre("pc->can_Adopt", epc_can_Adopt_pre); + addHookPre("pc->adoption", epc_adoption_pre); addHookPre("pc->readparam", epc_readparam_pre); addHookPre("pc->setregistry", epc_setregistry); addHookPre("pc->equipitem_pos", epc_equipitem_pos); diff --git a/src/emap/pc.c b/src/emap/pc.c index 95230d5..1c7c74e 100644 --- a/src/emap/pc.c +++ b/src/emap/pc.c @@ -570,3 +570,88 @@ int epc_insert_card_post(int retVal, struct map_session_data* sd, int *idx_card, } return retVal; } + +bool epc_can_Adopt_pre(struct map_session_data *p1_sd, + struct map_session_data *p2_sd, + struct map_session_data *b_sd) +{ + hookStop(); + + if (!p1_sd || !p2_sd || !b_sd) + return false; + + if (b_sd->status.father || b_sd->status.mother || b_sd->adopt_invite) + return false; // already adopted baby / in adopt request + + if (!p1_sd->status.partner_id || !p1_sd->status.party_id || p1_sd->status.party_id != b_sd->status.party_id) + return false; // You need to be married and in party with baby to adopt + + if (p1_sd->status.partner_id != p2_sd->status.char_id || p2_sd->status.partner_id != p1_sd->status.char_id) + return false; // Not married, wrong married + + if (p2_sd->status.party_id != p1_sd->status.party_id) + return false; // Both parents need to be in the same party + + // Parents need to have their ring equipped +// if (!pc->isequipped(p1_sd, WEDDING_RING_M) && !pc->isequipped(p1_sd, WEDDING_RING_F)) +// return false; + +// if (!pc->isequipped(p2_sd, WEDDING_RING_M) && !pc->isequipped(p2_sd, WEDDING_RING_F)) +// return false; + + // Already adopted a baby + if (p1_sd->status.child || p2_sd->status.child) + { + clif->adopt_reply(p1_sd, 0); + hookStop(); + return false; + } + + // Parents need at least lvl 70 to adopt +// if (p1_sd->status.base_level < 70 || p2_sd->status.base_level < 70) +// { +// clif->adopt_reply(p1_sd, 1); +// hookStop(); +// return false; +// } + + if (b_sd->status.partner_id) + { + clif->adopt_reply(p1_sd, 2); + hookStop(); + return false; + } + +// if (!((b_sd->status.class_ >= JOB_NOVICE && b_sd->status.class_ <= JOB_THIEF) || b_sd->status.class_ == JOB_SUPER_NOVICE)) +// return false; + + hookStop(); + return true; +} + +bool epc_adoption_pre(struct map_session_data *p1_sd, + struct map_session_data *p2_sd, + struct map_session_data *b_sd) +{ + if (!pc->can_Adopt(p1_sd, p2_sd, b_sd)) + { + hookStop(); + return false; + } + + p1_sd->status.child = b_sd->status.char_id; + p2_sd->status.child = b_sd->status.char_id; + b_sd->status.father = p1_sd->status.char_id; + b_sd->status.mother = p2_sd->status.char_id; + + // Baby Skills + pc->skill(b_sd, WE_BABY, 1, SKILL_GRANT_PERMANENT); + pc->skill(b_sd, WE_CALLPARENT, 1, SKILL_GRANT_PERMANENT); + + // Parents Skills + pc->skill(p1_sd, WE_CALLBABY, 1, SKILL_GRANT_PERMANENT); + pc->skill(p2_sd, WE_CALLBABY, 1, SKILL_GRANT_PERMANENT); + + hookStop(); + return true; +} diff --git a/src/emap/pc.h b/src/emap/pc.h index 92af4cf..951c91e 100644 --- a/src/emap/pc.h +++ b/src/emap/pc.h @@ -66,4 +66,12 @@ int epc_insert_card_pre(struct map_session_data* sd, int *idx_card, int *idx_equ int epc_insert_card_post(int retVal, struct map_session_data* sd, int *idx_card, int *idx_equip); +bool epc_can_Adopt_pre(struct map_session_data *p1_sd, + struct map_session_data *p2_sd, + struct map_session_data *b_sd); + +bool epc_adoption_pre(struct map_session_data *p1_sd, + struct map_session_data *p2_sd, + struct map_session_data *b_sd); + #endif // EVOL_MAP_PC -- cgit v1.2.3-60-g2f50