Organize dScripts (#814)

* Organize dScripts

whitespace

Remove parent scope

Remove parent scope from initial setter

Remove debug

Remove helper programs

* Fix NtImagimeterVisibility script

Co-authored-by: aronwk-aaron <aronwk.aaron@gmail.com>
This commit is contained in:
David Markowitz
2022-11-03 10:57:54 -07:00
committed by GitHub
parent b974eed8f5
commit 8d37d9b681
567 changed files with 886 additions and 252 deletions

View File

@@ -0,0 +1,3 @@
set(DSCRIPTS_SOURCES_ZONE_AG
"ZoneAgSurvival.cpp"
PARENT_SCOPE)

View File

@@ -0,0 +1,127 @@
#include "ZoneAgSurvival.h"
Constants ZoneAgSurvival::GetConstants() {
return Constants{
60,
2,
7,
5,
10,
5,
15,
10,
0,
true,
std::vector<uint32_t> {8, 13, 18, 23, 28, 32},
std::vector<uint32_t> {2, 10, 15, 20, 25, 30}
};
}
MobSets ZoneAgSurvival::GetMobSets() {
return MobSets{
std::map<std::string, std::vector<LOT>> {
{"MobA", {6351, 8088, 8089} },
{"MobB", {6668, 8090, 8091} },
{"MobC", {6454, 8096, 8097} },
},
std::map<std::string, std::vector<std::vector<std::vector<uint32_t>>>> {
{ BaseMobSet, {
{ {3, 0, 0}, },
{ {2, 1, 0}, },
{ {4, 1, 0}, },
{ {1, 2, 0}, },
{ {0, 1, 1}, },
{ {0, 2, 2}, }
}},
{ RandMobSet, {
{ {4, 0, 0}, {4, 0, 0}, {4, 0, 0}, {4, 0, 0}, {3, 1, 0} },
{ {4, 1, 0}, {4, 1, 0}, {4, 1, 0}, {4, 1, 0}, {2, 1, 1} },
{ {1, 2, 0}, {1, 2, 0}, {1, 2, 0}, {1, 2, 0}, {0, 1, 1} },
{ {1, 2, 1}, {1, 2, 1}, {1, 2, 1}, {0, 2, 1}, {0, 2, 2} },
{ {0, 1, 2}, {0, 1, 2}, {0, 1, 2}, {0, 1, 3}, {0, 1, 3} },
{ {0, 2, 3}, {0, 2, 3}, {0, 2, 3}, {0, 2, 3}, {0, 2, 3} },
}}
}
};
}
SpawnerNetworks ZoneAgSurvival::GetSpawnerNetworks() {
return SpawnerNetworks{
SpawnerNetworkCollection {
BaseMobSet,
{
SpawnerNetwork {
std::vector<std::string> { "Base_MobA", "Base_MobB", "Base_MobC" },
"",
false,
false
},
}
},
SpawnerNetworkCollection {
RandMobSet,
{
SpawnerNetwork {
std::vector<std::string> {"MobA_", "MobB_", "MobC_"},
"01",
false,
false
},
SpawnerNetwork {
std::vector<std::string> {"MobA_", "MobB_", "MobC_"},
"02",
false,
false
},
SpawnerNetwork {
std::vector<std::string> {"MobA_", "MobB_", "MobC_"},
"03",
true,
false
},
}
},
SpawnerNetworkCollection {
"",
{
SpawnerNetwork {
std::vector<std::string> { "Rewards_" },
"01",
false,
false
},
}
},
SpawnerNetworkCollection {
"",
{
SpawnerNetwork {
std::vector<std::string> { "Smash_" },
"01",
false,
false
},
}
}
};
}
std::map<uint32_t, uint32_t> ZoneAgSurvival::GetMissionsToUpdate() {
return std::map<uint32_t, uint32_t> {
{ 479, 60 },
{ 1153, 180 },
{ 1618, 420 },
{ 1628, 420 },
{ 1638, 420 },
{ 1648, 420 },
{ 1412, 120 },
{ 1510, 120 },
{ 1547, 120 },
{ 1584, 120 },
{ 1426, 300 },
{ 1524, 300 },
{ 1561, 300 },
{ 1598, 300 },
{ 1865, 180 }
};
}

View File

@@ -0,0 +1,11 @@
#pragma once
#include "CppScripts.h"
#include "BaseSurvivalServer.h"
#include <map>
class ZoneAgSurvival : public BaseSurvivalServer {
Constants GetConstants() override;
SpawnerNetworks GetSpawnerNetworks() override;
MobSets GetMobSets() override;
std::map<uint32_t, uint32_t> GetMissionsToUpdate() override;
};

View File

@@ -0,0 +1,21 @@
set(DSCRIPTS_SOURCES_ZONE)
add_subdirectory(AG)
foreach(file ${DSCRIPTS_SOURCES_ZONE_AG})
set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} "AG/${file}")
endforeach()
add_subdirectory(LUPs)
foreach(file ${DSCRIPTS_SOURCES_ZONE_LUPS})
set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} "LUPs/${file}")
endforeach()
add_subdirectory(PROPERTY)
foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY})
set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} "PROPERTY/${file}")
endforeach()
set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} PARENT_SCOPE)

