summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStreusel <advance_me@hotmail.de>2013-02-10 21:07:51 -0800
committerStreusel <advance_me@hotmail.de>2013-02-10 21:07:51 -0800
commit6d0c98456e5e75d50ff82c982db64618cf545f79 (patch)
tree705b65117a961c1db2a7027df0bcfab2d766a6bc
parentaac4234c5cbc791cf4b127bd5d64db97bd384430 (diff)
parent52e8c428bfc64a2285710256496331bfff19b651 (diff)
downloadhercules-6d0c98456e5e75d50ff82c982db64618cf545f79.tar.gz
hercules-6d0c98456e5e75d50ff82c982db64618cf545f79.tar.bz2
hercules-6d0c98456e5e75d50ff82c982db64618cf545f79.tar.xz
hercules-6d0c98456e5e75d50ff82c982db64618cf545f79.zip
Merge github.com:Mysteries/Hercules
-rw-r--r--conf/maps.conf59
-rw-r--r--db/map_index.txt56
-rw-r--r--db/pre-re/map_cache.datbin2014060 -> 2096346 bytes
-rw-r--r--db/re/map_cache.datbin2014060 -> 2096346 bytes
4 files changed, 96 insertions, 19 deletions
diff --git a/conf/maps.conf b/conf/maps.conf
index 9820bce44..71a3b7db6 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 (Thanks Streusel!)
+// ===============================
+//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 ---------------------------
diff --git a/db/map_index.txt b/db/map_index.txt
index ed0ac755c..ff2bdced7 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -168,16 +168,10 @@ orcsdun01
orcsdun02
ordeal_1-1
ordeal_1-2
-ordeal_1-3
-ordeal_1-4
ordeal_2-1
ordeal_2-2
-ordeal_2-3
-ordeal_2-4
ordeal_3-1
ordeal_3-2
-ordeal_3-3
-ordeal_3-4
pay_arche
pay_dun00
pay_dun01
@@ -912,6 +906,54 @@ moc_prydn2
//1@def03
+// ===============================
+// New Maps added 2013-02-10 (Thanks Streusel!)
+// ===============================
+//iz_int
+//iz_int01
+//iz_int02
+//iz_int03
+//iz_int04
+//iz_ac01
+//iz_ac02
+//iz_ng01
+//treasure_n1
+//treasure_n2
+//iz_ac01_d
+//iz_ac02_d
+//iz_ac01_c
+//iz_ac02_c
+//iz_ac01_b
+//iz_ac02_b
+//iz_ac01_a
+//iz_ac02_a
+//izlude_d
+//izlude_c
+//izlude_b
+//izlude_a
+//prt_fild08d
+//prt_fild08c
+//prt_fild08b
+//prt_fild08a
+//te_prt_gld
+//te_prtcas01
+//te_prtcas02
+//te_prtcas03
+//te_prtcas04
+//te_prtcas05
+//teg_dun01
+//teg_dun02
+//te_alde_gld
+//te_aldecas1
+//te_aldecas2
+//te_aldecas3
+//te_aldecas4
+//te_aldecas5
+//gl_cas02_
+//gl_chyard_
+//2@gl_k
+//1@gl_k
+
// Only add maps under this line if they are not standard maps!
@@ -936,8 +978,6 @@ moc_prydn2
//prontera_s
//pay_arche_s
//xmas_old
-//ordeal_a00
-//ordeal_a02
//fay_vilg00
//fay_vilg01
//gef_vilg00
diff --git a/db/pre-re/map_cache.dat b/db/pre-re/map_cache.dat
index 96650c31b..645961065 100644
--- a/db/pre-re/map_cache.dat
+++ b/db/pre-re/map_cache.dat
Binary files differ
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 96650c31b..645961065 100644
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