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

Move to shared pointer

Browse Source
This commit is contained in:
David Markowitz
2023-06-07 00:23:50 -07:00
parent ea9d0d8592
commit 9e9e4dc087
219 changed files with 743 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.cpp
View File

@@ -29,9 +29,9 @@ void BossSpiderQueenEnemyServer::OnStartup(Entity* self) {
//self:SetStatusImmunity{ StateChangeType = "PUSH", bImmuneToPullToPoint = true, bImmuneToKnockback = true, bImmuneToInterrupt = true }
//Get our components:
destroyable = static_cast<DestroyableComponent*>(self->GetComponent(eReplicaComponentType::DESTROYABLE));
controllable = static_cast<ControllablePhysicsComponent*>(self->GetComponent(eReplicaComponentType::CONTROLLABLE_PHYSICS));
combat = static_cast<BaseCombatAIComponent*>(self->GetComponent(eReplicaComponentType::BASE_COMBAT_AI));
auto destroyable = self->GetComponent<DestroyableComponent>();
auto controllable = self->GetComponent<ControllablePhysicsComponent>();
auto combat = self->GetComponent<BaseCombatAIComponent>();
if (!destroyable || !controllable) return;
@@ -53,7 +53,7 @@ void BossSpiderQueenEnemyServer::OnStartup(Entity* self) {
void BossSpiderQueenEnemyServer::OnDie(Entity* self, Entity* killer) {
if (dZoneManager::Instance()->GetZoneID().GetMapID() == instanceZoneID) {
auto* missionComponent = killer->GetComponent<MissionComponent>();
auto missionComponent = killer->GetComponent<MissionComponent>();
if (missionComponent == nullptr)
return;
@@ -99,7 +99,7 @@ void BossSpiderQueenEnemyServer::WithdrawSpider(Entity* self, const bool withdra
EntityManager::Instance()->SerializeEntity(self);
auto* baseCombatAi = self->GetComponent<BaseCombatAIComponent>();
auto baseCombatAi = self->GetComponent<BaseCombatAIComponent>();
baseCombatAi->SetDisabled(true);
@@ -123,7 +123,7 @@ void BossSpiderQueenEnemyServer::WithdrawSpider(Entity* self, const bool withdra
//Cancel all remaining timers for say idle anims:
self->CancelAllTimers();
auto* baseCombatAi = self->GetComponent<BaseCombatAIComponent>();
auto baseCombatAi = self->GetComponent<BaseCombatAIComponent>();
baseCombatAi->SetDisabled(false);
@@ -314,7 +314,7 @@ void BossSpiderQueenEnemyServer::RainOfFireManager(Entity* self) {
return;
}
auto* skillComponent = entity->GetComponent<SkillComponent>();
auto skillComponent = entity->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
Game::logger->Log("BossSpiderQueenEnemyServer", "Failed to find impact skill component!");
@@ -347,7 +347,7 @@ void BossSpiderQueenEnemyServer::RapidFireShooterManager(Entity* self) {
const auto target = attackTargetTable[0];
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
skillComponent->CalculateBehavior(1394, 32612, target, true);
@@ -381,7 +381,7 @@ void BossSpiderQueenEnemyServer::RunRapidFireShooter(Entity* self) {
attackTargetTable.push_back(attackFocus);
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
skillComponent->CalculateBehavior(1480, 36652, attackFocus, true);
@@ -493,14 +493,14 @@ void BossSpiderQueenEnemyServer::OnTimerDone(Entity* self, const std::string tim
auto landingTarget = self->GetI64(u"LandingTarget");
auto landingEntity = EntityManager::Instance()->GetEntity(landingTarget);
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(bossLandingSkill, 37739, LWOOBJID_EMPTY);
}
if (landingEntity) {
auto* landingSkill = landingEntity->GetComponent<SkillComponent>();
auto landingSkill = landingEntity->GetComponent<SkillComponent>();
if (landingSkill != nullptr) {
landingSkill->CalculateBehavior(bossLandingSkill, 37739, LWOOBJID_EMPTY, true);

12
dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp
View File

@@ -12,7 +12,7 @@
void AmDarklingDragon::OnStartup(Entity* self) {
self->SetVar<int32_t>(u"weakspot", 0);
auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (baseCombatAIComponent != nullptr) {
baseCombatAIComponent->SetStunImmune(true);
@@ -46,7 +46,7 @@ void AmDarklingDragon::OnHitOrHealResult(Entity* self, Entity* attacker, int32_t
}
}
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
if (destroyableComponent->GetArmor() > 0) return;
@@ -56,8 +56,8 @@ void AmDarklingDragon::OnHitOrHealResult(Entity* self, Entity* attacker, int32_t
if (weakpoint == 0) {
self->AddTimer("ReviveTimer", 12);
auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto* skillComponent = self->GetComponent<SkillComponent>();
auto baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (baseCombatAIComponent != nullptr) {
baseCombatAIComponent->SetDisabled(true);
@@ -127,8 +127,8 @@ void AmDarklingDragon::OnTimerDone(Entity* self, std::string timerName) {
RenderComponent::PlayAnimation(self, u"stunend", 2.0f);
self->AddTimer("backToAttack", 1);
} else if (timerName == "backToAttack") {
auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto* skillComponent = self->GetComponent<SkillComponent>();
auto baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (baseCombatAIComponent != nullptr) {
baseCombatAIComponent->SetDisabled(false);
baseCombatAIComponent->SetStunned(false);

4
dScripts/02_server/Enemy/AM/AmSkeletonEngineer.cpp
View File

@@ -3,8 +3,8 @@
#include "SkillComponent.h"
void AmSkeletonEngineer::OnHit(Entity* self, Entity* attacker) {
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto* skillComponent = self->GetComponent<SkillComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (destroyableComponent == nullptr || skillComponent == nullptr) {
return;

12
dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp
View File

@@ -10,7 +10,7 @@
void FvMaelstromDragon::OnStartup(Entity* self) {
self->SetVar<int32_t>(u"weakspot", 0);
auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (baseCombatAIComponent != nullptr) {
baseCombatAIComponent->SetStunImmune(true);
@@ -59,7 +59,7 @@ void FvMaelstromDragon::OnHitOrHealResult(Entity* self, Entity* attacker, int32_
}
}
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
if (destroyableComponent->GetArmor() > 0) return;
@@ -71,8 +71,8 @@ void FvMaelstromDragon::OnHitOrHealResult(Entity* self, Entity* attacker, int32_
self->AddTimer("ReviveTimer", 12);
auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto* skillComponent = self->GetComponent<SkillComponent>();
auto baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (baseCombatAIComponent != nullptr) {
baseCombatAIComponent->SetDisabled(true);
@@ -143,8 +143,8 @@ void FvMaelstromDragon::OnTimerDone(Entity* self, std::string timerName) {
RenderComponent::PlayAnimation(self, u"stunend", 2.0f);
self->AddTimer("backToAttack", 1.0f);
} else if (timerName == "backToAttack") {
auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto* skillComponent = self->GetComponent<SkillComponent>();
auto baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (baseCombatAIComponent != nullptr) {
baseCombatAIComponent->SetDisabled(false);

12
dScripts/02_server/Enemy/General/BaseEnemyApe.cpp
View File

@@ -31,11 +31,11 @@ void BaseEnemyApe::OnSkillCast(Entity* self, uint32_t skillID) {
}
void BaseEnemyApe::OnHit(Entity* self, Entity* attacker) {
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr && destroyableComponent->GetArmor() < 1 && !self->GetBoolean(u"knockedOut")) {
StunApe(self, true);
self->CancelTimer("spawnQBTime");
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent) {
skillComponent->Reset();
}
@@ -52,7 +52,7 @@ void BaseEnemyApe::OnTimerDone(Entity* self, std::string timerName) {
// Revives the ape, giving it back some armor
const auto timesStunned = self->GetVar<uint32_t>(u"timesStunned");
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
destroyableComponent->SetArmor(destroyableComponent->GetMaxArmor() / timesStunned);
}
@@ -104,7 +104,7 @@ void BaseEnemyApe::OnTimerDone(Entity* self, std::string timerName) {
return;
}
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(1273, 29446, self->GetObjectID(), true, false, player->GetObjectID());
}
@@ -123,12 +123,12 @@ void BaseEnemyApe::OnFireEventServerSide(Entity* self, Entity* sender, std::stri
}
void BaseEnemyApe::StunApe(Entity* self, bool stunState) {
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(stunState);
combatAIComponent->SetStunned(stunState);
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->Interrupt();
}

4
dScripts/02_server/Enemy/General/BaseEnemyMech.cpp
View File

@@ -9,14 +9,14 @@
#include "eReplicaComponentType.h"
void BaseEnemyMech::OnStartup(Entity* self) {
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
destroyableComponent->SetFaction(4);
}
}
void BaseEnemyMech::OnDie(Entity* self, Entity* killer) {
ControllablePhysicsComponent* controlPhys = static_cast<ControllablePhysicsComponent*>(self->GetComponent(eReplicaComponentType::CONTROLLABLE_PHYSICS));
auto controlPhys = self->GetComponent<ControllablePhysicsComponent>();
if (!controlPhys) return;
NiPoint3 newLoc = { controlPhys->GetPosition().x, dpWorld::Instance().GetNavMesh()->GetHeightAtPoint(controlPhys->GetPosition()), controlPhys->GetPosition().z };

2
dScripts/02_server/Enemy/General/EnemyNjBuff.cpp
View File

@@ -2,7 +2,7 @@
#include "SkillComponent.h"
void EnemyNjBuff::OnStartup(Entity* self) {
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;

2
dScripts/02_server/Enemy/General/TreasureChestDragonServer.cpp
View File

@@ -15,7 +15,7 @@ void TreasureChestDragonServer::OnUse(Entity* self, Entity* user) {
self->SetVar<bool>(u"bUsed", true);
auto* scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
auto scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
if (scriptedActivityComponent == nullptr) {
return;

2
dScripts/02_server/Enemy/Survival/AgSurvivalMech.cpp
View File

@@ -4,7 +4,7 @@
void AgSurvivalMech::OnStartup(Entity* self) {
BaseWavesGenericEnemy::OnStartup(self);
auto* destroyable = self->GetComponent<DestroyableComponent>();
auto destroyable = self->GetComponent<DestroyableComponent>();
if (destroyable != nullptr) {
destroyable->SetFaction(4);
}

2
dScripts/02_server/Enemy/Survival/AgSurvivalSpiderling.cpp
View File

@@ -4,7 +4,7 @@
void AgSurvivalSpiderling::OnStartup(Entity* self) {
BaseWavesGenericEnemy::OnStartup(self);
auto* combatAI = self->GetComponent<BaseCombatAIComponent>();
auto combatAI = self->GetComponent<BaseCombatAIComponent>();
if (combatAI != nullptr) {
combatAI->SetStunImmune(true);
}

4
dScripts/02_server/Enemy/Waves/WaveBossApe.cpp
View File

@@ -11,7 +11,7 @@ void WaveBossApe::OnStartup(Entity* self) {
self->SetVar<float_t>(u"AnchorDamageDelayTime", 0.5f);
self->SetVar<float_t>(u"spawnQBTime", 5.0f);
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(true);
combatAIComponent->SetStunImmune(true);
@@ -30,7 +30,7 @@ void WaveBossApe::OnDie(Entity* self, Entity* killer) {
void WaveBossApe::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2,
int32_t param3) {
if (args == "startAI") {
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(false);
combatAIComponent->SetStunImmune(false);

4
dScripts/02_server/Enemy/Waves/WaveBossHammerling.cpp
View File

@@ -5,7 +5,7 @@
void WaveBossHammerling::OnStartup(Entity* self) {
BaseWavesGenericEnemy::OnStartup(self);
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(true);
combatAIComponent->SetStunImmune(true);
@@ -17,7 +17,7 @@ void WaveBossHammerling::OnStartup(Entity* self) {
void WaveBossHammerling::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1,
int32_t param2, int32_t param3) {
if (args == "startAI") {
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(false);
}

4
dScripts/02_server/Enemy/Waves/WaveBossHorsemen.cpp
View File

@@ -5,7 +5,7 @@
void WaveBossHorsemen::OnStartup(Entity* self) {
BaseWavesGenericEnemy::OnStartup(self);
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(true);
combatAIComponent->SetStunImmune(true);
@@ -18,7 +18,7 @@ void
WaveBossHorsemen::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2,
int32_t param3) {
if (args == "startAI") {
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(false);
}

4
dScripts/02_server/Enemy/Waves/WaveBossSpiderling.cpp
View File

@@ -5,7 +5,7 @@
void WaveBossSpiderling::OnStartup(Entity* self) {
BaseWavesGenericEnemy::OnStartup(self);
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(true);
combatAIComponent->SetStunImmune(true);
@@ -17,7 +17,7 @@ void WaveBossSpiderling::OnStartup(Entity* self) {
void WaveBossSpiderling::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1,
int32_t param2, int32_t param3) {
if (args == "startAI") {
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(false);
combatAIComponent->SetStunImmune(false);

4
dScripts/02_server/Equipment/BootyDigServer.cpp
View File

@@ -35,13 +35,13 @@ BootyDigServer::OnFireEventServerSide(Entity* self, Entity* sender, std::string
// Make sure players only dig up one booty per instance
player->SetVar<bool>(u"bootyDug", true);
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
auto* mission = missionComponent->GetMission(1881);
if (mission != nullptr && (mission->GetMissionState() == eMissionState::ACTIVE || mission->GetMissionState() == eMissionState::COMPLETE_ACTIVE)) {
mission->Progress(eMissionTaskType::SCRIPT, self->GetLOT());
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr)
renderComponent->PlayEffect(7730, u"cast", "bootyshine");

2
dScripts/02_server/Map/AG/AgBugsprayer.cpp
View File

@@ -8,7 +8,7 @@ void AgBugsprayer::OnRebuildComplete(Entity* self, Entity* target) {
void AgBugsprayer::OnTimerDone(Entity* self, std::string timerName) {
if (timerName == "castSkill") {
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent == nullptr) return;

2
dScripts/02_server/Map/AG/AgCagedBricksServer.cpp
View File

@@ -21,7 +21,7 @@ void AgCagedBricksServer::OnUse(Entity* self, Entity* user) {
character->SetPlayerFlag(ePlayerFlag::CAGED_SPIDER, true);
//Remove the maelstrom cube:
auto inv = static_cast<InventoryComponent*>(user->GetComponent(eReplicaComponentType::INVENTORY));
auto inv = user->GetComponent<InventoryComponent>();
if (inv) {
inv->RemoveItem(14553, 1);

4
dScripts/02_server/Map/AG/AgLaserSensorServer.cpp
View File

@@ -8,7 +8,7 @@ void AgLaserSensorServer::OnStartup(Entity* self) {
self->SetBoolean(u"active", true);
auto repelForce = self->GetVarAs<float>(u"repelForce");
if (!repelForce) repelForce = m_RepelForce;
auto* phantomPhysicsComponent = self->GetComponent<PhantomPhysicsComponent>();
auto phantomPhysicsComponent = self->GetComponent<PhantomPhysicsComponent>();
if (!phantomPhysicsComponent) return;
phantomPhysicsComponent->SetPhysicsEffectActive(true);
phantomPhysicsComponent->SetEffectType(ePhysicsEffectType::REPULSE);
@@ -22,7 +22,7 @@ void AgLaserSensorServer::OnCollisionPhantom(Entity* self, Entity* target) {
if (!active) return;
auto skillCastID = self->GetVarAs<float>(u"skillCastID");
if (skillCastID == 0) skillCastID = m_SkillCastID;
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (!skillComponent) return;
skillComponent->CastSkill(m_SkillCastID, target->GetObjectID());
}

8
dScripts/02_server/Map/AG/NpcAgCourseStarter.cpp
View File

@@ -13,7 +13,7 @@ void NpcAgCourseStarter::OnStartup(Entity* self) {
}
void NpcAgCourseStarter::OnUse(Entity* self, Entity* user) {
auto* scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
auto scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
if (scriptedActivityComponent == nullptr) {
return;
@@ -27,7 +27,7 @@ void NpcAgCourseStarter::OnUse(Entity* self, Entity* user) {
}
void NpcAgCourseStarter::OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData) {
auto* scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
auto scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
if (scriptedActivityComponent == nullptr) {
return;
@@ -70,7 +70,7 @@ void NpcAgCourseStarter::OnMessageBoxResponse(Entity* self, Entity* sender, int3
void NpcAgCourseStarter::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2,
int32_t param3) {
auto* scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
auto scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
if (scriptedActivityComponent == nullptr)
return;
@@ -88,7 +88,7 @@ void NpcAgCourseStarter::OnFireEventServerSide(Entity* self, Entity* sender, std
data->values[2] = *(float*)&finish;
auto* missionComponent = sender->GetComponent<MissionComponent>();
auto missionComponent = sender->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->ForceProgressTaskType(1884, 1, 1, false);
missionComponent->Progress(eMissionTaskType::PERFORM_ACTIVITY, -finish, self->GetObjectID(),

2
dScripts/02_server/Map/AG/NpcCowboyServer.cpp
View File

@@ -7,7 +7,7 @@ void NpcCowboyServer::OnMissionDialogueOK(Entity* self, Entity* target, int miss
return;
}
auto* inventoryComponent = target->GetComponent<InventoryComponent>();
auto inventoryComponent = target->GetComponent<InventoryComponent>();
if (inventoryComponent == nullptr) {
return;

4
dScripts/02_server/Map/AG/NpcNjAssistantServer.cpp
View File

@@ -12,7 +12,7 @@ void NpcNjAssistantServer::OnMissionDialogueOK(Entity* self, Entity* target, int
if (missionState == eMissionState::COMPLETE || missionState == eMissionState::READY_TO_COMPLETE) {
GameMessages::SendNotifyClientObject(self->GetObjectID(), u"switch", 0, 0, LWOOBJID_EMPTY, "", target->GetSystemAddress());
auto* inv = static_cast<InventoryComponent*>(target->GetComponent(eReplicaComponentType::INVENTORY));
auto inv = target->GetComponent<InventoryComponent>();
// If we are ready to complete our missions, we take the kit from you:
if (inv && missionState == eMissionState::READY_TO_COMPLETE) {
@@ -23,7 +23,7 @@ void NpcNjAssistantServer::OnMissionDialogueOK(Entity* self, Entity* target, int
}
}
} else if (missionState == eMissionState::AVAILABLE) {
auto* missionComponent = static_cast<MissionComponent*>(target->GetComponent(eReplicaComponentType::MISSION));
auto missionComponent = target->GetComponent<MissionComponent>();
missionComponent->CompleteMission(mailAchievement, true);
}
}

2
dScripts/02_server/Map/AG/NpcPirateServer.cpp
View File

@@ -3,7 +3,7 @@
#include "InventoryComponent.h"
void NpcPirateServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) {
auto* inventory = target->GetComponent<InventoryComponent>();
auto inventory = target->GetComponent<InventoryComponent>();
if (inventory != nullptr && missionID == 1881) {
auto* luckyShovel = inventory->FindItemByLot(14591);

2
dScripts/02_server/Map/AG/NpcWispServer.cpp
View File

@@ -9,7 +9,7 @@ void NpcWispServer::OnMissionDialogueOK(Entity* self, Entity* target, int missio
if (missionID != 1849 && missionID != 1883)
return;
auto* inventory = target->GetComponent<InventoryComponent>();
auto inventory = target->GetComponent<InventoryComponent>();
if (inventory == nullptr)
return;

2
dScripts/02_server/Map/AG/RemoveRentalGear.cpp
View File

@@ -23,7 +23,7 @@ void RemoveRentalGear::OnMissionDialogueOK(Entity* self, Entity* target, int mis
if (missionID != defaultMission && missionID != 313) return;
if (missionState == eMissionState::COMPLETE || missionState == eMissionState::READY_TO_COMPLETE) {
auto inv = static_cast<InventoryComponent*>(target->GetComponent(eReplicaComponentType::INVENTORY));
auto inv = target->GetComponent<InventoryComponent>();
if (!inv) return;
//remove the inventory items

2
dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp
View File

@@ -28,7 +28,7 @@ void ZoneAgSpiderQueen::BasePlayerLoaded(Entity* self, Entity* player) {
ActivityManager::TakeActivityCost(self, player->GetObjectID());
// Make sure the player has full stats when they join
auto* playerDestroyableComponent = player->GetComponent<DestroyableComponent>();
auto playerDestroyableComponent = player->GetComponent<DestroyableComponent>();
if (playerDestroyableComponent != nullptr) {
playerDestroyableComponent->SetImagination(playerDestroyableComponent->GetMaxImagination());
playerDestroyableComponent->SetArmor(playerDestroyableComponent->GetMaxArmor());

4
dScripts/02_server/Map/AM/AmBlueX.cpp
View File

@@ -5,7 +5,7 @@
#include "Character.h"
void AmBlueX::OnUse(Entity* self, Entity* user) {
auto* skillComponent = user->GetComponent<SkillComponent>();
auto skillComponent = user->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(m_SwordSkill, m_SwordBehavior, self->GetObjectID());
}
@@ -37,7 +37,7 @@ void AmBlueX::OnSkillEventFired(Entity* self, Entity* caster, const std::string&
self->AddCallbackTimer(m_BombTime, [this, self, fxObjectID, playerID]() {
auto* fxObject = EntityManager::Instance()->GetEntity(fxObjectID);
auto* player = EntityManager::Instance()->GetEntity(playerID);
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent == nullptr)
return;

4
dScripts/02_server/Map/AM/AmDrawBridge.cpp
View File

@@ -60,7 +60,7 @@ void AmDrawBridge::OnTimerDone(Entity* self, std::string timerName) {
self->SetNetworkVar(u"BridgeLeaving", false);
auto* simplePhysicsComponent = bridge->GetComponent<SimplePhysicsComponent>();
auto simplePhysicsComponent = bridge->GetComponent<SimplePhysicsComponent>();
if (simplePhysicsComponent == nullptr) {
return;
@@ -87,7 +87,7 @@ void AmDrawBridge::OnNotifyObject(Entity* self, Entity* sender, const std::strin
}
void AmDrawBridge::MoveBridgeDown(Entity* self, Entity* bridge, bool down) {
auto* simplePhysicsComponent = bridge->GetComponent<SimplePhysicsComponent>();
auto simplePhysicsComponent = bridge->GetComponent<SimplePhysicsComponent>();
if (simplePhysicsComponent == nullptr) {
return;

8
dScripts/02_server/Map/AM/AmDropshipComputer.cpp
View File

@@ -10,14 +10,14 @@ void AmDropshipComputer::OnStartup(Entity* self) {
}
void AmDropshipComputer::OnUse(Entity* self, Entity* user) {
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent == nullptr || rebuildComponent->GetState() != eRebuildState::COMPLETED) {
return;
}
auto* missionComponent = user->GetComponent<MissionComponent>();
auto* inventoryComponent = user->GetComponent<InventoryComponent>();
auto missionComponent = user->GetComponent<MissionComponent>();
auto inventoryComponent = user->GetComponent<InventoryComponent>();
if (missionComponent == nullptr || inventoryComponent == nullptr) {
return;
@@ -70,7 +70,7 @@ void AmDropshipComputer::OnDie(Entity* self, Entity* killer) {
}
void AmDropshipComputer::OnTimerDone(Entity* self, std::string timerName) {
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent == nullptr) {
return;

2
dScripts/02_server/Map/AM/AmScrollReaderServer.cpp
View File

@@ -3,7 +3,7 @@
void AmScrollReaderServer::OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData) {
if (identifier == u"story_end") {
auto* missionComponent = sender->GetComponent<MissionComponent>();
auto missionComponent = sender->GetComponent<MissionComponent>();
if (missionComponent == nullptr) {
return;

8
dScripts/02_server/Map/AM/AmShieldGenerator.cpp
View File

@@ -15,7 +15,7 @@ void AmShieldGenerator::OnStartup(Entity* self) {
}
void AmShieldGenerator::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) {
auto* destroyableComponent = entering->GetComponent<DestroyableComponent>();
auto destroyableComponent = entering->GetComponent<DestroyableComponent>();
if (status == "ENTER" && name == "shield") {
if (destroyableComponent->HasFaction(4)) {
@@ -102,7 +102,7 @@ void AmShieldGenerator::StartShield(Entity* self) {
}
void AmShieldGenerator::BuffPlayers(Entity* self) {
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;
@@ -122,8 +122,8 @@ void AmShieldGenerator::BuffPlayers(Entity* self) {
}
void AmShieldGenerator::EnemyEnteredShield(Entity* self, Entity* intruder) {
auto* baseCombatAIComponent = intruder->GetComponent<BaseCombatAIComponent>();
auto* movementAIComponent = intruder->GetComponent<MovementAIComponent>();
auto baseCombatAIComponent = intruder->GetComponent<BaseCombatAIComponent>();
auto movementAIComponent = intruder->GetComponent<MovementAIComponent>();
if (baseCombatAIComponent == nullptr || movementAIComponent == nullptr) {
return;

12
dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.cpp
View File

@@ -15,7 +15,7 @@ void AmShieldGeneratorQuickbuild::OnStartup(Entity* self) {
}
void AmShieldGeneratorQuickbuild::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) {
auto* destroyableComponent = entering->GetComponent<DestroyableComponent>();
auto destroyableComponent = entering->GetComponent<DestroyableComponent>();
if (name == "shield") {
if (!destroyableComponent->HasFaction(4) || entering->IsPlayer()) {
@@ -122,7 +122,7 @@ void AmShieldGeneratorQuickbuild::OnRebuildComplete(Entity* self, Entity* target
continue;
}
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent == nullptr) {
return;
@@ -154,7 +154,7 @@ void AmShieldGeneratorQuickbuild::StartShield(Entity* self) {
}
void AmShieldGeneratorQuickbuild::BuffPlayers(Entity* self) {
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;
@@ -174,14 +174,14 @@ void AmShieldGeneratorQuickbuild::BuffPlayers(Entity* self) {
}
void AmShieldGeneratorQuickbuild::EnemyEnteredShield(Entity* self, Entity* intruder) {
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent == nullptr || rebuildComponent->GetState() != eRebuildState::COMPLETED) {
return;
}
auto* baseCombatAIComponent = intruder->GetComponent<BaseCombatAIComponent>();
auto* movementAIComponent = intruder->GetComponent<MovementAIComponent>();
auto baseCombatAIComponent = intruder->GetComponent<BaseCombatAIComponent>();
auto movementAIComponent = intruder->GetComponent<MovementAIComponent>();
if (baseCombatAIComponent == nullptr || movementAIComponent == nullptr) {
return;

12
dScripts/02_server/Map/AM/AmSkullkinDrill.cpp
View File

@@ -14,7 +14,7 @@ void AmSkullkinDrill::OnStartup(Entity* self) {
GameMessages::SendPlayFXEffect(self->GetObjectID(), -1, u"spin", "active");
auto* movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
auto movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
if (movingPlatformComponent == nullptr) {
return;
@@ -58,7 +58,7 @@ void AmSkullkinDrill::OnSkillEventFired(Entity* self, Entity* caster, const std:
return;
}
auto* proximityMonitorComponent = self->GetComponent<ProximityMonitorComponent>();
auto proximityMonitorComponent = self->GetComponent<ProximityMonitorComponent>();
if (proximityMonitorComponent == nullptr || !proximityMonitorComponent->IsInProximity("spin_distance", caster->GetObjectID())) {
return;
@@ -82,7 +82,7 @@ void AmSkullkinDrill::TriggerDrill(Entity* self) {
standObj->SetVar(u"bActive", false);
}
auto* movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
auto movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
if (movingPlatformComponent == nullptr) {
return;
@@ -223,7 +223,7 @@ void AmSkullkinDrill::PlayAnim(Entity* self, Entity* player, const std::string&
}
void AmSkullkinDrill::OnHitOrHealResult(Entity* self, Entity* attacker, int32_t damage) {
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent == nullptr || !attacker->IsPlayer()) {
return;
@@ -239,7 +239,7 @@ void AmSkullkinDrill::OnHitOrHealResult(Entity* self, Entity* attacker, int32_t
// TODO: Missions
if (activator != nullptr) {
auto* missionComponent = activator->GetComponent<MissionComponent>();
auto missionComponent = activator->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
for (const auto missionID : m_MissionsToUpdate) {
@@ -279,7 +279,7 @@ void AmSkullkinDrill::OnTimerDone(Entity* self, std::string timerName) {
standObj->SetVar(u"bActive", true);
}
auto* movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
auto movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
if (movingPlatformComponent == nullptr) {
return;

6
dScripts/02_server/Map/AM/AmSkullkinTower.cpp
View File

@@ -12,7 +12,7 @@ void AmSkullkinTower::OnStartup(Entity* self) {
// onPhysicsComponentReady
auto* movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
auto movingPlatformComponent = self->GetComponent<MovingPlatformComponent>();
if (movingPlatformComponent != nullptr) {
movingPlatformComponent->StopPathing();
@@ -82,7 +82,7 @@ void AmSkullkinTower::OnChildLoaded(Entity* self, Entity* child) {
child->AddDieCallback([this, selfID, child]() {
auto* self = EntityManager::Instance()->GetEntity(selfID);
auto* destroyableComponent = child->GetComponent<DestroyableComponent>();
auto destroyableComponent = child->GetComponent<DestroyableComponent>();
if (destroyableComponent == nullptr || self == nullptr) {
return;
@@ -163,7 +163,7 @@ void AmSkullkinTower::OnChildRemoved(Entity* self, Entity* child) {
continue;
}
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent == nullptr) {
continue;

2
dScripts/02_server/Map/AM/AmTeapotServer.cpp
View File

@@ -5,7 +5,7 @@
#include "eTerminateType.h"
void AmTeapotServer::OnUse(Entity* self, Entity* user) {
auto* inventoryComponent = user->GetComponent<InventoryComponent>();
auto inventoryComponent = user->GetComponent<InventoryComponent>();
if (!inventoryComponent) return;
auto* blueFlowerItem = inventoryComponent->FindItemByLot(BLUE_FLOWER_LEAVES, eInventoryType::ITEMS);

2
dScripts/02_server/Map/AM/AmTemplateSkillVolume.cpp
View File

@@ -6,7 +6,7 @@ void AmTemplateSkillVolume::OnSkillEventFired(Entity* self, Entity* caster, cons
return;
}
auto* missionComponent = caster->GetComponent<MissionComponent>();
auto missionComponent = caster->GetComponent<MissionComponent>();
const auto missionIDsVariable = GeneralUtils::UTF16ToWTF8(self->GetVar<std::u16string>(u"missions"));
const auto missionIDs = GeneralUtils::SplitString(missionIDsVariable, '_');

6
dScripts/02_server/Map/FV/EnemyRoninSpawner.cpp
View File

@@ -10,7 +10,7 @@ void EnemyRoninSpawner::OnStartup(Entity* self) {
void EnemyRoninSpawner::OnTimerDone(Entity* self, std::string timerName) {
if (timerName == "hatchTime") {
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->PlayEffect(644, u"create", "BurstFX1");
@@ -42,7 +42,7 @@ void EnemyRoninSpawner::OnProximityUpdate(Entity* self, Entity* entering, std::s
if (entering->IsPlayer() && name == "ronin" && status == "ENTER" && !self->GetVar<bool>(u"hatching")) {
StartHatching(self);
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(305, 3568, LWOOBJID_EMPTY);
@@ -59,7 +59,7 @@ void EnemyRoninSpawner::OnHit(Entity* self, Entity* attacker) {
void EnemyRoninSpawner::StartHatching(Entity* self) {
self->SetVar(u"hatching", true);
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->PlayEffect(2260, u"rebuild_medium", "WakeUpFX1");

8
dScripts/02_server/Map/FV/FvCandle.cpp
View File

@@ -6,7 +6,7 @@
std::vector<int32_t> FvCandle::m_Missions = { 850, 1431, 1529, 1566, 1603 };
void FvCandle::OnStartup(Entity* self) {
auto* render = static_cast<RenderComponent*>(self->GetComponent(eReplicaComponentType::RENDER));
auto render = self->GetComponent<RenderComponent>();
if (render == nullptr)
return;
@@ -23,11 +23,11 @@ void FvCandle::BlowOutCandle(Entity* self, Entity* blower) {
if (self->GetBoolean(u"AmHit"))
return;
auto* render = static_cast<RenderComponent*>(self->GetComponent(eReplicaComponentType::RENDER));
auto render = self->GetComponent<RenderComponent>();
if (render == nullptr)
return;
auto* missionComponent = blower->GetComponent<MissionComponent>();
auto missionComponent = blower->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
for (const auto mission : m_Missions) {
@@ -47,7 +47,7 @@ void FvCandle::BlowOutCandle(Entity* self, Entity* blower) {
void FvCandle::OnTimerDone(Entity* self, std::string timerName) {
self->SetBoolean(u"AmHit", false);
auto* render = static_cast<RenderComponent*>(self->GetComponent(eReplicaComponentType::RENDER));
auto render = self->GetComponent<RenderComponent>();
if (render == nullptr)
return;

2
dScripts/02_server/Map/FV/FvHorsemenTrigger.cpp
View File

@@ -39,7 +39,7 @@ FvHorsemenTrigger::OnFireEventServerSide(Entity* self, Entity* sender, std::stri
continue;
}
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent == nullptr) {
continue;

14
dScripts/02_server/Map/FV/ImgBrickConsoleQB.cpp
View File

@@ -19,7 +19,7 @@ void ImgBrickConsoleQB::OnStartup(Entity* self) {
}
void ImgBrickConsoleQB::OnUse(Entity* self, Entity* user) {
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent->GetState() == eRebuildState::COMPLETED) {
if (!self->GetNetworkVar<bool>(u"used")) {
@@ -28,7 +28,7 @@ void ImgBrickConsoleQB::OnUse(Entity* self, Entity* user) {
auto bothBuilt = false;
for (auto* console : consoles) {
auto* consoleRebuildComponent = console->GetComponent<RebuildComponent>();
auto consoleRebuildComponent = console->GetComponent<RebuildComponent>();
if (consoleRebuildComponent->GetState() != eRebuildState::COMPLETED) {
continue;
@@ -69,8 +69,8 @@ void ImgBrickConsoleQB::OnUse(Entity* self, Entity* user) {
auto* player = user;
auto* missionComponent = player->GetComponent<MissionComponent>();
auto* inventoryComponent = player->GetComponent<InventoryComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
auto inventoryComponent = player->GetComponent<InventoryComponent>();
if (missionComponent != nullptr && inventoryComponent != nullptr) {
if (missionComponent->GetMissionState(1302) == eMissionState::ACTIVE) {
@@ -145,7 +145,7 @@ void ImgBrickConsoleQB::OnRebuildComplete(Entity* self, Entity* target) {
const auto consoles = EntityManager::Instance()->GetEntitiesInGroup("Console");
for (auto* console : consoles) {
auto* consoleRebuildComponent = console->GetComponent<RebuildComponent>();
auto consoleRebuildComponent = console->GetComponent<RebuildComponent>();
if (consoleRebuildComponent->GetState() != eRebuildState::COMPLETED) {
continue;
@@ -166,7 +166,7 @@ void ImgBrickConsoleQB::OnDie(Entity* self, Entity* killer) {
self->SetVar(u"Died", true);
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent->GetState() == eRebuildState::COMPLETED) {
auto offFX = 0;
@@ -227,7 +227,7 @@ void ImgBrickConsoleQB::OnDie(Entity* self, Entity* killer) {
void ImgBrickConsoleQB::OnTimerDone(Entity* self, std::string timerName) {
if (timerName == "reset") {
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent->GetState() == eRebuildState::OPEN) {
self->Smash(self->GetObjectID(), eKillType::SILENT);

6
dScripts/02_server/Map/FV/Racing/RaceMaelstromGeiser.cpp
View File

@@ -23,7 +23,7 @@ void RaceMaelstromGeiser::OnProximityUpdate(Entity* self, Entity* entering, std:
return;
}
auto* possessableComponent = entering->GetComponent<PossessableComponent>();
auto possessableComponent = entering->GetComponent<PossessableComponent>();
Entity* vehicle;
Entity* player;
@@ -37,7 +37,7 @@ void RaceMaelstromGeiser::OnProximityUpdate(Entity* self, Entity* entering, std:
vehicle = entering;
} else if (entering->IsPlayer()) {
auto* possessorComponent = entering->GetComponent<PossessorComponent>();
auto possessorComponent = entering->GetComponent<PossessorComponent>();
if (possessorComponent == nullptr) {
return;
@@ -59,7 +59,7 @@ void RaceMaelstromGeiser::OnProximityUpdate(Entity* self, Entity* entering, std:
auto* zoneController = dZoneManager::Instance()->GetZoneControlObject();
auto* racingControlComponent = zoneController->GetComponent<RacingControlComponent>();
auto racingControlComponent = zoneController->GetComponent<RacingControlComponent>();
if (racingControlComponent != nullptr) {
racingControlComponent->OnRequestDie(player);

2
dScripts/02_server/Map/GF/GfCaptainsCannon.cpp
View File

@@ -75,7 +75,7 @@ void GfCaptainsCannon::OnTimerDone(Entity* self, std::string timerName) {
GameMessages::SendStopFXEffect(player, true, "hook");
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->ForceProgress(601, 910, 1);

6
dScripts/02_server/Map/GF/GfTikiTorch.cpp
View File

@@ -45,7 +45,7 @@ void GfTikiTorch::OnTimerDone(Entity* self, std::string timerName) {
}
void GfTikiTorch::LightTorch(Entity* self) {
auto* renderComponent = static_cast<RenderComponent*>(self->GetComponent(eReplicaComponentType::RENDER));
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent == nullptr)
return;
@@ -59,14 +59,14 @@ void GfTikiTorch::OnSkillEventFired(Entity* self, Entity* caster, const std::str
if (self->GetBoolean(u"isBurning") && message == "waterspray") {
RenderComponent::PlayAnimation(self, u"water");
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->StopEffect("tikitorch");
renderComponent->PlayEffect(611, u"water", "water");
renderComponent->PlayEffect(611, u"steam", "steam");
}
auto* casterMissionComponent = caster->GetComponent<MissionComponent>();
auto casterMissionComponent = caster->GetComponent<MissionComponent>();
if (casterMissionComponent != nullptr) {
for (const auto missionID : m_missions) {
casterMissionComponent->ForceProgressTaskType(missionID, static_cast<uint32_t>(eMissionTaskType::SCRIPT), 1);

4
dScripts/02_server/Map/GF/MastTeleport.cpp
View File

@@ -23,7 +23,7 @@ void MastTeleport::OnRebuildComplete(Entity* self, Entity* target) {
GameMessages::SendSetStunned(target->GetObjectID(), eStateChangeType::PUSH, target->GetSystemAddress(),
LWOOBJID_EMPTY, true, true, true, true, true, true, true
);
auto* destroyableComponent = target->GetComponent<DestroyableComponent>();
auto destroyableComponent = target->GetComponent<DestroyableComponent>();
if (destroyableComponent) destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, true, true, true, true, true, false, false, true, true);
self->AddTimer("Start", 3);
@@ -94,7 +94,7 @@ void MastTeleport::OnTimerDone(Entity* self, std::string timerName) {
GameMessages::SendSetStunned(playerId, eStateChangeType::POP, player->GetSystemAddress(),
LWOOBJID_EMPTY, true, true, true, true, true, true, true
);
auto* destroyableComponent = player->GetComponent<DestroyableComponent>();
auto destroyableComponent = player->GetComponent<DestroyableComponent>();
if (destroyableComponent) destroyableComponent->SetStatusImmunity(eStateChangeType::POP, true, true, true, true, true, false, false, true, true);
EntityManager::Instance()->SerializeEntity(player);
}

8
dScripts/02_server/Map/General/ExplodingAsset.cpp
View File

@@ -24,7 +24,7 @@ void ExplodingAsset::OnHit(Entity* self, Entity* attacker) {
if (en->GetObjectID() == attacker->GetObjectID()) {
if (Vector3::DistanceSquared(en->GetPosition(), self->GetPosition()) > 10 * 10) continue;
auto* destroyable = en->GetComponent<DestroyableComponent>();
auto destroyable = en->GetComponent<DestroyableComponent>();
if (destroyable == nullptr) {
continue;
}
@@ -40,7 +40,7 @@ void ExplodingAsset::OnHit(Entity* self, Entity* attacker) {
GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(self, u"camshake", self->GetObjectID(), 16);
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(147, 4721, LWOOBJID_EMPTY, true);
}
@@ -49,7 +49,7 @@ void ExplodingAsset::OnHit(Entity* self, Entity* attacker) {
auto achievementIDs = self->GetVar<std::u16string>(u"achieveID");
// Progress all scripted missions related to this asset
auto* missionComponent = attacker->GetComponent<MissionComponent>();
auto missionComponent = attacker->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
if (missionID != 0) {
missionComponent->ForceProgressValue(missionID,
@@ -70,7 +70,7 @@ void ExplodingAsset::OnHit(Entity* self, Entity* attacker) {
}
void ExplodingAsset::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) {
auto* destuctableComponent = entering->GetComponent<DestroyableComponent>();
auto destuctableComponent = entering->GetComponent<DestroyableComponent>();
if (destuctableComponent == nullptr) return;

2
dScripts/02_server/Map/General/ForceVolumeServer.cpp
View File

@@ -4,7 +4,7 @@
#include "ePhysicsEffectType.h"
void ForceVolumeServer::OnStartup(Entity* self) {
auto* phantomPhysicsComponent = self->GetComponent<PhantomPhysicsComponent>();
auto phantomPhysicsComponent = self->GetComponent<PhantomPhysicsComponent>();
if (phantomPhysicsComponent == nullptr) return;

2
dScripts/02_server/Map/General/GrowingFlower.cpp
View File

@@ -15,7 +15,7 @@ void GrowingFlower::OnSkillEventFired(Entity* self, Entity* target, const std::s
LootGenerator::Instance().DropActivityLoot(target, self, self->GetLOT(), 0);
auto* missionComponent = target->GetComponent<MissionComponent>();
auto missionComponent = target->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
for (const auto mission : achievementIDs)
missionComponent->ForceProgressTaskType(mission, static_cast<uint32_t>(eMissionTaskType::SCRIPT), 1);

2
dScripts/02_server/Map/General/ImaginationBackpackHealServer.cpp
View File

@@ -12,7 +12,7 @@ void ImaginationBackpackHealServer::OnSkillEventFired(Entity* self, Entity* cast
if (healMission == 0)
return;
auto* missionComponent = caster->GetComponent<MissionComponent>();
auto missionComponent = caster->GetComponent<MissionComponent>();
if (missionComponent != nullptr && missionComponent->GetMissionState(healMission) == eMissionState::ACTIVE) {
missionComponent->Progress(eMissionTaskType::SCRIPT, self->GetLOT());
GameMessages::SendNotifyClientObject(self->GetObjectID(), u"ClearMaelstrom", 0, 0,

2
dScripts/02_server/Map/General/Ninjago/NjRailActivatorsServer.cpp
View File

@@ -4,7 +4,7 @@
void NjRailActivatorsServer::OnUse(Entity* self, Entity* user) {
const auto flag = self->GetVar<int32_t>(u"RailFlagNum");
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
// Only allow use if this is not a quick build or the quick build is built
if (rebuildComponent == nullptr || rebuildComponent->GetState() == eRebuildState::COMPLETED) {

2
dScripts/02_server/Map/General/Ninjago/NjRailPostServer.cpp
View File

@@ -3,7 +3,7 @@
#include "EntityManager.h"
void NjRailPostServer::OnStartup(Entity* self) {
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent != nullptr) {
self->SetNetworkVar<bool>(NetworkNotActiveVariable, true);
}

6
dScripts/02_server/Map/General/PetDigServer.cpp
View File

@@ -125,7 +125,7 @@ void PetDigServer::HandleXBuildDig(const Entity* self, Entity* owner, Entity* pe
// If the player doesn't have the flag yet
if (playerFlag != 0 && !player->GetPlayerFlag(playerFlag)) {
auto* petComponent = pet->GetComponent<PetComponent>();
auto petComponent = pet->GetComponent<PetComponent>();
if (petComponent != nullptr) {
// TODO: Pet state = 9 ??
}
@@ -159,7 +159,7 @@ void PetDigServer::HandleBouncerDig(const Entity* self, const Entity* owner) {
* \param owner the owner that just made a pet dig something up
*/
void PetDigServer::ProgressPetDigMissions(const Entity* owner, const Entity* chest) {
auto* missionComponent = owner->GetComponent<MissionComponent>();
auto missionComponent = owner->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
// Can You Dig It progress
@@ -193,7 +193,7 @@ void PetDigServer::ProgressPetDigMissions(const Entity* owner, const Entity* che
void PetDigServer::SpawnPet(Entity* self, const Entity* owner, const DigInfo digInfo) {
// Some treasures require a mission to be active
if (digInfo.requiredMission >= 0) {
auto* missionComponent = owner->GetComponent<MissionComponent>();
auto missionComponent = owner->GetComponent<MissionComponent>();
if (missionComponent != nullptr && missionComponent->GetMissionState(digInfo.requiredMission) < eMissionState::ACTIVE) {
return;
}

2
dScripts/02_server/Map/General/PropertyDevice.cpp
View File

@@ -16,7 +16,7 @@ void PropertyDevice::OnRebuildComplete(Entity* self, Entity* target) {
if (propertyOwnerID == std::to_string(LWOOBJID_EMPTY))
return;
auto* missionComponent = target->GetComponent<MissionComponent>();
auto missionComponent = target->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
if (missionComponent->GetMissionState(m_PropertyMissionID) == eMissionState::ACTIVE) {
GameMessages::SendPlayFXEffect(self->GetObjectID(), 641, u"create", "callhome");

6
dScripts/02_server/Map/General/PropertyPlatform.cpp
View File

@@ -4,7 +4,7 @@
#include "MovingPlatformComponent.h"
void PropertyPlatform::OnRebuildComplete(Entity* self, Entity* target) {
// auto* movingPlatform = self->GetComponent<MovingPlatformComponent>();
// auto movingPlatform = self->GetComponent<MovingPlatformComponent>();
// if (movingPlatform != nullptr) {
// movingPlatform->StopPathing();
// movingPlatform->SetNoAutoStart(true);
@@ -14,9 +14,9 @@ void PropertyPlatform::OnRebuildComplete(Entity* self, Entity* target) {
}
void PropertyPlatform::OnUse(Entity* self, Entity* user) {
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent != nullptr && rebuildComponent->GetState() == eRebuildState::COMPLETED) {
// auto* movingPlatform = self->GetComponent<MovingPlatformComponent>();
// auto movingPlatform = self->GetComponent<MovingPlatformComponent>();
// if (movingPlatform != nullptr) {
// movingPlatform->GotoWaypoint(1);
// }

4
dScripts/02_server/Map/General/QbEnemyStunner.cpp
View File

@@ -7,7 +7,7 @@
#include "CDSkillBehaviorTable.h"
void QbEnemyStunner::OnRebuildComplete(Entity* self, Entity* target) {
auto* destroyable = self->GetComponent<DestroyableComponent>();
auto destroyable = self->GetComponent<DestroyableComponent>();
if (destroyable != nullptr) {
destroyable->SetFaction(115);
@@ -51,7 +51,7 @@ void QbEnemyStunner::OnTimerDone(Entity* self, std::string timerName) {
self->AddTimer("DieTime", 5.0f);
} else if (timerName == "TickTime") {
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
auto skillBehaviorMap = self->GetVar<std::map<uint32_t, uint32_t>>(u"skillBehaviorMap");

4
dScripts/02_server/Map/General/QbSpawner.cpp
View File

@@ -115,14 +115,14 @@ void QbSpawner::OnChildRemoved(Entity* self, Entity* child) {
}
void QbSpawner::AggroTargetObject(Entity* self, Entity* enemy) {
auto* baseCombatAIComponent = enemy->GetComponent<BaseCombatAIComponent>();
auto baseCombatAIComponent = enemy->GetComponent<BaseCombatAIComponent>();
if (!baseCombatAIComponent) return;
auto gateObjID = self->GetVar<LWOOBJID>(u"gateObj");
if (gateObjID) {
auto* gate = EntityManager::Instance()->GetEntity(gateObjID);
if (gate) {
auto* movementAIComponent = enemy->GetComponent<MovementAIComponent>();
auto movementAIComponent = enemy->GetComponent<MovementAIComponent>();
if (movementAIComponent) movementAIComponent->SetDestination(gate->GetPosition());
baseCombatAIComponent->Taunt(gateObjID, 1000);
}

2
dScripts/02_server/Map/General/TokenConsoleServer.cpp
View File

@@ -9,7 +9,7 @@
//2021-05-03 - max - added script, omitted some parts related to inheritance in lua which we don't need
void TokenConsoleServer::OnUse(Entity* self, Entity* user) {
auto* inv = static_cast<InventoryComponent*>(user->GetComponent(eReplicaComponentType::INVENTORY));
auto inv = user->GetComponent<InventoryComponent>();
//make sure the user has the required amount of infected bricks
if (inv && inv->GetLotCount(6194) >= bricksToTake) {

2
dScripts/02_server/Map/General/TouchMissionUpdateServer.cpp
View File

@@ -17,7 +17,7 @@ void TouchMissionUpdateServer::OnCollisionPhantom(Entity* self, Entity* target)
return;
}
auto* missionComponent = static_cast<MissionComponent*>(target->GetComponent(eReplicaComponentType::MISSION));
auto missionComponent = target->GetComponent<MissionComponent>();
if (missionComponent == nullptr) {
return;

2
dScripts/02_server/Map/General/WishingWellServer.cpp
View File

@@ -9,7 +9,7 @@ void WishingWellServer::OnStartup(Entity* self) {
}
void WishingWellServer::OnUse(Entity* self, Entity* user) {
auto* scriptedActivity = self->GetComponent<ScriptedActivityComponent>();
auto scriptedActivity = self->GetComponent<ScriptedActivityComponent>();
if (!scriptedActivity->TakeCost(user)) {
return;

6
dScripts/02_server/Map/NS/NsTokenConsoleServer.cpp
View File

@@ -12,7 +12,7 @@ void NsTokenConsoleServer::OnStartup(Entity* self) {
}
void NsTokenConsoleServer::OnUse(Entity* self, Entity* user) {
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent == nullptr) {
return;
@@ -22,8 +22,8 @@ void NsTokenConsoleServer::OnUse(Entity* self, Entity* user) {
return;
}
auto* inventoryComponent = user->GetComponent<InventoryComponent>();
auto* missionComponent = user->GetComponent<MissionComponent>();
auto inventoryComponent = user->GetComponent<InventoryComponent>();
auto missionComponent = user->GetComponent<MissionComponent>();
auto* character = user->GetCharacter();
if (inventoryComponent == nullptr || missionComponent == nullptr || character == nullptr) {

2
dScripts/02_server/Map/NT/NtAssemblyTubeServer.cpp
View File

@@ -24,7 +24,7 @@ void NtAssemblyTubeServer::OnProximityUpdate(Entity* self, Entity* entering, std
RunAssemblyTube(self, player);
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->Progress(eMissionTaskType::SCRIPT, self->GetLOT());

4
dScripts/02_server/Map/NT/NtCombatChallengeServer.cpp
View File

@@ -48,7 +48,7 @@ void NtCombatChallengeServer::OnMessageBoxResponse(Entity* self, Entity* sender,
self->SetVar(u"playerID", sender->GetObjectID());
auto* inventoryComponent = sender->GetComponent<InventoryComponent>();
auto inventoryComponent = sender->GetComponent<InventoryComponent>();
if (inventoryComponent != nullptr) {
inventoryComponent->RemoveItem(3039, 1);
@@ -133,7 +133,7 @@ void NtCombatChallengeServer::ResetGame(Entity* self) {
auto* player = EntityManager::Instance()->GetEntity(playerID);
if (player != nullptr) {
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
for (const auto& mission : tMissions) {

2
dScripts/02_server/Map/NT/NtDarkitectRevealServer.cpp
View File

@@ -6,7 +6,7 @@ void NtDarkitectRevealServer::OnUse(Entity* self, Entity* user) {
Darkitect Baron;
Baron.Reveal(self, user);
auto* missionComponent = user->GetComponent<MissionComponent>();
auto missionComponent = user->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->ForceProgressTaskType(1344, 1, 14293);

2
dScripts/02_server/Map/NT/NtDirtCloudServer.cpp
View File

@@ -30,7 +30,7 @@ void NtDirtCloudServer::OnSkillEventFired(Entity* self, Entity* caster, const st
const auto& myMis = m_Missions[mySpawner];
auto* missionComponent = caster->GetComponent<MissionComponent>();
auto missionComponent = caster->GetComponent<MissionComponent>();
if (missionComponent == nullptr) {
return;

4
dScripts/02_server/Map/NT/NtDukeServer.cpp
View File

@@ -24,8 +24,8 @@ void NtDukeServer::SetVariables(Entity* self) {
void NtDukeServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) {
// Handles adding and removing the sword for the Crux Prime Sword mission
auto* missionComponent = target->GetComponent<MissionComponent>();
auto* inventoryComponent = target->GetComponent<InventoryComponent>();
auto missionComponent = target->GetComponent<MissionComponent>();
auto inventoryComponent = target->GetComponent<InventoryComponent>();
if (missionComponent != nullptr && inventoryComponent != nullptr) {
auto state = missionComponent->GetMissionState(m_SwordMissionID);

2
dScripts/02_server/Map/NT/NtImagBeamBuffer.cpp
View File

@@ -33,7 +33,7 @@ void NtImagBeamBuffer::OnTimerDone(Entity* self, std::string timerName) {
return;
}
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;

2
dScripts/02_server/Map/NT/NtParadoxPanelServer.cpp
View File

@@ -15,7 +15,7 @@ void NtParadoxPanelServer::OnUse(Entity* self, Entity* user) {
self->SetVar(u"bActive", true);
auto* missionComponent = user->GetComponent<MissionComponent>();
auto missionComponent = user->GetComponent<MissionComponent>();
const auto playerID = user->GetObjectID();

2
dScripts/02_server/Map/NT/NtParadoxTeleServer.cpp
View File

@@ -43,7 +43,7 @@ void NtParadoxTeleServer::OnProximityUpdate(Entity* self, Entity* entering, std:
});
}
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->Progress(eMissionTaskType::SCRIPT, self->GetLOT());

4
dScripts/02_server/Map/NT/NtSentinelWalkwayServer.cpp
View File

@@ -6,7 +6,7 @@
#include "ePhysicsEffectType.h"
void NtSentinelWalkwayServer::OnStartup(Entity* self) {
auto* phantomPhysicsComponent = self->GetComponent<PhantomPhysicsComponent>();
auto phantomPhysicsComponent = self->GetComponent<PhantomPhysicsComponent>();
if (phantomPhysicsComponent == nullptr) {
return;
@@ -37,7 +37,7 @@ void NtSentinelWalkwayServer::OnProximityUpdate(Entity* self, Entity* entering,
auto* player = entering;
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->Progress(eMissionTaskType::SCRIPT, self->GetLOT());

2
dScripts/02_server/Map/NT/NtSleepingGuard.cpp
View File

@@ -20,7 +20,7 @@ void NtSleepingGuard::OnEmoteReceived(Entity* self, const int32_t emote, Entity*
RenderComponent::PlayAnimation(self, u"greet");
auto* missionComponent = target->GetComponent<MissionComponent>();
auto missionComponent = target->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->CompleteMission(1346);

2
dScripts/02_server/Map/NT/NtVandaServer.cpp
View File

@@ -6,7 +6,7 @@ void NtVandaServer::OnMissionDialogueOK(Entity* self, Entity* target, int missio
// Removes the alien parts after completing the mission
if (missionID == m_AlienPartMissionID && missionState == eMissionState::READY_TO_COMPLETE) {
auto* inventoryComponent = target->GetComponent<InventoryComponent>();
auto inventoryComponent = target->GetComponent<InventoryComponent>();
for (const auto& alienPartLot : m_AlienPartLots) {
inventoryComponent->RemoveItem(alienPartLot, 1);
}

4
dScripts/02_server/Map/NT/NtVentureSpeedPadServer.cpp
View File

@@ -15,13 +15,13 @@ void NtVentureSpeedPadServer::OnProximityUpdate(Entity* self, Entity* entering,
auto* player = entering;
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->Progress(eMissionTaskType::SCRIPT, self->GetLOT());
}
auto* skillComponent = player->GetComponent<SkillComponent>();
auto skillComponent = player->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(927, 18913, player->GetObjectID(), true);

2
dScripts/02_server/Map/NT/NtXRayServer.cpp
View File

@@ -2,7 +2,7 @@
#include "SkillComponent.h"
void NtXRayServer::OnCollisionPhantom(Entity* self, Entity* target) {
auto* skillComponent = target->GetComponent<SkillComponent>();
auto skillComponent = target->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;

4
dScripts/02_server/Map/PR/SpawnGryphonServer.cpp
View File

@@ -14,8 +14,8 @@ void SpawnGryphonServer::SetVariables(Entity* self) {
}
void SpawnGryphonServer::OnUse(Entity* self, Entity* user) {
auto* missionComponent = user->GetComponent<MissionComponent>();
auto* inventoryComponent = user->GetComponent<InventoryComponent>();
auto missionComponent = user->GetComponent<MissionComponent>();
auto inventoryComponent = user->GetComponent<InventoryComponent>();
// Little extra for handling the case of the egg being placed the first time
if (missionComponent != nullptr && inventoryComponent != nullptr

4
dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.cpp
View File

@@ -15,7 +15,7 @@ void EnemySpiderSpawner::OnFireEventServerSide(Entity* self, Entity* sender, std
GameMessages::SendPlayFXEffect(self->GetObjectID(), 2856, u"maelstrom", "test", LWOOBJID_EMPTY, 1.0f, 1.0f, true);
// Make indestructible
auto dest = static_cast<DestroyableComponent*>(self->GetComponent(eReplicaComponentType::DESTROYABLE));
auto dest = self->GetComponent<DestroyableComponent>();
if (dest) {
dest->SetFaction(-1);
}
@@ -54,7 +54,7 @@ void EnemySpiderSpawner::OnTimerDone(Entity* self, std::string timerName) {
newEntity->GetGroups().push_back("BabySpider");
/*
auto* movementAi = newEntity->GetComponent<MovementAIComponent>();
auto movementAi = newEntity->GetComponent<MovementAIComponent>();
movementAi->SetDestination(newEntity->GetPosition());
*/

14
dScripts/02_server/Map/Property/AG_Small/ZoneAgProperty.cpp
View File

@@ -75,7 +75,7 @@ void ZoneAgProperty::OnPlayerLoaded(Entity* self, Entity* player) {
}
void ZoneAgProperty::PropGuardCheck(Entity* self, Entity* player) {
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent == nullptr)
return;
@@ -211,7 +211,7 @@ void ZoneAgProperty::BaseTimerDone(Entity* self, const std::string& timerName) {
KillGuard(self);
} else if (timerName == "tornadoOff") {
for (auto* entity : EntityManager::Instance()->GetEntitiesInGroup(self->GetVar<std::string>(FXManagerGroup))) {
auto* renderComponent = entity->GetComponent<RenderComponent>();
auto renderComponent = entity->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->StopEffect("TornadoDebris", false);
renderComponent->StopEffect("TornadoVortex", false);
@@ -223,7 +223,7 @@ void ZoneAgProperty::BaseTimerDone(Entity* self, const std::string& timerName) {
self->AddTimer("ShowClearEffects", 2);
} else if (timerName == "ShowClearEffects") {
for (auto* entity : EntityManager::Instance()->GetEntitiesInGroup(self->GetVar<std::string>(FXManagerGroup))) {
auto* renderComponent = entity->GetComponent<RenderComponent>();
auto renderComponent = entity->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->PlayEffect(-1, u"beamOn", "beam");
}
@@ -275,7 +275,7 @@ void ZoneAgProperty::BaseTimerDone(Entity* self, const std::string& timerName) {
StartTornadoFx(self);
} else if (timerName == "killFXObject") {
for (auto* entity : EntityManager::Instance()->GetEntitiesInGroup(self->GetVar<std::string>(FXManagerGroup))) {
auto* renderComponent = entity->GetComponent<RenderComponent>();
auto renderComponent = entity->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->StopEffect("beam");
}
@@ -301,7 +301,7 @@ void ZoneAgProperty::OnZonePropertyRented(Entity* self, Entity* player) {
void ZoneAgProperty::OnZonePropertyModelPlaced(Entity* self, Entity* player) {
auto* character = player->GetCharacter();
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (!character->GetPlayerFlag(101)) {
BaseZonePropertyModelPlaced(self, player);
@@ -329,7 +329,7 @@ void ZoneAgProperty::OnZonePropertyModelPlaced(Entity* self, Entity* player) {
void ZoneAgProperty::OnZonePropertyModelPickedUp(Entity* self, Entity* player) {
auto* character = player->GetCharacter();
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (!character->GetPlayerFlag(109)) {
character->SetPlayerFlag(109, true);
@@ -350,7 +350,7 @@ void ZoneAgProperty::OnZonePropertyModelRemovedWhileEquipped(Entity* self, Entit
void ZoneAgProperty::OnZonePropertyModelRotated(Entity* self, Entity* player) {
auto* character = player->GetCharacter();
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (!character->GetPlayerFlag(110)) {
character->SetPlayerFlag(110, true);

2
dScripts/02_server/Map/SS/SsModularBuildServer.cpp
View File

@@ -7,7 +7,7 @@ void SsModularBuildServer::OnModularBuildExit(Entity* self, Entity* player, bool
int missionNum = 1732;
if (bCompleted) {
MissionComponent* mission = static_cast<MissionComponent*>(player->GetComponent(eReplicaComponentType::MISSION));
auto mission = self->GetComponent<MissionComponent>();
Mission* rocketMission = mission->GetMission(missionNum);
if (rocketMission->GetMissionState() == eMissionState::ACTIVE) {

4
dScripts/02_server/Map/VE/VeBricksampleServer.cpp
View File

@@ -6,10 +6,10 @@
#include "eMissionState.h"
void VeBricksampleServer::OnUse(Entity* self, Entity* user) {
auto* missionComponent = user->GetComponent<MissionComponent>();
auto missionComponent = user->GetComponent<MissionComponent>();
if (missionComponent != nullptr && missionComponent->GetMissionState(1183) == eMissionState::ACTIVE) {
const auto loot = self->GetVar<int32_t>(m_LootVariable);
auto* inventoryComponent = user->GetComponent<InventoryComponent>();
auto inventoryComponent = user->GetComponent<InventoryComponent>();
if (loot && inventoryComponent != nullptr && inventoryComponent->GetLotCount(loot) == 0) {
inventoryComponent->AddItem(loot, 1, eLootSourceType::ACTIVITY);

2
dScripts/02_server/Map/VE/VeMissionConsole.cpp
View File

@@ -8,7 +8,7 @@
void VeMissionConsole::OnUse(Entity* self, Entity* user) {
LootGenerator::Instance().DropActivityLoot(user, self, 12551);
auto* inventoryComponent = user->GetComponent<InventoryComponent>();
auto inventoryComponent = user->GetComponent<InventoryComponent>();
if (inventoryComponent != nullptr) {
inventoryComponent->AddItem(12547, 1, eLootSourceType::ACTIVITY); // Add the panel required for pickup
}

2
dScripts/02_server/Map/njhub/BurningTile.cpp
View File

@@ -3,7 +3,7 @@
void BurningTile::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) {
if (args == "PlayerEntered") {
auto* skillComponent = sender->GetComponent<SkillComponent>();
auto skillComponent = sender->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;

2
dScripts/02_server/Map/njhub/CavePrisonCage.cpp
View File

@@ -68,7 +68,7 @@ void CavePrisonCage::SpawnCounterweight(Entity* self, Spawner* spawner) {
self->SetVar<LWOOBJID>(u"Counterweight", counterweight->GetObjectID());
auto* rebuildComponent = counterweight->GetComponent<RebuildComponent>();
auto rebuildComponent = counterweight->GetComponent<RebuildComponent>();
if (rebuildComponent != nullptr) {
rebuildComponent->AddRebuildStateCallback([this, self](eRebuildState state) {

8
dScripts/02_server/Map/njhub/EnemySkeletonSpawner.cpp
View File

@@ -7,7 +7,7 @@
void EnemySkeletonSpawner::OnStartup(Entity* self) {
self->SetProximityRadius(15, "ronin");
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(1127, 24812, LWOOBJID_EMPTY, true);
@@ -16,7 +16,7 @@ void EnemySkeletonSpawner::OnStartup(Entity* self) {
void EnemySkeletonSpawner::OnTimerDone(Entity* self, std::string timerName) {
if (timerName == "hatchTime") {
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->PlayEffect(644, u"create", "BurstFX1");
@@ -48,7 +48,7 @@ void EnemySkeletonSpawner::OnProximityUpdate(Entity* self, Entity* entering, std
if (entering->IsPlayer() && name == "ronin" && status == "ENTER" && !self->GetVar<bool>(u"hatching")) {
StartHatching(self);
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(305, 3568, LWOOBJID_EMPTY);
@@ -65,7 +65,7 @@ void EnemySkeletonSpawner::OnHit(Entity* self, Entity* attacker) {
void EnemySkeletonSpawner::StartHatching(Entity* self) {
self->SetVar(u"hatching", true);
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->PlayEffect(9017, u"cast", "WakeUpFX1");

4
dScripts/02_server/Map/njhub/FallingTile.cpp
View File

@@ -3,7 +3,7 @@
#include "GameMessages.h"
void FallingTile::OnStartup(Entity* self) {
auto* movingPlatfromComponent = self->GetComponent<MovingPlatformComponent>();
auto movingPlatfromComponent = self->GetComponent<MovingPlatformComponent>();
if (movingPlatfromComponent == nullptr) {
return;
@@ -31,7 +31,7 @@ void FallingTile::OnWaypointReached(Entity* self, uint32_t waypointIndex) {
}
void FallingTile::OnTimerDone(Entity* self, std::string timerName) {
auto* movingPlatfromComponent = self->GetComponent<MovingPlatformComponent>();
auto movingPlatfromComponent = self->GetComponent<MovingPlatformComponent>();
if (movingPlatfromComponent == nullptr) {
return;

2
dScripts/02_server/Map/njhub/FlameJetServer.cpp
View File

@@ -19,7 +19,7 @@ void FlameJetServer::OnCollisionPhantom(Entity* self, Entity* target) {
return;
}
auto* skillComponent = target->GetComponent<SkillComponent>();
auto skillComponent = target->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;

2
dScripts/02_server/Map/njhub/ImaginationShrineServer.cpp
View File

@@ -3,7 +3,7 @@
void ImaginationShrineServer::OnUse(Entity* self, Entity* user) {
// If the rebuild component is complete, use the shrine
auto* rebuildComponent = self->GetComponent<RebuildComponent>();
auto rebuildComponent = self->GetComponent<RebuildComponent>();
if (rebuildComponent == nullptr) {
return;

2
dScripts/02_server/Map/njhub/Lieutenant.cpp
View File

@@ -3,7 +3,7 @@
#include "dZoneManager.h"
void Lieutenant::OnStartup(Entity* self) {
auto* skillComponent = self->GetComponent<SkillComponent>();
auto skillComponent = self->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;

8
dScripts/02_server/Map/njhub/NjColeNPC.cpp
View File

@@ -8,7 +8,7 @@ void NjColeNPC::OnEmoteReceived(Entity* self, int32_t emote, Entity* target) {
return;
}
auto* inventoryComponent = target->GetComponent<InventoryComponent>();
auto inventoryComponent = target->GetComponent<InventoryComponent>();
if (inventoryComponent == nullptr) {
return;
@@ -18,7 +18,7 @@ void NjColeNPC::OnEmoteReceived(Entity* self, int32_t emote, Entity* target) {
return;
}
auto* missionComponent = target->GetComponent<MissionComponent>();
auto missionComponent = target->GetComponent<MissionComponent>();
if (missionComponent == nullptr) {
return;
@@ -31,8 +31,8 @@ void NjColeNPC::OnMissionDialogueOK(Entity* self, Entity* target, int missionID,
NjNPCMissionSpinjitzuServer::OnMissionDialogueOK(self, target, missionID, missionState);
if (missionID == 1818 && missionState >= eMissionState::READY_TO_COMPLETE) {
auto* missionComponent = target->GetComponent<MissionComponent>();
auto* inventoryComponent = target->GetComponent<InventoryComponent>();
auto missionComponent = target->GetComponent<MissionComponent>();
auto inventoryComponent = target->GetComponent<InventoryComponent>();
if (missionComponent == nullptr || inventoryComponent == nullptr) {
return;

2
dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.cpp
View File

@@ -12,7 +12,7 @@ void NjDragonEmblemChestServer::OnUse(Entity* self, Entity* user) {
character->SetPlayerFlag(ePlayerFlag::NJ_WU_SHOW_DAILY_CHEST, false);
}
auto* destroyable = self->GetComponent<DestroyableComponent>();
auto destroyable = self->GetComponent<DestroyableComponent>();
if (destroyable != nullptr) {
LootGenerator::Instance().DropLoot(user, self, destroyable->GetLootMatrixID(), 0, 0);
}

2
dScripts/02_server/Map/njhub/NjEarthPetServer.cpp
View File

@@ -2,7 +2,7 @@
#include "PetComponent.h"
void NjEarthPetServer::OnStartup(Entity* self) {
auto* petComponent = self->GetComponent<PetComponent>();
auto petComponent = self->GetComponent<PetComponent>();
if (petComponent == nullptr || petComponent->GetOwnerId() != LWOOBJID_EMPTY)
return;

2
dScripts/02_server/Map/njhub/NjScrollChestServer.cpp
View File

@@ -5,7 +5,7 @@ void NjScrollChestServer::OnUse(Entity* self, Entity* user) {
const auto keyLOT = self->GetVar<LOT>(u"KeyNum");
const auto rewardItemLOT = self->GetVar<LOT>(u"openItemID");
auto* playerInventory = user->GetComponent<InventoryComponent>();
auto playerInventory = user->GetComponent<InventoryComponent>();
if (playerInventory != nullptr && playerInventory->GetLotCount(keyLOT) == 1) {
// Check for the key and remove

2
dScripts/02_server/Map/njhub/NjWuNPC.cpp
View File

@@ -11,7 +11,7 @@ void NjWuNPC::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, e
// The Dragon statue daily mission
if (missionID == m_MainDragonMissionID) {
auto* character = target->GetCharacter();
auto* missionComponent = target->GetComponent<MissionComponent>();
auto missionComponent = target->GetComponent<MissionComponent>();
if (character == nullptr || missionComponent == nullptr)
return;

2
dScripts/02_server/Map/njhub/RainOfArrows.cpp
View File

@@ -43,7 +43,7 @@ void RainOfArrows::OnTimerDone(Entity* self, std::string timerName) {
return;
}
auto* skillComponent = child->GetComponent<SkillComponent>();
auto skillComponent = child->GetComponent<SkillComponent>();
if (skillComponent == nullptr) {
return;

22
dScripts/02_server/Map/njhub/boss_instance/NjMonastryBossInstance.cpp
View File

@@ -51,7 +51,7 @@ void NjMonastryBossInstance::OnPlayerLoaded(Entity* self, Entity* player) {
UpdatePlayer(self, player->GetObjectID());
// Buff the player
auto* destroyableComponent = player->GetComponent<DestroyableComponent>();
auto destroyableComponent = player->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
destroyableComponent->SetHealth((int32_t)destroyableComponent->GetMaxHealth());
destroyableComponent->SetArmor((int32_t)destroyableComponent->GetMaxArmor());
@@ -147,7 +147,7 @@ void NjMonastryBossInstance::OnActivityTimerDone(Entity* self, const std::string
} else if (timerName + TimerSplitChar == UnstunTimer) {
auto* entity = EntityManager::Instance()->GetEntity(objectID);
if (entity != nullptr) {
auto* combatAI = entity->GetComponent<BaseCombatAIComponent>();
auto combatAI = entity->GetComponent<BaseCombatAIComponent>();
if (combatAI != nullptr) {
combatAI->SetDisabled(false);
}
@@ -221,7 +221,7 @@ void NjMonastryBossInstance::HandleLedgedFrakjawSpawned(Entity* self, Entity* le
}
void NjMonastryBossInstance::HandleCounterWeightSpawned(Entity* self, Entity* counterWeight) {
auto* rebuildComponent = counterWeight->GetComponent<RebuildComponent>();
auto rebuildComponent = counterWeight->GetComponent<RebuildComponent>();
if (rebuildComponent != nullptr) {
rebuildComponent->AddRebuildStateCallback([this, self, counterWeight](eRebuildState state) {
@@ -257,7 +257,7 @@ void NjMonastryBossInstance::HandleCounterWeightSpawned(Entity* self, Entity* co
return;
}
auto* skillComponent = frakjaw->GetComponent<SkillComponent>();
auto skillComponent = frakjaw->GetComponent<SkillComponent>();
if (skillComponent != nullptr) {
skillComponent->CalculateBehavior(1635, 39097, frakjaw->GetObjectID(), true, false);
}
@@ -285,12 +285,12 @@ void NjMonastryBossInstance::HandleLowerFrakjawSpawned(Entity* self, Entity* low
RenderComponent::PlayAnimation(lowerFrakjaw, TeleportInAnimation);
self->SetVar<LWOOBJID>(LowerFrakjawVariable, lowerFrakjaw->GetObjectID());
auto* combatAI = lowerFrakjaw->GetComponent<BaseCombatAIComponent>();
auto combatAI = lowerFrakjaw->GetComponent<BaseCombatAIComponent>();
if (combatAI != nullptr) {
combatAI->SetDisabled(true);
}
auto* destroyableComponent = lowerFrakjaw->GetComponent<DestroyableComponent>();
auto destroyableComponent = lowerFrakjaw->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
destroyableComponent->AddOnHitCallback([this, self, lowerFrakjaw](Entity* attacker) {
NjMonastryBossInstance::HandleLowerFrakjawHit(self, lowerFrakjaw, attacker);
@@ -323,7 +323,7 @@ void NjMonastryBossInstance::HandleLowerFrakjawSpawned(Entity* self, Entity* low
}
void NjMonastryBossInstance::HandleLowerFrakjawHit(Entity* self, Entity* lowerFrakjaw, Entity* attacker) {
auto* destroyableComponent = lowerFrakjaw->GetComponent<DestroyableComponent>();
auto destroyableComponent = lowerFrakjaw->GetComponent<DestroyableComponent>();
if (destroyableComponent == nullptr)
return;
@@ -332,7 +332,7 @@ void NjMonastryBossInstance::HandleLowerFrakjawHit(Entity* self, Entity* lowerFr
self->SetVar<bool>(OnLastWaveVarbiale, true);
// Stun frakjaw during the cinematic
auto* combatAI = lowerFrakjaw->GetComponent<BaseCombatAIComponent>();
auto combatAI = lowerFrakjaw->GetComponent<BaseCombatAIComponent>();
if (combatAI != nullptr) {
combatAI->SetDisabled(true);
}
@@ -347,7 +347,7 @@ void NjMonastryBossInstance::HandleLowerFrakjawHit(Entity* self, Entity* lowerFr
newTrashMobs.push_back(trashMobID);
// Stun all the enemies until the cinematic is over
auto* trashMobCombatAI = trashMob->GetComponent<BaseCombatAIComponent>();
auto trashMobCombatAI = trashMob->GetComponent<BaseCombatAIComponent>();
if (trashMobCombatAI != nullptr) {
trashMobCombatAI->SetDisabled(true);
}
@@ -375,7 +375,7 @@ void NjMonastryBossInstance::HandleWaveEnemySpawned(Entity* self, Entity* waveEn
waveEnemies.push_back(waveEnemy->GetObjectID());
self->SetVar<std::vector<LWOOBJID>>(TrashMobsAliveVariable, waveEnemies);
auto* combatAI = waveEnemy->GetComponent<BaseCombatAIComponent>();
auto combatAI = waveEnemy->GetComponent<BaseCombatAIComponent>();
if (combatAI != nullptr) {
combatAI->SetDisabled(true);
ActivityTimerStart(self, UnstunTimer + std::to_string(waveEnemy->GetObjectID()), 3.0f, 3.0f);
@@ -436,7 +436,7 @@ void NjMonastryBossInstance::RemovePoison(Entity* self) {
auto* player = EntityManager::Instance()->GetEntity(playerID);
if (player != nullptr) {
auto* buffComponent = player->GetComponent<BuffComponent>();
auto buffComponent = player->GetComponent<BuffComponent>();
if (buffComponent != nullptr) {
buffComponent->RemoveBuff(PoisonBuff);
}

4
dScripts/02_server/Minigame/General/MinigameTreasureChestServer.cpp
View File

@@ -6,7 +6,7 @@
#include "Loot.h"
void MinigameTreasureChestServer::OnUse(Entity* self, Entity* user) {
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac == nullptr)
return;
@@ -57,7 +57,7 @@ void MinigameTreasureChestServer::OnStartup(Entity* self) {
// BONS treasure chest thinks it's on FV, causing it to start a lobby
if (dZoneManager::Instance()->GetZoneID().GetMapID() == 1204) {
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac != nullptr) {
sac->SetInstanceMapID(1204);
}

24
dScripts/02_server/Pets/DamagingPets.cpp
View File

@@ -8,7 +8,7 @@
void DamagingPets::OnStartup(Entity* self) {
// Make the pet hostile or non-hostile based on whether or not it is tamed
const auto* petComponent = self->GetComponent<PetComponent>();
const auto petComponent = self->GetComponent<PetComponent>();
if (petComponent != nullptr && petComponent->GetOwner() == nullptr) {
self->AddTimer("GoEvil", 0.5f);
}
@@ -19,9 +19,9 @@ void DamagingPets::OnPlayerLoaded(Entity* self, Entity* player) {
// Makes it so that new players also see the effect
self->AddCallbackTimer(2.5f, [self]() {
if (self != nullptr) {
const auto* petComponent = self->GetComponent<PetComponent>();
const auto petComponent = self->GetComponent<PetComponent>();
if (petComponent != nullptr && petComponent->GetOwner() == nullptr && self->GetVar<bool>(u"IsEvil")) {
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
auto counter = 1;
for (const auto petEffect : GetPetInfo(self).effect) {
@@ -58,7 +58,7 @@ void DamagingPets::OnSkillEventFired(Entity* self, Entity* caster, const std::st
if (infoForPet.skill == message) {
// Only make pets tamable that aren't tamed yet
const auto* petComponent = self->GetComponent<PetComponent>();
const auto petComponent = self->GetComponent<PetComponent>();
if (petComponent != nullptr && petComponent->GetOwner() == nullptr && self->GetVar<bool>(u"IsEvil")) {
ClearEffects(self);
self->AddTimer("GoEvil", 30.0f);
@@ -74,7 +74,7 @@ void DamagingPets::OnTimerDone(Entity* self, std::string message) {
}
void DamagingPets::MakeUntamable(Entity* self) {
auto* petComponent = self->GetComponent<PetComponent>();
auto petComponent = self->GetComponent<PetComponent>();
// If the pet is currently not being tamed, make it hostile
if (petComponent != nullptr && petComponent->GetStatus() != 5) {
@@ -82,19 +82,19 @@ void DamagingPets::MakeUntamable(Entity* self) {
self->SetVar<bool>(u"IsEvil", true);
petComponent->SetStatus(1);
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(false);
}
// Special faction that can attack the player but the player can't attack
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
destroyableComponent->SetFaction(114);
destroyableComponent->SetHealth(5);
}
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
auto counter = 1;
for (const auto petEffect : GetPetInfo(self).effect) {
@@ -108,22 +108,22 @@ void DamagingPets::MakeUntamable(Entity* self) {
void DamagingPets::ClearEffects(Entity* self) {
self->SetVar<bool>(u"IsEvil", false);
auto* petComponent = self->GetComponent<PetComponent>();
auto petComponent = self->GetComponent<PetComponent>();
if (petComponent != nullptr) {
petComponent->SetStatus(67108866);
}
auto* combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
auto combatAIComponent = self->GetComponent<BaseCombatAIComponent>();
if (combatAIComponent != nullptr) {
combatAIComponent->SetDisabled(true);
}
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
auto destroyableComponent = self->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
destroyableComponent->SetFaction(99);
}
auto* renderComponent = self->GetComponent<RenderComponent>();
auto renderComponent = self->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
auto counter = 1;
for (const auto petEffect : GetPetInfo(self).effect) {

6
dScripts/02_server/Pets/PetFromDigServer.cpp
View File

@@ -3,7 +3,7 @@
#include "ePetTamingNotifyType.h"
void PetFromDigServer::OnStartup(Entity* self) {
auto* petComponent = self->GetComponent<PetComponent>();
auto petComponent = self->GetComponent<PetComponent>();
if (petComponent == nullptr || petComponent->GetOwner() != nullptr)
return;
@@ -21,7 +21,7 @@ void PetFromDigServer::OnTimerDone(Entity* self, std::string timerName) {
if (timerName == "killself") {
// Don't accidentally kill a pet that is already owned
auto* petComponent = self->GetComponent<PetComponent>();
auto petComponent = self->GetComponent<PetComponent>();
if (petComponent == nullptr || petComponent->GetOwner() != nullptr)
return;
@@ -35,7 +35,7 @@ void PetFromDigServer::OnNotifyPetTamingMinigame(Entity* self, Entity* tamer, eP
} else if (type == ePetTamingNotifyType::QUIT || type == ePetTamingNotifyType::FAILED) {
self->Smash(self->GetObjectID(), eKillType::SILENT);
} else if (type == ePetTamingNotifyType::SUCCESS) {
auto* petComponent = self->GetComponent<PetComponent>();
auto petComponent = self->GetComponent<PetComponent>();
if (petComponent == nullptr)
return;
// TODO: Remove custom group?

2
dScripts/02_server/Pets/PetFromObjectServer.cpp
View File

@@ -9,7 +9,7 @@ void PetFromObjectServer::OnStartup(Entity* self) {
void PetFromObjectServer::OnTimerDone(Entity* self, std::string timerName) {
if (timerName == "killSelf") {
const auto* petComponent = self->GetComponent<PetComponent>();
const auto petComponent = self->GetComponent<PetComponent>();
if (petComponent == nullptr || petComponent->GetOwner() != nullptr)
return;
self->Smash(self->GetObjectID(), eKillType::SILENT);

18
dScripts/ActivityManager.cpp
View File

@@ -8,12 +8,12 @@
#include "Loot.h"
bool ActivityManager::IsPlayerInActivity(Entity* self, LWOOBJID playerID) {
const auto* sac = self->GetComponent<ScriptedActivityComponent>();
const auto sac = self->GetComponent<ScriptedActivityComponent>();
return sac != nullptr && sac->IsPlayedBy(playerID);
}
void ActivityManager::UpdatePlayer(Entity* self, LWOOBJID playerID, const bool remove) {
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac == nullptr)
return;
@@ -34,7 +34,7 @@ void ActivityManager::SetActivityScore(Entity* self, LWOOBJID playerID, uint32_t
void ActivityManager::SetActivityValue(Entity* self, const LWOOBJID playerID, const uint32_t valueIndex,
const float_t value) {
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac == nullptr)
return;
@@ -42,7 +42,7 @@ void ActivityManager::SetActivityValue(Entity* self, const LWOOBJID playerID, co
}
float_t ActivityManager::GetActivityValue(Entity* self, const LWOOBJID playerID, const uint32_t valueIndex) {
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac == nullptr)
return -1.0f;
@@ -53,7 +53,7 @@ void ActivityManager::StopActivity(Entity* self, const LWOOBJID playerID, const
const uint32_t value1, const uint32_t value2, bool quit) {
int32_t gameID = 0;
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac == nullptr) {
gameID = self->GetLOT();
} else {
@@ -92,7 +92,7 @@ void ActivityManager::StopActivity(Entity* self, const LWOOBJID playerID, const
}
bool ActivityManager::TakeActivityCost(const Entity* self, const LWOOBJID playerID) {
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac == nullptr)
return false;
@@ -104,7 +104,7 @@ bool ActivityManager::TakeActivityCost(const Entity* self, const LWOOBJID player
}
uint32_t ActivityManager::CalculateActivityRating(Entity* self, const LWOOBJID playerID) {
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac == nullptr)
return 0;
@@ -112,7 +112,7 @@ uint32_t ActivityManager::CalculateActivityRating(Entity* self, const LWOOBJID p
}
uint32_t ActivityManager::GetActivityID(const Entity* self) {
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
return sac != nullptr ? sac->GetActivityID() : 0;
}
@@ -147,7 +147,7 @@ float_t ActivityManager::ActivityTimerGetCurrentTime(Entity* self, const std::st
int32_t ActivityManager::GetGameID(Entity* self) const {
int32_t gameID = 0;
auto* sac = self->GetComponent<ScriptedActivityComponent>();
auto sac = self->GetComponent<ScriptedActivityComponent>();
if (sac == nullptr) {
gameID = self->GetLOT();
} else {

14
dScripts/BasePropertyServer.cpp
View File

@@ -95,7 +95,7 @@ void BasePropertyServer::BasePlayerLoaded(Entity* self, Entity* player) {
const auto& mapID = dZoneManager::Instance()->GetZone()->GetZoneID();
if (propertyOwner > 0) {
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->Progress(
@@ -149,7 +149,7 @@ void BasePropertyServer::BasePlayerLoaded(Entity* self, Entity* player) {
}
void BasePropertyServer::PropGuardCheck(Entity* self, Entity* player) {
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr
&& missionComponent->GetMissionState(self->GetVar<uint32_t>(guardMissionFlag)) != eMissionState::COMPLETE) {
@@ -241,7 +241,7 @@ void BasePropertyServer::StartTornadoFx(Entity* self) const {
}
for (auto* entity : entities) {
auto* renderComponent = entity->GetComponent<RenderComponent>();
auto renderComponent = entity->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->PlayEffect(-1, u"debrisOn", "TornadoDebris");
renderComponent->PlayEffect(-1, u"VortexOn", "TornadoVortex");
@@ -270,7 +270,7 @@ void BasePropertyServer::KillGuard(Entity* self) {
}
void BasePropertyServer::RequestDie(Entity* self, Entity* other) {
auto* destroyable = other->GetComponent<DestroyableComponent>();
auto destroyable = other->GetComponent<DestroyableComponent>();
if (destroyable == nullptr)
return;
@@ -344,7 +344,7 @@ void BasePropertyServer::BaseTimerDone(Entity* self, const std::string& timerNam
auto fxManagers = EntityManager::Instance()->GetEntitiesInGroup(self->GetVar<std::string>(FXManagerGroup));
for (auto* fxManager : fxManagers) {
auto* renderComponent = fxManager->GetComponent<RenderComponent>();
auto renderComponent = fxManager->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->StopEffect("TornadoDebris", false);
renderComponent->StopEffect("TornadoVortex", false);
@@ -357,7 +357,7 @@ void BasePropertyServer::BaseTimerDone(Entity* self, const std::string& timerNam
auto fxManagers = EntityManager::Instance()->GetEntitiesInGroup(self->GetVar<std::string>(FXManagerGroup));
for (auto* fxManager : fxManagers) {
auto* renderComponent = fxManager->GetComponent<RenderComponent>();
auto renderComponent = fxManager->GetComponent<RenderComponent>();
if (renderComponent != nullptr)
renderComponent->PlayEffect(-1, u"beamOn", "beam");
}
@@ -423,7 +423,7 @@ void BasePropertyServer::BaseTimerDone(Entity* self, const std::string& timerNam
}
for (auto* fxManager : fxManagers) {
auto* renderComponent = fxManager->GetComponent<RenderComponent>();
auto renderComponent = fxManager->GetComponent<RenderComponent>();
if (renderComponent != nullptr) {
renderComponent->StopEffect("beam");
}

4
dScripts/BaseSurvivalServer.cpp
View File

@@ -225,7 +225,7 @@ void BaseSurvivalServer::ResetStats(LWOOBJID playerID) {
if (player != nullptr) {
// Boost all the player stats when loading in
auto* destroyableComponent = player->GetComponent<DestroyableComponent>();
auto destroyableComponent = player->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
destroyableComponent->SetHealth(destroyableComponent->GetMaxHealth());
destroyableComponent->SetArmor(destroyableComponent->GetMaxArmor());
@@ -360,7 +360,7 @@ void BaseSurvivalServer::GameOver(Entity* self) {
player->Resurrect();
// Update all mission progression
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->Progress(eMissionTaskType::PERFORM_ACTIVITY, time, self->GetObjectID(),
self->GetVar<std::string>(MissionTypeVariable));

8
dScripts/BaseWavesServer.cpp
View File

@@ -228,7 +228,7 @@ void BaseWavesServer::ResetStats(LWOOBJID playerID) {
if (player != nullptr) {
// Boost all the player stats when loading in
auto* destroyableComponent = player->GetComponent<DestroyableComponent>();
auto destroyableComponent = player->GetComponent<DestroyableComponent>();
if (destroyableComponent != nullptr) {
destroyableComponent->SetHealth(destroyableComponent->GetMaxHealth());
destroyableComponent->SetArmor(destroyableComponent->GetMaxArmor());
@@ -372,7 +372,7 @@ void BaseWavesServer::GameOver(Entity* self, bool won) {
}
// Update all mission progression
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
missionComponent->Progress(eMissionTaskType::PERFORM_ACTIVITY, time, self->GetObjectID(), self->GetVar<std::string>(MissionTypeVariable));
}
@@ -505,7 +505,7 @@ bool BaseWavesServer::UpdateSpawnedEnemies(Entity* self, LWOOBJID enemyID, uint3
SetActivityValue(self, playerID, 2, state.waveNumber);
// Update player missions
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent != nullptr) {
for (const auto& missionID : waveMission) {
// Get the mission state
@@ -560,7 +560,7 @@ void BaseWavesServer::UpdateMissionForAllPlayers(Entity* self, uint32_t missionI
for (const auto& playerID : state.players) {
auto* player = EntityManager::Instance()->GetEntity(playerID);
if (player != nullptr) {
auto* missionComponent = player->GetComponent<MissionComponent>();
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent == nullptr) return;
// Get the mission state
auto missionState = missionComponent->GetMissionState(missionID);

4
dScripts/CppScripts.cpp
View File

@@ -944,8 +944,8 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr
std::vector<CppScripts::Script*> CppScripts::GetEntityScripts(Entity* entity) {
std::vector<CppScripts::Script*> scripts;
std::vector<ScriptComponent*> comps = entity->GetScriptComponents();
for (ScriptComponent* scriptComp : comps) {
auto comps = entity->GetScriptComponents();
for (auto& scriptComp : comps) {
if (scriptComp != nullptr) {
scripts.push_back(scriptComp->GetScript());
}

Some files were not shown because too many files have changed in this diff Show More