Update from hercules

8 files changed, 100 insertions, 45 deletions

diff --git a/conf/map/battle/drops.conf b/conf/map/battle/drops.conf
index cf09d14d..d37aba45 100644
--- a/conf/map/battle/drops.conf
+++ b/conf/map/battle/drops.conf
@@ -151,3 +151,7 @@ alchemist_summon_reward: 1
 // When picking random options for a dropped item, it does lots of iterations to choose the option to be set,
 // this value limits the number of iterations to avoid making the server hang in a long loop.
 option_drop_max_loop: 10
+
+// Does autoloot take into account player bonuses and penalties? (Note 1)
+// If RENEWAL_DROP, Bubble Gum, or any other modifiers are active autoloot will take them into account.
+autoloot_adjust: false
diff --git a/conf/map/battle/homunc.conf b/conf/map/battle/homunc.conf
index 7ccaf8f8..f2ed4d8d 100644
--- a/conf/map/battle/homunc.conf
+++ b/conf/map/battle/homunc.conf
@@ -66,3 +66,6 @@ homunculus_max_level: 99
 
 // Max level for Homunculus S
 homunculus_S_max_level: 150
+
+// Bonus EXP homunculus received from master? (Note 2)
+hom_bonus_exp_from_master: 10
diff --git a/conf/messages.conf b/conf/messages.conf
index 8b737e6f..d62999b5 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -758,18 +758,18 @@
 
 //995 FREE
 
-// @refine
+// @refine - Part 1
 996: Please enter a position bitmask and an amount (usage: @refine <equip position> <+/- amount>).
-997: %d: Lower Headgear
-998: %d: Right Hand
+997: %d: Headgear (Low)
+998: %d: Hand (Right)
 999: %d: Garment
-1000: %d: Left Accessory
+1000: %d: Accessory (Left)
 1001: %d: Body Armor
-1002: %d: Left Hand
+1002: %d: Hand (Left)
 1003: %d: Shoes
