summaryrefslogtreecommitdiff
path: root/conf-tmpl
diff options
context:
space:
mode:
authorMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-13 00:53:28 +0000
committerMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-13 00:53:28 +0000
commitcfb5552ecf3b072c6bacba939634432f46bce3e4 (patch)
tree2f3ebfa933a49ec6a8ad3f5e3ce1149991b94bca /conf-tmpl
parent029a87801700a4f5c3a8af1ffa39ffeee5099417 (diff)
downloadhercules-cfb5552ecf3b072c6bacba939634432f46bce3e4.tar.gz
hercules-cfb5552ecf3b072c6bacba939634432f46bce3e4.tar.bz2
hercules-cfb5552ecf3b072c6bacba939634432f46bce3e4.tar.xz
hercules-cfb5552ecf3b072c6bacba939634432f46bce3e4.zip
Implemented a missing npc in Amatsu and the momotaro event.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7114 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl')
-rw-r--r--conf-tmpl/mapflag/indoors.txt1
-rw-r--r--conf-tmpl/mapflag/nobranch.txt1
-rw-r--r--conf-tmpl/mapflag/nomemo.txt1
-rw-r--r--conf-tmpl/mapflag/nopenalty.txt1
-rw-r--r--conf-tmpl/mapflag/noreturn.txt1
-rw-r--r--conf-tmpl/mapflag/nosave.txt1
-rw-r--r--conf-tmpl/mapflag/noteleport.txt1
-rw-r--r--conf-tmpl/mapflag/nowarp.txt1
-rw-r--r--conf-tmpl/mapflag/nowarpto.txt4
9 files changed, 11 insertions, 1 deletions
diff --git a/conf-tmpl/mapflag/indoors.txt b/conf-tmpl/mapflag/indoors.txt
index a3aaf35e7..7a66224f1 100644
--- a/conf-tmpl/mapflag/indoors.txt
+++ b/conf-tmpl/mapflag/indoors.txt
@@ -11,6 +11,7 @@
//============================================================
alberta_in.gat mapflag indoors
+ama_test.gat mapflag indoors
izlude_in.gat mapflag indoors
gef_tower.gat mapflag indoors
geffen_in.gat mapflag indoors
diff --git a/conf-tmpl/mapflag/nobranch.txt b/conf-tmpl/mapflag/nobranch.txt
index a55ceacdf..77fcb3c58 100644
--- a/conf-tmpl/mapflag/nobranch.txt
+++ b/conf-tmpl/mapflag/nobranch.txt
@@ -15,6 +15,7 @@ alberta_in.gat mapflag nobranch
aldeba_in.gat mapflag nobranch
ama_in01.gat mapflag nobranch
ama_in02.gat mapflag nobranch
+ama_test.gat mapflag nobranch
cmd_in01.gat mapflag nobranch
cmd_in02.gat mapflag nobranch
gef_tower.gat mapflag nobranch
diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt
index ea4041811..1b5b649bb 100644
--- a/conf-tmpl/mapflag/nomemo.txt
+++ b/conf-tmpl/mapflag/nomemo.txt
@@ -16,6 +16,7 @@ alberta_in.gat mapflag nomemo
aldeba_in.gat mapflag nomemo
ama_in01.gat mapflag nomemo
ama_in02.gat mapflag nomemo
+ama_test.gat mapflag nomemo
cmd_in01.gat mapflag nomemo
cmd_in02.gat mapflag nomemo
gef_fild06.gat mapflag nomemo
diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt
index 8ea4cbcc6..bffd40d6b 100644
--- a/conf-tmpl/mapflag/nopenalty.txt
+++ b/conf-tmpl/mapflag/nopenalty.txt
@@ -17,6 +17,7 @@ aldeba_in.gat mapflag nopenalty
amatsu.gat mapflag nopenalty
ama_in01.gat mapflag nopenalty
ama_in02.gat mapflag nopenalty
+ama_test.gat mapflag nopenalty
arena_room.gat mapflag nopenalty
comodo.gat mapflag nopenalty
cmd_in01.gat mapflag nopenalty
diff --git a/conf-tmpl/mapflag/noreturn.txt b/conf-tmpl/mapflag/noreturn.txt
index 003915c42..cf0a4125e 100644
--- a/conf-tmpl/mapflag/noreturn.txt
+++ b/conf-tmpl/mapflag/noreturn.txt
@@ -17,6 +17,7 @@ alberta_in.gat mapflag noreturn
aldeba_in.gat mapflag noreturn
ama_in01.gat mapflag noreturn
ama_in02.gat mapflag noreturn
+ama_test.gat mapflag noreturn
cmd_in01.gat mapflag noreturn
cmd_in02.gat mapflag noreturn
gef_tower.gat mapflag noreturn
diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt
index f639a16c1..bb48842f1 100644
--- a/conf-tmpl/mapflag/nosave.txt
+++ b/conf-tmpl/mapflag/nosave.txt
@@ -31,6 +31,7 @@ job_star.gat mapflag nosave SavePoint
job_soul.gat mapflag nosave SavePoint
// Special Quests Places =====
+ama_test.gat mapflag nosave SavePoint
que_god01.gat mapflag nosave SavePoint
que_god02.gat mapflag nosave SavePoint
que_sign01.gat mapflag nosave SavePoint
diff --git a/conf-tmpl/mapflag/noteleport.txt b/conf-tmpl/mapflag/noteleport.txt
index f14b78da0..4d67e5895 100644
--- a/conf-tmpl/mapflag/noteleport.txt
+++ b/conf-tmpl/mapflag/noteleport.txt
@@ -16,6 +16,7 @@ aldeba_in.gat mapflag noteleport
ama_dun01.gat mapflag noteleport
ama_in01.gat mapflag noteleport
ama_in02.gat mapflag noteleport
+ama_test.gat mapflag noteleport
cmd_in01.gat mapflag noteleport
cmd_in02.gat mapflag noteleport
gef_tower.gat mapflag noteleport
diff --git a/conf-tmpl/mapflag/nowarp.txt b/conf-tmpl/mapflag/nowarp.txt
index fe01fc05f..a92ec3143 100644
--- a/conf-tmpl/mapflag/nowarp.txt
+++ b/conf-tmpl/mapflag/nowarp.txt
@@ -5,6 +5,7 @@
//= v 1.1a
//===== Current Version: =====================================
+ama_test.gat mapflag nowarp
aldeg_cas01.gat mapflag nowarp
aldeg_cas02.gat mapflag nowarp
aldeg_cas03.gat mapflag nowarp
diff --git a/conf-tmpl/mapflag/nowarpto.txt b/conf-tmpl/mapflag/nowarpto.txt
index e75c7d232..27fc65636 100644
--- a/conf-tmpl/mapflag/nowarpto.txt
+++ b/conf-tmpl/mapflag/nowarpto.txt
@@ -36,4 +36,6 @@ nguild_gef.gat mapflag nowarpto
nguild_pay.gat mapflag nowarpto
nguild_prt.gat mapflag nowarpto
//Lighthalzen Bio-Lab 3F
-lhz_dun03.gat mapflag nowarpto \ No newline at end of file
+lhz_dun03.gat mapflag nowarpto
+//Momotaro Event
+ama_test.gat mapflag nowarpto