Update from hercules.s20180419

Add new configuration options into conf/map/battle/*.
Add new messages into messages.conf.
Add new db attendance_db.conf.
Convert pet db into libconfig format.
Add sql update for attendance db.

1 files changed, 64 insertions, 0 deletions

diff --git a/db/pet_db2.conf b/db/pet_db2.conf
new file mode 100644
index 00000000..34a6130e
--- /dev/null
+++ b/db/pet_db2.conf
@@ -0,0 +1,64 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2018  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/>.
+//=========================================================================
+//= Pets Database
+//=========================================================================
+
+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)
+	PetScript: <" Pet Script (can also be multi-line) ">
+	EquipScript: <" Equip Script (can also be multi-line) ">
+},
+**************************************************************************/
+	// entries in this file will override the ones in /(pre-)re/pet_db.conf
+)