update for Hercules v2020.07.26

5 files changed, 13 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index c724a220..b66e50be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: new server-update server-updatebuild maps build buildasan config updateconfig initdb updatedb givegm updates
+.PHONY: new server-update server-updatebuild maps build buildasan config updateconfig initdb updatedb givegm updates constdb
 
 new: build config initdb
 
@@ -32,3 +32,6 @@ givegm:
 
 updates:
 	cd ../tools/update/ ; ./createnew.sh ; ./create_music.sh
+
+constdb:
+	mkdir -p doc && ./map-server --run-once --load-plugin constdb2doc --constdb2doc && cp -f doc/constants.md ../docs/server/scripts/constants.md; rm -r doc
diff --git a/conf/map/battle/pet.conf b/conf/map/battle/pet.conf
index 9ee4c9f8..e2bf9f66 100644
--- a/conf/map/battle/pet.conf
+++ b/conf/map/battle/pet.conf
@@ -102,11 +102,6 @@ pet_max_stats: 99
 pet_max_atk1: 500
 pet_max_atk2: 1000
 
-// Are pets disabled during Guild Wars?
-// If set to true, pets are automatically returned to egg when entering castles during WoE times
-// and hatching is forbidden within as well.
-pet_disable_in_gvg: false
-
 // Should the pet immediately be removed when its intimacy drops to 0? (Note 1)
 // If set to false the pet will randomly walk around the map before being removed.
 pet_remove_immediately: true
diff --git a/conf/messages.conf b/conf/messages.conf
index d6250406..cdb4f1e7 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -646,8 +646,9 @@
 668: Shadow Chaser T
 669: Summoner
 
-//670-853 FREE (please start using from the top if you need, leave the 670+ range for new jobs)
+//670-852 FREE (please start using from the top if you need, leave the 670+ range for new jobs)
 
+853: NoPet |
 // Mapflag to disable Autoloot Commands
 854: Auto loot item are disabled on this map.
 
@@ -667,7 +668,7 @@
 863: Duel: Can't use this item in duel.
 864: You cannot use this command when dead.
 865: Can't create chat rooms in this area.
-866: Pets are not allowed in Guild Wars.
+866: Pets are disabled in this map.
 867: You're not dead.
 868: Your current memo positions are:
 869: You broke the target's weapon.
@@ -694,7 +695,7 @@
 886: Gained %dz.
 887: %s stole an Unknown Item (id: %i).
 888: %s stole %s.
-889: Experience Gained Base:%"PRIu64" (%.2f%%) Job:%"PRIu64" (%.2f%%)
+889: Experience Gained Base:%llu (%.2f%%) Job:%llu (%.2f%%)
 890: [KS Warning!! - Owner : %s]
 891: [Watch out! %s is trying to KS you!]
 892: Growth: hp:%d sp:%d str(%.2f) agi(%.2f) vit(%.2f) int(%.2f) dex(%.2f) luk(%.2f)
diff --git a/db/constants.conf b/db/constants.conf
index c306e31b..94afab25 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -438,6 +438,7 @@ constants_db: {
 	mf_pairship_endable:   58
 	mf_nostorage:          59
 	mf_nogstorage:         60
+    mf_nopet:              61
 
 	comment__: "Cell Properties"
 	cell_walkable:       0
@@ -652,6 +653,8 @@ constants_db: {
 	bSetMDefRace:             2060
 	bAddRaceTolerance:        2061
 	bAddMaxWeight:            2062
+    bSubDefEle:               2063
+    bMagicSubDefEle:          2064
 
 	comment__: "Equip index"
 	/* reference to script.c::script_defaults():equip[] array used for easy-conversion */
@@ -3756,7 +3759,7 @@ constants_db: {
 	MER_SWORDMAN09:    6045
 	MER_SWORDMAN10:    6046
 
-	comment__: "checkquest"
+	comment__: "questprogress"
 	HAVEQUEST: 0
 	PLAYTIME:  1
 	HUNTING:   2
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index e2339732..7eea13cb 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -11643,7 +11643,7 @@ skill_db: (
     }
     AttackType: "Weapon"
     Element: "Ele_Weapon"
-    SplashRange: 2
+    SplashRange: 1
     InterruptCast: true
     SkillInstances: 13
     CastTime: 1000