From c8d4b89b3de0e8db730fbd375c5b4abd38ac6dff Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 1 Aug 2006 17:59:34 +0000 Subject: - Cleaned up some more the SC_JAILED code - merged in atcommands jailfor, jailtime, charjailtime. Thanks to Meruru and Coltaro for the code. - Cleaned the code of atcommnds jail and unjail - Be warned that the code MAY contain bugs as I adjusted it to save the character's position before jailing, allowing the automatic unjailing to warp you back to the exact spot you were at before being jailed. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8038 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 7 + conf-tmpl/atcommand_athena.conf | 9 ++ conf-tmpl/msg_athena.conf | 5 +- src/map/atcommand.c | 307 +++++++++++++++++++++++++++++++++++----- src/map/atcommand.h | 3 + src/map/status.c | 22 +-- 6 files changed, 307 insertions(+), 46 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0148af9e0..be6ee6848 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,13 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/08/01 + * Cleaned up some more the SC_JAILED code [Skotlex] + * merged in atcommands jailfor, jailtime, charjailtime. Thanks to Meruru + and Coltaro for the code. [Skotlex] + * Cleaned the code of atcommands jail and unjail [Skotlex] + * Be warned that the code MAY contain bugs as I adjusted it to save the + character's position before jailing, allowing the automatic unjailing to + warp you back to the exact spot you were at before being jailed. [Skotlex] * Should have fixed the cooking sets not displaying all cooking available items. [Skotlex] * Figured out and fixed the issue with Volcano/Deluge/Violent Gale not 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