summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/mapflag/nowarpto.txt4
-rw-r--r--conf/msg_athena.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt
index 25d8c3786..c37d6e194 100644
--- a/conf/mapflag/nowarpto.txt
+++ b/conf/mapflag/nowarpto.txt
@@ -122,8 +122,8 @@ spl_fild01 mapflag nowarpto
spl_in01 mapflag nowarpto
//Orc's Memory ===================
-1@cata mapflag nowarpto
-2@cata mapflag nowarpto
+1@orcs mapflag nowarpto
+2@orcs mapflag nowarpto
// Nidhoggr's Instance ===========
1@nyd mapflag nowarpto
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 3e2eb4567..6a7db3946 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -255,7 +255,7 @@
239: Game time: After, the game will be in daylight for %s.
240: %d monster(s) summoned!
241: You can now attack and kill players freely.
-242: You be attacked and killed by players.
+242: You can now be attacked and killed by players.
243: Skills have been disabled on this map.
244: Skills have been enabled on this map.
245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.