Added item precondition checks

Added item precondition checks for items so players who do not meet the conditions cannot use the items.  tested with the faction bag tokens and they only gave the tokens when a player met all the preconditions or was a Game Master of level 6+
This commit is contained in:
EmosewaMC 2022-06-20 21:02:52 -07:00
parent 29199f4755
commit 43377caa3b

View File

@ -311,7 +311,9 @@ bool Item::UseNonEquip()
const auto success = !packages.empty(); const auto success = !packages.empty();
Game::logger->Log("Item", "Used (%i) with (%d)\n", lot, success); auto inventoryComponent = inventory->GetComponent();
auto playerEntity = inventoryComponent->GetParent();
if (subKey != LWOOBJID_EMPTY) if (subKey != LWOOBJID_EMPTY)
{ {
@ -324,8 +326,7 @@ bool Item::UseNonEquip()
return true; return true;
} }
} }
if (success && (playerEntity->GetGMLevel() >= eGameMasterLevel::GAME_MASTER_LEVEL_JUNIOR_DEVELOPER || this->GetPreconditionExpression()->Check(playerEntity)))
if (success)
{ {
auto* entityParent = inventory->GetComponent()->GetParent(); auto* entityParent = inventory->GetComponent()->GetParent();
@ -342,7 +343,7 @@ bool Item::UseNonEquip()
LootGenerator::Instance().GiveLoot(inventory->GetComponent()->GetParent(), result, eLootSourceType::LOOT_SOURCE_CONSUMPTION); LootGenerator::Instance().GiveLoot(inventory->GetComponent()->GetParent(), result, eLootSourceType::LOOT_SOURCE_CONSUMPTION);
} }
Game::logger->Log("Item", "Used (%i)\n", lot);
inventory->GetComponent()->RemoveItem(lot, 1); inventory->GetComponent()->RemoveItem(lot, 1);
} }