Update to latest hercules.

Add new constants.
Add new configuration parameters.
Add new server messages.

5 files changed, 81 insertions, 3 deletions

diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
index 3c9ba71e..c7aa9924 100644
--- a/conf/map/battle/items.conf
+++ b/conf/map/battle/items.conf
@@ -118,3 +118,7 @@ unequip_restricted_equipment: 0
 // When unequip a bow with arrow equipped, it also unequip the arrow?
 // Default: true (Official behavior, applies only in Renewal)
 bow_unequip_arrow: true
+
+// How much should rental mounts increase a player's movement speed? (Note 2)
+// Official: 25 (Default)
+boarding_halter_speed: 25
diff --git a/conf/map/battle/player.conf b/conf/map/battle/player.conf
index f4e73484..b8fe28a3 100644
--- a/conf/map/battle/player.conf
+++ b/conf/map/battle/player.conf
@@ -140,6 +140,15 @@ max_cart_weight: 8000
 // Prevent logout of players after being hit for how long (in ms, 0 disables)?
 prevent_logout: 10000
 
+// When should the server prevent a player from logging out? Have no effect if prevent_logout is disabled. (Note 3)
+// Official servers prevent players from logging out after attacking, casting skills, and taking damage.
+// 0 = Players can always logout
+// 1 = Prevent logout on login
+// 2 = Prevent logout after attacking
+// 4 = Prevent logout after casting skill
+// 8 = Prevent logout after being hit
+prevent_logout_trigger: 14
+
 // Display the drained hp/sp values from normal attacks? (Ie: Hunter Fly card)
 show_hp_sp_drain: false
 
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
index 8d7c9df4..b88c5d14 100644
--- a/conf/map/battle/skill.conf
+++ b/conf/map/battle/skill.conf
@@ -284,7 +284,7 @@ sg_miracle_skill_duration: 3600000
 sg_angel_skill_ratio: 10
 
 // Skills that bHealPower has effect on
-// 1: Heal, 2: Sanctuary, 4: Potion Pitcher, 8: Slim Pitcher, 16: Apple of Idun
+// 1: Heal, 2: Sanctuary, 4: Potion Pitcher, 8: Slim Pitcher, 16: Apple of Idun, 32: Highness Heal
 skill_add_heal_rate: 7
 
 // Whether the damage of EarthQuake with a single target on screen is able to be reflected.
diff --git a/conf/messages.conf b/conf/messages.conf
index 58662157..19dc23df 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -51,7 +51,8 @@
 23: Job level can't go any higher.
 24: Job level raised.
 25: Job level lowered.
-//26-27 FREE
+26: [%d] seconds left until you can use
+//27 FREE
 28: No player found.
 29: 1 player found.
 30: %d players found.
diff --git a/db/constants.conf b/db/constants.conf
index b29c488c..956af0c3 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3616,7 +3616,7 @@ constants_db: {
 	MOUNT_DRAGON_BLUE:  7
 	MOUNT_DRAGON_RED:   8
 
-	comment__: "gettime"
+	comment__: "Gettime Types"
 	GETTIME_SECOND:     1
 	GETTIME_MINUTE:     2
 	GETTIME_HOUR:       3
@@ -3640,6 +3640,13 @@ constants_db: {
 	UNITTYPE_MER:  5
 	UNITTYPE_ELEM: 6
 
+	comment__: "Unit AI Types"
+	AI_NONE:   0     //0: Normal mob.
+	AI_ATTACK: 1     //1: Standard summon, attacks mobs.
+	AI_SPHERE: 2     //2: Alchemist Marine Sphere
+	AI_FLORA:  3     //3: Alchemist Summon Flora
+	AI_ZANZOU: 4     //4: Summon Zanzou
+
 	comment__: "Colors"
 	C_AQUA:        0x00FFFF
 	C_BLACK:       0x000000
@@ -3667,6 +3674,63 @@ constants_db: {
 	SEX_FEMALE:	0
 	SEX_MALE:	1
 
+	comment__: "Script Unit Data Types"
+	UDT_TYPE:             0
+	UDT_SIZE:             1
+	UDT_LEVEL:            2
+	UDT_HP:               3
+	UDT_MAXHP:            4
+	UDT_SP:               5
+	UDT_MAXSP:            6
+	UDT_MASTERAID:        7
+	UDT_MASTERCID:        8
+	UDT_MAPIDXY:          9
+	UDT_WALKTOXY:        10
+	UDT_SPEED:           11
+	UDT_MODE:            12
+	UDT_AI:              13
+	UDT_SCOPTION:        14
+	UDT_SEX:             15
+	UDT_CLASS:           16
+	UDT_HAIRSTYLE:       17
+	UDT_HAIRCOLOR:       18
+	UDT_HEADBOTTOM:      19
+	UDT_HEADMIDDLE:      20
+	UDT_HEADTOP:         21
+	UDT_CLOTHCOLOR:      22
+	UDT_SHIELD:          23
+	UDT_WEAPON:          24
+	UDT_LOOKDIR:         25
+	UDT_CANMOVETICK:     26
+	UDT_STR:             27
+	UDT_AGI:             28
+	UDT_VIT:             29
+	UDT_INT:             30
+	UDT_DEX:             31
+	UDT_LUK:             32
+	UDT_ATKRANGE:        33
+	UDT_ATKMIN:          34
+	UDT_ATKMAX:          35
+	UDT_MATKMIN:         36
+	UDT_MATKMAX:         37
+	UDT_DEF:             38
+	UDT_MDEF:            39
+	UDT_HIT:             40
+	UDT_FLEE:            41
+	UDT_PDODGE:          42
+	UDT_CRIT:            43
+	UDT_RACE:            44
+	UDT_ELETYPE:         45
+	UDT_ELELEVEL:        46
+	UDT_AMOTION:         47
+	UDT_ADELAY:          48
+	UDT_DMOTION:         49
+	UDT_HUNGER:          50
+	UDT_INTIMACY:        51
+	UDT_LIFETIME:        52
+	UDT_MERC_KILLCOUNT:  53
+	UDT_STATADD:         54
+
     // for disable warning
     ITMCHAIN_ORE: 1