Skip to content

Add default attributes to loot templates #490

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
holzmaster merged 4 commits into from
Nov 26, 2024
Merged

Add default attributes to loot templates #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
495a6f0
Add default attributes to loot templates
twobiers Nov 26, 2024
70c80ef
Format
twobiers Nov 26, 2024
97d39fc
Rename `defaultAttributes` to `initialAttributes`
twobiers Nov 26, 2024
fbaac04
Update src/storage/loot.ts
holzmaster Nov 26, 2024
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
2 changes: 2 additions & 0 deletions src/service/lootData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export const lootTemplates: LootTemplate[] = [
dropDescription: "Awww",
emote: ":catsmile:",
asset: "assets/loot/01-kadse.jpg",
initialAttributes: [LootAttributeKindId.SWEET],
attributeAsset: {
[LootAttributeKindId.RADIOACTIVE]: "assets/loot/attributes/01-kadse-verstrahlt.jpg",
},
Expand Down Expand Up @@ -484,6 +485,7 @@ export const lootTemplates: LootTemplate[] = [
dropDescription: "Bóbr kurwa! Ja pierdolę! Jakie bydlę!",
emote: ":beaver:",
asset: "assets/loot/36-biber.jpg",
initialAttributes: [LootAttributeKindId.SWEET],
},
] as const;

Expand Down
12 changes: 0 additions & 12 deletions src/service/lootDrop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@ export async function postLootDrop(
return;
}

await awardPostDropLootAttributes(claimedLoot);

await reply.delete();

log.info(
Expand Down Expand Up @@ -284,13 +282,3 @@ async function getDropWeightAdjustments(
weights: newWeights,
};
}

async function awardPostDropLootAttributes(loot: Loot) {
switch (loot.lootKindId) {
case LootKindId.KADSE:
await lootService.addLootAttributeIfNotPresent(loot.id, LootAttributeKindId.SWEET);
break;
default:
break;
}
}
10 changes: 9 additions & 1 deletion src/storage/loot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import type {
} from "./db/model.js";

import db from "@db";
import type { LootAttributeKindId } from "@/service/lootData.js";
import { resolveLootAttributeTemplate, type LootAttributeKindId } from "@/service/lootData.js";

export type LootUseCommandInteraction = ChatInputCommandInteraction & {
channel: GuildTextBasedChannel;
Expand All @@ -36,6 +36,7 @@ export interface LootTemplate {
emote: string;
excludeFromInventory?: boolean;
effects?: string[];
initialAttributes?: LootAttributeKindId[];

onDrop?: (
context: BotContext,
Expand Down Expand Up @@ -110,6 +111,13 @@ export async function createLoot(
.returningAll()
.executeTakeFirstOrThrow();

for (const attributeId of template.initialAttributes ?? []) {
const attribute = resolveLootAttributeTemplate(attributeId);
if (!attribute) continue;

await addLootAttributeIfNotPresent(res.id, attribute, ctx);
}

if (rarityAttribute) {
await addLootAttributeIfNotPresent(res.id, rarityAttribute, ctx);
}
Expand Down