Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-12-12 02:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into raw-parsing-for-scene-data

Browse Source
This commit is contained in:
Aaron Kimbrell
2025-10-15 20:08:21 -05:00
committed by GitHub
parent 893d127e72 c2dba31f70
commit 2d744af20a
29 changed files with 1106 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dGame/dUtilities/SlashCommands/DEVGMCommands.cpp
View File

@@ -1314,7 +1314,7 @@ namespace DEVGMCommands {
for (uint32_t i = 0; i < loops; i++) {
while (true) {
auto lootRoll = Loot::RollLootMatrix(lootMatrixIndex.value());
const auto lootRoll = Loot::RollLootMatrix(nullptr, lootMatrixIndex.value());
totalRuns += 1;
bool doBreak = false;
for (const auto& kv : lootRoll) {
@@ -1479,15 +1479,20 @@ namespace DEVGMCommands {
void Inspect(Entity* entity, const SystemAddress& sysAddr, const std::string args) {
const auto splitArgs = GeneralUtils::SplitString(args, ' ');
if (splitArgs.empty()) return;
const auto idParsed = GeneralUtils::TryParse<LWOOBJID>(splitArgs[0]);
// First try to get the object by its ID if provided.
// Second try to get the object by player name.
// Lastly assume we were passed a component or LDF and try to find the closest entity with that component or LDF.
Entity* closest = nullptr;
if (idParsed) closest = Game::entityManager->GetEntity(idParsed.value());
float closestDistance = 0.0f;
std::u16string ldf;
bool isLDF = false;
closest = PlayerManager::GetPlayer(splitArgs[0]);
if (!closest) closest = PlayerManager::GetPlayer(splitArgs[0]);
if (!closest) {
auto component = GeneralUtils::TryParse<eReplicaComponentType>(splitArgs[0]);
if (!component) {