mirror of
https://github.com/brues-code/ClassicAPI.git
synced 2026-11-16 16:10:36 +00:00
C_Item.PickupItem(itemInfo) picks the matching item up onto the cursor.
itemInfo is an itemID / "item:NNN" / link / name (same input family as
UseItemByName / EquipItemByName): resolved via Item::Arg::Resolve and
found by Item::Location::FindByArg across equipment (1..19, checked first)
and bags (0..4) using the shared MatchesArg predicate (itemID, or the
decorated name for a name arg). An equipped match is lifted off the
paperdoll; a bag match off the container. Verified in-game (bag + equipped,
by id and by name).
Drives the engine's cursor-pickup primitives DIRECTLY rather than the Lua
Script_Pickup* state-machine wrappers (no faking the Lua stack), via a new
shared Item::Cursor:
- PickupEquipmentSlot -> FUN_004C7300 (self-contained; own guards)
- PickupBagItem -> FUN_00494B60, replicating the two guards the
Script wrapper applies (empty cursor + unlocked item) and the
post-pickup source lock. The empty-cursor check reuses a new shared
Cursor::Info::HasItem() (the same cursor-GUID globals GetCursorInfo
reads), rather than duplicating it.
Supporting consolidation in Item::Location:
- ResolveBagSlotDetail exposes the container object + linear slot the
cursor primitive needs; ResolveBagSlot now delegates to it.
- FindByArg (equipment-then-bags, MatchesArg) reuses FindByArgInBags for
the bag half; FindByItemID is now its itemID-only specialization.
C_EquipmentSet.UseEquipmentSet was considered but already uses the atomic
FUN_INVENTORY_SWAP (no cursor). EquipItemByName's auto-slot path still uses
the Script wrapper; migrating it to Item::Cursor::PickupBagItem is a
follow-up.
64 lines
2.4 KiB
C++
64 lines
2.4 KiB
C++
// This file is part of ClassicAPI.
|
|
//
|
|
// ClassicAPI is free software: you can redistribute it and/or modify it under the terms
|
|
// of the GNU General Public License as published by the Free Software Foundation, either
|
|
// version 3 of the License, or (at your option) any later version.
|
|
//
|
|
// ClassicAPI is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
// PURPOSE. See the GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License along with
|
|
// ClassicAPI. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
// `C_Item.PickupItem(itemInfo)` — finds the item matching `itemInfo` in
|
|
// the player's equipment or bags and picks it up onto the cursor.
|
|
// `itemInfo` is an itemID, `"item:NNN"` string, item link, or item name —
|
|
// the same input `C_Item.UseItemByName` / `EquipItemByName` accept,
|
|
// resolved via `Item::Arg::Resolve` and matched by `FindByArg` (itemID, or
|
|
// decorated name for a name arg) across equipment (1..19, checked first)
|
|
// and bags (0..4).
|
|
//
|
|
// The pickup goes through the shared `Item::Cursor` wrappers, which call
|
|
// the engine's cursor primitives directly (no Lua `Script_Pickup*`
|
|
// wrapper): an equipped match uses the equipment-slot primitive, a bag
|
|
// match the bag primitive (guarded on an empty cursor + unlocked item).
|
|
// Silently no-ops on bad input, no match, a busy cursor, or a locked item.
|
|
|
|
#include "Game.h"
|
|
#include "item/Arg.h"
|
|
#include "item/Cursor.h"
|
|
#include "item/Location.h"
|
|
|
|
namespace Item::Pickup {
|
|
|
|
namespace {
|
|
|
|
int __fastcall Script_C_Item_PickupItem(void *L) {
|
|
const auto arg = Item::Arg::Resolve(L, 1);
|
|
if (arg.itemID <= 0 && arg.name == nullptr)
|
|
return 0;
|
|
|
|
Item::Location::ByGUIDResult found;
|
|
if (!Item::Location::FindByArg(L, arg, &found))
|
|
return 0;
|
|
|
|
// equipmentSlotIndex != 0 → equipped (paperdoll slot); else a bag slot.
|
|
if (found.equipmentSlotIndex != 0)
|
|
Item::Cursor::PickupEquipmentSlot(found.equipmentSlotIndex);
|
|
else
|
|
Item::Cursor::PickupBagItem(L, found.bagID, found.slotIndex);
|
|
return 0;
|
|
}
|
|
|
|
void RegisterLuaFunctions() {
|
|
Game::Lua::RegisterTableFunction("C_Item", "PickupItem",
|
|
&Script_C_Item_PickupItem);
|
|
}
|
|
|
|
const Game::ModuleAutoRegister _autoreg{&RegisterLuaFunctions};
|
|
|
|
} // namespace
|
|
|
|
} // namespace Item::Pickup
|