Add 3th missing jobs and do some other small fixes

3rdparty/libbacktrace/Makefile.in

@@ -72,4 +72,4 @@ Makefile: Makefile.in
 
 %.o: %.c $(LIBBACKTRACE_H) Makefile
 	@echo "	CC	$<"
-	@$(CC) @CFLAGS@ @DEFS@ @CPPFLAGS@ -Wno-pointer-arith -c $(OUTPUT_OPTION) $<
+	@$(CC) @CFLAGS@ @DEFS@ @CPPFLAGS@ -Wno-pointer-arith -Wno-switch-enum -c $(OUTPUT_OPTION) $<

conf/messages.conf

@@ -658,8 +658,21 @@
 667: Genetic T
 668: Shadow Chaser T
 669: Summoner
-
-//670-849 FREE (please start using from the top if you need, leave the 670+ range for new jobs)
+670: Baby Summoner
+671: Baby Ninja
+672: Baby Kagerou
+673: Baby Oboro
+674: Baby Taekwon
+675: Baby Star Gladiator
+676: Baby Soul Linker
+677: Baby Gunslinger
+678: Baby Rebellion
+679: Star Emperor
+680: Baby Star Emperor
+681: Soul Reaper
+682: Baby Soul Reaper
+
+//683-849 FREE (please start using from the top if you need, leave the 670+ range for new jobs)
 
 850: No Knockback |
 851: Source For Instance |

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac ab7b4aa61.
+# From configure.ac 528bd2111.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -8186,6 +8186,55 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wswitch-enum" >&5
+$as_echo_n "checking whether $CC supports -Wswitch-enum... " >&6; }
+		OLD_CFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS -Werror -Wswitch-enum"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+				CFLAGS="$OLD_CFLAGS -Wswitch-enum"
+				# Optionally, run a test
+				if test "x" != "x"; then
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC can actually use -Wswitch-enum" >&5
+$as_echo_n "checking whether $CC can actually use -Wswitch-enum... " >&6; }
+					CFLAGS="$OLD_CFLAGS -Werror -Wswitch-enum"
+					cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+							{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+							CFLAGS="$OLD_CFLAGS"
+
+
+							{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+							CFLAGS="$OLD_CFLAGS -Wswitch-enum"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+				fi
+
+else
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+				CFLAGS="$OLD_CFLAGS"
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wno-format-nonliteral" >&5
 $as_echo_n "checking whether $CC supports -Wno-format-nonliteral... " >&6; }
 		OLD_CFLAGS="$CFLAGS"

configure.ac

@@ -1147,6 +1147,7 @@ AC_CHECK_COMPILER_WFLAG(cast-qual)
 AC_CHECK_COMPILER_WFLAG(misleading-indentation)
 AC_CHECK_COMPILER_WFLAG(null-dereference)
 AC_CHECK_COMPILER_WFLAG(vla)
+AC_CHECK_COMPILER_WFLAG(switch-enum)
 AC_CHECK_COMPILER_WNOFLAG(format-nonliteral)
 AC_CHECK_COMPILER_WNOFLAG(switch)
 AC_CHECK_COMPILER_WNOFLAG(missing-field-initializers)

db/constants.conf

@@ -232,141 +232,21 @@ constants_db: {
 	Job_Rebellion:          4215
 
 	Job_Summoner:           4218
+	Job_Baby_Summoner:      4220
 
-	comment__: "Job masks / Job map_ids"
-	EAJL_2_1:                  0x0100
-	EAJL_2_2:                  0x0200
-	EAJL_2:                    0x0300
-	EAJL_UPPER:                0x1000
-	EAJL_BABY:                 0x2000
-	EAJL_THIRD:                0x4000
-
-	EAJ_BASEMASK:              0x00ff
-	EAJ_UPPERMASK:             0x0fff
-	EAJ_THIRDMASK:             0x4fff
-
-	EAJ_NOVICE:                0x0000
-	EAJ_SWORDMAN:              0x0001
-	EAJ_MAGE:                  0x0002
-	EAJ_ARCHER:                0x0003
-	EAJ_ACOLYTE:               0x0004
-	EAJ_MERCHANT:              0x0005
-	EAJ_THIEF:                 0x0006
-	EAJ_TAEKWON:               0x0007
-	EAJ_GUNSLINGER:            0x0009
-	EAJ_NINJA:                 0x000A
-	EAJ_GANGSI:                0x000D
-	EAJ_SUMMONER:              0x000E
-
-	EAJ_SUPER_NOVICE:          0x0100
-	EAJ_KNIGHT:                0x0101
-	EAJ_WIZARD:                0x0102
-	EAJ_HUNTER:                0x0103
-	EAJ_PRIEST:                0x0104
-	EAJ_BLACKSMITH:            0x0105
-	EAJ_ASSASSIN:              0x0106
-	EAJ_STAR_GLADIATOR:        0x0107
-	EAJ_REBELLION:             0x0109
-	EAJ_KAGEROUOBORO:          0x010A
-	EAJ_DEATH_KNIGHT:          0x010D
-
-	EAJ_CRUSADER:              0x0201
-	EAJ_SAGE:                  0x0202
-	EAJ_BARDDANCER:            0x0203
-	EAJ_MONK:                  0x0204
-	EAJ_ALCHEMIST:             0x0205
-	EAJ_ROGUE:                 0x0206
-	EAJ_SOUL_LINKER:           0x0207
-	EAJ_DARK_COLLECTOR:        0x020D
-
-	EAJ_NOVICE_HIGH:           0x1000
-	EAJ_SWORDMAN_HIGH:         0x1001
-	EAJ_MAGE_HIGH:             0x1002
-	EAJ_ARCHER_HIGH:           0x1003
-	EAJ_ACOLYTE_HIGH:          0x1004
-	EAJ_MERCHANT_HIGH:         0x1005
-	EAJ_THIEF_HIGH:            0x1006
-
-	EAJ_LORD_KNIGHT:           0x1101
-	EAJ_HIGH_WIZARD:           0x1102
-	EAJ_SNIPER:                0x1103
-	EAJ_HIGH_PRIEST:           0x1104
-	EAJ_WHITESMITH:            0x1105
-	EAJ_ASSASSIN_CROSS:        0x1106
-
-	EAJ_PALADIN:               0x1201
-	EAJ_PROFESSOR:             0x1202
-	EAJ_CLOWNGYPSY:            0x1203
-	EAJ_CHAMPION:              0x1204
-	EAJ_CREATOR:               0x1205
-	EAJ_STALKER:               0x1206
-
-	EAJ_BABY:                  0x2000
-	EAJ_BABY_SWORDMAN:         0x2001
-	EAJ_BABY_MAGE:             0x2002
-	EAJ_BABY_ARCHER:           0x2003
-	EAJ_BABY_ACOLYTE:          0x2004
-	EAJ_BABY_MERCHANT:         0x2005
-	EAJ_BABY_THIEF:            0x2006
-
-	EAJ_SUPER_BABY:            0x2100
-	EAJ_BABY_KNIGHT:           0x2101
-	EAJ_BABY_WIZARD:           0x2102
-	EAJ_BABY_HUNTER:           0x2103
-	EAJ_BABY_PRIEST:           0x2104
-	EAJ_BABY_BLACKSMITH:       0x2105
-	EAJ_BABY_ASSASSIN:         0x2106
-
-	EAJ_BABY_CRUSADER:         0x2201
-	EAJ_BABY_SAGE:             0x2202
-	EAJ_BABY_BARDDANCER:       0x2203
-	EAJ_BABY_MONK:             0x2204
-	EAJ_BABY_ALCHEMIST:        0x2205
-	EAJ_BABY_ROGUE:            0x2206
-
-	EAJ_SUPER_NOVICE_E:        0x4100
-	EAJ_RUNE_KNIGHT:           0x4101
-	EAJ_WARLOCK:               0x4102
-	EAJ_RANGER:                0x4103
-	EAJ_ARCH_BISHOP:           0x4104
-	EAJ_MECHANIC:              0x4105
-	EAJ_GUILLOTINE_CROSS:      0x4106
-
-	EAJ_ROYAL_GUARD:           0x4201
-	EAJ_SORCERER:              0x4202
-	EAJ_MINSTRELWANDERER:      0x4203
-	EAJ_SURA:                  0x4204
-	EAJ_GENETIC:               0x4205
-	EAJ_SHADOW_CHASER:         0x4206
-
-	EAJ_RUNE_KNIGHT_T:         0x5101
-	EAJ_WARLOCK_T:             0x5102
-	EAJ_RANGER_T:              0x5103
-	EAJ_ARCH_BISHOP_T:         0x5104
-	EAJ_MECHANIC_T:            0x5105
-	EAJ_GUILLOTINE_CROSS_T:    0x5106
-
-	EAJ_ROYAL_GUARD_T:         0x5201
-	EAJ_SORCERER_T:            0x5202
-	EAJ_MINSTRELWANDERER_T:    0x5203
-	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
-	EAJ_BABY_BISHOP:           0x6104
-	EAJ_BABY_MECHANIC:         0x6105
-	EAJ_BABY_CROSS:            0x6106
-
-	EAJ_BABY_GUARD:            0x6201
-	EAJ_BABY_SORCERER:         0x6202
-	EAJ_BABY_MINSTRELWANDERER: 0x6203
-	EAJ_BABY_SURA:             0x6204
-	EAJ_BABY_GENETIC:          0x6205
-	EAJ_BABY_CHASER:           0x6206
+	Job_Baby_Ninja:         4222
+	Job_Baby_Kagerou:       4223
+	Job_Baby_Oboro:         4224
+	Job_Baby_Taekwon:       4225
+	Job_Baby_Star_Gladiator: 4226
+	Job_Baby_Soul_Linker:   4227
+	Job_Baby_Gunslinger:    4228
+	Job_Baby_Rebellion:     4229
+	Job_Baby_Star_Gladiator2: 4238
+	Job_Star_Emperor:       4239
+	Job_Soul_Reaper:        4240
+	Job_Baby_Star_Emperor:  4241
+	Job_Baby_Soul_Reaper:   4242
 
 	comment__: "Broadcast flags"
 	bc_all:     0

db/job_db2.txt

@@ -61,6 +61,8 @@
 23,1,0,2,0,3,0,4,0,5,0,6,0,1,0,2,0,3,0,4,0,5,0,6,0,1,0,2,0,3,0,4,0,5,0,6,0,1,0,2,0,3,0,4,0,5,0,6,0,1,0,0,2,0,0,0,3,0,0,0,4,0,0,0,5,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Gunslinger
 24,5,6,0,6,0,5,0,0,0,0,5,6,0,0,0,0,5,0,0,0,6,0,0,0,5,0,0,0,0,0,6,1,0,0,5,0,0,0,0,0,1,0,0,0,5,0,0,0,0,1,6,4,0,0,5,0,0,0,2,3,4,5,6,1,0,0,0,0,0,0
+// Baby Gunslinger
+4228,5,6,0,6,0,5,0,0,0,0,5,6,0,0,0,0,5,0,0,0,6,0,0,0,5,0,0,0,0,0,6,1,0,0,5,0,0,0,0,0,1,0,0,0,5,0,0,0,0,1,6,4,0,0,5,0,0,0,2,3,4,5,6,1,0,0,0,0,0,0
 // Ninja
 25,2,2,0,0,0,0,0,0,0,5,2,0,0,0,0,0,0,0,0,4,2,5,0,0,0,0,0,0,4,6,2,5,0,0,0,0,0,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,4,5,6,0,0,0,0,0,0
 // Novice High
@@ -153,14 +155,20 @@
 4044,6,6,6,6,6,0,1,0,4,0,1,3,0,5,3,0,1,0,0,4,4,3,1,0,1,0,0,5,0,2,0,1,0,5,0,2,0,4,0,3,3,0,0,4,0,3,0,1,0,3
 // Baby Super Novice
 4045,1,0,2,0,3,0,4,0,5,0,6,0,1,0,2,0,3,0,4,0,5,0,6,0,1,0,2,0,3,0,4,0,5,0,6,0,1,0,2,0,3,0,4,0,5,0,6,0,1,0,0,2,0,0,0,3,0,0,0,4,0,0,0,5,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+// Baby Ninja
+4222,2,2,0,0,0,0,0,0,0,5,2,0,0,0,0,0,0,0,0,4,2,5,0,0,0,0,0,0,4,6,2,5,0,0,0,0,0,0,0,6,2,4,5,0,0,0,0,0,0,4,2,6,5,0,0,0,0,0,1,3,2,4,5,6,0,0,0,0,0,0
 // Taekwon
 4046,1,1,1,1,1,1,0,0,0,5,5,5,5,5,5,0,0,0,0,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Star Gladiator
 4047,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2
 // Star Gladiator (Union)
 4048,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2
+// Baby Star Gladiator
+4226,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2
 // Soul Linker
 4049,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5
+// Baby Soul Linker
+4227,4,4,4,4,4,4,4,4,4,4,4,4,0,0,0,0,0,0,0,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5
 //================================
 // 3CeAM r664 Base
 //
@@ -285,9 +293,27 @@
 4191,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0,1,2,0,3,0,4,5,0,6,0
 // Kagerou
 4211,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
+// Kagerou Baby
+4223,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
 // Oboro
 4212,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
+// Oboro Baby
+4224,5,0,4,0,2,3,0,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,6,3,4,0,5,0,2,0,1,4,0,5,4,0,3,5,1,0,2,4,1,0,5,6,2,1,0,5
+// Taekwon Baby
+4225,1,1,1,1,1,1,0,0,0,5,5,5,5,5,5,0,0,0,0,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Rebellion
 4215,0,5,0,4,0,3,5,4,2,6,0,0,3,4,0,2,5,4,3,6,0,0,3,5,1,4,2,0,0,6,3,0,5,4,1,0,0,5,0,2,6,0,5,3,4,0,0,0,0,1
+// Baby Rebellion
+4229,0,5,0,4,0,3,5,4,2,6,0,0,3,4,0,2,5,4,3,6,0,0,3,5,1,4,2,0,0,6,3,0,5,4,1,0,0,5,0,2,6,0,5,3,4,0,0,0,0,1
 // Summoner
 4218,5,0,3,0,5,3,0,2,4,0,2,4,5,0,2,4,5,0,2,4,5,0,6,3,5,0,2,0,6,0,4,5,0,6,0,4,6,0,2,0,5,4,3,0,5,6,3,2,0,5
+// Summoner Baby
+4220,5,0,3,0,5,3,0,2,4,0,2,4,5,0,2,4,5,0,2,4,5,0,6,3,5,0,2,0,6,0,4,5,0,6,0,4,6,0,2,0,5,4,3,0,5,6,3,2,0,5
+// Star Emperor
+4239,1,5,0,0,2,0,4,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,1,3,4,0,5,0,2,5,1,0,0,5,2,6,3,5,1,0,2,3,1,0,5,0,2,1,0,5,0,0,0,0,0,1,0,0,2,0
+// Star Emperor Baby
+4241,1,5,0,0,2,0,4,1,6,0,5,1,2,0,4,6,3,0,1,5,2,0,1,3,4,0,5,0,2,5,1,0,0,5,2,6,3,5,1,0,2,3,1,0,5,0,2,1,0,5,0,0,0,0,0,1,0,0,2,0
+// Soul Reaper
+4240,4,5,0,0,4,3,5,0,0,0,5,4,2,0,5,4,3,0,1,5,2,0,0,3,4,5,0,1,2,5,4,0,0,5,2,0,3,5,4,0,2,3,1,4,5,0,2,0,4,5,0,2,0,4,0,0,0,0,4,0
+// Soul Reaper Baby
+4242,4,5,0,0,4,3,5,0,0,0,5,4,2,0,5,4,3,0,1,5,2,0,0,3,4,5,0,1,2,5,4,0,0,5,2,0,3,5,4,0,2,3,1,4,5,0,2,0,4,5,0,2,0,4,0,0,0,0,4,0

db/pre-re/exp_group_db.conf

@@ -157,6 +157,16 @@ job_exp_group_db: {
 			1289472, 1587070, 1843620, 2213516, 2521910, 2974608, 3115314, 3981264, 5166772
 		]
 	}
+	SoulLinker: {
+		MaxLevel: 50
+		Exp: [
+			2500, 4200, 7000, 10300, 15900, 18900, 20900, 22600, 24900, 28800,
+			31500, 32000, 33300, 35100, 40500, 44100, 46300, 48500, 50700, 56000,
+			59400, 63500, 68100, 75000, 85700, 90500, 96600, 102600, 108600, 119700,
+			126000, 132300, 138600, 146100, 157500, 170600, 180400, 190300, 196800, 214900,
+			225200, 232000, 245700, 255900, 279300, 294000, 308700, 327000, 345400
+		]
+	}
 	SuperNovice: {
 		MaxLevel: 99
 		Exp: [