dsh-pet-live2d-viola 1.1.1 → 1.1.2

package/lib/client.js

@@ -100,22 +100,36 @@ window.__ModuleLoader__.load({
 		 * @see aspect
 		 */
 		const SURFACE_ASPECT_SCALE = {
-			yuno: { default: 1.15, full: 1, threeQuarter: 1.1, bust: 1.28 },
-			yuno_virtual: { default: 1.15, full: 1, threeQuarter: 1.1, bust: 1.28 }
+			/*
+			 * The shared entry: every model falls back to `default`, so a character only needs its own line to differ.
+			 *
+			 * `full` is named explicitly because `default` also covers crops with no entry — a bare `default: 0.9` would
+			 * narrow EVERY crop, which is not the same thing.
+			 */
+			default: { default: 1, full: 0.7, threeQuarter: 0.85 },
+			yuno: { default: 1.15, full: 0.7, threeQuarter: 1.1, bust: 1.28 },
+			yuno_virtual: { default: 1.15, full: 0.7, threeQuarter: 1.1, bust: 1.28 }
 		};
 		/**
 		 * The framing-box width multiplier for a character and crop.
 		 *
+		 * Resolution order: the character's own entry, then the shared `default` entry, then 1. Within an entry, a crop
+		 * missing from it falls back to that entry's `default`, so a character can widen one crop without listing the
+		 * others.
+		 *
 		 * @param character - the active model id.
 		 * @param crop - the framing preset key.
 		 * @returns the multiplier on the surface width; 1 when nothing is configured.
 		 */
 		function aspectScaleFor(character, crop) {
-			const entry = SURFACE_ASPECT_SCALE[character];
-			if (entry === undefined) return 1;
-			// A plain number applies to every crop; an object may override per crop with `default` as the fallback.
-			const value = typeof entry === "number" ? entry : (entry[crop] ?? entry.default);
-			return typeof value === "number" && value > 0 ? value : 1;
+			const resolve = (entry) => {
+				if (entry === undefined) return undefined;
+				if (typeof entry === "number") return entry;
+				const value = entry[crop] ?? entry.default;
+				return typeof value === "number" ? value : undefined;
+			};
+			const value = resolve(SURFACE_ASPECT_SCALE[character]) ?? resolve(SURFACE_ASPECT_SCALE.default) ?? 1;
+			return value > 0 ? value : 1;
 		}
 		/**
 		 * Vertical position adjustment for a widened box, as a fraction of the box HEIGHT.
@@ -135,21 +149,36 @@ window.__ModuleLoader__.load({
 		 * line. Change a number here; nothing else has to move.
 		 */
 		const SURFACE_Y_ADJUST = {
-			yuno: { default: 0.12, full: 0, threeQuarter: 0.08, bust: 0.3 },
-			yuno_virtual: { default: 0.12, full: 0, threeQuarter: 0.08, bust: 0.3 }
+			/*
+			 * The shared entry, like the one on `SURFACE_ASPECT_SCALE`: every model falls back to it, so a value meant for
+			 * everyone is written once. Per character only where it has to differ.
+			 *
+			 * `full` begins at 0 — the un-widened box's own framing, which is the right starting point for a crop that has
+			 * not needed adjustment.
+			 */
+			default: { default: 0, full: -0.18, threeQuarter: -0.14 },
+			yuno: { default: 0.12, full: -0.18, threeQuarter: 0.08, bust: 0.3 },
+			yuno_virtual: { default: 0.12, full: -0.18, threeQuarter: 0.08, bust: 0.3 }
 		};
 		/**
 		 * The vertical adjustment for a character and crop.
 		 *
+		 * Resolution order mirrors `aspectScaleFor`: the character's own entry, then the shared `default` entry, then 0.
+		 * Within an entry, a crop missing from it falls back to that entry's `default`.
+		 *
 		 * @param character - the active model id.
 		 * @param crop - the framing preset key.
 		 * @returns the fraction of box height to shift by; 0 when nothing is configured.
 		 */
 		function yAdjustFor(character, crop) {
-			const perChar = SURFACE_Y_ADJUST[character];
-			if (perChar === undefined) return 0;
-			const value = perChar[crop] ?? perChar.default;
-			return typeof value === "number" && Number.isFinite(value) ? value : 0;
+			const resolve = (entry) => {
+				if (entry === undefined) return undefined;
+				if (typeof entry === "number") return entry;
+				const value = entry[crop] ?? entry.default;
+				return typeof value === "number" ? value : undefined;
+			};
+			const value = resolve(SURFACE_Y_ADJUST[character]) ?? resolve(SURFACE_Y_ADJUST.default) ?? 0;
+			return Number.isFinite(value) ? value : 0;
 		}
 
 		/**
@@ -163,15 +192,33 @@ window.__ModuleLoader__.load({
 		 * preset's zoom, so a tighter crop shifts further.
 		 */
 		const SURFACE_X_ADJUST = {
-			yuno: { default: 0, bust: 0 },
-			yuno_virtual: { default: 0, bust: 0 }
+			/*
+			 * The shared entry, mirroring `SURFACE_Y_ADJUST`: every model falls back to it, so a value meant for everyone
+			 * is written once. Without it, a request to move "everyone" would silently apply to 由乃 alone.
+			 */
+			default: { default: 0, full: 0.07, threeQuarter: -0.02 },
+			yuno: { default: 0, full: 0.07, bust: 0 },
+			yuno_virtual: { default: 0, full: 0.07, bust: 0 }
 		};
-		/** The horizontal adjustment for a character and crop. @see SURFACE_X_ADJUST */
+		/**
+		 * The horizontal adjustment for a character and crop.
+		 *
+		 * Resolution order mirrors `aspectScaleFor` / `yAdjustFor`: the character's own entry, then the shared `default`
+		 * entry, then 0. Reading only the character's own entry is what made an "everyone" change apply to 由乃 alone.
+		 *
+		 * @param character - the active model id.
+		 * @param crop - the framing preset key.
+		 * @returns the fraction of box width to shift by; 0 when nothing is configured.
+		 */
 		function xAdjustFor(character, crop) {
-			const perChar = SURFACE_X_ADJUST[character];
-			if (perChar === undefined) return 0;
-			const value = perChar[crop] ?? perChar.default;
-			return typeof value === "number" && Number.isFinite(value) ? value : 0;
+			const resolve = (entry) => {
+				if (entry === undefined) return undefined;
+				if (typeof entry === "number") return entry;
+				const value = entry[crop] ?? entry.default;
+				return typeof value === "number" ? value : undefined;
+			};
+			const value = resolve(SURFACE_X_ADJUST[character]) ?? resolve(SURFACE_X_ADJUST.default) ?? 0;
+			return Number.isFinite(value) ? value : 0;
 		}
 		/**
 		 * Extra surface height, as a multiple of the base height, added BELOW the character.
@@ -2387,8 +2434,26 @@ window.__ModuleLoader__.load({
 	bottom: calc(100% - var(--bubble-offset, 10px) * var(--bubble-scale, 1));
 	top: auto;
 	transform: translateX(-50%);
-	max-width: min(94%, 400px);
-	min-width: 84px;
+	/*
+	 * An EXPLICIT width, because the percentage offset would otherwise decide it.
+	 *
+	 * The element is absolutely positioned with left:50%, and for those the shrink-to-fit width has the offset
+	 * subtracted from the containing block: in a 246 px frame the available width is only 246 - 123 = 123 px. That is why
+	 * raising max-width had no effect — measured, the rendered width stayed at exactly half the frame (123 / 246), and
+	 * removing max-width, zeroing min-width and clearing the transform ALL also left it at 123.
+	 *
+	 * Setting the width outright takes it out of that calculation, so the caption is sized by the text and by how big the
+	 * pet is, not by how far the frame has been cropped. Measured after the change: 400 px in every crop.
+	 *
+	 * All three numbers are independent of the frame:
+	 *   351px * --bubble-scale  tracks the pet's own size, so a bigger pet gets a bigger caption
+	 *   400px                   the ceiling, unchanged from before
+	 *   84px * --bubble-scale   the floor, so a two-word line is not a sliver
+	 *   max-content             hugs the text rather than filling the width
+	 */
+	width: max-content;
+	max-width: min(calc(351px * var(--bubble-scale, 1)), 400px);
+	min-width: calc(84px * var(--bubble-scale, 1));
 	/*
 	 * Sized from --bubble-scale, which the layout sets to the model's own scale.
 	 *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-pet-live2d-viola",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Live2D desktop pet for the DeepSeek Harness web GUI. One pet, three characters: 都子 (miyako_014_casual_spring_01_marukun), 薇欧拉 in casual or school uniform, and 由乃 in casual clothes or her virtual-avatar outfit — each with its own motions, expressions, voice lines, captions, idle drift, click reactions and goodbye.",
   "type": "module",
   "main": "lib/index.js",