update for hercules v2020.06.28

9 files changed, 220 insertions, 85 deletions

diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf
index 9d0026e4..77a9a598 100644
--- a/db/re/item_chain.conf
+++ b/db/re/item_chain.conf
@@ -1,21 +1,42 @@
-//====================================================
-//=       _   _                     _           
-//=      | | | |                   | |          
-//=      | |_| | ___ _ __ ___ _   _| | ___  ___ 
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
 //=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
 //=      | | | |  __/ | | (__| |_| | |  __/\__ \
 //=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
-//=                                                  
-//=            http://herc.ws/board/                        
-//================= More Information =================
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2013-2020 Hercules Dev Team
+//=
+//= 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/>.
+//================= More Information ======================================
 // http://herc.ws/board/topic/1244-official-item-grouppackagechain
-//====================================================
-// Structure of file:
-/*
+//=========================================================================
 
- ITMCHAIN_<Name>: {
-   <Item_Name>: <chance>
- }
-
-*/
+/**************************************************************************
+ ************* Entry structure ********************************************
+ **************************************************************************
+ITMCHAIN_<Name>: {
+	<Item_Name>: <chance>
+	// ...
+}
+**************************************************************************/
 
+// Hercules expects those 3 to always exist:
+ITMCHAIN_ORE: {}
+ITMCHAIN_SIEGFRIED: {}
+ITMCHAIN_NEO_INSURANCE: {}
diff --git a/db/re/item_combo_db.conf b/db/re/item_combo_db.conf
new file mode 100644
index 00000000..cb4b0af5
--- /dev/null
+++ b/db/re/item_combo_db.conf
@@ -0,0 +1,43 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2019  Hercules Dev Team
+//=
+//= 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/>.
+//================= Description ===========================================
+// Configurations file for status effects
+//=========================================================================
+
+combo_db: (
+/**************************************************************************
+ ************* Entry structure ********************************************
+ **************************************************************************
+{
+	// ================ Mandatory fields ===============================
+	Items: ["item_list"]   (string, array) list of items
+	Script: <"
+		Script
+		(it can be multi-line)
+	">
+}
+**************************************************************************/
+)
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
deleted file mode 100644
index 2f4fa6ac..00000000
--- a/db/re/item_combo_db.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// Item Combos Database
-//
-// Structure of Database:
-// ID:ID:ID:ID,{ Script }
-
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 4dc9d48e..c971ebd8 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2014-2015  Hercules Dev Team
+//= Copyright (C) 2014-2020 Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -28,17 +28,15 @@
 //=========================================================================
 
 item_db: (
-//  Items Database
-//
-/******************************************************************************
- ************* Entry structure ************************************************
- ******************************************************************************
+/**************************************************************************
+************* Entry structure ********************************************
+**************************************************************************
 {
-    // =================== Mandatory fields ===============================
+    // ================ Mandatory fields ==============================
     Id: ID                        (int)
     AegisName: "Aegis_Name"       (string)
     Name: "Item Name"             (string)
-    // =================== Optional fields ================================
+    // ================ Optional fields ===============================
     Type: Item Type               (string, defaults to "IT_ETC")
     Buy: Buy Price                (int, defaults to Sell * 2)
     Sell: Sell Price              (int, defaults to Buy / 2)
@@ -49,7 +47,21 @@ item_db: (
     Range: Attack Range           (int, defaults to 0)
     MinRange: Minimal Attack Range (int, defaults to 0)
     Slots: Slots                  (int, defaults to 0)
-    Job: Job mask                 (int, defaults to all jobs = 0xFFFFFFFF)
+    Job: {                        (defaults to all job)
+        All: true/false           (boolean, defaults to false)
+        Viro: true/false          (boolean, defaults to false)
+        CaveUkar: true/false      (boolean, defaults to false)
+        FireKralog: true/false    (boolean, defaults to false)
+        LightRaijin: true/false   (boolean, defaults to false)
+        SeaTritan: true/false     (boolean, defaults to false)
+        FrostKralog: true/false   (boolean, defaults to false)
+        DarkRaijin: true/false    (boolean, defaults to false)
+        ArgaesViro: true/false    (boolean, defaults to false)
+        TonoriViro: true/false    (boolean, defaults to false)
+        LakeTritan: true/false    (boolean, defaults to false)
+        MountainUkar: true/false  (boolean, defaults to false)
+    }
+    Job: Job mask                 (alternate format, int, defaults to all jobs = 0xFFFFFFFF)
     Upper: Upper mask             (bitmask array, string or int, defaults to "ITEMUPPER_ALL")
     Gender: Gender                (string, defaults to "SEX_ANY")
     Loc: Equip location           (bitmask array, string or int, required value for equipment)
@@ -96,13 +108,13 @@ item_db: (
         override: GroupID             (int, defaults to 100)
         nodrop: true/false            (boolean, defaults to false)
         notrade: true/false           (boolean, defaults to false)
-        partneroverride: true/false   (boolean, defaults to false)
-        noselltonpc: true/false       (boolean, defaults to false)
-        nocart: true/false            (boolean, defaults to false)
         nostorage: true/false         (boolean, defaults to false)
-        nogstorage: true/false        (boolean, defaults to false)
+        nocart: true/false            (boolean, defaults to false)
+        noselltonpc: true/false       (boolean, defaults to false)
         nomail: true/false            (boolean, defaults to false)
         noauction: true/false         (boolean, defaults to false)
+        nogstorage: true/false        (boolean, defaults to false)
+        partneroverride: true/false   (boolean, defaults to false)
     }
     Nouse: {                      (defaults to no restrictions)
         override: GroupID             (int, defaults to 100)
@@ -119,6 +131,8 @@ item_db: (
     OnDropScript: <" OnDrop Script (can also be multi-line) ">
     OnTakeScript: <" OnTake Script (can also be multi-line) ">
     OnInsertCardScript: <" OnInsert card Script (can also be multi-line) ">
+    OnRentalStartScript: <" On item renting script, gets called after item is created in inventory (can also be multi-line) ">
+    OnRentalEndScript: <" On item rent end/expire script, gets called after item is removed from inventory (can also be multi-line) ">
     AllowCards: {
         idNUM: amount         (NUM is id number, amount is amount)
     }
@@ -126,7 +140,7 @@ item_db: (
         idNUM: something      (NUM is id number)
     }
 },
-******************************************************************************/
+**************************************************************************/
 /*
 501     699       = Usable Items
 700     999       = Generic Items
diff --git a/db/re/item_lapineddukddak.conf b/db/re/item_lapineddukddak.conf
new file mode 100644
index 00000000..c8f22eca
--- /dev/null
+++ b/db/re/item_lapineddukddak.conf
@@ -0,0 +1,44 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2018-2019  Hercules Dev Team
+//= Copyright (C) 2018-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/>.
+//=========================================================================
+
+/**************************************************************************
+ ************* Entry structure ********************************************
+ **************************************************************************
+<Box_Item_Const>: {
+	NeedCount:                       (int, defaults to 0) The required amount of unique items
+	NeedRefineMin:                   (int, defaults to 0) The minimum refine for each of the items
+	NeedRefineMax:                   (int, defaults to 0) The maximum refine for each of the items
+	SourceItems: {                         A list of allowed items to be converted with specific amount for each item
+		<Item_Const>: <amount>       (string, int)
+		...
+	}
+	Script: <"
+		Script (it can be multi-line)
+		Executes on success
+	">
+}
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index ca0ef908..c627e2c3 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -106,6 +106,21 @@ mob_db: (
     SkillAttacks: {
         SkillName: 10000
     }
+    ViewData: {
+        SpriteId: sprite id              (int, defaults to Id)
+        WeaponId: weapon id              (int, defaults to 0)
+        ShieldId: shield id              (int, defaults to 0)
+        RobeId: garment id               (int, defaults to 0)
+        HeadTopId: top headgear id       (int, defaults to 0)
+        HeadMidId: middle headgear id    (int, defaults to 0)
+        HeadLowId: lower headgear id     (int, defaults to 0)
+        HairStyleId: hair style id       (int, defaults to 0)
+        BodyStyleId: clothes id          (int, defaults to 0)
+        HairColorId: hair color id       (int, defaults to 0)
+        BodyColorId: clothes color id    (int, defaults to 0)
+        Gender: gender                   (string, defaults to "SEX_FEMALE")
+        Options: options                 (int, defaults to 0)
+    }
 },
 ******************************************************************************/
 
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 7e4c18e8..9c550159 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -35,22 +35,22 @@ mob_skill_db:(
 	<Monster_Constant>: {
 		<Skill_Constant>: {
 			ClearSkills:   (boolean, defaults to false) allows cleaning all previous defined skills for the mob.
-			SkillLevel:	(int, defaults to 1)
-			SkillState:	(int, defaults to 0)
-			SkillTarget:   (int, defaults to 0)
-			Rate:		  (int, defaults to 1) Rate refers to the chance of the skill being casted when the condition is fulfilled.(10000 = 100%)
-			CastTime:	  (int, defaults to 0) CastTime is the time in milliseconds that has to be pass to casting skill
-			Delay:		 (int, defaults to 0) Delay is the time in milliseconds that has to be pass before recasting the same skill.
-			Cancelable:	(boolean, defaults to false)
-			CastCondition: (int, defaults to 0)
+			SkillLevel:    (int, defaults to 1)
+			SkillState:    (string, defaults to "MSS_ANY")
+			SkillTarget:   (string, defaults to "MST_TARGET")
+			Rate:          (int, defaults to 1) Rate refers to the chance of the skill being casted when the condition is fulfilled.(10000 = 100%)
+			CastTime:      (int, defaults to 0) CastTime is the time in milliseconds that has to be pass to casting skill
+			Delay:         (int, defaults to 0) Delay is the time in milliseconds that has to be pass before recasting the same skill.
+			Cancelable:    (boolean, defaults to false)
+			CastCondition: (string, defaults to "MSC_ALWAYS")
 			ConditionData: (int, defaults to 0)
-			val0:		  (int, defaults to 0) Value 0
-			val1:		  (int, defaults to 0)
-			val2:		  (int, defaults to 0)
-			val3:		  (int, defaults to 0)
-			val4:		  (int, defaults to 0)
-			Emotion:	   (int, defaults to 0)
-			ChatMsgID:	 (int, defaults to 0)
+			val0:          (int, defaults to 0)
+			val1:          (int, defaults to 0)
+			val2:          (int, defaults to 0)
+			val3:          (int, defaults to 0)
+			val4:          (int, defaults to 0)
+			Emotion:       (int, defaults to -1)
+			ChatMsgID:     (int, defaults to 0)
 		}
 	}
 
diff --git a/db/re/pet_db.conf b/db/re/pet_db.conf
index 25535bf1..fcd1fcff 100644
--- a/db/re/pet_db.conf
+++ b/db/re/pet_db.conf
@@ -9,7 +9,7 @@
 //= This file is part of Hercules.
 //= http://herc.ws - http://github.com/HerculesWS/Hercules
 //=
-//= Copyright (C) 2018  Hercules Dev Team
+//= Copyright (C) 2018-2020 Hercules Dev Team
 //=
 //= Hercules is free software: you can redistribute it and/or modify
 //= it under the terms of the GNU General Public License as published by
@@ -32,39 +32,41 @@ pet_db:(
  ************* Entry structure ********************************************
  **************************************************************************
 {
-    // ================ Mandatory fields ==============================
-    Id: ID                               (int)
-    SpriteName: "Sprite_Name"            (string)
-    Name: "Pet Name"                     (string)
-    // ================ Optional fields ===============================
-    TamingItem: Taming Item              (string, defaults to 0)
-    EggItem: Egg Id                      (string, defaults to 0)
-    AccessoryItem: Equipment Id          (string, defaults to 0)
-    FoodItem: Food Id                    (string, defaults to 0)
-    FoodEffectiveness: hunger points     (int, defaults to 0)
-    HungerDelay: hunger time             (int, defaults to 0)
-    Intimacy: {
-        Initial: start intimacy                   (int, defaults to 0)
-        FeedIncrement: feeding intimacy           (int, defaults to 0)
-        OverFeedDecrement: overfeeding intimacy   (int, defaults to 0)
-        OwnerDeathDecrement: owner die intimacy   (int, defaults to 0)
-    }
-    CaptureRate: capture rate            (int, defaults to 0)
-    Speed: speed                         (int, defaults to 0)
-    SpecialPerformance: true/false       (boolean, defaults to false)
-    TalkWithEmotes: convert talk         (boolean, defaults to false)
-    AttackRate: attack rate              (int, defaults to 0)
-    DefendRate: Defence attack           (int, defaults to 0)
-    ChangeTargetRate: change target      (int, defaults to 0)
-    Evolve: {
-            EggID: {                     (string, Evolved Pet EggID)
-                   Name: Amount          (items required to perform evolution)
-                   ...
-            }
-    }
-    AutoFeed: true/false                 (boolean, defaults to false)
-    PetScript: <" Pet Script (can also be multi-line) ">
-    EquipScript: <" Equip Script (can also be multi-line) ">
+	// ================ Mandatory fields ==============================
+	Id: ID                               (int)
+	Name: "Pet Name"                     (string)
+	EggItem: "Egg Item Constant"         (string)
+	// ================ Optional fields ===============================
+	TamingItem: "Taming Item Constant"         (string, defaults to 0)
+	FoodItem: "Food Item Constant"             (string, defaults to "Pet_Food" (ID=537))
+	AccessoryItem: "Equipment Item Constant"   (string, defaults to 0)
+	FoodEffectiveness: hunger points           (int, defaults to 80)
+	HungerDelay: hunger time                   (int, defaults to 60)
+	HungerDecrement: hunger points             (int, defaults to 1)
+	Intimacy: {
+		Initial: start intimacy                   (int, defaults to 250)
+		FeedIncrement: feeding intimacy           (int, defaults to 10)
+		OverFeedDecrement: overfeeding intimacy   (int, defaults to 100)
+		OwnerDeathDecrement: owner die intimacy   (int, defaults to 20)
+		StarvingDelay: starving time              (int, defaults to 20)
+		StarvingDecrement: starving intimacy      (int, defaults to 20)
+	}
+	CaptureRate: capture rate            (int, defaults to 1000)
+	Speed: speed                         (int, defaults to 150)
+	SpecialPerformance: true/false       (boolean, defaults to false)
+	TalkWithEmotes: convert talk         (boolean, defaults to false)
+	AttackRate: attack rate              (int, defaults to 300)
+	DefendRate: Defence attack           (int, defaults to 300)
+	ChangeTargetRate: change target      (int, defaults to 800)
+	AutoFeed: true/false                 (boolean, defaults to false)
+	PetScript: <" Pet Script (can also be multi-line) ">
+	EquipScript: <" Equip Script (can also be multi-line) ">
+	Evolve: {
+		EggID: {                     (string, Evolved Pet EggID)
+			Name: Amount         (items required to perform evolution)
+			...
+		}
+	}
 },
 **************************************************************************/
 
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 6749fcd3..e2339732 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -28253,7 +28253,7 @@ skill_db: (
         Lv7: 20
         Lv8: 22
         Lv9: 24
-        Lv10: 26
+        Lv10: 25
     }
     CastTime: 1000
     AfterCastActDelay: 1000
@@ -28308,7 +28308,7 @@ skill_db: (
         Lv7: 20
         Lv8: 22
         Lv9: 24
-        Lv10: 26
+        Lv10: 25
     }
     CastTime: 1000
     AfterCastActDelay: 1000
@@ -38662,3 +38662,4 @@ skill_db: (
     }
 },
 )
+