From 5cdff8bcaf916b9345148cdf0f6c309dbb09cca4 Mon Sep 17 00:00:00 2001 From: Aaron Kimbre Date: Sun, 9 Apr 2023 08:54:14 -0500 Subject: [PATCH] Simplify tested that things still work as intended --- dScripts/CppScripts.cpp | 51 ++++++++----------- dScripts/ai/SPEC/Special10BronzeCoinSpawner.h | 13 ----- dScripts/ai/SPEC/Special10GoldCoinSpawner.h | 13 ----- dScripts/ai/SPEC/Special10SilverCoinSpawner.h | 13 ----- dScripts/ai/SPEC/Special1BronzeCoinSpawner.h | 15 ------ dScripts/ai/SPEC/Special1GoldCoinSpawner.h | 13 ----- dScripts/ai/SPEC/Special1SilverCoinSpawner.h | 13 ----- dScripts/ai/SPEC/Special25BronzeCoinSpawner.h | 13 ----- dScripts/ai/SPEC/Special25GoldCoinSpawner.h | 13 ----- dScripts/ai/SPEC/Special25SilverCoinSpawner.h | 13 ----- dScripts/ai/SPEC/SpecialArmorPowerupSpawner.h | 14 ----- dScripts/ai/SPEC/SpecialCoinSpawner.cpp | 2 +- dScripts/ai/SPEC/SpecialCoinSpawner.h | 4 +- .../ai/SPEC/SpecialImaginePowerupSpawner.h | 13 ----- .../ai/SPEC/SpecialImaginePowerupSpawner2pt.h | 13 ----- dScripts/ai/SPEC/SpecialLifePowerupSpawner.h | 13 ----- 16 files changed, 23 insertions(+), 206 deletions(-) delete mode 100644 dScripts/ai/SPEC/Special10BronzeCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/Special10GoldCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/Special10SilverCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/Special1BronzeCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/Special1GoldCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/Special1SilverCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/Special25BronzeCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/Special25GoldCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/Special25SilverCoinSpawner.h delete mode 100644 dScripts/ai/SPEC/SpecialArmorPowerupSpawner.h delete mode 100644 dScripts/ai/SPEC/SpecialImaginePowerupSpawner.h delete mode 100644 dScripts/ai/SPEC/SpecialImaginePowerupSpawner2pt.h delete mode 100644 dScripts/ai/SPEC/SpecialLifePowerupSpawner.h diff --git a/dScripts/CppScripts.cpp b/dScripts/CppScripts.cpp index 6b57b0f9..f7faa9aa 100644 --- a/dScripts/CppScripts.cpp +++ b/dScripts/CppScripts.cpp @@ -295,19 +295,8 @@ #include "WblGenericZone.h" // pickups -#include "Special1BronzeCoinSpawner.h" -#include "Special1SilverCoinSpawner.h" -#include "Special10BronzeCoinSpawner.h" -#include "Special25BronzeCoinSpawner.h" -#include "Special10SilverCoinSpawner.h" -#include "Special25SilverCoinSpawner.h" -#include "Special1GoldCoinSpawner.h" -#include "Special10GoldCoinSpawner.h" -#include "Special25GoldCoinSpawner.h" -#include "SpecialImaginePowerupSpawner.h" -#include "SpecialImaginePowerupSpawner2pt.h" -#include "SpecialLifePowerupSpawner.h" -#include "SpecialArmorPowerupSpawner.h" +#include "SpecialCoinSpawner.h" +#include "SpecialPowerupSpawner.h" //Big bad global bc this is a namespace and not a class: InvalidScript* invalidToReturn = new InvalidScript(); @@ -874,31 +863,31 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr // pickups if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_1_BRONZE-COIN-SPAWNER.lua") - script = new Special1BronzeCoinSpawner(); - else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_1_SILVER-COIN-SPAWNER.lua") - script = new Special1SilverCoinSpawner(); - else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_10_BRONZE-COIN-SPAWNER.lua") - script = new Special10BronzeCoinSpawner(); - else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_25_BRONZE-COIN-SPAWNER.lua") - script = new Special25BronzeCoinSpawner(); - else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_10_SILVER-COIN-SPAWNER.lua") - script = new Special10SilverCoinSpawner(); - else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_25_SILVER-COIN-SPAWNER.lua") - script = new Special25SilverCoinSpawner(); + script = new SpecialCoinSpawner(1); else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_1_GOLD-COIN-SPAWNER.lua") - script = new Special1GoldCoinSpawner(); + script = new SpecialCoinSpawner(10000); + else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_1_SILVER-COIN-SPAWNER.lua") + script = new SpecialCoinSpawner(100); + else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_10_BRONZE-COIN-SPAWNER.lua") + script = new SpecialCoinSpawner(10); else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_10_GOLD-COIN-SPAWNER.lua") - script = new Special10GoldCoinSpawner(); + script = new SpecialCoinSpawner(100000); + else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_10_SILVER-COIN-SPAWNER.lua") + script = new SpecialCoinSpawner(1000); + else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_25_BRONZE-COIN-SPAWNER.lua") + script = new SpecialCoinSpawner(25); else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_25_GOLD-COIN-SPAWNER.lua") - script = new Special25GoldCoinSpawner(); + script = new SpecialCoinSpawner(250000); + else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_25_SILVER-COIN-SPAWNER.lua") + script = new SpecialCoinSpawner(2500); else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_IMAGINE-POWERUP-SPAWNER.lua") - script = new SpecialImaginePowerupSpawner(); + script = new SpecialPowerupSpawner(13); else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_IMAGINE-POWERUP-SPAWNER-2PT.lua") - script = new SpecialImaginePowerupSpawner2pt(); + script = new SpecialPowerupSpawner(129); else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_LIFE-POWERUP-SPAWNER.lua") - script = new SpecialLifePowerupSpawner(); + script = new SpecialPowerupSpawner(5); else if (scriptName == "scripts\\ai\\SPEC\\L_SPECIAL_ARMOR-POWERUP-SPAWNER.lua") - script = new SpecialArmorPowerupSpawner(); + script = new SpecialPowerupSpawner(80); // handle invalid script reporting if the path is greater than zero and it's not an ignored script // information not really needed for sys admins but is for developers diff --git a/dScripts/ai/SPEC/Special10BronzeCoinSpawner.h b/dScripts/ai/SPEC/Special10BronzeCoinSpawner.h deleted file mode 100644 index bbc4ecbe..00000000 --- a/dScripts/ai/SPEC/Special10BronzeCoinSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIAL10BRONZECOINSPAWNER__H__ -#define __SPECIAL10BRONZECOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special10BronzeCoinSpawner : public SpecialCoinSpawner { -public: - Special10BronzeCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 10; -}; - -#endif //!__SPECIAL10BRONZECOINSPAWNER__H__ diff --git a/dScripts/ai/SPEC/Special10GoldCoinSpawner.h b/dScripts/ai/SPEC/Special10GoldCoinSpawner.h deleted file mode 100644 index 0f45832b..00000000 --- a/dScripts/ai/SPEC/Special10GoldCoinSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIAL10GOLDCOINSPAWNER__H__ -#define __SPECIAL10GOLDCOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special10GoldCoinSpawner : public SpecialCoinSpawner { -public: - Special10GoldCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 100000; -}; - -#endif //!__SPECIAL10GOLDCOINSPAWNER__H__ diff --git a/dScripts/ai/SPEC/Special10SilverCoinSpawner.h b/dScripts/ai/SPEC/Special10SilverCoinSpawner.h deleted file mode 100644 index 55aa8c2b..00000000 --- a/dScripts/ai/SPEC/Special10SilverCoinSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIAL10SILVERCOINSPAWNER__H__ -#define __SPECIAL10SILVERCOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special10SilverCoinSpawner : public SpecialCoinSpawner { -public: - Special10SilverCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 1000; -}; - -#endif //!__SPECIAL10SILVERCOINSPAWNER__H__ diff --git a/dScripts/ai/SPEC/Special1BronzeCoinSpawner.h b/dScripts/ai/SPEC/Special1BronzeCoinSpawner.h deleted file mode 100644 index 1577b95c..00000000 --- a/dScripts/ai/SPEC/Special1BronzeCoinSpawner.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef __SPECIAL1BRONZECOINSPAWNER__H__ -#define __SPECIAL1BRONZECOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special1BronzeCoinSpawner : public SpecialCoinSpawner { -public: - Special1BronzeCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 1; -}; - -#endif //!__SPECIAL1BRONZECOINSPAWNER__H__ - - diff --git a/dScripts/ai/SPEC/Special1GoldCoinSpawner.h b/dScripts/ai/SPEC/Special1GoldCoinSpawner.h deleted file mode 100644 index a1fd2737..00000000 --- a/dScripts/ai/SPEC/Special1GoldCoinSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIAL1GOLDCOINSPAWNER__H__ -#define __SPECIAL1GOLDCOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special1GoldCoinSpawner : public SpecialCoinSpawner { -public: - Special1GoldCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 10000; -}; - -#endif //!__SPECIAL1GOLDCOINSPAWNER__H__ diff --git a/dScripts/ai/SPEC/Special1SilverCoinSpawner.h b/dScripts/ai/SPEC/Special1SilverCoinSpawner.h deleted file mode 100644 index 558f9a63..00000000 --- a/dScripts/ai/SPEC/Special1SilverCoinSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIAL1SILVERCOINSPAWNER__H__ -#define __SPECIAL1SILVERCOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special1SilverCoinSpawner : public SpecialCoinSpawner { -public: - Special1SilverCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 100; -}; - -#endif //!__SPECIAL1SILVERCOINSPAWNER__H__ diff --git a/dScripts/ai/SPEC/Special25BronzeCoinSpawner.h b/dScripts/ai/SPEC/Special25BronzeCoinSpawner.h deleted file mode 100644 index 6be32fb1..00000000 --- a/dScripts/ai/SPEC/Special25BronzeCoinSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIAL25BRONZECOINSPAWNER__H__ -#define __SPECIAL25BRONZECOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special25BronzeCoinSpawner : public SpecialCoinSpawner { -public: - Special25BronzeCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 25; -}; - -#endif //!__SPECIAL25BRONZECOINSPAWNER__H__ diff --git a/dScripts/ai/SPEC/Special25GoldCoinSpawner.h b/dScripts/ai/SPEC/Special25GoldCoinSpawner.h deleted file mode 100644 index 30eb8688..00000000 --- a/dScripts/ai/SPEC/Special25GoldCoinSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIAL25GOLDCOINSPAWNER__H__ -#define __SPECIAL25GOLDCOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special25GoldCoinSpawner : public SpecialCoinSpawner { -public: - Special25GoldCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 250000; -}; - -#endif //!__SPECIAL25GOLDCOINSPAWNER__H__ diff --git a/dScripts/ai/SPEC/Special25SilverCoinSpawner.h b/dScripts/ai/SPEC/Special25SilverCoinSpawner.h deleted file mode 100644 index c07ae2d6..00000000 --- a/dScripts/ai/SPEC/Special25SilverCoinSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIAL25SILVERCOINSPAWNER__H__ -#define __SPECIAL25SILVERCOINSPAWNER__H__ - -#include "SpecialCoinSpawner.h" - -class Special25SilverCoinSpawner : public SpecialCoinSpawner { -public: - Special25SilverCoinSpawner() : SpecialCoinSpawner(m_currencyDenomination) {}; -private: - static const uint32_t m_currencyDenomination = 2500; -}; - -#endif //!__SPECIAL25SILVERCOINSPAWNER__H__ diff --git a/dScripts/ai/SPEC/SpecialArmorPowerupSpawner.h b/dScripts/ai/SPEC/SpecialArmorPowerupSpawner.h deleted file mode 100644 index d6599c7f..00000000 --- a/dScripts/ai/SPEC/SpecialArmorPowerupSpawner.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __SPECIALARMORPOWERUPSPAWNER__H__ -#define __SPECIALARMORPOWERUPSPAWNER__H__ - -#include "SpecialPowerupSpawner.h" - -class SpecialArmorPowerupSpawner : public SpecialPowerupSpawner { -public: - SpecialArmorPowerupSpawner() : SpecialPowerupSpawner(m_SkillId) {}; -private: - uint32_t m_SkillId = 80; -}; - - -#endif //!__SPECIALARMORPOWERUPSPAWNER__H__ diff --git a/dScripts/ai/SPEC/SpecialCoinSpawner.cpp b/dScripts/ai/SPEC/SpecialCoinSpawner.cpp index 447230de..aed9e817 100644 --- a/dScripts/ai/SPEC/SpecialCoinSpawner.cpp +++ b/dScripts/ai/SPEC/SpecialCoinSpawner.cpp @@ -11,6 +11,6 @@ void SpecialCoinSpawner::OnProximityUpdate(Entity* self, Entity* entering, const auto character = entering->GetCharacter(); if (!character) return; GameMessages::SendPlayFXEffect(self, -1, u"pickup", "", LWOOBJID_EMPTY, 1, 1, true); - character->SetCoins(character->GetCoins() + this->m_currencyDenomination, eLootSourceType::LOOT_SOURCE_CURRENCY); + character->SetCoins(character->GetCoins() + this->m_CurrencyDenomination, eLootSourceType::LOOT_SOURCE_CURRENCY); self->Smash(entering->GetObjectID(), eKillType::SILENT); } diff --git a/dScripts/ai/SPEC/SpecialCoinSpawner.h b/dScripts/ai/SPEC/SpecialCoinSpawner.h index 6d73f6f0..5af6f24a 100644 --- a/dScripts/ai/SPEC/SpecialCoinSpawner.h +++ b/dScripts/ai/SPEC/SpecialCoinSpawner.h @@ -4,10 +4,10 @@ class SpecialCoinSpawner : public CppScripts::Script { public: SpecialCoinSpawner(uint32_t CurrencyDenomination) { - m_currencyDenomination = CurrencyDenomination; + m_CurrencyDenomination = CurrencyDenomination; }; void OnStartup(Entity* self) override; void OnProximityUpdate(Entity* self, Entity* entering, const std::string name, const std::string status) override; private: - int32_t m_currencyDenomination = 0; + int32_t m_CurrencyDenomination = 0; }; diff --git a/dScripts/ai/SPEC/SpecialImaginePowerupSpawner.h b/dScripts/ai/SPEC/SpecialImaginePowerupSpawner.h deleted file mode 100644 index ec13e253..00000000 --- a/dScripts/ai/SPEC/SpecialImaginePowerupSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIALIMAGINEPOWERUPSPAWNER__H__ -#define __SPECIALIMAGINEPOWERUPSPAWNER__H__ - -#include "SpecialPowerupSpawner.h" - -class SpecialImaginePowerupSpawner : public SpecialPowerupSpawner { -public: - SpecialImaginePowerupSpawner() : SpecialPowerupSpawner(m_SkillId) {}; -private: - uint32_t m_SkillId = 13; -}; - -#endif //!__SPECIALIMAGINEPOWERUPSPAWNER__H__ diff --git a/dScripts/ai/SPEC/SpecialImaginePowerupSpawner2pt.h b/dScripts/ai/SPEC/SpecialImaginePowerupSpawner2pt.h deleted file mode 100644 index d7e4428c..00000000 --- a/dScripts/ai/SPEC/SpecialImaginePowerupSpawner2pt.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIALIMAGINEPOWERUPSPAWNER2PT__H__ -#define __SPECIALIMAGINEPOWERUPSPAWNER2PT__H__ - -#include "SpecialPowerupSpawner.h" - -class SpecialImaginePowerupSpawner2pt : public SpecialPowerupSpawner { -public: - SpecialImaginePowerupSpawner2pt() : SpecialPowerupSpawner(m_SkillId) {}; -private: - uint32_t m_SkillId = 129; -}; - -#endif //!__SPECIALIMAGINEPOWERUPSPAWNER2PT__H__ diff --git a/dScripts/ai/SPEC/SpecialLifePowerupSpawner.h b/dScripts/ai/SPEC/SpecialLifePowerupSpawner.h deleted file mode 100644 index 2b5ce687..00000000 --- a/dScripts/ai/SPEC/SpecialLifePowerupSpawner.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __SPECIALLIFEPOWERUPSPAWNER__H__ -#define __SPECIALLIFEPOWERUPSPAWNER__H__ - -#include "SpecialPowerupSpawner.h" - -class SpecialLifePowerupSpawner : public SpecialPowerupSpawner { -public: - SpecialLifePowerupSpawner() : SpecialPowerupSpawner(m_SkillId) {}; -private: - uint32_t m_SkillId = 5; -}; - -#endif //!__SPECIALLIFEPOWERUPSPAWNER__H__