@sharpee/stdlib 0.9.111 → 0.9.113
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/actions/capability-dispatch.d.ts.map +1 -1
- package/actions/capability-dispatch.js +5 -3
- package/actions/capability-dispatch.js.map +1 -1
- package/actions/standard/attacking/attacking.d.ts.map +1 -1
- package/actions/standard/attacking/attacking.js +22 -14
- package/actions/standard/attacking/attacking.js.map +1 -1
- package/actions/standard/climbing/climbing.d.ts.map +1 -1
- package/actions/standard/climbing/climbing.js +8 -4
- package/actions/standard/climbing/climbing.js.map +1 -1
- package/actions/standard/closing/closing.d.ts.map +1 -1
- package/actions/standard/closing/closing.js +12 -11
- package/actions/standard/closing/closing.js.map +1 -1
- package/actions/standard/drinking/drinking.d.ts.map +1 -1
- package/actions/standard/drinking/drinking.js +8 -5
- package/actions/standard/drinking/drinking.js.map +1 -1
- package/actions/standard/dropping/dropping-data.d.ts.map +1 -1
- package/actions/standard/dropping/dropping-data.js +7 -5
- package/actions/standard/dropping/dropping-data.js.map +1 -1
- package/actions/standard/dropping/dropping.d.ts.map +1 -1
- package/actions/standard/dropping/dropping.js +20 -18
- package/actions/standard/dropping/dropping.js.map +1 -1
- package/actions/standard/eating/eating.d.ts.map +1 -1
- package/actions/standard/eating/eating.js +10 -7
- package/actions/standard/eating/eating.js.map +1 -1
- package/actions/standard/entering/entering.d.ts.map +1 -1
- package/actions/standard/entering/entering.js +15 -17
- package/actions/standard/entering/entering.js.map +1 -1
- package/actions/standard/examining/examining-data.d.ts.map +1 -1
- package/actions/standard/examining/examining-data.js +4 -3
- package/actions/standard/examining/examining-data.js.map +1 -1
- package/actions/standard/examining/examining.d.ts.map +1 -1
- package/actions/standard/examining/examining.js +4 -1
- package/actions/standard/examining/examining.js.map +1 -1
- package/actions/standard/exiting/exiting.d.ts.map +1 -1
- package/actions/standard/exiting/exiting.js +7 -3
- package/actions/standard/exiting/exiting.js.map +1 -1
- package/actions/standard/giving/giving.d.ts.map +1 -1
- package/actions/standard/giving/giving.js +12 -9
- package/actions/standard/giving/giving.js.map +1 -1
- package/actions/standard/going/going.d.ts.map +1 -1
- package/actions/standard/going/going.js +12 -13
- package/actions/standard/going/going.js.map +1 -1
- package/actions/standard/inserting/inserting.d.ts.map +1 -1
- package/actions/standard/inserting/inserting.js +11 -6
- package/actions/standard/inserting/inserting.js.map +1 -1
- package/actions/standard/listening/listening.d.ts.map +1 -1
- package/actions/standard/listening/listening.js +4 -2
- package/actions/standard/listening/listening.js.map +1 -1
- package/actions/standard/lock-shared.d.ts.map +1 -1
- package/actions/standard/lock-shared.js +10 -9
- package/actions/standard/lock-shared.js.map +1 -1
- package/actions/standard/locking/locking.d.ts.map +1 -1
- package/actions/standard/locking/locking.js +11 -7
- package/actions/standard/locking/locking.js.map +1 -1
- package/actions/standard/looking/looking-data.d.ts.map +1 -1
- package/actions/standard/looking/looking-data.js +8 -4
- package/actions/standard/looking/looking-data.js.map +1 -1
- package/actions/standard/looking/looking.d.ts.map +1 -1
- package/actions/standard/looking/looking.js +7 -1
- package/actions/standard/looking/looking.js.map +1 -1
- package/actions/standard/opening/opening.d.ts.map +1 -1
- package/actions/standard/opening/opening.js +9 -7
- package/actions/standard/opening/opening.js.map +1 -1
- package/actions/standard/pulling/pulling.d.ts.map +1 -1
- package/actions/standard/pulling/pulling.js +10 -5
- package/actions/standard/pulling/pulling.js.map +1 -1
- package/actions/standard/pushing/pushing.d.ts.map +1 -1
- package/actions/standard/pushing/pushing.js +15 -15
- package/actions/standard/pushing/pushing.js.map +1 -1
- package/actions/standard/putting/putting.d.ts.map +1 -1
- package/actions/standard/putting/putting.js +26 -28
- package/actions/standard/putting/putting.js.map +1 -1
- package/actions/standard/reading/reading.d.ts.map +1 -1
- package/actions/standard/reading/reading.js +7 -4
- package/actions/standard/reading/reading.js.map +1 -1
- package/actions/standard/removing/removing.d.ts.map +1 -1
- package/actions/standard/removing/removing.js +27 -26
- package/actions/standard/removing/removing.js.map +1 -1
- package/actions/standard/searching/searching.d.ts.map +1 -1
- package/actions/standard/searching/searching.js +4 -2
- package/actions/standard/searching/searching.js.map +1 -1
- package/actions/standard/searching-helpers.d.ts.map +1 -1
- package/actions/standard/searching-helpers.js +3 -1
- package/actions/standard/searching-helpers.js.map +1 -1
- package/actions/standard/showing/showing.d.ts.map +1 -1
- package/actions/standard/showing/showing.js +9 -6
- package/actions/standard/showing/showing.js.map +1 -1
- package/actions/standard/smelling/smelling.d.ts.map +1 -1
- package/actions/standard/smelling/smelling.js +5 -3
- package/actions/standard/smelling/smelling.js.map +1 -1
- package/actions/standard/switching_off/switching_off.d.ts.map +1 -1
- package/actions/standard/switching_off/switching_off.js +8 -5
- package/actions/standard/switching_off/switching_off.js.map +1 -1
- package/actions/standard/switching_on/switching_on.d.ts.map +1 -1
- package/actions/standard/switching_on/switching_on.js +16 -10
- package/actions/standard/switching_on/switching_on.js.map +1 -1
- package/actions/standard/taking/taking.d.ts.map +1 -1
- package/actions/standard/taking/taking.js +25 -18
- package/actions/standard/taking/taking.js.map +1 -1
- package/actions/standard/taking_off/taking-off.d.ts.map +1 -1
- package/actions/standard/taking_off/taking-off.js +12 -10
- package/actions/standard/taking_off/taking-off.js.map +1 -1
- package/actions/standard/talking/talking.d.ts.map +1 -1
- package/actions/standard/talking/talking.js +8 -4
- package/actions/standard/talking/talking.js.map +1 -1
- package/actions/standard/throwing/throwing.d.ts.map +1 -1
- package/actions/standard/throwing/throwing.js +13 -14
- package/actions/standard/throwing/throwing.js.map +1 -1
- package/actions/standard/touching/touching.d.ts.map +1 -1
- package/actions/standard/touching/touching.js +6 -2
- package/actions/standard/touching/touching.js.map +1 -1
- package/actions/standard/unlocking/unlocking.d.ts.map +1 -1
- package/actions/standard/unlocking/unlocking.js +10 -6
- package/actions/standard/unlocking/unlocking.js.map +1 -1
- package/actions/standard/wearable-shared.d.ts.map +1 -1
- package/actions/standard/wearable-shared.js +3 -1
- package/actions/standard/wearable-shared.js.map +1 -1
- package/actions/standard/wearing/wearing.d.ts.map +1 -1
- package/actions/standard/wearing/wearing.js +7 -5
- package/actions/standard/wearing/wearing.js.map +1 -1
- package/index.d.ts +1 -0
- package/index.d.ts.map +1 -1
- package/index.js +1 -0
- package/index.js.map +1 -1
- package/package.json +6 -6
- package/utils/entity-info.d.ts +45 -0
- package/utils/entity-info.d.ts.map +1 -0
- package/utils/entity-info.js +68 -0
- package/utils/entity-info.js.map +1 -0
- package/utils/index.d.ts +9 -0
- package/utils/index.d.ts.map +1 -0
- package/utils/index.js +13 -0
- package/utils/index.js.map +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capability-dispatch.d.ts","sourceRoot":"","sources":["../../../../../../repos/sharpee/packages/stdlib/src/actions/capability-dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,kBAAkB,CAAC;AAQ3E,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"capability-dispatch.d.ts","sourceRoot":"","sources":["../../../../../../repos/sharpee/packages/stdlib/src/actions/capability-dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,kBAAkB,CAAC;AAQ3E,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG5C;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,eAAe,EAAE,MAAM,CAAC;IACxB,yDAAyD;IACzD,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAoCD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,wBAAwB,GAC/B,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAAE,CA8IvC"}
|
|
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.createCapabilityDispatchAction = createCapabilityDispatchAction;
|
|
11
11
|
const world_model_1 = require("../../world-model/index.js");
|
|
12
12
|
const types_1 = require("../scope/types");
|
|
13
|
+
const utils_1 = require("../utils");
|
|
13
14
|
/**
|
|
14
15
|
* Convert capability effects to semantic events.
|
|
15
16
|
*
|
|
@@ -65,13 +66,14 @@ function createCapabilityDispatchAction(config) {
|
|
|
65
66
|
if (!entity) {
|
|
66
67
|
return { valid: false, error: config.noTargetError };
|
|
67
68
|
}
|
|
68
|
-
// Find trait that claims this capability
|
|
69
|
+
// Find trait that claims this capability.
|
|
70
|
+
// params carry EntityInfo for the formatter chain (ADR-158).
|
|
69
71
|
const trait = (0, world_model_1.findTraitWithCapability)(entity, config.actionId);
|
|
70
72
|
if (!trait) {
|
|
71
73
|
return {
|
|
72
74
|
valid: false,
|
|
73
75
|
error: config.cantDoThatError,
|
|
74
|
-
params: { target: entity
|
|
76
|
+
params: { target: (0, utils_1.entityInfoFrom)(entity) }
|
|
75
77
|
};
|
|
76
78
|
}
|
|
77
79
|
// Get behavior for this trait+capability
|
|
@@ -84,7 +86,7 @@ function createCapabilityDispatchAction(config) {
|
|
|
84
86
|
return {
|
|
85
87
|
valid: false,
|
|
86
88
|
error: config.cantDoThatError,
|
|
87
|
-
params: { target: entity
|
|
89
|
+
params: { target: (0, utils_1.entityInfoFrom)(entity) }
|
|
88
90
|
};
|
|
89
91
|
}
|
|
90
92
|
// Create sharedData for passing data between behavior phases
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capability-dispatch.js","sourceRoot":"","sources":["../../../../../../../repos/sharpee/packages/stdlib/src/actions/capability-dispatch.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"capability-dispatch.js","sourceRoot":"","sources":["../../../../../../../repos/sharpee/packages/stdlib/src/actions/capability-dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attacking.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/attacking/attacking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"attacking.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/attacking/attacking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAgB/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAiBrD,eAAO,MAAM,eAAe,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAidhE,CAAC"}
|
|
@@ -19,6 +19,7 @@ const world_model_1 = require("../../../../world-model/index.js");
|
|
|
19
19
|
const constants_1 = require("../../constants");
|
|
20
20
|
const types_1 = require("../../../scope/types");
|
|
21
21
|
const combat_1 = require("../../../combat");
|
|
22
|
+
const utils_1 = require("../../../utils");
|
|
22
23
|
function getAttackingSharedData(context) {
|
|
23
24
|
return context.sharedData;
|
|
24
25
|
}
|
|
@@ -94,11 +95,11 @@ exports.attackingAction = {
|
|
|
94
95
|
}
|
|
95
96
|
// Check if target is visible
|
|
96
97
|
if (!context.canSee(target)) {
|
|
97
|
-
return { valid: false, error: 'not_visible', params: { target: target
|
|
98
|
+
return { valid: false, error: 'not_visible', params: { target: (0, utils_1.entityInfoFrom)(target) } };
|
|
98
99
|
}
|
|
99
100
|
// Check if target is reachable
|
|
100
101
|
if (!context.canReach(target)) {
|
|
101
|
-
return { valid: false, error: 'not_reachable', params: { target: target
|
|
102
|
+
return { valid: false, error: 'not_reachable', params: { target: (0, utils_1.entityInfoFrom)(target) } };
|
|
102
103
|
}
|
|
103
104
|
// Prevent attacking self
|
|
104
105
|
if (target.id === actor.id) {
|
|
@@ -115,11 +116,11 @@ exports.attackingAction = {
|
|
|
115
116
|
if (target.has(world_model_1.TraitType.COMBATANT)) {
|
|
116
117
|
const combatant = target.get(world_model_1.TraitType.COMBATANT);
|
|
117
118
|
if (combatant && !combatant.isAlive) {
|
|
118
|
-
return { valid: false, error: 'already_dead', params: { target: target
|
|
119
|
+
return { valid: false, error: 'already_dead', params: { target: (0, utils_1.entityInfoFrom)(target) } };
|
|
119
120
|
}
|
|
120
121
|
// No combat interceptor registered — block with standard IF response
|
|
121
122
|
if (!interceptor) {
|
|
122
|
-
return { valid: false, error: 'violence_not_the_answer', params: { target: target
|
|
123
|
+
return { valid: false, error: 'violence_not_the_answer', params: { target: (0, utils_1.entityInfoFrom)(target) } };
|
|
123
124
|
}
|
|
124
125
|
}
|
|
125
126
|
// === POST-VALIDATE HOOK ===
|
|
@@ -263,7 +264,8 @@ exports.attackingAction = {
|
|
|
263
264
|
return [context.event('if.event.attacked', {
|
|
264
265
|
blocked: true,
|
|
265
266
|
messageId: `${context.action.id}.${result.error}`,
|
|
266
|
-
params
|
|
267
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
268
|
+
params: { target: target ? (0, utils_1.entityInfoFrom)(target) : undefined, ...result.params },
|
|
267
269
|
reason: result.error,
|
|
268
270
|
targetId: target?.id,
|
|
269
271
|
targetName: target?.name
|
|
@@ -297,7 +299,8 @@ exports.attackingAction = {
|
|
|
297
299
|
return [
|
|
298
300
|
context.event('if.event.attacked', {
|
|
299
301
|
messageId: fullFailMessageId,
|
|
300
|
-
params
|
|
302
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
303
|
+
params: { target: (0, utils_1.entityInfoFrom)(target) },
|
|
301
304
|
target: target.id,
|
|
302
305
|
targetName: target.name,
|
|
303
306
|
failed: true
|
|
@@ -312,20 +315,25 @@ exports.attackingAction = {
|
|
|
312
315
|
weaponName: weapon?.name,
|
|
313
316
|
unarmed: !weapon
|
|
314
317
|
};
|
|
318
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
315
319
|
const params = {
|
|
316
|
-
target: target
|
|
317
|
-
weapon: weapon
|
|
320
|
+
target: (0, utils_1.entityInfoFrom)(target),
|
|
321
|
+
weapon: weapon ? (0, utils_1.entityInfoFrom)(weapon) : undefined
|
|
318
322
|
};
|
|
319
323
|
// Create ATTACKED event for world model
|
|
320
324
|
events.push(context.event('if.event.attacked', eventData));
|
|
321
325
|
// Determine message based on result type
|
|
322
326
|
let messageId;
|
|
323
|
-
// Use CombatService message IDs for combatant attacks
|
|
327
|
+
// Use CombatService message IDs for combatant attacks.
|
|
328
|
+
// ADR-158: provide both `target` (EntityInfo for templates) and
|
|
329
|
+
// `targetName` (string for handler / event-sourcing compat). The
|
|
330
|
+
// combatResult.messageData also carries both shapes.
|
|
324
331
|
if (usedCombatService && combatResult) {
|
|
325
332
|
messageId = combatResult.messageId;
|
|
326
333
|
params.damage = combatResult.damage;
|
|
327
334
|
params.attackerName = context.player.name;
|
|
328
|
-
params.targetName = target.name;
|
|
335
|
+
params.targetName = target.name; // string for combat service compat
|
|
336
|
+
params.target = (0, utils_1.entityInfoFrom)(target);
|
|
329
337
|
// Add any extra data from combat result
|
|
330
338
|
if (combatResult.messageData) {
|
|
331
339
|
Object.assign(params, combatResult.messageData);
|
|
@@ -413,13 +421,13 @@ exports.attackingAction = {
|
|
|
413
421
|
// === POST-REPORT HOOK ===
|
|
414
422
|
// Run before death/knockout events so attack blow text renders
|
|
415
423
|
// before consequence messages (e.g., troll disappearance smoke).
|
|
424
|
+
// See ISSUE-074: postReport may override the if.event.attacked
|
|
425
|
+
// messageId or emit additional narration events.
|
|
416
426
|
const interceptor = sharedData.interceptor;
|
|
417
427
|
const interceptorData = sharedData.interceptorData || {};
|
|
418
428
|
if (interceptor?.postReport) {
|
|
419
|
-
const
|
|
420
|
-
|
|
421
|
-
events.push(context.event(effect.type, effect.payload));
|
|
422
|
-
}
|
|
429
|
+
const result = interceptor.postReport(target, context.world, context.player.id, interceptorData);
|
|
430
|
+
(0, world_model_1.applyInterceptorReportResult)(events, 'if.event.attacked', result, context);
|
|
423
431
|
}
|
|
424
432
|
// For killed targets, emit a death event
|
|
425
433
|
if (result.targetKilled) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attacking.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/attacking/attacking.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"attacking.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/attacking/attacking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"climbing.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/climbing/climbing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"climbing.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/climbing/climbing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAwBrD,eAAO,MAAM,cAAc,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAwJ/D,CAAC"}
|
|
@@ -16,6 +16,7 @@ exports.climbingAction = void 0;
|
|
|
16
16
|
const types_1 = require("../../../scope/types");
|
|
17
17
|
const world_model_1 = require("../../../../world-model/index.js");
|
|
18
18
|
const constants_1 = require("../../constants");
|
|
19
|
+
const utils_1 = require("../../../utils");
|
|
19
20
|
function getClimbingSharedData(context) {
|
|
20
21
|
return context.sharedData;
|
|
21
22
|
}
|
|
@@ -100,7 +101,8 @@ exports.climbingAction = {
|
|
|
100
101
|
return [context.event('if.event.climbed', {
|
|
101
102
|
blocked: true,
|
|
102
103
|
messageId: `${context.action.id}.${result.error}`,
|
|
103
|
-
params
|
|
104
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
105
|
+
params: { target: target ? (0, utils_1.entityInfoFrom)(target) : undefined, ...result.params },
|
|
104
106
|
reason: result.error,
|
|
105
107
|
targetId: target?.id,
|
|
106
108
|
targetName: target?.name,
|
|
@@ -136,9 +138,11 @@ exports.climbingAction = {
|
|
|
136
138
|
}
|
|
137
139
|
else {
|
|
138
140
|
// Object climbing - emit climbed event with messageId for text rendering
|
|
141
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
142
|
+
const target = context.command.directObject?.entity;
|
|
139
143
|
events.push(context.event('if.event.climbed', {
|
|
140
144
|
messageId: `${context.action.id}.climbed_onto`,
|
|
141
|
-
params: { target: sharedData.targetName },
|
|
145
|
+
params: { target: target ? (0, utils_1.entityInfoFrom)(target) : { name: sharedData.targetName ?? '' } },
|
|
142
146
|
targetId: sharedData.targetId,
|
|
143
147
|
targetName: sharedData.targetName,
|
|
144
148
|
method: 'onto'
|
|
@@ -196,12 +200,12 @@ function validateObjectClimbing(target, context) {
|
|
|
196
200
|
}
|
|
197
201
|
}
|
|
198
202
|
if (!isClimbable) {
|
|
199
|
-
return { valid: false, error: 'not_climbable', params: { object: target
|
|
203
|
+
return { valid: false, error: 'not_climbable', params: { object: (0, utils_1.entityInfoFrom)(target) } };
|
|
200
204
|
}
|
|
201
205
|
// Check if already on/in the target
|
|
202
206
|
const currentLocation = context.world.getLocation(context.player.id);
|
|
203
207
|
if (currentLocation === target.id) {
|
|
204
|
-
return { valid: false, error: 'already_there', params: { place: target
|
|
208
|
+
return { valid: false, error: 'already_there', params: { place: (0, utils_1.entityInfoFrom)(target) } };
|
|
205
209
|
}
|
|
206
210
|
return { valid: true };
|
|
207
211
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"climbing.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/climbing/climbing.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,gDAAkD;AAElD,sDAAoE;AACpE,+CAA4C;
|
|
1
|
+
{"version":3,"file":"climbing.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/climbing/climbing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closing.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/closing/closing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAU/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"closing.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/closing/closing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAU/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAiBrD,eAAO,MAAM,aAAa,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CA+O9D,CAAC"}
|
|
@@ -19,6 +19,7 @@ const constants_1 = require("../../constants");
|
|
|
19
19
|
const closing_data_1 = require("./closing-data");
|
|
20
20
|
const closing_messages_1 = require("./closing-messages");
|
|
21
21
|
const types_1 = require("../../../scope/types");
|
|
22
|
+
const utils_1 = require("../../../utils");
|
|
22
23
|
function getClosingSharedData(context) {
|
|
23
24
|
return context.sharedData;
|
|
24
25
|
}
|
|
@@ -92,7 +93,7 @@ exports.closingAction = {
|
|
|
92
93
|
return {
|
|
93
94
|
valid: false,
|
|
94
95
|
error: closing_messages_1.ClosingMessages.NOT_CLOSABLE,
|
|
95
|
-
params: { item: noun
|
|
96
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
96
97
|
};
|
|
97
98
|
}
|
|
98
99
|
// Use behavior's canClose method for validation
|
|
@@ -102,14 +103,14 @@ exports.closingAction = {
|
|
|
102
103
|
return {
|
|
103
104
|
valid: false,
|
|
104
105
|
error: closing_messages_1.ClosingMessages.ALREADY_CLOSED,
|
|
105
|
-
params: { item: noun
|
|
106
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
106
107
|
};
|
|
107
108
|
}
|
|
108
109
|
// Otherwise it can't be closed for some other reason
|
|
109
110
|
return {
|
|
110
111
|
valid: false,
|
|
111
112
|
error: closing_messages_1.ClosingMessages.PREVENTS_CLOSING,
|
|
112
|
-
params: { item: noun
|
|
113
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) }
|
|
113
114
|
};
|
|
114
115
|
}
|
|
115
116
|
// Check if closable has special requirements
|
|
@@ -122,7 +123,7 @@ exports.closingAction = {
|
|
|
122
123
|
valid: false,
|
|
123
124
|
error: closing_messages_1.ClosingMessages.PREVENTS_CLOSING,
|
|
124
125
|
params: {
|
|
125
|
-
item: noun
|
|
126
|
+
item: (0, utils_1.entityInfoFrom)(noun),
|
|
126
127
|
obstacle: requirement.preventedBy
|
|
127
128
|
}
|
|
128
129
|
};
|
|
@@ -176,12 +177,12 @@ exports.closingAction = {
|
|
|
176
177
|
contentsCount = contents.length;
|
|
177
178
|
contentsIds = contents.map(item => item.id);
|
|
178
179
|
}
|
|
179
|
-
// Emit domain event with messageId (simplified pattern - ADR-097)
|
|
180
|
+
// Emit domain event with messageId (simplified pattern - ADR-097).
|
|
181
|
+
// params carries EntityInfo for the formatter chain (ADR-158);
|
|
182
|
+
// top-level fields stay strings for handlers.
|
|
180
183
|
events.push(context.event('if.event.closed', {
|
|
181
|
-
// Rendering data (messageId + params for text-service)
|
|
182
184
|
messageId: `${context.action.id}.${closing_messages_1.ClosingMessages.CLOSED}`,
|
|
183
|
-
params: { item: noun
|
|
184
|
-
// Domain data (for event sourcing / handlers)
|
|
185
|
+
params: { item: (0, utils_1.entityInfoFrom)(noun) },
|
|
185
186
|
...eventData,
|
|
186
187
|
targetId: noun.id,
|
|
187
188
|
targetName: noun.name,
|
|
@@ -219,13 +220,13 @@ exports.closingAction = {
|
|
|
219
220
|
// If error already contains dots (e.g., story interceptor ID), use as-is; otherwise prefix with action ID
|
|
220
221
|
const messageId = error.includes('.') ? error : `${context.action.id}.${error}`;
|
|
221
222
|
return [context.event('if.event.close_blocked', {
|
|
222
|
-
// Rendering data
|
|
223
|
+
// Rendering data — EntityInfo for the formatter chain (ADR-158)
|
|
223
224
|
messageId,
|
|
224
225
|
params: {
|
|
225
226
|
...result.params,
|
|
226
|
-
item: noun
|
|
227
|
+
item: noun ? (0, utils_1.entityInfoFrom)(noun) : undefined
|
|
227
228
|
},
|
|
228
|
-
// Domain data
|
|
229
|
+
// Domain data — strings for handlers
|
|
229
230
|
targetId: noun?.id,
|
|
230
231
|
targetName: noun?.name,
|
|
231
232
|
reason: result.error
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closing.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/closing/closing.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,sDAAmK;AACnK,iEAA0D;AAC1D,+CAA4C;AAC5C,iDAAkD;AAClD,yDAAqD;AAKrD,gDAAkD;
|
|
1
|
+
{"version":3,"file":"closing.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/closing/closing.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,sDAAmK;AACnK,iEAA0D;AAC1D,+CAA4C;AAC5C,iDAAkD;AAClD,yDAAqD;AAKrD,gDAAkD;AAClD,0CAAgD;AAWhD,SAAS,oBAAoB,CAAC,OAAsB;IAClD,OAAO,OAAO,CAAC,UAA+B,CAAC;AACjD,CAAC;AAEY,QAAA,aAAa,GAA0C;IAClE,EAAE,EAAE,qBAAS,CAAC,OAAO;IAErB,qDAAqD;IACrD,YAAY,EAAE;QACZ,MAAM,EAAE,kBAAU,CAAC,SAAS;KAC7B;IAED,2CAA2C;IAC3C,kBAAkB,EAAE;QAClB,KAAK,EAAE,uBAAS,CAAC,QAAQ;QACzB,SAAS,EAAE,SAAS;QACpB,WAAW,EAAE,UAAU;KACxB;IAED,6CAA6C;IAC7C,eAAe,EAAE,KAAK;IAEtB,gBAAgB,EAAE;QAChB,WAAW;QACX,cAAc;QACd,gBAAgB;QAChB,QAAQ;QACR,YAAY;QACZ,kBAAkB;KACnB;IACD,QAAQ,EAAE;QACR,oBAAoB,EAAE,IAAI;QAC1B,sBAAsB,EAAE,KAAK;QAC7B,iBAAiB,EAAE,kBAAU,CAAC,SAAS;KACxC;IACD,KAAK,EAAE,wBAAwB;IAE/B;;;OAGG;IACH,QAAQ,CAAC,OAAsB;QAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAElD,4BAA4B;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,kCAAe,CAAC,SAAS;aACjC,CAAC;QACJ,CAAC;QAED,uDAAuD;QACvD,MAAM,iBAAiB,GAAG,IAAA,qCAAuB,EAAC,IAAI,EAAE,qBAAS,CAAC,OAAO,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,iBAAiB,EAAE,WAAW,CAAC;QACnD,MAAM,eAAe,GAA0B,EAAE,CAAC;QAElD,6DAA6D;QAC7D,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACjD,UAAU,CAAC,WAAW,GAAG,WAAW,CAAC;QACrC,UAAU,CAAC,eAAe,GAAG,eAAe,CAAC;QAE7C,4BAA4B;QAC5B,IAAI,WAAW,EAAE,WAAW,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;YAChG,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBACrC,OAAO;oBACL,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;iBACtB,CAAC;YACJ,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,kBAAU,CAAC,SAAS,CAAC,CAAC;QACpE,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,OAAO,UAAU,CAAC,KAAM,CAAC;QAC3B,CAAC;QAED,+DAA+D;QAC/D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,uBAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,kCAAe,CAAC,YAAY;gBACnC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;aACvC,CAAC;QACJ,CAAC;QAED,gDAAgD;QAChD,IAAI,CAAC,8BAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,4CAA4C;YAC5C,IAAI,CAAC,8BAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,OAAO;oBACL,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,kCAAe,CAAC,cAAc;oBACrC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;iBACvC,CAAC;YACJ,CAAC;YACD,qDAAqD;YACrD,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,kCAAe,CAAC,gBAAgB;gBACvC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;aACvC,CAAC;QACJ,CAAC;QAED,6CAA6C;QAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,2BAAa,CAAC,CAAC;QACnD,MAAM,cAAc,GAAG,aAAoD,CAAC;QAC5E,IAAI,cAAc,EAAE,iBAAiB,EAAE,CAAC;YACtC,MAAM,WAAW,GAAG,cAAc,CAAC,iBAA4C,CAAC;YAChF,IAAI,WAAW,CAAC,WAAW,EAAE,CAAC;gBAC5B,OAAO;oBACL,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,kCAAe,CAAC,gBAAgB;oBACvC,MAAM,EAAE;wBACN,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC;wBAC1B,QAAQ,EAAE,WAAW,CAAC,WAAW;qBAClC;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,OAAsB;QAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,MAAO,CAAC;QAEnD,mCAAmC;QACnC,MAAM,MAAM,GAAiB,8BAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE1D,iDAAiD;QACjD,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACjD,UAAU,CAAC,WAAW,GAAG,MAAM,CAAC;IAClC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAAsB;QAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,MAAO,CAAC;QACnD,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,UAAU,CAAC,WAA2B,CAAC;QAEtD,MAAM,MAAM,GAAqB,EAAE,CAAC;QAEpC,gDAAgD;QAChD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE;YAClC,QAAQ,EAAE,IAAI,CAAC,EAAE;YACjB,UAAU,EAAE,IAAI,CAAC,IAAI;YACrB,aAAa,EAAE,MAAM,CAAC,YAAY;YAClC,KAAK,EAAE,MAAM,CAAC,UAAU;SACzB,CAAC,CAAC,CAAC;QAEJ,0CAA0C;QAC1C,MAAM,SAAS,GAAG,IAAA,mCAAc,EAAC,+BAAgB,EAAE,OAAO,CAAC,CAAC;QAE5D,mDAAmD;QACnD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAS,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAS,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAS,CAAC,SAAS,CAAC,CAAC;QAElD,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,WAAW,GAAa,EAAE,CAAC;QAE/B,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACpD,WAAW,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;YAClC,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC;YAChC,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,mEAAmE;QACnE,+DAA+D;QAC/D,8CAA8C;QAC9C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE;YAC3C,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,kCAAe,CAAC,MAAM,EAAE;YAC3D,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;YACtC,GAAG,SAAS;YACZ,QAAQ,EAAE,IAAI,CAAC,EAAE;YACjB,UAAU,EAAE,IAAI,CAAC,IAAI;YACrB,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;YAC1B,WAAW,EAAE,IAAI,CAAC,EAAE;YACpB,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,WAAW;YACX,MAAM;YACN,WAAW;YACX,WAAW;YACX,aAAa;YACb,WAAW;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC,CAAC;QAEJ,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,OAAsB,EAAE,MAAwB;QACtD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAElD,0BAA0B;QAC1B,MAAM,UAAU,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,CAAC;QAC3C,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,IAAI,EAAE,CAAC;QACzD,IAAI,WAAW,EAAE,SAAS,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACnD,MAAM,aAAa,GAAG,WAAW,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YACnH,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC3B,OAAO,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;QACjC,0GAA0G;QAC1G,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,KAAK,EAAE,CAAC;QAEhF,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE;gBAC9C,gEAAgE;gBAChE,SAAS;gBACT,MAAM,EAAE;oBACN,GAAG,MAAM,CAAC,MAAM;oBAChB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;iBAC9C;gBACD,qCAAqC;gBACrC,QAAQ,EAAE,IAAI,EAAE,EAAE;gBAClB,UAAU,EAAE,IAAI,EAAE,IAAI;gBACtB,MAAM,EAAE,MAAM,CAAC,KAAK;aACrB,CAAC,CAAC,CAAC;IACN,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drinking.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/drinking/drinking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAK/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"drinking.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/drinking/drinking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAK/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAyHrD,eAAO,MAAM,cAAc,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAqN/D,CAAC"}
|
|
@@ -16,6 +16,7 @@ exports.drinkingAction = void 0;
|
|
|
16
16
|
const world_model_1 = require("../../../../world-model/index.js");
|
|
17
17
|
const constants_1 = require("../../constants");
|
|
18
18
|
const types_1 = require("../../../scope/types");
|
|
19
|
+
const utils_1 = require("../../../utils");
|
|
19
20
|
function getDrinkingSharedData(context) {
|
|
20
21
|
return context.sharedData;
|
|
21
22
|
}
|
|
@@ -171,15 +172,15 @@ exports.drinkingAction = {
|
|
|
171
172
|
}
|
|
172
173
|
}
|
|
173
174
|
if (!isDrinkable) {
|
|
174
|
-
return { valid: false, error: 'not_drinkable', params: { item: item
|
|
175
|
+
return { valid: false, error: 'not_drinkable', params: { item: (0, utils_1.entityInfoFrom)(item) } };
|
|
175
176
|
}
|
|
176
177
|
// Check if already consumed
|
|
177
178
|
if (edibleTrait && (edibleTrait.servings ?? 1) <= 0) {
|
|
178
|
-
return { valid: false, error: 'already_consumed', params: { item: item
|
|
179
|
+
return { valid: false, error: 'already_consumed', params: { item: (0, utils_1.entityInfoFrom)(item) } };
|
|
179
180
|
}
|
|
180
181
|
// Check if container needs to be open
|
|
181
182
|
if (containerTrait && item.has(world_model_1.TraitType.OPENABLE) && !world_model_1.OpenableBehavior.isOpen(item)) {
|
|
182
|
-
return { valid: false, error: 'container_closed', params: { item: item
|
|
183
|
+
return { valid: false, error: 'container_closed', params: { item: (0, utils_1.entityInfoFrom)(item) } };
|
|
183
184
|
}
|
|
184
185
|
return { valid: true };
|
|
185
186
|
},
|
|
@@ -206,8 +207,9 @@ exports.drinkingAction = {
|
|
|
206
207
|
item: item.id,
|
|
207
208
|
itemName: item.name
|
|
208
209
|
};
|
|
210
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
209
211
|
const params = {
|
|
210
|
-
item: item
|
|
212
|
+
item: (0, utils_1.entityInfoFrom)(item)
|
|
211
213
|
};
|
|
212
214
|
// Capture state BEFORE mutations for determineMessage
|
|
213
215
|
const servingsBefore = edibleTrait ? world_model_1.EdibleBehavior.getServings(item) : 0;
|
|
@@ -255,7 +257,8 @@ exports.drinkingAction = {
|
|
|
255
257
|
return [context.event('if.event.drunk', {
|
|
256
258
|
blocked: true,
|
|
257
259
|
messageId: `${context.action.id}.${result.error}`,
|
|
258
|
-
params
|
|
260
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
261
|
+
params: { item: item ? (0, utils_1.entityInfoFrom)(item) : undefined, ...result.params },
|
|
259
262
|
reason: result.error,
|
|
260
263
|
itemId: item?.id,
|
|
261
264
|
itemName: item?.name
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drinking.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/drinking/drinking.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,sDAAgH;AAChH,+CAA4C;AAG5C,gDAAkD;
|
|
1
|
+
{"version":3,"file":"drinking.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/drinking/drinking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dropping-data.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/dropping/dropping-data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"dropping-data.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/dropping/dropping-data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAKrD;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA2DvE,CAAC;AAEF;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,OAAO,EAAE,aAAa,GACrB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CAyCpD;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGvE,CAAC"}
|
|
@@ -10,6 +10,7 @@ exports.droppedDataConfig = exports.buildDroppedData = void 0;
|
|
|
10
10
|
exports.determineDroppingMessage = determineDroppingMessage;
|
|
11
11
|
const world_model_1 = require("../../../../world-model/index.js");
|
|
12
12
|
const snapshot_utils_1 = require("../../base/snapshot-utils");
|
|
13
|
+
const utils_1 = require("../../../utils");
|
|
13
14
|
/**
|
|
14
15
|
* Build dropped event data
|
|
15
16
|
*
|
|
@@ -73,22 +74,23 @@ function determineDroppingMessage(droppedData, context) {
|
|
|
73
74
|
if (!noun || !dropLocation) {
|
|
74
75
|
return {
|
|
75
76
|
messageId: 'dropped',
|
|
76
|
-
params: { item: droppedData.itemName }
|
|
77
|
+
params: { item: { name: droppedData.itemName } }
|
|
77
78
|
};
|
|
78
79
|
}
|
|
80
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
79
81
|
const params = {
|
|
80
|
-
item: noun
|
|
81
|
-
location: dropLocation
|
|
82
|
+
item: (0, utils_1.entityInfoFrom)(noun),
|
|
83
|
+
location: (0, utils_1.entityInfoFrom)(dropLocation)
|
|
82
84
|
};
|
|
83
85
|
let messageId = 'dropped';
|
|
84
86
|
// Determine message based on drop location
|
|
85
87
|
if (droppedData.toContainer) {
|
|
86
88
|
messageId = 'dropped_in';
|
|
87
|
-
params.container = dropLocation
|
|
89
|
+
params.container = (0, utils_1.entityInfoFrom)(dropLocation);
|
|
88
90
|
}
|
|
89
91
|
else if (droppedData.toSupporter) {
|
|
90
92
|
messageId = 'dropped_on';
|
|
91
|
-
params.supporter = dropLocation
|
|
93
|
+
params.supporter = (0, utils_1.entityInfoFrom)(dropLocation);
|
|
92
94
|
}
|
|
93
95
|
else if (droppedData.toRoom) {
|
|
94
96
|
// Vary the message based on how the item is dropped
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dropping-data.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/dropping/dropping-data.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;
|
|
1
|
+
{"version":3,"file":"dropping-data.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/dropping/dropping-data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dropping.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/dropping/dropping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"dropping.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/dropping/dropping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAgB/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA6OrD,eAAO,MAAM,cAAc,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CA+L/D,CAAC"}
|