@linxin666/dsh-pet 0.4.8 → 0.4.9
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/README.i18n.yaml +2 -2
- package/README.md +7 -2
- package/README.zh.md +7 -2
- package/contracts/voice-pack-v1.schema.json +27 -0
- package/lib/client.js +24 -13
- package/lib/client.js.map +1 -1
- package/lib/index.js +160 -28
- package/lib/types/affinity.d.ts +26 -3
- package/lib/types/affinity.d.ts.map +1 -1
- package/lib/types/affinity.js +27 -4
- package/lib/types/client/PetDockEntry.d.ts +5 -0
- package/lib/types/client/PetDockEntry.d.ts.map +1 -1
- package/lib/types/client/PetDockEntry.js +1 -1
- package/lib/types/client/PetSprite.d.ts +5 -0
- package/lib/types/client/PetSprite.d.ts.map +1 -1
- package/lib/types/client/PetSprite.js +20 -8
- package/lib/types/client/index.d.ts.map +1 -1
- package/lib/types/client/index.js +15 -1
- package/lib/types/index.d.ts +1 -1
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/ledger.d.ts +10 -1
- package/lib/types/ledger.d.ts.map +1 -1
- package/lib/types/ledger.js +11 -1
- package/lib/types/pair-access.d.ts.map +1 -1
- package/lib/types/pair-access.js +26 -3
- package/lib/types/service.d.ts +14 -12
- package/lib/types/service.d.ts.map +1 -1
- package/lib/types/service.js +22 -17
- package/lib/types/voice-pack.d.ts +20 -1
- package/lib/types/voice-pack.d.ts.map +1 -1
- package/lib/types/voice-pack.js +86 -3
- package/package.json +24 -24
- package/src/affinity.test.ts +42 -0
- package/src/affinity.ts +46 -3
- package/src/client/PetDockEntry.tsx +6 -0
- package/src/client/PetSprite.test.tsx +42 -0
- package/src/client/PetSprite.tsx +24 -8
- package/src/client/index.test.tsx +4 -0
- package/src/client/index.ts +15 -1
- package/src/index.ts +2 -0
- package/src/ledger.test.ts +19 -0
- package/src/ledger.ts +15 -1
- package/src/pair-access.ts +26 -3
- package/src/service.test.ts +61 -0
- package/src/service.ts +27 -18
- package/src/voice-pack.test.ts +112 -0
- package/src/voice-pack.ts +101 -3
package/lib/index.js
CHANGED
|
@@ -1261,18 +1261,37 @@ function emptyAffinity() {
|
|
|
1261
1261
|
turns: 0
|
|
1262
1262
|
};
|
|
1263
1263
|
}
|
|
1264
|
-
/**
|
|
1265
|
-
function
|
|
1264
|
+
/** Built-in ladder lookup (the fallback for pets with no declared ladder). */
|
|
1265
|
+
function builtinRankOf(points) {
|
|
1266
1266
|
let rank = AFFINITY_RANKS[0];
|
|
1267
1267
|
for (const candidate of AFFINITY_RANKS) if (points >= candidate.min) rank = candidate;
|
|
1268
1268
|
return rank;
|
|
1269
1269
|
}
|
|
1270
|
+
/**
|
|
1271
|
+
* Rank for a point total. A pet-declared ladder replaces the tier names while
|
|
1272
|
+
* the built-in ladder still supplies the display marker; without a ladder the
|
|
1273
|
+
* built-in ladder answers unchanged. Points, thresholds and the persisted
|
|
1274
|
+
* ledger are untouched — the ladder is a display-only rename.
|
|
1275
|
+
*/
|
|
1276
|
+
function rankOf(points, ladder) {
|
|
1277
|
+
const builtin = builtinRankOf(points);
|
|
1278
|
+
if (ladder === void 0 || ladder.length === 0) return builtin;
|
|
1279
|
+
let selected = ladder[0];
|
|
1280
|
+
for (const candidate of ladder) if (points >= candidate.min) selected = candidate;
|
|
1281
|
+
return {
|
|
1282
|
+
min: selected.min,
|
|
1283
|
+
name: selected.name,
|
|
1284
|
+
...selected.nameEn === void 0 ? {} : { nameEn: selected.nameEn },
|
|
1285
|
+
emoji: builtin.emoji
|
|
1286
|
+
};
|
|
1287
|
+
}
|
|
1270
1288
|
/** Derive the read-only view of one affinity state at a wall-clock instant. */
|
|
1271
|
-
function affinityViewOf(state, nowMs, config = defaultAffinityConfig) {
|
|
1272
|
-
const rank = rankOf(state.points);
|
|
1289
|
+
function affinityViewOf(state, nowMs, config = defaultAffinityConfig, ladder) {
|
|
1290
|
+
const rank = rankOf(state.points, ladder);
|
|
1273
1291
|
return {
|
|
1274
1292
|
points: state.points,
|
|
1275
1293
|
rank: rank.name,
|
|
1294
|
+
...rank.nameEn === void 0 ? {} : { rankEn: rank.nameEn },
|
|
1276
1295
|
rankEmoji: rank.emoji,
|
|
1277
1296
|
pets: state.pets,
|
|
1278
1297
|
feeds: state.feeds,
|
|
@@ -1444,6 +1463,8 @@ var PetLedger = class {
|
|
|
1444
1463
|
treatConfig;
|
|
1445
1464
|
/** Round-robin reaction picker; rebuilt when the selected pet changes. */
|
|
1446
1465
|
picker;
|
|
1466
|
+
/** Declared rank ladder; undefined keeps the built-in whale ladder. */
|
|
1467
|
+
rankLadder;
|
|
1447
1468
|
current;
|
|
1448
1469
|
/** Completed turns already rewarded, per session (turn numbers are per-session). */
|
|
1449
1470
|
rewardedTurns = /* @__PURE__ */ new Map();
|
|
@@ -1459,6 +1480,7 @@ var PetLedger = class {
|
|
|
1459
1480
|
...config.treats ?? {}
|
|
1460
1481
|
};
|
|
1461
1482
|
this.picker = new RemarkPicker(config.remarks, config.voiceRemarks);
|
|
1483
|
+
this.rankLadder = config.rankLadder;
|
|
1462
1484
|
this.current = persist;
|
|
1463
1485
|
}
|
|
1464
1486
|
/** Affinity cooldown/rank tuning (read-only). */
|
|
@@ -1564,6 +1586,13 @@ var PetLedger = class {
|
|
|
1564
1586
|
this.picker = new RemarkPicker(remarks, voiceRemarks);
|
|
1565
1587
|
}
|
|
1566
1588
|
/**
|
|
1589
|
+
* Swap the display-only rank ladder to the selected pet's declared one
|
|
1590
|
+
* (called on pet selection). Undefined restores the built-in ladder.
|
|
1591
|
+
*/
|
|
1592
|
+
setRankLadder(ladder) {
|
|
1593
|
+
this.rankLadder = ladder;
|
|
1594
|
+
}
|
|
1595
|
+
/**
|
|
1567
1596
|
* Settle the treat economy (work + time output since the last settlement).
|
|
1568
1597
|
* A zero-gain first settlement still starts the time clock (anchor write),
|
|
1569
1598
|
* which is how the time output can ever accrue. Returns true when
|
|
@@ -1689,7 +1718,7 @@ var PetLedger = class {
|
|
|
1689
1718
|
}
|
|
1690
1719
|
/** Current affinity view for the RPC snapshot. */
|
|
1691
1720
|
affinityView(nowMs) {
|
|
1692
|
-
return affinityViewOf(this.current.affinity, nowMs, this.affinityConfig);
|
|
1721
|
+
return affinityViewOf(this.current.affinity, nowMs, this.affinityConfig, this.rankLadder);
|
|
1693
1722
|
}
|
|
1694
1723
|
};
|
|
1695
1724
|
//#endregion
|
|
@@ -2132,7 +2161,74 @@ function normalizeWhisperResults(raw, onWarning = () => {}) {
|
|
|
2132
2161
|
}
|
|
2133
2162
|
return Object.keys(pools).length > 0 ? pools : void 0;
|
|
2134
2163
|
}
|
|
2135
|
-
/**
|
|
2164
|
+
/** Validate one rank name slot of a declared ladder. */
|
|
2165
|
+
function rankName(raw, index, field, onWarning) {
|
|
2166
|
+
if (typeof raw !== "string") {
|
|
2167
|
+
onWarning("panel.ranks[" + index + "]." + field + " must be a string");
|
|
2168
|
+
return;
|
|
2169
|
+
}
|
|
2170
|
+
const trimmed = raw.trim();
|
|
2171
|
+
if (trimmed === "" || trimmed.length > 24) {
|
|
2172
|
+
onWarning("panel.ranks[" + index + "]." + field + " must be 1-24 characters");
|
|
2173
|
+
return;
|
|
2174
|
+
}
|
|
2175
|
+
return trimmed;
|
|
2176
|
+
}
|
|
2177
|
+
/**
|
|
2178
|
+
* Normalize one pet-declared affinity ladder (`panel.ranks`). A ladder is
|
|
2179
|
+
* all-or-nothing: it must be an array of 1-{@link RANK_LADDER_MAX} entries,
|
|
2180
|
+
* start at min 0, sort ascending with unique minima, and carry names of
|
|
2181
|
+
* 1-{@link RANK_NAME_MAX} characters. Any violation warns and drops the
|
|
2182
|
+
* whole ladder, so the pet keeps the built-in names instead of a half-broken
|
|
2183
|
+
* ladder; a bad ladder never rejects the pet.
|
|
2184
|
+
*/
|
|
2185
|
+
function normalizeRankLadder(raw, onWarning = () => {}) {
|
|
2186
|
+
if (!Array.isArray(raw)) {
|
|
2187
|
+
onWarning("panel.ranks must be an array");
|
|
2188
|
+
return;
|
|
2189
|
+
}
|
|
2190
|
+
if (raw.length === 0 || raw.length > 16) {
|
|
2191
|
+
onWarning("panel.ranks must contain 1-16 entries");
|
|
2192
|
+
return;
|
|
2193
|
+
}
|
|
2194
|
+
const ladder = [];
|
|
2195
|
+
let previousMin = -1;
|
|
2196
|
+
for (let index = 0; index < raw.length; index++) {
|
|
2197
|
+
const entry = raw[index];
|
|
2198
|
+
if (!isRecord$3(entry)) {
|
|
2199
|
+
onWarning("panel.ranks[" + index + "] must be an object");
|
|
2200
|
+
return;
|
|
2201
|
+
}
|
|
2202
|
+
const min = entry.min;
|
|
2203
|
+
if (typeof min !== "number" || !Number.isSafeInteger(min) || min < 0) {
|
|
2204
|
+
onWarning("panel.ranks[" + index + "].min must be a non-negative integer");
|
|
2205
|
+
return;
|
|
2206
|
+
}
|
|
2207
|
+
if (index === 0 && min !== 0) {
|
|
2208
|
+
onWarning("panel.ranks must start at min 0");
|
|
2209
|
+
return;
|
|
2210
|
+
}
|
|
2211
|
+
if (min <= previousMin) {
|
|
2212
|
+
onWarning("panel.ranks must be sorted ascending with unique min values");
|
|
2213
|
+
return;
|
|
2214
|
+
}
|
|
2215
|
+
previousMin = min;
|
|
2216
|
+
const defaultName = rankName(entry.name, index, "name", onWarning);
|
|
2217
|
+
if (defaultName === void 0) return void 0;
|
|
2218
|
+
let nameEn;
|
|
2219
|
+
if (entry.nameEn !== void 0) {
|
|
2220
|
+
nameEn = rankName(entry.nameEn, index, "nameEn", onWarning);
|
|
2221
|
+
if (nameEn === void 0) return void 0;
|
|
2222
|
+
}
|
|
2223
|
+
ladder.push({
|
|
2224
|
+
min,
|
|
2225
|
+
name: defaultName,
|
|
2226
|
+
...nameEn === void 0 ? {} : { nameEn }
|
|
2227
|
+
});
|
|
2228
|
+
}
|
|
2229
|
+
return ladder;
|
|
2230
|
+
}
|
|
2231
|
+
/** Normalize the panel block (labels / stats / actions / ranks; warn-and-drop). */
|
|
2136
2232
|
function normalizePanel(raw, onWarning = () => {}) {
|
|
2137
2233
|
if (!isRecord$3(raw)) {
|
|
2138
2234
|
onWarning("panel must be an object");
|
|
@@ -2190,7 +2286,12 @@ function normalizePanel(raw, onWarning = () => {}) {
|
|
|
2190
2286
|
panel.actions = PANEL_ACTIONS.filter((action) => seen.has(action));
|
|
2191
2287
|
}
|
|
2192
2288
|
}
|
|
2193
|
-
|
|
2289
|
+
const ranksRaw = raw.ranks;
|
|
2290
|
+
if (ranksRaw !== void 0) {
|
|
2291
|
+
const ladder = normalizeRankLadder(ranksRaw, onWarning);
|
|
2292
|
+
if (ladder !== void 0) panel.ranks = ladder;
|
|
2293
|
+
}
|
|
2294
|
+
if (panel.labels === void 0 && panel.stats === void 0 && panel.actions === void 0 && panel.ranks === void 0) return void 0;
|
|
2194
2295
|
return panel;
|
|
2195
2296
|
}
|
|
2196
2297
|
/** Voice-pack top-level fields ('$schema' mirrors the schema twin; drift-locked in tests). */
|
|
@@ -2304,6 +2405,7 @@ function mergeVoicePacks(...layers) {
|
|
|
2304
2405
|
const stats = {};
|
|
2305
2406
|
let remarks;
|
|
2306
2407
|
let ranks;
|
|
2408
|
+
let panelRanks;
|
|
2307
2409
|
let actions;
|
|
2308
2410
|
let panelSeen = false;
|
|
2309
2411
|
let any = false;
|
|
@@ -2328,6 +2430,7 @@ function mergeVoicePacks(...layers) {
|
|
|
2328
2430
|
if (layer.panel.labels !== void 0) Object.assign(labels, layer.panel.labels);
|
|
2329
2431
|
if (layer.panel.stats !== void 0) Object.assign(stats, layer.panel.stats);
|
|
2330
2432
|
if (layer.panel.actions !== void 0) actions = layer.panel.actions;
|
|
2433
|
+
if (layer.panel.ranks !== void 0) panelRanks = layer.panel.ranks;
|
|
2331
2434
|
}
|
|
2332
2435
|
if (layer.remarks !== void 0) remarks = {
|
|
2333
2436
|
...remarks ?? {},
|
|
@@ -2342,9 +2445,10 @@ function mergeVoicePacks(...layers) {
|
|
|
2342
2445
|
const panel = {
|
|
2343
2446
|
...Object.keys(labels).length > 0 ? { labels } : {},
|
|
2344
2447
|
...Object.keys(stats).length > 0 ? { stats } : {},
|
|
2345
|
-
...actions === void 0 ? {} : { actions }
|
|
2448
|
+
...actions === void 0 ? {} : { actions },
|
|
2449
|
+
...panelRanks === void 0 ? {} : { ranks: panelRanks }
|
|
2346
2450
|
};
|
|
2347
|
-
const panelEmpty = panel.labels === void 0 && panel.stats === void 0 && panel.actions === void 0;
|
|
2451
|
+
const panelEmpty = panel.labels === void 0 && panel.stats === void 0 && panel.actions === void 0 && panel.ranks === void 0;
|
|
2348
2452
|
return {
|
|
2349
2453
|
overrides,
|
|
2350
2454
|
...panelSeen && !panelEmpty ? { panel } : {},
|
|
@@ -5266,7 +5370,7 @@ var PetService = class extends Service {
|
|
|
5266
5370
|
const ledgerConfig = {
|
|
5267
5371
|
affinity: config.affinity,
|
|
5268
5372
|
treats: config.treats,
|
|
5269
|
-
...this.
|
|
5373
|
+
...this.voiceLayers(selected)
|
|
5270
5374
|
};
|
|
5271
5375
|
this.ledger = new PetLedger(persist, ledgerConfig);
|
|
5272
5376
|
this.stateConfig = {
|
|
@@ -5301,26 +5405,31 @@ var PetService = class extends Service {
|
|
|
5301
5405
|
return this.enabled;
|
|
5302
5406
|
}
|
|
5303
5407
|
/**
|
|
5304
|
-
* The
|
|
5305
|
-
* first, then the voice packs (a pet directory's voice.json over the
|
|
5306
|
-
* `$DSH_HOME/pets/.voice.json`).
|
|
5307
|
-
*
|
|
5308
|
-
*
|
|
5309
|
-
*
|
|
5310
|
-
*
|
|
5311
|
-
*
|
|
5312
|
-
*
|
|
5408
|
+
* The voice layers one pet contributes to the ledger: its manifest remark
|
|
5409
|
+
* pools first, then the voice packs (a pet directory's voice.json over the
|
|
5410
|
+
* global `$DSH_HOME/pets/.voice.json`). The voice pack's `panel.ranks`
|
|
5411
|
+
* ladder rides the same merge, so a ladder declared by either layer applies
|
|
5412
|
+
* with the documented precedence. Every path that seats these layers
|
|
5413
|
+
* resolves them here, so no call site can apply the manifest pools and
|
|
5414
|
+
* silently drop the voice layer: doing that reverted a pet whose lines a
|
|
5415
|
+
* voice pack had translated back to the built-in pools the moment the
|
|
5416
|
+
* settings surface applied.
|
|
5417
|
+
* @param entry - the pet whose layers apply.
|
|
5418
|
+
* @returns the layers `PetLedger` takes.
|
|
5313
5419
|
*/
|
|
5314
|
-
|
|
5420
|
+
voiceLayers(entry) {
|
|
5421
|
+
const voice = mergeVoicePacks(this.registry.globalVoice, entry.voice);
|
|
5315
5422
|
return {
|
|
5316
5423
|
remarks: entry.remarks,
|
|
5317
|
-
voiceRemarks:
|
|
5424
|
+
voiceRemarks: voice?.remarks,
|
|
5425
|
+
rankLadder: voice?.panel?.ranks
|
|
5318
5426
|
};
|
|
5319
5427
|
}
|
|
5320
|
-
/** Re-seat the ledger's remark pools from one pet's layers. */
|
|
5321
|
-
|
|
5322
|
-
const layers = this.
|
|
5428
|
+
/** Re-seat the ledger's remark pools and rank ladder from one pet's layers. */
|
|
5429
|
+
applyVoiceLayers(entry) {
|
|
5430
|
+
const layers = this.voiceLayers(entry);
|
|
5323
5431
|
this.ledger.setRemarks(layers.remarks, layers.voiceRemarks);
|
|
5432
|
+
this.ledger.setRankLadder(layers.rankLadder);
|
|
5324
5433
|
}
|
|
5325
5434
|
/** RPC: current pet state snapshot. */
|
|
5326
5435
|
async state(currentSessionId) {
|
|
@@ -5456,7 +5565,7 @@ var PetService = class extends Service {
|
|
|
5456
5565
|
error: "unknown-pet"
|
|
5457
5566
|
};
|
|
5458
5567
|
this.ledger.setPetId(entry.id);
|
|
5459
|
-
this.
|
|
5568
|
+
this.applyVoiceLayers(entry);
|
|
5460
5569
|
this.flush();
|
|
5461
5570
|
this.syncSettingsFromPet();
|
|
5462
5571
|
return {
|
|
@@ -5882,7 +5991,7 @@ var PetService = class extends Service {
|
|
|
5882
5991
|
const selected = typeof section.petId === "string" ? this.registry.byId(section.petId) : void 0;
|
|
5883
5992
|
if (selected !== void 0) {
|
|
5884
5993
|
this.ledger.setPetId(selected.id);
|
|
5885
|
-
this.
|
|
5994
|
+
this.applyVoiceLayers(selected);
|
|
5886
5995
|
} else if (section.petId !== void 0) this.syncSettingsFromPet();
|
|
5887
5996
|
const next = { ...this.ledger.snapshot.display };
|
|
5888
5997
|
next.visible = section.visible;
|
|
@@ -6041,8 +6150,31 @@ function isLoopbackRequest(request) {
|
|
|
6041
6150
|
*/
|
|
6042
6151
|
function isPairedOrLoopbackAllowed(ctx, request) {
|
|
6043
6152
|
if (isLoopbackRequest(request)) return true;
|
|
6044
|
-
|
|
6045
|
-
|
|
6153
|
+
return lookupPairing(ctx)?.isPairedDevice(request) === true;
|
|
6154
|
+
}
|
|
6155
|
+
/**
|
|
6156
|
+
* The pairing service, or undefined when this composition does not expose it.
|
|
6157
|
+
*
|
|
6158
|
+
* Two lookups exist because the fence is shared with test harnesses that hand
|
|
6159
|
+
* over a bare object: a real cordis context resolves services through `get`, a
|
|
6160
|
+
* harness may carry the property directly. `get(name, false)` is the
|
|
6161
|
+
* non-strict form, so an unloaded service answers undefined rather than
|
|
6162
|
+
* throwing. Reading an un-injected service as a PROPERTY throws instead
|
|
6163
|
+
* (`cannot get property "remoteWebUiPairing" without inject`); a trust fence
|
|
6164
|
+
* must answer "not paired" in that case, never leak the error into the route
|
|
6165
|
+
* handler, where the host web server turns it into an empty-body 400 (#1942).
|
|
6166
|
+
*/
|
|
6167
|
+
function lookupPairing(ctx) {
|
|
6168
|
+
if (typeof ctx.get === "function") {
|
|
6169
|
+
const viaGet = ctx.get("remoteWebUiPairing", false);
|
|
6170
|
+
return isPairingAccess(viaGet) ? viaGet : void 0;
|
|
6171
|
+
}
|
|
6172
|
+
try {
|
|
6173
|
+
const viaProperty = ctx.remoteWebUiPairing;
|
|
6174
|
+
return isPairingAccess(viaProperty) ? viaProperty : void 0;
|
|
6175
|
+
} catch {
|
|
6176
|
+
return;
|
|
6177
|
+
}
|
|
6046
6178
|
}
|
|
6047
6179
|
function isPairingAccess(value) {
|
|
6048
6180
|
return value !== void 0 && value !== null && typeof value.isPairedDevice === "function";
|
package/lib/types/affinity.d.ts
CHANGED
|
@@ -75,6 +75,22 @@ export declare const AFFINITY_RANKS: readonly [{
|
|
|
75
75
|
readonly name: "鲸生共渡";
|
|
76
76
|
readonly emoji: "*********";
|
|
77
77
|
}];
|
|
78
|
+
/** One tier of a pet-declared affinity ladder (voice.json `panel.ranks`). */
|
|
79
|
+
export interface AffinityRankName {
|
|
80
|
+
/** Minimum points for this tier; the first entry is always 0. */
|
|
81
|
+
min: number;
|
|
82
|
+
/** Default rank name shown in every locale without an English variant. */
|
|
83
|
+
name: string;
|
|
84
|
+
/** Optional English name used when the UI locale is English. */
|
|
85
|
+
nameEn?: string;
|
|
86
|
+
}
|
|
87
|
+
/** A resolved rank: the effective name plus the display-only marker. */
|
|
88
|
+
export interface AffinityRank {
|
|
89
|
+
min: number;
|
|
90
|
+
name: string;
|
|
91
|
+
nameEn?: string;
|
|
92
|
+
emoji: string;
|
|
93
|
+
}
|
|
78
94
|
/** English translations for the 9 built-in affinity rank names (#1226). */
|
|
79
95
|
export declare const AFFINITY_RANKS_EN: Readonly<Record<string, string>>;
|
|
80
96
|
/** Interaction tuning (all in points / ms). */
|
|
@@ -103,12 +119,19 @@ export interface InteractionOutcome {
|
|
|
103
119
|
/** True when the interaction was accepted (outside cooldown). */
|
|
104
120
|
accepted: boolean;
|
|
105
121
|
}
|
|
106
|
-
/**
|
|
107
|
-
|
|
122
|
+
/**
|
|
123
|
+
* Rank for a point total. A pet-declared ladder replaces the tier names while
|
|
124
|
+
* the built-in ladder still supplies the display marker; without a ladder the
|
|
125
|
+
* built-in ladder answers unchanged. Points, thresholds and the persisted
|
|
126
|
+
* ledger are untouched — the ladder is a display-only rename.
|
|
127
|
+
*/
|
|
128
|
+
export declare function rankOf(points: number, ladder?: readonly AffinityRankName[]): AffinityRank;
|
|
108
129
|
/** Read-only affinity snapshot suited for the RPC view shape. */
|
|
109
130
|
export interface PetAffinityView {
|
|
110
131
|
points: number;
|
|
111
132
|
rank: string;
|
|
133
|
+
/** English rank name when the pet declared one (an English UI shows this). */
|
|
134
|
+
rankEn?: string;
|
|
112
135
|
rankEmoji: string;
|
|
113
136
|
pets: number;
|
|
114
137
|
feeds: number;
|
|
@@ -119,7 +142,7 @@ export interface PetAffinityView {
|
|
|
119
142
|
feedCooldown: boolean;
|
|
120
143
|
}
|
|
121
144
|
/** Derive the read-only view of one affinity state at a wall-clock instant. */
|
|
122
|
-
export declare function affinityViewOf(state: AffinityState, nowMs: number, config?: AffinityConfig): PetAffinityView;
|
|
145
|
+
export declare function affinityViewOf(state: AffinityState, nowMs: number, config?: AffinityConfig, ladder?: readonly AffinityRankName[]): PetAffinityView;
|
|
123
146
|
/**
|
|
124
147
|
* Apply one interaction to a copy of the state (immutable style: returns a
|
|
125
148
|
* new object; the caller replaces the persisted state). Cooldowns only
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affinity.d.ts","sourceRoot":"","sources":["../../src/affinity.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,uDAAuD;AACvD,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,MAAM,CAAA;AAE3C,mCAAmC;AACnC,MAAM,WAAW,aAAa;IAC5B,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAA;IACd,4CAA4C;IAC5C,SAAS,EAAE,MAAM,CAAA;IACjB,iCAAiC;IACjC,UAAU,EAAE,MAAM,CAAA;IAClB,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,mCAAmC;IACnC,KAAK,EAAE,MAAM,CAAA;IACb,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAA;IAClB,2DAA2D;IAC3D,WAAW,EAAE,MAAM,CAAA;IACnB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAA;CACd;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,YAAc,CAAA;AAEvC;;;;8EAI8E;AAC9E,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUjB,CAAA;AAEV,2EAA2E;AAC3E,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAU9D,CAAA;AAED,+CAA+C;AAC/C,MAAM,WAAW,cAAc;IAC7B,iCAAiC;IACjC,UAAU,EAAE,MAAM,CAAA;IAClB,6DAA6D;IAC7D,SAAS,EAAE,MAAM,CAAA;IACjB,iCAAiC;IACjC,aAAa,EAAE,MAAM,CAAA;IACrB,uBAAuB;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,kCAAkC;IAClC,cAAc,EAAE,MAAM,CAAA;CACvB;AAED,eAAO,MAAM,qBAAqB,EAAE,cAMnC,CAAA;AAED,wBAAgB,aAAa,IAAI,aAAa,CAW7C;AAED,kCAAkC;AAClC,MAAM,WAAW,kBAAkB;IACjC,mDAAmD;IACnD,QAAQ,EAAE,aAAa,CAAA;IACvB,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAA;IACb,6DAA6D;IAC7D,QAAQ,EAAE,MAAM,CAAA;IAChB,iEAAiE;IACjE,QAAQ,EAAE,OAAO,CAAA;CAClB;
|
|
1
|
+
{"version":3,"file":"affinity.d.ts","sourceRoot":"","sources":["../../src/affinity.ts"],"names":[],"mappings":"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"}
|
package/lib/types/affinity.js
CHANGED
|
@@ -60,8 +60,8 @@ export function emptyAffinity() {
|
|
|
60
60
|
turns: 0,
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
|
-
/**
|
|
64
|
-
|
|
63
|
+
/** Built-in ladder lookup (the fallback for pets with no declared ladder). */
|
|
64
|
+
function builtinRankOf(points) {
|
|
65
65
|
let rank = AFFINITY_RANKS[0];
|
|
66
66
|
for (const candidate of AFFINITY_RANKS) {
|
|
67
67
|
if (points >= candidate.min)
|
|
@@ -69,12 +69,35 @@ export function rankOf(points) {
|
|
|
69
69
|
}
|
|
70
70
|
return rank;
|
|
71
71
|
}
|
|
72
|
+
/**
|
|
73
|
+
* Rank for a point total. A pet-declared ladder replaces the tier names while
|
|
74
|
+
* the built-in ladder still supplies the display marker; without a ladder the
|
|
75
|
+
* built-in ladder answers unchanged. Points, thresholds and the persisted
|
|
76
|
+
* ledger are untouched — the ladder is a display-only rename.
|
|
77
|
+
*/
|
|
78
|
+
export function rankOf(points, ladder) {
|
|
79
|
+
const builtin = builtinRankOf(points);
|
|
80
|
+
if (ladder === undefined || ladder.length === 0)
|
|
81
|
+
return builtin;
|
|
82
|
+
let selected = ladder[0];
|
|
83
|
+
for (const candidate of ladder) {
|
|
84
|
+
if (points >= candidate.min)
|
|
85
|
+
selected = candidate;
|
|
86
|
+
}
|
|
87
|
+
return {
|
|
88
|
+
min: selected.min,
|
|
89
|
+
name: selected.name,
|
|
90
|
+
...(selected.nameEn === undefined ? {} : { nameEn: selected.nameEn }),
|
|
91
|
+
emoji: builtin.emoji,
|
|
92
|
+
};
|
|
93
|
+
}
|
|
72
94
|
/** Derive the read-only view of one affinity state at a wall-clock instant. */
|
|
73
|
-
export function affinityViewOf(state, nowMs, config = defaultAffinityConfig) {
|
|
74
|
-
const rank = rankOf(state.points);
|
|
95
|
+
export function affinityViewOf(state, nowMs, config = defaultAffinityConfig, ladder) {
|
|
96
|
+
const rank = rankOf(state.points, ladder);
|
|
75
97
|
return {
|
|
76
98
|
points: state.points,
|
|
77
99
|
rank: rank.name,
|
|
100
|
+
...(rank.nameEn === undefined ? {} : { rankEn: rank.nameEn }),
|
|
78
101
|
rankEmoji: rank.emoji,
|
|
79
102
|
pets: state.pets,
|
|
80
103
|
feeds: state.feeds,
|
|
@@ -56,6 +56,11 @@ export type PetDockEntryProps = PetInjected & PropsLocale<typeof NS> & {
|
|
|
56
56
|
* own the whole pet surface as one unit.
|
|
57
57
|
*/
|
|
58
58
|
portalTarget?: Element;
|
|
59
|
+
/**
|
|
60
|
+
* Active UI locale id, forwarded to the sprite so a pet-declared English
|
|
61
|
+
* rank name (`rankEn`) applies when the UI language is English.
|
|
62
|
+
*/
|
|
63
|
+
lang?: string;
|
|
59
64
|
};
|
|
60
65
|
/**
|
|
61
66
|
* Dock entry: while the pet is visible, mount the floating PetSprite (it
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PetDockEntry.d.ts","sourceRoot":"","sources":["../../../src/client/PetDockEntry.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAA2C,KAAK,YAAY,EAAE,MAAM,OAAO,CAAA;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAEnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAItD,OAAO,EAAe,KAAK,WAAW,EAAoB,MAAM,oBAAoB,CAAA;AACpF,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAGjC,2DAA2D;AAC3D,MAAM,WAAW,WAAW;IAC1B,6EAA6E;IAC7E,KAAK,EAAE,gBAAgB,CAAA;IACvB,kFAAkF;IAClF,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,8BAA8B;IAC9B,GAAG,EAAE,MAAM,IAAI,CAAA;IACf,uBAAuB;IACvB,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,uBAAuB;IACvB,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,qCAAqC;IACrC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,+BAA+B;IAC/B,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAChD,uDAAuD;IACvD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B;;;;OAIG;IACH,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,2DAA2D;IAC3D,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IACxC,iCAAiC;IACjC,YAAY,EAAE,MAAM,IAAI,CAAA;IACxB,uGAAuG;IACvG,QAAQ,EAAE,WAAW,CAAA;CACtB;AAED,yFAAyF;AACzF,MAAM,MAAM,iBAAiB,GAC3B,WAAW,GACT,WAAW,CAAC,OAAO,EAAE,CAAC,GACtB;IACA;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"PetDockEntry.d.ts","sourceRoot":"","sources":["../../../src/client/PetDockEntry.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAA2C,KAAK,YAAY,EAAE,MAAM,OAAO,CAAA;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAEnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAItD,OAAO,EAAe,KAAK,WAAW,EAAoB,MAAM,oBAAoB,CAAA;AACpF,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAGjC,2DAA2D;AAC3D,MAAM,WAAW,WAAW;IAC1B,6EAA6E;IAC7E,KAAK,EAAE,gBAAgB,CAAA;IACvB,kFAAkF;IAClF,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,8BAA8B;IAC9B,GAAG,EAAE,MAAM,IAAI,CAAA;IACf,uBAAuB;IACvB,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,uBAAuB;IACvB,IAAI,EAAE,MAAM,IAAI,CAAA;IAChB,qCAAqC;IACrC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,+BAA+B;IAC/B,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAChD,uDAAuD;IACvD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9B;;;;OAIG;IACH,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACjC,2DAA2D;IAC3D,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IACxC,iCAAiC;IACjC,YAAY,EAAE,MAAM,IAAI,CAAA;IACxB,uGAAuG;IACvG,QAAQ,EAAE,WAAW,CAAA;CACtB;AAED,yFAAyF;AACzF,MAAM,MAAM,iBAAiB,GAC3B,WAAW,GACT,WAAW,CAAC,OAAO,EAAE,CAAC,GACtB;IACA;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAIH;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,YAAY,CA4FnE"}
|
|
@@ -47,7 +47,7 @@ export function PetDockEntry(props) {
|
|
|
47
47
|
if (visible) {
|
|
48
48
|
return (_jsx("span", { "data-pet-dock": true, "data-testid": "pet-dock", children: snapshot === null || definition === null
|
|
49
49
|
? null
|
|
50
|
-
: (_jsx(PetRendererSwitch, { definition: definition, phase: snapshot?.phase ?? 'idle', onPet: props.pet, ...(aux === null ? {} : { drag: aux.drag, bus: aux.bus }), t: props.t, children: _jsx(PetSprite, { snapshot: snapshot, definition: definition, display: snapshot.display, feedback: feedback, onPet: props.pet, onFeed: props.feed, onHide: props.hide, onDragEnd: props.dragEnd, onRename: props.rename, onPanelAction: props.panelAction, onOpenSession: props.openSession, onFeedbackDone: props.feedbackDone, portalTarget: props.portalTarget, dragDisabled: snapshot.gameplay?.mode === 'work', ...(aux === null ? {} : { bus: aux.bus }), ...(gameplay === undefined || aux === null
|
|
50
|
+
: (_jsx(PetRendererSwitch, { definition: definition, phase: snapshot?.phase ?? 'idle', onPet: props.pet, ...(aux === null ? {} : { drag: aux.drag, bus: aux.bus }), t: props.t, children: _jsx(PetSprite, { snapshot: snapshot, definition: definition, display: snapshot.display, feedback: feedback, onPet: props.pet, onFeed: props.feed, onHide: props.hide, onDragEnd: props.dragEnd, onRename: props.rename, onPanelAction: props.panelAction, onOpenSession: props.openSession, onFeedbackDone: props.feedbackDone, portalTarget: props.portalTarget, dragDisabled: snapshot.gameplay?.mode === 'work', ...(aux === null ? {} : { bus: aux.bus }), lang: props.lang, ...(gameplay === undefined || aux === null
|
|
51
51
|
? {}
|
|
52
52
|
: {
|
|
53
53
|
onGameplayTap: (fx, fy) => aux.bus.tap?.(fx, fy),
|
|
@@ -91,6 +91,11 @@ export interface PetSpriteProps {
|
|
|
91
91
|
portalTarget?: Element;
|
|
92
92
|
/** Locale translate seat (namespace-bound). */
|
|
93
93
|
t: TranslateNS<typeof NS>;
|
|
94
|
+
/**
|
|
95
|
+
* Active UI locale id, used to pick a pet-declared English rank name
|
|
96
|
+
* (`rankEn`). Defaults to the document language for direct mounts/tests.
|
|
97
|
+
*/
|
|
98
|
+
lang?: string;
|
|
94
99
|
}
|
|
95
100
|
/**
|
|
96
101
|
* The floating pet. The spritesheet frame advances on a timer scheduled for the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PetSprite.d.ts","sourceRoot":"","sources":["../../../src/client/PetSprite.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAkE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAIjD,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAGjC,wEAAwE;AACxE,MAAM,WAAW,cAAc;IAC7B,gDAAgD;IAChD,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAA;IAC7B,8EAA8E;IAC9E,UAAU,EAAE,aAAa,CAAA;IACzB,qDAAqD;IACrD,OAAO,EAAE,gBAAgB,CAAA;IACzB,sCAAsC;IACtC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAA;IAC5B,8BAA8B;IAC9B,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,sCAAsC;IACtC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,sCAAsC;IACtC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,+BAA+B;IAC/B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAClD,6EAA6E;IAC7E,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAA;IAC9C,uDAAuD;IACvD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC;;;;;OAKG;IACH,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,4DAA4D;IAC5D,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IAC1C,2DAA2D;IAC3D,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB;;;;OAIG;IACH,GAAG,CAAC,EAAE,SAAS,CAAA;IACf;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9D;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,qEAAqE;IACrE,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;OAGG;IACH,GAAG,CAAC,EAAE,WAAW,CAAA;IACjB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,+CAA+C;IAC/C,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"PetSprite.d.ts","sourceRoot":"","sources":["../../../src/client/PetSprite.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAkE,SAAS,EAAE,WAAW,EAAE,MAAM,OAAO,CAAA;AAGnH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAIjD,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAA;AAGjC,wEAAwE;AACxE,MAAM,WAAW,cAAc;IAC7B,gDAAgD;IAChD,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAA;IAC7B,8EAA8E;IAC9E,UAAU,EAAE,aAAa,CAAA;IACzB,qDAAqD;IACrD,OAAO,EAAE,gBAAgB,CAAA;IACzB,sCAAsC;IACtC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAA;IAC5B,8BAA8B;IAC9B,KAAK,EAAE,MAAM,IAAI,CAAA;IACjB,sCAAsC;IACtC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,sCAAsC;IACtC,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,+BAA+B;IAC/B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAClD,6EAA6E;IAC7E,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAA;IAC9C,uDAAuD;IACvD,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IAChC;;;;;OAKG;IACH,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,4DAA4D;IAC5D,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IAC1C,2DAA2D;IAC3D,cAAc,EAAE,MAAM,IAAI,CAAA;IAC1B;;;;OAIG;IACH,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB;;;;OAIG;IACH,GAAG,CAAC,EAAE,SAAS,CAAA;IACf;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IAC9D;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;IAC3B,qEAAqE;IACrE,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;OAGG;IACH,GAAG,CAAC,EAAE,WAAW,CAAA;IACjB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,+CAA+C;IAC/C,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;IACzB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAkJD;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,GAAG,WAAW,CAwxB5D"}
|
|
@@ -184,6 +184,22 @@ export function PetSprite(props) {
|
|
|
184
184
|
// formats carry {rank}/{n}/{points} placeholders the host validated.
|
|
185
185
|
const panel = definition.panel;
|
|
186
186
|
const panelLabel = (slot, i18n) => panel?.labels?.[slot] ?? i18n;
|
|
187
|
+
// The active rank name is display-only: a pet-declared ladder may carry an
|
|
188
|
+
// English variant, while built-in names still resolve through the i18n
|
|
189
|
+
// dictionary. `lang` is handed down by the mount; the document language is
|
|
190
|
+
// the direct-mount/test fallback.
|
|
191
|
+
const englishUi = (props.lang ?? (typeof document === 'undefined' ? 'zh' : document.documentElement.lang))
|
|
192
|
+
.toLowerCase()
|
|
193
|
+
.startsWith('en');
|
|
194
|
+
const rankNameOf = () => {
|
|
195
|
+
const rawRank = snapshot?.affinity.rank ?? '?';
|
|
196
|
+
const rankEn = snapshot?.affinity.rankEn;
|
|
197
|
+
if (englishUi && rankEn !== undefined)
|
|
198
|
+
return rankEn;
|
|
199
|
+
const rankKey = `pet.rank.name.${rawRank}`;
|
|
200
|
+
const localized = props.t(rankKey);
|
|
201
|
+
return localized !== rankKey ? localized : rawRank;
|
|
202
|
+
};
|
|
187
203
|
const panelStat = (slot, i18nKey, values) => {
|
|
188
204
|
const format = panel?.stats?.[slot] ?? props.t(i18nKey, values);
|
|
189
205
|
if (panel?.stats?.[slot] === undefined)
|
|
@@ -191,8 +207,10 @@ export function PetSprite(props) {
|
|
|
191
207
|
// The host whitelists {rank}/{n}/{points} in every stat slot, so a pack
|
|
192
208
|
// format may reference any of them; substitute all three live values
|
|
193
209
|
// (the slot's own value plus the siblings) instead of only the slot's.
|
|
210
|
+
// {rank} carries the effective name, so a pet ladder's English variant
|
|
211
|
+
// also reaches a custom stat format.
|
|
194
212
|
const all = {
|
|
195
|
-
rank:
|
|
213
|
+
rank: values.rank !== undefined ? values.rank : rankNameOf(),
|
|
196
214
|
n: snapshot?.treats.stocked ?? 0,
|
|
197
215
|
points: snapshot?.affinity.points ?? 0,
|
|
198
216
|
};
|
|
@@ -726,13 +744,7 @@ export function PetSprite(props) {
|
|
|
726
744
|
props.onRename(trimmed);
|
|
727
745
|
setRenaming(false);
|
|
728
746
|
}
|
|
729
|
-
}, children: panelLabel('confirm', props.t('pet.confirm')) })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: styles.rankRow, children: [_jsx("span", { className: styles.nameCell, children: displayName }), _jsx("span", { className: styles.statRank, children: (() => {
|
|
730
|
-
const rawRank = snapshot?.affinity.rank ?? '?';
|
|
731
|
-
const rankKey = `pet.rank.name.${rawRank}`;
|
|
732
|
-
const localized = props.t(rankKey);
|
|
733
|
-
const rankName = localized !== rankKey ? localized : rawRank;
|
|
734
|
-
return panelStat('rank', 'pet.rank', { rank: rankName });
|
|
735
|
-
})() })] }), _jsxs("div", { className: styles.rankRow, children: [_jsx("span", { className: styles.statTreats, children: panelStat('treats', 'pet.treats', { n: snapshot?.treats.stocked ?? 0 }) }), _jsx("span", { className: styles.statPoints, children: panelStat('points', 'pet.points', { points: snapshot?.affinity.points ?? 0 }) })] }), _jsxs("div", { className: styles.actions, children: [panelShows('feed') && (_jsx("button", { type: "button", className: styles.action, onClick: props.onFeed, children: panelLabel('feed', props.t('pet.feed')) })), panelShows('rename') && (_jsx("button", { type: "button", className: styles.action, onClick: () => {
|
|
747
|
+
}, children: panelLabel('confirm', props.t('pet.confirm')) })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: styles.rankRow, children: [_jsx("span", { className: styles.nameCell, children: displayName }), _jsx("span", { className: styles.statRank, children: panelStat('rank', 'pet.rank', { rank: rankNameOf() }) })] }), _jsxs("div", { className: styles.rankRow, children: [_jsx("span", { className: styles.statTreats, children: panelStat('treats', 'pet.treats', { n: snapshot?.treats.stocked ?? 0 }) }), _jsx("span", { className: styles.statPoints, children: panelStat('points', 'pet.points', { points: snapshot?.affinity.points ?? 0 }) })] }), _jsxs("div", { className: styles.actions, children: [panelShows('feed') && (_jsx("button", { type: "button", className: styles.action, onClick: props.onFeed, children: panelLabel('feed', props.t('pet.feed')) })), panelShows('rename') && (_jsx("button", { type: "button", className: styles.action, onClick: () => {
|
|
736
748
|
// Cancel any pending hide so the rename box cannot
|
|
737
749
|
// unmount right as the user starts typing (#303).
|
|
738
750
|
clearHideTimer();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnE,OAAO,KAAK,EAAE,UAAU,EAAsB,MAAM,4CAA4C,CAAA;AAuFhG,wEAAwE;AACxE,eAAO,MAAM,MAAM,UAAwF,CAAA;AAE3G,qEAAqE;AACrE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC7D,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AACtF,YAAY,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAEnD,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;WAIG;QACH,aAAa,CAAC,EAAE;YACd,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE;gBAAE,SAAS,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,GAAG,SAAS,CAAA;aAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;SAClG,CAAA;KACF;CACF;AAUD,mFAAmF;AACnF,eAAO,MAAM,eAAe,MAAM,CAAA;AA2NlC,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnE,OAAO,KAAK,EAAE,UAAU,EAAsB,MAAM,4CAA4C,CAAA;AAuFhG,wEAAwE;AACxE,eAAO,MAAM,MAAM,UAAwF,CAAA;AAE3G,qEAAqE;AACrE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACxE,YAAY,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACrD,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC7D,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AACtF,YAAY,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAEnD,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf;;;;WAIG;QACH,aAAa,CAAC,EAAE;YACd,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE;gBAAE,SAAS,EAAE,MAAM,CAAC;gBAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,CAAC,GAAG,SAAS,CAAA;aAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;SAClG,CAAA;KACF;CACF;AAUD,mFAAmF;AACnF,eAAO,MAAM,eAAe,MAAM,CAAA;AA2NlC,wBAAgB,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,CA2W9C"}
|
|
@@ -589,7 +589,20 @@ export function apply(ctx) {
|
|
|
589
589
|
// the 'pet' namespace instead follows the active language, the English
|
|
590
590
|
// fallback, and every language pack that registers a dictionary for it
|
|
591
591
|
// (the settings section label already resolves through the same seat).
|
|
592
|
-
|
|
592
|
+
const renderPet = () => {
|
|
593
|
+
petRoot.render(createElement(PetDockEntry, {
|
|
594
|
+
...injected(),
|
|
595
|
+
t: ctx.locale.bind(NS),
|
|
596
|
+
// The active locale rides the same mount as the translate seat so a
|
|
597
|
+
// pet-declared English rank name follows the UI language.
|
|
598
|
+
lang: ctx.locale.getLocale().active,
|
|
599
|
+
portalTarget: container,
|
|
600
|
+
}));
|
|
601
|
+
};
|
|
602
|
+
renderPet();
|
|
603
|
+
// Re-render on a language switch instead of waiting for the next poll
|
|
604
|
+
// tick: the declared rank ladder's nameEn applies immediately.
|
|
605
|
+
const unsubscribeLocale = ctx.locale.subscribe(renderPet);
|
|
593
606
|
let uiGone = false;
|
|
594
607
|
disposeUi = () => {
|
|
595
608
|
if (uiGone)
|
|
@@ -597,6 +610,7 @@ export function apply(ctx) {
|
|
|
597
610
|
uiGone = true;
|
|
598
611
|
clearUiTeardown?.();
|
|
599
612
|
clearUiTeardown = undefined;
|
|
613
|
+
unsubscribeLocale();
|
|
600
614
|
petRoot.unmount();
|
|
601
615
|
container.remove();
|
|
602
616
|
disposePoll();
|
package/lib/types/index.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export type { PetConfig, PetInteractResult, PetSettingsSection, PetSessionView,
|
|
|
19
19
|
export { MAX_PANEL_ACTIONS, PanelActionRegistry, normalizePanelAction } from './panel-actions.ts';
|
|
20
20
|
export type { PetPanelActionContext, PetPanelActionHandler, PetPanelActionRegistration, PetPanelActionView, } from './panel-actions.ts';
|
|
21
21
|
export { AFFINITY_MAX, AFFINITY_RANKS, applyInteraction, applyTurnReward, emptyAffinity, rankOf, } from './affinity.ts';
|
|
22
|
-
export type { AffinityConfig, AffinityState, InteractionOutcome, PetInteraction, } from './affinity.ts';
|
|
22
|
+
export type { AffinityConfig, AffinityRank, AffinityRankName, AffinityState, InteractionOutcome, PetInteraction, } from './affinity.ts';
|
|
23
23
|
export { animationForPhase, PetStateMachine, rowOf, } from './state.ts';
|
|
24
24
|
export type { ActivityPhase, PetAnimation, PetStateConfig, PetStateInput, PetStateSnapshot, } from './state.ts';
|
|
25
25
|
export { consumeTreat, defaultTreatConfig, emptyTreatLedger, settleTreatGrants, } from './treats.ts';
|
package/lib/types/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/types/ledger.d.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* economic events: completed-turn rewards (official or legacy) and feeds.
|
|
7
7
|
* @module @linxin666/dsh-pet/ledger
|
|
8
8
|
*/
|
|
9
|
-
import { type AffinityConfig, type PetAffinityView, type PetInteraction } from './affinity.ts';
|
|
9
|
+
import { type AffinityConfig, type AffinityRankName, type PetAffinityView, type PetInteraction } from './affinity.ts';
|
|
10
10
|
import { type TreatConfig } from './treats.ts';
|
|
11
11
|
import { type PetRemarks } from './remarks.ts';
|
|
12
12
|
import type { PetDisplayConfig, PetPersist } from './persist.ts';
|
|
@@ -19,6 +19,8 @@ export interface LedgerConfig {
|
|
|
19
19
|
remarks?: PetRemarks;
|
|
20
20
|
/** Voice-pack fallback remark pools (global or pet voice pack). */
|
|
21
21
|
voiceRemarks?: PetRemarks;
|
|
22
|
+
/** Display-only rank ladder for the selected pet (voice.json panel.ranks). */
|
|
23
|
+
rankLadder?: readonly AffinityRankName[];
|
|
22
24
|
}
|
|
23
25
|
/** Result of one ledger interaction (the shape the pet RPC returns). */
|
|
24
26
|
export interface LedgerInteractionResult {
|
|
@@ -39,6 +41,8 @@ export declare class PetLedger {
|
|
|
39
41
|
private readonly treatConfig;
|
|
40
42
|
/** Round-robin reaction picker; rebuilt when the selected pet changes. */
|
|
41
43
|
private picker;
|
|
44
|
+
/** Declared rank ladder; undefined keeps the built-in whale ladder. */
|
|
45
|
+
private rankLadder;
|
|
42
46
|
private current;
|
|
43
47
|
/** Completed turns already rewarded, per session (turn numbers are per-session). */
|
|
44
48
|
private rewardedTurns;
|
|
@@ -79,6 +83,11 @@ export declare class PetLedger {
|
|
|
79
83
|
* selection). Slots the pet does not declare fall back to voice packs or built-ins.
|
|
80
84
|
*/
|
|
81
85
|
setRemarks(remarks?: PetRemarks, voiceRemarks?: PetRemarks): void;
|
|
86
|
+
/**
|
|
87
|
+
* Swap the display-only rank ladder to the selected pet's declared one
|
|
88
|
+
* (called on pet selection). Undefined restores the built-in ladder.
|
|
89
|
+
*/
|
|
90
|
+
setRankLadder(ladder?: readonly AffinityRankName[]): void;
|
|
82
91
|
/**
|
|
83
92
|
* Settle the treat economy (work + time output since the last settlement).
|
|
84
93
|
* A zero-gain first settlement still starts the time clock (anchor write),
|