summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-04-08 19:52:23 +0300
committerAndrei Karas <akaras@inbox.ru>2019-04-08 19:52:23 +0300
commit1132423156249187136ea464b721e7ac2b6041f2 (patch)
tree79857df94f2e2d4a06991a13781ae3b7a1aa3700
parente5da829a4c16d9a73c2ebb40239a8cfdd39c2456 (diff)
downloadserverdata-1132423156249187136ea464b721e7ac2b6041f2.tar.gz
serverdata-1132423156249187136ea464b721e7ac2b6041f2.tar.bz2
serverdata-1132423156249187136ea464b721e7ac2b6041f2.tar.xz
serverdata-1132423156249187136ea464b721e7ac2b6041f2.zip
Update from hercules
Conf files and constants updated.
-rw-r--r--conf/map/battle/client.conf9
-rw-r--r--conf/map/battle/feature.conf5
-rw-r--r--db/constants.conf26
3 files changed, 35 insertions, 5 deletions
diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index 59f5fceb..ea5f1ac0 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -189,3 +189,12 @@ mvp_exp_reward_message: false
// character has 0 HP when dead.
// Default: true (Official behavior)
display_fake_hp_when_dead: false
+
+// Send ping timer
+// For clients 20190320 Re+
+// Interval in seconds for each timer invoke.
+ping_timer_inverval: 30
+
+// Send packets timeout in seconds before ping packet can be sent.
+// For clients 20190320 Re+
+ping_time: 20
diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf
index 1ed94b2a..be4d88b9 100644
--- a/conf/map/battle/feature.conf
+++ b/conf/map/battle/feature.conf
@@ -83,4 +83,9 @@ features: {
// Attendance End time in the format YearMonthDay
feature_attendance_endtime: 20180331
+
+ // Enable Achievement System
+ // true: enable (Default)
+ // false: disable
+ enable_achievement_system: false
}
diff --git a/db/constants.conf b/db/constants.conf
index f2d23ac1..c9fcf425 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1401,11 +1401,27 @@ constants_db: {
SC_CLAN_INFO: 654
comment__: "petstat"
- PET_CLASS: 1
- PET_NAME: 2
- PET_LEVEL: 3
- PET_HUNGRY: 4
- PET_INTIMATE: 5
+ comment__: "petstat - deprecated, use *getpetinfo"
+ PET_CLASS: {
+ Value: 1
+ Deprecated: true
+ }
+ PET_NAME: {
+ Value: 2
+ Deprecated: true
+ }
+ PET_LEVEL: {
+ Value: 3
+ Deprecated: true
+ }
+ PET_HUNGRY: {
+ Value: 4
+ Deprecated: true
+ }
+ PET_INTIMATE: {
+ Value: 5
+ Deprecated: true
+ }
comment__: "getmonsterinfo"
MOB_NAME: 0