View File

@@ -0,0 +1,3 @@
set(DSCRIPTS_SOURCES_ZONE_LUPS
"WblGenericZone.cpp"
PARENT_SCOPE)

View File

@@ -0,0 +1,10 @@
#include "WblGenericZone.h"
#include "Player.h"
void WblGenericZone::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) {
if (args == m_WblAbortMsg) {
if (!sender) return;
auto player = dynamic_cast<Player*>(sender);
if (player) player->SendToZone(m_WblMainZone);
}
}

View File

@@ -0,0 +1,10 @@
#pragma once
#include "CppScripts.h"
class WblGenericZone : public CppScripts::Script
{
public:
void OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) override;
private:
const LWOMAPID m_WblMainZone = 1600;
const std::string m_WblAbortMsg = "AbortWBLZone";
};

View File

@@ -0,0 +1,21 @@
set(DSCRIPTS_SOURCES_ZONE_PROPERTY)
add_subdirectory(FV)
foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY_FV})
set(DSCRIPTS_SOURCES_ZONE_PROPERTY ${DSCRIPTS_SOURCES_ZONE_PROPERTY} "FV/${file}")
endforeach()
add_subdirectory(GF)
foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY_GF})
set(DSCRIPTS_SOURCES_ZONE_PROPERTY ${DSCRIPTS_SOURCES_ZONE_PROPERTY} "GF/${file}")
endforeach()
add_subdirectory(NS)
foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY_NS})
set(DSCRIPTS_SOURCES_ZONE_PROPERTY ${DSCRIPTS_SOURCES_ZONE_PROPERTY} "NS/${file}")
endforeach()
set(DSCRIPTS_SOURCES_ZONE_PROPERTY ${DSCRIPTS_SOURCES_ZONE_PROPERTY} PARENT_SCOPE)

View File

@@ -0,0 +1,3 @@
set(DSCRIPTS_SOURCES_ZONE_PROPERTY_FV
"ZoneFvProperty.cpp"
PARENT_SCOPE)

View File

@@ -0,0 +1,40 @@
#include "ZoneFvProperty.h"
#include "Entity.h"
void ZoneFvProperty::SetGameVariables(Entity* self) {
self->SetVar<std::string>(ClaimMarkerGroup, "Platform");
self->SetVar<std::string>(GeneratorGroup, "Generator");
self->SetVar<std::string>(GuardGroup, "Guard");
self->SetVar<std::string>(PropertyPlaqueGroup, "PropertyPlaque");
self->SetVar<std::string>(PropertyVendorGroup, "PropertyVendor");
self->SetVar<std::string>(SpotsGroup, "Spots");
self->SetVar<std::string>(MSCloudsGroup, "Clouds");
self->SetVar<std::string>(EnemiesGroup, "Enemies");
self->SetVar<std::string>(FXManagerGroup, "FXManager");
self->SetVar<std::string>(ImagOrbGroup, "Orb");
self->SetVar<std::string>(GeneratorFXGroup, "GeneratorFX");
self->SetVar<std::vector<std::string>>(EnemiesSpawner,
{ "RoninWander", "RoninGen", "HorsemenGen" });
self->SetVar<std::string>(ClaimMarkerSpawner, "Platform");
self->SetVar<std::string>(GeneratorSpawner, "Generator");
self->SetVar<std::string>(DamageFXSpawner, "Clouds");
self->SetVar<std::string>(FXSpotsSpawner, "Spots");
self->SetVar<std::string>(PropertyMGSpawner, "Guard");
self->SetVar<std::string>(ImageOrbSpawner, "Orb");
self->SetVar<std::string>(GeneratorFXSpawner, "GeneratorFX");
self->SetVar<std::string>(SmashablesSpawner, "Smashables");
self->SetVar<std::string>(FXManagerSpawner, "FXManager");
self->SetVar<std::string>(PropObjsSpawner, "BankObj");
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<uint32_t>(guardMissionFlag, 874);
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 950);
self->SetVar<std::string>(passwordFlag, "s3kratK1ttN");
self->SetVar<LOT>(generatorIdFlag, 11023);
self->SetVar<LOT>(orbIDFlag, 10226);
self->SetVar<LOT>(behaviorQBID, 11011);
}

View File

@@ -0,0 +1,6 @@
#pragma once
#include "BasePropertyServer.h"
class ZoneFvProperty : public BasePropertyServer {
void SetGameVariables(Entity* self) override;
};

View File

@@ -0,0 +1,3 @@
set(DSCRIPTS_SOURCES_ZONE_PROPERTY_GF
"ZoneGfProperty.cpp"
PARENT_SCOPE)

View File

