mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-21 21:17:25 +00:00
Merge pull request #134 from DarkflameUniverse/fix-sentry-faction
Update BaseEnemyMech script to change the default faction
This commit is contained in:
commit
51600a5329
@ -1,9 +0,0 @@
|
||||
#include "AgDarklingMech.h"
|
||||
#include "DestroyableComponent.h"
|
||||
|
||||
void AgDarklingMech::OnStartup(Entity *self) {
|
||||
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
|
||||
if (destroyableComponent != nullptr) {
|
||||
destroyableComponent->SetFaction(4);
|
||||
}
|
||||
}
|
@ -1,6 +0,0 @@
|
||||
#pragma once
|
||||
#include "BaseEnemyMech.h"
|
||||
|
||||
class AgDarklingMech : public BaseEnemyMech {
|
||||
void OnStartup(Entity* self) override;
|
||||
};
|
@ -3,9 +3,6 @@
|
||||
|
||||
void AmDarklingMech::OnStartup(Entity* self)
|
||||
{
|
||||
auto* destroyableComponent = self->GetComponent<DestroyableComponent>();
|
||||
|
||||
destroyableComponent->SetFaction(4);
|
||||
|
||||
BaseEnemyMech::OnStartup(self);
|
||||
qbTurretLOT = 13171;
|
||||
}
|
||||
|
@ -7,6 +7,14 @@
|
||||
#include "EntityManager.h"
|
||||
#include "dpWorld.h"
|
||||
#include "GeneralUtils.h"
|
||||
#include "DestroyableComponent.h"
|
||||
|
||||
void BaseEnemyMech::OnStartup(Entity* self) {
|
||||
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(COMPONENT_TYPE_CONTROLLABLE_PHYSICS));
|
||||
|
@ -4,6 +4,7 @@
|
||||
class BaseEnemyMech : public CppScripts::Script
|
||||
{
|
||||
public:
|
||||
void OnStartup(Entity* self) override;
|
||||
void OnDie(Entity* self, Entity* killer) override;
|
||||
protected:
|
||||
LOT qbTurretLOT = 6254;
|
||||
|
@ -51,7 +51,6 @@
|
||||
#include "NpcCowboyServer.h"
|
||||
#include "ZoneAgMedProperty.h"
|
||||
#include "AgStromlingProperty.h"
|
||||
#include "AgDarklingMech.h"
|
||||
#include "AgDarkSpiderling.h"
|
||||
#include "PropertyFXDamage.h"
|
||||
#include "AgPropguards.h"
|
||||
@ -377,7 +376,7 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr
|
||||
else if (scriptName == "scripts\\ai\\AG\\L_AG_STROMBIE_PROPERTY.lua")
|
||||
script = new AgStromlingProperty();
|
||||
else if (scriptName == "scripts\\ai\\AG\\L_AG_DARKLING_MECH.lua")
|
||||
script = new AgDarklingMech();
|
||||
script = new BaseEnemyMech();
|
||||
else if (scriptName == "scripts\\ai\\AG\\L_AG_DARK_SPIDERLING.lua")
|
||||
script = new AgDarkSpiderling();
|
||||
else if (scriptName == "scripts\\ai\\PROPERTY\\L_PROP_GUARDS.lua")
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include "VeMech.h"
|
||||
|
||||
void VeMech::OnStartup(Entity *self) {
|
||||
BaseEnemyMech::OnStartup(self);
|
||||
qbTurretLOT = 8432;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user