mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 22:37:45 +00:00
Code Activity

fix excel structures, been a while

Browse source
This commit is contained in:
NotAdam 2020-02-24 23:04:25 +11:00
parent 8a559f8d53
commit b6344cfe23
6 changed files with 3530 additions and 337 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1991
src/common/Exd/ExdDataGenerated.cpp
View file

File diff suppressed because it is too large Load diff

1858
src/common/Exd/ExdDataGenerated.h
View file

File diff suppressed because it is too large Load diff

4
src/scripts/common/warptaxi/WarpTaxi.cpp
View file

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

2
src/world/Actor/BNpc.cpp
View file

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

8
src/world/Manager/EventMgr.cpp
View file

@ -61,12 +61,8 @@ std::string Sapphire::World::Manager::EventMgr::getEventName( uint32_t eventId )
} }
case Event::EventHandler::EventHandlerType::ICDirector: 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: case Event::EventHandler::EventHandlerType::QuestBattleDirector:
{ {

4
src/world/Manager/TerritoryMgr.cpp
View file

@ -348,10 +348,10 @@ Sapphire::TerritoryPtr Sapphire::World::Manager::TerritoryMgr::createInstanceCon
if( !pTeri || pContentFinderCondition->name.empty() ) if( !pTeri || pContentFinderCondition->name.empty() )
return nullptr; 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(), auto pZone = make_InstanceContent( pInstanceContent, pContentFinderCondition->territoryType, getNextInstanceId(),
pTeri->name, pContentFinderCondition->name, instanceContentId, framework() ); pTeri->name, pContentFinderCondition->name, instanceContentId, framework() );
pZone->init(); pZone->init();
m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone; m_instanceContentIdToInstanceMap[ instanceContentId ][ pZone->getGuId() ] = pZone;