summaryrefslogtreecommitdiff
path: root/conf-tmpl
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-09 15:12:53 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-09 15:12:53 +0000
commit6bd0769c68ca86c5454a360f46d0facbbc75cfe5 (patch)
tree91bffd583777704b9ebb1d00e2831ea2faed59eb /conf-tmpl
parent8711b3099048ccacaa84f52fef06e4c6ded4aa4b (diff)
downloadhercules-6bd0769c68ca86c5454a360f46d0facbbc75cfe5.tar.gz
hercules-6bd0769c68ca86c5454a360f46d0facbbc75cfe5.tar.bz2
hercules-6bd0769c68ca86c5454a360f46d0facbbc75cfe5.tar.xz
hercules-6bd0769c68ca86c5454a360f46d0facbbc75cfe5.zip
- Fixed @mapinfo displaying incorrectly maps with nosave which send you back to your last savepoint.
- Moved guild_exp_rate from a mapserver battle config setting to a char server config. It no longer modifies the total taxed exp as seen on the guild information window, but directly modifies the exp that the guild earns. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7074 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl')
-rw-r--r--conf-tmpl/battle/guild.conf4
-rw-r--r--conf-tmpl/char_athena.conf6
2 files changed, 6 insertions, 4 deletions
diff --git a/conf-tmpl/battle/guild.conf b/conf-tmpl/battle/guild.conf
index c02f4ce96..c63ca79ea 100644
--- a/conf-tmpl/battle/guild.conf
+++ b/conf-tmpl/battle/guild.conf
@@ -30,10 +30,6 @@
// When making a guild, an Emperium is consumed? (Note 1)
guild_emperium_check: yes
-// Rate at which taxed experience is earned. (Note 2)
-// For example, if set to 200, all experience that is taxed from players is doubled before adding it to the guild.
-guild_exp_rate: 100
-
// Maximum tax limit on a guild member.
guild_exp_limit: 50
diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf
index 68f7113aa..576d6e757 100644
--- a/conf-tmpl/char_athena.conf
+++ b/conf-tmpl/char_athena.conf
@@ -139,6 +139,12 @@ fame_list_alchemist: 10
fame_list_blacksmith: 10
fame_list_taekwon: 10
+// Guild earned exp modifier.
+// Adjusts taxed exp before adding it to the guild's exp. For example, if set
+// to 200, the guild receives double the player's taxed exp.
+guild_exp_rate: 100
+
+
// Name used for unknown characters
unknown_char_name: Unknown