-1004: %d: Right Accessory
-1005: %d: Top Headgear
-1006: %d: Mid Headgear
+1004: %d: Accessory (Right)
+1005: %d: Headgear (Top)
+1006: %d: Headgear (Mid)
 
 // @produce
 1007: Please enter at least one item name/ID (usage: @produce <equip name/ID> <element> <# of very's>).
@@ -1574,5 +1574,20 @@
 1501: Type List: (default) all = -1, healing = 0, usable = 2, etc = 3, weapon = 4, armor = 5, card = 6, petegg = 7, petarmor = 8, ammo = 10, delayed-consumable = 11, cash = 18 
 1502: %d items are dropped!
 
+// @refine - Part 2
+1503: %d: Costume Headgear (Top)
+1504: %d: Costume Headgear (Mid)
+1505: %d: Costume Headgear (Low)
+1506: %d: Costume Garment
+1507: %d: Shadow Armor
+1508: %d: Shadow Weapon
+1509: %d: Shadow Shield
+1510: %d: Shadow Shoes
+1511: %d: Shadow Accessory (Right)
+1512: %d: Shadow Accessory (Left)
+1513: %d: Refine All Equip (General)
+1514: %d: Refine All Equip (Costume)
+1515: %d: Refine All Equip (Shadow)
+
 //Custom translations
 import: conf/import/msg_conf.txt
diff --git a/db/castle_db.conf b/db/castle_db.conf
new file mode 100644
index 00000000..fe4d07fe
--- /dev/null
+++ b/db/castle_db.conf
@@ -0,0 +1,44 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2019  Hercules Dev Team
+//= Copyright (C) 2019  Asheraf
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Castle Database
+//=========================================================================
+
+castle_db: (
+/**************************************************************************
+ ************* Entry structure ********************************************
+ **************************************************************************
+{
+	// ================ Mandatory fields ==============================
+	CastleID:              (int)    Unique ID of the castle. Must remain unique across all map-servers.
+	MapName:               (string) Map name to be considered as the castle map.
+	CastleName:            (string) Name of the castle (used by scripts and guardian name tags)
+	OnGuildBreakEventName: (string) NPC unique name to invoke ::OnGuildBreak on, when a occupied 
+	                                castle is abandoned during guild break.
+},
+**************************************************************************/
+)
diff --git a/db/castle_db.txt b/db/castle_db.txt
deleted file mode 100644
index 89b00eee..00000000
--- a/db/castle_db.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Guild Castles Database
-//
-// Structure of Database:
-// CastleID,MapName,CastleName,OnGuildBreakEventName,Flag
-//
-// 01. CastleID                  Unique ID of the castle. Must remain unique across all map-servers.
-// 02. MapName                   Map name to be considered as the castle map.
-// 03. CastleName                Name of the castle (used by scripts and guardian name tags).
-// 04. OnGuildBreakEventName     NPC unique name to invoke ::OnGuildBreak on, when a occupied
-//                               castle is abandoned during guild break.
-// 05. Flag                      Switch flag (reserved as of athena-dev mod0796~0801, not used by server).
-
-
diff --git a/db/constants.conf b/db/constants.conf
index 51b8d9ae..2c6c4429 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1426,29 +1426,30 @@ constants_db: {
 	}
 
 	comment__: "getmonsterinfo"
-	MOB_NAME:     0
-	MOB_LV:       1
-	MOB_MAXHP:    2
-	MOB_BASEEXP:  3
-	MOB_JOBEXP:   4
-	MOB_ATK1:     5
-	MOB_ATK2:     6
-	MOB_DEF:      7
-	MOB_MDEF:     8
-	MOB_STR:      9
-	MOB_AGI:     10
-	MOB_VIT:     11
-	MOB_INT:     12
-	MOB_DEX:     13
-	MOB_LUK:     14
-	MOB_RANGE:   15
-	MOB_RANGE2:  16
-	MOB_RANGE3:  17
-	MOB_SIZE:    18
-	MOB_RACE:    19
-	MOB_ELEMENT: 20
-	MOB_MODE:    21
-	MOB_MVPEXP:  22
+	MOB_NAME:             0
+	MOB_LV:               1
+	MOB_MAXHP:            2
+	MOB_BASEEXP:          3
+	MOB_JOBEXP:           4
+	MOB_ATK1:             5
+	MOB_ATK2:             6
+	MOB_DEF:              7
+	MOB_MDEF:             8
+	MOB_STR:              9
+	MOB_AGI:             10
+	MOB_VIT:             11
+	MOB_INT:             12
+	MOB_DEX:             13
+	MOB_LUK:             14
+	MOB_RANGE:           15
+	MOB_RANGE2:          16
+	MOB_RANGE3:          17
+	MOB_SIZE:            18
+	MOB_RACE:            19
+	MOB_ELEMENT:         20
+	MOB_MODE:            21
+	MOB_MVPEXP:          22
+	MOB_DMG_TAKEN_RATE:  23
 
 	comment__: "mercenary guilds"
 	ARCH_MERC_GUILD:  0
diff --git a/db/mob_db2.conf b/db/mob_db2.conf
index 4f6141aa..e21cc2a2 100644
--- a/db/mob_db2.conf
+++ b/db/mob_db2.conf
@@ -65,7 +65,7 @@ mob_db: (
 		AegisName: (chance, "Option Drop Group")
 		// ...
 	}
-
+	DamageTakenRate: damage taken rate    (int, defaults to 100)
 },
 ******************************************************************************/
 
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 420f8489..e6d6b56a 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -99,6 +99,7 @@ mob_db: (
         AegisName: (chance, "Option Drop Group")
         // ...
     }
+    DamageTakenRate: damage taken rate    (int, defaults to 100)
     WeaponAttacks: {
         WeaponType: 10000
     }