=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

1 files changed, 191 insertions, 2 deletions

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