Couple of Fixes

.editorconfig

@@ -0,0 +1,20 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+[*.{c,h,cpp,hpp}]
+indent_size = 4
+indent_style = space
+cpp_indent_case_contents_when_block = true
+cpp_new_line_before_open_brace_namespace = same_line
+cpp_indent_namespace_contents = true

Changelog.txt

@@ -3429,9 +3429,143 @@ Additionally, the problem of zig-zag issue following in the South direction has
 
 02-11-2023, Jhobean
 - Modified: @Mount added argument ARGN1
-	ARGN1 (rw) = The itemID of the item containing the animation use when moounting. (Anim # is in tiledata of this item)
+	  ARGN1 (rw) = The itemID of the item containing the animation use when moounting. (Anim # is in tiledata of this item)
     NOTE: When mounting a pet you'll read a non sense random value but you can replace it by an ITEMID to force anim
     Example: 03ea6 for Llama anim or 03e9f for gray horse anim. Yes 03ea6 is a ship part but in tiledata it link to anim 828
 
 18-11-2023, Nolok
 - Fixed: House customization sending wrong component data, breaking it.
+
+09-12-2023, DavideRei
+- Added: DispID can now also be used on chars, to change their appearance.
+
+13-12-2023, Nolok
+- Fixed: Rare crash occurring when a NPC is selecting an attackable target, but there's only one target (not attackable) in sight.
+
+12-02-2024, Drk84
+- Updated SphereCrypt.ini.
+
+13-03-2024, Jhobean
+- Added: Item properties functionnality:HITAREAPHYSICAL,HITAREAFIRE,HITAREACOLD,HITAREAPOISON,HITAREAENERGY,HITFIREBALL,HITHARM,HITLIGHTNING,HITMAGICARROW,REFLECTPHYSICALDAM
+
+24-03-2024, xwerswoodx
+Fixed: The issue that causes more1/2 not saved correctly for spellbook. (Issue: #1221)
+Fixed: Players automatically become criminal to everyone when attack someone. (Issue: #1213)
+Fixed: CallGuard not working correctly on the players that only criminal for target. (Issue: #1213, #1040)
+Fixed: The wrong input of Kill trigger, to make it compatible with older sphere versions. (Issue: #1210)
+Added: New Layer LAYER_STORAGE (80) to let scripters create their own storage system. (Issue: #1209)
+      	Only t_container and t_container_locked can be equipped to this layer.
+Changed: Decay time removed from spawned items, as Sphere gives tons of invalid link errors when items decayed. (Issue: #1218)
+Added: New spellflag SPELLFLAG_ASYNC (0100000000) to randomize field timers like old sphere versions. (Issue: #1169)
+	SPELLFLAG_ASYNC should be added to defs.
+Added: New spellflag SPELLFLAG_TARG_ONLYSELF (0200000000) to make spell only be used on character himself. (Issue: #1171)
+	SPELLFLAG_TARG_ONLYSELF should be added to defs.
+	//magery_9 "You can only use this spell on yourself." could be added to defmessages.
+Changed: SERV.LOG command changed to support console colors. (Issue: [Feature Request] Colored Serv & Src Log System #1158)
+	SERV.LOG works same as before.
+	Usage of custom color system is: SERV.LOG @color,type,mask message
+	Example: SERV.LOG @CTCOL_RED,LOGL_EVENT,LOGM_NOCONTEXT|LOGM_KILLS message
+	LOGM, LOGL and CTCOL values should be added to defs.
+
+25-03-2024, xwerswoodx
+Added: Sphere.ini setting CanPetsDrinkPotion (true in default) to make pets drink potion when their owner drop it on it. (Issue: #1147)
+	CanPetsDrinkPotion = 0 can be added to sphere.ini to disable that.
+Fixed: Missing fCheckOnly checks block the taming skill. (Issue: #1219)
+
+26-03-2024, xwerswoodx
+Added: New trigger @Drink added for characters. (Issue: #1162)
+	I: The character drinking the item.
+	SRC: The character drinking the item.
+	ARGO = the item that drank
+	ARGN1 = cooldown (in seconds)
+	ARGN2 = consumption amount (1 in default)
+	LOCAL.BottleID = empty bottle id that will be given when after item drank. (Will be given ARGN2 amount of empty bottle in default)
+	- Returns:
+	1: Stops character from drinking the item.
+	5: Let character to drink but will only give 1 empty bottle.
+	6: Let character to drink but will not give any empty bottle.
+	- Messages:
+	DRINK_NOT_ENOUGH, "You don't have enough %s to drink this."
+Added: New trigger @AfkMode added for characters. (Issue: #1161)
+	I: The character changing AFK status.
+	SRC: The character changing AFK status.
+	ARGN1 = Current Afk Status
+	ARGN2 = Next Afk Status
+	- Returns:
+	1: Stops character from switching afk status.
+Added: New trigger @Reveal added for characters. (Issue: #1157)
+	I: The character who is revealing.
+	SRC: The character who is revealing.
+	- Returns:
+	1: Prevents character from being revealed.
+Added: New triggers @ArrowQuest_Add and @ArrowQuest_Close added for characters. (Issue: #1116)
+	I: The character who activating/deactivating arrow quest.
+	SRC: The character who activating/deactivating arrow quest.
+Added: New function triggers f_onaccount_block and f_onaccount_unblock. (Issue: #1156)
+	ARGS = Account name.
+	- Returns:
+	1: Prevents account from blocking/unblocking.
+Added: New function trigger f_onserver_broadcast. (Issue: #1145)
+	ARGS = message
+	- Returns:
+	1: Prevents server to send broadcast message.
+Added: Two new LOCAL variables ItemPoisonReductionChance and ItemPoisonReductionAmount to @Hit trigger. (Issue: #1159)
+	LOCAL.ItemPoisonReductionChance = Is the chance that weapon reduce poison morez. (Default 100%)
+	LOCAL.ItemPoisonReductionAmount = Is the amount that weapon reduce. (Default: CurrentPoisonAmount/ 2)
+Added: You can now use TDATA2 for setting default cooldown (delay) for drinks. (Default: 15secs for potions, 1500 secs for ales)
+Added: MAGICF_REACTIVEARMORTH (010000) MAGICF flag to Sphere.ini to let people decide if reactive armor should reflect two handed weapons.
+
+27-03-2024, xwerswoodx
+Fixed: Possible fix for accesses and bans not loading for multis. (Issue: #1223)
+Fixed: Possible fix for wrong damage calculation of slayer bonus damage. (Issue: #1179)
+
+28-03-2024, xwerswoodx
+Added: REGION_FLAG_HOUSE (0x0100) for houses. (Issue: #1154)
+	REGION_FLAG_HOUSE 0100 should be added defs.
+
+30-03-2024, xwerswoodx
+Added: ARGO object for @MurderMark trigger to get killed character.
+Fixed: ARGN1 (reap amount) doesn't updated depends on the amount left on bit. (Issue: #1224)
+Added: ARGO to get bit uid under @ResourceGather and @RegionResourceGather triggers.
+
+31-03-2024, xwerswoodx
+Fixed: Possible fix for the OnRegionTrigger getting called on invalid region while multi creating/removing.
+
+02-04-2024, xwerswoodx
+Changed: dword CAN flags changed with uint64 to increase limits.
+Fixed: Possible fix for chat debugs. (Issue: #1212) (Issue: https://discord.com/channels/354358315373035542/483721253773901824/1224030729906815077)
+
+03-04-2024, xwerswoodx
+Added: "MOREX" key to set amount of fruit given when the crop ripped.
+Changed: Now @Create trigger called when crop grow to let people to change MORE values in stages if needed.
+Added: @ResourceTest trigger added for crops. (This trigger works separately for every stage)
+	I: Crop UID
+	SRC: Player who uses plant.
+	ARGN1: Next state item ID [Writeable]
+	ARGN2: Fruit ID (if exists) [Writeable]
+	ARGN3: Fruit ID Override (if exists) [Writeable]
+	- Returns:
+	1: Stop the fruit checks.
+Added: @ResourceGather trigger added for crops. (This trigger works separately for every stage)
+	I: Crop UID
+	SRC: Player who is gathering plant.
+	ARGN1: Amount of fruit. [Writeable]
+	ARGO: Fruit UID
+	- Returns:
+	1: Prevent player to gather fruit.
+	6: Let player to gather fruit but it will drop to the ground instead of backpack.
+Fixed: Possible fix for invalid ResourceID warnings. (Issue: #1071)
+
+08-04-2024, xwerswoodx
+Fixed: Missing REGION reference for multis. (Issue: #1228)
+Added: ElementalEngineFlags variable added to sphere.ini to let servers to filter elemental engine. (Issue: #1230)
+	EE_CURSE                    = 0x1,      // Adds Elemental buff/defuff to curse spell.
+	EE_MASS_CURSE               = 0x2,      // Adds Elemental buff/defuff to mass curse spell.
+	EE_REACTIVE_ARMOR           = 0x4,      // Adds Elemental buff/defuff to reactive armor spell.
+	EE_MAGIC_REFLECT            = 0x8,      // Adds Elemental buff/defuff to magic reflect spell.
+	EE_PROTECTION               = 0x10,     // Adds Elemental buff/defuff to protection spell.
+	EE_ARCH_PROTECTION          = 0x20,     // Adds Elemental buff/defuff to arch protection spell.
+	EE_STONESKIN                = 0x40,     // Adds Elemental buff/defuff to stone skin spell.
+	EE_STEELSKIN                = 0x80,     // Adds Elemental buff/defuff to steel skin spell.
+	EE_RESPHYSICAL              = 0x100     // Use RESPHYSICAL value instead of ARMOR for defense calculation.
+

src/common/CLog.cpp

@@ -6,7 +6,7 @@
 #include "CLog.h"
 
 
-int CEventLog::VEvent(dword dwMask, lpctstr pszFormat, va_list args) noexcept
+int CEventLog::VEvent(dword dwMask, lpctstr pszFormat, va_list args, ConsoleTextColor iColor) noexcept
 {
     if (pszFormat == nullptr || pszFormat[0] == '\0')
         return 0;
@@ -21,7 +21,7 @@ int CEventLog::VEvent(dword dwMask, lpctstr pszFormat, va_list args) noexcept
     // if ( ( pFix = strchr( pszText, 0x0C ) ) )
     //	*pFix = ' ';
 
-    return EventStr(dwMask, pszTemp);
+    return EventStr(dwMask, pszTemp, iColor);
 }
 
 int CEventLog::Event(dword dwMask, lpctstr pszFormat, ...) noexcept
@@ -60,6 +60,15 @@ int CEventLog::EventWarn(lpctstr pszFormat, ...) noexcept
     return iret;
 }
 
+int CEventLog::EventCustom(ConsoleTextColor iColor, dword dwMask, lpctstr pszFormat, ...) noexcept
+{
+    va_list vargs;
+    va_start(vargs, pszFormat);
+    int iret = VEvent(dwMask, pszFormat, vargs, iColor);
+    va_end(vargs);
+    return iret;
+}
+
 #ifdef _DEBUG
 int CEventLog::EventEvent(lpctstr pszFormat, ...) noexcept
 {
@@ -204,7 +213,7 @@ bool CLog::OpenLog(lpctstr pszBaseDirName)	// name set previously.
 	THREAD_UNIQUE_LOCK_RETURN(CLog::_OpenLog(pszBaseDirName));
 }
 
-int CLog::EventStr( dword dwMask, lpctstr pszMsg ) noexcept
+int CLog::EventStr( dword dwMask, lpctstr pszMsg, ConsoleTextColor iLogColor) noexcept
 {
     ADDTOCALLSTACK("CLog::EventStr");
 	// NOTE: This could be called in odd interrupt context so don't use dynamic stuff
@@ -217,7 +226,7 @@ int CLog::EventStr( dword dwMask, lpctstr pszMsg ) noexcept
 
 	try
 	{
-        ConsoleTextColor iLogTextColor = CTCOL_DEFAULT;
+        ConsoleTextColor iLogTextColor = iLogColor;
         ConsoleTextColor iLogTypeColor = CTCOL_DEFAULT;
 
 		// Put up the date/time.

src/common/CLog.h

@@ -44,7 +44,8 @@ enum LOG_TYPE
 	LOGM_KILLS			= 0x010000,	// Log player combat results.
 	LOGM_HTTP			= 0x020000,
 	LOGM_NOCONTEXT		= 0x040000,	// do not include context information
-	LOGM_DEBUG			= 0x080000	// debug kind of message with "DEBUG:" prefix
+	LOGM_DEBUG			= 0x080000,	// debug kind of message with "DEBUG:" prefix
+    LOGM_QTY            = 0x0FFF00  // All masks.
 };
 
 class CSError;
@@ -58,15 +59,16 @@ class CEventLog
 	// May include __LINE__ or __FILE__ macro as well ?
 
 protected:
-	virtual int EventStr(dword dwMask, lpctstr pszMsg) noexcept = 0;
+	virtual int EventStr(dword dwMask, lpctstr pszMsg, ConsoleTextColor iColor = CTCOL_DEFAULT) noexcept = 0;
 
-    int VEvent(dword dwMask, lpctstr pszFormat, va_list args) noexcept;
+    int VEvent(dword dwMask, lpctstr pszFormat, va_list args, ConsoleTextColor iColor = CTCOL_DEFAULT) noexcept;
 
 public:
 	int _cdecl Event( dword dwMask, lpctstr pszFormat, ... ) noexcept __printfargs(3,4);
 	int _cdecl EventDebug(lpctstr pszFormat, ...) noexcept  __printfargs(2,3);
 	int _cdecl EventError(lpctstr pszFormat, ...) noexcept __printfargs(2,3);
 	int _cdecl EventWarn(lpctstr pszFormat, ...) noexcept __printfargs(2,3);
+    int _cdecl EventCustom(ConsoleTextColor iColor, dword dwMask, lpctstr pszFormat, ...) noexcept __printfargs(4,5);
 #ifdef _DEBUG
 	int _cdecl EventEvent( lpctstr pszFormat, ... ) noexcept __printfargs(2,3);
 #endif //_DEBUG
@@ -117,7 +119,7 @@ public:		bool OpenLog(lpctstr pszName = nullptr);
 	bool IsLoggedLevel( LOG_TYPE level ) const;
 	bool IsLogged( dword dwMask ) const;
 
-	virtual int EventStr( dword dwMask, lpctstr pszMsg ) noexcept final;	// final: for now, it doesn't have any other virtual methods
+	virtual int EventStr( dword dwMask, lpctstr pszMsg, ConsoleTextColor iLogColor = CTCOL_DEFAULT ) noexcept final;	// final: for now, it doesn't have any other virtual methods
 	void _cdecl CatchEvent( const CSError * pErr, lpctstr pszCatchContext, ...  ) __printfargs(3,4);
     void _cdecl CatchStdException( const std::exception * pExc, lpctstr pszCatchContext, ...  ) __printfargs(3,4);