Skip to content

feat: check_invcat hunt config implementation #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pazaz merged 2 commits into from
Jul 24, 2026
Merged

feat: check_invcat hunt config implementation #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a326e71
feat: check_invcat config impl
Indio3 Jul 16, 2026
9dda92b
fix comment
Indio3 Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/cache/config/HuntType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export default class HuntType extends ConfigType {
checkLoc: number = -1;
checkInv: number = -1;
checkObjParam: number = -1;
checkObjCat: number = -1;
checkInvCondition: string = '';
checkInvVal: number = -1;
checkVars: { varId: number; condition: string; val: number }[] = [];
Expand Down Expand Up @@ -138,7 +139,12 @@ export default class HuntType extends ConfigType {
this.checkObjParam = dat.g2();
this.checkInvCondition = dat.gjstr();
this.checkInvVal = dat.g4s();
} else if (code > 17 && code < 21) {
} else if (code === 18) {
this.checkInv = dat.g2();
this.checkObjCat = dat.g2();
this.checkInvCondition = dat.gjstr();
this.checkInvVal = dat.g4s();
} else if (code > 18 && code < 22) {
this.checkVars.push({ varId: dat.g2(), condition: dat.gjstr(), val: dat.g4s() });
} else if (code === 250) {
this.debugname = dat.gjstr();
Expand Down
2 changes: 2 additions & 0 deletions src/engine/entity/Npc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,8 @@ export default class Npc extends PathingEntity {
quantity = player.invTotal(hunt.checkInv, hunt.checkObj);
} else if (hunt.checkObjParam !== -1) {
quantity = player.invTotalParam(hunt.checkInv, hunt.checkObjParam);
} else if (hunt.checkObjCat !== -1) {
quantity = player.invTotalCat(hunt.checkInv, hunt.checkObjCat);
}
if (!hunt.checkHuntCondition(quantity, hunt.checkInvCondition, hunt.checkInvVal)) {
continue;
Expand Down
60 changes: 50 additions & 10 deletions tools/pack/config/HuntConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { HuntNobodyNear } from '#/engine/entity/hunt/HuntNobodyNear.js';
import { HuntVis } from '#/engine/entity/hunt/HuntVis.js';
import { NpcMode } from '#/engine/entity/NpcMode.js';
import { CategoryPack, HuntPack, InvPack, LocPack, NpcPack, ObjPack, ParamPack, VarnPack, VarpPack } from '#tools/pack/PackFile.js';
import { ConfigValue, ConfigLine, PackedData, isConfigBoolean, getConfigBoolean, HuntCheckInv, HuntCheckInvParam, HuntCheckVar } from '#tools/pack/config/PackShared.js';
import { ConfigValue, ConfigLine, PackedData, isConfigBoolean, getConfigBoolean, HuntCheckInv, HuntCheckInvParam, HuntCheckVar, HuntCheckInvCat } from '#tools/pack/config/PackShared.js';

export function parseHuntConfig(key: string, value: string): ConfigValue | null | undefined {
const stringKeys: string[] = [];
Expand Down Expand Up @@ -326,7 +326,7 @@ export function parseHuntConfig(key: string, value: string): ConfigValue | null
}
return { inv, obj, condition, val };
} else if (key === 'check_invparam') {
// check_inv=inv,param,min,max
// check_invparam=inv,param,cond
const parts: string[] = value.split(',');
if (parts.length !== 3) {
return null;
Expand All @@ -351,6 +351,32 @@ export function parseHuntConfig(key: string, value: string): ConfigValue | null
return null;
}
return { inv, param, condition, val };
} else if (key === 'check_invcat') {
// check_invcat=inv,param,cond
const parts: string[] = value.split(',');
if (parts.length !== 3) {
return null;
}

const inv = InvPack.getByName(parts[0]);
if (inv === -1) {
return null;
}

const category = CategoryPack.getByName(parts[1]);
if (category === -1) {
return null;
}
const conditionWithVal = parts[2];
const condition = conditionWithVal.charAt(0);
if (!['=', '>', '<', '!'].includes(condition)) {
return null;
}
const val = parseInt(conditionWithVal.slice(1));
if (isNaN(val)) {
return null;
}
return { inv, category, condition, val };
} else if (key === 'extracheck_var') {
const parts: string[] = value.split(',');

Expand Down Expand Up @@ -448,7 +474,7 @@ export function packHuntConfigs(configs: Map<string, ConfigLine[]>): { client: P
}
} else if (key === 'check_category') {
if (
config.every(x => x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_inv' && x.key !== 'check_invparam') &&
config.every(x => x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_inv' && x.key !== 'check_invparam' && x.key !== 'check_invcat') &&
config.filter(x => x.key === 'type' && (x.value === HuntModeType.NPC || x.value === HuntModeType.OBJ || x.value === HuntModeType.SCENERY)).length > 0
) {
server.p1(12);
Expand All @@ -458,7 +484,7 @@ export function packHuntConfigs(configs: Map<string, ConfigLine[]>): { client: P
}
} else if (key === 'check_npc') {
if (
config.every(x => x.key !== 'check_category' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_inv' && x.key !== 'check_invparam') &&
config.every(x => x.key !== 'check_category' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_inv' && x.key !== 'check_invparam' && x.key !== 'check_invcat') &&
config.filter(x => x.key === 'type' && x.value === HuntModeType.NPC).length > 0
) {
server.p1(13);
Expand All @@ -468,7 +494,7 @@ export function packHuntConfigs(configs: Map<string, ConfigLine[]>): { client: P
}
} else if (key === 'check_obj') {
if (
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_loc' && x.key !== 'check_inv' && x.key !== 'check_invparam') &&
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_loc' && x.key !== 'check_inv' && x.key !== 'check_invparam' && x.key !== 'check_invcat') &&
config.filter(x => x.key === 'type' && x.value === HuntModeType.OBJ).length > 0
) {
server.p1(14);
Expand All @@ -478,7 +504,7 @@ export function packHuntConfigs(configs: Map<string, ConfigLine[]>): { client: P
}
} else if (key === 'check_loc') {
if (
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_inv' && x.key !== 'check_invparam') &&
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_inv' && x.key !== 'check_invparam' && x.key !== 'check_invcat') &&
config.filter(x => x.key === 'type' && x.value === HuntModeType.SCENERY).length > 0
) {
server.p1(15);
Expand All @@ -488,7 +514,7 @@ export function packHuntConfigs(configs: Map<string, ConfigLine[]>): { client: P
}
} else if (key === 'check_inv') {
if (
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_invparam') &&
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_invparam' && x.key !== 'check_invcat') &&
config.filter(x => x.key === 'type' && x.value === HuntModeType.PLAYER).length > 0
) {
const checkInv: HuntCheckInv = value as HuntCheckInv;
Expand All @@ -502,7 +528,7 @@ export function packHuntConfigs(configs: Map<string, ConfigLine[]>): { client: P
}
} else if (key === 'check_invparam') {
if (
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_inv') &&
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_inv' && x.key !== 'check_invcat') &&
config.filter(x => x.key === 'type' && x.value === HuntModeType.PLAYER).length > 0
) {
const checkInv: HuntCheckInvParam = value as HuntCheckInvParam;
Expand All @@ -514,13 +540,27 @@ export function packHuntConfigs(configs: Map<string, ConfigLine[]>): { client: P
} else {
throw new Error(`Hunt config: [${debugname}] unable to pack line!!!.\nInvalid property value: ${key}=${value}`);
}
} else if (key === 'check_invcat') {
if (
config.every(x => x.key !== 'check_category' && x.key !== 'check_npc' && x.key !== 'check_obj' && x.key !== 'check_loc' && x.key !== 'check_inv' && x.key !== 'check_invparam') &&
config.filter(x => x.key === 'type' && x.value === HuntModeType.PLAYER).length > 0
) {
const checkInv: HuntCheckInvCat = value as HuntCheckInvCat;
server.p1(18);
server.p2(checkInv.inv);
server.p2(checkInv.category);
server.pjstr(checkInv.condition);
server.p4(checkInv.val);
} else {
throw new Error(`Hunt config: [${debugname}] unable to pack line!!!.\nInvalid property value: ${key}=${value}`);
}
} else if (key === 'extracheck_var') {
// 18-20
// 19-21
if (extracheckVarsCount > 2) {
throw new Error(`Hunt config: [${debugname}] unable to pack line!!!.\nLimit of 3 extracheck_var properties exceeded.`);
} else if (value !== null && config.filter(x => x.key === 'type' && x.value === HuntModeType.PLAYER).length > 0) {
const checkVar: HuntCheckVar = value as HuntCheckVar;
server.p1(18 + extracheckVarsCount);
server.p1(19 + extracheckVarsCount);
server.p2(checkVar.varp);
server.pjstr(checkVar.condition);
server.p4(checkVar.val);
Expand Down
3 changes: 2 additions & 1 deletion tools/pack/config/PackShared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,9 @@ export type ParamValue = {
export type LocModelShape = { model: number; shape: number };
export type HuntCheckInv = { inv: number; obj: number; condition: string; val: number };
export type HuntCheckInvParam = { inv: number; param: number; condition: string; val: number };
export type HuntCheckInvCat = { inv: number; category: number; condition: string; val: number };
export type HuntCheckVar = { varp: number; condition: string; val: number };
export type ConfigValue = string | number | boolean | number[] | LocModelShape[] | ParamValue | HuntCheckInv | HuntCheckInvParam | HuntCheckVar;
export type ConfigValue = string | number | boolean | number[] | LocModelShape[] | ParamValue | HuntCheckInv | HuntCheckInvParam | HuntCheckInvCat | HuntCheckVar;
export type ConfigLine = { key: string; value: ConfigValue };

// we're using null for invalid values, undefined for invalid keys
Expand Down
Loading