=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, 68 insertions, 3 deletions

diff --git a/db/const.txt b/db/const.txt
index f8c8f74cb..69a45a59e 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -42,6 +42,7 @@ Job_SuperNovice	23
 Job_Gunslinger	24
 Job_Ninja	25
 Job_Xmas	26
+Job_Summer	27
 
 Job_Novice_High	4001
 Job_Swordman_High	4002
@@ -96,6 +97,10 @@ Job_Star_Gladiator	4047
 Job_Star_Gladiator2	4048
 Job_Soul_Linker	4049
 
+Job_Gangsi	4050
+Job_Death_Knight	4051
+Job_Dark_Collector	4052
+
 Job_Rune_Knight	4054
 Job_Warlock	4055
 Job_Ranger	4056
@@ -154,14 +159,21 @@ Job_Baby_Guard2	4110
 Job_Baby_Ranger2	4111
 Job_Baby_Mechanic2	4112
 
+Job_Super_Novice_E	4190
+Job_Super_Baby_E	4191
+
+Job_Kagerou	4211
+Job_Oboro	4212
+
 EAJL_2_1	0x100
 EAJL_2_2	0x200
 EAJL_2	0x300
 EAJL_UPPER	0x1000
 EAJL_BABY	0x2000
-EAJ_THIRD	0x4000
-EAJ_UPPERMASK	0x0fff
+EAJL_THIRD	0x4000
+
 EAJ_BASEMASK	0x00ff
+EAJ_UPPERMASK	0x0fff
 EAJ_THIRDMASK	0x4fff
 
 EAJ_NOVICE	0x0
@@ -174,6 +186,7 @@ EAJ_THIEF	0x6
 EAJ_TAEKWON	0x7
 EAJ_GUNSLINGER	0x9
 EAJ_NINJA	0x0A
+EAJ_GANGSI	0x0D
 
 EAJ_SUPER_NOVICE	0x100
 EAJ_KNIGHT	0x101
@@ -183,6 +196,8 @@ EAJ_PRIEST	0x104
 EAJ_BLACKSMITH	0x105
 EAJ_ASSASSIN	0x106
 EAJ_STAR_GLADIATOR	0x107
+EAJ_KAGEROUOBORO	0x10A
+EAJ_DEATH_KNIGHT	0x10D
 
 EAJ_CRUSADER	0x201
 EAJ_SAGE	0x202
@@ -191,6 +206,7 @@ EAJ_MONK	0x204
 EAJ_ALCHEMIST	0x205
 EAJ_ROGUE	0x206
 EAJ_SOUL_LINKER	0x207
+EAJ_DARK_COLLECTOR	0x20D
 
 EAJ_NOVICE_HIGH	0x1000
 EAJ_SWORDMAN_HIGH	0x1001
@@ -222,6 +238,7 @@ EAJ_BABY_ACOLYTE	0x2004
 EAJ_BABY_MERCHANT	0x2005
 EAJ_BABY_THIEF	0x2006
 EAJ_BABY_TAEKWON	0x2007
+EAJ_BABY_GANGSI	0x200D
 
 EAJ_SUPER_BABY	0x2100
 EAJ_BABY_KNIGHT	0x2101
@@ -231,6 +248,7 @@ EAJ_BABY_PRIEST	0x2104
 EAJ_BABY_BLACKSMITH	0x2105
 EAJ_BABY_ASSASSIN	0x2106
 EAJ_BABY_STAR_GLADIATOR	0x2107
+EAJ_BABY_DEATH_KNIGHT	0x210D
 
 EAJ_BABY_CRUSADER	0x2201
 EAJ_BABY_SAGE	0x2202
@@ -239,7 +257,9 @@ EAJ_BABY_MONK	0x2204
 EAJ_BABY_ALCHEMIST	0x2205
 EAJ_BABY_ROGUE	0x2206
 EAJ_BABY_SOUL_LINKER	0x2207
+EAJ_BABY_DARK_COLLECTOR	0x220D
 
+EAJ_SUPER_NOVICE_E	0x4100
 EAJ_RUNE_KNIGHT	0x4101
 EAJ_WARLOCK	0x4102
 EAJ_RANGER	0x4103
@@ -268,6 +288,7 @@ EAJ_SURA_T	0x5204
 EAJ_GENETIC_T	0x5205
 EAJ_SHADOW_CHASER_T	0x5206
 
+EAJ_SUPER_BABY_E	0x6100
 EAJ_BABY_RUNE		0x6101
 EAJ_BABY_WARLOCK	0x6102
 EAJ_BABY_RANGER		0x6103
@@ -1817,7 +1838,9 @@ HIDDEN_NPC	111
 2_F_MAGICMASTER	123
 4_F_TELEPORTER	124
 4_M_TELEPORTER	125
+// Free ID's 126 - 138
 HIDDEN_WARP_NPC	139
+// Free ID's 140 - 400
 4_M_MUT2	401
 4_M_SCIENCE	402
 4_F_VALKYRIE2	403
@@ -2021,7 +2044,49 @@ MOB_TOMB	565
 4_F_JP_CYNTHIA	601
 4_M_JP_GUSTON	602
 4_M_JP_BERKUT	603
-//Free	Ids
+4_F_JP_DARK_ADELAIDE	604
+4_M_JP_DARK_DARIUS	605
+4_M_JP_JESTER	606
+XMAS_SMOKEY_B	607
+XMAS_SMOKEY_R	608
+XMAS_SMOKEY_Y	609
+4_F_CLOCKDOLL	610
+4_F_FAIRY2	611
+4_F_PINKWOMAN	612
+4_FAIRYDEADLEAF	613
+4_FROG	614
+4_M_BLACKMAN	615
+4_M_BLUEMAN	616
+4_M_FAIRYANG	617
+4_M_FAIRYAVANT	618
+4_M_FAIRYFREAK	619
+4_M_FAIRYKID6	620
+4_M_FAIRYSCHOLAR	621
+4_M_FAIRYSCHOLAR_DIRTY	622
+4_M_FARIY_HISIE	623
+4_M_FARIYKING	624
+4_M_NEWOZ	625
+4_M_OLIVER	626
+4_M_PROFESSORWORM	627
+4_M_REDMAN	628
+4_F_GELKA	629
+4_M_ROTERT	630
+4_BLACKDRAGON	631
+4_M_GUNSLINGER	632
+4_F_GUNSLINGER	633
+4_M_ARCHER	634
+4_M_SWORDMAN	635
+4_M_NINJA_RED	636
+4_M_NINJA_BLUE	637
+4_M_THIEF_RUMIN	638
+4_M_NOV_RUMIN	639
+4_F_MAYSEL	640
+4_F_ACOLYTE	641
+4_M_NOV_HUNT	642
+4_F_GENETIC	643
+4_F_TAEKWON	644
+4_F_SWORDMAN	645
+//Free	Ids 646 - 699
 8_F_GIRL	700
 4_F_GODEMOM	701
 4_F_GON	702