blacktrigram 0.7.18 → 0.7.19

package/lib/components/screens/combat/CombatScreen3D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CombatScreen3D.d.ts","sourceRoot":"","sources":["../../../../src/components/screens/combat/CombatScreen3D.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,OAAO,KAMN,MAAM,OAAO,CAAC;AAUf,OAAO,EAAa,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAqB1D,OAAO,EAEL,QAAQ,EAIT,MAAM,gBAAgB,CAAC;AAgFxB;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;IACzC;;;;OAIG;IACH,QAAQ,CAAC,cAAc,EAAE,CACvB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,KAC1B,IAAI,CAAC;IACV;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;IACpC;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IACzC;;OAEG;IACH,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAC3C;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAq8FxD,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"CombatScreen3D.d.ts","sourceRoot":"","sources":["../../../../src/components/screens/combat/CombatScreen3D.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,OAAO,KAMN,MAAM,OAAO,CAAC;AAUf,OAAO,EAAa,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAsB1D,OAAO,EAEL,QAAQ,EAIT,MAAM,gBAAgB,CAAC;AAkFxB;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,QAAQ,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAC;IACzC;;;;OAIG;IACH,QAAQ,CAAC,cAAc,EAAE,CACvB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,KAC1B,IAAI,CAAC;IACV;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC;IACpC;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IACzC;;OAEG;IACH,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAC3C;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAsgGxD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/lib/components/screens/combat/CombatScreen3D.js

@@ -11,10 +11,11 @@ import { Z_INDEX } from "../../../types/LayoutTypes.js";
 import { InjuryType } from "../../../types/injury.js";
 import { TRIGRAM_STANCES_ORDER } from "../../../systems/trigram/types.js";
 import { useKeyboardControls } from "../../../hooks/useKeyboardControls.js";
-import { getAnimation, getAnimationForTechnique } from "../../../systems/animation/core/AnimationRegistry.js";
+import { getAnimation, resolveTechniqueAnimation } from "../../../systems/animation/core/AnimationRegistry.js";
 import { determineRecoveryType, getRecoveryAnimationState } from "../../../systems/animation/catalogs/RecoveryAnimations.js";
 import { usePlayerAnimation } from "../../../hooks/usePlayerAnimation.js";
 import useRoundTransition from "../../../hooks/useRoundTransition.js";
+import { TRIGRAM_TECHNIQUES } from "../../../systems/trigram/techniques/index.js";
 import useTechniqueSelection from "../../../hooks/useTechniqueSelection.js";
 import { useWebGLContextLossHandler } from "../../../hooks/useWebGLContextLossHandler.js";
 import { injuryMovementModifier } from "../../../systems/movement/InjuryMovementModifier.js";
@@ -24,6 +25,7 @@ import BalanceSystem from "../../../systems/combat/BalanceSystem.js";
 import CombatSystem from "../../../systems/CombatSystem.js";
 import { getPersonalityByArchetype } from "../../../systems/ai/AIPersonality.js";
 import { AdaptiveDifficulty } from "../../../systems/ai/AdaptiveDifficulty.js";
+import { getMobileControlsBottom } from "../../../types/constants/layout.js";
 import { getAnimationTypeForTechnique } from "../../../data/techniqueMappings.js";
 import { toHexColor } from "../../../utils/colorHelpers.js";
 import { usePlayerMovement } from "../../../utils/inputSystem.js";
@@ -59,6 +61,7 @@ import CombatTopHUD from "./components/hud/CombatTopHUD.js";
 import CombatBottomHUD from "./components/hud/CombatBottomHUD.js";
 import CombatLeftHUD from "./components/hud/CombatLeftHUD.js";
 import CombatRightHUD from "./components/hud/CombatRightHUD.js";
+import CombatPortraitStatusStrip from "./components/hud/CombatPortraitStatusStrip.js";
 import FPSMonitor from "./components/hud/FPSMonitor.js";
 import { PlayerStateOverlayHtml } from "./components/hud/PlayerStateOverlayHtml.js";
 import { BalanceIndicatorOverlayHtml } from "../../ui/combat/BalanceIndicatorOverlayHtml.js";
@@ -107,7 +110,7 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 	}, []);
 	const audio = useAudio();
 	useEffect(() => {}, []);
-	const { arenaBounds, isMobile, screenSize, layoutConstants } = useCombatLayout(width, height);
+	const { arenaBounds, isMobile, isPortrait, screenSize, layoutConstants } = useCombatLayout(width, height);
 	const theme = useKoreanTheme({
 		variant: "primary",
 		size: "md",
@@ -123,7 +126,19 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 			default: return 1;
 		}
 	}, [screenSize]);
