shni/amayo
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: corregir error de inclusión de weaponItem en PlayerEquipment

Browse Source
This commit is contained in:
shni
2025-10-09 02:25:32 -05:00
parent 646f62d2e9
commit ed170f5298
2 changed files with 145 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/game/minigames/service.ts
View File

@@ -148,19 +148,23 @@ async function validateRequirements(
// 1. Intentar herramienta equipada en slot weapon si coincide el tipo
const equip = await prisma.playerEquipment.findUnique({
where: { userId_guildId: { userId, guildId } },
include: { weaponItem: true } as any,
});
if (equip?.weaponItemId && equip?.weaponItem) {
const wProps = parseItemProps((equip as any).weaponItem.props);
if (wProps.tool?.type === toolReq.toolType) {
const tier = Math.max(0, wProps.tool?.tier ?? 0);
if (
(toolReq.minTier == null || tier >= toolReq.minTier) &&
(!toolReq.allowedKeys ||
toolReq.allowedKeys.includes((equip as any).weaponItem.key))
) {
toolKeyUsed = (equip as any).weaponItem.key;
toolSource = "equipped";
if (equip?.weaponItemId) {
const weaponItem = await prisma.economyItem.findUnique({
where: { id: equip.weaponItemId },
});
if (weaponItem) {
const wProps = parseItemProps(weaponItem.props);
if (wProps.tool?.type === toolReq.toolType) {
const tier = Math.max(0, wProps.tool?.tier ?? 0);
if (
(toolReq.minTier == null || tier >= toolReq.minTier) &&
(!toolReq.allowedKeys ||
toolReq.allowedKeys.includes(weaponItem.key))
) {
toolKeyUsed = weaponItem.key;
toolSource = "equipped";
}
}
}
}