summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/msg_athena.conf33
-rw-r--r--npc/011-1_Woodland/shops.txt6
2 files changed, 28 insertions, 11 deletions
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 1aacf66b..313d22b7 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -31,10 +31,10 @@
8: Speed changed.
//9: Options changed.
9: Options changed.
-//10: Invisible: Off
-10: Invisible: Off
-//11: Invisible: On
-11: Invisible: On
+//10: Invisible: Off.
+10: Invisible: Off.
+//11: Invisible: On.
+11: Invisible: On.
//12: Your job has been changed.
12: Your job has been changed.
//13: A pity! You've died.
@@ -493,10 +493,16 @@
239: Game time: After, the game will be in daylight for %s.
//240: %d monster(s) summoned!
240: %d monster(s) summoned!
-241: you be a killa..
-242: you gonna be own3d..
-243: Map skills are off
-244: Map skills are on
+//241: You be a killa...
+241: You be a killa...
+//242: You gonna be own3d...
+242: You gonna be own3d...
+//243: Map skills are off.
+243: Map skills are off.
+//244: Map skills are on.
+244: Map skills are on.
+//245: Muting is disabled.
+245: Muting is disabled.
// Messages of others (not for GM commands)
// ----------------------------------------
@@ -509,3 +515,14 @@
502: The day has arrived!
//503: The night has fallen...
503: The night has fallen...
+// 504-508: Chat validation.
+//504: You cannot page yourself.
+504: You cannot page yourself.
+//505: Your message could not be sent.
+505: Your message could not be sent.
+//506: WARNING: You are about to be automatically banned for spam!
+506: WARNING: You are about to be automatically banned for spam!
+//507: WARNING: Please slow down, do not repeat, and do not SHOUT!
+507: WARNING: Please slow down, do not repeat, and do not SHOUT!
+//508: You have been banned for %s spamming. Please do not spam.
+508: You have been banned for %s spamming. Please do not spam.
diff --git a/npc/011-1_Woodland/shops.txt b/npc/011-1_Woodland/shops.txt
index 4d8b55e1..e9616d8c 100644
--- a/npc/011-1_Woodland/shops.txt
+++ b/npc/011-1_Woodland/shops.txt
@@ -4,6 +4,6 @@
//# #
//#################################################################################
-// Extoic Trader
-// Toy Sabra - 10mil, Cap - 20mil, High Prist Crown - 30mil, Monster Skull Helmet - 30mil
-011-1.gat,109,38,0 shop Extoic Trader 179,1215:10000000,654:20000000,721:30000000,722:30000000
+// Exotic Trader
+// Toy Sabre - 10mil, Cap - 20mil, High Priest Crown - 30mil, Monster Skull Helmet - 30mil
+011-1.gat,109,38,0 shop Exotic Trader 179,1215:10000000,654:20000000,721:30000000,722:30000000