mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 19:17:45 +00:00
Code Activity

merge instance def and useful warptaxi

Browse source
This commit is contained in:
collett 2021-07-06 07:22:39 +09:00
parent 399bb02abf
commit 2d164fe76d
6 changed files with 184 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/scripts/common/warptaxi/WarpTaxi131146.cpp Normal file
View file

@ -0,0 +1,26 @@
#include <ScriptObject.h>
#include <Actor/Player.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
using namespace Sapphire;
using namespace Sapphire::Network::Packets;
using namespace Sapphire::Network::Packets::Server;
class WarpTaxi131146 : public Sapphire::ScriptAPI::EventScript
{
public:
WarpTaxi131146() :
Sapphire::ScriptAPI::EventScript( 131146 )
{
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
player.eventFinish( getId(), 1 );
player.setPosAndSendActorMove( 565, -1.7, -253, -0.83 );
}
};
EXPOSE_SCRIPT( WarpTaxi131146 );

26
src/scripts/common/warptaxi/WarpTaxi131147.cpp Normal file
View file

@ -0,0 +1,26 @@
#include <ScriptObject.h>
#include <Actor/Player.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
using namespace Sapphire;
using namespace Sapphire::Network::Packets;
using namespace Sapphire::Network::Packets::Server;
class WarpTaxi131147 : public Sapphire::ScriptAPI::EventScript
{
public:
WarpTaxi131147() :
Sapphire::ScriptAPI::EventScript( 131147 )
{
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
player.eventFinish( getId(), 1 );
player.setPosAndSendActorMove( 574, -1.9, -264, 2.62 );
}
};
EXPOSE_SCRIPT( WarpTaxi131147 );

26
src/scripts/common/warptaxi/WarpTaxi131306.cpp Normal file
View file

@ -0,0 +1,26 @@
#include <ScriptObject.h>
#include <Actor/Player.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
using namespace Sapphire;
using namespace Sapphire::Network::Packets;
using namespace Sapphire::Network::Packets::Server;
class WarpTaxi131306 : public Sapphire::ScriptAPI::EventScript
{
public:
WarpTaxi131306() :
Sapphire::ScriptAPI::EventScript( 131306 )
{
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
player.eventFinish( getId(), 1 );
player.setPosAndSendActorMove( -466, 107.7, 107.7, -2 );
}
};
EXPOSE_SCRIPT( WarpTaxi131306 );

26
src/scripts/common/warptaxi/WarpTaxi131315.cpp Normal file
View file

@ -0,0 +1,26 @@
#include <ScriptObject.h>
#include <Actor/Player.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
using namespace Sapphire;
using namespace Sapphire::Network::Packets;
using namespace Sapphire::Network::Packets::Server;
class WarpTaxi131315 : public Sapphire::ScriptAPI::EventScript
{
public:
WarpTaxi131315() :
Sapphire::ScriptAPI::EventScript( 131315 )
{
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
player.eventFinish( getId(), 1 );
player.enterPredefinedPrivateInstance( 844 );
}
};
EXPOSE_SCRIPT( WarpTaxi131315 );

26
src/scripts/common/warptaxi/WarpTaxi131330.cpp Normal file
View file

@ -0,0 +1,26 @@
#include <ScriptObject.h>
#include <Actor/Player.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
using namespace Sapphire;
using namespace Sapphire::Network::Packets;
using namespace Sapphire::Network::Packets::Server;
class WarpTaxi131330 : public Sapphire::ScriptAPI::EventScript
{
public:
WarpTaxi131330() :
Sapphire::ScriptAPI::EventScript( 131330 )
{
}
void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
{
player.eventFinish( getId(), 1 );
player.forceZoneing( 814, -464, 361.72, 14.84, -3.14, false );
}
};
EXPOSE_SCRIPT( WarpTaxi131330 );

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

@ -727,7 +727,14 @@ std::unordered_map< uint32_t, Sapphire::World::Manager::TerritoryMgr::InstanceSp
{ 727, { { -454, 383, -127 }, 1.578 } },
{ 738, { { 0, -2, 55 }, -3.14 } },
{ 737, { { 250, 122, -346 }, -3.14 } },
{ 744, { { 0, 0, 0 }, 0 } },
{ 744, { { 0, 0, 0 }, -3.14 } },
{ 786, { { 0, -8, 43.5 }, 3.14 } },
{ 829, { { -500, 107.7, 161.6 }, 2.75 } },
{ 842, { { -66.5, 4.32, 72.36 }, 2.53 } },
{ 877, { { 442.5, 4.95, 274 }, 0.85 } },
{ 844, { { 0, 0, 0 }, -3.14 } },
{ 880, { { 100, 0, 100 }, 3.14 } },
{ 881, { { 100, 0, 100 }, 0 } },
};
std::unordered_map< uint32_t, uint32_t > Sapphire::World::Manager::TerritoryMgr::instanceExitEvent =
@ -756,4 +763,11 @@ std::unordered_map< uint32_t, uint32_t > Sapphire::World::Manager::TerritoryMgr:
{ 131286, 738 },
{ 131289, 737 },
{ 131294, 744 },
{ 131296, 786 },
{ 131305, 829 },
{ 131323, 842 },
//{ 0, 877 }, no exit
{ 131311, 844 },
{ 131326, 880 },
{ 131327, 881 },
};