=General

*Added some jobs with ID's and MAPID's masks to prepare for the adding of more jobs in const.txt
*Fixed a typo on JOBL_THIRD check in const.txt
*Added all currently known tags and ID's support for NPC's, skills, status, and units.
*Changed SI_SITTING to official name SI_SIT.
*Increased MAX_SKILL to 3040.

=NPC
*Corrected a typo in the jobmaster script.
-Fixed required job level for changing to 3rd to 50.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15836 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 289 insertions, 11 deletions

diff --git a/src/common/mmo.h b/src/common/mmo.h
index 7268982d7..543757e5e 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -79,7 +79,7 @@
 #define MAX_ZENY 1000000000
 #define MAX_FAME 1000000000
 #define MAX_CART 100
-#define MAX_SKILL 2540
+#define MAX_SKILL 3040
 #define GLOBAL_REG_NUM 256
 #define ACCOUNT_REG_NUM 64
 #define ACCOUNT_REG2_NUM 16
diff --git a/src/map/pc.c b/src/map/pc.c
index 5d47f13cf..8c815c37e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6120,7 +6120,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
 
 	/* e.g. not killed thru pc_damage */
 	if( pc_issit(sd) ) {
-		clif_status_load(&sd->bl,SI_SITTING,0);
+		clif_status_load(&sd->bl,SI_SIT,0);
 	}
 
 	pc_setdead(sd);
diff --git a/src/map/skill.c b/src/map/skill.c
index 317ec007e..c646a9f09 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -12712,9 +12712,9 @@ int skill_sit (struct map_session_data *sd, int type)
 	}
 
 	if( type ) {
-		clif_status_load(&sd->bl,SI_SITTING,1);
+		clif_status_load(&sd->bl,SI_SIT,1);
 	} else {
-		clif_status_load(&sd->bl,SI_SITTING,0);
+		clif_status_load(&sd->bl,SI_SIT,0);
 	}
 
 	if (!flag) return 0;
