Update to support the new changes to our server code base.

We're now Hercules v2019.10.20 with selective patches up to Hercules v2021.02.98
I've only cherry-picked what I wanted, about 40 commits, incl. features & fixes.

3 files changed, 113 insertions, 1 deletions

diff --git a/db/constants.conf b/db/constants.conf
index c76c41092..8d1a09bd9 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2372,6 +2372,6 @@ constants_db: {
 	ACADEMIC_SAGE:      7
 	ACADEMIC_GM:        8
 
-	//@include "db/si_config.conf"
+	@include "db/si_config.conf"
 	@include "conf/import/constants.conf"
 }
diff --git a/db/sc_config.conf b/db/sc_config.conf
index 67ee6aefc..e4cfdd09f 100644
--- a/db/sc_config.conf
+++ b/db/sc_config.conf
@@ -42,12 +42,14 @@ SC_TYPE: {
 		Debuff:            (bool) SC considered as debuff and be removed by Gospel and etc.
 		NoMadoReset:       (bool) SC cannot be reset when MADO Gear is taken off.
 		NoAllReset:        (bool) SC cannot be reset by 'sc_end SC_ALL' and status change clear.
+		NoBoss:            (bool) SC cannot be applied to boss monsters.
 	}
 }
 **************************************************************************/
 SC_PROVOKE: {
 	Flags: {
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_ENDURE: {
@@ -105,6 +107,7 @@ SC_BLESSING: {
 	Flags: {
 		Buff: true
 		NoMadoReset: true
+		NoBoss: true
 	}
 }
 SC_INC_AGI: {
@@ -117,6 +120,7 @@ SC_DEC_AGI: {
 	Flags: {
 		NoSave: true
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_SLOWPOISON: {
@@ -646,6 +650,7 @@ SC_FOGWALL: {
 		NoSave: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_SPIDERWEB: {
@@ -713,6 +718,7 @@ SC_PLUSATTACKPOWER: {
 		Buff: true
 		NoMadoReset: true
 	}
+	//Icon: "SI_TESTINGSI"
 }
 SC_PLUSMAGICPOWER: {
 	Visible: true
@@ -787,6 +793,7 @@ SC_GRAVITATION: {
 		NoSave: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_OVERTHRUSTMAX: {
@@ -857,6 +864,7 @@ SC_NJ_SUITON: {
 		NoDispelReset: true
 		NoClearanceReset: true
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_FOOD_STR: {
@@ -1489,48 +1497,56 @@ SC_TOXIN: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_PARALYSE: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_VENOMBLEED: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_MAGICMUSHROOM: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_DEATHHURT: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_PYREXIA: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_OBLIVIONCURSE: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_LEECHESEND: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_DUPLELIGHT: {
@@ -1553,12 +1569,14 @@ SC_ELECTRICSHOCKER: {
 		NoDispelReset: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_MARSHOFABYSS: {
 	Flags: {
 		NoDispelReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_RECOGNIZEDSPELL: {
@@ -1581,6 +1599,7 @@ SC_WUGBITE: {
 		NoDispelReset: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_CAMOUFLAGE: {
@@ -1707,6 +1726,7 @@ SC_MAGNETICFIELD: {
 		NoDispelReset: true
 		NoClearanceReset: true
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_NEUTRALBARRIER: {
@@ -1867,6 +1887,7 @@ SC_EXEEDBREAK: {
 SC_ADORAMUS: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_PRESTIGE: {
@@ -1919,11 +1940,13 @@ SC_INSPIRATION: {
 SC__ENERVATION: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC__GROOMY: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_RAISINGDRAGON: {
@@ -1937,11 +1960,13 @@ SC_RAISINGDRAGON: {
 SC__IGNORANCE: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC__LAZINESS: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_LIGHTNINGWALK: {
@@ -1960,6 +1985,7 @@ SC_ACARAJE: {
 SC__UNLUCKY: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_CURSEDCIRCLE_ATKER: {
@@ -1981,6 +2007,7 @@ SC_CURSEDCIRCLE_TARGET: {
 SC__WEAKNESS: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_CRESCENTELBOW: {
@@ -2039,6 +2066,7 @@ SC_SPELLFIST: {
 SC_NETHERWORLD: {
 	Flags: {
 		Buff: true
+		NoBoss: true
 	}
 }
 SC_SIREN: {
@@ -2051,6 +2079,7 @@ SC_DEEP_SLEEP: {
 	Flags: {
 		NoSave: true
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_SIRCLEOFNATURE: {
@@ -2166,6 +2195,7 @@ SC_FROSTMISTY: {
 	Visible: true
 	Flags: {
 		Debuff: true
+		NoBoss: true
 	}
 }
 SC_STOMACHACHE: {
@@ -2221,6 +2251,7 @@ SC_MORA_BUFF: {
 SC_NEEDLE_OF_PARALYZE: {
 	Flags: {
 		NoDeathReset: true
+		NoBoss: true
 	}
 }
 SC_PAIN_KILLER: {
@@ -2698,6 +2729,7 @@ SC_PUSH_CART: {
 SC_COLD: {
 	Visible: true
 	Flags: {
+		NoBoss: true
 	}
 }
 SC_BLOOD_SUCKER: {
@@ -2871,6 +2903,7 @@ SC_SPRITEMABLE: {
 SC_BITESCAR: {
 	Flags: {
 		NoDispelReset: true
+		NoBoss: true
 	}
 }
 SC_CLAN_INFO: {
@@ -2902,6 +2935,44 @@ SC_DAILYSENDMAILCNT: {
 		NoAllReset: true
 	}
 }
+SC_COMA: {
+	Visible: true
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_RICHMANKIM: {
+	Visible: true
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_BURNING: {
+	Visible: true
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_ROKISWEIL: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_VACUUM_EXTREME: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_FRESHSHRIMP: {
+	Flags: {
+		NoBoss: true
+	}
+}
+SC_SV_ROOTTWIST: {
+	Flags: {
+		NoBoss: true
+	}
+}
 SC_PHYSICAL_SHIELD: {
 	Visible: true
 	Flags: {
diff --git a/db/si_config.conf b/db/si_config.conf
index ffe5c87b7..1703b2f4a 100644
--- a/db/si_config.conf
+++ b/db/si_config.conf
@@ -1,4 +1,43 @@
+//================= Hercules Database =====================================
+//=       _   _                     _
+//=      | | | |                   | |
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2016  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/>.
+//=========================================================================
+//= Script Constants Additional Database
+//=========================================================================
+
+/************* Entry structure (short) ************************************
+	Identifier: value            // (int)
+ ************* Entry structure (full) *************************************
+	Identifier: {
+		Value: value         // (int)
+		Deprecated: true     // (boolean)      Defaults to false.
+	}
+**************************************************************************/
+
 	comment__: "Status Effect Icons"
+    /*
 	SI_BLANK:                                     -1
 	SI_PROVOKE:                                    0
 	SI_ENDURE:                                     1
@@ -650,4 +689,6 @@
 	SI_FRESHSHRIMP:                               921
 	SI_SUHIDE:                                    933
 	SI_SPRITEMABLE:                               937
+    */
+	SI_TESTINGSI:                                 35