castle-web-cli 0.4.233 → 0.4.234
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/dist/api.d.ts +11 -0
- package/dist/api.js +43 -0
- package/dist/bundle.d.ts +64 -0
- package/dist/bundle.js +558 -2
- package/dist/castle-host/host.d.ts +17 -2
- package/dist/castle-host/host.js +793 -36
- package/dist/castleJson.d.ts +20 -1
- package/dist/castleJson.js +44 -2
- package/dist/check.js +9 -2
- package/dist/chunkLoader.d.ts +3 -0
- package/dist/chunkLoader.js +111 -0
- package/dist/devParty.d.ts +26 -0
- package/dist/devParty.js +231 -0
- package/dist/devSaveStorage.js +4 -0
- package/dist/devSessionStorage.js +3 -1
- package/dist/devSocial.d.ts +24 -0
- package/dist/devSocial.js +70 -0
- package/dist/ide.d.ts +2 -0
- package/dist/ide.js +119 -15
- package/dist/index.js +8 -2
- package/dist/init.js +1 -1
- package/dist/save-deck.d.ts +20 -1
- package/dist/save-deck.js +141 -5
- package/dist/serve.js +29 -11
- package/dist/shell/assets/{index-BjOxR-lW.js → index-DulbYIJm.js} +97 -97
- package/dist/shell/index.html +1 -1
- package/dist/vitePlugins.d.ts +2 -1
- package/dist/vitePlugins.js +13 -0
- package/kits/base/castle.json +1 -1
- package/kits/base/sdk/README.md +260 -3
- package/kits/base/sdk/castle.d.ts +7 -3
- package/kits/base/sdk/castle.js +2 -0
- package/kits/base/sdk/commands.d.ts +162 -1
- package/kits/base/sdk/commands.js +3 -0
- package/kits/base/sdk/display.d.ts +3 -0
- package/kits/base/sdk/display.js +9 -3
- package/kits/base/sdk/hub.d.ts +33 -6
- package/kits/base/sdk/hub.js +50 -4
- package/kits/base/sdk/multiplayer.d.ts +7 -1
- package/kits/base/sdk/multiplayer.js +140 -40
- package/kits/base/sdk/multiplayerProtocol.d.ts +2 -0
- package/kits/base/sdk/party.d.ts +23 -0
- package/kits/base/sdk/party.js +91 -0
- package/kits/base/sdk/reconnectBudget.d.ts +23 -0
- package/kits/base/sdk/reconnectBudget.js +96 -0
- package/kits/base/sdk/save.d.ts +38 -1
- package/kits/base/sdk/save.js +79 -6
- package/kits/base/sdk/server/hub.d.ts +31 -1
- package/kits/base/sdk/server/hub.js +50 -3
- package/kits/base/sdk/server/platformHandle.d.ts +13 -1
- package/kits/base/sdk/server/storage.d.ts +4 -0
- package/kits/base/sdk/server/storage.js +19 -3
- package/kits/base/sdk/server/wrapper.d.ts +7 -1
- package/kits/base/sdk/server/wrapper.js +10 -1
- package/kits/base/sdk/social.d.ts +9 -0
- package/kits/base/sdk/social.js +5 -0
- package/kits/hub-game/CLAUDE.md +123 -3
- package/kits/hub-game/README.md +63 -0
- package/kits/hub-game/castle.json +5 -5
- package/kits/hub-game/code/client/act.js +312 -0
- package/kits/hub-game/code/client/actionLayout.js +147 -0
- package/kits/hub-game/code/client/actionOverflow.js +556 -0
- package/kits/hub-game/code/client/arrivalCamera.js +50 -0
- package/kits/hub-game/code/client/askSlot.js +117 -0
- package/kits/hub-game/code/client/avatar.js +4 -2
- package/kits/hub-game/code/client/avatarShare.js +2 -0
- package/kits/hub-game/code/client/backVisibility.js +13 -0
- package/kits/hub-game/code/client/ballot.js +15 -10
- package/kits/hub-game/code/client/build.js +16 -0
- package/kits/hub-game/code/client/chat.js +41 -5
- package/kits/hub-game/code/client/chatModeration.js +5 -0
- package/kits/hub-game/code/client/chrome.js +1148 -258
- package/kits/hub-game/code/client/crowdNames.js +241 -0
- package/kits/hub-game/code/client/decor.js +10 -4
- package/kits/hub-game/code/client/defaultEnvironment.js +194 -0
- package/kits/hub-game/code/client/doorErrors.js +39 -0
- package/kits/hub-game/code/client/fall.js +18 -0
- package/kits/hub-game/code/client/farAvatars.js +233 -0
- package/kits/hub-game/code/client/firstJoin.js +9 -2
- package/kits/hub-game/code/client/fpsTelemetry.js +50 -0
- package/kits/hub-game/code/client/frameBatch.js +5 -0
- package/kits/hub-game/code/client/grab.js +31 -11
- package/kits/hub-game/code/client/hookLayer.js +87 -8
- package/kits/hub-game/code/client/hudCopy.js +51 -0
- package/kits/hub-game/code/client/hudRate.js +20 -0
- package/kits/hub-game/code/client/idle.js +14 -2
- package/kits/hub-game/code/client/invites.js +231 -0
- package/kits/hub-game/code/client/joinError.js +9 -0
- package/kits/hub-game/code/client/labelsNear.js +31 -2
- package/kits/hub-game/code/client/landscapeLayout.js +17 -0
- package/kits/hub-game/code/client/layoutCache.js +264 -0
- package/kits/hub-game/code/client/loadTelemetry.js +20 -0
- package/kits/hub-game/code/client/loadingCover.js +148 -0
- package/kits/hub-game/code/client/loadingEntry.js +8 -0
- package/kits/hub-game/code/client/menuRows.js +43 -0
- package/kits/hub-game/code/client/modelReady.js +7 -0
- package/kits/hub-game/code/client/padCueArrival.js +23 -0
- package/kits/hub-game/code/client/padCues.js +112 -0
- package/kits/hub-game/code/client/padOccupancy.js +88 -0
- package/kits/hub-game/code/client/padReadability.js +26 -0
- package/kits/hub-game/code/client/padRings.js +69 -0
- package/kits/hub-game/code/client/pushVisit.js +14 -0
- package/kits/hub-game/code/client/quality.js +205 -0
- package/kits/hub-game/code/client/qualityEntry.js +55 -0
- package/kits/hub-game/code/client/safeLayout.js +338 -0
- package/kits/hub-game/code/client/safeStyle.js +42 -0
- package/kits/hub-game/code/client/say.js +12 -3
- package/kits/hub-game/code/client/shot.js +64 -10
- package/kits/hub-game/code/client/shotFit.js +56 -0
- package/kits/hub-game/code/client/signIn.js +28 -0
- package/kits/hub-game/code/client/state.js +53 -0
- package/kits/hub-game/code/client/talk.js +209 -45
- package/kits/hub-game/code/client/tiers.js +68 -66
- package/kits/hub-game/code/client/together.js +7 -2
- package/kits/hub-game/code/client/weakestLookBake.js +92 -0
- package/kits/hub-game/code/client/weakestTier.js +295 -0
- package/kits/hub-game/code/client/worldLabels.js +241 -0
- package/kits/hub-game/code/client/yours.js +10 -9
- package/kits/hub-game/code/npcDisplayText.js +55 -0
- package/kits/hub-game/code/server/act.js +124 -0
- package/kits/hub-game/code/server/actions.js +6 -1
- package/kits/hub-game/code/server/actors.js +2 -1
- package/kits/hub-game/code/server/analytics.js +83 -0
- package/kits/hub-game/code/server/anonymousEntry.js +49 -0
- package/kits/hub-game/code/server/arrivalPose.js +36 -0
- package/kits/hub-game/code/server/companion.js +28 -3
- package/kits/hub-game/code/server/doorAnalytics.js +52 -0
- package/kits/hub-game/code/server/earned.js +22 -5
- package/kits/hub-game/code/server/frameBatch.js +183 -0
- package/kits/hub-game/code/server/friendsAmong.js +49 -9
- package/kits/hub-game/code/server/history.js +2 -0
- package/kits/hub-game/code/server/hub.js +1306 -95
- package/kits/hub-game/code/server/idle.js +30 -1
- package/kits/hub-game/code/server/index.js +26 -4
- package/kits/hub-game/code/server/invites.js +19 -0
- package/kits/hub-game/code/server/labels.js +9 -1
- package/kits/hub-game/code/server/loadAbandon.js +106 -0
- package/kits/hub-game/code/server/manifest.js +211 -3
- package/kits/hub-game/code/server/menu.js +31 -3
- package/kits/hub-game/code/server/npcs.js +226 -64
- package/kits/hub-game/code/server/observe.js +408 -0
- package/kits/hub-game/code/server/padOccupancy.js +85 -0
- package/kits/hub-game/code/server/players.js +9 -1
- package/kits/hub-game/code/server/resumePose.js +152 -0
- package/kits/hub-game/code/server/say.js +1 -1
- package/kits/hub-game/code/server/standing.js +4 -5
- package/kits/hub-game/code/server/storageLimit.js +187 -0
- package/kits/hub-game/code/server/vis.js +67 -5
- package/kits/hub-game/code/shared/act.js +35 -0
- package/kits/hub-game/code/shared/danceIdle.js +28 -0
- package/kits/hub-game/code/shared/loadStages.js +12 -0
- package/kits/hub-game/code/shared/quality.js +74 -0
- package/kits/hub-game/code/shared/say.js +2 -0
- package/kits/hub-game/code/shared/shot.js +35 -1
- package/kits/hub-game/code/systems/hub.js +970 -169
- package/kits/hub-game/docs/analytics.md +279 -0
- package/kits/hub-game/docs/contract.md +1257 -42
- package/kits/hub-game/docs/home-pieces.md +9 -2
- package/kits/hub-game/docs/observed-progress.md +252 -0
- package/kits/hub-game/main.jsx +2 -0
- package/kits/hub-game/package-lock.json +10 -3
- package/kits/hub-game/package.json +6 -3
- package/kits/hub-game/play/player.js +142 -0
- package/kits/hub-game/play/registry.js +47 -0
- package/kits/hub-game/play.jsx +37 -0
- package/kits/hub-game/scripts/check.mjs +39 -5
- package/kits/hub-game/scripts/companion-follower-wire.json +1 -1
- package/kits/hub-game/scripts/fixtures/decor-keyless-draw.json +11 -0
- package/kits/hub-game/scripts/fixtures/decor-keyless.json +5 -5
- package/kits/hub-game/scripts/fixtures/engine-models-stub.mjs +3 -0
- package/kits/hub-game/scripts/fixtures/fake-dom.mjs +19 -3
- package/kits/hub-game/scripts/fixtures/interest-legacy.json +3 -3
- package/kits/hub-game/scripts/fixtures/vis-shared-wire.json +1 -1
- package/kits/hub-game/scripts/pose-storage-fixture.mjs +46 -0
- package/kits/hub-game/scripts/test-act-client.mjs +186 -0
- package/kits/hub-game/scripts/test-act.mjs +171 -0
- package/kits/hub-game/scripts/test-action-layout.mjs +80 -0
- package/kits/hub-game/scripts/test-action-observers.mjs +46 -0
- package/kits/hub-game/scripts/test-actions-client.mjs +367 -2
- package/kits/hub-game/scripts/test-actors.mjs +20 -7
- package/kits/hub-game/scripts/test-analytics.mjs +76 -0
- package/kits/hub-game/scripts/test-anonymous-entry.mjs +28 -0
- package/kits/hub-game/scripts/test-arrival-pose-server.mjs +196 -0
- package/kits/hub-game/scripts/test-arrival-pose.mjs +24 -0
- package/kits/hub-game/scripts/test-ask-slot.mjs +85 -0
- package/kits/hub-game/scripts/test-avatar-wire.mjs +49 -10
- package/kits/hub-game/scripts/test-avatar.mjs +44 -0
- package/kits/hub-game/scripts/test-back-visibility.mjs +82 -0
- package/kits/hub-game/scripts/test-ballot.mjs +11 -4
- package/kits/hub-game/scripts/test-ban-join.mjs +121 -13
- package/kits/hub-game/scripts/test-build.mjs +20 -2
- package/kits/hub-game/scripts/test-chat.mjs +206 -5
- package/kits/hub-game/scripts/test-companion-chat.mjs +20 -2
- package/kits/hub-game/scripts/test-control-layout-dom.mjs +120 -0
- package/kits/hub-game/scripts/test-crowd-names.mjs +205 -0
- package/kits/hub-game/scripts/test-decor-client.mjs +45 -4
- package/kits/hub-game/scripts/test-decor.mjs +7 -0
- package/kits/hub-game/scripts/test-default-environment-root.mjs +95 -0
- package/kits/hub-game/scripts/test-default-environment.mjs +267 -0
- package/kits/hub-game/scripts/test-door-analytics.mjs +58 -0
- package/kits/hub-game/scripts/test-door-jump.mjs +100 -0
- package/kits/hub-game/scripts/test-earned.mjs +33 -3
- package/kits/hub-game/scripts/test-far-avatars.mjs +340 -0
- package/kits/hub-game/scripts/test-fps-telemetry.mjs +112 -0
- package/kits/hub-game/scripts/test-frame-batch.mjs +252 -0
- package/kits/hub-game/scripts/test-fresh-friends.mjs +118 -0
- package/kits/hub-game/scripts/test-grab-orbit.mjs +47 -4
- package/kits/hub-game/scripts/test-high-only.mjs +170 -0
- package/kits/hub-game/scripts/test-hub-ops.mjs +321 -2
- package/kits/hub-game/scripts/test-hub-trip.mjs +879 -11
- package/kits/hub-game/scripts/test-hud-clear.mjs +162 -59
- package/kits/hub-game/scripts/test-hud-defects-dom.mjs +100 -0
- package/kits/hub-game/scripts/test-hud-rate.mjs +224 -0
- package/kits/hub-game/scripts/test-hud-safe-visibility-dom.mjs +83 -0
- package/kits/hub-game/scripts/test-idle.mjs +66 -0
- package/kits/hub-game/scripts/test-interest-cells.mjs +20 -0
- package/kits/hub-game/scripts/test-interest.mjs +15 -0
- package/kits/hub-game/scripts/test-invites-client.mjs +430 -0
- package/kits/hub-game/scripts/test-invites.mjs +109 -0
- package/kits/hub-game/scripts/test-labels.mjs +71 -3
- package/kits/hub-game/scripts/test-landscape-layout.mjs +194 -0
- package/kits/hub-game/scripts/test-list-scroll-dom.mjs +49 -0
- package/kits/hub-game/scripts/test-load-abandon.mjs +246 -0
- package/kits/hub-game/scripts/test-loading-cover.mjs +162 -0
- package/kits/hub-game/scripts/test-manifest.mjs +265 -0
- package/kits/hub-game/scripts/test-menu-client.mjs +105 -0
- package/kits/hub-game/scripts/test-menu.mjs +23 -0
- package/kits/hub-game/scripts/test-npcs.mjs +819 -10
- package/kits/hub-game/scripts/test-observed.mjs +745 -0
- package/kits/hub-game/scripts/test-pad-cues.mjs +304 -0
- package/kits/hub-game/scripts/test-pad-occupancy.mjs +177 -0
- package/kits/hub-game/scripts/test-picker.mjs +234 -7
- package/kits/hub-game/scripts/test-placement-cache.mjs +690 -0
- package/kits/hub-game/scripts/test-progress-reset.mjs +559 -0
- package/kits/hub-game/scripts/test-push-visit.mjs +26 -0
- package/kits/hub-game/scripts/test-quality.mjs +385 -0
- package/kits/hub-game/scripts/test-rehello.mjs +699 -5
- package/kits/hub-game/scripts/test-resume-action-order.mjs +598 -0
- package/kits/hub-game/scripts/test-resume-held.mjs +239 -0
- package/kits/hub-game/scripts/test-resume-pose.mjs +142 -0
- package/kits/hub-game/scripts/test-safe-events-dom.mjs +116 -0
- package/kits/hub-game/scripts/test-safe-layout.mjs +330 -0
- package/kits/hub-game/scripts/test-say.mjs +1 -1
- package/kits/hub-game/scripts/test-shot.mjs +145 -0
- package/kits/hub-game/scripts/test-signin-client.mjs +45 -0
- package/kits/hub-game/scripts/test-soundscape.mjs +22 -17
- package/kits/hub-game/scripts/test-standing.mjs +35 -2
- package/kits/hub-game/scripts/test-storage-limit.mjs +333 -0
- package/kits/hub-game/scripts/test-stuck.mjs +5 -4
- package/kits/hub-game/scripts/test-talk-overlay-dom.mjs +130 -0
- package/kits/hub-game/scripts/test-tiers-render.mjs +86 -13
- package/kits/hub-game/scripts/test-tiers.mjs +7 -8
- package/kits/hub-game/scripts/test-vis.mjs +433 -6
- package/kits/hub-game/scripts/test-weakest-tier.mjs +924 -0
- package/kits/hub-game/scripts/test-world-labels.mjs +367 -0
- package/kits/hub-game/scripts/test-yours-chrome.mjs +50 -6
- package/kits/hub-game/scripts/test-yours.mjs +39 -8
- package/kits/multiplayer-3d/castle.json +5 -5
- package/kits/multiplayer-3d/code/client/joinFailure.js +27 -0
- package/kits/multiplayer-3d/code/client/resumeGate.js +139 -0
- package/kits/multiplayer-3d/code/systems/multiplayer.js +369 -30
- package/kits/multiplayer-3d/package-lock.json +8 -1
- package/kits/multiplayer-3d/package.json +2 -1
- package/kits/multiplayer-3d/scripts/test-join-watchdog.mjs +436 -0
- package/kits/multiplayer-3d/scripts/test-resume-gate.mjs +624 -0
- package/kits/physics-2d/CLAUDE.md +10 -1
- package/kits/physics-2d/castle.json +2 -2
- package/kits/physics-2d/engine/frozenActors.js +233 -0
- package/kits/physics-2d/engine/scene.js +87 -5
- package/kits/physics-2d/eslint.config.js +1 -1
- package/kits/physics-2d/play/behaviors/AnalogStick.js +198 -0
- package/kits/physics-2d/play/behaviors/Camera.js +40 -0
- package/kits/physics-2d/play/behaviors/Collider.js +122 -0
- package/kits/physics-2d/play/behaviors/Draggable.js +115 -0
- package/kits/physics-2d/play/behaviors/Goal.js +46 -0
- package/kits/physics-2d/play/behaviors/Joints.js +126 -0
- package/kits/physics-2d/play/behaviors/Layout.js +71 -0
- package/kits/physics-2d/play/behaviors/RigidBody.js +57 -0
- package/kits/physics-2d/play/behaviors/Slingshot.js +142 -0
- package/kits/physics-2d/play/behaviors/SoundPlayer.js +263 -0
- package/kits/physics-2d/play/behaviors/Sprite.js +406 -0
- package/kits/physics-2d/play/behaviors/Style.js +209 -0
- package/kits/physics-2d/play/behaviors/Text.js +85 -0
- package/kits/physics-2d/play/behaviors/Video.js +93 -0
- package/kits/physics-3d/CLAUDE.md +25 -1651
- package/kits/physics-3d/behaviors/Body.jsx +3 -0
- package/kits/physics-3d/behaviors/Model.jsx +3 -0
- package/kits/physics-3d/behaviors/Player.jsx +35 -18
- package/kits/physics-3d/behaviors/Shape.jsx +3 -0
- package/kits/physics-3d/behaviors/Solid.jsx +3 -0
- package/kits/physics-3d/behaviors/Transform.jsx +3 -0
- package/kits/physics-3d/castle.json +3 -3
- package/kits/physics-3d/docs/engine-camera.md +542 -0
- package/kits/physics-3d/docs/engine-frame-cap.md +136 -0
- package/kits/physics-3d/docs/engine-load.md +149 -0
- package/kits/physics-3d/docs/engine-look.md +114 -0
- package/kits/physics-3d/docs/engine-shadows.md +372 -0
- package/kits/physics-3d/docs/engine-skip-work.md +187 -0
- package/kits/physics-3d/docs/engine-sky.md +198 -0
- package/kits/physics-3d/docs/engine-static-actors.md +226 -0
- package/kits/physics-3d/docs/engine-view.md +37 -0
- package/kits/physics-3d/docs/pxmodel-format.md +1 -1
- package/kits/physics-3d/engine3d/PlayOnly3D.jsx +5 -1
- package/kits/physics-3d/engine3d/Scene3DPlayer.jsx +19 -333
- package/kits/physics-3d/engine3d/actornode.js +1 -0
- package/kits/physics-3d/engine3d/branches.js +3 -13
- package/kits/physics-3d/engine3d/cage.js +2 -7
- package/kits/physics-3d/engine3d/cageops.js +2 -17
- package/kits/physics-3d/engine3d/dataBehaviors.js +12 -0
- package/kits/physics-3d/engine3d/framecap.js +4 -1
- package/kits/physics-3d/engine3d/frozenphysics.js +140 -0
- package/kits/physics-3d/engine3d/frozenstatics.js +273 -0
- package/kits/physics-3d/engine3d/gait.js +8 -0
- package/kits/physics-3d/engine3d/initialModelFiles.js +18 -0
- package/kits/physics-3d/engine3d/look.js +7 -0
- package/kits/physics-3d/engine3d/modelFiles.js +3 -17
- package/kits/physics-3d/engine3d/modelMath.js +49 -0
- package/kits/physics-3d/engine3d/modelready.js +16 -0
- package/kits/physics-3d/engine3d/motion.js +3 -3
- package/kits/physics-3d/engine3d/nearshadows.js +77 -10
- package/kits/physics-3d/engine3d/orbitinput.js +59 -25
- package/kits/physics-3d/engine3d/partgeometry.js +1 -16
- package/kits/physics-3d/engine3d/paths.js +1 -9
- package/kits/physics-3d/engine3d/playTimings.js +50 -0
- package/kits/physics-3d/engine3d/playerRun.js +372 -0
- package/kits/physics-3d/engine3d/pxmodel.js +3 -3
- package/kits/physics-3d/engine3d/rapier.js +27 -0
- package/kits/physics-3d/engine3d/scatter.js +1 -11
- package/kits/physics-3d/engine3d/shadowfade.js +23 -15
- package/kits/physics-3d/engine3d/sky.js +1 -1
- package/kits/physics-3d/engine3d/squarefirst.js +177 -0
- package/kits/physics-3d/engine3d/stillshadows.js +399 -0
- package/kits/physics-3d/engine3d/sweep.js +1 -25
- package/kits/physics-3d/engine3d/world3d.js +468 -18
- package/kits/physics-3d/eslint.config.js +2 -1
- package/kits/physics-3d/main.jsx +6 -3
- package/kits/physics-3d/package-lock.json +7 -0
- package/kits/physics-3d/package.json +5 -1
- package/kits/physics-3d/play/behaviors/Body.js +31 -0
- package/kits/physics-3d/play/behaviors/Door.js +37 -0
- package/kits/physics-3d/play/behaviors/Lookable.js +16 -0
- package/kits/physics-3d/play/behaviors/Model.js +23 -0
- package/kits/physics-3d/play/behaviors/Pickup.js +46 -0
- package/kits/physics-3d/play/behaviors/Player.js +1204 -0
- package/kits/physics-3d/play/behaviors/Shape.js +47 -0
- package/kits/physics-3d/play/behaviors/Solid.js +16 -0
- package/kits/physics-3d/play/behaviors/Transform.js +29 -0
- package/kits/physics-3d/pnpm-lock.yaml +8 -0
- package/kits/physics-3d/scripts/bench-shadow-fade.mjs +37 -0
- package/kits/physics-3d/scripts/build-rapier-gz.mjs +56 -0
- package/kits/physics-3d/scripts/frozen-statics-fixture.mjs +141 -0
- package/kits/physics-3d/scripts/test-camera-follow.mjs +5 -1
- package/kits/physics-3d/scripts/test-camera-orbit.mjs +52 -4
- package/kits/physics-3d/scripts/test-drop-empty-parts.mjs +1 -1
- package/kits/physics-3d/scripts/test-empty-gait-hints.mjs +89 -0
- package/kits/physics-3d/scripts/test-frame-cap-bob.mjs +6 -3
- package/kits/physics-3d/scripts/test-frame-cap.mjs +1 -1
- package/kits/physics-3d/scripts/test-frozen-nested.mjs +49 -0
- package/kits/physics-3d/scripts/test-frozen-statics-legacy-physics2d.mjs +123 -0
- package/kits/physics-3d/scripts/test-frozen-statics.mjs +434 -0
- package/kits/physics-3d/scripts/test-look-bake.mjs +1 -1
- package/kits/physics-3d/scripts/test-near-shadows.mjs +2 -2
- package/kits/physics-3d/scripts/test-orbit-shadow-fade.mjs +88 -7
- package/kits/physics-3d/scripts/test-orbit-shift-lock.mjs +40 -3
- package/kits/physics-3d/scripts/test-orbit-shot.mjs +75 -1
- package/kits/physics-3d/scripts/test-rapier-gz.mjs +106 -0
- package/kits/physics-3d/scripts/test-sky.mjs +1 -1
- package/kits/physics-3d/scripts/test-square-first.mjs +921 -0
- package/kits/physics-3d/scripts/test-static-actors.mjs +3 -1
- package/kits/physics-3d/scripts/test-static-physics.mjs +4 -1
- package/kits/physics-3d/scripts/test-static-scenery.mjs +5 -2
- package/kits/physics-3d/scripts/test-steady-hover.mjs +5 -2
- package/kits/physics-3d/scripts/test-still-shadows.mjs +477 -0
- package/kits/physics-3d/systems/physics3d.js +37 -4
- package/kits/real-time/castle.json +2 -2
- package/kits/real-time/code/client/connection.js +33 -10
- package/kits/real-time/code/client/gameHooks.js +2 -0
- package/kits/real-time/code/client/joinOverlay.js +9 -4
- package/kits/real-time/code/server/session.js +6 -4
- package/kits/real-time/package-lock.json +1 -1
- package/package.json +2 -2
package/kits/hub-game/CLAUDE.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
A game behind a door in the Cauldron hub town. A hub game is a
|
|
4
4
|
`castle.multiplayer-3d` deck that meets the **hub contract**
|
|
5
|
-
(`docs/contract.md`, latest version 1.
|
|
5
|
+
(`docs/contract.md`, latest version 1.136; manifest `hub.contract: 1`): the kit
|
|
6
6
|
draws every player as their platform avatar, brings them in at the arrival
|
|
7
7
|
together and sends them back out
|
|
8
8
|
through the door they came in by, and draws the HUD, labels and Back control
|
|
@@ -36,8 +36,8 @@ notes messages and the client's refill behavior stay exactly as before.
|
|
|
36
36
|
get `hub`, the place's context: `ready(hub)`, `arrive(hub, group)`,
|
|
37
37
|
`step(hub, dt)`, `leave(hub, playerId, { userId, username })` (a result may be
|
|
38
38
|
reported there), `shutdown(hub)` (finish writing), `message(hub, player, data)`,
|
|
39
|
-
`fall(hub, playerId)` (below the place's `fallY`;
|
|
40
|
-
|
|
39
|
+
`fall(hub, playerId)` (below the place's `fallY`; every place catches at
|
|
40
|
+
-20 by default, including past the edge of the finite implicit ground).
|
|
41
41
|
`server.main` stays `imports/castle.hub-game/code/server/index.js`.
|
|
42
42
|
- **A player's progress between visits** goes in `hub.session.storage.deck`
|
|
43
43
|
under `'<name>:<userId>'`, never user scope, which their own client can
|
|
@@ -90,6 +90,10 @@ notes messages and the client's refill behavior stay exactly as before.
|
|
|
90
90
|
normalised into [-180, 180), looking along (sin f, cos f) in x/z.
|
|
91
91
|
Holds and seats take precedence. Follow-camera places ignore `face`;
|
|
92
92
|
camera yaw (`camAngle`) is never changed.
|
|
93
|
+
Optional `presentation: 'rows'` (v1.136) shows full-width text rows; items
|
|
94
|
+
may add `columns: [left, middle, right]` (each 1..24 code points) and
|
|
95
|
+
`readOnly`. Optional `footer: [{ id, label }]` pins up to four actions below
|
|
96
|
+
the scroll. Rows and footer share the existing 48-item budget and pick path.
|
|
93
97
|
Close, replacement without it, leave and higher-priority UI release it;
|
|
94
98
|
absent `face` preserves control and wire bytes. Bounds and validation: contract
|
|
95
99
|
§9; `scripts/test-menu.mjs` and `test-menu-client.mjs`. No absent-key API,
|
|
@@ -110,6 +114,17 @@ notes messages and the client's refill behavior stay exactly as before.
|
|
|
110
114
|
disconnected players are ignored; at most 256 actor overrides per player.
|
|
111
115
|
Private calls return true when taken; invalid actor/options or exceeding the
|
|
112
116
|
cap warn once and return false without changes. Leaving drops overrides.
|
|
117
|
+
A result place with `resume: { keep: true }` may also set
|
|
118
|
+
`resumeVisibility: true`: for the retained visit's <60 s absence, keep the
|
|
119
|
+
authenticated viewer's overrides. This requires an exported `resume` hook;
|
|
120
|
+
on return the kit holds stale replay, runs that hook early, then sends the
|
|
121
|
+
current whole map. Rebuild every current mask synchronously before the hook
|
|
122
|
+
returns or first awaits. Changed/missing identity, travel, expiry, shutdown
|
|
123
|
+
and forget delete the cache; offline targets are still ignored. This is
|
|
124
|
+
server-only and adds no public place/wire field. WORLD can precede hello and
|
|
125
|
+
replay, so a cleared client, or an actor newly made private while offline, can
|
|
126
|
+
briefly have the shared view. The guarantee starts at the first replayed
|
|
127
|
+
merged state; async-late mask writes and a failing hook are not covered.
|
|
113
128
|
Client drawing, pads, idle and soundscape use the merged visibility; server
|
|
114
129
|
bodies and shared visibility logic (pads, labels, doors, idle) stay unchanged.
|
|
115
130
|
Shared-only places send exactly the same snapshots, deltas and messages.
|
|
@@ -129,6 +144,20 @@ notes messages and the client's refill behavior stay exactly as before.
|
|
|
129
144
|
The client drops a shot not renewed for 5 s, on its first watcher run even
|
|
130
145
|
after a background-tab pause, so it cannot outlive its server or connection.
|
|
131
146
|
No client code or manifest key needed.
|
|
147
|
+
A fixed-view scene may opt into `engine.camera.arrivalFromShot: true`:
|
|
148
|
+
on fresh hub arrival, its persistent movement angle is seeded from the
|
|
149
|
+
accepted orbit shot yaw, including a shot delivered after the arrival.
|
|
150
|
+
Later shot changes and lease renewals do not reseed it. Absent or false,
|
|
151
|
+
the arrival facing seeds the angle as before; Player's shot behavior is
|
|
152
|
+
unchanged. This scene key needs no hub contract version or wire field.
|
|
153
|
+
Use `engine.camera.arrivalFromShot: { "yaw": -38 }` when a temporary
|
|
154
|
+
portrait can arrive first: seed only after an accepted shot matches that
|
|
155
|
+
heading (modulo 360 degrees), including after the portrait closes.
|
|
156
|
+
`engine.camera.walkFromShot: true` makes keyboard and stick walking use
|
|
157
|
+
a valid held shot's drawn yaw (including its blend; target yaw before its
|
|
158
|
+
first placement), keeping up on screen even if the arrival heading drifts.
|
|
159
|
+
It does not change persistent camAngle. Absent/false or no valid shot keeps
|
|
160
|
+
the existing walking basis; `arrivalFromShot` still seeds the follow heading.
|
|
132
161
|
- **The choice card** (v1.68): `"ballot": { "lines": [{ "id", "text", "about":
|
|
133
162
|
"face" | "self" }] }` in a place's hub block (or `true`: faces and options
|
|
134
163
|
only; ≤ 32 lines, ids `[a-z0-9-]{1,24}`, text ≤ 40). `hub.ballot(playerIds |
|
|
@@ -149,9 +178,20 @@ notes messages and the client's refill behavior stay exactly as before.
|
|
|
149
178
|
without the key no ballot code runs, client or server (no `hub.ballot`).
|
|
150
179
|
- **Turning displays** (v1.55): `"HubSpin": { "rate": 45 }` (deg/s, ±720) on a
|
|
151
180
|
non-solid scene actor with no moving Body turns it on every client; no op.
|
|
181
|
+
- **Safe chrome** (v1.123): optional deck-only `hub.safeInsets: true` keeps
|
|
182
|
+
chrome inside CSS safe-area edges and outside both host-owned 64 × 56 top
|
|
183
|
+
corners. Oversize text wraps and cards scroll. Client-only; no wire field.
|
|
184
|
+
`window.castleHub.layout()` reports visible boxes for layout QA (§9).
|
|
152
185
|
- **The HUD** is `{ title, big, text, timer: { since | until } }` in simulation
|
|
153
186
|
ms (`hub.now`), drawn by the hub. It is the only way the game puts words on
|
|
154
187
|
screen.
|
|
188
|
+
- **Reachable action overflow** is a scene choice: set
|
|
189
|
+
`"engine": { "hubActionOverflow": true }` in a scene that may receive three
|
|
190
|
+
`hub.actions` offers. The kit measures one row, then at most two rows; where
|
|
191
|
+
neither clears the scene's visible controls and touch regions it keeps every
|
|
192
|
+
offer behind a keyboard-accessible More/Actions sheet. The sheet dismisses
|
|
193
|
+
with Close, Escape or platform Back and holds only local input while open.
|
|
194
|
+
Without the scene key, action chips use the legacy stack unchanged.
|
|
155
195
|
- **Results** are server-only, once per player per visit, checked against
|
|
156
196
|
`hub.result` in `castle.json`. No free text: the town writes the words. The
|
|
157
197
|
`outcome` may be left out when a `score` says it all (a time trial).
|
|
@@ -160,9 +200,22 @@ notes messages and the client's refill behavior stay exactly as before.
|
|
|
160
200
|
then `arrive` run again for the same player id, so the game must restore
|
|
161
201
|
that player's round state by account. One result per visit (a result
|
|
162
202
|
reported in `leave` is kept), one deadline, the end and first door kept.
|
|
203
|
+
- **Pose-only reconnect** (v1.117): `resumeArrivalPose: true` keeps only pose
|
|
204
|
+
and facing for a same-id, same signed-in account return within 60 seconds.
|
|
205
|
+
Ordinary `leave` and `arrive` still run; pose is restored after `arrive`.
|
|
206
|
+
Result places also need `resume: true`. Retained-visit modes conflict.
|
|
207
|
+
Anonymous/new identities, travel, end, expiry and shutdown restore nothing.
|
|
208
|
+
This adds no public manifest/wire field; absent keeps existing behavior.
|
|
163
209
|
- **Players arrive at `hub.arrival.actor`**, in a row, facing
|
|
164
210
|
`hub.arrival.face`, already placed when `arrive` runs. Never move the Player
|
|
165
211
|
actor in the scene to change that -- change the arrival.
|
|
212
|
+
- **Every §5 ask-slot card expires** (v1.125) 12 s after first display, or
|
|
213
|
+
sooner at 3 m of movement or on entering any pad. This is universal
|
|
214
|
+
client lifecycle, not a manifest opt-in: it covers invitations, proposals,
|
|
215
|
+
play/follow, Play again and Your games without new wire bytes. Reconnect
|
|
216
|
+
replay does not resurrect an expired observable card. Server withdrawal can
|
|
217
|
+
end a party offer sooner, and identical same-sender invitation packets count
|
|
218
|
+
as one offer until a received clear or identity change; leaving toast is unchanged.
|
|
166
219
|
- **Exit is always the hub's**: the Back control, `hub.end`, or
|
|
167
220
|
`hub.maxDurationSec`. A game has no lobby and no leave button.
|
|
168
221
|
- Never ship `blueprints/other-player.scene` or restyle the Player: every
|
|
@@ -171,6 +224,12 @@ notes messages and the client's refill behavior stay exactly as before.
|
|
|
171
224
|
- Controller: `"walk"` (the engine's `Player`) is the only preset; `hub.tune`
|
|
172
225
|
scales one player's speed and jump within it. No
|
|
173
226
|
player shove: other players are kinematic.
|
|
227
|
+
- A scene without a top-level `background`, `engine.sky` or `engine.view`
|
|
228
|
+
gets the hub's cheap pale-sky clear and linear ground fog. Authored
|
|
229
|
+
environment keys remain the whole picture on every graphics tier. Root
|
|
230
|
+
`hub.defaultEnvironment: false` disables that fallback and the canvas fall
|
|
231
|
+
fade for every local or mounted scene; it does not disable server fall
|
|
232
|
+
catching or a scene's authored environment.
|
|
174
233
|
- **Grab and throw** (contract v1.3): `"grab": true` in the `hub` block (or
|
|
175
234
|
`{ throwSpeed, holdDistance, holdHeight }`) gives players a Grab / Throw
|
|
176
235
|
button for the place's `Body` `"dynamic"` actors (crates, barrels). The
|
|
@@ -487,3 +546,64 @@ The Low budget also applies to the separate HubSpin controller, so distant
|
|
|
487
546
|
display rotations write at the chosen cadence. Restoring near/High cadence
|
|
488
547
|
flushes pending elapsed time. Model walk and authored motion share a tick
|
|
489
548
|
to preserve their composed pose between updates.
|
|
549
|
+
|
|
550
|
+
Town play entry opt-in: use `/imports/castle.hub-game/play.jsx` as the
|
|
551
|
+
index.html module entry and set `hub.playOnlyEntry: true` in castle.json.
|
|
552
|
+
The ordinary main.jsx entry remains the default. The explicit entry uses the
|
|
553
|
+
same 3d runtime and file map without React or the official behavior inspectors;
|
|
554
|
+
its development edit route loads the ordinary editor. It requires the matching
|
|
555
|
+
physics-2d and physics-3d kits carrying `play/behaviors` and `playerRun`.
|
|
556
|
+
Custom deck behaviors keep the ordinary discovery order and may bring their
|
|
557
|
+
own UI dependencies. Official behavior sources stay in `behaviors/`; after
|
|
558
|
+
editing them, run `npm run sync:play-behaviors` at the repository root to
|
|
559
|
+
regenerate the runtime mirrors. The build checks their executable members and
|
|
560
|
+
byte-exact generation.
|
|
561
|
+
|
|
562
|
+
Optional `hub.loadTimings: true` exposes `globalThis.__hubLoadTimings` from
|
|
563
|
+
both entries. Events cover runtime creation, first scene synchronization and
|
|
564
|
+
render, image decode promises, and observed join/placement. Image promise time
|
|
565
|
+
includes loading and queueing; join/placement observations have 50 ms polling
|
|
566
|
+
resolution. The probe does not wait for images and is absent by default.
|
|
567
|
+
|
|
568
|
+
### Optional distant avatar bodies
|
|
569
|
+
|
|
570
|
+
`hub.mergeFarAvatars: true` opts a hub into simpler distant remote avatars on
|
|
571
|
+
Low. Beyond 12 metres, compatible model bodies are merged in their resting
|
|
572
|
+
pose, without body outlines or cast shadows; within 10 metres the current
|
|
573
|
+
animated rig returns. Distance is checked every 250 ms. The local avatar,
|
|
574
|
+
High, the editor and content packs retain their normal bodies. Names, worn
|
|
575
|
+
objects, movement, physics and wire data are unchanged. The hidden rig still
|
|
576
|
+
animates, so this reduces drawing rather than animation CPU work.
|
|
577
|
+
|
|
578
|
+
The key is absent by default. Models with textures, transparent materials,
|
|
579
|
+
custom per-mesh rendering, reflected part transforms or incompatible geometry
|
|
580
|
+
retain their normal rig;
|
|
581
|
+
models waiting for deferred look baking are retried when ready. Owned merged
|
|
582
|
+
geometries are shared while in use and released when the last user leaves.
|
|
583
|
+
|
|
584
|
+
|
|
585
|
+
`hub.weakestTier: true` with `hub.tiers: true` opts into the v1.97 weakest-phone
|
|
586
|
+
profile. Auto/Low use it on PowerVR GE8xxx; High overrides it, and a manual
|
|
587
|
+
Weakest choice is available only in opted-in decks. A scene's `weakestDistricts`
|
|
588
|
+
physical table controls sleeping outside the active district (four-metre apron).
|
|
589
|
+
The profile preserves actor state/ID lookup, skips outline/AO bakes, defers look
|
|
590
|
+
work, caps both renderer and composer pixel ratios at 0.5, and uses the existing
|
|
591
|
+
far-body merge with twelve nearest full rigs. Leaving the profile restores the
|
|
592
|
+
previous buffer ratios unless another owner has changed them.
|
|
593
|
+
Unmapped actors, route anchors and dynamic bodies stay live. Games mounted
|
|
594
|
+
through doors use their ordinary tier path. See docs/contract.md for the schema.
|
|
595
|
+
|
|
596
|
+
- **Bounded shots** (v1.119): optional `fit: {min:{x,y,z}, max:{x,y,z}, minDistance}`
|
|
597
|
+
on hub.shot fits a world box inside the central 90% of the current perspective
|
|
598
|
+
canvas. Coordinates ±10000, ordered spans ≤1000, minDistance in (0,1000].
|
|
599
|
+
Absent fit keeps the authored distance. Wire bounds own lease equality;
|
|
600
|
+
resizing changes only the drawn distance, preserving shot identity/lifecycle.
|
|
601
|
+
|
|
602
|
+
|
|
603
|
+
`hub.playCards: true` (v1.122) offers canned play-phrase Go cards to mutual
|
|
604
|
+
friends and party members anywhere in the layer, and strangers within 12 m.
|
|
605
|
+
Only one stranger card is retained at a time; each stranger has a 60 s
|
|
606
|
+
cooldown across doors. Bubble/feed and blocks are unchanged. Absent/false
|
|
607
|
+
keeps the existing policy.
|
|
608
|
+
|
|
609
|
+
`hub.highOnly: true` with `hub.tiers: true` reserves `tier: "high"` Transform/Shape/Model decor for High; Low/Middle/Weakest skip it before load and High restores it in 8 ms slices, independently of `hub.quality`. Editor and door content are unchanged.
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
# hub-game
|
|
2
|
+
|
|
3
|
+
The public API is the [hub contract](docs/contract.md), version **1.125**.
|
|
4
|
+
|
|
5
|
+
For the optional lighter play entry, set `hub.playOnlyEntry: true` in
|
|
6
|
+
`castle.json` and use `/imports/castle.hub-game/play.jsx` as the only module
|
|
7
|
+
script in `index.html`. Publish checks accept this entry only with that flag;
|
|
8
|
+
`main.jsx` remains the default. See contract v1.120 for the restrictions.
|
|
9
|
+
|
|
10
|
+
A result place that retains short reconnects can also retain per-viewer actor
|
|
11
|
+
visibility:
|
|
12
|
+
|
|
13
|
+
```jsonc
|
|
14
|
+
"resume": { "keep": true },
|
|
15
|
+
"resumeVisibility": true
|
|
16
|
+
```
|
|
17
|
+
|
|
18
|
+
`resumeVisibility` is optional and defaults off. It requires an exported
|
|
19
|
+
`resume(hub, { playerId })` hook. On a retained fresh, resume, or silent hello,
|
|
20
|
+
the kit holds the old private visibility replay and action dispatch, runs that
|
|
21
|
+
hook before the next authored `step`, and then sends the complete current map.
|
|
22
|
+
Retained private visibility resumes only for the same authenticated roster
|
|
23
|
+
identity. If that trusted identity is absent, including an anonymous roster row
|
|
24
|
+
whose raw user id looks decimal or hexadecimal, the kit ends the retained visit
|
|
25
|
+
through normal `leave` cleanup and treats the return as a fresh entry. Local
|
|
26
|
+
`dev-guest-*` subjects remain eligible on the development serve.
|
|
27
|
+
The synchronous hook can cancel or revalidate deck-owned queued intents before
|
|
28
|
+
that step matures them. The hook must synchronously rebuild every current
|
|
29
|
+
`hub.hide/show` mask before it returns or first awaits. The place always keeps
|
|
30
|
+
stepping. For a retained same-identity visit with a committed progress marker
|
|
31
|
+
and no existing progress lock, the hook runs against that committed state before
|
|
32
|
+
the kit starts the hello's automatic marker refresh. That refresh still applies
|
|
33
|
+
new reset generations and blocks progress mutations while pending. Unknown
|
|
34
|
+
markers and reads or resets already in flight still block preparation.
|
|
35
|
+
If a progress read blocks preparation, the kit ends and forgets only
|
|
36
|
+
that retained visit through normal `leave` cleanup before authored stepping;
|
|
37
|
+
the next hello uses fresh entry. A synchronous preparation throw fails closed
|
|
38
|
+
the same way. A retained hello queued inside a resume hook belongs to the next
|
|
39
|
+
step; because preparation cannot wait, that visit also ends through cleanup.
|
|
40
|
+
Actions received while preparation is pending are rejected, not queued. The
|
|
41
|
+
kit does not cancel deck-owned promises or intents itself. Masks written after
|
|
42
|
+
an `await` have no current-view guarantee. Queued-intent preparation has the
|
|
43
|
+
same synchronous requirement; returned promises are neither awaited nor
|
|
44
|
+
cancelled, and their later failures keep the ordinary warning behavior.
|
|
45
|
+
|
|
46
|
+
This is not an atomic render guarantee: WORLD can reach the client before the
|
|
47
|
+
prepared private map. A locally cleared client has the shared view until replay,
|
|
48
|
+
and an ordinary retained page can briefly show an actor made private while it
|
|
49
|
+
was away. The contract guarantees only server ordering: synchronous mask writes
|
|
50
|
+
precede the complete `hub-vis` replay. It does not promise when the browser
|
|
51
|
+
draws either message. Without `resumeVisibility`, existing cleanup, resume
|
|
52
|
+
ordering, and wire behavior remain unchanged.
|
|
53
|
+
|
|
54
|
+
Optional top-level `hub.frameBatch: true` batches world and private player packets into ordered envelopes after each simulation tick. Every opt-in packet uses the paced envelope lane from join, including before the client acknowledges support. Opt-in sessions require the updated real-time and multiplayer-3d imports; they do not fall back to an unpaced legacy stream. Without the key, existing bytes and packet order are unchanged.
|
|
55
|
+
|
|
56
|
+
Join replay remains FIFO and is spread across ticks using a shared 768 KiB/s byte bucket. Visit controls (including end, travel, result and the leaving line) use a reserved 64 KiB/s lane ahead of replay. Each lane banks less than 64 KiB, leaving burst and sustained headroom for storage and hub requests under the current host budget. Both lanes also share a frame bucket of 30 frames/s per connected player with a 20-frame burst, reserving the rest of the host frame budget for requests. Normal ticks deliver at most one envelope per player; immediate visit controls may add a paced frame.
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
`hub.loadingCover: true` (v1.126) shows the deck title and white spinner on
|
|
60
|
+
solid black from entry startup until placement and the first completed world render, hiding
|
|
61
|
+
the HUD and action chips until then. Backgrounding or connection loss returns
|
|
62
|
+
the same cover until the connected, placed player has a completed frame.
|
|
63
|
+
Absent/false keeps the existing loading behavior; no wire fields are added.
|
|
@@ -6,25 +6,25 @@
|
|
|
6
6
|
"imports": {
|
|
7
7
|
"castle.multiplayer-3d": {
|
|
8
8
|
"deckId": "ZwA_P_-VO-Qh",
|
|
9
|
-
"version": "2026-10-
|
|
9
|
+
"version": "2026-10-18T06:47:00.410Z"
|
|
10
10
|
},
|
|
11
11
|
"castle.real-time": {
|
|
12
12
|
"deckId": "xFVr-afOLuUQ",
|
|
13
|
-
"version": "2026-10-
|
|
13
|
+
"version": "2026-10-18T06:38:41.691Z"
|
|
14
14
|
},
|
|
15
15
|
"castle.physics-3d": {
|
|
16
16
|
"deckId": "JH0SclbPVP0y",
|
|
17
|
-
"version": "2026-10-
|
|
17
|
+
"version": "2026-10-18T06:40:58.918Z",
|
|
18
18
|
"via": "castle.multiplayer-3d"
|
|
19
19
|
},
|
|
20
20
|
"castle.physics-2d": {
|
|
21
21
|
"deckId": "ckRZGFW4iPrx",
|
|
22
|
-
"version": "2026-10-
|
|
22
|
+
"version": "2026-10-17T06:02:29.713Z",
|
|
23
23
|
"via": "castle.multiplayer-3d"
|
|
24
24
|
},
|
|
25
25
|
"castle.base": {
|
|
26
26
|
"deckId": "yRcmH4_aYllE",
|
|
27
|
-
"version": "2026-10-
|
|
27
|
+
"version": "2026-10-18T06:37:02.597Z"
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"autoUpdateWhenImported": true,
|
|
@@ -0,0 +1,312 @@
|
|
|
1
|
+
// Shared Act/Jump controls, allocated only by hub.act. All text comes from
|
|
2
|
+
// the server's current private offer; scene data supplies its world anchor.
|
|
3
|
+
import { makeLayoutCache } from './layoutCache.js';
|
|
4
|
+
import { hub } from './state.js';
|
|
5
|
+
import { footprintDistance } from './idle.js';
|
|
6
|
+
import { clearBox } from './padOccupancy.js';
|
|
7
|
+
import { interaction } from '../shared/act.js';
|
|
8
|
+
|
|
9
|
+
const intersects = (a, b) => a.left < b.right && a.right > b.left && a.top < b.bottom && a.bottom > b.top;
|
|
10
|
+
export function placeBox(w, h, preferred, bounds, obstacles) {
|
|
11
|
+
if (w > bounds.right - bounds.left || h > bounds.bottom - bounds.top) {return null;}
|
|
12
|
+
const x = Math.max(bounds.left, Math.min(preferred.x - w / 2, bounds.right - w));
|
|
13
|
+
let y = Math.max(bounds.top, Math.min(preferred.y - h, bounds.bottom - h));
|
|
14
|
+
for (let tries = 0; tries <= obstacles.length; tries += 1) {
|
|
15
|
+
const box = { left: x, right: x + w, top: y, bottom: y + h };
|
|
16
|
+
const hits = obstacles.filter(other => intersects(box, other));
|
|
17
|
+
if (!hits.length) {return box;}
|
|
18
|
+
y = Math.max(...hits.map(other => other.bottom)) + 6;
|
|
19
|
+
if (y + h > bounds.bottom) {return null;}
|
|
20
|
+
}
|
|
21
|
+
return null;
|
|
22
|
+
}
|
|
23
|
+
const textEntry = event => event.target?.isContentEditable || ['INPUT', 'TEXTAREA', 'SELECT'].includes(event.target?.tagName);
|
|
24
|
+
// Authored counter verbs (Trade, Stamp, Buy, Play, Sit...) take focus over a
|
|
25
|
+
// nearby loose body or keeper; distance decides only within a rank.
|
|
26
|
+
const rank = item => item.op === 'talk' || item.op === 'grab' ? 1 : 0;
|
|
27
|
+
const typing = event => textEntry(event) || event.target?.tagName === 'BUTTON';
|
|
28
|
+
// Break only at spaces, keeping any omission after a complete word. Explicit
|
|
29
|
+
// line breaks avoid browser line-clamp ellipses in the middle of a name.
|
|
30
|
+
export function fitTalk(verb, hint, width, measure) {
|
|
31
|
+
const suffix = hint ? ' · E' : '', lines = [''];
|
|
32
|
+
if (measure('…' + suffix) > width) {return '';}
|
|
33
|
+
let omitted = false;
|
|
34
|
+
for (const word of verb.trim().split(/\s+/u)) {
|
|
35
|
+
const index = lines.length - 1, next = `${lines[index]}${lines[index] ? ' ' : ''}${word}`;
|
|
36
|
+
if (measure(next + suffix) <= width) {lines[index] = next;}
|
|
37
|
+
else if (lines[index] && lines.length < 2 && measure(word + suffix) <= width) {lines.push(word);}
|
|
38
|
+
else {omitted = true; break;}
|
|
39
|
+
}
|
|
40
|
+
if (omitted) {
|
|
41
|
+
while (measure(lines.at(-1) + '…' + suffix) > width) {
|
|
42
|
+
const words = lines.at(-1).split(' ');
|
|
43
|
+
if (words.length > 1) {lines[lines.length - 1] = words.slice(0, -1).join(' ');}
|
|
44
|
+
else if (lines.length > 1) {lines.pop();}
|
|
45
|
+
else {lines[0] = ''; break;}
|
|
46
|
+
}
|
|
47
|
+
lines[lines.length - 1] += '…';
|
|
48
|
+
}
|
|
49
|
+
return lines.join('\n') + suffix;
|
|
50
|
+
}
|
|
51
|
+
function el(parent, kind, text) {
|
|
52
|
+
const node = document.createElement('button');
|
|
53
|
+
node.dataset.hubAct = kind;
|
|
54
|
+
node.textContent = text;
|
|
55
|
+
Object.assign(node.style, { position: 'absolute', pointerEvents: 'auto', touchAction: 'none', userSelect: 'none',
|
|
56
|
+
minHeight: '44px', padding: '8px 12px', borderRadius: '22px', border: '2px solid rgba(255,255,255,.55)',
|
|
57
|
+
background: 'rgba(20,16,12,.88)', color: '#fff', font: '700 14px system-ui,sans-serif', boxSizing: 'border-box', whiteSpace: 'normal', overflowWrap: 'anywhere' });
|
|
58
|
+
parent.appendChild(node);
|
|
59
|
+
return node;
|
|
60
|
+
}
|
|
61
|
+
export function makeAct(chrome, grab, talk) {
|
|
62
|
+
const sharedGeometry = chrome.layoutGeometry?.();
|
|
63
|
+
const geometry = sharedGeometry ?? makeLayoutCache();
|
|
64
|
+
const root = document.createElement('div');
|
|
65
|
+
Object.assign(root.style, { position: 'absolute', inset: '0', pointerEvents: 'none', zIndex: '2' });
|
|
66
|
+
chrome.interactionRoot().appendChild(root);
|
|
67
|
+
const pair = document.createElement('div');
|
|
68
|
+
Object.assign(pair.style, { position: 'absolute', width: '134px', height: '48px', pointerEvents: 'none', display: 'none' });
|
|
69
|
+
root.appendChild(pair);
|
|
70
|
+
const act = el(pair, 'act', 'Act'), jump = el(pair, 'jump', 'Jump');
|
|
71
|
+
Object.assign(act.style, { left: '70px', top: '0', height: '48px', padding: '8px', whiteSpace: 'nowrap' });
|
|
72
|
+
Object.assign(jump.style, { left: '0', top: '0', height: '48px', padding: '8px', whiteSpace: 'nowrap' });
|
|
73
|
+
chrome.interactionRail(pair, act, jump);
|
|
74
|
+
act.style.width = jump.style.width = '64px';
|
|
75
|
+
const probe = document.createElement('div');
|
|
76
|
+
Object.assign(probe.style, { position: 'absolute', visibility: 'hidden', pointerEvents: 'none', padding: 'env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left)' });
|
|
77
|
+
root.appendChild(probe);
|
|
78
|
+
geometry.register(probe, { padding: true });
|
|
79
|
+
for (const node of [pair, act, jump]) {geometry.register(node);}
|
|
80
|
+
const nodes = new Map(), listeners = new AbortController(), signal = listeners.signal;
|
|
81
|
+
let current = null, context = null, press = null, seq = Date.now() * 1000, queuedJump = false, input = null, originalJump = null;
|
|
82
|
+
let keyboardInput = false;
|
|
83
|
+
let textMeasure;
|
|
84
|
+
chrome.setActMode(true);
|
|
85
|
+
function cancel() {
|
|
86
|
+
if (press) {context?.mp.net?.send({ k: 'hub-act-hold', id: press.id, n: press.n, down: false });}
|
|
87
|
+
press = null;
|
|
88
|
+
}
|
|
89
|
+
function perform(item, n) {
|
|
90
|
+
const c = context;
|
|
91
|
+
if (!c?.can || !item) {return;}
|
|
92
|
+
// The existing client prediction/denial paths carry grabs and NPC panels.
|
|
93
|
+
if (item.op === 'throw') {
|
|
94
|
+
grab.perform(item.actor, c.scene, c.mp, c.local, item.op, () => c.mp.net.send({ k: 'hub-act', id: item.id, n }));
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
if (item.op === 'grab') {grab.perform(item.actor, c.scene, c.mp, c.local, item.op);}
|
|
98
|
+
if (item.op === 'talk') {talk.prepare(item.actor);}
|
|
99
|
+
c.mp.net.send({ k: 'hub-act', id: item.id, n });
|
|
100
|
+
}
|
|
101
|
+
function release() {
|
|
102
|
+
if (!press || performance.now() - press.at < 500) {cancel(); return;}
|
|
103
|
+
const done = press; press = null; perform(done.item, done.n);
|
|
104
|
+
}
|
|
105
|
+
function start(item, source) {
|
|
106
|
+
if (!context?.can || !item || press) {return;}
|
|
107
|
+
const n = ++seq;
|
|
108
|
+
if (item.hold) {
|
|
109
|
+
press = { id: item.id, n, at: performance.now(), source, item };
|
|
110
|
+
context.mp.net.send({ k: 'hub-act-hold', id: item.id, n, down: true });
|
|
111
|
+
} else {perform(item, n);}
|
|
112
|
+
}
|
|
113
|
+
function bind(node, item) {
|
|
114
|
+
node.addEventListener('pointerdown', event => {
|
|
115
|
+
keyboardInput = false;
|
|
116
|
+
event.preventDefault(); event.stopPropagation();
|
|
117
|
+
node.setPointerCapture?.(event.pointerId);
|
|
118
|
+
start(item(), `pointer:${event.pointerId}`);
|
|
119
|
+
}, { signal });
|
|
120
|
+
for (const type of ['pointerup', 'pointercancel', 'lostpointercapture']) {
|
|
121
|
+
node.addEventListener(type, event => {
|
|
122
|
+
event.preventDefault(); event.stopPropagation();
|
|
123
|
+
if (press?.source === `pointer:${event.pointerId}`) {
|
|
124
|
+
if (type === 'pointerup') {release();} else {cancel();}
|
|
125
|
+
}
|
|
126
|
+
}, { signal });
|
|
127
|
+
}
|
|
128
|
+
node.addEventListener('keydown', event => {
|
|
129
|
+
if (event.code === 'Space' || event.code === 'Enter') {
|
|
130
|
+
keyboardInput = true;
|
|
131
|
+
event.stopPropagation();
|
|
132
|
+
const chosen = item();
|
|
133
|
+
if (chosen?.hold) {
|
|
134
|
+
event.preventDefault();
|
|
135
|
+
if (!event.repeat) {start(chosen, event.code);}
|
|
136
|
+
} else if (event.repeat) {event.preventDefault();}
|
|
137
|
+
// Non-held keyboard presses use the button's native click once.
|
|
138
|
+
// Starting here as well would double-dispatch a synthesized click.
|
|
139
|
+
}
|
|
140
|
+
}, { signal });
|
|
141
|
+
node.addEventListener('keyup', event => {
|
|
142
|
+
if (['Space', 'Enter'].includes(event.code)) {event.stopPropagation();}
|
|
143
|
+
if (press?.source === event.code) {event.preventDefault(); release();}
|
|
144
|
+
}, { signal });
|
|
145
|
+
// Synthesized activation has no hold duration. It can activate ordinary
|
|
146
|
+
// actions; spending still requires sustained pointer or keyboard input.
|
|
147
|
+
node.addEventListener('click', event => {
|
|
148
|
+
if (event.detail !== 0) {return;}
|
|
149
|
+
event.preventDefault(); event.stopPropagation();
|
|
150
|
+
const chosen = item();
|
|
151
|
+
if (chosen && !chosen.hold) {start(chosen, 'click');}
|
|
152
|
+
}, { signal });
|
|
153
|
+
}
|
|
154
|
+
bind(act, () => current);
|
|
155
|
+
jump.addEventListener('pointerdown', event => {keyboardInput = false; event.preventDefault(); event.stopPropagation(); if (context?.can) {queuedJump = true;}}, { signal });
|
|
156
|
+
jump.addEventListener('keydown', event => {
|
|
157
|
+
if (['Space', 'Enter'].includes(event.code)) {keyboardInput = true; event.preventDefault(); event.stopPropagation(); if (!event.repeat && context?.can) {queuedJump = true;}}
|
|
158
|
+
}, { signal });
|
|
159
|
+
jump.addEventListener('click', event => {if (event.detail === 0 && context?.can) {queuedJump = true;}}, { signal });
|
|
160
|
+
globalThis.addEventListener?.('pointerdown', () => {keyboardInput = false;}, { capture: true, signal });
|
|
161
|
+
globalThis.addEventListener?.('keydown', event => {
|
|
162
|
+
// Pointer capability does not establish a hardware-keyboard input.
|
|
163
|
+
// Observe game/navigation keys outside editable or composing text instead.
|
|
164
|
+
if (!textEntry(event) && !event.isComposing && !event.altKey && !event.ctrlKey && !event.metaKey &&
|
|
165
|
+
/^(Key[WASDEF]|Arrow(Up|Down|Left|Right)|Space|Enter|Tab)$/.test(event.code)) {keyboardInput = true;}
|
|
166
|
+
if (typing(event) || event.altKey || event.ctrlKey || event.metaKey || !context?.can) {return;}
|
|
167
|
+
if (event.code === 'KeyE' || (event.code === 'Space' && current)) {
|
|
168
|
+
event.preventDefault(); event.stopImmediatePropagation();
|
|
169
|
+
if (event.code === 'Space') {context.scene.keys?.delete?.('Space');}
|
|
170
|
+
if (!event.repeat) {start(current, event.code);}
|
|
171
|
+
}
|
|
172
|
+
}, { capture: true, signal });
|
|
173
|
+
globalThis.addEventListener?.('keyup', event => {
|
|
174
|
+
if (press?.source === event.code) {release();}
|
|
175
|
+
if (event.code === 'Space') {context?.scene.keys?.delete?.('Space');}
|
|
176
|
+
}, { capture: true, signal });
|
|
177
|
+
globalThis.addEventListener?.('blur', cancel, { signal });
|
|
178
|
+
document.addEventListener('visibilitychange', () => {if (document.hidden) {cancel();}}, { signal });
|
|
179
|
+
function frame(scene, mp, local, can) {
|
|
180
|
+
const self = mp.net?.selfId?.();
|
|
181
|
+
can = can && (!hub.held.has(self) || Object.hasOwn(hub.seated, self));
|
|
182
|
+
const status = mp.net?.status?.();
|
|
183
|
+
const connected = mp.net && self && local?.components.Transform && (!status || status.state === 'connected');
|
|
184
|
+
const changed = context && (context.scene !== scene || context.mp.net !== mp.net || context.self !== self || context.place !== hub.place?.id);
|
|
185
|
+
if (changed || !can || !connected) {cancel(); queuedJump = false;}
|
|
186
|
+
if (changed) {keyboardInput = false;}
|
|
187
|
+
context = { scene, mp, local, can: Boolean(can && connected), self, place: hub.place?.id };
|
|
188
|
+
if (scene.moveInput && input !== scene.moveInput) {
|
|
189
|
+
if (input?.consumeJump === consumeJump) {input.consumeJump = originalJump;}
|
|
190
|
+
input = scene.moveInput; originalJump = input.consumeJump;
|
|
191
|
+
input.consumeJump = consumeJump;
|
|
192
|
+
}
|
|
193
|
+
const actors = scene.getActors(), authored = new Map();
|
|
194
|
+
for (const actor of actors) {
|
|
195
|
+
const item = interaction(actor, hub.place ?? {}, Object.hasOwn(hub.spawned, actor.id));
|
|
196
|
+
if (item) {authored.set(item.id, item);}
|
|
197
|
+
}
|
|
198
|
+
const me = local?.components.Transform;
|
|
199
|
+
const items = (context.can ? hub.prompts ?? [] : []).flatMap(item => {
|
|
200
|
+
const base = authored.get(item.id), actor = base && scene.getActor(base.actor), t = actor?.components.Transform;
|
|
201
|
+
if (!base || !t || hub.hidden.has(actor.id)) {return [];}
|
|
202
|
+
// Stand and Throw are server-selected states of the same actor.
|
|
203
|
+
const op = item.verb === 'Stand' && base.op === 'sit' ? 'stand' : item.verb === 'Throw' && base.op === 'grab' ? 'throw' : base.op;
|
|
204
|
+
const d = op === 'throw' ? 0 : base.op === 'sit' ? footprintDistance(actor, me) : Math.hypot(t.x - me.x, t.y - me.y, t.z - me.z);
|
|
205
|
+
return d <= base.reach ? [{ ...base, ...item, op, t, d }] : [];
|
|
206
|
+
}).sort((a, b) => rank(a) - rank(b) || a.d - b.d || a.id.localeCompare(b.id));
|
|
207
|
+
current = items[0] ?? null;
|
|
208
|
+
if (press && !items.some(item => item.id === press.id && item.verb === press.item.verb && item.hold === press.item.hold)) {cancel();}
|
|
209
|
+
if (press && performance.now() - press.at >= 500) {
|
|
210
|
+
const done = press; press = null; perform(done.item, done.n);
|
|
211
|
+
}
|
|
212
|
+
const visible = new Set(items.map(item => item.id));
|
|
213
|
+
for (const [id, node] of nodes) {if (!visible.has(id)) {chrome.safeSurface?.(`act-prompt:${id}`, null); geometry.unregister(node); node.remove(); nodes.delete(id);}}
|
|
214
|
+
for (const item of items) {
|
|
215
|
+
let node = nodes.get(item.id);
|
|
216
|
+
if (!node) {
|
|
217
|
+
node = el(root, 'prompt', ''); nodes.set(item.id, node);
|
|
218
|
+
geometry.register(node, { positioned: true });
|
|
219
|
+
chrome.safeSurface?.(`act-prompt:${item.id}`, node, 'control', { transient: true });
|
|
220
|
+
bind(node, () => context?.can ? node._actItem : null);
|
|
221
|
+
}
|
|
222
|
+
node._actItem = item;
|
|
223
|
+
const label = `${item.verb}${keyboardInput ? ' · E' : ''}`;
|
|
224
|
+
if (item.op !== 'talk' && node.textContent !== label) {node.textContent = label;}
|
|
225
|
+
if (node.getAttribute('aria-label') !== item.verb) {node.setAttribute('aria-label', item.verb);}
|
|
226
|
+
if (node.title !== item.verb) {node.title = item.verb;}
|
|
227
|
+
node.style.opacity = item.id === current?.id ? '1' : '.55';
|
|
228
|
+
node.style.borderColor = item.id === current?.id ? '#f2c94c' : 'rgba(255,255,255,.55)';
|
|
229
|
+
const progress = press?.id === item.id ? Math.min(1, (performance.now() - press.at) / 500) : 0;
|
|
230
|
+
node.style.background = progress ? `linear-gradient(90deg, #806521 ${progress * 100}%, rgba(20,16,12,.88) ${progress * 100}%)` : 'rgba(20,16,12,.88)';
|
|
231
|
+
}
|
|
232
|
+
act.disabled = !current;
|
|
233
|
+
act.style.opacity = current ? '1' : '.5';
|
|
234
|
+
pair.style.display = context.can ? 'block' : 'none';
|
|
235
|
+
act.style.display = jump.style.display = context.can ? 'block' : 'none';
|
|
236
|
+
chrome.layoutInteractionRail();
|
|
237
|
+
layout(scene, items);
|
|
238
|
+
}
|
|
239
|
+
function consumeJump(...args) {
|
|
240
|
+
const own = queuedJump; queuedJump = false;
|
|
241
|
+
const had = originalJump?.apply(this, args);
|
|
242
|
+
return context?.can && (own || had);
|
|
243
|
+
}
|
|
244
|
+
function layout(scene, items) {
|
|
245
|
+
const { w, h } = geometry.view(), inset = geometry.padding(probe);
|
|
246
|
+
const bounds = { left: inset.left + 8, right: w - inset.right - 8, top: inset.top + 8, bottom: h - inset.bottom - 8 };
|
|
247
|
+
const obstacles = chrome.interactionObstacles().map(node => geometry.rect(node)).filter(r => r.width && r.height);
|
|
248
|
+
obstacles.push({ left: bounds.left - 8, right: bounds.left + 56, top: bounds.top - 8, bottom: bounds.top + 48 },
|
|
249
|
+
{ left: bounds.right - 56, right: bounds.right + 8, top: bounds.top - 8, bottom: bounds.top + 48 });
|
|
250
|
+
// The common rail owns the pair; projected prompts yield to its final
|
|
251
|
+
// controls in the same safeSurface pass at the end of the hub frame.
|
|
252
|
+
const cam = scene.three?.camera;
|
|
253
|
+
// Prompts are placed focused first; each keeps clear of the player's own
|
|
254
|
+
// avatar (last drawn frame), the HUD and rail, and the prompts already
|
|
255
|
+
// placed, inside the safe bounds, so the later safeSurface pass has
|
|
256
|
+
// nothing left to move back onto the player.
|
|
257
|
+
const seen = chrome.worldAvatar?.();
|
|
258
|
+
const avatar = seen && [seen.left, seen.right, seen.top, seen.bottom].every(Number.isFinite) ? seen : null;
|
|
259
|
+
const railBox = pair.style.display !== 'none' ? geometry.rect(pair) : null;
|
|
260
|
+
const placed = [...(avatar ? [avatar] : []), ...obstacles, ...(railBox?.width ? [railBox] : [])];
|
|
261
|
+
for (const item of items) {
|
|
262
|
+
const node = nodes.get(item.id), v = cam?.position.clone().set(item.t.x, item.t.y + 1.5, item.t.z).project(cam);
|
|
263
|
+
const width = Math.min(bounds.right - bounds.left, item.op === 'talk' ? 280 : Infinity);
|
|
264
|
+
node.style.maxWidth = `${width}px`;
|
|
265
|
+
if (item.op === 'talk') {
|
|
266
|
+
textMeasure ??= document.createElement('canvas').getContext('2d');
|
|
267
|
+
textMeasure.font = '700 14px system-ui,sans-serif';
|
|
268
|
+
const key = `${item.verb}\0${keyboardInput}\0${width}`;
|
|
269
|
+
if (node._talkKey !== key) {
|
|
270
|
+
node._talkKey = key;
|
|
271
|
+
node._talkText = fitTalk(item.verb, keyboardInput, width - 29, text => textMeasure.measureText(text).width);
|
|
272
|
+
}
|
|
273
|
+
if (node.textContent !== node._talkText) {node.textContent = node._talkText;}
|
|
274
|
+
Object.assign(node.style, { whiteSpace: 'pre', lineHeight: '18px' });
|
|
275
|
+
}
|
|
276
|
+
node.style.display = 'block';
|
|
277
|
+
const size = geometry.dimensions(node);
|
|
278
|
+
const r = { width: size.w, height: size.h };
|
|
279
|
+
const preferred = v && v.z >= -1 && v.z <= 1 ? { x: (v.x + 1) * w / 2, y: (1 - v.y) * h / 2 } : { x: w / 2, y: bounds.top + 62 };
|
|
280
|
+
let box;
|
|
281
|
+
if (chrome.safeSurface) {
|
|
282
|
+
const left = Math.max(bounds.left, Math.min(preferred.x - r.width / 2, bounds.right - r.width));
|
|
283
|
+
const top = Math.max(bounds.top, Math.min(preferred.y - r.height, bounds.bottom - r.height));
|
|
284
|
+
const at = { left, right: left + r.width, top, bottom: top + r.height };
|
|
285
|
+
// A secondary prompt with nowhere clear yields rather than cover the
|
|
286
|
+
// player; the focused one keeps its projected place.
|
|
287
|
+
box = clearBox(at, placed, { w, h, bounds }, avatar) ?? (item === current ? at : null);
|
|
288
|
+
} else {box = placeBox(r.width, r.height, preferred, bounds, obstacles);}
|
|
289
|
+
if (box) {
|
|
290
|
+
Object.assign(node.style, { left: `${box.left}px`, top: `${box.top}px` }); obstacles.push(box);
|
|
291
|
+
placed.push({ left: box.left, top: box.top, right: box.left + r.width, bottom: box.top + r.height });
|
|
292
|
+
} else {node.style.display = 'none';}
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
return { frame,
|
|
296
|
+
beginLayoutFrame() {
|
|
297
|
+
if (!sharedGeometry) {
|
|
298
|
+
for (const node of chrome.interactionObstacles()) {geometry.register(node);}
|
|
299
|
+
geometry.beginFrame();
|
|
300
|
+
}
|
|
301
|
+
},
|
|
302
|
+
endLayoutFrame() {if (!sharedGeometry) {geometry.endFrame();}},
|
|
303
|
+
dispose() {
|
|
304
|
+
cancel(); listeners.abort(); geometry.unregister(root);
|
|
305
|
+
if (!sharedGeometry) {geometry.dispose();}
|
|
306
|
+
chrome.interactionRail(null);
|
|
307
|
+
for (const [id] of nodes) {chrome.safeSurface?.(`act-prompt:${id}`, null);}
|
|
308
|
+
root.remove(); chrome.setActMode(false);
|
|
309
|
+
if (input?.consumeJump === consumeJump) {input.consumeJump = originalJump;}
|
|
310
|
+
},
|
|
311
|
+
};
|
|
312
|
+
}
|