summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-05-05 22:32:49 -0300
committerJesusaves <cpntb1@ymail.com>2018-05-05 22:32:49 -0300
commit38b2ecb383ff878a5331d712395fab1a46021b49 (patch)
tree692735879e2428767c697a3bc21b7bd0df441eed
parent7d3d3ce8d9243594e7e79e118b4714aaccd17dba (diff)
downloadserverdata-38b2ecb383ff878a5331d712395fab1a46021b49.tar.gz
serverdata-38b2ecb383ff878a5331d712395fab1a46021b49.tar.bz2
serverdata-38b2ecb383ff878a5331d712395fab1a46021b49.tar.xz
serverdata-38b2ecb383ff878a5331d712395fab1a46021b49.zip
Initial part of hercules updates
-rw-r--r--conf/char/char-server.conf26
-rw-r--r--conf/map/battle/guild.conf9
-rw-r--r--npc/003-2/lua.txt3
3 files changed, 34 insertions, 4 deletions
diff --git a/conf/char/char-server.conf b/conf/char/char-server.conf
index db433244a..b76898b61 100644
--- a/conf/char/char-server.conf
+++ b/conf/char/char-server.conf
@@ -218,6 +218,32 @@ char_configuration: {
// Default: 3
// Maximum allowed by clientside: 3
max_tries: 3
+
+ // Whether or not to refuse pincodes that are blacklisted
+ // Default: true
+ check_blacklisted: false
+
+ // Blacklisted pincodes
+ blacklist: [
+ "0000",
+ "1111",
+ "2222",
+ "3333",
+ "4444",
+ "5555",
+ "6666",
+ "7777",
+ "8888",
+ "9999",
+ "0123",
+ "1234",
+ "2345",
+ "3456",
+ "4567",
+ "5678",
+ "6789",
+ "7890"
+ ]
}
}
diff --git a/conf/map/battle/guild.conf b/conf/map/battle/guild.conf
index c8f8db8c3..90282ef53 100644
--- a/conf/map/battle/guild.conf
+++ b/conf/map/battle/guild.conf
@@ -39,10 +39,11 @@ guild_exp_limit: 50
// Maximum castles one guild can own (0 = unlimited)
guild_max_castles: 0
-// Restart guild skills cooldown by relog? (Note 1)
-// When false, you relog with the same cooldown remaining as from when you
-// logged out, true restarts the cooldown upon login to its full duration.
-guild_skill_relog_delay: false
+// How guild skills cooldown works?
+// 0 - you relog with the same cooldown remaining as from when you logged out
+// 1 - restarts the cooldown upon login to its full duration.
+// 2 - like 1, but your logged off time is also decreased from the remaining cooldown (Aegis)
+guild_skill_relog_delay: 2
// Damage adjustments for WOE battles against defending Guild monsters (Note 2)
castle_defense_rate: 100
diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index cd06751e8..6aac9fc5d 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -1,6 +1,9 @@
// TMW2 Scripts.
// Author:
// Jesusalva
+// Description:
+// Lua is an Alliance Officer. She takes care of miscelanneous administrative tasks, including Strange Coin generation.
+// She can also change the world's hero, give Sponsor their necklace, and is part of main storyline.
003-2,38,34,0 script Lua#003-2 NPC_FEMALE,{
.@n = getq(General_Narrator);