From 880e227ea202ee977fe2676c66b3b2baead159ae Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Sun, 24 Jun 2018 22:16:28 +0200 Subject: [PATCH] Cleaned up some hardcoded variables (#3237) --- src/map/atcommand.cpp | 2 +- src/map/mob.cpp | 4 ++-- src/map/pc.cpp | 46 +++++++++++++++++++++---------------------- src/map/pc.hpp | 9 +++++++++ src/map/skill.cpp | 8 ++++---- 5 files changed, 39 insertions(+), 30 deletions(-) diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 0059ee1425..4aa4e7235c 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -9602,7 +9602,7 @@ ACMD_FUNC(langtype) lang = msg_langstr2langtype(langstr); //Switch langstr to associated langtype if( msg_checklangtype(lang,false) == 1 ){ //Verify it's enabled and set it char output[100]; - pc_setaccountreg(sd, add_str("#langtype"), lang); //For login/char + pc_setaccountreg(sd, add_str(LANGTYPE_VAR), lang); //For login/char sd->langtype = lang; sprintf(output,msg_txt(sd,461),msg_langtype2langstr(lang)); // Language is now set to %s. clif_displaymessage(fd,output); diff --git a/src/map/mob.cpp b/src/map/mob.cpp index f228ec1bad..0b19a7842e 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -2974,11 +2974,11 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) { pc_addfame(sd, battle_config.fame_taekwon_mission); sd->mission_mobid = temp; - pc_setglobalreg(sd, add_str("TK_MISSION_ID"), temp); + pc_setglobalreg(sd, add_str(TKMISSIONID_VAR), temp); sd->mission_count = 0; clif_mission_info(sd, temp, 0); } - pc_setglobalreg(sd, add_str("TK_MISSION_COUNT"), sd->mission_count); + pc_setglobalreg(sd, add_str(TKMISSIONCOUNT_VAR), sd->mission_count); } if (sd->status.party_id) diff --git a/src/map/pc.cpp b/src/map/pc.cpp index 3c38ef21de..98f4c9f08e 100755 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -1419,25 +1419,25 @@ void pc_reg_received(struct map_session_data *sd) sd->vars_ok = true; - sd->change_level_2nd = pc_readglobalreg(sd, add_str("jobchange_level")); - sd->change_level_3rd = pc_readglobalreg(sd, add_str("jobchange_level_3rd")); - sd->die_counter = pc_readglobalreg(sd, add_str("PC_DIE_COUNTER")); + sd->change_level_2nd = pc_readglobalreg(sd, add_str(JOBCHANGE2ND_VAR)); + sd->change_level_3rd = pc_readglobalreg(sd, add_str(JOBCHANGE3RD_VAR)); + sd->die_counter = pc_readglobalreg(sd, add_str(PCDIECOUNTER_VAR)); - sd->langtype = pc_readaccountreg(sd, add_str("#langtype")); + sd->langtype = pc_readaccountreg(sd, add_str(LANGTYPE_VAR)); if (msg_checklangtype(sd->langtype,true) < 0) sd->langtype = 0; //invalid langtype reset to default // Cash shop - sd->cashPoints = pc_readaccountreg(sd, add_str("#CASHPOINTS")); - sd->kafraPoints = pc_readaccountreg(sd, add_str("#KAFRAPOINTS")); + sd->cashPoints = pc_readaccountreg(sd, add_str(CASHPOINT_VAR)); + sd->kafraPoints = pc_readaccountreg(sd, add_str(KAFRAPOINT_VAR)); // Cooking Exp - sd->cook_mastery = pc_readglobalreg(sd, add_str("COOK_MASTERY")); + sd->cook_mastery = pc_readglobalreg(sd, add_str(COOKMASTERY_VAR)); if( (sd->class_&MAPID_BASEMASK) == MAPID_TAEKWON ) { // Better check for class rather than skill to prevent "skill resets" from unsetting this - sd->mission_mobid = pc_readglobalreg(sd, add_str("TK_MISSION_ID")); - sd->mission_count = pc_readglobalreg(sd, add_str("TK_MISSION_COUNT")); + sd->mission_mobid = pc_readglobalreg(sd, add_str(TKMISSIONID_VAR)); + sd->mission_count = pc_readglobalreg(sd, add_str(TKMISSIONCOUNT_VAR)); } if (battle_config.feature_banking) @@ -1962,7 +1962,7 @@ int pc_calc_skilltree_normalize_job(struct map_session_data *sd) } - pc_setglobalreg(sd, add_str("jobchange_level"), sd->change_level_2nd); + pc_setglobalreg(sd, add_str(JOBCHANGE2ND_VAR), sd->change_level_2nd); } if (skill_point < novice_skills + (sd->change_level_2nd - 1)) @@ -1979,7 +1979,7 @@ int pc_calc_skilltree_normalize_job(struct map_session_data *sd) - (sd->status.job_level - 1) - (sd->change_level_2nd - 1) - novice_skills; - pc_setglobalreg(sd, add_str("jobchange_level_3rd"), sd->change_level_3rd); + pc_setglobalreg(sd, add_str(JOBCHANGE3RD_VAR), sd->change_level_3rd); } if (skill_point < novice_skills + (sd->change_level_2nd - 1) + (sd->change_level_3rd - 1)) @@ -4467,11 +4467,11 @@ int pc_paycash(struct map_session_data *sd, int price, int points, e_log_pick_ty return -1; } - pc_setaccountreg(sd, add_str("#CASHPOINTS"), sd->cashPoints-cash); + pc_setaccountreg(sd, add_str(CASHPOINT_VAR), sd->cashPoints-cash); if( cash ){ log_cash( sd, type, LOG_CASH_TYPE_CASH, -cash ); } - pc_setaccountreg(sd, add_str("#KAFRAPOINTS"), sd->kafraPoints-points); + pc_setaccountreg(sd, add_str(KAFRAPOINT_VAR), sd->kafraPoints-points); if( points ){ log_cash( sd, type, LOG_CASH_TYPE_KAFRA, -points ); } @@ -4510,7 +4510,7 @@ int pc_getcash(struct map_session_data *sd, int cash, int points, e_log_pick_typ cash = MAX_ZENY-sd->cashPoints; } - pc_setaccountreg(sd, add_str("#CASHPOINTS"), sd->cashPoints+cash); + pc_setaccountreg(sd, add_str(CASHPOINT_VAR), sd->cashPoints+cash); if( cash ){ log_cash( sd, type, LOG_CASH_TYPE_CASH, cash ); } @@ -4536,7 +4536,7 @@ int pc_getcash(struct map_session_data *sd, int cash, int points, e_log_pick_typ points = MAX_ZENY-sd->kafraPoints; } - pc_setaccountreg(sd, add_str("#KAFRAPOINTS"), sd->kafraPoints+points); + pc_setaccountreg(sd, add_str(KAFRAPOINT_VAR), sd->kafraPoints+points); if( points ){ log_cash( sd, type, LOG_CASH_TYPE_KAFRA, points ); } @@ -7386,7 +7386,7 @@ int pc_resetstate(struct map_session_data* sd) if( sd->mission_mobid ) { //bugreport:2200 sd->mission_mobid = 0; sd->mission_count = 0; - pc_setglobalreg(sd, add_str("TK_MISSION_ID"), 0); + pc_setglobalreg(sd, add_str(TKMISSIONID_VAR), 0); } status_calc_pc(sd, SCO_NONE); @@ -7786,7 +7786,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) pc_setdead(sd); - pc_setglobalreg(sd, add_str("PC_DIE_COUNTER"), sd->die_counter+1); + pc_setglobalreg(sd, add_str(PCDIECOUNTER_VAR), sd->die_counter+1); pc_setparam(sd, SP_KILLERRID, src?src->id:0); //Reset menu skills/item skills @@ -8589,12 +8589,12 @@ bool pc_jobchange(struct map_session_data *sd,int job, char upper) // changing from 1st to 2nd job if ((b_class&JOBL_2) && !(sd->class_&JOBL_2) && (sd->class_&MAPID_UPPERMASK) != MAPID_SUPER_NOVICE) { sd->change_level_2nd = sd->status.job_level; - pc_setglobalreg(sd, add_str("jobchange_level"), sd->change_level_2nd); + pc_setglobalreg(sd, add_str(JOBCHANGE2ND_VAR), sd->change_level_2nd); } // changing from 2nd to 3rd job else if((b_class&JOBL_THIRD) && !(sd->class_&JOBL_THIRD)) { sd->change_level_3rd = sd->status.job_level; - pc_setglobalreg(sd, add_str("jobchange_level_3rd"), sd->change_level_3rd); + pc_setglobalreg(sd, add_str(JOBCHANGE3RD_VAR), sd->change_level_3rd); } if(sd->cloneskill_idx > 0) { @@ -9235,21 +9235,21 @@ int pc_setregistry(struct map_session_data *sd, int64 reg, int val) // These should be stored elsewhere e.g. char ones in char table, the cash ones in account_data table! switch( regname[0] ) { default: //Char reg - if( !strcmp(regname,"PC_DIE_COUNTER") && sd->die_counter != val ) { + if( !strcmp(regname,PCDIECOUNTER_VAR) && sd->die_counter != val ) { int i = (!sd->die_counter && (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE); sd->die_counter = val; if( i ) status_calc_pc(sd,SCO_NONE); // Lost the bonus. - } else if( !strcmp(regname,"COOK_MASTERY") && sd->cook_mastery != val ) { + } else if( !strcmp(regname,COOKMASTERY_VAR) && sd->cook_mastery != val ) { val = cap_value(val, 0, 1999); sd->cook_mastery = val; } break; case '#': - if( !strcmp(regname,"#CASHPOINTS") && sd->cashPoints != val ) { + if( !strcmp(regname,CASHPOINT_VAR) && sd->cashPoints != val ) { val = cap_value(val, 0, MAX_ZENY); sd->cashPoints = val; - } else if( !strcmp(regname,"#KAFRAPOINTS") && sd->kafraPoints != val ) { + } else if( !strcmp(regname,KAFRAPOINT_VAR) && sd->kafraPoints != val ) { val = cap_value(val, 0, MAX_ZENY); sd->kafraPoints = val; } diff --git a/src/map/pc.hpp b/src/map/pc.hpp index 84559725b6..9767fc160b 100644 --- a/src/map/pc.hpp +++ b/src/map/pc.hpp @@ -33,10 +33,19 @@ enum sc_type : int16; #define MAX_DEVOTION 5 /// Max Devotion slots #define MAX_SPIRITCHARM 10 /// Max spirit charms +#define LANGTYPE_VAR "#langtype" +#define CASHPOINT_VAR "#CASHPOINTS" +#define KAFRAPOINT_VAR "#KAFRAPOINTS" #define BANK_VAULT_VAR "#BANKVAULT" #define ROULETTE_BRONZE_VAR "RouletteBronze" #define ROULETTE_SILVER_VAR "RouletteSilver" #define ROULETTE_GOLD_VAR "RouletteGold" +#define COOKMASTERY_VAR "COOK_MASTERY" +#define PCDIECOUNTER_VAR "PC_DIE_COUNTER" +#define JOBCHANGE2ND_VAR "jobchange_level" +#define JOBCHANGE3RD_VAR "jobchange_level_3rd" +#define TKMISSIONID_VAR "TK_MISSION_ID" +#define TKMISSIONCOUNT_VAR "TK_MISSION_COUNT" //Update this max as necessary. 55 is the value needed for Super Baby currently //Raised to 85 since Expanded Super Baby needs it. diff --git a/src/map/skill.cpp b/src/map/skill.cpp index f724e9b06c..f2e8f3659e 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -6818,7 +6818,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui } sd->mission_mobid = id; sd->mission_count = 0; - pc_setglobalreg(sd, add_str("TK_MISSION_ID"), id); + pc_setglobalreg(sd, add_str(TKMISSIONID_VAR), id); clif_mission_info(sd, id, 0); clif_skill_nodamage(src,bl,skill_id,skill_lv,1); } @@ -8714,7 +8714,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui if (skill_id == SL_SUPERNOVICE && dstsd && dstsd->die_counter && !(rnd()%100)) { //Erase death count 1% of the casts dstsd->die_counter = 0; - pc_setglobalreg(dstsd, add_str("PC_DIE_COUNTER"), 0); + pc_setglobalreg(dstsd, add_str(PCDIECOUNTER_VAR), 0); clif_specialeffect(bl, EF_ANGEL2, AREA); //SC_SPIRIT invokes status_calc_pc for us. } @@ -19440,7 +19440,7 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, unsigned sh if (skill_produce_db[idx].itemlv > 10 && skill_produce_db[idx].itemlv <= 20) { //Cooking items. clif_specialeffect(&sd->bl, EF_COOKING_OK, AREA); if (sd->cook_mastery < 1999) - pc_setglobalreg(sd, add_str("COOK_MASTERY"), sd->cook_mastery + ( 1 << ( (skill_produce_db[idx].itemlv - 11) / 2 ) ) * 5); + pc_setglobalreg(sd, add_str(COOKMASTERY_VAR), sd->cook_mastery + ( 1 << ( (skill_produce_db[idx].itemlv - 11) / 2 ) ) * 5); } break; } @@ -19558,7 +19558,7 @@ bool skill_produce_mix(struct map_session_data *sd, uint16 skill_id, unsigned sh if (skill_produce_db[idx].itemlv > 10 && skill_produce_db[idx].itemlv <= 20 ) { //Cooking items. clif_specialeffect(&sd->bl, EF_COOKING_FAIL, AREA); if (sd->cook_mastery > 0) - pc_setglobalreg(sd, add_str("COOK_MASTERY"), sd->cook_mastery - ( 1 << ((skill_produce_db[idx].itemlv - 11) / 2) ) - ( ( ( 1 << ((skill_produce_db[idx].itemlv - 11) / 2) ) >> 1 ) * 3 )); + pc_setglobalreg(sd, add_str(COOKMASTERY_VAR), sd->cook_mastery - ( 1 << ((skill_produce_db[idx].itemlv - 11) / 2) ) - ( ( ( 1 << ((skill_produce_db[idx].itemlv - 11) / 2) ) >> 1 ) * 3 )); } break; }