1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-22 12:47:45 +00:00

renamed setSystemActionUnlock to setRewardFlag

This commit is contained in:
Mordred 2022-02-28 08:40:57 +01:00
parent 83517ec2e7
commit 50fbdbfa12
16 changed files with 45 additions and 16 deletions

View file

@ -0,0 +1,29 @@
os:
- Visual Studio 2019
configuration:
- Debug
platform:
- Win64
environment:
MSVC_DEFAULT_OPTIONS: ON
MYSQL_PWD: "Password12!"
services:
- mysql
before_build:
- set PATH="C:\\Program Files\\MySQL\\MySQL Server 5.7\\bin";%PATH%
- cd c:\projects\sapphire
- git submodule update --init
- mkdir build
- cd build
- cmake .. -G "Visual Studio 16 2019" -A x64
- cmake --build . --target ALL_BUILD --config RelWithDebInfo
build_script:
- cd bin
- copy "C:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll" libmysql.dll
- sh sql_import.sh

View file

@ -64,7 +64,7 @@ namespace Sapphire::Network::ActorControl
SpawnEffect = 0x25, SpawnEffect = 0x25,
ToggleInvisible = 0x26, ToggleInvisible = 0x26,
DeadFadeOut = 0x27, DeadFadeOut = 0x27,
SetSystemActionUnlocked = 0x29, SetRewardFlag = 0x29,
UpdateUiExp = 0x2B, UpdateUiExp = 0x2B,
SetFallDamage = 0x2D, SetFallDamage = 0x2D,

View file

@ -101,7 +101,7 @@ public:
else else
{ {
eventMgr().sendEventNotice( player, eventId, 0, 1, 1, 0 ); eventMgr().sendEventNotice( player, eventId, 0, 1, 1, 0 );
player.setSystemActionUnlocked( Common::UnlockEntry::Teleport ); player.setRewardFlag( Common::UnlockEntry::Teleport );
} }
}, },
[]( Entity::Player& player, uint32_t eventId, uint64_t additional ) []( Entity::Player& player, uint32_t eventId, uint64_t additional )

View file

@ -201,7 +201,7 @@ public:
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setSystemActionUnlocked( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00051( quest, player ); Scene00051( quest, player );
}; };

View file

@ -80,7 +80,7 @@ public:
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setSystemActionUnlocked( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00051( quest, player ); Scene00051( quest, player );
}, },
nullptr, quest.getId() ); nullptr, quest.getId() );

View file

@ -83,7 +83,7 @@ public:
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setSystemActionUnlocked( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00051( quest, player ); Scene00051( quest, player );
}, },
nullptr, quest.getId() ); nullptr, quest.getId() );

View file

@ -59,7 +59,7 @@ public:
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setSystemActionUnlocked( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00002( player ); Scene00002( player );
}, },
nullptr, getId() ); nullptr, getId() );

View file

@ -73,7 +73,7 @@ public:
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setSystemActionUnlocked( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00002( player ); Scene00002( player );
}, },
nullptr, getId() ); nullptr, getId() );

View file

@ -90,7 +90,7 @@ public:
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setSystemActionUnlocked( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00001( quest, player ); Scene00001( quest, player );
}, },
nullptr, getId() ); nullptr, getId() );

View file

@ -90,7 +90,7 @@ public:
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setSystemActionUnlocked( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00001( player ); Scene00001( player );
}, },
nullptr, getId() ); nullptr, getId() );

View file

@ -90,7 +90,7 @@ public:
{ {
eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 ); eventMgr().sendEventNotice( player, 0x050002, 0, 1, 0, 0 );
player.registerAetheryte( 2 ); player.registerAetheryte( 2 );
player.setSystemActionUnlocked( Common::UnlockEntry::Return ); player.setRewardFlag( Common::UnlockEntry::Return );
Scene00001( player ); Scene00001( player );
}, },
nullptr, getId() ); nullptr, getId() );

View file

@ -207,7 +207,7 @@ private:
if( result.getResult( 0 ) == 1 ) if( result.getResult( 0 ) == 1 )
{ {
player.setSystemActionUnlocked( Sapphire::Common::UnlockEntry::HuntingLog ); player.setRewardFlag( Sapphire::Common::UnlockEntry::HuntingLog );
player.finishQuest( getId(), result.getResult( 1 ) ); player.finishQuest( getId(), result.getResult( 1 ) );
} }
} }

View file

@ -224,7 +224,7 @@ private:
if( result.getResult( 0 ) == 1 ) if( result.getResult( 0 ) == 1 )
{ {
player.setSystemActionUnlocked( Common::UnlockEntry::EmoteImperialSalute ); player.setRewardFlag( Common::UnlockEntry::EmoteImperialSalute );
player.finishQuest( getId(), result.getResult( 1 ) ); player.finishQuest( getId(), result.getResult( 1 ) );
} }
} }

View file

@ -649,7 +649,7 @@ void Player::changePosition( float x, float y, float z, float o )
warpMgr.requestWarp( *this, Common::WARP_TYPE_NORMAL, pos, getRot() ); warpMgr.requestWarp( *this, Common::WARP_TYPE_NORMAL, pos, getRot() );
} }
void Player::setSystemActionUnlocked( Common::UnlockEntry unlockId ) void Player::setRewardFlag( Common::UnlockEntry unlockId )
{ {
uint16_t index; uint16_t index;
uint8_t value; uint8_t value;
@ -658,7 +658,7 @@ void Player::setSystemActionUnlocked( Common::UnlockEntry unlockId )
m_unlocks[ index ] |= value; m_unlocks[ index ] |= value;
queuePacket( makeActorControlSelf( getId(), SetSystemActionUnlocked, unlock, 1 ) ); queuePacket( makeActorControlSelf( getId(), SetRewardFlag, unlock, 1 ) );
} }
void Player::learnSong( uint8_t songId, uint32_t itemId ) void Player::learnSong( uint8_t songId, uint32_t itemId )

View file

@ -434,7 +434,7 @@ namespace Sapphire::Entity
void updateHowtosSeen( uint32_t howToId ); void updateHowtosSeen( uint32_t howToId );
/*! learn an action / update the unlock bitmask. */ /*! learn an action / update the unlock bitmask. */
void setSystemActionUnlocked( Common::UnlockEntry unlockId ); void setRewardFlag( Common::UnlockEntry unlockId );
/*! learn a song / update the unlock bitmask. */ /*! learn a song / update the unlock bitmask. */
void learnSong( uint8_t songId, uint32_t itemId ); void learnSong( uint8_t songId, uint32_t itemId );

View file

@ -528,7 +528,7 @@ void DebugCommandMgr::add( char* data, Entity::Player& player, std::shared_ptr<
uint32_t id; uint32_t id;
sscanf( params.c_str(), "%d", &id ); sscanf( params.c_str(), "%d", &id );
player.setSystemActionUnlocked( static_cast< Common::UnlockEntry >( id ) ); player.setRewardFlag( static_cast< Common::UnlockEntry >( id ) );
} }
else if ( subCommand == "effect") else if ( subCommand == "effect")
{ {