mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-09 01:38:20 +00:00
Fix typing of some player flag variables (#1067)
Mainly on properties Tested that the spider queen mission can now be progressed
This commit is contained in:
parent
e297aacc68
commit
5479cf4428
@ -9,8 +9,8 @@ void ZoneAgSpiderQueen::SetGameVariables(Entity* self) {
|
||||
ZoneAgProperty::SetGameVariables(self);
|
||||
|
||||
// Disable property flags
|
||||
self->SetVar<uint32_t>(defeatedProperyFlag, 0);
|
||||
self->SetVar<uint32_t>(placedModelFlag, 0);
|
||||
self->SetVar<int32_t>(defeatedProperyFlag, 0);
|
||||
self->SetVar<int32_t>(placedModelFlag, 0);
|
||||
self->SetVar<uint32_t>(guardFirstMissionFlag, 0);
|
||||
self->SetVar<uint32_t>(guardMissionFlag, 0);
|
||||
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 0);
|
||||
|
@ -31,8 +31,8 @@ void ZoneAgMedProperty::SetGameVariables(Entity* self) {
|
||||
self->SetVar<std::vector<std::string>>(AmbientFXSpawner, { "BirdFX", "SunBeam" });
|
||||
self->SetVar<std::vector<std::string>>(BehaviorObjsSpawner, {});
|
||||
|
||||
self->SetVar<uint32_t>(defeatedProperyFlag, 118);
|
||||
self->SetVar<uint32_t>(placedModelFlag, 119);
|
||||
self->SetVar<int32_t>(defeatedProperyFlag, 118);
|
||||
self->SetVar<int32_t>(placedModelFlag, 119);
|
||||
self->SetVar<uint32_t>(guardMissionFlag, 1293);
|
||||
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 1294);
|
||||
self->SetVar<std::string>(passwordFlag, "s3kratK1ttN");
|
||||
|
@ -39,8 +39,8 @@ void ZoneAgProperty::SetGameVariables(Entity* self) {
|
||||
self->SetVar<std::string>(LauncherSpawner, "Launcher");
|
||||
self->SetVar<std::string>(InstancerSpawner, "Instancer");
|
||||
|
||||
self->SetVar<uint32_t>(defeatedProperyFlag, 71);
|
||||
self->SetVar<uint32_t>(placedModelFlag, 73);
|
||||
self->SetVar<int32_t>(defeatedProperyFlag, 71);
|
||||
self->SetVar<int32_t>(placedModelFlag, 73);
|
||||
self->SetVar<uint32_t>(guardFirstMissionFlag, 891);
|
||||
self->SetVar<uint32_t>(guardMissionFlag, 320);
|
||||
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 951);
|
||||
|
@ -38,8 +38,8 @@ void BasePropertyServer::SetGameVariables(Entity* self) {
|
||||
self->SetVar<std::vector<std::string>>(AmbientFXSpawner, {});
|
||||
self->SetVar<std::vector<std::string>>(BehaviorObjsSpawner, {});
|
||||
|
||||
self->SetVar<uint32_t>(defeatedProperyFlag, 0);
|
||||
self->SetVar<uint32_t>(placedModelFlag, 0);
|
||||
self->SetVar<int32_t>(defeatedProperyFlag, 0);
|
||||
self->SetVar<int32_t>(placedModelFlag, 0);
|
||||
self->SetVar<uint32_t>(guardMissionFlag, 0);
|
||||
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 0);
|
||||
self->SetVar<std::string>(passwordFlag, "s3kratK1ttN");
|
||||
|
@ -39,7 +39,7 @@ void AgPropguards::OnMissionDialogueOK(Entity* self, Entity* target, int mission
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t AgPropguards::GetFlagForMission(uint32_t missionID) {
|
||||
int32_t AgPropguards::GetFlagForMission(uint32_t missionID) {
|
||||
switch (missionID) {
|
||||
case 872:
|
||||
return 97;
|
||||
|
@ -4,5 +4,5 @@
|
||||
class AgPropguards : public CppScripts::Script {
|
||||
void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override;
|
||||
private:
|
||||
static uint32_t GetFlagForMission(uint32_t missionID);
|
||||
static int32_t GetFlagForMission(uint32_t missionID);
|
||||
};
|
||||
|
@ -29,8 +29,8 @@ void ZoneFvProperty::SetGameVariables(Entity* self) {
|
||||
self->SetVar<std::vector<std::string>>(AmbientFXSpawner, { "Ash", "FX", "Fog" });
|
||||
self->SetVar<std::vector<std::string>>(BehaviorObjsSpawner, {});
|
||||
|
||||
self->SetVar<uint32_t>(defeatedProperyFlag, 99);
|
||||
self->SetVar<uint32_t>(placedModelFlag, 107);
|
||||
self->SetVar<int32_t>(defeatedProperyFlag, 99);
|
||||
self->SetVar<int32_t>(placedModelFlag, 107);
|
||||
self->SetVar<uint32_t>(guardMissionFlag, 874);
|
||||
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 950);
|
||||
self->SetVar<std::string>(passwordFlag, "s3kratK1ttN");
|
||||
|
@ -29,8 +29,8 @@ void ZoneGfProperty::SetGameVariables(Entity* self) {
|
||||
self->SetVar<std::vector<std::string>>(AmbientFXSpawner, { "Birds", "Falls", "Sunbeam" });
|
||||
self->SetVar<std::vector<std::string>>(BehaviorObjsSpawner, { "TrappedPlatform", "IceBarrier", "FireBeast" });
|
||||
|
||||
self->SetVar<uint32_t>(defeatedProperyFlag, 98);
|
||||
self->SetVar<uint32_t>(placedModelFlag, 106);
|
||||
self->SetVar<int32_t>(defeatedProperyFlag, 98);
|
||||
self->SetVar<int32_t>(placedModelFlag, 106);
|
||||
self->SetVar<uint32_t>(guardMissionFlag, 873);
|
||||
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 949);
|
||||
self->SetVar<std::string>(passwordFlag, "s3kratK1ttN");
|
||||
|
@ -30,8 +30,8 @@ void ZoneNsProperty::SetGameVariables(Entity* self) {
|
||||
self->SetVar<std::vector<std::string>>(AmbientFXSpawner, { "Rockets" });
|
||||
self->SetVar<std::vector<std::string>>(BehaviorObjsSpawner, { "Cage", "Platform", "Door" });
|
||||
|
||||
self->SetVar<uint32_t>(defeatedProperyFlag, 97);
|
||||
self->SetVar<uint32_t>(placedModelFlag, 105);
|
||||
self->SetVar<int32_t>(defeatedProperyFlag, 97);
|
||||
self->SetVar<int32_t>(placedModelFlag, 105);
|
||||
self->SetVar<uint32_t>(guardMissionFlag, 872);
|
||||
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 948);
|
||||
self->SetVar<std::string>(passwordFlag, "s3kratK1ttN");
|
||||
|
Loading…
Reference in New Issue
Block a user