summaryrefslogtreecommitdiff
path: root/conf-tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'conf-tmpl')
-rw-r--r--conf-tmpl/char_athena.conf2
-rw-r--r--conf-tmpl/mapflag/indoors.txt4
-rw-r--r--conf-tmpl/mapflag/nobranch.txt12
-rw-r--r--conf-tmpl/mapflag/noexp.txt2
-rw-r--r--conf-tmpl/mapflag/noicewall.txt4
-rw-r--r--conf-tmpl/mapflag/noloot.txt2
-rw-r--r--conf-tmpl/mapflag/nomemo.txt12
-rw-r--r--conf-tmpl/mapflag/nopenalty.txt12
-rw-r--r--conf-tmpl/mapflag/nopvp.txt4
-rw-r--r--conf-tmpl/mapflag/noreturn.txt12
-rw-r--r--conf-tmpl/mapflag/nosave.txt6
-rw-r--r--conf-tmpl/mapflag/noteleport.txt14
-rw-r--r--conf-tmpl/maps_athena.conf20
13 files changed, 44 insertions, 62 deletions
diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf
index 797bd6905..c48c92138 100644
--- a/conf-tmpl/char_athena.conf
+++ b/conf-tmpl/char_athena.conf
@@ -127,7 +127,7 @@ backup_txt: save/athena_backup.txt
friends_txt: save/friends.txt
// Start point, Map name followed by coordinates (x,y)
-start_point: new_1-1.gat,53,111
+start_point: new_zone01.gat,53,111
// Starting weapon for new characters
start_weapon: 1201
diff --git a/conf-tmpl/mapflag/indoors.txt b/conf-tmpl/mapflag/indoors.txt
index 0e3f6866c..4d6a7a4e7 100644
--- a/conf-tmpl/mapflag/indoors.txt
+++ b/conf-tmpl/mapflag/indoors.txt
@@ -28,9 +28,7 @@ aldeba_in.gat mapflag indoors
monk_in.gat mapflag indoors
prt_are_in.gat mapflag indoors
arena_room.gat mapflag indoors
-sword_1-1.gat mapflag indoors
-//sword_2-1.gat mapflag indoors
-//sword_3-1.gat mapflag indoors
+job_sword1.gat mapflag indoors
xmas_in.gat mapflag indoors
cmd_in01.gat mapflag indoors
cmd_in02.gat mapflag indoors
diff --git a/conf-tmpl/mapflag/nobranch.txt b/conf-tmpl/mapflag/nobranch.txt
index f0cbc7764..81a04d2ae 100644
--- a/conf-tmpl/mapflag/nobranch.txt
+++ b/conf-tmpl/mapflag/nobranch.txt
@@ -29,10 +29,10 @@ lou_in01.gat mapflag nobranch
lou_in02.gat mapflag nobranch
moc_castle.gat mapflag nobranch
morocc_in.gat mapflag nobranch
-new_1-1.gat mapflag nobranch
-new_1-2.gat mapflag nobranch
-new_1-3.gat mapflag nobranch
-new_1-4.gat mapflag nobranch
+new_zone01.gat mapflag nobranch
+new_zone02.gat mapflag nobranch
+new_zone03.gat mapflag nobranch
+new_zone04.gat mapflag nobranch
nif_in.gat mapflag nobranch
payon_in01.gat mapflag nobranch
payon_in02.gat mapflag nobranch
@@ -72,9 +72,7 @@ ra_temsky.gat mapflag nobranch
que_rachel.gat mapflag nobranch
// Job Quests ====================
-sword_1-1.gat mapflag nobranch
-//sword_2-1.gat mapflag nobranch
-//sword_3-1.gat mapflag nobranch
+job_sword1.gat mapflag nobranch
job_thief1.gat mapflag nobranch
// 2-1
job_knt.gat mapflag nobranch
diff --git a/conf-tmpl/mapflag/noexp.txt b/conf-tmpl/mapflag/noexp.txt
index 908c05ea0..0d6fbddef 100644
--- a/conf-tmpl/mapflag/noexp.txt
+++ b/conf-tmpl/mapflag/noexp.txt
@@ -8,7 +8,7 @@
// Location for Job's Quests
job_thief1.gat mapflag noexp
-sword_1-1.gat mapflag noexp
+job_sword1.gat mapflag noexp
in_moc_16.gat mapflag noexp
job_hunte.gat mapflag noexp
job_knt.gat mapflag noexp
diff --git a/conf-tmpl/mapflag/noicewall.txt b/conf-tmpl/mapflag/noicewall.txt
index 44d6a6b31..fd9ddbdb5 100644
--- a/conf-tmpl/mapflag/noicewall.txt
+++ b/conf-tmpl/mapflag/noicewall.txt
@@ -52,9 +52,7 @@ prt_church.gat mapflag noicewall
prt_in.gat mapflag noicewall
prontera.gat mapflag noicewall
sec_in01.gat mapflag noicewall
-sword_1-1.gat mapflag noicewall
-//sword_2-1.gat mapflag noicewall
-//sword_3-1.gat mapflag noicewall
+job_sword1.gat mapflag noicewall
um_in.gat mapflag noicewall
umbala.gat mapflag noicewall
xmas_in.gat mapflag noicewall
diff --git a/conf-tmpl/mapflag/noloot.txt b/conf-tmpl/mapflag/noloot.txt
index de62c35de..928588338 100644
--- a/conf-tmpl/mapflag/noloot.txt
+++ b/conf-tmpl/mapflag/noloot.txt
@@ -7,7 +7,7 @@
//============================================================
// Location for Job's Quests
-sword_1-1.gat mapflag noloot
+job_sword1.gat mapflag noloot
in_moc_16.gat mapflag noloot
job_hunte.gat mapflag noloot
job_knt.gat mapflag noloot
diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt
index df2206d88..23fb1b605 100644
--- a/conf-tmpl/mapflag/nomemo.txt
+++ b/conf-tmpl/mapflag/nomemo.txt
@@ -30,10 +30,10 @@ moc_castle.gat mapflag nomemo
morocc_in.gat mapflag nomemo
niflheim.gat mapflag nomemo
nif_in.gat mapflag nomemo
-new_1-1.gat mapflag nomemo
-new_1-2.gat mapflag nomemo
-new_1-3.gat mapflag nomemo
-new_1-4.gat mapflag nomemo
+new_zone01.gat mapflag nomemo
+new_zone02.gat mapflag nomemo
+new_zone03.gat mapflag nomemo
+new_zone04.gat mapflag nomemo
pay_arche.gat mapflag nomemo
payon_in01.gat mapflag nomemo
payon_in02.gat mapflag nomemo
@@ -149,9 +149,7 @@ yuno_fild10.gat mapflag nomemo
// Job Quests ================
// First Job Class
-sword_1-1.gat mapflag nomemo
-//sword_2-1.gat mapflag nomemo
-//sword_3-1.gat mapflag nomemo
+job_sword1.gat mapflag nomemo
job_thief1.gat mapflag nomemo
job_star.gat mapflag nomemo
// Primary Second Job Class
diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt
index 0d593a992..6328e8c4f 100644
--- a/conf-tmpl/mapflag/nopenalty.txt
+++ b/conf-tmpl/mapflag/nopenalty.txt
@@ -42,10 +42,10 @@ lou_in02.gat mapflag nopenalty
morocc.gat mapflag nopenalty
moc_castle.gat mapflag nopenalty
morocc_in.gat mapflag nopenalty
-new_1-1.gat mapflag nopenalty
-new_1-2.gat mapflag nopenalty
-new_1-3.gat mapflag nopenalty
-new_1-4.gat mapflag nopenalty
+new_zone01.gat mapflag nopenalty
+new_zone02.gat mapflag nopenalty
+new_zone03.gat mapflag nopenalty
+new_zone04.gat mapflag nopenalty
nif_in.gat mapflag nopenalty
pay_arche.gat mapflag nopenalty
payon.gat mapflag nopenalty
@@ -98,9 +98,7 @@ kh_vila.gat mapflag nopenalty
ayothaya.gat mapflag nopenalty
// Job Quests ========================
-sword_1-1.gat mapflag nopenalty
-//sword_2-1.gat mapflag nopenalty
-//sword_3-1.gat mapflag nopenalty
+job_sword1.gat mapflag nopenalty
job_thief1.gat mapflag nopenalty
// 2-1 -----------------------
job_prist.gat mapflag nopenalty
diff --git a/conf-tmpl/mapflag/nopvp.txt b/conf-tmpl/mapflag/nopvp.txt
index 89511f200..cfb0d6490 100644
--- a/conf-tmpl/mapflag/nopvp.txt
+++ b/conf-tmpl/mapflag/nopvp.txt
@@ -55,9 +55,7 @@ prt_church.gat mapflag pvp off
prt_in.gat mapflag pvp off
prontera.gat mapflag pvp off
sec_in01.gat mapflag pvp off
-sword_1-1.gat mapflag pvp off
-//sword_2-1.gat mapflag pvp off
-//sword_3-1.gat mapflag pvp off
+job_sword1.gat mapflag pvp off
um_in.gat mapflag pvp off
umbala.gat mapflag pvp off
xmas_in.gat mapflag pvp off
diff --git a/conf-tmpl/mapflag/noreturn.txt b/conf-tmpl/mapflag/noreturn.txt
index f99ec3442..1dd044fb4 100644
--- a/conf-tmpl/mapflag/noreturn.txt
+++ b/conf-tmpl/mapflag/noreturn.txt
@@ -32,10 +32,10 @@ lou_in01.gat mapflag noreturn
lou_in02.gat mapflag noreturn
moc_castle.gat mapflag noreturn
morocc_in.gat mapflag noreturn
-new_1-1.gat mapflag noreturn
-new_1-2.gat mapflag noreturn
-new_1-3.gat mapflag noreturn
-new_1-4.gat mapflag noreturn
+new_zone01.gat mapflag noreturn
+new_zone02.gat mapflag noreturn
+new_zone03.gat mapflag noreturn
+new_zone04.gat mapflag noreturn
nif_in.gat mapflag noreturn
payon_in01.gat mapflag noreturn
payon_in02.gat mapflag noreturn
@@ -74,9 +74,7 @@ kh_school.gat mapflag noreturn
kh_vila.gat mapflag noreturn
// Job Quests ====================
-sword_1-1.gat mapflag noreturn
-//sword_2-1.gat mapflag noreturn
-//sword_3-1.gat mapflag noreturn
+job_sword1.gat mapflag noreturn
job_thief1.gat mapflag noreturn
// 2-1 -----------------------
job_hunte.gat mapflag noreturn
diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt
index e83510a5a..b647f8c4b 100644
--- a/conf-tmpl/mapflag/nosave.txt
+++ b/conf-tmpl/mapflag/nosave.txt
@@ -2,13 +2,11 @@
//= Map flags that disable auto saving
//===== By: ==================================================
//= eAthena Dev Team
-//= 1.4 [Lupus]
+//= 1.5 [Lupus]
//===== Current Version: =====================================
// Job Quests ====================
-sword_1-1.gat mapflag nosave SavePoint
-//sword_2-1.gat mapflag nosave SavePoint
-//sword_3-1.gat mapflag nosave SavePoint
+job_sword1.gat mapflag nosave SavePoint
//job_thief1.gat mapflag nosave SavePoint
// 2-1
job_knt.gat mapflag nosave SavePoint
diff --git a/conf-tmpl/mapflag/noteleport.txt b/conf-tmpl/mapflag/noteleport.txt
index 439f02dd5..e9b7b0268 100644
--- a/conf-tmpl/mapflag/noteleport.txt
+++ b/conf-tmpl/mapflag/noteleport.txt
@@ -2,7 +2,7 @@
//= Map flags that disable use of fly wings
//===== By: ==================================================
//= eAthena Dev Team
-//= 1.5 [Lupus]
+//= 1.6 [Lupus]
//===== Notes: ===============================================
//= For disabling Butterfly wings use noreturn
//===== Current Version: =====================================
@@ -31,10 +31,10 @@ lou_in01.gat mapflag noteleport
lou_in02.gat mapflag noteleport
moc_castle.gat mapflag noteleport
morocc_in.gat mapflag noteleport
-new_1-1.gat mapflag noteleport
-new_1-2.gat mapflag noteleport
-new_1-3.gat mapflag noteleport
-new_1-4.gat mapflag noteleport
+new_zone01.gat mapflag noteleport
+new_zone02.gat mapflag noteleport
+new_zone03.gat mapflag noteleport
+new_zone04.gat mapflag noteleport
nif_in.gat mapflag noteleport
payon_in01.gat mapflag noteleport
payon_in02.gat mapflag noteleport
@@ -96,9 +96,7 @@ kh_school.gat mapflag noteleport
kh_vila.gat mapflag noteleport
// Job Quests ====================
-sword_1-1.gat mapflag noteleport
-//sword_2-1.gat mapflag noteleport
-//sword_3-1.gat mapflag noteleport
+job_sword1.gat mapflag noteleport
job_thief1.gat mapflag noteleport
// 2-1 -----------------------
job_prist.gat mapflag noteleport
diff --git a/conf-tmpl/maps_athena.conf b/conf-tmpl/maps_athena.conf
index 41478f297..70735ab2f 100644
--- a/conf-tmpl/maps_athena.conf
+++ b/conf-tmpl/maps_athena.conf
@@ -136,14 +136,14 @@ map: moc_ruins.gat
map: monk_in.gat
map: morocc.gat
map: morocc_in.gat
-//map: new_zone01.gat
-//map: new_zone02.gat
-//map: new_zone03.gat
-//map: new_zone04.gat
-map: new_1-1.gat
-map: new_1-2.gat
-map: new_1-3.gat
-map: new_1-4.gat
+map: new_zone01.gat
+map: new_zone02.gat
+map: new_zone03.gat
+map: new_zone04.gat
+//map: new_1-1.gat
+//map: new_1-2.gat
+//map: new_1-3.gat
+//map: new_1-4.gat
//map: new_2-1.gat
//map: new_2-2.gat
//map: new_2-3.gat
@@ -310,7 +310,7 @@ map: pvp_y_8-3.gat
map: pvp_y_8-4.gat
map: pvp_y_8-5.gat
map: pvp_y_room.gat
-map: sword_1-1.gat
+//map: sword_1-1.gat
//map: sword_2-1.gat
//map: sword_3-1.gat
map: treasure01.gat
@@ -395,7 +395,7 @@ map: job_hunte.gat
map: job_knt.gat
//map: job_priest.gat
map: job_prist.gat
-//map: job_sword1.gat
+map: job_sword1.gat
//map: job_wizard.gat
map: job_wiz.gat
map: pay_gld.gat