Clarify some Job Class vs MapID confusion (1/2)

This commit ensures that `sd->status.class` and related variables only
contain Job Classes (i.e. the client-compatible values, where High
Novice 4001) and are never checked against the bitmask-based MapID
values.

As a rule of thumb, from now on, when a variable is named `class`, it
is intended to contain a Job Class ID and not a MapID. The type of such
variable shall be a signed `int16` or `int`.

To ensure that related third party code is also verified when this
commit is merged, the variable `struct mmo_charstatus::class_ (i.e.
`sd->status.class_`) is renamed to `class`.

Some issues in related lines are also fixed, including:

- A wrong check in the char server would prevent the correct detection
  of babies in code related to the family exp sharing.

- Baby Arch Bishops would not be affected by Eucharistica.

- A wrong check would cause the `questinfo()` script command not to
  display its information for most classes (except 1-1 classes).

- Map IDs and Job Classes were mixed up in `itemdb_jobid2mapid()` and
  `itemdb_jobmask2mapid()` for 1-1 classes (causing currently no harm,
  since they just happen to coincide).

- The Baby Sura class would not cause parties to be marked as
  containing a monk type character (for SLS Team Up purposes).

- Baby Geneticists would bypass the cart check when trying to equip
  ammunitions.

- Baby Mechanics would bypass the Mado Gear check when trying to equip
  ammunitions.

- Transcendent Shadow Chasers would lose the Stalkers' ability to clone
  transcendent skills.

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 8c1a3f364..812d588aa 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -892,7 +892,7 @@ int64 battle_calc_masteryfix(struct block_list *src, struct block_list *target,
 		damage += damage * ratio / 100;
 	}
 
-	if( sd->status.class_ == JOB_ARCH_BISHOP_T || sd->status.class_ == JOB_ARCH_BISHOP ){
+	if ((sd->class_ & MAPID_THIRDMASK) == MAPID_ARCH_BISHOP) {
 		if((skill2_lv = pc->checkskill(sd,AB_EUCHARISTICA)) > 0 &&
 			(tstatus->race == RC_DEMON || tstatus->def_ele == ELE_DARK) )
 			damage += damage * skill2_lv / 100;
@@ -3760,10 +3760,11 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 				//Constant/misc additions from skills
 				if (skill_id == WZ_FIREPILLAR)
 					MATK_ADD(100+50*skill_lv);
-				if( sd && ( sd->status.class_ == JOB_ARCH_BISHOP_T || sd->status.class_ == JOB_ARCH_BISHOP ) &&
-					(i=pc->checkskill(sd,AB_EUCHARISTICA)) > 0 &&
-					(tstatus->race == RC_DEMON || tstatus->def_ele == ELE_DARK) )
-					MATK_ADDRATE(i);
+				if (sd != NULL && (sd->class_ & MAPID_THIRDMASK) == MAPID_ARCH_BISHOP) {
+					int eucharistica_level = pc->checkskill(sd,AB_EUCHARISTICA);
+					if (eucharistica_level > 0 && (tstatus->race == RC_DEMON || tstatus->def_ele == ELE_DARK))
+						MATK_ADDRATE(eucharistica_level);
+				}
 			}
 		}
 #ifndef HMAP_ZONE_DAMAGE_CAP_TYPE