@@ -0,0 +1,40 @@
#include "ZoneGfProperty.h"
#include "Entity.h"
void ZoneGfProperty::SetGameVariables(Entity* self) {
self->SetVar<std::string>(ClaimMarkerGroup, "BehavQB");
self->SetVar<std::string>(GeneratorGroup, "Generator");
self->SetVar<std::string>(GuardGroup, "Guard");
self->SetVar<std::string>(PropertyPlaqueGroup, "PropertyPlaque");
self->SetVar<std::string>(PropertyVendorGroup, "PropertyVendor");
self->SetVar<std::string>(SpotsGroup, "Spots");
self->SetVar<std::string>(MSCloudsGroup, "Clouds");
self->SetVar<std::string>(EnemiesGroup, "Enemies");
self->SetVar<std::string>(FXManagerGroup, "FXManager");
self->SetVar<std::string>(ImagOrbGroup, "Orb");
self->SetVar<std::string>(GeneratorFXGroup, "GeneratorFX");
self->SetVar<std::vector<std::string>>(EnemiesSpawner,
{ "PiratesWander", "PiratesGen", "AdmiralsWander", "AdmiralsGen" });
self->SetVar<std::string>(ClaimMarkerSpawner, "BehavPlat");
self->SetVar<std::string>(GeneratorSpawner, "Generator");
self->SetVar<std::string>(DamageFXSpawner, "Clouds");
self->SetVar<std::string>(FXSpotsSpawner, "Spots");
self->SetVar<std::string>(PropertyMGSpawner, "Guard");
self->SetVar<std::string>(ImageOrbSpawner, "Orb");
self->SetVar<std::string>(GeneratorFXSpawner, "GeneratorFX");
self->SetVar<std::string>(SmashablesSpawner, "Smashables");
self->SetVar<std::string>(FXManagerSpawner, "FXManager");
self->SetVar<std::string>(PropObjsSpawner, "BankObj");
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<uint32_t>(guardMissionFlag, 873);
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 949);
self->SetVar<std::string>(passwordFlag, "s3kratK1ttN");
self->SetVar<LOT>(generatorIdFlag, 11109);
self->SetVar<LOT>(orbIDFlag, 10226);
self->SetVar<LOT>(behaviorQBID, 11001);
}

View File

@@ -0,0 +1,6 @@
#pragma once
#include "BasePropertyServer.h"
class ZoneGfProperty : public BasePropertyServer {
void SetGameVariables(Entity* self) override;
};

View File

@@ -0,0 +1,3 @@
set(DSCRIPTS_SOURCES_ZONE_PROPERTY_NS
"ZoneNsProperty.cpp"
PARENT_SCOPE)

View File

@@ -0,0 +1,41 @@
#include "ZoneNsProperty.h"
#include "Entity.h"
void ZoneNsProperty::SetGameVariables(Entity* self) {
self->SetVar<std::string>(ClaimMarkerGroup, "Rhino");
self->SetVar<std::string>(GeneratorGroup, "Generator");
self->SetVar<std::string>(GuardGroup, "Guard");
self->SetVar<std::string>(PropertyPlaqueGroup, "PropertyPlaque");
self->SetVar<std::string>(PropertyVendorGroup, "PropertyVendor");
self->SetVar<std::string>(SpotsGroup, "Spots");
self->SetVar<std::string>(MSCloudsGroup, "Clouds");
self->SetVar<std::string>(EnemiesGroup, "Enemies");
self->SetVar<std::string>(FXManagerGroup, "FXManager");
self->SetVar<std::string>(ImagOrbGroup, "Orb");
self->SetVar<std::string>(GeneratorFXGroup, "GeneratorFX");
self->SetVar<std::vector<std::string>>(EnemiesSpawner, {
"StrombieWander", "StrombieGen", "PirateWander", "PirateGen", "RoninGen"
});
self->SetVar<std::string>(ClaimMarkerSpawner, "ClaimMarker");
self->SetVar<std::string>(GeneratorSpawner, "Generator");
self->SetVar<std::string>(DamageFXSpawner, "MSClouds");
self->SetVar<std::string>(FXSpotsSpawner, "Spots");
self->SetVar<std::string>(PropertyMGSpawner, "Guard");
self->SetVar<std::string>(ImageOrbSpawner, "Orb");
self->SetVar<std::string>(GeneratorFXSpawner, "GeneratorFX");
self->SetVar<std::string>(SmashablesSpawner, "Smashables");
self->SetVar<std::string>(FXManagerSpawner, "FXManager");
self->SetVar<std::string>(PropObjsSpawner, "BankObj");
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<uint32_t>(guardMissionFlag, 872);
self->SetVar<uint32_t>(brickLinkMissionIDFlag, 948);
self->SetVar<std::string>(passwordFlag, "s3kratK1ttN");
self->SetVar<LOT>(generatorIdFlag, 11031);
self->SetVar<LOT>(orbIDFlag, 10226);
self->SetVar<LOT>(behaviorQBID, 11009);
}

View File

@@ -0,0 +1,6 @@
#pragma once
#include "BasePropertyServer.h"
class ZoneNsProperty : public BasePropertyServer {
void SetGameVariables(Entity* self) override;
};