Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 65 insertions, 0 deletions

diff --git a/db/option_drop_groups.conf b/db/option_drop_groups.conf
new file mode 100644
index 00000000..ccd88867
--- /dev/null
+++ b/db/option_drop_groups.conf
@@ -0,0 +1,65 @@
+//================= 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/>.
+//=========================================================================
+//= Random Option Drop Group Database
+//=========================================================================
+
+option_drop_group_db: (
+{
+/**************************************************************************
+ ************* Entry structure ********************************************
+ **************************************************************************
+	<Group Name Constant>: (
+		{ // Option Slot 1
+			Rate: (int) chance of filling option slot 1 (100 = 1%)
+
+			// Possible options for slot 1
+			// min/max value : int, defaults to 0
+			// chance : int, 100 = 1% if not set, will be 100%/number of possibiltiies
+			OptionName: value
+			// or
+			OptionName: [min value, max value]
+			// or
+			OptionName: [min value, max value, chance]
+			// ...  (as many as you want)
+		},
+		// ... (up to MAX_ITEM_OPTION)
+	),
+**************************************************************************/
+	ODG_BASICSTAT: (
+		{ // Option Slot 1
+			Rate: 100
+
+			VAR_STRAMOUNT: 1
+			VAR_AGIAMOUNT: 1
+			VAR_VITAMOUNT: 1
+			VAR_INTAMOUNT: 1
+			VAR_DEXAMOUNT: 1
+			VAR_LUKAMOUNT: 1
+		},
+	),
+}
+)