HerculesWS · MishimaHaruna · Mar 3, 2022 · Feb 20, 2022 · Feb 20, 2022 · Feb 20, 2022
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
@@ -1463,6 +1463,54 @@ map_list: (
 	"que_thr",
 	"1@tcamp",
 
+	// Illusion of Twins
+	"ant_d02_i",
+
+	// Sunken Tower
+	"1@ch_u",
+
+	// Barmund Artificial Biosphere
+	"bl_grass",
+	"bl_lava",
+	"bl_ice",
+	"bl_death",
+
+	// Second-Tier Extended Jobs
+	"1@exhn",
+	"1@exds",
+	"2@exds",
+	"1@exse",
+	"1@exnw",
+	"1@exsr",
+	"1@exsh",
+
+	// Level 240 Content Clock Tower Unknown Basement
+	"clock_01",
+
+	// Ragnarok Festival
+	"rag_fes",
+	"rag_fes_a",
+
+	// Episode 19 Isgard, Land of Legends
+	"icecastle",
+	"icas_in",
+	"jor_tail",
+	"jor_back1",
+	"jor_back2",
+	"jor_back3",
+	"jor_nest",
+	"jor_dun01",
+	"jor_dun02",
+	"jor_dun03",
+	"jor_ab01",
+	"jor_ab02",
+	"jor_que",
+	"air_if",
+	"1@iwp",
+	"1@jorchs",
+	"1@jorlab",
+	"1@whl",
+
 	//------------------------- Clone Maps ---------------------------
 	//------------------------- Extra Maps ---------------------------
 

diff --git a/db/constants.conf b/db/constants.conf
@@ -3647,6 +3647,75 @@ constants_db: {
 	4_POINT_YELLOW:         10430
 	4_POINT_BLACK:          10431
 	4_POINT_WHITE:          10432
+	4_EXJOB_GERHOLD:        10433
+	4_EXJOB_NINJA:          10434
+	4_EXJOB_MASTER_J:       10435
+	4_EXJOB_MR_SEO:         10436
+	4_EXJOB_HAPPY_CLOUD:    10437
+	4_EXJOB_STAR:           10438
+	4_EXJOB_CHUL_HO:        10439
+	4_EXJOB_KI_SUL:         10440
+	4_EXJOB_HYUN_ROK:       10441
+	1_JOURNEY_STONE_D:      10442
+	1_JOURNEY_STONE_F:      10443
+	4_EP19_ZORYARA:         10451
+	4_EP19_MORYARA:         10452
+	4_EP19_LUNCH:           10453
+	4_EP19_LAZY:            10454
+	4_EP19_JUNCEA:          10455
+	4_EP19_JUNCEA_M:        10456
+	4_EP19_JUNCEA_D:        10457
+	4_EP19_FRIEDERIKE:      10458
+	4_EP19_SUITCASE:        10459
+	4_EP19_HEALROCK:        10460
+	4_EP19_IWIN:            10461
+	4_EP19_IWIN_DIVER:      10462
+	4_EP19_TAMARIN:         10463
+	4_EP19_LEON:            10464
+	4_EP19_AURELIE:         10465
+	4_EP19_LASGAND:         10466
+	4_EP19_VOGLINDE:        10467
+	4_EP19_VELLGUNDE:       10468
+	4_EP19_LEHAR:           10469
+	4_EP19_RGAN_R1:         10470
+	4_EP19_RGAN_R2:         10471
+	4_EP19_RGAN_R3:         10472
+	4_EP19_RGAN_SR1:        10473
+	4_EP19_RGAN_SR2:        10474
+	4_EP19_RGAN_SR3:        10475
+	1_RAGFES_01:            10476
+	1_RAGFES_01_M:          10477
+	4_RAGFES_02:            10478
+	4_RAGFES_02_M:          10479
+	4_RAGFES_03:            10480
+	4_RAGFES_03_M:          10481
+	4_RAGFES_04:            10482
+	4_RAGFES_04_M:          10483
+	4_RAGFES_05:            10484
+	4_RAGFES_05_M:          10485
+	4_RAGFES_06:            10486
+	4_RAGFES_06_M:          10487
+	4_RAGFES_07:            10488
+	4_RAGFES_07_M:          10489
+	4_RAGFES_08:            10490
+	4_RAGFES_08_M:          10491
+	4_RAGFES_09:            10492
+	4_RAGFES_09_M:          10493
+	4_RAGFES_10:            10494
+	4_RAGFES_10_M:          10495
+	4_RAGFES_11:            10496
+	4_RAGFES_11_M:          10497
+	4_RAGFES_12:            10498
+	4_RAGFES_12_M:          10499
+	4_RAGFES_13:            10500
+	4_RAGFES_13_M:          10501
+	4_RAGFES_14:            10502
+	4_RAGFES_14_M:          10503
+	4_RAGFES_15:            10504
+	4_RAGFES_15_M:          10505
+	4_RAGFES_16:            10506
+	4_RAGFES_16_M:          10507
+	4_EXJOB_NINJA2:         10508
 
 	comment__: "Mercenary IDs"
 	MER_LIF:           6001
@@ -4057,6 +4126,21 @@ constants_db: {
 	HAT_EF_160LV_SOUL_R_GRAY:      147
 	HAT_EF_GEARWHEEL:              148
 	HAT_EF_GIFT_OF_SNOW:           149
+	HAT_EF_SNOW_POWDER:            150
+	HAT_EF_FALLING_SNOW:           151
+	HAT_EF_C_PHIGASIA_SCARF_EXE:   152
+	HAT_EF_C_KYEL_HYRE_ULTI_TW:    153
+	HAT_EF_C_MASTER:               154
+	HAT_EF_C_TIME_ACCESSORY:       155
+	HAT_EF_C_HELM_OF_RA:           156
+	HAT_EF_C_2021RTC_HEADSET_TW:   157
+	HAT_EF_C_MOONSTAR_ACCESSORY:   158
+	HAT_EF_BLACK_THUNDER:          159
+	HAT_EF_BLACK_THUNDER_DARK:     160
+	HAT_EF_C_RELEASED_GROUND:      161
+	HAT_EF_C_SAMBA_CARNIVAL:       162
+	HAT_EF_POISON_MASTER:          163
+	HAT_EF_C_SWIRLING_FLAME:       164
 
 	comment__: "Achievement Types"
 	ACH_QUEST:                          0

diff --git a/db/map_index.txt b/db/map_index.txt
@@ -1114,6 +1114,40 @@ oz_dun02
 1@advs
 que_thr
 1@tcamp
+ant_d02_i
+1@ch_u
+bl_grass
+bl_lava
+bl_ice
+bl_death
+1@exhn
+1@exds
+2@exds
+1@exse
+1@exnw
+1@exsr
+1@exsh
+clock_01
+rag_fes
+rag_fes_a
+icecastle
+icas_in
+jor_tail
+jor_back1
+jor_back2
+jor_back3
+jor_nest
+jor_dun01
+jor_dun02
+jor_dun03
+jor_ab01
+jor_ab02
+jor_que
+air_if
+1@iwp
+1@jorchs
+1@jorlab
+1@whl
 
 // Only add maps under this line if they are not standard maps!
 //======================================================================================

diff --git a/maps/pre-re/1@ch_u.mcache b/maps/pre-re/1@ch_u.mcache
diff --git a/maps/pre-re/1@exds.mcache b/maps/pre-re/1@exds.mcache
diff --git a/maps/pre-re/1@exhn.mcache b/maps/pre-re/1@exhn.mcache
diff --git a/maps/pre-re/1@exnw.mcache b/maps/pre-re/1@exnw.mcache
diff --git a/maps/pre-re/1@exse.mcache b/maps/pre-re/1@exse.mcache
diff --git a/maps/pre-re/1@exsh.mcache b/maps/pre-re/1@exsh.mcache
diff --git a/maps/pre-re/1@exsr.mcache b/maps/pre-re/1@exsr.mcache
diff --git a/maps/pre-re/1@iwp.mcache b/maps/pre-re/1@iwp.mcache
diff --git a/maps/pre-re/1@jorchs.mcache b/maps/pre-re/1@jorchs.mcache
diff --git a/maps/pre-re/1@jorlab.mcache b/maps/pre-re/1@jorlab.mcache
diff --git a/maps/pre-re/1@whl.mcache b/maps/pre-re/1@whl.mcache
diff --git a/maps/pre-re/2@exds.mcache b/maps/pre-re/2@exds.mcache
diff --git a/maps/pre-re/air_if.mcache b/maps/pre-re/air_if.mcache
diff --git a/maps/pre-re/ant_d02_i.mcache b/maps/pre-re/ant_d02_i.mcache
diff --git a/maps/pre-re/bl_death.mcache b/maps/pre-re/bl_death.mcache
diff --git a/maps/pre-re/bl_grass.mcache b/maps/pre-re/bl_grass.mcache
diff --git a/maps/pre-re/bl_ice.mcache b/maps/pre-re/bl_ice.mcache
diff --git a/maps/pre-re/bl_lava.mcache b/maps/pre-re/bl_lava.mcache
diff --git a/maps/pre-re/clock_01.mcache b/maps/pre-re/clock_01.mcache
diff --git a/maps/pre-re/icas_in.mcache b/maps/pre-re/icas_in.mcache
diff --git a/maps/pre-re/icecastle.mcache b/maps/pre-re/icecastle.mcache
diff --git a/maps/pre-re/jor_ab01.mcache b/maps/pre-re/jor_ab01.mcache
diff --git a/maps/pre-re/jor_ab02.mcache b/maps/pre-re/jor_ab02.mcache
diff --git a/maps/pre-re/jor_back1.mcache b/maps/pre-re/jor_back1.mcache
diff --git a/maps/pre-re/jor_back2.mcache b/maps/pre-re/jor_back2.mcache
diff --git a/maps/pre-re/jor_back3.mcache b/maps/pre-re/jor_back3.mcache
diff --git a/maps/pre-re/jor_dun01.mcache b/maps/pre-re/jor_dun01.mcache
diff --git a/maps/pre-re/jor_dun02.mcache b/maps/pre-re/jor_dun02.mcache
diff --git a/maps/pre-re/jor_dun03.mcache b/maps/pre-re/jor_dun03.mcache
diff --git a/maps/pre-re/jor_nest.mcache b/maps/pre-re/jor_nest.mcache
diff --git a/maps/pre-re/jor_que.mcache b/maps/pre-re/jor_que.mcache
diff --git a/maps/pre-re/jor_tail.mcache b/maps/pre-re/jor_tail.mcache
diff --git a/maps/pre-re/rag_fes.mcache b/maps/pre-re/rag_fes.mcache
diff --git a/maps/pre-re/rag_fes_a.mcache b/maps/pre-re/rag_fes_a.mcache
diff --git a/maps/re/1@ch_u.mcache b/maps/re/1@ch_u.mcache
diff --git a/maps/re/1@exds.mcache b/maps/re/1@exds.mcache
diff --git a/maps/re/1@exhn.mcache b/maps/re/1@exhn.mcache
diff --git a/maps/re/1@exnw.mcache b/maps/re/1@exnw.mcache
diff --git a/maps/re/1@exse.mcache b/maps/re/1@exse.mcache
diff --git a/maps/re/1@exsh.mcache b/maps/re/1@exsh.mcache
diff --git a/maps/re/1@exsr.mcache b/maps/re/1@exsr.mcache
diff --git a/maps/re/1@iwp.mcache b/maps/re/1@iwp.mcache
diff --git a/maps/re/1@jorchs.mcache b/maps/re/1@jorchs.mcache
diff --git a/maps/re/1@jorlab.mcache b/maps/re/1@jorlab.mcache
diff --git a/maps/re/1@whl.mcache b/maps/re/1@whl.mcache
diff --git a/maps/re/2@exds.mcache b/maps/re/2@exds.mcache
diff --git a/maps/re/air_if.mcache b/maps/re/air_if.mcache
diff --git a/maps/re/ant_d02_i.mcache b/maps/re/ant_d02_i.mcache
diff --git a/maps/re/bl_death.mcache b/maps/re/bl_death.mcache
diff --git a/maps/re/bl_grass.mcache b/maps/re/bl_grass.mcache
diff --git a/maps/re/bl_ice.mcache b/maps/re/bl_ice.mcache
diff --git a/maps/re/bl_lava.mcache b/maps/re/bl_lava.mcache
diff --git a/maps/re/clock_01.mcache b/maps/re/clock_01.mcache
diff --git a/maps/re/icas_in.mcache b/maps/re/icas_in.mcache
diff --git a/maps/re/icecastle.mcache b/maps/re/icecastle.mcache
diff --git a/maps/re/jor_ab01.mcache b/maps/re/jor_ab01.mcache
diff --git a/maps/re/jor_ab02.mcache b/maps/re/jor_ab02.mcache
diff --git a/maps/re/jor_back1.mcache b/maps/re/jor_back1.mcache
diff --git a/maps/re/jor_back2.mcache b/maps/re/jor_back2.mcache
diff --git a/maps/re/jor_back3.mcache b/maps/re/jor_back3.mcache
diff --git a/maps/re/jor_dun01.mcache b/maps/re/jor_dun01.mcache
diff --git a/maps/re/jor_dun02.mcache b/maps/re/jor_dun02.mcache
diff --git a/maps/re/jor_dun03.mcache b/maps/re/jor_dun03.mcache
diff --git a/maps/re/jor_nest.mcache b/maps/re/jor_nest.mcache
diff --git a/maps/re/jor_que.mcache b/maps/re/jor_que.mcache
diff --git a/maps/re/jor_tail.mcache b/maps/re/jor_tail.mcache
diff --git a/maps/re/rag_fes.mcache b/maps/re/rag_fes.mcache
diff --git a/maps/re/rag_fes_a.mcache b/maps/re/rag_fes_a.mcache
diff --git a/src/map/npc.h b/src/map/npc.h
@@ -166,7 +166,7 @@ enum actor_classes {
 #define MAX_NPC_CLASS 1000
 // New NPC range
 #define MAX_NPC_CLASS2_START 10001
-#define MAX_NPC_CLASS2_END 10376
+#define MAX_NPC_CLASS2_END 10509
 
 //Script NPC events.
 enum npce_event {

diff --git a/src/plugins/mapcache.c b/src/plugins/mapcache.c
@@ -288,7 +288,7 @@ bool mapcache_cache_map(const char *mapname)
 		}
 		int major_version = rsw[4];
 		int minor_version = rsw[5];
-		if (major_version > 2 || (major_version == 2 && minor_version > 5)) {
+		if (major_version > 2 || (major_version == 2 && minor_version > 6)) {
 			ShowError("mapcache_cache_map: Unsupported version %d.%d for rsw file %s\n", major_version, minor_version, filepath);
 			aFree(rsw);
 			return false;