Added missing maps to map_cache (#3192)

* Added missing maps to map_cache
- additionnally removed the commented 'extra maps'
- Added mapflags on instances and dungeons maps

Credit to @zackdreaver for some map name

conf/maps_athena.conf

@@ -1272,91 +1272,60 @@ map: gef_d01_i
 // Illusion Ice (Frozen)
 map: ice_d03_i
 
-// ??
+// Suspicious shipwreck
 map: 1@tre
 
-// ??
+// Poring Town
 map: 1@begi
 
 // Illusion Turtle island (Archery)
 map: tur_d03_i
 map: tur_d04_i
 
-// ??
+// Volcanic island Korodo
 map: 1@crd
 
+// ??
+map: ordeal_a00
+map: ordeal_a02
+map: pprontera
+
+// ??
+map: niflxmas
+map: sch_lab
+map: nakhyang
+
+// Noodles Festival July
+map: lasa_sea
+map: 1@drdo
+
+// X anniversary
+map: x_lhz
+map: x_prt
+map: x_ra
+
+// November hunting contest
+map: prt_evt_in
+
+// Welcome Corridor
+map: vis_h01
+map: vis_h02
+map: vis_h03
+map: vis_h04
+
+// Illusion Teddy Bear Nasarian Empire
+map: ein_d02_i
+
+// Illusion Ruande
+map: com_d02_i
+
+// Soul Reaper Job Change
+map: 1@soul
+
+// Star Emperor Job Change
+map: star_frst
+map: star_in
+
+
 //------------------------- Clone Maps ---------------------------
 //------------------------- Extra Maps ---------------------------
-
-// Ragnarok World Championship 2004
-// Requires: RWC 2004 Client
-// or Akaru's SuperGRF 1.64 or newer
-//map: rwc01
-//map: rwc02
-//map: rwc03
-
-// Ragnarok World Championship 2009
-// Requires: RWC 2009 Map files
-//map: 2009rwc_f01
-//map: 2009rwc_01
-//map: 2009rwc_02
-//map: 2009rwc_03
-//map: 2009rwc_04
-
-// Ragnarok World Championship 2008?
-// Requires: RWC 2008 Map files?
-//map: 2008rwc_04
-
-//Christmas & Sakura Special
-//Requires Akaru's SuperGRF 1.1 or newer
-//map: prontera_x
-//map: alberta_x
-//map: aldebaran_x
-//map: geffen_x
-//map: izlude_x
-//map: prt_church_x
-//map: prontera_s
-//map: pay_arche_s
-
-//Fenced Lutie
-//Requires Akaru's SuperGRF 1.23 or newer
-//map: xmas_old
-
-//Alpha Maps
-//Requires adata.grf containing alpha maps and data
-//map: fay_vilg00
-//map: fay_vilg01
-//map: gef_vilg00
-//map: gef_vilg01
-//map: moc_dugn01
-//map: moc_dugn02
-//map: moc_fild01
-//map: moc_fild02
-//map: moc_fild03
-//map: moc_fild04
-//map: moc_intr00
-//map: moc_intr01
-//map: moc_intr02
-//map: moc_intr04
-//map: moc_vilg00
-//map: moc_vilg01
-//map: moc_vilg02
-//map: probemap
-//map: probemap02
-//map: prt_cstl01
-//map: prt_dugn00
-//map: prt_dugn01
-//map: prt_fild00
-//map: prt_fild01
-//map: prt_fild03
-//map: prt_fild04
-//map: prt_fild05
-//map: prt_intr01
-//map: prt_intr01_a
-//map: prt_intr02
-//map: prt_vilg00
-//map: prt_vilg01
-//map: prt_vilg02
-//map: tank_test
-//map: tank_test2
-//map: test

db/map_index.txt

@@ -1,13 +1,13 @@
 //======================================================================================
 // Map Index
 //======================================================================================
-//Contains the list of maps with their respective IDs for inter-server use.
-//IDs must never change, therefore any new maps need to be added at the end,
-//and old ones must not be removed, but may be replaced.
-//Format:
-//mapname<tab>index <- specifies index for this map
-//mapname <- map will use index of previous map +1
-//Note that map index 0 is special and reserved for "error" status. 
+// Contains the list of maps with their respective IDs for inter-server use.
+// IDs must never change, therefore any new maps need to be added at the end,
+// and old ones must not be removed, but may be replaced.
+// Format:
+// mapname<tab>index <- specifies index for this map
+// mapname <- map will use index of previous map +1
+// Note that map index 0 is special and reserved for "error" status. 
 
 alb_ship 1
 alb2trea
@@ -1009,66 +1009,28 @@ ice_d03_i
 tur_d03_i
 tur_d04_i
 1@crd
-
-// Only add maps under this line if they are not standard maps!
-
+ordeal_a00
+ordeal_a02
+pprontera
+niflxmas
+sch_lab
+nakhyang
+lasa_sea
+1@drdo
+x_lhz
+x_prt
+x_ra
+prt_evt_in
+vis_h01
+vis_h02
+vis_h03
+vis_h04
+ein_d02_i
+com_d02_i
+1@soul
+star_frst
+star_in
 
 //======================================================================================
 // - Other/Extra maps -
 //======================================================================================
-//rwc01	1000
-//rwc02
-//rwc03
-//2009rwc_f01
-//2009rwc_01
-//2009rwc_02
-//2009rwc_03
-//2009rwc_04
-//2008rwc_04
-//prontera_x
-//alberta_x
-//aldebaran_x
-//geffen_x
-//izlude_x
-//prt_church_x
-//prontera_s
-//pay_arche_s
-//xmas_old
-//ordeal_a00
-//ordeal_a02
-//fay_vilg00
-//fay_vilg01
-//gef_vilg00
-//gef_vilg01
-//moc_dugn01
-//moc_dugn02
-//moc_fild01
-//moc_fild02
-//moc_fild03
-//moc_fild04
-//moc_intr00
-//moc_intr01
-//moc_intr02
-//moc_intr04
-//moc_vilg00
-//moc_vilg01
-//moc_vilg02
-//probemap
-//probemap02
-//prt_cstl01
-//prt_dugn00
-//prt_dugn01
-//prt_fild00
-//prt_fild01
-//prt_fild03
-//prt_fild04
-//prt_fild05
-//prt_intr01
-//prt_intr01_a
-//prt_intr02
-//prt_vilg00
-//prt_vilg01
-//prt_vilg02
-//tank_test
-//tank_test2
-//test

npc/re/mapflag/nobranch.txt

@@ -193,3 +193,25 @@ lasagna	mapflag	nobranch
 lasa_in01	mapflag	nobranch
 conch_in	mapflag	nobranch
 lasa_dun_q	mapflag	nobranch
+
+// Chicken Mode Nightmare Glastheim
+1@gl_k2	mapflag	nobranch
+2@gl_k2	mapflag	nobranch
+
+// Chicken Mode Horror Toy Factory
+1@xm_d2	mapflag	nobranch
+
+// Suspicious shipwreck
+1@tre	mapflag	nobranch
+
+// Poring Town
+1@begi	mapflag	nobranch
+
+// Volcanic island Korodo
+1@crd	mapflag	nobranch
+
+// Noodles Festival July
+1@drdo	mapflag	nobranch
+
+// Soul Reaper Job Change
+1@soul	mapflag	nobranch

npc/re/mapflag/noicewall.txt

@@ -97,3 +97,25 @@ te_aldecas5	mapflag	noicewall
 1@sthd	mapflag	noicewall
 1@slw	mapflag	noicewall
 1@swat	mapflag	noicewall
+
+// Chicken Mode Nightmare Glastheim
+1@gl_k2	mapflag	noicewall
+2@gl_k2	mapflag	noicewall
+
+// Chicken Mode Horror Toy Factory
+1@xm_d2	mapflag	noicewall
+
+// Suspicious shipwreck
+1@tre	mapflag	noicewall
+
+// Poring Town
+1@begi	mapflag	noicewall
+
+// Volcanic island Korodo
+1@crd	mapflag	noicewall
+
+// Noodles Festival July
+1@drdo	mapflag	noicewall
+
+// Soul Reaper Job Change
+1@soul	mapflag	noicewall

npc/re/mapflag/nomemo.txt

@@ -216,3 +216,48 @@ lasa_dun01	mapflag	nomemo
 lasa_dun02	mapflag	nomemo
 lasa_dun03	mapflag	nomemo
 lasa_dun_q	mapflag	nomemo
+
+// Chicken Mode Nightmare Glastheim
+1@gl_k2	mapflag	nomemo
+2@gl_k2	mapflag	nomemo
+
+// Chicken Mode Horror Toy Factory
+1@xm_d2	mapflag	nomemo
+
+// Illusion Payon (Moonlight)
+pay_d03_i	mapflag	nomemo
+
+// Illusion Geffen (Vampire)
+gef_d01_i	mapflag	nomemo
+
+// Illusion Ice (Frozen)
+ice_d03_i	mapflag	nomemo
+
+// Suspicious shipwreck
+1@tre	mapflag	nomemo
+
+// Poring Town
+1@begi	mapflag	nomemo
+
+// Illusion Turtle island (Archery)
+tur_d03_i	mapflag	nomemo
+tur_d04_i	mapflag	nomemo
+
+// Volcanic island Korodo
+1@crd	mapflag	nomemo
+
+// Noodles Festival July
+1@drdo	mapflag	nomemo
+
+// Illusion Teddy Bear Nasarian Empire
+ein_d02_i	mapflag	nomemo
+
+// Illusion Ruande
+com_d02_i	mapflag	nomemo
+
+// Soul Reaper Job Change
+1@soul	mapflag	nomemo
+
+// Star Emperor Job Change
+star_frst	mapflag	nomemo
+star_in	mapflag	nomemo

npc/re/mapflag/nosave.txt

@@ -150,3 +150,25 @@ que_swat	mapflag	nosave	SavePoint
 
 // Rockridge
 rockmi2	mapflag	nosave	SavePoint
+
+// Chicken Mode Nightmare Glastheim
+1@gl_k2	mapflag	nosave	SavePoint
+2@gl_k2	mapflag	nosave	SavePoint
+
+// Chicken Mode Horror Toy Factory
+1@xm_d2	mapflag	nosave	SavePoint
+
+// Suspicious shipwreck
+1@tre	mapflag	nosave	SavePoint
+
+// Poring Town
+1@begi	mapflag	nosave	SavePoint
+
+// Volcanic island Korodo
+1@crd	mapflag	nosave	SavePoint
+
+// Noodles Festival July
+1@drdo	mapflag	nosave	SavePoint
+
+// Soul Reaper Job Change
+1@soul	mapflag	nosave	SavePoint

npc/re/mapflag/noteleport.txt

@@ -205,3 +205,25 @@ rockmi2	mapflag	noteleport
 // Lasagna
 lasa_in01	mapflag	noteleport
 conch_in	mapflag	noteleport
+
+// Chicken Mode Nightmare Glastheim
+1@gl_k2	mapflag	noteleport
+2@gl_k2	mapflag	noteleport
+
+// Chicken Mode Horror Toy Factory
+1@xm_d2	mapflag	noteleport
+
+// Suspicious shipwreck
+1@tre	mapflag	noteleport
+
+// Poring Town
+1@begi	mapflag	noteleport
+
+// Volcanic island Korodo
+1@crd	mapflag	noteleport
+
+// Noodles Festival July
+1@drdo	mapflag	noteleport
+
+// Soul Reaper Job Change
+1@soul	mapflag	noteleport

npc/re/mapflag/nowarpto.txt

@@ -138,3 +138,25 @@ rockmi2	mapflag	nowarpto
 lasa_in01	mapflag	nowarpto
 conch_in	mapflag	nowarpto
 lasa_dun_q	mapflag	nowarpto
+
+// Chicken Mode Nightmare Glastheim
+1@gl_k2	mapflag	nowarpto
+2@gl_k2	mapflag	nowarpto
+
+// Chicken Mode Horror Toy Factory
+1@xm_d2	mapflag	nowarpto
+
+// Suspicious shipwreck
+1@tre	mapflag	nowarpto
+
+// Poring Town
+1@begi	mapflag	nowarpto
+
+// Volcanic island Korodo
+1@crd	mapflag	nowarpto
+
+// Noodles Festival July
+1@drdo	mapflag	nowarpto
+
+// Soul Reaper Job Change
+1@soul	mapflag	nowarpto

npc/re/mapflag/partylock.txt

@@ -91,3 +91,25 @@
 1@sthd	mapflag	partylock
 1@slw	mapflag	partylock
 1@swat	mapflag	partylock
+
+// Chicken Mode Nightmare Glastheim
+1@gl_k2	mapflag	partylock
+2@gl_k2	mapflag	partylock
+
+// Chicken Mode Horror Toy Factory
+1@xm_d2	mapflag	partylock
+
+// Suspicious shipwreck
+1@tre	mapflag	partylock
+
+// Poring Town
+1@begi	mapflag	partylock
+
+// Volcanic island Korodo
+1@crd	mapflag	partylock
+
+// Noodles Festival July
+1@drdo	mapflag	partylock
+
+// Soul Reaper Job Change
+1@soul	mapflag	partylock

npc/re/mapflag/restricted.txt

@@ -74,6 +74,28 @@
 1@slw	mapflag	restricted	6
 1@swat	mapflag	restricted	6
 
+// Chicken Mode Nightmare Glastheim
+1@gl_k2	mapflag	restricted	6
+2@gl_k2	mapflag	restricted	6
+
+// Chicken Mode Horror Toy Factory
+1@xm_d2	mapflag	restricted	6
+
+// Suspicious shipwreck
+1@tre	mapflag	restricted	6
+
+// Poring Town
+1@begi	mapflag	restricted	6
+
+// Volcanic island Korodo
+1@crd	mapflag	restricted	6
+
+// Noodles Festival July
+1@drdo	mapflag	restricted	6
+
+// Soul Reaper Job Change
+1@soul	mapflag	restricted	6
+
 // Towns =========================
 brasilis	mapflag	restricted	7
 dewata	mapflag	restricted	7