Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-06 02:34:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge DarkflameServer

Browse Source
This commit is contained in:
TheMatt2
2022-01-30 13:40:08 -05:00
parent 9dfa401b27 344af924fe
commit 59afc63a2f
77 changed files with 1019 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dGame/dGameMessages/GameMessageHandler.cpp
View File

@@ -105,9 +105,6 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
auto items = inv->GetEquippedItems();
for (auto pair : items) {
const auto item = pair.second;
if (item.lot == 1727) GameMessages::SendSetJetpackMode(entity, false, true, false);
if (item.lot == 7292) GameMessages::SendSetJetpackMode(entity, true, true, false);
if (item.lot == 14442) GameMessages::SendSetJetpackMode(entity, false, true, true);
inv->AddItemSkills(item.lot);
}

35
dGame/dGameMessages/GameMessages.cpp
View File

@@ -872,19 +872,14 @@ void GameMessages::SendSetEmoteLockState(Entity* entity, bool bLock, int emoteID
SEND_PACKET
}
void GameMessages::SendSetJetpackMode(Entity* entity, bool bDoHover, bool bUse, bool bIsJamessterPhysics) {
int effectID = 167;
int iWarningEffectID = -1;
float fAirspeed = 25;
float fMaxAirspeed = 25;
float fVertVel = 2;
bool bBypassChecks = true;
void GameMessages::SendSetJetPackMode(Entity* entity, bool use, bool bypassChecks, bool doHover, int effectID, float airspeed, float maxAirspeed, float verticalVelocity, int warningEffectID) {
/* historical jamesster jetpack values
if (bIsJamessterPhysics) {
fAirspeed = 75;
fMaxAirspeed = 75;
fVertVel = 15;
}
*/
CBITSTREAM
CMSGHEADER
@@ -892,24 +887,24 @@ void GameMessages::SendSetJetpackMode(Entity* entity, bool bDoHover, bool bUse,
bitStream.Write(entity->GetObjectID());
bitStream.Write(uint16_t(GAME_MSG_SET_JET_PACK_MODE));
bitStream.Write(bBypassChecks);
bitStream.Write(bDoHover);
bitStream.Write(bUse);
bitStream.Write(bypassChecks);
bitStream.Write(doHover);
bitStream.Write(use);
bitStream.Write(effectID != -1);
if (effectID != -1) bitStream.Write(effectID);
bitStream.Write(fAirspeed != 10);
if (fAirspeed != 10) bitStream.Write(fAirspeed);
bitStream.Write(airspeed != 10);
if (airspeed != 10) bitStream.Write(airspeed);
bitStream.Write(fMaxAirspeed != 15);
if (fMaxAirspeed != 15) bitStream.Write(fMaxAirspeed);
bitStream.Write(maxAirspeed != 15);
if (maxAirspeed != 15) bitStream.Write(maxAirspeed);
bitStream.Write(fVertVel != 1);
if (fVertVel != 1) bitStream.Write(fVertVel);
bitStream.Write(verticalVelocity != 1);
if (verticalVelocity != 1) bitStream.Write(verticalVelocity);
bitStream.Write(iWarningEffectID != -1);
if (iWarningEffectID != -1) bitStream.Write(iWarningEffectID);
bitStream.Write(warningEffectID != -1);
if (warningEffectID != -1) bitStream.Write(warningEffectID);
SEND_PACKET_BROADCAST
}
@@ -4898,7 +4893,7 @@ void GameMessages::HandleFireEventServerSide(RakNet::BitStream* inStream, Entity
}
ZoneInstanceManager::Instance()->RequestZoneTransfer(Game::server, mapId, cloneId, false, [=](bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, std::string serverIP, uint16_t serverPort) {
Game::logger->Log("UserManager", "Transferring %s to Zone %i (Instance %i | Clone %i | Mythran Shift: %s) with IP %s and Port %i\n", sysAddr.ToString(), zoneID, zoneInstance, zoneClone, mythranShift == true ? "true" : "false", serverIP.c_str(), serverPort);
Game::logger->Log("UserManager", "Transferring %s to Zone %i (Instance %i | Clone %i | Mythran Shift: %s) with IP %s and Port %i\n", character->GetName().c_str(), zoneID, zoneInstance, zoneClone, mythranShift == true ? "true" : "false", serverIP.c_str(), serverPort);
if (character) {
character->SetZoneID(zoneID);

2
dGame/dGameMessages/GameMessages.h
View File

@@ -91,7 +91,7 @@ namespace GameMessages {
void SendSetInventorySize(Entity* entity, int invType, int size);
void SendSetEmoteLockState(Entity* entity, bool bLock, int emoteID);
void SendSetJetpackMode(Entity* entity, bool bDoHover, bool bUse, bool bIsJamessterPhysics);
void SendSetJetPackMode(Entity* entity, bool use, bool bypassChecks = false, bool doHover = false, int effectID = -1, float airspeed = 10, float maxAirspeed = 15, float verticalVelocity = 1, int warningEffectID = -1);
void SendResurrect(Entity* entity);
void SendStop2DAmbientSound(Entity* entity, bool force, std::string audioGUID, bool result = false);
void SendPlay2DAmbientSound(Entity* entity, std::string audioGUID, bool result = false);