Merge branch 'dev' into Item_move_fix

Author: Jhobean

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,4 +1,4 @@
-name: 🐛 Bug Report
+name: "🐛 Bug Report"
 description: Report unexpected behavior
 labels: ["bug"]
 #assignees:
@@ -40,7 +40,7 @@ body:
       required: true
    - type: dropdown
      id: sphere-branch
-    attributes:
+     attributes:
        label: Branch
        description: "Select the branch you are working with"
        options:

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,26 @@
+name: "💡 Feature Request"
+description: Suggest an idea.
+labels: ["feature"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to suggest a feature!
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A clear description of the feature you want to request.
+      placeholder: "Describe the feature here..."
+    validations:
+      required: true
+
+  - type: textarea
+    id: rationale
+    attributes:
+      label: Why this should be added
+      description: Explain why this feature would be useful, and describe real use cases.
+      placeholder: "Explain why this feature is important..."
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -4074,10 +4074,27 @@ When setting a property like MORE to the a spell or skill defname, trying to rea
 
 17-11-2025, Nolok
 - Fixed: CAN_O_NOSLEEP was not considered/honored at server startup (Issue #1440).
-- Changed: Object timers are now saved in worldsave files as TIMERMS, to avoid ambiguity and reliance on git build number to determine if TIMER expressed a number in seconds or milliseconds.
+- Fixed: Chars not always going in sleeping state when appropriate (Issue #1249).
+- Changed: Object timers are now saved in worldsave files as TIMERMS, to avoid ambiguity and reliance on git build number to
+    determine if TIMER expressed a number in seconds or milliseconds.
 - Changed: Added 5 seconds timeout to DNS hostname resolution at startup (avoid getting stuck when connectivity is enabled but not working).
 - Changed: CANMASK formatted in worldsave files as hexadecimal number, instead of decimal.
 
-19-11-2025, Jhobean
+2-12-2025, canerksk
+- Changed: Duplicate message deleted. (Issue #1519).
+
+3-12-2025, Nolok
+- Fixed: Items were always put into 'sleeping' ticking state when moved inside a container (Issue #1272).
+- Fixed: Failed assertion when a char speaks in a sector with a communication crystal and other items (Issue #1429).
+- Fixed: "Old VarDef value..." log message being shown while resyncing a file even if the VarDef (DEF) didn't change (Issue #1437).
+- Fixed: Str_To* methods (for string to number conversion) didn't correctly parse a single '0' if interpreting it as a hex number. This caused also 'mobtypes.txt' to not being parsed correctly.
+- Added: SERV.MAP.n.SECTOR.n returns 1 if the sector number is valid, 0 otherwise.
+- Added: Clear Console entry on taskbar icon of sphere console window on Windows OS (Issue - feature request #1516).
+
+4-12-2025, Nolok
+- Fixed: Malformed spell flags being returned via scripts.
+- Fixed: REGION ISEVENT didn't (always?) find REGIONTYPES.
+
+5-12-2025, Jhobean
 - Fixed: Full Tooltip now update each time you move an item manually (Issue #1500)
 - Fixed: On some situation when item was move or add on ground by script, decay flag and timer was not set. (Issue #1498)

Changelog.txt

@@ -13,7 +13,7 @@ function(toolchain_after_project)
     if(NOT CMAKE_VS_PLATFORM_NAME)
         set(CMAKE_VS_PLATFORM_NAME "${CMAKE_VS_PLATFORM_NAME_DEFAULT}")
     endif()
-    if(${CMAKE_VS_PLATFORM_NAME} STREQUAL "Win32")
+    if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
         set(CMAKE_SYSTEM_PROCESSOR "x86" CACHE INTERNAL "" FORCE)
     endif()
     set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_VS_PLATFORM_NAME}" CACHE INTERNAL "" FORCE)

cmake/toolchains/Windows-MSVC.cmake

@@ -149,14 +149,14 @@ bool CDataBase::query(const char *query, CVarDefMap & mapQueryResult)
 
                 if ( !rownum )
                 {
-                    mapQueryResult.SetStr(Str_FromI_Fast(i, key, sizeof(key), 10), true, z);
-                    mapQueryResult.SetStr(fields[i].name, true, z);
+                    mapQueryResult.SetStr(Str_FromI_Fast(i, key, sizeof(key), 10), true, z, false, true);
+                    mapQueryResult.SetStr(fields[i].name, true, z, false, true);
                 }
 
                 snprintf(zStore, Str_TempLength(), "%d.%d", rownum, i);
-                mapQueryResult.SetStr(zStore, true, z);
+                mapQueryResult.SetStr(zStore, true, z, false, true);
                 snprintf(zStore, Str_TempLength(), "%d.%s", rownum, fields[i].name);
-                mapQueryResult.SetStr(zStore, true, z);
+                mapQueryResult.SetStr(zStore, true, z, false, true);
             }
             ++rownum;
         }

src/common/CDataBase.cpp

@@ -406,21 +406,24 @@ CVarDefContNum* CVarDefMap::SetNum( lpctstr pszName, int64 iVal, bool fDeleteZer
 		return SetNumNew( pszName, iVal );
 
 	CVarDefContNum * pVarNum = dynamic_cast <CVarDefContNum *>( pVarBase );
-    const bool fShouldWarn = fWarnOverwrite && g_Serv.IsStartupLoadingScripts();
-	if ( pVarNum )
+    const bool fResync = g_Serv.IsResyncing();
+    bool fShouldWarn = fWarnOverwrite && g_Serv.IsStartupLoadingScripts();
+    if ( pVarNum )
     {
+        const int64 iOldVal = pVarNum->GetValNum();
+        fShouldWarn = fShouldWarn || (fWarnOverwrite && fResync && (iVal != iOldVal));
         if ( fShouldWarn )
         {
             g_Log.EventWarn( "Replacing existing VarNum '%s' with number: 0%" PRIx64 " (%" PRId64 ")\n", pVarBase->GetKey(), iVal, iVal );
 #ifdef _DEBUG
-            const int64 iOldVal = pVarNum->GetValNum();
-            g_Log.EventDebug("Previous value: %0" PRIx64 "(%" PRId64 ")\n", iOldVal, iOldVal);
+            g_Log.EventDebug("Previous value: 0%" PRIx64 " (%" PRId64 ")\n", iOldVal, iOldVal);
 #endif
         }
         pVarNum->SetValNum( iVal );
     }
 	else
 	{
+        fShouldWarn = fShouldWarn || (fWarnOverwrite && fResync);
         if ( fShouldWarn )
         {
             g_Log.EventWarn( "Replacing existing VarStr '%s' with number: 0%" PRIx64" (%" PRId64 ")\n", pVarBase->GetKey(), iVal, iVal );
@@ -464,28 +467,28 @@ CVarDefContStr* CVarDefMap::SetStrOverride( lpctstr ptcKey, lpctstr pszVal )
 	return SetStrNew(ptcKey,pszVal);
 }
 
-CVarDefCont* CVarDefMap::SetStr( lpctstr pszName, bool fQuoted, lpctstr pszVal, bool fDeleteZero, bool fWarnOverwrite )
+CVarDefCont* CVarDefMap::SetStr( lpctstr pszName, bool fQuoted, lpctstr ptcVal, bool fDeleteZero, bool fWarnOverwrite )
 {
 	ADDTOCALLSTACK_DEBUG("CVarDefMap::SetStr");
 	// ASSUME: This has been clipped of unwanted beginning and trailing spaces.
     ASSERT(pszName);
 	if ( !pszName[0] )
 		return nullptr;
 
-    ASSERT(pszVal);
+    ASSERT(ptcVal);
 	if (!fQuoted)
 	{
-		if (pszVal[0] == '\0')
+        if (ptcVal[0] == '\0')
 		{
 			// If Val is an empty string, remove any previous def (and do not add a new def)
 			DeleteAtKey(pszName);
 			return nullptr;
 		}
 
-		if (IsSimpleNumberString(pszVal))
+        if (IsSimpleNumberString(ptcVal))
 		{
 			// Just store the number and not the string.
-			return SetNum(pszName, Exp_Get64Val(pszVal), fDeleteZero, fWarnOverwrite);
+            return SetNum(pszName, Exp_Get64Val(ptcVal), fDeleteZero, fWarnOverwrite);
 		}
 	}
 
@@ -496,32 +499,37 @@ CVarDefCont* CVarDefMap::SetStr( lpctstr pszName, bool fQuoted, lpctstr pszVal,
 		pVarBase = m_Container[idx];
 
 	if ( !pVarBase )
-		return SetStrNew( pszName, pszVal );
+        return SetStrNew( pszName, ptcVal );
 
 	CVarDefContStr * pVarStr = dynamic_cast <CVarDefContStr *>( pVarBase );
-	if ( pVarStr )
+    const bool fResync = g_Serv.IsResyncing();
+    bool fShouldWarn = fWarnOverwrite && g_Serv.IsStartupLoadingScripts();
+    if ( pVarStr )
     {
-        if ( fWarnOverwrite && !g_Serv.IsResyncing() && g_Serv.IsLoadingGeneric() )
+        lpctstr ptcOldVal = pVarStr->GetValStr();
+        fShouldWarn = fShouldWarn || (fWarnOverwrite && fResync && (0 != strncmp(ptcVal, ptcOldVal, SCRIPT_MAX_LINE_LEN)));
+        if ( fShouldWarn )
         {
-            g_Log.EventWarn( "Replacing existing VarStr '%s' with string: '%s'\n", pVarBase->GetKey(), pszVal );
+            g_Log.EventWarn( "Replacing existing VarStr '%s' with string: '%s'\n", pVarBase->GetKey(), ptcVal );
 #ifdef _DEBUG
-            g_Log.EventDebug("Previous value: '%s'\n", pVarStr->GetValStr());
+            g_Log.EventDebug("Previous value: '%s'\n", ptcOldVal);
 #endif
         }
-        pVarStr->SetValStr( pszVal );
+        pVarStr->SetValStr( ptcVal );
     }
 	else
 	{
-		if ( fWarnOverwrite && !g_Serv.IsResyncing() && g_Serv.IsLoadingGeneric() )
+        fShouldWarn = fShouldWarn || (fWarnOverwrite && fResync);
+        if ( fShouldWarn )
         {
-			g_Log.EventWarn( "Replacing existing VarNum '%s' with string: '%s'\n", pVarBase->GetKey(), pszVal );
+            g_Log.EventWarn( "Replacing existing VarNum '%s' with string: '%s'\n", pVarBase->GetKey(), ptcVal );
 #ifdef _DEBUG
             const int64 iOldVal = pVarStr->GetValNum();
             g_Log.EventDebug("Previous value: 0%" PRIx64 " (%" PRId64 ")\n", iOldVal, iOldVal);
 
 #endif
         }
-        return SetStrOverride( pszName, pszVal );
+        return SetStrOverride( pszName, ptcVal );
 	}
 	return pVarStr;
 }

src/common/CVarDefMap.cpp

@@ -155,10 +155,10 @@ class CVarDefMap
 	lpctstr FindValStr( lpctstr pVal ) const;
 
     CVarDefContNum* SetNumNew( lpctstr ptcKey, int64 iVal );
-    CVarDefContNum* SetNum( lpctstr ptcKey, int64 iVal, bool fDeleteZero = true, bool fWarnOverwrite = true );
+    CVarDefContNum* SetNum( lpctstr ptcKey, int64 iVal, bool fDeleteZero = true, bool fWarnOverwrite = false );
     CVarDefContNum* ModNum( lpctstr ptcKey, int64 iMod, bool fDeleteZero = true);
     CVarDefContStr* SetStrNew( lpctstr ptcKey, lpctstr pszVal );
-    CVarDefCont* SetStr( lpctstr ptcKey, bool fQuoted, lpctstr pszVal, bool fDeleteZero = true, bool fWarnOverwrite = true );
+    CVarDefCont* SetStr(lpctstr ptcKey, bool fQuoted, lpctstr ptcVal, bool fDeleteZero = true, bool fWarnOverwrite = false );
 
 	CVarDefCont * GetAt( size_t at ) const;
 	CVarDefCont * GetKey( lpctstr ptcKey ) const;

src/common/CVarDefMap.h

@@ -64,7 +64,7 @@ bool CResourceDef::SetResourceName( lpctstr pszName )
             g_Log.EventWarn("DEFNAME=%s: redefinition (0%x!=0%x)\n",
                             pszName, iKeyIndex, iResIndex);
 
-        pVarKeyNum = gwriter->m_VarResDefs.SetNum( pszName, dwResPrivateUID );
+        pVarKeyNum = gwriter->m_VarResDefs.SetNum( pszName, dwResPrivateUID, false, true );
     }
     else
     {

src/common/resource/CResourceDef.cpp

@@ -116,7 +116,7 @@ bool CSpellDef::r_WriteVal( lpctstr ptcKey, CSString & sVal, CTextConsole * pSrc
             sVal.FormatVal( m_idEffect );
             break;
         case SPC_FLAGS:
-            sVal.FormatULLVal( m_uiFlags );
+            sVal.FormatULLHex( m_uiFlags );
             break;
         case SPC_GROUP:
             sVal.FormatDWVal( m_dwGroup );