Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-13 10:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DarkflameUniverse:main' into PetFixes

Browse Source
This commit is contained in:
jadebenn
2024-01-05 15:37:17 -06:00
committed by GitHub
parent 384083ea18 2804dc3ec2
commit 0f365e0ae4
55 changed files with 259 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dGame/dComponents/ActivityComponent.cpp
View File

@@ -7,7 +7,7 @@
#include "ZoneInstanceManager.h"
#include "Game.h"
#include "Logger.h"
#include <WorldPackets.h>
#include "WorldPackets.h"
#include "EntityManager.h"
#include "ChatPackets.h"
#include "Player.h"

2
dGame/dComponents/BaseCombatAIComponent.cpp
View File

@@ -1,5 +1,5 @@
#include "BaseCombatAIComponent.h"
#include <BitStream.h>
#include "BitStream.h"
#include "Entity.h"
#include "EntityManager.h"

2
dGame/dComponents/BouncerComponent.cpp
View File

@@ -6,7 +6,7 @@
#include "Game.h"
#include "Logger.h"
#include "GameMessages.h"
#include <BitStream.h>
#include "BitStream.h"
#include "eTriggerEventType.h"
BouncerComponent::BouncerComponent(Entity* parent) : Component(parent) {

2
dGame/dComponents/BuffComponent.cpp
View File

@@ -1,5 +1,5 @@
#include "BuffComponent.h"
#include <BitStream.h>
#include "BitStream.h"
#include "CDClientDatabase.h"
#include <stdexcept>
#include "DestroyableComponent.h"

2
dGame/dComponents/CharacterComponent.cpp
View File

@@ -1,5 +1,5 @@
#include "CharacterComponent.h"
#include <BitStream.h>
#include "BitStream.h"
#include "tinyxml2.h"
#include "Game.h"
#include "Logger.h"

2
dGame/dComponents/Component.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "../thirdparty/tinyxml2/tinyxml2.h"
#include "tinyxml2.h"
class Entity;

2
dGame/dComponents/DestroyableComponent.cpp
View File

@@ -1,5 +1,5 @@
#include "DestroyableComponent.h"
#include <BitStream.h>
#include "BitStream.h"
#include "Logger.h"
#include "Game.h"
#include "dConfig.h"

8
dGame/dComponents/InventoryComponent.cpp
View File

@@ -7,7 +7,7 @@
#include "Game.h"
#include "Logger.h"
#include "CDClientManager.h"
#include "../dWorldServer/ObjectIDManager.h"
#include "ObjectIDManager.h"
#include "MissionComponent.h"
#include "GameMessages.h"
#include "SkillComponent.h"
@@ -68,7 +68,7 @@ InventoryComponent::InventoryComponent(Entity* parent, tinyxml2::XMLDocument* do
continue;
}
const LWOOBJID id = ObjectIDManager::Instance()->GenerateObjectID();
const LWOOBJID id = ObjectIDManager::GenerateObjectID();
const auto& info = Inventory::FindItemComponent(item.itemid);
@@ -86,7 +86,7 @@ InventoryComponent::InventoryComponent(Entity* parent, tinyxml2::XMLDocument* do
const auto proxyLOT = static_cast<LOT>(std::stoi(proxyLotAsString));
const auto& proxyInfo = Inventory::FindItemComponent(proxyLOT);
const LWOOBJID proxyId = ObjectIDManager::Instance()->GenerateObjectID();
const LWOOBJID proxyId = ObjectIDManager::GenerateObjectID();
// Use item.count since we equip item.count number of the item this is a requested proxy of
UpdateSlot(proxyInfo.equipLocation, { proxyId, proxyLOT, item.count, slot++ });
@@ -1341,7 +1341,7 @@ void InventoryComponent::SetNPCItems(const std::vector<LOT>& items) {
auto slot = 0u;
for (const auto& item : items) {
const LWOOBJID id = ObjectIDManager::Instance()->GenerateObjectID();
const LWOOBJID id = ObjectIDManager::GenerateObjectID();
const auto& info = Inventory::FindItemComponent(item);

4
dGame/dComponents/PetComponent.cpp
View File

@@ -14,7 +14,7 @@
#include "DestroyableComponent.h"
#include "dpWorld.h"
#include "PetDigServer.h"
#include "../dWorldServer/ObjectIDManager.h"
#include "ObjectIDManager.h"
#include "eUnequippableActiveType.h"
#include "eTerminateType.h"
#include "ePetTamingNotifyType.h"
@@ -460,7 +460,7 @@ void PetComponent::NotifyTamingBuildSuccess(NiPoint3 position) {
auto* inventoryComponent = tamer->GetComponent<InventoryComponent>();
if (!inventoryComponent) return;
LWOOBJID petSubKey = ObjectIDManager::Instance()->GenerateRandomObjectID();
LWOOBJID petSubKey = ObjectIDManager::GenerateRandomObjectID();
GeneralUtils::SetBit(petSubKey, eObjectBits::CHARACTER);
GeneralUtils::SetBit(petSubKey, eObjectBits::PERSISTENT);

2
dGame/dComponents/PropertyEntranceComponent.cpp
View File

@@ -1,6 +1,6 @@
#include "PropertyEntranceComponent.h"
#include <CDPropertyEntranceComponentTable.h>
#include "CDPropertyEntranceComponentTable.h"
#include "Character.h"
#include "Database.h"

4
dGame/dComponents/PropertyManagementComponent.cpp
View File

@@ -13,7 +13,7 @@
#include "Game.h"
#include "Item.h"
#include "Database.h"
#include "../dWorldServer/ObjectIDManager.h"
#include "ObjectIDManager.h"
#include "Player.h"
#include "RocketLaunchpadControlComponent.h"
#include "PropertyEntranceComponent.h"
@@ -334,7 +334,7 @@ void PropertyManagementComponent::UpdateModelPosition(const LWOOBJID id, const N
node->position = position;
node->rotation = rotation;
ObjectIDManager::Instance()->RequestPersistentID([this, node, modelLOT, entity, position, rotation, originalRotation](uint32_t persistentId) {
ObjectIDManager::RequestPersistentID([this, node, modelLOT, entity, position, rotation, originalRotation](uint32_t persistentId) {
SpawnerInfo info{};
info.templateID = modelLOT;

2
dGame/dComponents/QuickBuildComponent.h
View File

@@ -1,7 +1,7 @@
#ifndef QUICKBUILDCOMPONENT_H
#define QUICKBUILDCOMPONENT_H
#include <BitStream.h>
#include "BitStream.h"
#include <vector>
#include <string>
#include "dCommonVars.h"

2
dGame/dComponents/RenderComponent.h
View File

@@ -1,7 +1,7 @@
#ifndef RENDERCOMPONENT_H
#define RENDERCOMPONENT_H
#include <BitStream.h>
#include "BitStream.h"
#include <vector>
#include <string>
#include <unordered_map>