Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-26 23:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from upstream

Browse Source
This commit is contained in:
David Markowitz 2023-06-16 02:01:01 -07:00
commit a992a28088
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dGame/dComponents/DestroyableComponent.cpp
View File

@ -52,7 +52,7 @@ DestroyableComponent::DestroyableComponent(Entity* parent, int32_t componentId)
m_IsGMImmune = false; m_IsGMImmune = false;
m_IsShielded = false; m_IsShielded = false;
m_DamageToAbsorb = 0; m_DamageToAbsorb = 0;
m_HasBricks = false; m_IsModuleAssembly = m_Parent->HasComponent(eReplicaComponentType::MODULE_ASSEMBLY);
m_DirtyThreatList = false; m_DirtyThreatList = false;
m_HasThreats = false; m_HasThreats = false;
m_ExplodeFactor = 1.0f; m_ExplodeFactor = 1.0f;
@ -187,7 +187,7 @@ void DestroyableComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsIn
outBitStream->Write(m_IsSmashed); outBitStream->Write(m_IsSmashed);
if (m_IsSmashable) { if (m_IsSmashable) {
outBitStream->Write(m_HasBricks); outBitStream->Write(m_IsModuleAssembly);
outBitStream->Write(m_ExplodeFactor != 1.0f); outBitStream->Write(m_ExplodeFactor != 1.0f);
if (m_ExplodeFactor != 1.0f) outBitStream->Write(m_ExplodeFactor); if (m_ExplodeFactor != 1.0f) outBitStream->Write(m_ExplodeFactor);
} }

4
dGame/dComponents/DestroyableComponent.h
View File

@ -235,7 +235,7 @@ public:
* Returns whether or not this entity has bricks flying out when smashed * Returns whether or not this entity has bricks flying out when smashed
* @return whether or not this entity has bricks flying out when smashed * @return whether or not this entity has bricks flying out when smashed
*/ */
bool GetHasBricks() const { return m_HasBricks; } bool GetHasBricks() const { return m_IsModuleAssembly; }
/** /**
* Sets the multiplier for the explosion that's visible when the bricks fly out when this entity is smashed * Sets the multiplier for the explosion that's visible when the bricks fly out when this entity is smashed
@ -544,7 +544,7 @@ private:
/** /**
* Whether this entity has bricks flying out when smashed (causes the client to look up the files) * Whether this entity has bricks flying out when smashed (causes the client to look up the files)
*/ */
bool m_HasBricks; bool m_IsModuleAssembly;
/** /**
* The rate at which bricks fly out when smashed * The rate at which bricks fly out when smashed

1
dGame/dComponents/InventoryComponent.cpp
View File

@ -1002,7 +1002,6 @@ void InventoryComponent::HandlePossession(Item* item) {
// Setup the destroyable stats // Setup the destroyable stats
auto* destroyableComponent = mount->GetComponent<DestroyableComponent>(); auto* destroyableComponent = mount->GetComponent<DestroyableComponent>();
if (destroyableComponent) { if (destroyableComponent) {
destroyableComponent->SetIsSmashable(false);
destroyableComponent->SetIsImmune(true); destroyableComponent->SetIsImmune(true);
} }

2
dScripts/EquipmentScripts/BuccaneerValiantShip.cpp
View File

@ -11,7 +11,7 @@ void BuccaneerValiantShip::OnStartup(Entity* self) {
// Kill self if missed // Kill self if missed
self->AddCallbackTimer(1.1F, [self]() { self->AddCallbackTimer(1.1F, [self]() {
self->Kill(); self->Smash();
}); });
} }
}); });