@sharpee/stdlib 0.9.111 → 1.0.0
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/enhanced-context.d.ts.map +1 -1
- package/actions/enhanced-context.js +16 -0
- package/actions/enhanced-context.js.map +1 -1
- package/actions/enhanced-types.d.ts +35 -0
- package/actions/enhanced-types.d.ts.map +1 -1
- package/actions/enhanced-types.js.map +1 -1
- package/actions/index.d.ts +0 -1
- package/actions/index.d.ts.map +1 -1
- package/actions/index.js +0 -1
- package/actions/index.js.map +1 -1
- package/actions/standard/about/about-events.d.ts +2 -0
- package/actions/standard/about/about-events.d.ts.map +1 -1
- package/actions/standard/about/about.d.ts.map +1 -1
- package/actions/standard/about/about.js +4 -1
- package/actions/standard/about/about.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 +38 -3
- package/actions/standard/examining/examining-data.js.map +1 -1
- package/actions/standard/examining/examining-messages.d.ts +1 -0
- package/actions/standard/examining/examining-messages.d.ts.map +1 -1
- package/actions/standard/examining/examining-messages.js +1 -0
- package/actions/standard/examining/examining-messages.js.map +1 -1
- package/actions/standard/examining/examining.d.ts.map +1 -1
- package/actions/standard/examining/examining.js +5 -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/channels/index.d.ts +40 -0
- package/channels/index.d.ts.map +1 -0
- package/channels/index.js +86 -0
- package/channels/index.js.map +1 -0
- package/channels/keys.d.ts +23 -0
- package/channels/keys.d.ts.map +1 -0
- package/channels/keys.js +36 -0
- package/channels/keys.js.map +1 -0
- package/channels/media.d.ts +135 -0
- package/channels/media.d.ts.map +1 -0
- package/channels/media.js +397 -0
- package/channels/media.js.map +1 -0
- package/channels/registry.d.ts +58 -0
- package/channels/registry.d.ts.map +1 -0
- package/channels/registry.js +84 -0
- package/channels/registry.js.map +1 -0
- package/channels/sound-events.d.ts +72 -0
- package/channels/sound-events.d.ts.map +1 -0
- package/channels/sound-events.js +88 -0
- package/channels/sound-events.js.map +1 -0
- package/channels/standard.d.ts +209 -0
- package/channels/standard.d.ts.map +1 -0
- package/channels/standard.js +403 -0
- package/channels/standard.js.map +1 -0
- package/channels/world-helpers.d.ts +43 -0
- package/channels/world-helpers.d.ts.map +1 -0
- package/channels/world-helpers.js +72 -0
- package/channels/world-helpers.js.map +1 -0
- package/index.d.ts +2 -0
- package/index.d.ts.map +1 -1
- package/index.js +2 -0
- package/index.js.map +1 -1
- package/package.json +7 -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
- package/validation/command-validator.d.ts +11 -1
- package/validation/command-validator.d.ts.map +1 -1
- package/validation/command-validator.js +31 -1
- package/validation/command-validator.js.map +1 -1
|
@@ -16,6 +16,7 @@ exports.enteringAction = void 0;
|
|
|
16
16
|
const world_model_1 = require("../../../../world-model/index.js");
|
|
17
17
|
const constants_1 = require("../../constants");
|
|
18
18
|
const entering_messages_1 = require("./entering-messages");
|
|
19
|
+
const utils_1 = require("../../../utils");
|
|
19
20
|
function getEnteringSharedData(context) {
|
|
20
21
|
return context.sharedData;
|
|
21
22
|
}
|
|
@@ -78,7 +79,7 @@ exports.enteringAction = {
|
|
|
78
79
|
return {
|
|
79
80
|
valid: false,
|
|
80
81
|
error: entering_messages_1.EnteringMessages.ALREADY_INSIDE,
|
|
81
|
-
params: { place: target
|
|
82
|
+
params: { place: (0, utils_1.entityInfoFrom)(target) }
|
|
82
83
|
};
|
|
83
84
|
}
|
|
84
85
|
// Check enterability
|
|
@@ -86,7 +87,7 @@ exports.enteringAction = {
|
|
|
86
87
|
return {
|
|
87
88
|
valid: false,
|
|
88
89
|
error: entering_messages_1.EnteringMessages.NOT_ENTERABLE,
|
|
89
|
-
params: { place: target
|
|
90
|
+
params: { place: (0, utils_1.entityInfoFrom)(target) }
|
|
90
91
|
};
|
|
91
92
|
}
|
|
92
93
|
// Check if it needs to be open
|
|
@@ -94,7 +95,7 @@ exports.enteringAction = {
|
|
|
94
95
|
return {
|
|
95
96
|
valid: false,
|
|
96
97
|
error: entering_messages_1.EnteringMessages.CONTAINER_CLOSED,
|
|
97
|
-
params: { container: target
|
|
98
|
+
params: { container: (0, utils_1.entityInfoFrom)(target) }
|
|
98
99
|
};
|
|
99
100
|
}
|
|
100
101
|
// === POST-VALIDATE HOOK ===
|
|
@@ -160,28 +161,25 @@ exports.enteringAction = {
|
|
|
160
161
|
}
|
|
161
162
|
// Determine the message ID based on preposition
|
|
162
163
|
const messageId = state.preposition === 'on' ? entering_messages_1.EnteringMessages.ENTERED_ON : entering_messages_1.EnteringMessages.ENTERED;
|
|
163
|
-
// Create the ENTERED event with messageId for text rendering
|
|
164
|
+
// Create the ENTERED event with messageId for text rendering.
|
|
165
|
+
// params carry EntityInfo for the formatter chain (ADR-158).
|
|
166
|
+
const target = context.command.directObject?.entity;
|
|
164
167
|
const events = [context.event('if.event.entered', {
|
|
165
168
|
messageId: `${context.action.id}.${messageId}`,
|
|
166
|
-
params: { place: state.targetName },
|
|
169
|
+
params: { place: target ? (0, utils_1.entityInfoFrom)(target) : { name: state.targetName } },
|
|
167
170
|
targetId: state.targetId,
|
|
168
171
|
targetName: state.targetName,
|
|
169
172
|
fromLocation: state.fromLocation,
|
|
170
173
|
preposition: state.preposition
|
|
171
174
|
})];
|
|
172
175
|
// === POST-REPORT HOOK ===
|
|
173
|
-
//
|
|
176
|
+
// Apply interceptor's override (replaces if.event.entered.messageId)
|
|
177
|
+
// and/or emit (additional events). See ISSUE-074.
|
|
174
178
|
const interceptor = sharedData.interceptor;
|
|
175
179
|
const interceptorData = sharedData.interceptorData || {};
|
|
176
|
-
if (interceptor?.postReport) {
|
|
177
|
-
const
|
|
178
|
-
if
|
|
179
|
-
const additionalEffects = interceptor.postReport(target, context.world, context.player.id, interceptorData);
|
|
180
|
-
// Convert CapabilityEffects to ISemanticEvents
|
|
181
|
-
for (const effect of additionalEffects) {
|
|
182
|
-
events.push(context.event(effect.type, effect.payload));
|
|
183
|
-
}
|
|
184
|
-
}
|
|
180
|
+
if (interceptor?.postReport && target) {
|
|
181
|
+
const result = interceptor.postReport(target, context.world, context.player.id, interceptorData);
|
|
182
|
+
(0, world_model_1.applyInterceptorReportResult)(events, 'if.event.entered', result, context);
|
|
185
183
|
}
|
|
186
184
|
return events;
|
|
187
185
|
},
|
|
@@ -203,11 +201,11 @@ exports.enteringAction = {
|
|
|
203
201
|
return customEffects.map(effect => context.event(effect.type, effect.payload));
|
|
204
202
|
}
|
|
205
203
|
}
|
|
206
|
-
// Standard blocked handling
|
|
204
|
+
// Standard blocked handling — params carry EntityInfo (ADR-158)
|
|
207
205
|
return [context.event('if.event.entered', {
|
|
208
206
|
blocked: true,
|
|
209
207
|
messageId: `${context.action.id}.${result.error}`,
|
|
210
|
-
params: { place: target
|
|
208
|
+
params: { place: target ? (0, utils_1.entityInfoFrom)(target) : undefined, ...result.params },
|
|
211
209
|
reason: result.error,
|
|
212
210
|
targetId: target?.id,
|
|
213
211
|
targetName: target?.name
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entering.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/entering/entering.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,
|
|
1
|
+
{"version":3,"file":"entering.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/entering/entering.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examining-data.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining-data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE/E,OAAO,EAAyB,QAAQ,
|
|
1
|
+
{"version":3,"file":"examining-data.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining-data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE/E,OAAO,EAAyB,QAAQ,EAA4C,MAAM,sBAAsB,CAAC;AAMjH;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA6IzE,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,0DAA0D;IAC1D,eAAe,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,CAAC;CACtE;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,IAAI,EAAE,QAAQ,GACb,sBAAsB,CAmGxB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGzE,CAAC"}
|
|
@@ -11,6 +11,7 @@ exports.buildExaminingMessageParams = buildExaminingMessageParams;
|
|
|
11
11
|
const world_model_1 = require("../../../../world-model/index.js");
|
|
12
12
|
const world_model_2 = require("../../../../world-model/index.js");
|
|
13
13
|
const snapshot_utils_1 = require("../../base/snapshot-utils");
|
|
14
|
+
const utils_1 = require("../../../utils");
|
|
14
15
|
/**
|
|
15
16
|
* Build examining action success data
|
|
16
17
|
*
|
|
@@ -42,6 +43,27 @@ const buildExaminingData = (context, preState, postState) => {
|
|
|
42
43
|
eventData.self = true;
|
|
43
44
|
return eventData; // No trait checking for self-examination
|
|
44
45
|
}
|
|
46
|
+
// Walls (ADR-173 Phase 4): per-side description rendering. The wall entity
|
|
47
|
+
// is symmetric, but the *description* the player sees depends on which side
|
|
48
|
+
// they're standing on. We pull `wall.getSide(playerRoom)?.description` and
|
|
49
|
+
// emit `examined_wall` with that as the description param.
|
|
50
|
+
//
|
|
51
|
+
// The actor's current location resolves the side. If the actor is not in
|
|
52
|
+
// either of the wall's two rooms, no per-side description is available —
|
|
53
|
+
// the message falls through to `nothing_special` in `buildExaminingMessageParams`.
|
|
54
|
+
// (In practice this branch is unreachable because the validator's scope
|
|
55
|
+
// filter only admits walls when the actor is in a connecting room, but the
|
|
56
|
+
// data builder stays safe regardless.)
|
|
57
|
+
if (noun instanceof world_model_1.WallEntity) {
|
|
58
|
+
const playerRoom = context.world.getLocation(actor.id);
|
|
59
|
+
const side = playerRoom ? noun.getSide(playerRoom) : undefined;
|
|
60
|
+
eventData.isWall = true;
|
|
61
|
+
if (side?.description) {
|
|
62
|
+
eventData.hasDescription = true;
|
|
63
|
+
eventData.wallDescription = side.description;
|
|
64
|
+
}
|
|
65
|
+
return eventData;
|
|
66
|
+
}
|
|
45
67
|
// Add trait-specific information
|
|
46
68
|
// Description and brief (description uses computed getter for trait-aware text)
|
|
47
69
|
eventData.hasDescription = !!noun.description;
|
|
@@ -133,6 +155,19 @@ function buildExaminingMessageParams(eventData, noun) {
|
|
|
133
155
|
if (eventData.hasDescription && noun.description) {
|
|
134
156
|
params.description = noun.description;
|
|
135
157
|
}
|
|
158
|
+
// Wall-specific message (ADR-173 Phase 4) — checked first because walls
|
|
159
|
+
// do not carry IdentityTrait, so the trait branches below are no-ops.
|
|
160
|
+
if (eventData.isWall) {
|
|
161
|
+
if (eventData.wallDescription) {
|
|
162
|
+
params.description = eventData.wallDescription;
|
|
163
|
+
messageId = 'examined_wall';
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
params.item = (0, utils_1.entityInfoFrom)(noun);
|
|
167
|
+
messageId = 'nothing_special';
|
|
168
|
+
}
|
|
169
|
+
return { messageId, params, contentsMessage };
|
|
170
|
+
}
|
|
136
171
|
// Container-specific message
|
|
137
172
|
if (eventData.isContainer) {
|
|
138
173
|
messageId = 'examined_container';
|
|
@@ -144,7 +179,7 @@ function buildExaminingMessageParams(eventData, noun) {
|
|
|
144
179
|
contentsMessage = {
|
|
145
180
|
messageId: 'container_contents',
|
|
146
181
|
params: {
|
|
147
|
-
container: noun
|
|
182
|
+
container: (0, utils_1.entityInfoFrom)(noun),
|
|
148
183
|
items: itemNames
|
|
149
184
|
}
|
|
150
185
|
};
|
|
@@ -160,7 +195,7 @@ function buildExaminingMessageParams(eventData, noun) {
|
|
|
160
195
|
contentsMessage = {
|
|
161
196
|
messageId: 'surface_contents',
|
|
162
197
|
params: {
|
|
163
|
-
surface: noun
|
|
198
|
+
surface: (0, utils_1.entityInfoFrom)(noun),
|
|
164
199
|
items: itemNames
|
|
165
200
|
}
|
|
166
201
|
};
|
|
@@ -193,7 +228,7 @@ function buildExaminingMessageParams(eventData, noun) {
|
|
|
193
228
|
}
|
|
194
229
|
// Default parameters for basic examined message
|
|
195
230
|
else if (messageId === 'examined') {
|
|
196
|
-
params.target = noun
|
|
231
|
+
params.target = (0, utils_1.entityInfoFrom)(noun);
|
|
197
232
|
}
|
|
198
233
|
}
|
|
199
234
|
return { messageId, params, contentsMessage };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examining-data.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining-data.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;
|
|
1
|
+
{"version":3,"file":"examining-data.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining-data.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export declare const ExaminingMessages: {
|
|
|
15
15
|
readonly EXAMINED_SWITCHABLE: "examined_switchable";
|
|
16
16
|
readonly EXAMINED_WEARABLE: "examined_wearable";
|
|
17
17
|
readonly EXAMINED_DOOR: "examined_door";
|
|
18
|
+
readonly EXAMINED_WALL: "examined_wall";
|
|
18
19
|
readonly NOTHING_SPECIAL: "nothing_special";
|
|
19
20
|
readonly DESCRIPTION: "description";
|
|
20
21
|
readonly BRIEF_DESCRIPTION: "brief_description";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examining-messages.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining-messages.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"examining-messages.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining-messages.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;CAkBpB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,OAAO,iBAAiB,CAAC,MAAM,OAAO,iBAAiB,CAAC,CAAC"}
|
|
@@ -20,6 +20,7 @@ exports.ExaminingMessages = {
|
|
|
20
20
|
EXAMINED_SWITCHABLE: 'examined_switchable',
|
|
21
21
|
EXAMINED_WEARABLE: 'examined_wearable',
|
|
22
22
|
EXAMINED_DOOR: 'examined_door',
|
|
23
|
+
EXAMINED_WALL: 'examined_wall',
|
|
23
24
|
NOTHING_SPECIAL: 'nothing_special',
|
|
24
25
|
DESCRIPTION: 'description',
|
|
25
26
|
BRIEF_DESCRIPTION: 'brief_description',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examining-messages.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining-messages.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACU,QAAA,iBAAiB,GAAG;IAC/B,iBAAiB;IACjB,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAE1B,mBAAmB;IACnB,QAAQ,EAAE,UAAU;IACpB,aAAa,EAAE,eAAe;IAC9B,kBAAkB,EAAE,oBAAoB;IACxC,kBAAkB,EAAE,oBAAoB;IACxC,iBAAiB,EAAE,mBAAmB;IACtC,mBAAmB,EAAE,qBAAqB;IAC1C,iBAAiB,EAAE,mBAAmB;IACtC,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,iBAAiB,EAAE,mBAAmB;CAC9B,CAAC"}
|
|
1
|
+
{"version":3,"file":"examining-messages.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining-messages.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACU,QAAA,iBAAiB,GAAG;IAC/B,iBAAiB;IACjB,SAAS,EAAE,WAAW;IACtB,WAAW,EAAE,aAAa;IAE1B,mBAAmB;IACnB,QAAQ,EAAE,UAAU;IACpB,aAAa,EAAE,eAAe;IAC9B,kBAAkB,EAAE,oBAAoB;IACxC,kBAAkB,EAAE,oBAAoB;IACxC,iBAAiB,EAAE,mBAAmB;IACtC,mBAAmB,EAAE,qBAAqB;IAC1C,iBAAiB,EAAE,mBAAmB;IACtC,aAAa,EAAE,eAAe;IAC9B,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,iBAAiB,EAAE,mBAAmB;CAC9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examining.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAG/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"examining.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAG/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAWrD,eAAO,MAAM,eAAe,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CA6GhE,CAAC"}
|
|
@@ -20,6 +20,7 @@ const data_builder_types_1 = require("../../data-builder-types");
|
|
|
20
20
|
// Import our data builder
|
|
21
21
|
const examining_data_1 = require("./examining-data");
|
|
22
22
|
const examining_messages_1 = require("./examining-messages");
|
|
23
|
+
const utils_1 = require("../../../utils");
|
|
23
24
|
exports.examiningAction = {
|
|
24
25
|
id: constants_1.IFActions.EXAMINING,
|
|
25
26
|
// Default scope requirements for this action's slots
|
|
@@ -37,6 +38,7 @@ exports.examiningAction = {
|
|
|
37
38
|
'examined_switchable',
|
|
38
39
|
'examined_wearable',
|
|
39
40
|
'examined_door',
|
|
41
|
+
'examined_wall',
|
|
40
42
|
'nothing_special',
|
|
41
43
|
'description',
|
|
42
44
|
'brief_description'
|
|
@@ -96,7 +98,9 @@ exports.examiningAction = {
|
|
|
96
98
|
return [context.event('if.event.examined', {
|
|
97
99
|
blocked: true,
|
|
98
100
|
messageId: `${context.action.id}.${result.error}`,
|
|
99
|
-
params
|
|
101
|
+
// params carry EntityInfo for the formatter chain (ADR-158);
|
|
102
|
+
// top-level fields stay strings for handlers.
|
|
103
|
+
params: { target: noun ? (0, utils_1.entityInfoFrom)(noun) : undefined, ...result.params },
|
|
100
104
|
reason: result.error,
|
|
101
105
|
targetId: noun?.id,
|
|
102
106
|
targetName: noun?.name
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"examining.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,+CAA4C;AAE5C,gDAAkD;AAElD,yEAAqE;AACrE,iEAA0D;AAE1D,0BAA0B;AAC1B,qDAAoF;AACpF,6DAAyD;
|
|
1
|
+
{"version":3,"file":"examining.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/examining/examining.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,+CAA4C;AAE5C,gDAAkD;AAElD,yEAAqE;AACrE,iEAA0D;AAE1D,0BAA0B;AAC1B,qDAAoF;AACpF,6DAAyD;AACzD,0CAAgD;AAEnC,QAAA,eAAe,GAA0C;IACpE,EAAE,EAAE,qBAAS,CAAC,SAAS;IAEvB,qDAAqD;IACrD,YAAY,EAAE;QACZ,MAAM,EAAE,kBAAU,CAAC,OAAO;KAC3B;IAED,gBAAgB,EAAE;QAChB,WAAW;QACX,aAAa;QACb,UAAU;QACV,eAAe;QACf,oBAAoB;QACpB,oBAAoB;QACpB,mBAAmB;QACnB,qBAAqB;QACrB,mBAAmB;QACnB,eAAe;QACf,eAAe;QACf,iBAAiB;QACjB,aAAa;QACb,mBAAmB;KACpB;IAED,QAAQ,CAAC,OAAsB;QAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;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,sCAAiB,CAAC,SAAS;aACnC,CAAC;QACJ,CAAC;QAED,2EAA2E;QAC3E,IAAI,IAAI,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,kBAAU,CAAC,OAAO,CAAC,CAAC;YAClE,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;gBACnB,OAAO,UAAU,CAAC,KAAM,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,mDAAmD;QACnD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,OAAsB;QAC5B,iDAAiD;IACnD,CAAC;IAED,MAAM,CAAC,OAAsB;QAC3B,yDAAyD;QACzD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,MAAO,CAAC;QAEnD,wCAAwC;QACxC,MAAM,SAAS,GAAG,IAAA,mCAAc,EAAC,oCAAmB,EAAE,OAAO,CAAC,CAAC;QAE/D,uCAAuC;QACvC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,4CAA2B,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAE5F,2EAA2E;QAC3E,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE;YACvD,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,SAAS,EAAE;YAC9C,MAAM;YACN,GAAG,SAAS;SACb,CAAC,CAAC;QACH,MAAM,MAAM,GAAqB,CAAC,aAAa,CAAC,CAAC;QAEjD,6DAA6D;QAC7D,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,sCAAiB,EAAC,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;QAEjF,oEAAoE;QACpE,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE;gBAC7C,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,eAAe,CAAC,SAAS,EAAE;gBAC9D,MAAM,EAAE,eAAe,CAAC,MAAM;gBAC9B,iBAAiB,EAAE,IAAI;aACxB,CAAC,CAAC,CAAC;QACN,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,OAAsB,EAAE,MAAwB;QACtD,4CAA4C;QAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE;gBACzC,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE;gBACjD,6DAA6D;gBAC7D,8CAA8C;gBAC9C,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE;gBAC7E,MAAM,EAAE,MAAM,CAAC,KAAK;gBACpB,QAAQ,EAAE,IAAI,EAAE,EAAE;gBAClB,UAAU,EAAE,IAAI,EAAE,IAAI;aACvB,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,EAAE,aAAa;IAEpB,QAAQ,EAAE;QACR,oBAAoB,EAAE,IAAI;QAC1B,sBAAsB,EAAE,KAAK;QAC7B,iBAAiB,EAAE,kBAAU,CAAC,OAAO;KACtC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exiting.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/exiting/exiting.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAA0D,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"exiting.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/exiting/exiting.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAA0D,MAAM,sBAAsB,CAAC;AA6BtG,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD,eAAO,MAAM,aAAa,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAmJ9D,CAAC"}
|
|
@@ -9,6 +9,7 @@ exports.exitingAction = void 0;
|
|
|
9
9
|
const world_model_1 = require("../../../../world-model/index.js");
|
|
10
10
|
const constants_1 = require("../../constants");
|
|
11
11
|
const exiting_messages_1 = require("./exiting-messages");
|
|
12
|
+
const utils_1 = require("../../../utils");
|
|
12
13
|
function getExitingSharedData(context) {
|
|
13
14
|
return context.sharedData;
|
|
14
15
|
}
|
|
@@ -63,7 +64,7 @@ exports.exitingAction = {
|
|
|
63
64
|
return {
|
|
64
65
|
valid: false,
|
|
65
66
|
error: exiting_messages_1.ExitingMessages.CONTAINER_CLOSED,
|
|
66
|
-
params: { container: currentContainer
|
|
67
|
+
params: { container: (0, utils_1.entityInfoFrom)(currentContainer) }
|
|
67
68
|
};
|
|
68
69
|
}
|
|
69
70
|
}
|
|
@@ -115,10 +116,13 @@ exports.exitingAction = {
|
|
|
115
116
|
})
|
|
116
117
|
];
|
|
117
118
|
}
|
|
118
|
-
// Create the EXITED event with messageId for text rendering
|
|
119
|
+
// Create the EXITED event with messageId for text rendering.
|
|
120
|
+
// params carry EntityInfo for the formatter chain (ADR-158);
|
|
121
|
+
// re-derive from the entity since it's available via context.world.
|
|
122
|
+
const fromEntity = context.world.getEntity(state.fromLocation);
|
|
119
123
|
return [context.event('if.event.exited', {
|
|
120
124
|
messageId: `${context.action.id}.exited`,
|
|
121
|
-
params: { place: state.fromLocationName },
|
|
125
|
+
params: { place: fromEntity ? (0, utils_1.entityInfoFrom)(fromEntity) : { name: state.fromLocationName } },
|
|
122
126
|
fromLocation: state.fromLocation,
|
|
123
127
|
fromLocationName: state.fromLocationName,
|
|
124
128
|
toLocation: state.toLocation,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exiting.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/exiting/exiting.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH,sDAG8B;AAC9B,+CAA4C;AAE5C,yDAAqD;
|
|
1
|
+
{"version":3,"file":"exiting.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/exiting/exiting.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"giving.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/giving/giving.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":"giving.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/giving/giving.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAmC,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAyCrD,eAAO,MAAM,YAAY,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CA2Q7D,CAAC"}
|
|
@@ -16,6 +16,7 @@ exports.givingAction = 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 getGivingSharedData(context) {
|
|
20
21
|
return context.sharedData;
|
|
21
22
|
}
|
|
@@ -82,7 +83,7 @@ exports.givingAction = {
|
|
|
82
83
|
return {
|
|
83
84
|
valid: false,
|
|
84
85
|
error: 'not_actor',
|
|
85
|
-
params: { recipient: recipient
|
|
86
|
+
params: { recipient: (0, utils_1.entityInfoFrom)(recipient) }
|
|
86
87
|
};
|
|
87
88
|
}
|
|
88
89
|
// Prevent giving to self
|
|
@@ -90,7 +91,7 @@ exports.givingAction = {
|
|
|
90
91
|
return {
|
|
91
92
|
valid: false,
|
|
92
93
|
error: 'self',
|
|
93
|
-
params: { item: item
|
|
94
|
+
params: { item: (0, utils_1.entityInfoFrom)(item) }
|
|
94
95
|
};
|
|
95
96
|
}
|
|
96
97
|
// Check inventory capacity
|
|
@@ -104,7 +105,7 @@ exports.givingAction = {
|
|
|
104
105
|
return {
|
|
105
106
|
valid: false,
|
|
106
107
|
error: 'inventory_full',
|
|
107
|
-
params: { recipient: recipient
|
|
108
|
+
params: { recipient: (0, utils_1.entityInfoFrom)(recipient) }
|
|
108
109
|
};
|
|
109
110
|
}
|
|
110
111
|
// Check weight
|
|
@@ -117,7 +118,7 @@ exports.givingAction = {
|
|
|
117
118
|
return {
|
|
118
119
|
valid: false,
|
|
119
120
|
error: 'too_heavy',
|
|
120
|
-
params: { item: item
|
|
121
|
+
params: { item: (0, utils_1.entityInfoFrom)(item), recipient: (0, utils_1.entityInfoFrom)(recipient) }
|
|
121
122
|
};
|
|
122
123
|
}
|
|
123
124
|
}
|
|
@@ -133,7 +134,7 @@ exports.givingAction = {
|
|
|
133
134
|
return {
|
|
134
135
|
valid: false,
|
|
135
136
|
error: 'not_interested',
|
|
136
|
-
params: { item: item
|
|
137
|
+
params: { item: (0, utils_1.entityInfoFrom)(item), recipient: (0, utils_1.entityInfoFrom)(recipient) }
|
|
137
138
|
};
|
|
138
139
|
}
|
|
139
140
|
}
|
|
@@ -198,9 +199,10 @@ exports.givingAction = {
|
|
|
198
199
|
default:
|
|
199
200
|
sharedData.messageId = 'given';
|
|
200
201
|
}
|
|
202
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
201
203
|
sharedData.params = {
|
|
202
|
-
item: item
|
|
203
|
-
recipient: recipient
|
|
204
|
+
item: (0, utils_1.entityInfoFrom)(item),
|
|
205
|
+
recipient: (0, utils_1.entityInfoFrom)(recipient)
|
|
204
206
|
};
|
|
205
207
|
},
|
|
206
208
|
blocked(context, result) {
|
|
@@ -209,10 +211,11 @@ exports.givingAction = {
|
|
|
209
211
|
return [context.event('if.event.give_blocked', {
|
|
210
212
|
blocked: true,
|
|
211
213
|
messageId: `${context.action.id}.${result.error}`,
|
|
214
|
+
// params carry EntityInfo for the formatter chain (ADR-158)
|
|
212
215
|
params: {
|
|
213
216
|
...result.params,
|
|
214
|
-
item: item
|
|
215
|
-
recipient: recipient
|
|
217
|
+
item: item ? (0, utils_1.entityInfoFrom)(item) : undefined,
|
|
218
|
+
recipient: recipient ? (0, utils_1.entityInfoFrom)(recipient) : undefined
|
|
216
219
|
},
|
|
217
220
|
reason: result.error,
|
|
218
221
|
itemId: item?.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"giving.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/giving/giving.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,gDAAkD;AAElD,sDAS8B;AAC9B,+CAA4C;
|
|
1
|
+
{"version":3,"file":"giving.js","sourceRoot":"","sources":["../../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/giving/giving.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAIH,gDAAkD;AAElD,sDAS8B;AAC9B,+CAA4C;AAE5C,0CAAgD;AAkBhD,SAAS,mBAAmB,CAAC,OAAsB;IACjD,OAAO,OAAO,CAAC,UAA8B,CAAC;AAChD,CAAC;AAED,SAAS,eAAe,CAAC,OAA2B,EAAE,OAAsB;IAC1E,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC;AAEY,QAAA,YAAY,GAA0C;IACjE,EAAE,EAAE,qBAAS,CAAC,MAAM;IAEpB,qDAAqD;IACrD,YAAY,EAAE;QACZ,IAAI,EAAE,kBAAU,CAAC,SAAS,EAAG,iCAAiC;QAC9D,SAAS,EAAE,kBAAU,CAAC,SAAS;KAChC;IAED,gBAAgB,EAAE;QAChB,SAAS;QACT,cAAc;QACd,aAAa;QACb,uBAAuB;QACvB,yBAAyB;QACzB,WAAW;QACX,MAAM;QACN,gBAAgB;QAChB,WAAW;QACX,gBAAgB;QAChB,SAAS;QACT,OAAO;QACP,SAAS;QACT,oBAAoB;QACpB,qBAAqB;KACtB;IAED,QAAQ,EAAE;QACR,oBAAoB,EAAE,IAAI;QAC1B,sBAAsB,EAAE,IAAI;QAC5B,iBAAiB,EAAE,kBAAU,CAAC,SAAS,EAAG,iCAAiC;QAC3E,mBAAmB,EAAE,kBAAU,CAAC,SAAS;KAC1C;IAED,QAAQ,CAAC,OAAsB;QAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAClD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC;QAEzD,2CAA2C;QAC3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,SAAS;gBAChB,MAAM,EAAE,EAAE;aACX,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,cAAc;gBACrB,MAAM,EAAE,EAAE;aACX,CAAC;QACJ,CAAC;QAED,gDAAgD;QAChD,+DAA+D;QAC/D,MAAM,UAAU,GAAG,OAAO,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;YACnB,OAAO,UAAU,CAAC,KAAM,CAAC;QAC3B,CAAC;QAED,qDAAqD;QACrD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,uBAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,WAAW;gBAClB,MAAM,EAAE,EAAE,SAAS,EAAE,IAAA,sBAAc,EAAC,SAAS,CAAC,EAAE;aACjD,CAAC;QACJ,CAAC;QAED,yBAAyB;QACzB,IAAI,SAAS,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;YAC9B,OAAO;gBACL,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE;aACvC,CAAC;QACJ,CAAC;QAED,2BAA2B;QAC3B,MAAM,cAAc,GAAG,SAAS,CAAC,QAAQ,CAAC,wBAAU,CAAC,CAAC;QACtD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,KAAK,GAAG,cAAc,CAAC,QAAQ,IAAK,cAAqD,CAAC,gBAAgB,CAAmC,CAAC;YAEpJ,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,kBAAkB,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAEnE,mBAAmB;gBACnB,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,kBAAkB,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAChF,OAAO;wBACL,KAAK,EAAE,KAAK;wBACZ,KAAK,EAAE,gBAAgB;wBACvB,MAAM,EAAE,EAAE,SAAS,EAAE,IAAA,sBAAc,EAAC,SAAS,CAAC,EAAE;qBACjD,CAAC;gBACJ,CAAC;gBAED,eAAe;gBACf,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;oBAClC,MAAM,aAAa,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;wBACzD,OAAO,GAAG,GAAG,8BAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC;oBACN,MAAM,UAAU,GAAG,8BAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;oBAEpD,IAAI,aAAa,GAAG,UAAU,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;wBACjD,OAAO;4BACL,KAAK,EAAE,KAAK;4BACZ,KAAK,EAAE,WAAW;4BAClB,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAA,sBAAc,EAAC,SAAS,CAAC,EAAE;yBAC7E,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,6DAA6D;QAC7D,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,gBAAgB,EAAE,CAAC,aAAa,CAAC,IAAK,cAAqD,EAAE,CAAC,aAAa,CAAC,CAAwC,CAAC;QAC1L,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAEzC,IAAI,WAAW,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9D,KAAK,MAAM,MAAM,IAAI,WAAW,CAAC,OAAmB,EAAE,CAAC;oBACrD,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;wBAC5C,OAAO;4BACL,KAAK,EAAE,KAAK;4BACZ,KAAK,EAAE,gBAAgB;4BACvB,MAAM,EAAE,EAAE,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAA,sBAAc,EAAC,SAAS,CAAC,EAAE;yBAC7E,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,OAAsB;QAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,MAAO,CAAC;QACnD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,cAAe,CAAC,MAAO,CAAC;QAC1D,MAAM,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAEhD,mBAAmB;QACnB,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QAC5B,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;QAChC,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;QACtC,UAAU,CAAC,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC;QAE1C,oEAAoE;QACpE,MAAM,QAAQ,GAAG,IAAA,qCAAuB,EAAC,SAAS,EAAE,qBAAS,CAAC,MAAM,CAAC,CAAC;QACtE,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,IAAA,sCAAwB,EAAC,QAAQ,EAAE,qBAAS,CAAC,MAAM,CAAC,CAAC;YACtE,IAAI,QAAQ,EAAE,CAAC;gBACb,UAAU,CAAC,kBAAkB,GAAG,QAAQ,CAAC;gBACzC,UAAU,CAAC,eAAe,GAAG,QAAQ,CAAC;gBACtC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;gBAClF,OAAO;YACT,CAAC;QACH,CAAC;QAED,kDAAkD;QAClD,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;QAEhD,iDAAiD;QACjD,IAAI,cAAc,GAAwC,QAAQ,CAAC;QACnE,MAAM,cAAc,GAAG,SAAS,CAAC,QAAQ,CAAC,wBAAU,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,CAAC,cAAc,EAAE,gBAAgB,EAAE,CAAC,aAAa,CAAC,IAAK,cAAqD,EAAE,CAAC,aAAa,CAAC,CAAwC,CAAC;QAE1L,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAEzC,IAAI,WAAW,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1D,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,KAAiB,EAAE,CAAC;oBACjD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;wBAC1C,cAAc,GAAG,UAAU,CAAC;wBAC5B,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,cAAc,KAAK,QAAQ,IAAI,WAAW,CAAC,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/F,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,QAAoB,EAAE,CAAC;oBACvD,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;wBAC7C,cAAc,GAAG,WAAW,CAAC;wBAC7B,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,UAAU,CAAC,cAAc,GAAG,cAAc,CAAC;QAE3C,qDAAqD;QACrD,QAAQ,cAAc,EAAE,CAAC;YACvB,KAAK,UAAU;gBACb,UAAU,CAAC,SAAS,GAAG,oBAAoB,CAAC;gBAC5C,MAAM;YACR,KAAK,WAAW;gBACd,UAAU,CAAC,SAAS,GAAG,qBAAqB,CAAC;gBAC7C,MAAM;YACR;gBACE,UAAU,CAAC,SAAS,GAAG,OAAO,CAAC;QACnC,CAAC;QAED,4DAA4D;QAC5D,UAAU,CAAC,MAAM,GAAG;YAClB,IAAI,EAAE,IAAA,sBAAc,EAAC,IAAI,CAAC;YAC1B,SAAS,EAAE,IAAA,sBAAc,EAAC,SAAS,CAAC;SACrC,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,OAAsB,EAAE,MAAwB;QACtD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;QAClD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC;QACzD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAuB,EAAE;gBAC7C,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE;gBACjD,4DAA4D;gBAC5D,MAAM,EAAE;oBACN,GAAG,MAAM,CAAC,MAAM;oBAChB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;oBAC7C,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAA,sBAAc,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;iBAC7D;gBACD,MAAM,EAAE,MAAM,CAAC,KAAK;gBACpB,MAAM,EAAE,IAAI,EAAE,EAAE;gBAChB,QAAQ,EAAE,IAAI,EAAE,IAAI;gBACpB,WAAW,EAAE,SAAS,EAAE,EAAE;gBAC1B,aAAa,EAAE,SAAS,EAAE,IAAI;aAC/B,CAAC,CAAC,CAAC;IACN,CAAC;IAED,MAAM,CAAC,OAAsB;QAC3B,MAAM,UAAU,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,MAAM,GAAqB,EAAE,CAAC;QAEpC,uEAAuE;QACvE,IAAI,OAAO,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;QACxD,CAAC;QAED,iEAAiE;QACjE,IAAI,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAClC,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC;YACzD,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,OAAO,GAAG,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAClD,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,UAAU,CAChE,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;YACpD,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,+DAA+D;QAC/D,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE;YAC1C,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,UAAU,CAAC,SAAS,EAAE;YACzD,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,IAAI,EAAE,UAAU,CAAC,MAAM;YACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,SAAS,EAAE,UAAU,CAAC,WAAW;YACjC,aAAa,EAAE,UAAU,CAAC,aAAa;YACvC,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC,CAAC;QAEJ,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,EAAE,QAAQ;CAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"going.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/going/going.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAEL,QAAQ,EAOR,aAAa,EAGb,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,
|
|
1
|
+
{"version":3,"file":"going.d.ts","sourceRoot":"","sources":["../../../../../../../../repos/sharpee/packages/stdlib/src/actions/standard/going/going.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,MAAM,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAE/E,OAAO,EAEL,QAAQ,EAOR,aAAa,EAGb,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAgBrD;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,gDAAgD;IAChD,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,iDAAiD;IACjD,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,mEAAmE;IACnE,sBAAsB,CAAC,EAAE,iBAAiB,CAAC;IAC3C,qDAAqD;IACrD,0BAA0B,CAAC,EAAE,qBAAqB,CAAC;IACnD,sDAAsD;IACtD,eAAe,CAAC,EAAE,QAAQ,CAAC;IAC3B,mDAAmD;IACnD,SAAS,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAC;IACrC,kEAAkE;IAClE,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,eAAe,CAE1E;AAED,eAAO,MAAM,WAAW,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,cAAc,CAAA;CAqe5D,CAAC"}
|
|
@@ -20,6 +20,7 @@ const types_1 = require("../../../scope/types");
|
|
|
20
20
|
const snapshot_utils_1 = require("../../base/snapshot-utils");
|
|
21
21
|
const data_builder_types_1 = require("../../data-builder-types");
|
|
22
22
|
const going_messages_1 = require("./going-messages");
|
|
23
|
+
const utils_1 = require("../../../utils");
|
|
23
24
|
// Import our data builders
|
|
24
25
|
const going_data_1 = require("./going-data");
|
|
25
26
|
function getGoingSharedData(context) {
|
|
@@ -72,7 +73,7 @@ exports.goingAction = {
|
|
|
72
73
|
return {
|
|
73
74
|
valid: false,
|
|
74
75
|
error: going_messages_1.GoingMessages.NOT_IN_ROOM,
|
|
75
|
-
params: { vehicle: walkCheck.vehicle
|
|
76
|
+
params: { vehicle: walkCheck.vehicle ? (0, utils_1.entityInfoFrom)(walkCheck.vehicle) : undefined }
|
|
76
77
|
};
|
|
77
78
|
}
|
|
78
79
|
// In a vehicle that allows walking (boat, etc.) - get the containing room
|
|
@@ -153,7 +154,7 @@ exports.goingAction = {
|
|
|
153
154
|
valid: false,
|
|
154
155
|
error: going_messages_1.GoingMessages.DOOR_LOCKED,
|
|
155
156
|
params: {
|
|
156
|
-
door: door
|
|
157
|
+
door: (0, utils_1.entityInfoFrom)(door),
|
|
157
158
|
direction: direction,
|
|
158
159
|
isClosed: isClosed,
|
|
159
160
|
isLocked: true
|
|
@@ -164,7 +165,7 @@ exports.goingAction = {
|
|
|
164
165
|
return {
|
|
165
166
|
valid: false,
|
|
166
167
|
error: going_messages_1.GoingMessages.DOOR_CLOSED,
|
|
167
|
-
params: { door: door
|
|
168
|
+
params: { door: (0, utils_1.entityInfoFrom)(door), direction: direction }
|
|
168
169
|
};
|
|
169
170
|
}
|
|
170
171
|
}
|
|
@@ -392,24 +393,22 @@ exports.goingAction = {
|
|
|
392
393
|
}));
|
|
393
394
|
}
|
|
394
395
|
// === SOURCE POST-REPORT HOOK ===
|
|
395
|
-
//
|
|
396
|
+
// Apply interceptor's override (replaces if.event.went.messageId, when emitted)
|
|
397
|
+
// and/or emit (additional events). See ISSUE-074.
|
|
398
|
+
// Note: if.event.went is only emitted on dark/blocked; override is a no-op
|
|
399
|
+
// on success non-dark transitions. Use emit for narration after success.
|
|
396
400
|
const interceptor = sharedData.interceptor;
|
|
397
401
|
const interceptorData = sharedData.interceptorData || {};
|
|
398
402
|
if (interceptor?.postReport && sharedData.sourceRoom) {
|
|
399
|
-
const
|
|
400
|
-
|
|
401
|
-
for (const effect of additionalEffects) {
|
|
402
|
-
events.push(context.event(effect.type, effect.payload));
|
|
403
|
-
}
|
|
403
|
+
const result = interceptor.postReport(sharedData.sourceRoom, context.world, context.player.id, interceptorData);
|
|
404
|
+
(0, world_model_1.applyInterceptorReportResult)(events, 'if.event.went', result, context);
|
|
404
405
|
}
|
|
405
406
|
// === DESTINATION POST-REPORT HOOK (ADR-126) ===
|
|
406
407
|
const destInterceptor = sharedData.destinationInterceptor;
|
|
407
408
|
const destInterceptorData = sharedData.destinationInterceptorData || {};
|
|
408
409
|
if (destInterceptor?.postReport && sharedData.destinationRoom) {
|
|
409
|
-
const
|
|
410
|
-
|
|
411
|
-
events.push(context.event(effect.type, effect.payload));
|
|
412
|
-
}
|
|
410
|
+
const result = destInterceptor.postReport(sharedData.destinationRoom, context.world, context.player.id, destInterceptorData);
|
|
411
|
+
(0, world_model_1.applyInterceptorReportResult)(events, 'if.event.went', result, context);
|
|
413
412
|
}
|
|
414
413
|
return events;
|
|
415
414
|
},
|