diff options
| author | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-14 18:56:08 -0800 |
|---|---|---|
| committer | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-14 18:56:08 -0800 |
| commit | 7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e (patch) | |
| tree | 3a6cb20957b1486d92f7f017e0e6048951112d87 /conf | |
| parent | 52e8c428bfc64a2285710256496331bfff19b651 (diff) | |
| parent | 74c31098137aae3e0bfc962e4685a7050409df78 (diff) | |
| download | hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.gz hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.bz2 hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.xz hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.zip | |
Merge pull request #4 from HerculesWS/master
Merging Hercules Changes
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mapflag/nobranch.txt | 6 | ||||
| -rw-r--r-- | conf/mapflag/nomemo.txt | 6 | ||||
| -rw-r--r-- | conf/maps.conf | 100 |
3 files changed, 62 insertions, 50 deletions
diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt index a05c37df5..0c96bf896 100644 --- a/conf/mapflag/nobranch.txt +++ b/conf/mapflag/nobranch.txt @@ -199,13 +199,13 @@ force_1-2 mapflag nobranch force_1-3 mapflag nobranch ordeal_1-1 mapflag nobranch ordeal_1-2 mapflag nobranch -ordeal_1-3 mapflag nobranch +//ordeal_1-3 mapflag nobranch ordeal_2-1 mapflag nobranch ordeal_2-2 mapflag nobranch -ordeal_2-3 mapflag nobranch +//ordeal_2-3 mapflag nobranch ordeal_3-1 mapflag nobranch ordeal_3-2 mapflag nobranch -ordeal_3-3 mapflag nobranch +//ordeal_3-3 mapflag nobranch pvp_2vs2 mapflag nobranch pvp_c_room mapflag nobranch quiz_00 mapflag nobranch diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt index dbb35a164..f6628bf46 100644 --- a/conf/mapflag/nomemo.txt +++ b/conf/mapflag/nomemo.txt @@ -494,13 +494,13 @@ force_4-1 mapflag nomemo force_5-1 mapflag nomemo ordeal_1-1 mapflag nomemo ordeal_1-2 mapflag nomemo -ordeal_1-3 mapflag nomemo +//ordeal_1-3 mapflag nomemo ordeal_2-1 mapflag nomemo ordeal_2-2 mapflag nomemo -ordeal_2-3 mapflag nomemo +//ordeal_2-3 mapflag nomemo ordeal_3-1 mapflag nomemo ordeal_3-2 mapflag nomemo -ordeal_3-3 mapflag nomemo +//ordeal_3-3 mapflag nomemo pvp_c_room mapflag nomemo quiz_00 mapflag nomemo quiz_01 mapflag nomemo diff --git a/conf/maps.conf b/conf/maps.conf index 71a3b7db6..c34b05adf 100644 --- a/conf/maps.conf +++ b/conf/maps.conf @@ -164,12 +164,20 @@ 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 @@ -1049,51 +1057,55 @@ map: moc_prydn2 // =============================== // New Maps added 2013-02-10 (Thanks Streusel!) +// Credits to Baneado for reporting some // =============================== -//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 +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 +map: silk_lair +map: 1@def02 +map: 1@def03 //------------------------- Clone Maps --------------------------- //------------------------- Extra Maps --------------------------- |