Merge branch 'master' of https://github.com/EQEmu/Server

common/ptimer.cpp

@@ -74,11 +74,11 @@ To use ptimers, you need to create the table below in your DB:
 Schema:
 
 CREATE TABLE timers (
-	char_id INT(11) NOT nullptr,
-	type MEDIUMINT UNSIGNED NOT nullptr,
-	start INT UNSIGNED NOT nullptr,
-	duration INT UNSIGNED NOT nullptr,
-	enable TINYINT NOT nullptr,
+	char_id INT(11) NOT NULL,
+	type MEDIUMINT UNSIGNED NOT NULL,
+	start INT UNSIGNED NOT NULL,
+	duration INT UNSIGNED NOT NULL,
+	enable TINYINT NOT NULL,
 	PRIMARY KEY(char_id, type)
 );
 

common/rulesys.cpp

@@ -35,17 +35,17 @@ Requred SQL:
 
 
 CREATE TABLE rule_sets (
-  ruleset_id TINYINT UNSIGNED NOT nullptr auto_increment,
-  name VARCHAR(255) NOT nullptr,
+  ruleset_id TINYINT UNSIGNED NOT NULL auto_increment,
+  name VARCHAR(255) NOT NULL,
   PRIMARY KEY(ruleset_id)
 );
 INSERT INTO rule_sets VALUES(0, "default");
 UPDATE rule_sets SET ruleset_id=0;
 
 CREATE TABLE rule_values (
-  ruleset_id TINYINT UNSIGNED NOT nullptr,
-  rule_name VARCHAR(64) NOT nullptr,
-  rule_value VARCHAR(10) NOT nullptr,
+  ruleset_id TINYINT UNSIGNED NOT NULL,
+  rule_name VARCHAR(64) NOT NULL,
+  rule_value VARCHAR(10) NOT NULL,
   INDEX(ruleset_id),
   PRIMARY KEY(ruleset_id,rule_name)
 );

common/ruletypes.h

@@ -97,6 +97,8 @@ RULE_BOOL ( Character, EnableDiscoveredItems, true ) // If enabled, it enables E
 RULE_BOOL ( Character, EnableXTargetting, true) // Enable Extended Targetting Window, for users with UF and later clients.
 RULE_BOOL ( Character, KeepLevelOverMax, false) // Don't delevel a character that has somehow gone over the level cap
 RULE_INT ( Character, FoodLossPerUpdate, 35) // How much food/water you lose per stamina update
+RULE_INT ( Character, BaseInstrumentSoftCap, 36) // Softcap for instrument mods, 36 commonly referred to as "3.6" as well.
+RULE_INT ( Character, BaseRunSpeedCap, 158) // Base Run Speed Cap, on live it's 158% which will give you a runspeed of 1.580 hard capped to 225.
 RULE_CATEGORY_END()
 
 RULE_CATEGORY( Mercs )

common/spdat.h

@@ -404,7 +404,7 @@ typedef enum {
 #define SE_PetDiscipline				257 // not implemented as bonus - /pet hold
 #define SE_TripleBackstab				258 // implemented[AA] - chance to perform a triple backstab
 #define SE_CombatStability				259 // implemented[AA] - damage mitigation
-#define SE_AddSingingMod				260 // *not implemented
+#define SE_AddSingingMod				260 // implemented[AA] - Instrument/Singing Mastery, base1 is the mod, base2 is the ItemType
 //#define SE_Unknown261					261	// not used
 #define SE_RaiseStatCap					262 // implemented
 #define	SE_TradeSkillMastery			263	// implemented - lets you raise more than one tradeskill above master.