From a2420e71f388134ec0cd631bf424735c307c8a0d Mon Sep 17 00:00:00 2001 From: Mysteries Date: Sun, 10 Feb 2013 23:53:40 -0500 Subject: Maps - Removed maps that are no longer supported in the cache - Added new maps into the cache - Removed duplicate entries --- conf/maps.conf | 59 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 11 deletions(-) (limited to 'conf') diff --git a/conf/maps.conf b/conf/maps.conf index 9820bce44..7a0169dd2 100644 --- a/conf/maps.conf +++ b/conf/maps.conf @@ -164,20 +164,12 @@ map: new_5-3 map: new_5-4 map: orcsdun01 map: orcsdun02 -//map: ordeal_a00 -//map: ordeal_a02 map: ordeal_1-1 map: ordeal_1-2 -//map: ordeal_1-3 -//map: ordeal_1-4 map: ordeal_2-1 map: ordeal_2-2 -//map: ordeal_2-3 -//map: ordeal_2-4 map: ordeal_3-1 map: ordeal_3-2 -//map: ordeal_3-3 -//map: ordeal_3-4 map: pay_arche map: pay_dun00 map: pay_dun01 @@ -195,9 +187,6 @@ map: pay_fild08 map: pay_fild09 map: pay_fild10 map: pay_fild11 -//map: payon //moved down to new maps -//map: payon_in01 //moved down to new maps -//map: payon_in02 //moved down to new maps //map: priest_1-1 //map: priest_2-1 //map: priest_3-1 @@ -1058,6 +1047,54 @@ map: que_avan01 map: moc_prydn1 map: moc_prydn2 +// =============================== +// New Maps added 2013-02-10 +// =============================== +//map: iz_int +//map: iz_int01 +//map: iz_int02 +//map: iz_int03 +//map: iz_int04 +//map: iz_ac01 +//map: iz_ac02 +//map: iz_ng01 +//map: treasure_n1 +//map: treasure_n2 +//map: iz_ac01_d +//map: iz_ac02_d +//map: iz_ac01_c +//map: iz_ac02_c +//map: iz_ac01_b +//map: iz_ac02_b +//map: iz_ac01_a +//map: iz_ac02_a +//map: izlude_d +//map: izlude_c +//map: izlude_b +//map: izlude_a +//map: prt_fild08d +//map: prt_fild08c +//map: prt_fild08b +//map: prt_fild08a +//map: te_prt_gld +//map: te_prtcas01 +//map: te_prtcas02 +//map: te_prtcas03 +//map: te_prtcas04 +//map: te_prtcas05 +//map: teg_dun01 +//map: teg_dun02 +//map: te_alde_gld +//map: te_aldecas1 +//map: te_aldecas2 +//map: te_aldecas3 +//map: te_aldecas4 +//map: te_aldecas5 +//map: gl_cas02_ +//map: gl_chyard_ +//map: 2@gl_k +//map: 1@gl_k + //------------------------- Clone Maps --------------------------- //------------------------- Extra Maps --------------------------- -- cgit v1.2.3-70-g09d2 From abd09b2583a6d72c0012e0d5e0c4051b274dd3d9 Mon Sep 17 00:00:00 2001 From: Mysteries Date: Sun, 10 Feb 2013 23:56:15 -0500 Subject: Maps - Removed maps that are no longer supported in the cache - Added new maps into the cache - Removed duplicate entries --- conf/maps.conf | 4 ++++ db/map_index.txt | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'conf') diff --git a/conf/maps.conf b/conf/maps.conf index 7a0169dd2..01baea7da 100644 --- a/conf/maps.conf +++ b/conf/maps.conf @@ -1048,7 +1048,11 @@ map: moc_prydn1 map: moc_prydn2 // =============================== +<<<<<<< HEAD // New Maps added 2013-02-10 +======= +// New Maps added 2013-02-10 (Thanks Streusel!) +>>>>>>> Maps // =============================== //map: iz_int //map: iz_int01 diff --git a/db/map_index.txt b/db/map_index.txt index 9f6b22d7f..15e01e270 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -858,7 +858,11 @@ moc_prydn1 moc_prydn2 // =============================== +<<<<<<< HEAD // New Maps added 2013-02-10 +======= +// New Maps added 2013-02-10 (Thanks Streusel!) +>>>>>>> Maps // =============================== //iz_int //iz_int01 -- cgit v1.2.3-70-g09d2 From 57e430222f9e2c49f9a26bde4219e363459316fb Mon Sep 17 00:00:00 2001 From: Mysteries Date: Sun, 10 Feb 2013 23:57:23 -0500 Subject: Revert "Maps" This reverts commit abd09b2583a6d72c0012e0d5e0c4051b274dd3d9. --- conf/maps.conf | 4 ---- db/map_index.txt | 4 ---- 2 files changed, 8 deletions(-) (limited to 'conf') diff --git a/conf/maps.conf b/conf/maps.conf index 01baea7da..7a0169dd2 100644 --- a/conf/maps.conf +++ b/conf/maps.conf @@ -1048,11 +1048,7 @@ map: moc_prydn1 map: moc_prydn2 // =============================== -<<<<<<< HEAD // New Maps added 2013-02-10 -======= -// New Maps added 2013-02-10 (Thanks Streusel!) ->>>>>>> Maps // =============================== //map: iz_int //map: iz_int01 diff --git a/db/map_index.txt b/db/map_index.txt index 15e01e270..9f6b22d7f 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -858,11 +858,7 @@ moc_prydn1 moc_prydn2 // =============================== -<<<<<<< HEAD // New Maps added 2013-02-10 -======= -// New Maps added 2013-02-10 (Thanks Streusel!) ->>>>>>> Maps // =============================== //iz_int //iz_int01 -- cgit v1.2.3-70-g09d2 From 52e8c428bfc64a2285710256496331bfff19b651 Mon Sep 17 00:00:00 2001 From: Mysteries Date: Mon, 11 Feb 2013 00:00:31 -0500 Subject: Apparently this didn't want to be commited properly. --- conf/maps.conf | 2 +- db/map_index.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/maps.conf b/conf/maps.conf index 7a0169dd2..71a3b7db6 100644 --- a/conf/maps.conf +++ b/conf/maps.conf @@ -1048,7 +1048,7 @@ map: moc_prydn1 map: moc_prydn2 // =============================== -// New Maps added 2013-02-10 +// New Maps added 2013-02-10 (Thanks Streusel!) // =============================== //map: iz_int //map: iz_int01 diff --git a/db/map_index.txt b/db/map_index.txt index 9f6b22d7f..acfaacca4 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -858,7 +858,7 @@ moc_prydn1 moc_prydn2 // =============================== -// New Maps added 2013-02-10 +// New Maps added 2013-02-10 (Thanks Streusel!) // =============================== //iz_int //iz_int01 -- cgit v1.2.3-70-g09d2