Attribute gift items to John Questward with natural origins.
Gift stacks use craft/gather verbs (Smithed, Mined, Carved, …) instead of gods origin.
@@ -1,12 +1,13 @@
1
1
import { randomUUID } from "node:crypto";
2
2
import { ItemId, itemDefinition, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3
3
import { insertStackGrowable, normalizeVault } from "../../../shared/items/inventory.js";
4
import { attachOrigins, godsOrigin, writtenOrigin } from "../../../shared/items/origin.js";
4
import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";
5
5
import {
6
6
formatGiftLetterBody,
7
7
QUESTWARD_GIFT_AUTHOR,
8
8
QUESTWARD_GIFT_ORG
9
9
} from "../../../shared/courier/giftLetters.js";
10
import { giftItemOrigin } from "../../../shared/courier/giftOrigin.js";
10
11
11
12
function userError (message)
12
13
{
@@ -66,7 +67,7 @@ export class GiftService
66
67
const stack = attachOrigins({
67
68
itemId: entry.itemId,
68
69
quantity: entry.quantity,
69
origins: [{ origin: godsOrigin(), quantity: entry.quantity }]
70
origins: [{ origin: giftItemOrigin(entry.itemId), quantity: entry.quantity }]
70
71
});
71
72
this.#creditBank(characterId, stack, def);
72
73
credited.push({
@@ -1,12 +1,13 @@1
import { randomUUID } from "node:crypto";1
import { randomUUID } from "node:crypto";2
import { ItemId, itemDefinition, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";2
import { ItemId, itemDefinition, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";3
import { insertStackGrowable, normalizeVault } from "../../../shared/items/inventory.js";3
import { insertStackGrowable, normalizeVault } from "../../../shared/items/inventory.js";4
import { attachOrigins, godsOrigin, writtenOrigin } from "../../../shared/items/origin.js";4
import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";5
import {5
import {6
formatGiftLetterBody,6
formatGiftLetterBody,7
QUESTWARD_GIFT_AUTHOR,7
QUESTWARD_GIFT_AUTHOR,8
QUESTWARD_GIFT_ORG8
QUESTWARD_GIFT_ORG9
} from "../../../shared/courier/giftLetters.js";9
} from "../../../shared/courier/giftLetters.js";10
import { giftItemOrigin } from "../../../shared/courier/giftOrigin.js";10
11
11
function userError (message)12
function userError (message)12
{13
{@@ -66,7 +67,7 @@ export class GiftService66
const stack = attachOrigins({67
const stack = attachOrigins({67
itemId: entry.itemId,68
itemId: entry.itemId,68
quantity: entry.quantity,69
quantity: entry.quantity,69
origins: [{ origin: godsOrigin(), quantity: entry.quantity }]70
origins: [{ origin: giftItemOrigin(entry.itemId), quantity: entry.quantity }]70
});71
});71
this.#creditBank(characterId, stack, def);72
this.#creditBank(characterId, stack, def);72
credited.push({73
credited.push({@@ -10,8 +10,11 @@ import {
10
10
QUESTWARD_GIFT_AUTHOR,
11
11
QUESTWARD_GIFT_ORG
12
12
} from "../../shared/courier/giftLetters.js";
13
import { giftItemOrigin } from "../../shared/courier/giftOrigin.js";
13
14
import { formatLetterSignature } from "../../shared/courier/systemLetters.js";
14
15
import { ItemId } from "../../shared/definitions/items.js";
16
import { CraftingItemId } from "../../shared/definitions/craftingItems.js";
17
import { originLabel, ItemOriginKind, CraftOriginVerb, GatherOriginVerb } from "../../shared/items/origin.js";
15
18
import { BlockType } from "../../shared/definitions/tiles.js";
16
19
import { createEmptyChunkData, encodeChunkBlob, decodeChunkBlob } from "../src/world/chunkData.js";
17
20
import { GiftService } from "../src/gifts/service.js";
@@ -97,6 +100,23 @@ test("gift letter body and signature match Questward CEO format", () =>
97
100
);
98
101
});
99
102
103
test("gift item origins use natural verbs with John Questward", () =>
104
{
105
assert.equal(
106
originLabel(giftItemOrigin(ItemId.stick)),
107
"Carved by John Questward"
108
);
109
assert.equal(
110
originLabel(giftItemOrigin(CraftingItemId.copperOre)),
111
"Mined by John Questward"
112
);
113
const made = giftItemOrigin(ItemId.letter);
114
assert.equal(made.kind, ItemOriginKind.crafted);
115
assert.equal(made.displayName, QUESTWARD_GIFT_AUTHOR);
116
assert.equal(made.verb, CraftOriginVerb.made);
117
assert.equal(giftItemOrigin(CraftingItemId.copperOre).verb, GatherOriginVerb.mined);
118
});
119
100
120
test("admin gift credits bank and queues a system letter", () =>
101
121
{
102
122
const harness = makeSimulation({ workerCount: 1 });
@@ -126,11 +146,12 @@ test("admin gift credits bank and queues a system letter", () =>
126
146
assert.equal(result.ok, true);
127
147
128
148
const after = harness.stateDb.getBag(character.character_id);
129
const stickAfter = (after.vault ?? []).reduce(
130
(sum, slot) => sum + (slot?.itemId === ItemId.stick ? (slot.quantity | 0) : 0),
131
0
149
const stickStack = (after.vault ?? []).find((slot) => slot?.itemId === ItemId.stick);
150
assert.equal(stickStack?.quantity, stickBefore + 5);
151
assert.equal(
152
originLabel(stickStack?.origins?.[0]?.origin),
153
"Carved by John Questward"
132
154
);
133
assert.equal(stickAfter, stickBefore + 5);
134
155
135
156
const held = harness.stateDb.listHeldCourierDeliveries(character.character_id);
136
157
const foundHeld = held.some((row) =>
@@ -10,8 +10,11 @@ import {10
QUESTWARD_GIFT_AUTHOR,10
QUESTWARD_GIFT_AUTHOR,11
QUESTWARD_GIFT_ORG11
QUESTWARD_GIFT_ORG12
} from "../../shared/courier/giftLetters.js";12
} from "../../shared/courier/giftLetters.js";13
import { giftItemOrigin } from "../../shared/courier/giftOrigin.js";13
import { formatLetterSignature } from "../../shared/courier/systemLetters.js";14
import { formatLetterSignature } from "../../shared/courier/systemLetters.js";14
import { ItemId } from "../../shared/definitions/items.js";15
import { ItemId } from "../../shared/definitions/items.js";16
import { CraftingItemId } from "../../shared/definitions/craftingItems.js";17
import { originLabel, ItemOriginKind, CraftOriginVerb, GatherOriginVerb } from "../../shared/items/origin.js";15
import { BlockType } from "../../shared/definitions/tiles.js";18
import { BlockType } from "../../shared/definitions/tiles.js";16
import { createEmptyChunkData, encodeChunkBlob, decodeChunkBlob } from "../src/world/chunkData.js";19
import { createEmptyChunkData, encodeChunkBlob, decodeChunkBlob } from "../src/world/chunkData.js";17
import { GiftService } from "../src/gifts/service.js";20
import { GiftService } from "../src/gifts/service.js";@@ -97,6 +100,23 @@ test("gift letter body and signature match Questward CEO format", () =>97
);100
);98
});101
});99
102
103
test("gift item origins use natural verbs with John Questward", () =>104
{105
assert.equal(106
originLabel(giftItemOrigin(ItemId.stick)),107
"Carved by John Questward"108
);109
assert.equal(110
originLabel(giftItemOrigin(CraftingItemId.copperOre)),111
"Mined by John Questward"112
);113
const made = giftItemOrigin(ItemId.letter);114
assert.equal(made.kind, ItemOriginKind.crafted);115
assert.equal(made.displayName, QUESTWARD_GIFT_AUTHOR);116
assert.equal(made.verb, CraftOriginVerb.made);117
assert.equal(giftItemOrigin(CraftingItemId.copperOre).verb, GatherOriginVerb.mined);118
});119
100
test("admin gift credits bank and queues a system letter", () =>120
test("admin gift credits bank and queues a system letter", () =>101
{121
{102
const harness = makeSimulation({ workerCount: 1 });122
const harness = makeSimulation({ workerCount: 1 });@@ -126,11 +146,12 @@ test("admin gift credits bank and queues a system letter", () =>126
assert.equal(result.ok, true);146
assert.equal(result.ok, true);127
147
128
const after = harness.stateDb.getBag(character.character_id);148
const after = harness.stateDb.getBag(character.character_id);129
const stickAfter = (after.vault ?? []).reduce(149
const stickStack = (after.vault ?? []).find((slot) => slot?.itemId === ItemId.stick);130
(sum, slot) => sum + (slot?.itemId === ItemId.stick ? (slot.quantity | 0) : 0),150
assert.equal(stickStack?.quantity, stickBefore + 5);131
0151
assert.equal(152
originLabel(stickStack?.origins?.[0]?.origin),153
"Carved by John Questward"132
);154
);133
assert.equal(stickAfter, stickBefore + 5);134
155
135
const held = harness.stateDb.listHeldCourierDeliveries(character.character_id);156
const held = harness.stateDb.listHeldCourierDeliveries(character.character_id);136
const foundHeld = held.some((row) =>157
const foundHeld = held.some((row) =>