Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2

src/api/SapphireApi.cpp

@@ -192,13 +192,15 @@ void SapphireApi::deleteCharacter( std::string name, const uint32_t accountId )
   g_charaDb.execute( "DELETE FROM characlass WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaglobalitem WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charainfoblacklist WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
-  g_charaDb.execute( "DELETE FROM charainfofriendlist WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charainfolinkshell WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charainfosearch WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaitemcrystal WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
+  g_charaDb.execute( "DELETE FROM charaitemcurrency WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaiteminventory WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaitemgearset WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
+  g_charaDb.execute( "DELETE FROM charamonsternote WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
   g_charaDb.execute( "DELETE FROM charaquest WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
+  g_charaDb.execute( "DELETE FROM charastatus WHERE CharacterId LIKE '" + std::to_string( id ) + "';" );
 }
 
 std::vector< PlayerMinimal > SapphireApi::getCharList( uint32_t accountId )

src/scripts/common/warptaxi/WarpTaxi.cpp

@@ -41,7 +41,7 @@ public:
 
       auto playerMgr = framework()->get< Sapphire::World::Manager::PlayerMgr >();
 
-      auto pPop = pPopRange->getPopRange(  warp->level,  warp->level );
+      auto pPop = pPopRange->getPopRange( warp->territoryType, warp->popRange );
 
       if( !pPop )
       {
@@ -52,7 +52,7 @@ public:
         std::cout << "found!!";
       }
 
-      playerMgr->movePlayerToLandDestination( player, warp->level, result.param3 );
+      playerMgr->movePlayerToLandDestination( player, warp->popRange, result.param3 );
     }
     else
     {

src/tools/exd_struct_gen/ExdData.h.tmpl

@@ -13,8 +13,12 @@
 #include <set>
 #include <variant>
 
-namespace Sapphire {
+#if _WIN32
-namespace Data {
+#undef near
+#undef far
+#endif
+
+namespace Sapphire::Data {
 
 class ExdDataGenerated;
 
@@ -89,7 +93,6 @@ IDLISTGETTERS
   };
 
 }
-}
 
 #endif
 

src/world/Actor/BNpc.cpp

@@ -112,7 +112,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
   {
     auto modelSkeleton = exdData->get< Data::ModelSkeleton >( modelChara->model );
     if( modelSkeleton )
-      m_radius *= modelSkeleton->scaleFactor;
+      m_radius *= modelSkeleton->radius;
   }
 
   // todo: is this actually good?

src/world/Manager/EventMgr.cpp

@@ -61,12 +61,8 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
     }
     case Event::EventHandler::EventHandlerType::ICDirector:
     {
-      auto contentInfo = pExdData->get< Sapphire::Data::InstanceContent >( eventId & 0xFFFF );
+      // auto contentInfo = pExdData->get< Sapphire::Data::InstanceContent >( eventId & 0xFFFF );
-      std::string name = contentInfo->name;
+      return "InstanceContentDirector#" + std::to_string( eventId & 0xFFFF );
-      std::string remove( ",★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" );
-      Util::eraseAllIn( name, remove );
-      name[ 0 ] = toupper( name[ 0 ] );
-      return name;
     }
     case Event::EventHandler::EventHandlerType::QuestBattleDirector:
     {

src/world/Manager/TerritoryMgr.cpp

@@ -348,10 +348,10 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceCon
   if( !pTeri || pContentFinderCondition->name.empty() )
     return nullptr;
 
-  Logger::debug( "Starting instance for InstanceContent id: {0} ({1})", instanceContentId, pInstanceContent->name );
+  Logger::debug( "Starting instance for InstanceContent id: {0} ({1})", instanceContentId, pContentFinderCondition->name );
 
   auto pZone = make_InstanceContent( pInstanceContent, pContentFinderCondition->territoryType, getNextInstanceId(),
-                                       pTeri->name, pContentFinderCondition->name, instanceContentId, framework() );
+                                     pTeri->name, pContentFinderCondition->name, instanceContentId, framework() );
   pZone->init();
 
   m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;

src/world/ServerMgr.cpp

@@ -26,8 +26,6 @@
 
 #include "Script/ScriptMgr.h"
 
-#include <Exd/ExdDataGenerated.h>
-
 #include <Database/ZoneDbConnection.h>
 #include <Database/DbWorkerPool.h>
 #include "Manager/LinkshellMgr.h"