-	const cameraConfig = useMemo(() => createCameraConfig(isMobile), [isMobile]);
+	const cameraConfig = useMemo(() => {
+		const base = createCameraConfig(isMobile);
+		if (!isPortrait) return base;
+		return {
+			...base,
+			fov: Math.min(80, base.fov + 15),
+			position: [
+				base.position[0],
+				base.position[1],
+				base.position[2] + 4
+			]
+		};
+	}, [isMobile, isPortrait]);
 	const renderConfig = useMemo(() => {
 		const performanceSettings = getPerformanceSettings(width, isMobile);
 		return {
@@ -796,7 +811,7 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 		enabled: !isPaused && combatState.roundStarted && !combatState.roundEnded && matchCountdownComplete && !showRoundStart,
 		onTechniqueExecute: useCallback((technique) => {
 			feedbackActions.showTechnique(technique.name.korean, technique.name.english);
-			const animationName = getAnimationForTechnique(technique.name.english || technique.id);
+			const animationName = resolveTechniqueAnimation(technique);
 			setPlayer1AttackAnimation(animationName);
 			setPlayer1TechniqueId(technique.id);
 			const attackDuration = getAnimation(animationName)?.duration ?? .55;
@@ -892,7 +907,9 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 		combatState.roundEnded
 	]);
 	const handleAttackWithFeedback = useCallback(() => {
-		setPlayer1AttackAnimation("jab");
+		const basicTechnique = techniqueSelection.availableTechniques[0];
+		setPlayer1AttackAnimation(basicTechnique ? resolveTechniqueAnimation(basicTechnique) : "jab");
+		if (basicTechnique?.id) setPlayer1TechniqueId(basicTechnique.id);
 		if (player1Animation.transitionTo(AnimationState.ATTACK)) combatActions.setExecutingTechnique(true);
 		else {
 			console.warn("Attack animation transition failed; executing attack logic directly.");
@@ -901,7 +918,8 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 	}, [
 		player1Animation,
 		combatActions,
-		handleAttack
+		handleAttack,
+		techniqueSelection.availableTechniques
 	]);
 	const handleDefendWithFeedback = useCallback(() => {
 		const defenderPos = playerPositions[0];
@@ -1166,19 +1184,23 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 		updateDifficultyTarget
 	]);
 	const executeAIActionCallback = useCallback((action, targetPos, selectedTechnique, targetVitalPoint) => {
+		const aiFallbackTechnique = TRIGRAM_TECHNIQUES[validPlayers[1]?.currentStance ?? TrigramStance.GEON]?.[0];
+		const aiFallbackAnim = aiFallbackTechnique ? resolveTechniqueAnimation(aiFallbackTechnique) : "jab";
 		switch (action) {
 			case "attack":
-				if (selectedTechnique?.name?.english || selectedTechnique?.englishName) {
-					const p2AttackAnimName = getAnimationForTechnique(selectedTechnique.name?.english ?? selectedTechnique.englishName ?? "jab");
+				if (selectedTechnique) {
+					const p2AttackAnimName = resolveTechniqueAnimation(selectedTechnique);
 					setPlayer2AttackAnimation(p2AttackAnimName);
-					if (selectedTechnique?.id) setPlayer2TechniqueId(selectedTechnique.id);
+					if (selectedTechnique.id) setPlayer2TechniqueId(selectedTechnique.id);
 					const p2AttackDur = getAnimation(p2AttackAnimName)?.duration ?? .55;
 					player2AttackDurationRef.current = p2AttackDur;
 					player2Animation.transitionToAttack(p2AttackDur);
 				} else {
-					setPlayer2AttackAnimation("jab");
-					player2AttackDurationRef.current = .55;
-					player2Animation.transitionToAttack(.55);
+					setPlayer2AttackAnimation(aiFallbackAnim);
+					if (aiFallbackTechnique?.id) setPlayer2TechniqueId(aiFallbackTechnique.id);
+					const p2FallbackDur = getAnimation(aiFallbackAnim)?.duration ?? .55;
+					player2AttackDurationRef.current = p2FallbackDur;
+					player2Animation.transitionToAttack(p2FallbackDur);
 				}
 				handleAIAttack(selectedTechnique, targetVitalPoint);
 				break;
@@ -1188,17 +1210,19 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 				break;
 			case "technique":
 			case "combo":
-				if (selectedTechnique?.name?.english || selectedTechnique?.englishName) {
-					const p2TechAnimName = getAnimationForTechnique(selectedTechnique.name?.english ?? selectedTechnique.englishName ?? "cross");
+				if (selectedTechnique) {
+					const p2TechAnimName = resolveTechniqueAnimation(selectedTechnique);
 					setPlayer2AttackAnimation(p2TechAnimName);
-					if (selectedTechnique?.id) setPlayer2TechniqueId(selectedTechnique.id);
+					if (selectedTechnique.id) setPlayer2TechniqueId(selectedTechnique.id);
 					const p2TechDur = getAnimation(p2TechAnimName)?.duration ?? .6;
 					player2AttackDurationRef.current = p2TechDur;
 					player2Animation.transitionToAttack(p2TechDur);
 				} else {
-					setPlayer2AttackAnimation("cross");
-					player2AttackDurationRef.current = .6;
-					player2Animation.transitionToAttack(.6);
+					setPlayer2AttackAnimation(aiFallbackAnim);
+					if (aiFallbackTechnique?.id) setPlayer2TechniqueId(aiFallbackTechnique.id);
+					const p2FallbackDur = getAnimation(aiFallbackAnim)?.duration ?? .6;
+					player2AttackDurationRef.current = p2FallbackDur;
+					player2Animation.transitionToAttack(p2FallbackDur);
 				}
 				handleAITechnique(selectedTechnique, targetVitalPoint);
 				break;
@@ -1235,17 +1259,19 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 				}
 				break;
 			case "counter":
-				if (selectedTechnique?.name?.english || selectedTechnique?.englishName) {
-					const p2CounterAnimName = getAnimationForTechnique(selectedTechnique.name?.english ?? selectedTechnique.englishName ?? "cross");
+				if (selectedTechnique) {
+					const p2CounterAnimName = resolveTechniqueAnimation(selectedTechnique);
 					setPlayer2AttackAnimation(p2CounterAnimName);
-					if (selectedTechnique?.id) setPlayer2TechniqueId(selectedTechnique.id);
+					if (selectedTechnique.id) setPlayer2TechniqueId(selectedTechnique.id);
 					const p2CounterDur = getAnimation(p2CounterAnimName)?.duration ?? .6;
 					player2AttackDurationRef.current = p2CounterDur;
 					player2Animation.transitionToAttack(p2CounterDur);
 				} else {
-					setPlayer2AttackAnimation("cross");
-					player2AttackDurationRef.current = .6;
-					player2Animation.transitionToAttack(.6);
+					setPlayer2AttackAnimation(aiFallbackAnim);
+					if (aiFallbackTechnique?.id) setPlayer2TechniqueId(aiFallbackTechnique.id);
+					const p2FallbackDur = getAnimation(aiFallbackAnim)?.duration ?? .6;
+					player2AttackDurationRef.current = p2FallbackDur;
+					player2Animation.transitionToAttack(p2FallbackDur);
 				}
 				handleAIAttack(selectedTechnique, targetVitalPoint);
 				addCombatMessage("AI 반격!", "AI Counter!");
@@ -1752,7 +1778,7 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 						onReturnToMenu,
 						isPaused: isPaused || showPauseMenu
 					}),
-					/* @__PURE__ */ jsx(CombatLeftHUD, {
+					!(isMobile && isPortrait) && /* @__PURE__ */ jsx(CombatLeftHUD, {
 						width,
 						height,
 						isMobile,
@@ -1762,7 +1788,7 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 						isInGuard: player1Animation.isInStanceGuard(),
 						speedModifiers: player1SpeedModifiers
 					}),
-					/* @__PURE__ */ jsx(CombatRightHUD, {
+					!(isMobile && isPortrait) && /* @__PURE__ */ jsx(CombatRightHUD, {
 						width,
 						height,
 						isMobile,
@@ -1772,6 +1798,14 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 						speedModifiers: player2SpeedModifiers,
 						difficultyTier: currentDifficultyTier
 					}),
+					isMobile && isPortrait && /* @__PURE__ */ jsx(CombatPortraitStatusStrip, {
+						width,
+						height,
+						player1: validPlayers[0],
+						player2: validPlayers[1],
+						positionScale,
+						topOffset: layoutConstants.hudHeight
+					}),
 					/* @__PURE__ */ jsx(CombatBottomHUD, {
 						width,
 						height,
@@ -1792,7 +1826,8 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 						consciousness: validPlayers[0].consciousness,
 						bloodLoss: 0,
 						stamina: validPlayers[0].stamina,
-						isMobile
+						isMobile,
+						intensityScale: isMobile && isPortrait ? .5 : 1
 					}),
 					/* @__PURE__ */ jsx("div", {
 						style: {
@@ -1878,7 +1913,8 @@ var CombatScreen3D = ({ players, onPlayerUpdate, currentRound, timeRemaining, is
 				/* @__PURE__ */ jsx(MobileControlsOverlay, {
 					onMove: handleMobileMove,
 					onAttack: handleMobileAttack,
-					onBlock: handleMobileBlock
+					onBlock: handleMobileBlock,
+					bottom: getMobileControlsBottom(height)
 				}),
 				/* @__PURE__ */ jsx(StanceWheelPure, {
 					currentStance: currentStanceIndex,