Adjusts Spirit Handler to JOBL_FOURTH

* Changes the MAPID to JOBL_FOURTH so that traits can be adjusted.
Fixes Spirit Handler MAPID
2022-10-20 11:08:01 -04:00 · 2022-10-20 08:53:57 -04:00 · 2022-06-30 12:17:28 -04:00 · 2022-06-28 10:51:21 -04:00 · 2022-06-27 14:18:35 -04:00 · 2022-06-27 10:17:55 -04:00
3 changed files with 4 additions and 4 deletions
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@ -233,7 +233,7 @@ enum e_mapid : uint64{
 	MAPID_SKY_EMPEROR,
 	MAPID_NIGHT_WATCH = JOBL_FOURTH|JOBL_THIRD|JOBL_UPPER|MAPID_REBELLION,
 	MAPID_SHINKIRO_SHIRANUI,
-	MAPID_SPIRIT_HANDLER = JOBL_FOURTH|JOBL_THIRD|JOBL_UPPER|JOBL_2_1|MAPID_SUMMONER,
+	MAPID_SPIRIT_HANDLER = JOBL_FOURTH|MAPID_SUMMONER,
 //4-2 Jobs
 	MAPID_IMPERIAL_GUARD = JOBL_FOURTH|JOBL_THIRD|JOBL_UPPER|MAPID_CRUSADER,
 	MAPID_ELEMENTAL_MASTER,
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@ -2428,7 +2428,7 @@ uint64 pc_calc_skilltree_normalize_job_sub( struct map_session_data *sd ){
 	int skill_point = pc_calc_skillpoint( sd );

 	if( sd->class_ & MAPID_SUMMONER ){
-		// Novice's skill points for basic skill.
+		// Summoner's skill points for base skills.
 		std::shared_ptr<s_job_info> summoner_job = job_db.find( JOB_SUMMONER );

 		int summoner_skills = summoner_job->max_job_level - 1;
@ -13493,7 +13493,7 @@ void JobDatabase::loadingFinished() {
 				}
 			}

-			// Summoner
+			// Summoner / Spirit Handler
 			if( ( class_ & MAPID_BASEMASK ) == MAPID_SUMMONER ){
 				max = battle_config.max_summoner_parameter;
 				break;
--- a/src/map/status.cpp
+++ b/src/map/status.cpp
@ -3555,7 +3555,7 @@ int status_calc_pc_sub(struct map_session_data* sd, uint8 opt)
 	// Give them all modes except these (useful for clones)
 	base_status->mode = static_cast<e_mode>(MD_MASK&~(MD_STATUSIMMUNE|MD_IGNOREMELEE|MD_IGNOREMAGIC|MD_IGNORERANGED|MD_IGNOREMISC|MD_DETECTOR|MD_ANGRY|MD_TARGETWEAK));

-	base_status->size = (sd->class_&JOBL_BABY) ? SZ_SMALL : (((sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER) ? battle_config.summoner_size : SZ_MEDIUM);
+	base_status->size = (sd->class_&JOBL_BABY) ? SZ_SMALL : ((sd->class_&MAPID_BASEMASK) == MAPID_SUMMONER ? battle_config.summoner_size : SZ_MEDIUM);
 	if (battle_config.character_size && pc_isriding(sd)) { // [Lupus]
 		if (sd->class_&JOBL_BABY) {
 			if (battle_config.character_size&SZ_BIG)
Author	SHA1	Message	Date
Aleos	f47bda8661	Adjusts Spirit Handler to JOBL_FOURTH * Changes the MAPID to JOBL_FOURTH so that traits can be adjusted.	2022-10-20 11:08:01 -04:00
aleos	1498e9143f	Fixes Spirit Handler MAPID * Minor reversions to checks. * Adjusts Spirit Handler to just JOBL_UPPER.	2022-10-20 08:53:57 -04:00
aleos	e1bc3d30e3	Removes JOBL_2_1 mask from Spirit Handler	2022-06-30 12:17:28 -04:00
aleos	93ac6ed461	Adjusts the MAPID check Thanks to @Lemongrass3110!	2022-06-28 10:51:21 -04:00
aleos	549b300395	Adds missing return value	2022-06-27 14:18:35 -04:00
aleos	9603a2bd1b	Adds Spirit Handler to Summoner checks * Fixes #7039. * Adds the Spirit Handler job to the basic Summoner job checks. Thanks to @laziem!	2022-06-27 10:17:55 -04:00