Merge pull request #3249 from Asheraf/mapcache_1106

Update map list and other constants
HerculesWS · Nov 21, 2023 · a090e51 · a090e51
2 parents 619a586 + 73042e8
commit a090e51
Show file tree

Hide file tree

Showing 90 changed files with 178 additions and 1 deletion.
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
@@ -1542,6 +1542,69 @@ map_list: (
 	"hero_dun1",
 	"hero_tra",
 
+	// Fantasy Series Part 3
+	"1@vrclo",
+	"2@vrclo",
+	"1@vrhha",
+	"1@vrac1",
+	"1@vrac2",
+
+	// Barmund Artificial Biosphere 2
+	"bl_venom",
+	"bl_temple",
+	"bl_soul",
+
+	// Fantasy Series X - Lava Collaboration Damp Sewerage
+	"1@lvcb",
+
+	// 260 Level Expansion Content
+	"ra_pol01",
+	"mjo_wst01",
+
+	// Episode 20 The One Who Never Dies
+	"jor_twig",
+	"icas_in2",
+	"jor_back4",
+	"jor_back5",
+	"jor_back6",
+	"jor_twice",
+	"jor_sanct",
+	"jor_root1",
+	"jor_root2",
+	"jor_root3",
+	"jor_maze",
+	"jor_safty1",
+	"jor_safty2",
+	"1@twsd",
+	"1@slug",
+	"1@20cn1",
+	"1@20cn2",
+	"1@twas",
+	"1@twbs",
+	"1@twig",
+
+	// Barmund Deep Biosphere Floor 1
+	"bl_depth1",
+
+	// Prontera Dimension Rift Night Market
+	"x_prt_evt",
+	"x_prt_in",
+
+	// Garden of Time
+	"1@ba_go",
+	"1@f_lake",
+	"t_garden",
+	"for_dun01",
+	"for_dun02",
+
+	// Fantasy Series Part 4 - A great adventure beyond the end of the rainbow
+	"1@vrpop",
+	"2@vrpop",
+	"3@vrpop",
+
+	// Barmund Deep Biosphere Abyss
+	"bl_depth2",
+
 	//------------------------- Clone Maps ---------------------------
 	//------------------------- Extra Maps ---------------------------
 

diff --git a/db/constants.conf b/db/constants.conf
@@ -3718,6 +3718,31 @@ constants_db: {
 	GATE_SKYBLUE:           10527
 	4_CS_RIGEL:             10528
 	4_M_NILLEM:             10529
+	4_LARVA_RED:            10530
+	4_LARVA_YELLOW:         10531
+	4_LARVA_BLACK:          10532
+	4_LARVA_VIOLET:         10533
+	4_HERO_SAUSAGE:         10534
+	4_PRINCESS_SAUSAGE:     10535
+	4_EP20_LASGAND:         10536
+	4_EP20_NYAR:            10537
+	4_EP20_DEVICE_BLUE:     10538
+	4_EP20_DEVICE_RED:      10539
+	4_EP20_DEVICE_BLACK:    10540
+	4_GACHA_MACHINE:        10545
+	4_RUNESTONE:            10547
+	4_EM_ARDOR:             10548
+	4_EM_DILUVIO:           10549
+	4_EM_PROCELLA:          10550
+	4_EM_TERREMOTUS:        10551
+	4_EM_SERPENS:           10552
+	1_SHADOW_RED:           10554
+	1_SHADOW_ORANGE:        10555
+	1_SHADOW_YELLOW:        10556
+	1_SHADOW_GREEN:         10557
+	1_SHADOW_BLUE:          10558
+	1_SHADOW_INDIGO:        10559
+	1_SHADOW_VIOLET:        10560
 
 	comment__: "Mercenary IDs"
 	MER_LIF:           6001
@@ -4108,6 +4133,52 @@ constants_db: {
 	HAT_EF_C_SPOT_LIGHT:                174
 	HAT_EF_C_ASTRA_BLESSING:            175
 	HAT_EF_EFST_C_20TH_ANNIVERSARY_HAT: 176
+	HAT_EF_SUBJECT_AURA_NAVY:           177
+	HAT_EF_20TH_SCARF_J:                178
+	HAT_EF_GHOST_FIRE:                  179
+	HAT_EF_SERPENT_SHADOW:              180
+	HAT_EF_C_1ST_EVT_HAT_MSP:           181
+	HAT_EF_C_1ST_EVT_BALLOON_MSP:       182
+	HAT_EF_RABBIT_AURA:                 183
+	HAT_EF_ALICE_TEA:                   184
+	HAT_EF_C_DARK_LORD_CLOAK:           185
+	HAT_EF_C_SAKURA_FUBUKI:             186
+	HAT_EF_C_DARK_LORD_MANTEAU:         187
+	HAT_EF_DECORATION_OF_MUSIC:         188
+	HAT_EF_2023RTC_S_ROBE1:             189
+	HAT_EF_2023RTC_S_ROBE2:             190
+	HAT_EF_2023RTC_S_ROBE3:             191
+	HAT_EF_C_CONSECRATE_F_AUREOLA:      192
+	HAT_EF_C_BULB_WREATH:               193
+	HAT_EF_MD_HOL_BARRIER1:             194
+	HAT_EF_MD_HOL_BARRIER2:             195
+	HAT_EF_MD_HOL_BARRIER3:             196
+	HAT_EF_MD_HOL_BARRIER4:             197
+	HAT_EF_MD_HOL_BARRIER5:             198
+	HAT_EF_MD_HOL_BARRIER6:             199
+	HAT_EF_MD_HOL_BARRIER7:             200
+	HAT_EF_MD_HOL_BARRIER8:             201
+	HAT_EF_MD_HOL_BARRIER9:             202
+	HAT_EF_MD_HOL_BARRIER10:            203
+	HAT_EF_MD_HOL_BARRIER11:            204
+	HAT_EF_MD_HOL_BARRIER12:            205
+	HAT_EF_MD_HOL_BARRIER13:            206
+	HAT_EF_MD_HOL_BARRIER14:            207
+	HAT_EF_MD_HOL_BARRIER15:            208
+	HAT_EF_MD_HOL_BARRIER16:            209
+	HAT_EF_MD_HOL_BARRIER17:            210
+	HAT_EF_MD_HOL_BARRIER18:            211
+	HAT_EF_MD_HOL_BARRIER19:            212
+	HAT_EF_MD_HOL_BARRIER20:            213
+	HAT_EF_C_FLUTTERING_HAZE:           214
+	HAT_EF_EFST_CINNAMON:               215
+	HAT_EF_AUTUMN_FULL_MOON:            216
+	HAT_EF_NIFLHEIM_NIGHT_SKY:          217
+	HAT_EF_C_ROS2023_CAPE_1:            218
+	HAT_EF_BLACK_THUNDER2:              219
+	HAT_EF_C_ROS2023_CAPE_2:            220
+	HAT_EF_C_15TH_NOV_HELMET:           221
+	HAT_EF_COSMIC_CONNECTION:           222
 
 	comment__: "Achievement Types"
 	ACH_QUEST:                          0

diff --git a/db/map_index.txt b/db/map_index.txt
@@ -1171,6 +1171,49 @@ hero_in4
 herosria
 hero_dun1
 hero_tra
+1@vrclo
+2@vrclo
+1@vrhha
+1@vrac1
+1@vrac2
+bl_venom
+bl_temple
+bl_soul
+1@lvcb
+ra_pol01
+mjo_wst01
+jor_twig
+icas_in2
+jor_back4
+jor_back5
+jor_back6
+jor_twice
+jor_sanct
+jor_root1
+jor_root2
+jor_root3
+jor_maze
+jor_safty1
+jor_safty2
+1@twsd
+1@slug
+1@20cn1
+1@20cn2
+1@twas
+1@twbs
+1@twig
+bl_depth1
+x_prt_evt
+x_prt_in
+1@ba_go
+1@f_lake
+t_garden
+for_dun01
+for_dun02
+1@vrpop
+2@vrpop
+3@vrpop
+bl_depth2
 
 // Only add maps under this line if they are not standard maps!
 //======================================================================================

diff --git a/maps/pre-re/1@20cn1.mcache b/maps/pre-re/1@20cn1.mcache
diff --git a/maps/pre-re/1@20cn2.mcache b/maps/pre-re/1@20cn2.mcache
diff --git a/maps/pre-re/1@ba_go.mcache b/maps/pre-re/1@ba_go.mcache
diff --git a/maps/pre-re/1@f_lake.mcache b/maps/pre-re/1@f_lake.mcache
diff --git a/maps/pre-re/1@lvcb.mcache b/maps/pre-re/1@lvcb.mcache
diff --git a/maps/pre-re/1@slug.mcache b/maps/pre-re/1@slug.mcache
diff --git a/maps/pre-re/1@twas.mcache b/maps/pre-re/1@twas.mcache
diff --git a/maps/pre-re/1@twbs.mcache b/maps/pre-re/1@twbs.mcache
diff --git a/maps/pre-re/1@twig.mcache b/maps/pre-re/1@twig.mcache
diff --git a/maps/pre-re/1@twsd.mcache b/maps/pre-re/1@twsd.mcache
diff --git a/maps/pre-re/1@vrac1.mcache b/maps/pre-re/1@vrac1.mcache
diff --git a/maps/pre-re/1@vrac2.mcache b/maps/pre-re/1@vrac2.mcache
diff --git a/maps/pre-re/1@vrclo.mcache b/maps/pre-re/1@vrclo.mcache
diff --git a/maps/pre-re/1@vrhha.mcache b/maps/pre-re/1@vrhha.mcache
diff --git a/maps/pre-re/1@vrpop.mcache b/maps/pre-re/1@vrpop.mcache
diff --git a/maps/pre-re/2@vrclo.mcache b/maps/pre-re/2@vrclo.mcache
diff --git a/maps/pre-re/2@vrpop.mcache b/maps/pre-re/2@vrpop.mcache
diff --git a/maps/pre-re/3@vrpop.mcache b/maps/pre-re/3@vrpop.mcache
diff --git a/maps/pre-re/bl_depth1.mcache b/maps/pre-re/bl_depth1.mcache
diff --git a/maps/pre-re/bl_depth2.mcache b/maps/pre-re/bl_depth2.mcache
diff --git a/maps/pre-re/bl_soul.mcache b/maps/pre-re/bl_soul.mcache
diff --git a/maps/pre-re/bl_temple.mcache b/maps/pre-re/bl_temple.mcache
diff --git a/maps/pre-re/bl_venom.mcache b/maps/pre-re/bl_venom.mcache
diff --git a/maps/pre-re/for_dun01.mcache b/maps/pre-re/for_dun01.mcache
diff --git a/maps/pre-re/for_dun02.mcache b/maps/pre-re/for_dun02.mcache
diff --git a/maps/pre-re/icas_in2.mcache b/maps/pre-re/icas_in2.mcache
diff --git a/maps/pre-re/jor_back4.mcache b/maps/pre-re/jor_back4.mcache
diff --git a/maps/pre-re/jor_back5.mcache b/maps/pre-re/jor_back5.mcache
diff --git a/maps/pre-re/jor_back6.mcache b/maps/pre-re/jor_back6.mcache
diff --git a/maps/pre-re/jor_maze.mcache b/maps/pre-re/jor_maze.mcache
diff --git a/maps/pre-re/jor_root1.mcache b/maps/pre-re/jor_root1.mcache
diff --git a/maps/pre-re/jor_root2.mcache b/maps/pre-re/jor_root2.mcache
diff --git a/maps/pre-re/jor_root3.mcache b/maps/pre-re/jor_root3.mcache
diff --git a/maps/pre-re/jor_safty1.mcache b/maps/pre-re/jor_safty1.mcache
diff --git a/maps/pre-re/jor_safty2.mcache b/maps/pre-re/jor_safty2.mcache
diff --git a/maps/pre-re/jor_sanct.mcache b/maps/pre-re/jor_sanct.mcache
diff --git a/maps/pre-re/jor_twice.mcache b/maps/pre-re/jor_twice.mcache
diff --git a/maps/pre-re/jor_twig.mcache b/maps/pre-re/jor_twig.mcache
diff --git a/maps/pre-re/mjo_wst01.mcache b/maps/pre-re/mjo_wst01.mcache
diff --git a/maps/pre-re/ra_pol01.mcache b/maps/pre-re/ra_pol01.mcache
diff --git a/maps/pre-re/t_garden.mcache b/maps/pre-re/t_garden.mcache
diff --git a/maps/pre-re/x_prt_evt.mcache b/maps/pre-re/x_prt_evt.mcache
diff --git a/maps/pre-re/x_prt_in.mcache b/maps/pre-re/x_prt_in.mcache
diff --git a/maps/re/1@20cn1.mcache b/maps/re/1@20cn1.mcache
diff --git a/maps/re/1@20cn2.mcache b/maps/re/1@20cn2.mcache
diff --git a/maps/re/1@ba_go.mcache b/maps/re/1@ba_go.mcache
diff --git a/maps/re/1@f_lake.mcache b/maps/re/1@f_lake.mcache
diff --git a/maps/re/1@lvcb.mcache b/maps/re/1@lvcb.mcache
diff --git a/maps/re/1@slug.mcache b/maps/re/1@slug.mcache
diff --git a/maps/re/1@twas.mcache b/maps/re/1@twas.mcache
diff --git a/maps/re/1@twbs.mcache b/maps/re/1@twbs.mcache
diff --git a/maps/re/1@twig.mcache b/maps/re/1@twig.mcache
diff --git a/maps/re/1@twsd.mcache b/maps/re/1@twsd.mcache
diff --git a/maps/re/1@vrac1.mcache b/maps/re/1@vrac1.mcache
diff --git a/maps/re/1@vrac2.mcache b/maps/re/1@vrac2.mcache
diff --git a/maps/re/1@vrclo.mcache b/maps/re/1@vrclo.mcache
diff --git a/maps/re/1@vrhha.mcache b/maps/re/1@vrhha.mcache
diff --git a/maps/re/1@vrpop.mcache b/maps/re/1@vrpop.mcache
diff --git a/maps/re/2@vrclo.mcache b/maps/re/2@vrclo.mcache
diff --git a/maps/re/2@vrpop.mcache b/maps/re/2@vrpop.mcache
diff --git a/maps/re/3@vrpop.mcache b/maps/re/3@vrpop.mcache
diff --git a/maps/re/bl_depth1.mcache b/maps/re/bl_depth1.mcache
diff --git a/maps/re/bl_depth2.mcache b/maps/re/bl_depth2.mcache
diff --git a/maps/re/bl_soul.mcache b/maps/re/bl_soul.mcache
diff --git a/maps/re/bl_temple.mcache b/maps/re/bl_temple.mcache
diff --git a/maps/re/bl_venom.mcache b/maps/re/bl_venom.mcache
diff --git a/maps/re/for_dun01.mcache b/maps/re/for_dun01.mcache
diff --git a/maps/re/for_dun02.mcache b/maps/re/for_dun02.mcache
diff --git a/maps/re/icas_in2.mcache b/maps/re/icas_in2.mcache
diff --git a/maps/re/jor_back4.mcache b/maps/re/jor_back4.mcache
diff --git a/maps/re/jor_back5.mcache b/maps/re/jor_back5.mcache
diff --git a/maps/re/jor_back6.mcache b/maps/re/jor_back6.mcache
diff --git a/maps/re/jor_maze.mcache b/maps/re/jor_maze.mcache
diff --git a/maps/re/jor_root1.mcache b/maps/re/jor_root1.mcache
diff --git a/maps/re/jor_root2.mcache b/maps/re/jor_root2.mcache
diff --git a/maps/re/jor_root3.mcache b/maps/re/jor_root3.mcache
diff --git a/maps/re/jor_safty1.mcache b/maps/re/jor_safty1.mcache
diff --git a/maps/re/jor_safty2.mcache b/maps/re/jor_safty2.mcache
diff --git a/maps/re/jor_sanct.mcache b/maps/re/jor_sanct.mcache
diff --git a/maps/re/jor_twice.mcache b/maps/re/jor_twice.mcache
diff --git a/maps/re/jor_twig.mcache b/maps/re/jor_twig.mcache
diff --git a/maps/re/mjo_wst01.mcache b/maps/re/mjo_wst01.mcache
diff --git a/maps/re/ra_pol01.mcache b/maps/re/ra_pol01.mcache
diff --git a/maps/re/t_garden.mcache b/maps/re/t_garden.mcache
diff --git a/maps/re/x_prt_evt.mcache b/maps/re/x_prt_evt.mcache
diff --git a/maps/re/x_prt_in.mcache b/maps/re/x_prt_in.mcache
diff --git a/src/map/npc.h b/src/map/npc.h
@@ -174,7 +174,7 @@ enum actor_classes {
 #define MAX_NPC_CLASS 1000
 // New NPC range
 #define MAX_NPC_CLASS2_START 10001
-#define MAX_NPC_CLASS2_END 10529
+#define MAX_NPC_CLASS2_END 10560
 
 //Script NPC events.
 enum npce_event {