diff --git a/src/map/skill.h b/src/map/skill.h
index b78b1d54c..8dc9da1cc 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -847,6 +847,7 @@ enum e_skill {
 	TK_POWER,
 	TK_SEVENWIND,
 	TK_HIGHJUMP,
+
 	SG_FEEL,
 	SG_SUN_WARM,
 	SG_MOON_WARM,
@@ -865,6 +866,7 @@ enum e_skill {
 	SG_FRIEND,
 	SG_KNOWLEDGE,
 	SG_FUSION,
+
 	SL_ALCHEMIST,
 	AM_BERSERKPITCHER,
 	SL_MONK,
@@ -921,6 +923,7 @@ enum e_skill {
 	AM_TWILIGHT2,
 	AM_TWILIGHT3,
 	HT_POWER,
+
 	GS_GLITTERING,
 	GS_FLING,
 	GS_TRIPLEACTION,
@@ -943,6 +946,7 @@ enum e_skill {
 	GS_FULLBUSTER,
 	GS_SPREADATTACK,
 	GS_GROUNDDRIFT,
+
 	NJ_TOBIDOUGU,
 	NJ_SYURIKEN,
 	NJ_KUNAI,
@@ -967,7 +971,119 @@ enum e_skill {
 	NJ_NEN,
 	NJ_ISSEN,
 
-	NPC_EARTHQUAKE = 653,
+	MB_FIGHTING,
+	MB_NEUTRAL,
+	MB_TAIMING_PUTI,
+	MB_WHITEPOTION,
+	MB_MENTAL,
+	MB_CARDPITCHER,
+	MB_PETPITCHER,
+	MB_BODYSTUDY,
+	MB_BODYALTER,
+	MB_PETMEMORY,
+	MB_M_TELEPORT,
+	MB_B_GAIN,
+	MB_M_GAIN,
+	MB_MISSION,
+	MB_MUNAKKNOWLEDGE,
+	MB_MUNAKBALL,
+	MB_SCROLL,
+	MB_B_GATHERING,
+	MB_M_GATHERING,
+	MB_B_EXCLUDE,
+	MB_B_DRIFT,
+	MB_B_WALLRUSH,
+	MB_M_WALLRUSH,
+	MB_B_WALLSHIFT,
+	MB_M_WALLCRASH,
+	MB_M_REINCARNATION,
+	MB_B_EQUIP,
+
+	SL_DEATHKNIGHT,
+	SL_COLLECTOR,
+	SL_NINJA,
+	SL_GUNNER,
+	AM_TWILIGHT4,
+	DA_RESET,
+	DE_BERSERKAIZER,
+	DA_DARKPOWER,
+
+	DE_PASSIVE,
+	DE_PATTACK,
+	DE_PSPEED,
+	DE_PDEFENSE,
+	DE_PCRITICAL,
+	DE_PHP,
+	DE_PSP,
+	DE_RESET,
+	DE_RANKING,
+	DE_PTRIPLE,
+	DE_ENERGY,
+	DE_NIGHTMARE,
+	DE_SLASH,
+	DE_COIL,
+	DE_WAVE,
+	DE_REBIRTH,
+	DE_AURA,
+	DE_FREEZER,
+	DE_CHANGEATTACK,
+	DE_PUNISH,
+	DE_POISON,
+	DE_INSTANT,
+	DE_WARNING,
+	DE_RANKEDKNIFE,
+	DE_RANKEDGRADIUS,
+	DE_GAUGE,
+	DE_GTIME,
+	DE_GPAIN,
+	DE_GSKILL,
+	DE_GKILL,
+	DE_ACCEL,
+	DE_BLOCKDOUBLE,
+	DE_BLOCKMELEE,
+	DE_BLOCKFAR,
+	DE_FRONTATTACK,
+	DE_DANGERATTACK,
+	DE_TWINATTACK,
+	DE_WINDATTACK,
+	DE_WATERATTACK,
+
+	DA_ENERGY,
+	DA_CLOUD,
+	DA_FIRSTSLOT,
+	DA_HEADDEF,
+	DA_SPACE,
+	DA_TRANSFORM,
+	DA_EXPLOSION,
+	DA_REWARD,
+	DA_CRUSH,
+	DA_ITEMREBUILD,
+	DA_ILLUSION,
+	DA_NUETRALIZE,
+	DA_RUNNER,
+	DA_TRANSFER,
+	DA_WALL,
+	DA_ZENY,
+	DA_REVENGE,
+	DA_EARPLUG,
+	DA_CONTRACT,
+	DA_BLACK,
+	DA_DREAM,
+	DA_MAGICCART,
+	DA_COPY,
+	DA_CRYSTAL,
+	DA_EXP,
+	DA_CARTSWING,
+	DA_REBUILD,
+	DA_JOBCHANGE,
+	DA_EDARKNESS,
+	DA_EGUARDIAN,
+	DA_TIMEOUT,
+	ALL_TIMEIN,
+	DA_ZENYRANK,
+	DA_ACCESSORYMIX,
+
+	NPC_EARTHQUAKE,
 	NPC_FIREBREATH,
 	NPC_ICEBREATH,
 	NPC_THUNDERBREATH,
@@ -1251,9 +1367,11 @@ enum e_skill {
 	WA_SWING_DANCE = 2350,
 	WA_SYMPHONY_OF_LOVER,
 	WA_MOONLIT_SERENADE,
+
 	MI_RUSH_WINDMILL = 2381,
 	MI_ECHOSONG,
 	MI_HARMONIZE,
+
 	WM_LESSON = 2412,
 	WM_METALICSOUND,
 	WM_REVERBERATION,
@@ -1331,7 +1449,7 @@ enum e_skill {
 	GN_S_PHARMACY,
 	GN_SLINGITEM_RANGEMELEEATK,
 
-	AB_SECRAMENT=2515,
+	AB_SECRAMENT = 2515,
 	WM_SEVERE_RAINSTORM_MELEE,
 	SR_HOWLINGOFLION,
 	SR_RIDEINLIGHTNING,
@@ -1344,6 +1462,42 @@ enum e_skill {
 	ALL_GUARDIAN_RECALL,
 	ALL_ODINS_POWER,
 
+	KO_YAMIKUMO = 3001,
+	KO_RIGHT,
+	KO_LEFT,
+	KO_JYUMONJIKIRI,
+	KO_SETSUDAN,
+	KO_BAKURETSU,
+	KO_HAPPOKUNAI,
+	KO_MUCHANAGE,
+	KO_HUUMARANKA,
+	KO_MAKIBISHI,
+	KO_MEIKYOUSISUI,
+	KO_ZANZOU,
+	KO_KYOUGAKU,
+	KO_JYUSATSU,
+	KO_KAHU_ENTEN,
+	KO_HYOUHU_HUBUKI,
+	KO_KAZEHU_SEIRAN,
+	KO_DOHU_KOUKAI,
+	KO_KAIHOU,
+	KO_ZENKAI,
+	KO_GENWAKU,
+	KO_IZAYOI,
+	KG_KAGEHUMI,
+	KG_KYOMU,
+	KG_KAGEMUSYA,
+	OB_ZANGETSU,
+	OB_OBOROGENSOU,
+	OB_OBOROGENSOU_TRANSITION_ATK,
+	OB_AKAITSUKI,
+
+	ECL_SNOWFLIP = 3031,
+	ECL_PEONYMAMY,
+	ECL_SADAGUI,
+	ECL_SEQUOIADUST,
+	ECLAGE_RECALL,
+
 	HLIF_HEAL = 8001,
 	HLIF_AVOID,
 	HLIF_BRAIN,
@@ -1360,6 +1514,33 @@ enum e_skill {
 	HVAN_CHAOTIC,
 	HVAN_INSTRUCT,
 	HVAN_EXPLOSION,
+	MUTATION_BASEJOB,
+	MH_SUMMON_LEGION,
+	MH_NEEDLE_OF_PARALYZE,
+	MH_POISON_MIST,
+	MH_PAIN_KILLER,
+	MH_LIGHT_OF_REGENE,
+	MH_OVERED_BOOST,
+	MH_ERASER_CUTTER,
+	MH_XENO_SLASHER,
+	MH_SILENT_BREEZE,
+	MH_STYLE_CHANGE,
+	MH_SONIC_CRAW,
+	MH_SILVERVEIN_RUSH,
+	MH_MIDNIGHT_FRENZY,
+	MH_STAHL_HORN,
+	MH_GOLDENE_FERSE,
+	MH_STEINWAND,
+	MH_HEILIGE_STANGE,
+	MH_ANGRIFFS_MODUS,
+	MH_TINDER_BREAKER,
+	MH_CBC,
+	MH_EQC,
+	MH_MAGMA_FLOW,
+	MH_GRANITIC_ARMOR,
+	MH_LAVA_SLIDE,
+	MH_PYROCLASTIC,
+	MH_VOLCANIC_ASH,
 
 	MS_BASH = 8201,
 	MS_MAGNUM,
@@ -1567,6 +1748,14 @@ enum {
 	UNT_WATER_INSIGNIA, //TODO
 	UNT_WIND_INSIGNIA, //TODO
 	UNT_EARTH_INSIGNIA, //TODO
+	UNT_POISON_MIST,
+	UNT_LAVA_SLIDE,
+	UNT_VOLCANIC_ASH,
+	UNT_ZENKAI_WATER,
+	UNT_ZENKAI_GROUND,
+	UNT_ZENKAI_FIRE,
+	UNT_ZENKAI_WIND,
+	UNT_MAKIBISHI,
 	
 	/**
 	 * Guild Auras
diff --git a/src/map/status.h b/src/map/status.h
index 7ebe9627b..61854ffb5 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -913,7 +913,6 @@ enum si_type {
 	SI_CASH_PLUSONLYJOBEXP = 312,
 //	SI_PARTYFLEE = 313,
 //	SI_ANGEL_PROTECT = 314,
-
 	SI_ENDURE_MDEF = 315,
 	SI_ENCHANTBLADE = 316,
 	SI_DEATHBOUND = 317,
@@ -980,7 +979,6 @@ enum si_type {
 	SI_NEUTRALBARRIER_MASTER = 378,
 	SI_STEALTHFIELD = 379,
 	SI_STEALTHFIELD_MASTER = 380,
-
 	SI_MANU_ATK = 381, 
 	SI_MANU_DEF = 382, 
 	SI_SPL_ATK = 383, 
@@ -988,7 +986,6 @@ enum si_type {
 	SI_REPRODUCE = 385,
 	SI_MANU_MATK = 386,
 	SI_SPL_MATK = 387,
-
 	SI_STR_SCROLL = 388,
 	SI_INT_SCROLL = 389,
 	SI_LG_REFLECTDAMAGE = 390,
@@ -1173,9 +1170,101 @@ enum si_type {
 	SI_WIND_INSIGNIA = 569,
 	SI_EARTH_INSIGNIA = 570,
 	SI_EQUIPED_FLOOR = 571,
+	SI_GUARDIAN_RECALL = 572,
+	SI_MORA_BUFF = 573,
+	SI_REUSE_LIMIT_G = 574,
+	SI_REUSE_LIMIT_H = 575,
+	SI_NEEDLE_OF_PARALYZE = 576,
+	SI_PAIN_KILLER = 577,
+	SI_G_LIFEPOTION = 578,
+	SI_VITALIZE_POTION = 579,
+	SI_LIGHT_OF_REGENE = 580,
+	SI_OVERED_BOOST = 581,
+	SI_SILENT_BREEZE = 582,
 	SI_ODINS_POWER = 583,
-	SI_ALL_RIDING = 613,//awesome 571-613 gap, we're missing quite a few stuff here.
-	SI_SITTING = 622,
+	SI_STYLE_CHANGE = 584,
+	SI_SONIC_CLAW_POSTDELAY = 585,
+	// ID's 586 - 595 Currently Unused
+	SI_SILVERVEIN_RUSH_POSTDELAY = 596,
+	SI_MIDNIGHT_FRENZY_POSTDELAY = 597,
+	SI_GOLDENE_FERSE = 598,
+	SI_ANGRIFFS_MODUS = 599,
+	SI_TINDER_BREAKER = 600,
+	SI_TINDER_BREAKER_POSTDELAY = 601,
+	SI_CBC = 602,
+	SI_CBC_POSTDELAY = 603,
+	SI_EQC = 604,
+	SI_MAGMA_FLOW = 605,
+	SI_GRANITIC_ARMOR = 606,
+	SI_PYROCLASTIC = 607,
+	SI_VOLCANIC_ASH = 608,
+	SI_SPIRITS_SAVEINFO1 = 609,
+	SI_SPIRITS_SAVEINFO2 = 610,
+	SI_MAGIC_CANDY = 611,
+	SI_SEARCH_STORE_INFO = 612,
+	SI_ALL_RIDING = 613,
+	SI_ALL_RIDING_REUSE_LIMIT = 614,
+	SI_MACRO = 615,
+	SI_MACRO_POSTDELAY = 616,
+	SI_BEER_BOTTLE_CAP = 617,
+	SI_OVERLAPEXPUP = 618,
+	SI_PC_IZ_DUN05 = 619,
+	SI_CRUSHSTRIKE = 620,
+	SI_MONSTER_TRANSFORM = 621,
+	SI_SIT = 622,
+	SI_ONAIR = 623,
+	SI_MTF_ASPD = 624,
+	SI_MTF_RANGEATK = 625,
+	SI_MTF_MATK = 626,
+	SI_MTF_MLEATKED = 627,
+	SI_MTF_CRIDAMAGE = 628,
+	SI_REUSE_LIMIT_MTF = 629,
+	SI_MACRO_PERMIT = 630,
+	SI_MACRO_PLAY = 631,
+	SI_SKF_CAST = 632,
+	SI_SKF_ASPD = 633,
+	SI_SKF_ATK = 634,
+	SI_SKF_MATK = 635,
+	SI_REWARD_PLUSONLYJOBEXP = 636,
+	SI_HANDICAPSTATE_NORECOVER = 637,
+	SI_SET_NUM_DEF = 638,
+	SI_SET_NUM_MDEF = 639,
+	SI_SET_PER_DEF = 640,
+	SI_SET_PER_MDEF = 641,
+	SI_PARTYBOOKING_SEARCH_DEALY = 642,
+	SI_PARTYBOOKING_REGISTER_DEALY = 643,
+	SI_PERIOD_TIME_CHECK_DETECT_SKILL = 644,
+	SI_KO_JYUMONJIKIRI = 645,
+	SI_MEIKYOUSISUI = 646,
+	SI_ATTHASTE_CASH = 647,
+	SI_EQUIPPED_DIVINE_ARMOR = 648,
+	SI_EQUIPPED_HOLY_ARMOR = 649,
+	SI_2011RWC = 650,
+	SI_KYOUGAKU = 651,
+	SI_IZAYOI = 652,
+	SI_ZENKAI = 653,
+	SI_KG_KAGEHUMI = 654,
+	SI_KYOMU = 655,
+	SI_KAGEMUSYA = 656,
+	SI_ZANGETSU = 657,
+	SI_PHI_DEMON = 658,
+	SI_GENSOU = 659,
+	SI_AKAITSUKI = 660,
+	SI_TETANY = 661,
+	SI_GM_BATTLE = 662,
+	SI_GM_BATTLE2 = 663,
+	SI_2011RWC_SCROLL = 664,
+	SI_ACTIVE_MONSTER_TRANSFORM = 665,
+	SI_MYSTICPOWDER = 666,
+	SI_ECLAGE_RECALL = 667,
+	SI_ENTRY_QUEUE_APPLY_DELAY = 668,
+	SI_REUSE_LIMIT_ECL = 669,
+	SI_M_LIFEPOTION = 670,
+	SI_ENTRY_QUEUE_NOTIFY_ADMISSION_TIME_OUT = 671,
+	SI_UNKNOWN_NAME = 672,
+	SI_ON_PUSH_CART = 673,
+	SI_HAT_EFFECT = 674,
+	SI_FLOWER_LEAF = 675,
 	SI_MAX,
 };