summaryrefslogtreecommitdiff
path: root/conf-tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'conf-tmpl')
-rw-r--r--conf-tmpl/atcommand_athena.conf9
-rw-r--r--conf-tmpl/msg_athena.conf5
2 files changed, 13 insertions, 1 deletions
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index 6a2472ddd..455932977 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -122,6 +122,9 @@ main: 1
// Autorejecting Deals/Invites
noask: 1
+// Displays remaining jail time
+jailtime: 1
+
//---------------------------
// 10: Super player+ commands
@@ -579,6 +582,12 @@ jail: 60
unjail: 60
discharge: 60
+// Timed jailing
+jailfor: 60
+
+//Displays remaining jail time
+charjailtime: 60
+
// To change disguise of another player/GM
chardisguise: 60
charundisguise: 60
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index 7a9e31a03..f5e65f98b 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -133,7 +133,7 @@
118: Player warped in jails.
119: This player is not in jails.
120: GM has discharge you.
-121: Player warped to Prontera.
+121: Player unjailed.
122: Disguise applied.
123: Monster/NPC name/id hasn't been found.
124: Undisguise applied.
@@ -393,6 +393,9 @@
396: Autorejected alliance request from %s.
397: Autorejected opposition request from %s.
398: Autorejected friend request from %s.
+400: Usage: @jailfor <time> <character name>
+401: You have been jailed for %d years, %d months, %d days, %d hours and %d minutes
+402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes
// Messages of others (not for GM commands)
// ----------------------------------------