diff options
author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-14 01:25:09 +0000 |
---|---|---|
committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-14 01:25:09 +0000 |
commit | 851f1599bd54aad53efa05863a7b5a5441972b54 (patch) | |
tree | 775a3288f673054e911aa03e7b159a436daa6d65 /conf | |
parent | 6f2e4dfb3150a1fc833e57b6a0c8c7e13469f567 (diff) | |
download | hercules-851f1599bd54aad53efa05863a7b5a5441972b54.tar.gz hercules-851f1599bd54aad53efa05863a7b5a5441972b54.tar.bz2 hercules-851f1599bd54aad53efa05863a7b5a5441972b54.tar.xz hercules-851f1599bd54aad53efa05863a7b5a5441972b54.zip |
* Added settings 'cashshop_show_points' and 'mail_show_status', both disabled by default, as the messages they control are custom (follow up to r11548 and r12264).
- Moved custom cash point update messages to 'msg_athena.conf' (IDs 504~506).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14812 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf')
-rw-r--r-- | conf/Changelog.txt | 3 | ||||
-rw-r--r-- | conf/battle/misc.conf | 11 | ||||
-rw-r--r-- | conf/msg_athena.conf | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt index 35e57d601..71e3b75ca 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,8 @@ Date Added +2011/05/13 + * Rev. 14812 Added settings 'cashshop_show_points' and 'mail_show_status', both disabled by default, as the messages they control are custom (follow up to r11548 and r12264). [Ai4rei] + - Moved custom cash point update messages to 'msg_athena.conf' (IDs 504~506). 2011/03/15 * Rev. 14744 Fixed option 'monster_ai' referring to setting 'mob_npc_warp' rather than 'mob_warp' (follow up to r8135). [Ai4rei] 2011/03/06 diff --git a/conf/battle/misc.conf b/conf/battle/misc.conf index 76d18ed0f..797295aea 100644 --- a/conf/battle/misc.conf +++ b/conf/battle/misc.conf @@ -128,3 +128,14 @@ searchstore_querydelay: 10 // Maximum amount of results a store search query may yield, before // it is canceled. searchstore_maxresults: 30 + +// Whether or not gaining and loosing of cash points is displayed (Note 1). +// Default: no +cashshop_show_points: no + +// Whether or not mail box status is displayed upon login. +// Default: 0 +// 0 = No +// 1 = Yes +// 2 = Yes, when there are unread mails +mail_show_status: 0 diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf index 1d88c076a..98c20c361 100644 --- a/conf/msg_athena.conf +++ b/conf/msg_athena.conf @@ -423,7 +423,10 @@ 502: Day Mode is activated 503: Night Mode is activated -// 504~506 are not used (previously super novice's guardian angel prayer) +// Cash point change messages +504: Used %d kafra points and %d cash points. %d kafra and %d cash points remaining. +505: Gained %d cash points. Total %d points. +506: Gained %d kafra points. Total %d points. // Trade Spoof Messages 507: This player has been banned for %d minute(s). |