Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-24 06:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
5b8d2b19a3
DarkflameServer/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

1096 lines
34 KiB
C++
Raw Normal View History

Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
#include "SGCannon.h"
#include "EntityManager.h"
#include "GameMessages.h"
#include "dZoneManager.h"
#include "Character.h"
#include "ShootingGalleryComponent.h"
#include "PossessorComponent.h"
#include "CharacterComponent.h"
#include "SimplePhysicsComponent.h"
#include "MovementAIComponent.h"
chore: cleanup objectIdManager overloading and classes (#1391) * objectIdManager fixes * Remove debug log
2024-01-05 12:31:22 +00:00
#include "ObjectIDManager.h"
Optimize scripts for faster compilation (#597) * Implement Precompiled Headers * First volume of optimizations * Scripts A-B Gonna be doing this in alphabetical order now. * C Scripts and remove unneeded includes from base cppscripts header Remove the MissionComponent and Loot includes from all base scripts and place their needed includes in the respective scripts. * D scripts * F scripts * F scripts 2 Finish up removing extraneous includes from scripts that start with the letter F * G scripts Removing extraneous includes from scripts that start with the letter G * I scripts Removing extraneous includes from scripts that start with the letter I * M-Z scripts Removing extraneous includes from scripts that start with the letter M-Z * Revert "Implement Precompiled Headers" This reverts commit d79d8d499135207e5510184628f4f59f4002e1a5. * Revert "Revert "Implement Precompiled Headers"" This reverts commit 0597faf308fb405f424c6e545b9ed70765e3c797. * Add back in PCH Add back in PCH * Fix CMake Whitespace Remove duplicate file glob Remove newline
2022-07-05 06:00:10 +00:00
#include "MissionComponent.h"
dGame Precompiled header improvements (#876) * moving branch * Add deleteinven slash command * Change name of BRICKS_IN_BBB * Use string_view instead of strcmp * Clean up include tree * Remove unneeded headers from PCH files Removes unneeded headers from pre-compiled headers. This increases compile time, however reduces development time for most files. * Update Entity.h * Update EntityManager.h * Update GameMessages.cpp * There it compiles now Co-authored-by: Aaron Kimbrell <aronwk.aaron@gmail.com>
2023-01-07 05:17:05 +00:00
#include "Loot.h"
Add Delete Inventory Slash Command (#865) * moving branch * Add deleteinven slash command * Change name of BRICKS_IN_BBB * Use string_view instead of strcmp * Remove GameConfig * Revert "Remove GameConfig" This reverts commit cef5cdeea2282e3fc09a118dbecb0009d851b95f.
2022-12-18 15:46:04 +00:00
#include "InventoryComponent.h"
Optimize scripts for faster compilation (#597) * Implement Precompiled Headers * First volume of optimizations * Scripts A-B Gonna be doing this in alphabetical order now. * C Scripts and remove unneeded includes from base cppscripts header Remove the MissionComponent and Loot includes from all base scripts and place their needed includes in the respective scripts. * D scripts * F scripts * F scripts 2 Finish up removing extraneous includes from scripts that start with the letter F * G scripts Removing extraneous includes from scripts that start with the letter G * I scripts Removing extraneous includes from scripts that start with the letter I * M-Z scripts Removing extraneous includes from scripts that start with the letter M-Z * Revert "Implement Precompiled Headers" This reverts commit d79d8d499135207e5510184628f4f59f4002e1a5. * Revert "Revert "Implement Precompiled Headers"" This reverts commit 0597faf308fb405f424c6e545b9ed70765e3c797. * Add back in PCH Add back in PCH * Fix CMake Whitespace Remove duplicate file glob Remove newline
2022-07-05 06:00:10 +00:00
#include "eMissionTaskType.h"
breakout the component types into a scoped enum (#1002) * breakout the component types into a scoped enum tested that things are the same as they were before * fix missed rename * fix brick-by-brick name to be crafting because that's what it is
2023-03-04 07:16:37 +00:00
#include "eReplicaComponentType.h"
Remove inlines Clean up macros more tomorrow Cleanup and optimize CDActivities table Remove unused include Further work on CDActivityRewards Update MasterServer.cpp Further animations work Activities still needs work for a better PK. fix type All of these replacements worked Create internal interface for animations Allows for user to just call GetAnimationTIme or PlayAnimation rather than passing in arbitrary true false statements
2023-03-20 13:10:52 +00:00
#include "RenderComponent.h"
Breakout rest of the enums from dCommonVars and clean it up (#1061) * Breakout rest of the enums from dcommonvars so we don't have to deal with merge conflicts ePlayerFlags is not a scoped enum, yet, due to it's complexity * address feedback * make player flag types consistent * fix typo
2023-05-02 22:39:21 +00:00
#include "eGameActivity.h"
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
void SGCannon::OnStartup(Entity* self) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("OnStartup");
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
m_Waves = GetWaves();
constants = GetConstants();
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
ResetVars(self);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetVar<bool>(GameStartedVariable, false);
self->SetVar<Vector3>(InitialVelocityVariable, {});
self->SetVar<uint32_t>(ImpactSkillVariale, constants.impactSkillID);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto* shootingGalleryComponent = self->GetComponent<ShootingGalleryComponent>();
if (shootingGalleryComponent != nullptr) {
shootingGalleryComponent->SetStaticParams({
Vector3 { -327.8609924316406, 256.8999938964844, 1.6482199430465698 },
Vector3 { -181.4320068359375, 212.39999389648438, 2.5182199478149414 }
});
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
shootingGalleryComponent->SetDynamicParams({
Vector3 { 0.0, 4.3, 9.0 },
Vector3 { },
129.0,
800.0,
30.0,
0.0,
-1.0,
58.6
});
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetVar<uint32_t>(TimeLimitVariable, 30);
self->SetVar<std::vector<LOT>>(ValidActorsVariable, { 3109, 3110, 3111, 3112, 3125, 3126 });
self->SetVar<std::vector<LOT>>(ValidEffectsVariable, { 3122 });
self->SetVar<std::vector<uint32_t>>(StreakBonusVariable, { 1, 2, 5, 10 });
self->SetVar<bool>(SuperChargeActiveVariable, false);
self->SetVar<uint32_t>(MatrixVariable, 1);
self->SetVar<bool>(InitVariable, true);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto* simplePhysicsComponent = self->GetComponent<SimplePhysicsComponent>();
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (simplePhysicsComponent != nullptr) {
simplePhysicsComponent->SetPhysicsMotionState(5);
}
fix: laggy property models (and probably more) (#1646) * fix laggy property models (and probably more) global fix correcting the initial physics motion state from 0 to 5 (confirm in client). packet captures from a few worlds (didnt scan more than 5 files) show that the value for simple physics was either 5, or 4 for property models, or 1 for property models with behaviors. properties with pre-built models no longer lag and values of physics types should be correct across the board * will test this briefly
2024-11-18 02:44:35 +00:00
Game::entityManager->SerializeEntity(self);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
void SGCannon::OnPlayerLoaded(Entity* self, Entity* player) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Player loaded");
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetVar<LWOOBJID>(PlayerIDVariable, player->GetObjectID());
}
void SGCannon::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2,
int32_t param3) {
Script::OnFireEventServerSide(self, sender, args, param1, param2, param3);
}
void SGCannon::OnActivityStateChangeRequest(Entity* self, LWOOBJID senderID, int32_t value1, int32_t value2,
const std::u16string& stringValue) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Got activity state change request: %s", GeneralUtils::UTF16ToWTF8(stringValue).c_str());
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (stringValue == u"clientready") {
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (player != nullptr) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Player is ready");
Imminuty updates (#925) * WIP Immunities * Immunity getters * remove redundent variable replace it use with it's equivalent * remove unused lookups, fix typos * fix tests * added imunity test * address feedback * more immunity tests * explicit this
2023-01-07 05:59:19 +00:00
/*GameMessages::SendSetStunned(player->GetObjectID(), eStateChangeType::PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
true, true, true, true, true, true, true);*/
format codebase
2022-07-28 13:39:57 +00:00
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Sending ActivityEnter");
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
GameMessages::SendActivityEnter(self->GetObjectID(), player->GetSystemAddress());
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto* shootingGalleryComponent = self->GetComponent<ShootingGalleryComponent>();
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (shootingGalleryComponent != nullptr) {
shootingGalleryComponent->SetCurrentPlayerID(player->GetObjectID());
format codebase
2022-07-28 13:39:57 +00:00
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Setting player ID");
format codebase
2022-07-28 13:39:57 +00:00
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
Game::entityManager->SerializeEntity(self);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
} else {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Shooting gallery component is null");
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto* characterComponent = player->GetComponent<CharacterComponent>();
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (characterComponent != nullptr) {
characterComponent->SetIsRacing(true);
Breakout rest of the enums from dCommonVars and clean it up (#1061) * Breakout rest of the enums from dcommonvars so we don't have to deal with merge conflicts ePlayerFlags is not a scoped enum, yet, due to it's complexity * address feedback * make player flag types consistent * fix typo
2023-05-02 22:39:21 +00:00
characterComponent->SetCurrentActivity(eGameActivity::SHOOTING_GALLERY);
breakout possessor from char comp (#606) * breakout possessor from char comp Use the correct component for possessor cleanup scirps that were using possessor improperly beginnings of mounts * fix comments added bounds check
2022-06-29 23:50:24 +00:00
auto possessor = player->GetComponent<PossessorComponent>();
if (possessor) {
possessor->SetPossessable(self->GetObjectID());
Possessor and possessable additions (#619) * possessor-fixup and possessable additions * comment and docstring fixes * fix possessable initialization * split animation flags into it's own header remove unnecessary checks
2022-07-09 03:25:15 +00:00
possessor->SetPossessableType(ePossessionType::NO_POSSESSION);
breakout possessor from char comp (#606) * breakout possessor from char comp Use the correct component for possessor cleanup scirps that were using possessor improperly beginnings of mounts * fix comments added bounds check
2022-06-29 23:50:24 +00:00
}
format codebase
2022-07-28 13:39:57 +00:00
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
Game::entityManager->SerializeEntity(player);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetNetworkVar<bool>(HideScoreBoardVariable, true);
self->SetNetworkVar<bool>(ReSetSuperChargeVariable, true);
self->SetNetworkVar<bool>(ShowLoadingUI, true);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
/*
GameMessages::SendTeleport(
Make logger automatically put a newline (#675) at the end of the line remove all the newlines in log calls
2022-07-25 02:26:51 +00:00
player->GetObjectID(),
{-292.6415710449219, 230.20237731933594, -3.9090466499328613},
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
{0.7067984342575073, -6.527870573336259e-05, 0.707414984703064, 0.00021762956748716533},
player->GetSystemAddress(), true
);
*/
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
//GameMessages::SendRequestActivityEnter(self->GetObjectID(), player->GetSystemAddress(), false, player->GetObjectID());
} else {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Player not found");
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
} else if (value1 == 1200) {
StartGame(self);
}
}
fix: not exiting shooting gallery when clicking activity close button Fixes #436 Fixes crash when replaying as well
2023-05-11 00:26:04 +00:00
void SGCannon::OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData) {
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
fix: not exiting shooting gallery when clicking activity close button Fixes #436 Fixes crash when replaying as well
2023-05-11 00:26:04 +00:00
if (!player) return;
if (identifier == u"Scoreboardinfo") {
GameMessages::SendDisplayMessageBox(player->GetObjectID(), true,
Move dZoneManager to game namespace (#1143) * convert zone manager to game namespace * Destroy logger last
2023-07-17 22:55:33 +00:00
Game::zoneManager->GetZoneControlObject()->GetObjectID(),
fix: not exiting shooting gallery when clicking activity close button Fixes #436 Fixes crash when replaying as well
2023-05-11 00:26:04 +00:00
u"Shooting_Gallery_Retry", 2, u"Retry?",
u"", player->GetSystemAddress());
} else {
if ((button == 1 && (identifier == u"Shooting_Gallery_Retry" || identifier == u"RePlay")) || identifier == u"SG1" || button == 0) {
if (IsPlayerInActivity(self, player->GetObjectID())) return;
self->SetNetworkVar<bool>(ClearVariable, true);
StartGame(self);
Working in game again hooray
2023-06-05 11:10:59 +00:00
} else if (button == 0 && ((identifier == u"Shooting_Gallery_Retry" || identifier == u"RePlay"))) {
fix: not exiting shooting gallery when clicking activity close button Fixes #436 Fixes crash when replaying as well
2023-05-11 00:26:04 +00:00
RemovePlayer(player->GetObjectID());
UpdatePlayer(self, player->GetObjectID(), true);
} else if (button == 1 && identifier == u"Shooting_Gallery_Exit") {
The shooting Gallery now properly ends when a player leaves the instance The shooting Gallery now properly ends when a player leaves the instance Frakjaw player update Update the Frakjaw battle instance script to remove players when they leave the instance Simplify comparison Simplify comparison for entity pointer to be implicit
2022-06-19 07:44:49 +00:00
UpdatePlayer(self, player->GetObjectID(), true);
RemovePlayer(player->GetObjectID());
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
}
}
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
void SGCannon::SuperChargeTimerFunc(Entity* self) {
if (self->GetVar<bool>(WaveStatusVariable) || self->GetVar<uint32_t>(CurrentSuperChargedTimeVariable) < 1) {
self->SetNetworkVar<uint32_t>(ChargeCountingVariable, 99);
self->SetNetworkVar<uint32_t>(SuperChargeBarVariable, 0);
ToggleSuperCharge(self, false);
}
}
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
void SGCannon::SpawnWaveTimerFunc(Entity* self) {
if (self->GetVar<bool>(GameStartedVariable)) {
self->SetVar<bool>(WaveStatusVariable, true);
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
const auto wave = static_cast<int32_t>(self->GetVar<uint32_t>(ThisWaveVariable));
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
if (wave != 0 && self->GetVar<bool>(SuperChargePausedVariable)) {
StartChargedCannon(self, self->GetVar<uint32_t>(CurrentSuperChargedTimeVariable));
self->SetVar<uint32_t>(CurrentSuperChargedTimeVariable, 0);
}
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
TimerToggle(self, true);
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
for (const auto& enemyToSpawn : m_Waves.at(self->GetVar<uint32_t>(ThisWaveVariable))) {
SpawnObject(self, enemyToSpawn, true);
}
format codebase
2022-07-28 13:39:57 +00:00
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Current wave spawn: %i/%i", wave, m_Waves.size());
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
// All waves completed
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
const auto timeLimit = static_cast<float_t>(self->GetVar<uint32_t>(TimeLimitVariable));
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
if (wave >= m_Waves.size()) {
ActivityTimerStart(self, GameOverTimer, timeLimit, timeLimit);
} else {
ActivityTimerStart(self, EndWaveTimer, timeLimit, timeLimit);
}
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
const auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
if (player != nullptr) {
GameMessages::SendPlayFXEffect(player->GetObjectID(), -1, u"SG-start", "");
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
GameMessages::SendStartActivityTime(self->GetObjectID(), timeLimit, player->GetSystemAddress());
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Sending ActivityPause false");
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
GameMessages::SendActivityPause(self->GetObjectID(), false, player->GetSystemAddress());
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
}
}
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
void SGCannon::EndWaveTimerFunc(Entity* self) {
self->SetVar<bool>(WaveStatusVariable, false);
TimerToggle(self);
RecordPlayerScore(self);
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
if (self->GetVar<uint32_t>(ThisWaveVariable) >= 2) {
GameMessages::SendActivityPause(self->GetObjectID(), true);
ActivityTimerStart(self, GameOverTimer, 0.1, 0.1);
return;
}
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
self->SetVar<uint32_t>(ThisWaveVariable, self->GetVar<uint32_t>(ThisWaveVariable) + 1);
PlaySceneAnimation(self, u"wave" + GeneralUtils::to_u16string(self->GetVar<uint32_t>(ThisWaveVariable)), true, true, 1.7f);
self->SetNetworkVar<uint32_t>(WaveNumVariable, self->GetVar<uint32_t>(ThisWaveVariable) + 1);
self->SetNetworkVar<uint32_t>(WaveStrVariable, self->GetVar<uint32_t>(TimeLimitVariable));
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Current wave: %i/%i", self->GetVar<uint32_t>(ThisWaveVariable), m_Waves.size());
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
if (self->GetVar<uint32_t>(ThisWaveVariable) >= m_Waves.size()) {
ActivityTimerStart(self, GameOverTimer, 0.1, 0.1);
} else {
ActivityTimerStart(self, SpawnWaveTimer, constants.inBetweenWavePause, constants.inBetweenWavePause);
}
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Sending ActivityPause true");
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
GameMessages::SendActivityPause(self->GetObjectID(), true);
if (self->GetVar<bool>(SuperChargeActiveVariable) && !self->GetVar<bool>(SuperChargePausedVariable)) {
PauseChargeCannon(self);
}
}
void SGCannon::GameOverTimerFunc(Entity* self) {
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
if (player != nullptr) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("Sending ActivityPause true");
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
GameMessages::SendActivityPause(self->GetObjectID(), true, player->GetSystemAddress());
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
/*const auto leftoverCannonballs = Game::entityManager->GetEntitiesInGroup("cannonball");
if (leftoverCannonballs.empty()) {
RecordPlayerScore(self);
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
} else {
ActivityTimerStart(self, EndGameBufferTimer, 1, leftoverCannonballs.size());
}*/
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
ActivityTimerStart(self, EndGameBufferTimer, 1, 1);
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
TimerToggle(self);
}
}
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
void SGCannon::DoSpawnTimerFunc(Entity* self, const std::string& name) {
if (self->GetVar<bool>(GameStartedVariable)) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("time name %s %s", name.c_str(), name.substr(7).c_str());
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
const auto spawnNumber = static_cast<uint32_t>(std::stoi(name.substr(7)));
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
const auto& activeSpawns = self->GetVar<std::vector<SGEnemy>>(ActiveSpawnsVariable);
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("size %i, %i", activeSpawns.size(), spawnNumber);
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
if (activeSpawns.size() <= spawnNumber) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("Trying to spawn %i when spawns size is only %i", spawnNumber, activeSpawns.size());
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
return;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
const auto& toSpawn = activeSpawns.at(spawnNumber);
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("toSpawn %i", toSpawn.spawnPaths.size());
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
const auto pathIndex = GeneralUtils::GenerateRandomNumber<float_t>(0, toSpawn.spawnPaths.size() - 1);
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("index %f", pathIndex);
LOG_DEBUG("%s", toSpawn.spawnPaths.at(pathIndex).c_str());
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
const auto* path = Game::zoneManager->GetZone()->GetPath(toSpawn.spawnPaths.at(pathIndex));
if (!path) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("Path %s at index %i is null", toSpawn.spawnPaths.at(pathIndex).c_str(), pathIndex);
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
return;
}
format codebase
2022-07-28 13:39:57 +00:00
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("%s", path->pathName.c_str());
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
auto info = EntityInfo{};
info.lot = toSpawn.lot;
info.spawnerID = self->GetObjectID();
info.pos = path->pathWaypoints.at(0).position;
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
info.settings = {
new LDFData<SGEnemy>(u"SpawnData", toSpawn),
new LDFData<std::string>(u"custom_script_server", "scripts/ai/ACT/SG_TARGET.lua"),
new LDFData<std::string>(u"custom_script_client", "scripts/client/ai/SG_TARGET_CLIENT.lua"),
new LDFData<std::string>(u"attached_path", path->pathName),
new LDFData<uint32_t>(u"attached_path_start", 0),
new LDFData<std::u16string>(u"groupID", u"SGEnemy")
};
format codebase
2022-07-28 13:39:57 +00:00
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG_DEBUG("Spawning enemy %i on path %s", toSpawn.lot, path->pathName.c_str());
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
auto* enemy = Game::entityManager->CreateEntity(info, nullptr, self);
Game::entityManager->ConstructEntity(enemy);
format codebase
2022-07-28 13:39:57 +00:00
feat: Add isolated and simplified path to add components (#1204) * Components: Make ComponentType inline Prevents the next commits ODR violation * Components: Add new components * Entity: Add headers inline script component ComponentType * Components: Flip constructor argument order Entity comes first always * Entity: Add generic AddComponent Allows for much easier adding of components and is error proof by not allowing the user to add more than 1 of a specific component type to an Entity. * Entity: Migrate all component constructors Move all to the new variadic templates AddComponent function to reduce clutter and ways the component map is modified. The new function makes no assumptions. Component is assumed to not exist and is checked for with operator[]. This will construct a null component which will then be newed if the component didnt exist, or it will just get the current component if it does already exist. No new component will be allocated or constructed if the component already exists and the already existing pointer is returned instead. * Entity: Add placement new For the case where the component may already exist, use a placement new to construct the component again, it would be constructed again, but would not need to go through the allocator. * Entity: Add comments on likely new code * Tests: Fix tests * Update Entity.cpp * Update SGCannon.cpp * Entity: call destructor when re-constructing * Update Entity.cpp Update Entity.cpp --------- Co-authored-by: Aaron Kimbrell <aronwk.aaron@gmail.com>
2023-10-23 01:08:49 +00:00
auto* movementAI = enemy->AddComponent<MovementAIComponent>(MovementAIInfo{});
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
movementAI->SetMaxSpeed(toSpawn.initialSpeed);
movementAI->SetCurrentSpeed(toSpawn.initialSpeed);
movementAI->SetHaltDistance(0.0f);
format codebase
2022-07-28 13:39:57 +00:00
feat: Add MovingAI pathing for NPCs without combatAI (#1509) * remove goto * Update MovementAIComponent.cpp * convert to PathWaypoint Easier for usage with paths * add path parsing * ref removal, simplification of work * it works * Update MovementAIComponent.cpp * disable pathing for combat we just need it for npcs for now, combat ai can be done later * fixed stuttery enemies wow * start at ramped up speed * add pausing and resuming * Update MovementAIComponent.cpp * Update MovementAIComponent.h * Update CMakeLists.txt
2024-03-27 02:06:22 +00:00
std::vector<PathWaypoint> pathWaypoints = path->pathWaypoints;
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
if (GeneralUtils::GenerateRandomNumber<float_t>(0, 1) < 0.5f) {
std::reverse(pathWaypoints.begin(), pathWaypoints.end());
}
format codebase
2022-07-28 13:39:57 +00:00
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
movementAI->SetPath(pathWaypoints);
enemy->AddDieCallback([this, self, enemy, name]() {
RegisterHit(self, enemy, name);
});
// Save the enemy and tell it to start pathing
if (enemy != nullptr) {
const_cast<std::vector<LWOOBJID>&>(self->GetVar<std::vector<LWOOBJID>>(SpawnedObjects)).push_back(enemy->GetObjectID());
GameMessages::SendPlatformResync(enemy, UNASSIGNED_SYSTEM_ADDRESS);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
}
}
void SGCannon::EndGameBufferTimerFunc(Entity* self) {
RecordPlayerScore(self);
StopGame(self, false);
}
void SGCannon::OnActivityTimerDone(Entity* self, const std::string& name) {
if (name == SuperChargeTimer && !self->GetVar<bool>(SuperChargePausedVariable)) {
SuperChargeTimerFunc(self);
} else if (name == SpawnWaveTimer) {
SpawnWaveTimerFunc(self);
} else if (name == EndWaveTimer) {
EndWaveTimerFunc(self);
} else if (name == GameOverTimer) {
GameOverTimerFunc(self);
} else if (name.rfind(DoSpawnTimer, 0) == 0) {
DoSpawnTimerFunc(self, name);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
} else if (name == EndGameBufferTimer) {
Cannon Cove: Fix incorrect sign (#1211) Update CMakeVariables.txt Cannon Cove: Fix incorrect sign
2023-10-09 20:29:11 +00:00
EndGameBufferTimerFunc(self);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
}
void
SGCannon::OnActivityTimerUpdate(Entity* self, const std::string& name, float_t timeRemaining, float_t elapsedTime) {
ActivityManager::OnActivityTimerUpdate(self, name, timeRemaining, elapsedTime);
}
void SGCannon::StartGame(Entity* self) {
fix: not exiting shooting gallery when clicking activity close button Fixes #436 Fixes crash when replaying as well
2023-05-11 00:26:04 +00:00
if (self->GetVar<bool>(GameStartedVariable)) return;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetNetworkVar<uint32_t>(TimeLimitVariable, self->GetVar<uint32_t>(TimeLimitVariable));
self->SetNetworkVar<bool>(AudioStartIntroVariable, true);
self->SetVar<LOT>(CurrentRewardVariable, LOT_NULL);
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto rewardObjects = Game::entityManager->GetEntitiesInGroup(constants.rewardModelGroup);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
for (auto* reward : rewardObjects) {
reward->OnFireEventServerSide(self, ModelToBuildEvent);
}
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (player != nullptr) {
commit
2023-05-10 05:00:13 +00:00
GetLeaderboardData(self, player->GetObjectID(), GetActivityID(self), 1);
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Sending ActivityStart");
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
GameMessages::SendActivityStart(self->GetObjectID(), player->GetSystemAddress());
GameMessages::SendPlayFXEffect(self->GetObjectID(), -1, u"start", "");
self->SetNetworkVar<bool>(ClearVariable, true);
DoGameStartup(self);
if (!self->GetVar<bool>(FirstTimeDoneVariable)) {
TakeActivityCost(self, player->GetObjectID());
}
self->SetVar<bool>(FirstTimeDoneVariable, true);
}
SpawnNewModel(self);
}
void SGCannon::DoGameStartup(Entity* self) {
ResetVars(self);
self->SetVar<bool>(GameStartedVariable, true);
self->SetNetworkVar<bool>(ClearVariable, true);
self->SetVar<uint32_t>(ThisWaveVariable, 0);
if (constants.firstWaveStartTime < 1) {
constants.firstWaveStartTime = 1;
}
ActivityTimerStart(self, SpawnWaveTimer, constants.firstWaveStartTime,
constants.firstWaveStartTime);
}
void SGCannon::SpawnNewModel(Entity* self) {
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Add a new reward to the existing rewards
const auto currentReward = self->GetVar<LOT>(CurrentRewardVariable);
if (currentReward != -1) {
auto rewards = self->GetVar<std::vector<LOT>>(RewardsVariable);
rewards.push_back(currentReward);
self->SetNetworkVar<int32_t>(RewardAddedVariable, currentReward);
}
format codebase
2022-07-28 13:39:57 +00:00
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (player != nullptr) {
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
for (auto* rewardModel : Game::entityManager->GetEntitiesInGroup(constants.rewardModelGroup)) {
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
uint32_t lootMatrix;
switch (self->GetVar<uint32_t>(MatrixVariable)) {
case 1:
lootMatrix = constants.scoreLootMatrix1;
break;
case 2:
lootMatrix = constants.scoreLootMatrix2;
break;
case 3:
lootMatrix = constants.scoreLootMatrix3;
break;
case 4:
lootMatrix = constants.scoreLootMatrix4;
break;
case 5:
lootMatrix = constants.scoreLootMatrix5;
break;
default:
lootMatrix = 0;
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (lootMatrix != 0) {
std::unordered_map<LOT, int32_t> toDrop = {};
perf: Loot memory savings (#1165) * Move away from constructor queries Fix up other large tables to have proper backup lookups Revert "idk im just dumb ig" This reverts commit 5d5be5df53b8959b42b291613d7db749a65a3585. idk im just dumb ig * Fix slow components registry lookup * add define for cdclient cache all * Huge loot namespace rework - Remove all excess memory usage - do not cache components registry - cache loot matrices on startup of the destroyable component - convert loot singleton class to a namespace - rework loot cdclient tables to operate closer to how someone would actually use them (basically doing the previous LootGenerator::LootGenerator caching but in those tables) - Memory usage reduced by 10%+ across the board * cache rebuild matrix * Database: move reading to own function Also change name of cache to PascalCase * Database: Move common function rading
2023-10-09 20:33:22 +00:00
toDrop = Loot::RollLootMatrix(player, lootMatrix);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
for (auto drop : toDrop) {
rewardModel->OnFireEventServerSide(self, ModelToBuildEvent, drop.first);
self->SetVar<LOT>(CurrentRewardVariable, drop.first);
}
}
}
}
}
void SGCannon::RemovePlayer(LWOOBJID playerID) {
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(playerID);
chore: Simplify and move Player functionality to relevant component (#1408) * Moving and organizing Player code - Move code to CharacterComponent - Remove extraneous interfaces - Simplify some code greatly - Change some types to return and take in const ref (only structs larger than 8 bytes benefit from this change.) - Update code to use CharacterComponent for sending to zone instead of Player*. * Moving and organizing Player code - Move code to CharacterComponent - Remove extraneous interfaces - Simplify some code greatly - Change some types to return and take in const ref (only structs larger than 8 bytes benefit from this change.) - Update code to use CharacterComponent for sending to zone instead of Player*. - Remove static storage container (static containers can be destroyed before exit/terminate handler executes) * remove player cast * Remove extra includes
2024-01-12 17:39:51 +00:00
if (!player) return;
format codebase
2022-07-28 13:39:57 +00:00
chore: Simplify and move Player functionality to relevant component (#1408) * Moving and organizing Player code - Move code to CharacterComponent - Remove extraneous interfaces - Simplify some code greatly - Change some types to return and take in const ref (only structs larger than 8 bytes benefit from this change.) - Update code to use CharacterComponent for sending to zone instead of Player*. * Moving and organizing Player code - Move code to CharacterComponent - Remove extraneous interfaces - Simplify some code greatly - Change some types to return and take in const ref (only structs larger than 8 bytes benefit from this change.) - Update code to use CharacterComponent for sending to zone instead of Player*. - Remove static storage container (static containers can be destroyed before exit/terminate handler executes) * remove player cast * Remove extra includes
2024-01-12 17:39:51 +00:00
auto* character = player->GetCharacter();
auto* characterComponent = player->GetComponent<CharacterComponent>();
if (characterComponent && character) {
characterComponent->SendToZone(character->GetLastNonInstanceZoneID());
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
}
Working in game again hooray
2023-06-05 11:10:59 +00:00
void SGCannon::OnRequestActivityExit(Entity* self, LWOOBJID player, bool canceled) {
if (canceled) {
fix: not exiting shooting gallery when clicking activity close button Fixes #436 Fixes crash when replaying as well
2023-05-11 00:26:04 +00:00
StopGame(self, canceled);
RemovePlayer(player);
}
}
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
void SGCannon::StartChargedCannon(Entity* self, uint32_t optionalTime) {
optionalTime = optionalTime == 0 ? constants.chargedTime : optionalTime;
self->SetVar<bool>(SuperChargePausedVariable, false);
ToggleSuperCharge(self, true);
ActivityTimerStart(self, SuperChargeTimer, 1, optionalTime);
if (!self->GetVar<bool>(WaveStatusVariable)) {
PauseChargeCannon(self);
}
}
void SGCannon::TimerToggle(Entity* self, bool start) {
if (start) {
self->SetNetworkVar<uint32_t>(CountVariable, self->GetVar<uint32_t>(TimeLimitVariable));
self->SetVar<bool>(GameStartedVariable, true);
} else {
self->SetNetworkVar<bool>(StopVariable, true);
}
}
void SGCannon::SpawnObject(Entity* self, const SGEnemy& toSpawn, bool spawnNow) {
auto activeSpawns = self->GetVar<std::vector<SGEnemy>>(ActiveSpawnsVariable);
activeSpawns.push_back(toSpawn);
self->SetVar<std::vector<SGEnemy>>(ActiveSpawnsVariable, activeSpawns);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetVar(SpawnNumberVariable, activeSpawns.size() - 1);
const auto timerName = DoSpawnTimer + std::to_string(activeSpawns.size() - 1);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (spawnNow) {
if (toSpawn.minSpawnTime > 0 && toSpawn.maxSpawnTime > 0) {
const auto spawnTime = GeneralUtils::GenerateRandomNumber<float_t>(toSpawn.minSpawnTime, toSpawn.maxSpawnTime);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
ActivityTimerStart(self, timerName, spawnTime, spawnTime);
} else {
ActivityTimerStart(self, timerName, 1, 1);
}
} else if (toSpawn.respawns) {
const auto spawnTime = GeneralUtils::GenerateRandomNumber<float_t>(toSpawn.minRespawnTime, toSpawn.maxRespawnTime);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
ActivityTimerStart(self, timerName, spawnTime, spawnTime);
}
}
void SGCannon::RecordPlayerScore(Entity* self) {
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
const auto totalScore = self->GetVar<int32_t>(TotalScoreVariable);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
const auto currentWave = self->GetVar<uint32_t>(ThisWaveVariable);
if (currentWave > 0) {
auto totalWaveScore = 0;
auto playerScores = self->GetVar<std::vector<int32_t>>(PlayerScoresVariable);
for (const auto& waveScore : playerScores) {
totalWaveScore += waveScore;
}
if (currentWave >= playerScores.size()) {
playerScores.push_back(totalWaveScore);
} else {
playerScores[currentWave] = totalWaveScore;
}
}
}
void SGCannon::PlaySceneAnimation(Entity* self, const std::u16string& animationName, bool onCannon, bool onPlayer, float_t priority) {
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
for (auto* cannon : Game::entityManager->GetEntitiesInGroup("cannongroup")) {
Remove inlines Clean up macros more tomorrow Cleanup and optimize CDActivities table Remove unused include Further work on CDActivityRewards Update MasterServer.cpp Further animations work Activities still needs work for a better PK. fix type All of these replacements worked Create internal interface for animations Allows for user to just call GetAnimationTIme or PlayAnimation rather than passing in arbitrary true false statements
2023-03-20 13:10:52 +00:00
RenderComponent::PlayAnimation(cannon, animationName, priority);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (onCannon) {
Remove inlines Clean up macros more tomorrow Cleanup and optimize CDActivities table Remove unused include Further work on CDActivityRewards Update MasterServer.cpp Further animations work Activities still needs work for a better PK. fix type All of these replacements worked Create internal interface for animations Allows for user to just call GetAnimationTIme or PlayAnimation rather than passing in arbitrary true false statements
2023-03-20 13:10:52 +00:00
RenderComponent::PlayAnimation(self, animationName, priority);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (onPlayer) {
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (player != nullptr) {
Remove inlines Clean up macros more tomorrow Cleanup and optimize CDActivities table Remove unused include Further work on CDActivityRewards Update MasterServer.cpp Further animations work Activities still needs work for a better PK. fix type All of these replacements worked Create internal interface for animations Allows for user to just call GetAnimationTIme or PlayAnimation rather than passing in arbitrary true false statements
2023-03-20 13:10:52 +00:00
RenderComponent::PlayAnimation(player, animationName, priority);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
}
}
void SGCannon::PauseChargeCannon(Entity* self) {
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
const auto time = std::max(static_cast<uint32_t>(std::ceil(ActivityTimerGetCurrentTime(self, SuperChargeTimer))), static_cast<uint32_t>(1));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetVar<bool>(SuperChargePausedVariable, true);
self->SetVar<uint32_t>(CurrentSuperChargedTimeVariable, time);
self->SetNetworkVar<uint32_t>(ChargeCountingVariable, time);
ActivityTimerStop(self, SuperChargeTimer);
}
void SGCannon::StopGame(Entity* self, bool cancel) {
self->SetNetworkVar<bool>(ReSetSuperChargeVariable, true);
self->SetNetworkVar<bool>(HideSuperChargeVariable, true);
format codebase
2022-07-28 13:39:57 +00:00
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (player == nullptr)
return;
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
ToggleSuperCharge(self, false);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// The player won, store all the score and send rewards
if (!cancel) {
Fix shooting gallery leaderboard bugs - add weekly functionality for top scores - Fix shooting gallery score saving - remove extra leaderboard fetch
2023-06-22 04:46:11 +00:00
int32_t percentage = 0.0f;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto misses = self->GetVar<uint32_t>(MissesVariable);
auto fired = self->GetVar<uint32_t>(ShotsFiredVariable);
format codebase
2022-07-28 13:39:57 +00:00
Fix shooting gallery leaderboard bugs - add weekly functionality for top scores - Fix shooting gallery score saving - remove extra leaderboard fetch
2023-06-22 04:46:11 +00:00
if (fired > 0) {
percentage = misses / fired;
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto* missionComponent = player->GetComponent<MissionComponent>();
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (missionComponent != nullptr) {
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
missionComponent->Progress(eMissionTaskType::PERFORM_ACTIVITY, self->GetVar<int32_t>(TotalScoreVariable), self->GetObjectID(), "performact_score");
Fully Implemented Shooting Gallery Mission and Achievement Fixes (#381) * Fixed tab indent * Fully implemented Achievement tracking for Shooting Gallery - Removed logging in MissionTask.cpp and moved the checks for mission progression to after checking the instance. - Implemented the achievement tracking in SGCannon as well as tracking of the maximum hit streak and progression of enemy smashes in the shooting gallery.
2022-02-05 11:54:12 +00:00
missionComponent->Progress(eMissionTaskType::PERFORM_ACTIVITY, self->GetVar<uint32_t>(MaxStreakVariable), self->GetObjectID(), "performact_streak");
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
missionComponent->Progress(eMissionTaskType::ACTIVITY, m_CannonLot, 0, "", self->GetVar<int32_t>(TotalScoreVariable));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
format codebase
2022-07-28 13:39:57 +00:00
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
Loot::GiveActivityLoot(player, self, GetGameID(self), self->GetVar<int32_t>(TotalScoreVariable));
format codebase
2022-07-28 13:39:57 +00:00
Working in game again hooray
2023-06-05 11:10:59 +00:00
SaveScore(self, player->GetObjectID(),
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
static_cast<float>(self->GetVar<int32_t>(TotalScoreVariable)), static_cast<float>(self->GetVar<uint32_t>(MaxStreakVariable)), percentage);
Update SGCannon.cpp
2023-07-22 06:42:50 +00:00
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
StopActivity(self, player->GetObjectID(), self->GetVar<int32_t>(TotalScoreVariable), self->GetVar<uint32_t>(MaxStreakVariable), percentage);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetNetworkVar<bool>(AudioFinalWaveDoneVariable, true);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Give the player the model rewards they earned
auto* inventory = player->GetComponent<InventoryComponent>();
if (inventory != nullptr) {
for (const auto rewardLot : self->GetVar<std::vector<LOT>>(RewardsVariable)) {
Breakout rest of the enums from dCommonVars and clean it up (#1061) * Breakout rest of the enums from dcommonvars so we don't have to deal with merge conflicts ePlayerFlags is not a scoped enum, yet, due to it's complexity * address feedback * make player flag types consistent * fix typo
2023-05-02 22:39:21 +00:00
inventory->AddItem(rewardLot, 1, eLootSourceType::ACTIVITY, eInventoryType::MODELS);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetNetworkVar<std::u16string>(u"UI_Rewards",
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
GeneralUtils::to_u16string(self->GetVar<int32_t>(TotalScoreVariable)) + u"_0_0_0_0_0_0"
Add more null checks and split out code Makes crash logs more apparent for what stage they crashed in for the engine updating.
2023-05-06 06:31:30 +00:00
);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
GameMessages::SendActivityStop(self->GetObjectID(), false, cancel, player->GetSystemAddress());
self->SetVar<bool>(GameStartedVariable, false);
ActivityTimerStopAllTimers(self);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Destroy all spawners
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
for (auto* entity : Game::entityManager->GetEntitiesInGroup("SGEnemy")) {
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
entity->Kill();
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
ResetVars(self);
}
Make logger automatically put a newline (#675) at the end of the line remove all the newlines in log calls
2022-07-25 02:26:51 +00:00
void SGCannon::RegisterHit(Entity* self, Entity* target, const std::string& timerName) {
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
const auto& spawnInfo = target->GetVar<SGEnemy>(u"SpawnData");
if (spawnInfo.respawns) {
const auto respawnTime = GeneralUtils::GenerateRandomNumber<float_t>(spawnInfo.minRespawnTime, spawnInfo.maxRespawnTime);
ActivityTimerStart(self, timerName, respawnTime, respawnTime);
}
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
int32_t score = spawnInfo.score;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (score > 0) {
score += score * GetCurrentBonus(self);
if (!self->GetVar<bool>(SuperChargeActiveVariable)) {
self->SetVar<uint32_t>(u"m_curStreak", self->GetVar<uint32_t>(u"m_curStreak") + 1);
}
} else {
if (!self->GetVar<bool>(SuperChargeActiveVariable)) {
self->SetVar<uint32_t>(u"m_curStreak", 0);
}
self->SetNetworkVar<bool>(u"hitFriend", true);
}
auto lastSuperTotal = self->GetVar<uint32_t>(u"LastSuperTotal");
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
auto scScore = self->GetVar<int32_t>(TotalScoreVariable) - lastSuperTotal;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("LastSuperTotal: %i, scScore: %i, constants.chargedPoints: %i",
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
lastSuperTotal, scScore, constants.chargedPoints
);
if (!self->GetVar<bool>(SuperChargeActiveVariable) && scScore >= constants.chargedPoints && score >= 0) {
StartChargedCannon(self);
self->SetNetworkVar<float>(u"SuperChargeBar", 100.0f);
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
self->SetVar<uint32_t>(u"LastSuperTotal", self->GetVar<int32_t>(TotalScoreVariable));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
UpdateStreak(self);
GameMessages::SendNotifyClientShootingGalleryScore(self->GetObjectID(), UNASSIGNED_SYSTEM_ADDRESS,
0.0f,
score,
target->GetObjectID(),
target->GetPosition()
);
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
auto newScore = self->GetVar<int32_t>(TotalScoreVariable) + score;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (newScore < 0) {
newScore = 0;
}
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
self->SetVar<int32_t>(TotalScoreVariable, newScore);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetNetworkVar<uint32_t>(u"updateScore", newScore);
self->SetNetworkVar<std::u16string>(u"beatHighScore", GeneralUtils::to_u16string(newScore));
Fully Implemented Shooting Gallery Mission and Achievement Fixes (#381) * Fixed tab indent * Fully implemented Achievement tracking for Shooting Gallery - Removed logging in MissionTask.cpp and moved the checks for mission progression to after checking the instance. - Implemented the achievement tracking in SGCannon as well as tracking of the maximum hit streak and progression of enemy smashes in the shooting gallery.
2022-02-05 11:54:12 +00:00
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
Fully Implemented Shooting Gallery Mission and Achievement Fixes (#381) * Fixed tab indent * Fully implemented Achievement tracking for Shooting Gallery - Removed logging in MissionTask.cpp and moved the checks for mission progression to after checking the instance. - Implemented the achievement tracking in SGCannon as well as tracking of the maximum hit streak and progression of enemy smashes in the shooting gallery.
2022-02-05 11:54:12 +00:00
if (player == nullptr) return;
auto missionComponent = player->GetComponent<MissionComponent>();
if (missionComponent == nullptr) return;
missionComponent->Progress(eMissionTaskType::SMASH, spawnInfo.lot, self->GetObjectID());
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
Make logger automatically put a newline (#675) at the end of the line remove all the newlines in log calls
2022-07-25 02:26:51 +00:00
void SGCannon::UpdateStreak(Entity* self) {
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
const auto streakBonus = GetCurrentBonus(self);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
const auto curStreak = self->GetVar<uint32_t>(u"m_curStreak");
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
const auto marks = curStreak % 3;
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetNetworkVar<uint32_t>(u"cStreak", curStreak);
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (curStreak >= 0 && curStreak < 13) {
if (marks == 1) {
self->SetNetworkVar<bool>(u"Mark1", true);
} else if (marks == 2) {
self->SetNetworkVar<bool>(u"Mark2", true);
} else if (marks == 0 && curStreak > 0) {
self->SetVar<float_t>(u"StreakBonus", streakBonus);
self->SetNetworkVar<bool>(u"ShowStreak", streakBonus + 1);
self->SetNetworkVar<bool>(u"Mark3", true);
} else {
self->SetVar<float_t>(u"StreakBonus", streakBonus);
self->SetNetworkVar<bool>(u"UnMarkAll", true);
}
}
Fully Implemented Shooting Gallery Mission and Achievement Fixes (#381) * Fixed tab indent * Fully implemented Achievement tracking for Shooting Gallery - Removed logging in MissionTask.cpp and moved the checks for mission progression to after checking the instance. - Implemented the achievement tracking in SGCannon as well as tracking of the maximum hit streak and progression of enemy smashes in the shooting gallery.
2022-02-05 11:54:12 +00:00
auto maxStreak = self->GetVar<uint32_t>(MaxStreakVariable);
if (maxStreak < curStreak) self->SetVar<uint32_t>(MaxStreakVariable, curStreak);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
Make logger automatically put a newline (#675) at the end of the line remove all the newlines in log calls
2022-07-25 02:26:51 +00:00
float_t SGCannon::GetCurrentBonus(Entity* self) {
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto streak = self->GetVar<uint32_t>(u"m_curStreak");
if (streak > 12) {
streak = 12;
}
return streak / 3;
}
void SGCannon::ToggleSuperCharge(Entity* self, bool enable) {
if (enable && self->GetVar<bool>(SuperChargeActiveVariable))
return;
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
auto* player = Game::entityManager->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (player == nullptr) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Player not found in toggle super charge");
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
return;
}
auto* inventoryComponent = player->GetComponent<InventoryComponent>();
auto equippedItems = inventoryComponent->GetEquippedItems();
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Player has %d equipped items", equippedItems.size());
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto skillID = constants.cannonSkill;
Fix cannon super charge speed (#883) * Fix cannon * Update SGCannon.cpp
2022-12-16 21:23:09 +00:00
auto cooldown = constants.cannonRefireRate;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto* selfInventoryComponent = self->GetComponent<InventoryComponent>();
if (inventoryComponent == nullptr) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Inventory component not found");
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
return;
}
if (enable) {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Player is activating super charge");
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
selfInventoryComponent->UpdateSlot("greeble_r", { ObjectIDManager::GenerateRandomObjectID(), 6505, 1, 0 });
selfInventoryComponent->UpdateSlot("greeble_l", { ObjectIDManager::GenerateRandomObjectID(), 6506, 1, 0 });
// TODO: Equip items
skillID = constants.cannonSuperChargeSkill;
Fix cannon super charge speed (#883) * Fix cannon * Update SGCannon.cpp
2022-12-16 21:23:09 +00:00
cooldown = 400;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
} else {
selfInventoryComponent->UpdateSlot("greeble_r", { ObjectIDManager::GenerateRandomObjectID(), 0, 0, 0 });
selfInventoryComponent->UpdateSlot("greeble_l", { ObjectIDManager::GenerateRandomObjectID(), 0, 0, 0 });
Make logger automatically put a newline (#675) at the end of the line remove all the newlines in log calls
2022-07-25 02:26:51 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetNetworkVar<float>(u"SuperChargeBar", 0);
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Player disables super charge");
Make logger automatically put a newline (#675) at the end of the line remove all the newlines in log calls
2022-07-25 02:26:51 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// TODO: Unequip items
for (const auto& equipped : equippedItems) {
if (equipped.first == "special_r" || equipped.first == "special_l") {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Trying to unequip a weapon, %i", equipped.second.lot);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
auto* item = inventoryComponent->FindItemById(equipped.second.id);
if (item != nullptr) {
inventoryComponent->UnEquipItem(item);
} else {
feat: Abstract Logger and simplify code (#1207) * Logger: Rename logger to Logger from dLogger * Logger: Add compile time filename Fix include issues Add writers Add macros Add macro to force compilation * Logger: Replace calls with macros Allows for filename and line number to be logged * Logger: Add comments and remove extra define Logger: Replace with unique_ptr also flush console at exit. regular file writer should be flushed on file close. Logger: Remove constexpr on variable * Logger: Simplify code * Update Logger.cpp
2023-10-21 23:31:55 +00:00
LOG("Item not found, %i", equipped.second.lot);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
}
}
}
Fix cannon super charge speed (#883) * Fix cannon * Update SGCannon.cpp
2022-12-16 21:23:09 +00:00
cooldown = 800;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetVar<uint32_t>(NumberOfChargesVariable, 0);
}
const auto& constants = GetConstants();
auto* shootingGalleryComponent = self->GetComponent<ShootingGalleryComponent>();
if (shootingGalleryComponent == nullptr) {
return;
}
DynamicShootingGalleryParams properties = shootingGalleryComponent->GetDynamicParams();
Make logger automatically put a newline (#675) at the end of the line remove all the newlines in log calls
2022-07-25 02:26:51 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
properties.cannonFOV = 58.6f;
properties.cannonVelocity = 129.0;
Fix cannon super charge speed (#883) * Fix cannon * Update SGCannon.cpp
2022-12-16 21:23:09 +00:00
properties.cannonRefireRate = cooldown;
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
properties.cannonMinDistance = 30;
properties.cannonTimeout = -1;
shootingGalleryComponent->SetDynamicParams(properties);
Move EntityManager to Game namespace (#1140) * Move EntityManager to Game namespace * move initialization to later Need to wait for dZoneManager to be initialized. * Fix bugs - Cannot delete from a RandomAccessIterator while in a range based for loop. Touchup zone manager initialize replace magic numbers with better named constants replace magic zonecontrol id with a more readable hex alternative condense stack variables move initializers closer to their use initialize entity manager with zone control change initialize timings If zone is not zero we expect to initialize the entity manager during zone manager initialization Add constexpr for zone control LOT * Add proper error handling * revert vanity changes * Update WorldServer.cpp * Update dZoneManager.cpp
2023-07-15 20:56:33 +00:00
Game::entityManager->SerializeEntity(self);
Game::entityManager->SerializeEntity(player);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetNetworkVar<uint64_t>(CannonBallSkillIDVariable, skillID);
self->SetVar<bool>(SuperChargeActiveVariable, enable);
}
std::vector<std::vector<SGEnemy>> SGCannon::GetWaves() {
return {
// Wave 1
{
// Ship 1
{
std::vector<std::string> { "Wave_1_Ship_1", "Wave_1_Ship_3" },
6015, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Ship 2
{
std::vector<std::string> { "Wave_1_Ship_2", "Wave_1_Ship_4" },
6300, 0.0, 2.0, true, 0.0, 2.0,
2.0, 500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Sub 1
{
std::vector<std::string> { "Wave_1_Sub_1", "Wave_1_Sub_2" },
6016, 0.0, 2.0, true, 0.0, 2.0,
10.0, 1000, false, 0.0, 1.0,
1.0, true, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Sub 2
{
std::vector<std::string> { "Wave_2_Sub_1", "Wave_2_Sub_2" },
6016, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1000, false, 0.0, 1.0,
1.0, true, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Friendly
{
std::vector<std::string> { "Wave_3_FShip_1", "Wave_3_FShip_2" },
2168,0.0,5.0,true, 2.0, 5.0,
1.0, -1000, false, 0.0, 1.0,
1.0, false,true
}
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Wave 2
{
// Ship 1
{
std::vector<std::string> { "Wave_1_Ship_1", "Wave_1_Ship_3" },
6015, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Ship 2
{
std::vector<std::string> { "Wave_1_Ship_2", "Wave_1_Ship_4" },
6300, 0.0, 2.0, true, 0.0, 2.0,
2.0, 500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Ship 3
{
std::vector<std::string> { "Wave_2_Ship_1" },
6300, 0.0, 2.0, true, 0.0, 2.0,
2.0, 500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Ship 4
{
std::vector<std::string> { "Wave_2_Ship_2" },
6015, 0.0, 2.0, true, 0.0, 2.0,
2.0, 500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Sub 1
{
std::vector<std::string> { "Wave_1_Sub_1", "Wave_1_Sub_2" },
6016, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1000, false, 0.0, 1.0,
1.0, true, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Sub 2
{
std::vector<std::string> { "Wave_2_Sub_1", "Wave_2_Sub_2" },
6016, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1000, false, 0.0, 1.0,
1.0, true, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Duck
{
std::vector<std::string> { "Wave_1_Duck_1", "Wave_1_Duck_2" },
5946, 5.0, 10.0, true, 5.0, 10.0,
4.0, 5000, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Friendly
{
std::vector<std::string> { "Wave_3_FShip_1", "Wave_3_FShip_2" },
2168,0.0,5.0,true, 2.0, 5.0,
1.0, -1000, false, 0.0, 1.0,
1.0, false,true
}
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Wave 3
{
// Ship 1
{
std::vector<std::string> { "Wave_1_Ship_1", "Wave_1_Ship_3" },
6015, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Ship 2
{
std::vector<std::string> { "Wave_1_Ship_2", "Wave_1_Ship_4" },
6300, 0.0, 2.0, true, 0.0, 2.0,
2.0, 500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Ship 3
{
std::vector<std::string> { "Wave_2_Ship_1", "Wave_2_Ship_2" },
6015, 0.0, 2.0, true, 0.0, 2.0,
2.0, 500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Ship 4
{
std::vector<std::string> { "Wave_3_Ship_1", "Wave_3_Ship_2" },
6300, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1500, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Sub 1
{
std::vector<std::string> { "Wave_1_Sub_1", "Wave_1_Sub_2" },
6016, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1000, false, 0.0, 1.0,
1.0, true, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Sub 2
{
std::vector<std::string> { "Wave_2_Sub_1", "Wave_2_Sub_2" },
6016, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1000, false, 0.0, 1.0,
1.0, true, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Sub 3
{
std::vector<std::string> { "Wave_3_Sub_1", "Wave_3_Sub_2" },
6016, 0.0, 2.0, true, 0.0, 2.0,
2.0, 1000, false, 0.0, 1.0,
1.0, true, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Duck
{
std::vector<std::string> { "Wave_1_Duck_1", "Wave_1_Duck_2" },
5946, 5.0, 10.0, true, 5.0, 10.0,
4.0, 5000, false, 0.0, 1.0,
1.0, false, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Ness
{
std::vector<std::string> { "Wave_1_Ness_1", "Wave_1_Ness_2", "Wave_2_Ness_1" },
2565, 10.0, 15.0, true, 10.0, 15.0,
2.0, 10000, false, 0.0, 1.0,
1.0, true, true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Friendly 1
{
std::vector<std::string> { "Wave_3_FShip_1", "Wave_3_FShip_2" },
2168,0.0,5.0,true, 2.0, 5.0,
1.0, -1000, false, 0.0, 1.0,
1.0, false,true
},
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
// Friendly 2
{
std::vector<std::string> { "Wave_3_FShip_1", "Wave_3_FShip_2" },
2168,0.0,5.0,true, 2.0, 5.0,
1.0, -1000, false, 0.0, 1.0,
1.0, false,true
}
}
};
}
void SGCannon::ResetVars(Entity* self) {
self->SetVar<uint32_t>(SpawnNumberVariable, 0);
self->SetVar<uint32_t>(CurrentSpawnNumberVariable, 0);
self->SetVar<uint32_t>(ThisWaveVariable, 0);
self->SetVar<uint32_t>(GameScoreVariable, 0);
self->SetVar<uint32_t>(GameTimeVariable, 0);
self->SetVar<bool>(GameStartedVariable, false);
self->SetVar<uint32_t>(ShotsFiredVariable, 0);
self->SetVar<uint32_t>(MaxStreakVariable, 0);
self->SetVar<uint32_t>(MissesVariable, 0);
self->SetVar<uint32_t>(CurrentStreakVariable, 0);
self->SetVar<uint32_t>(CurrentSuperChargedTimeVariable, 0);
self->SetVar<std::vector<uint32_t>>(StreakBonusVariable, {});
self->SetVar<uint32_t>(LastSuperTotalVariable, 0);
self->SetVar<LOT>(CurrentRewardVariable, LOT_NULL);
self->SetVar<std::vector<LOT>>(RewardsVariable, {});
chore: Eradicate C-style casts and further clean up some code (#1361) * cast and code cleanup * cast cleanup * bug fixes and improvements * no getBoolField method exists * fixes * unbroke sg cannon scoring * removing comments * Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation) * (Hopefully) fix MacOS compilation error * partially-implemented feedback * more updates to account for feedback * change bool default --------- Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-28 04:18:20 +00:00
self->SetVar<int32_t>(TotalScoreVariable, 0);
format codebase
2022-07-28 13:39:57 +00:00
fix: shooting gallery bugs (#1347) fix: reset some more vars Co-authored-by: Aaron Kimbre <aronwk.aaron@gmail.com>
2023-12-23 17:50:14 +00:00
self->SetVar<uint32_t>(u"m_curStreak", 0);
self->SetNetworkVar<float>(u"SuperChargeBar", 0);
self->SetVar<uint32_t>(u"LastSuperTotal", 0);
self->SetNetworkVar<float>(u"SuperChargeBar", 0.0f);
self->SetNetworkVar<bool>(u"ShowStreak", 0);
self->SetNetworkVar<bool>(u"UnMarkAll", true);
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
const_cast<std::vector<SGEnemy>&>(self->GetVar<std::vector<SGEnemy>>(ActiveSpawnsVariable)).clear();
self->SetVar<std::vector<SGEnemy>>(ActiveSpawnsVariable, {});
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
const_cast<std::vector<LWOOBJID>&>(self->GetVar<std::vector<LWOOBJID>>(SpawnedObjects)).clear();
self->SetVar<std::vector<LWOOBJID>>(SpawnedObjects, {});
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
if (self->GetVar<bool>(InitVariable)) {
ToggleSuperCharge(self, false);
}
format codebase
2022-07-28 13:39:57 +00:00
Public release of the DLU server code! Have fun!
2021-12-05 17:54:36 +00:00
self->SetVar<uint32_t>(ImpactSkillVariale, constants.impactSkillID);
self->SetVar<std::vector<int32_t>>(PlayerScoresVariable, {});
ActivityTimerStopAllTimers(self);
}
SGConstants SGCannon::GetConstants() {
return {
Vector3 { -908.542480, 229.773178, -908.542480 },
Quaternion { 0.91913521289825, 0, 0.39394217729568, 0 },
1864,
34,
1822,
Vector3 { 6.652, -2, 1.5 },
157,
129.0,
30.0,
800.0,
Vector3 { 0, 4.3, 9 },
6297,
1822,
249,
228,
-1,
58.6,
true,
2,
10,
25000,
"QBRewardGroup",
1864,
50000,
157,
100000,
187,
200000,
188,
400000,
189,
800000,
190,
4.0,
7.0
};
}
Reference in New Issue Copy Permalink