diff options
| author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
| commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
| tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /conf | |
| parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
| parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
| download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/battle/guild.conf | 6 | ||||
| -rw-r--r-- | conf/messages.conf | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/conf/battle/guild.conf b/conf/battle/guild.conf index e9b025adb..a40cbbe3a 100644 --- a/conf/battle/guild.conf +++ b/conf/battle/guild.conf @@ -16,9 +16,9 @@ guild_exp_limit: 50 // Maximum castles one guild can own (0 = unlimited) guild_max_castles: 0 -// Activate guild skills delay by relog? (Note 1) -// Official setting is "yes", otherwise allow guild leaders to relog to cancel the 5 minute delay. -guild_skill_relog_delay: yes +// Restart guild skills cooldown by relog? (Note 1) +// When "no", you relog with the same cooldown remaining as from when you logged out, "yes" restarts the cooldown upon login to its full duration. +guild_skill_relog_delay: no // Damage adjustments for WOE battles against defending Guild monsters (Note 2) castle_defense_rate: 100 diff --git a/conf/messages.conf b/conf/messages.conf index 3a16d8054..7b7a99301 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -1532,5 +1532,7 @@ 1487: Character cannot be disguised while in monster form. 1488: Transforming into monster is not allowed in Guild Wars. +//CashShop mapflag +1489: Cash Shop is disabled in this map //Custom translations import: conf/import/msg_conf.txt |