more bugfixes

This commit is contained in:
ad044 2021-03-11 10:41:53 -08:00
parent 371c6a893f
commit 062d230df7
7 changed files with 49 additions and 20137 deletions

4
.gitignore vendored
View file

@ -22,9 +22,11 @@ npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
src/static/media_images src/static/sprites/*
src/static/media_images/*
src/static/media/* src/static/media/*
src/static/voice/* src/static/voice/*
src/static/sfx/*
scripts/extract/discs scripts/extract/discs
scripts/extract/*.log scripts/extract/*.log

20144
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -60,7 +60,12 @@ const MediaPlayer = () => {
return ( return (
<> <>
<video id="media" ref={videoRef}> <video id="media" ref={videoRef}>
<track id={"track"} ref={trackRef} kind="captions" default /> <track
id={"track"}
ref={trackRef}
kind="metadata"
default
/>
</video> </video>
<div id={"subtitle-container"}> <div id={"subtitle-container"}>
<p ref={subtitleRef} id={"subtitle"} /> <p ref={subtitleRef} id={"subtitle"} />

View file

@ -555,7 +555,15 @@ export const upgradeSskn = (calculatedState: { activeNode: NodeData }) => ({
inputCooldown: -1, inputCooldown: -1,
}, },
}, },
{ mutation: { currentScene: "main" }, delay: 6000 }, {
mutation: {
currentScene: "main",
ssknLoading: false,
activeSsknComponent: "ok",
inputCooldown: -1,
},
delay: 6000,
},
], ],
effects: [ effects: [
incrementSsknLvl, incrementSsknLvl,

View file

@ -153,17 +153,6 @@ const handleMainSceneInput = (
case "DOWN": { case "DOWN": {
const direction = keyPress.toLowerCase(); const direction = keyPress.toLowerCase();
const upperLimit = activeSite === "a" ? 22 : 13;
if (
(activeNode.matrixIndices?.rowIdx === 0 &&
direction === "up" &&
level === upperLimit) ||
(activeNode.matrixIndices?.rowIdx === 2 &&
direction === "down" &&
level === 1)
)
return resetInputCooldown;
const nodeData = findNode( const nodeData = findNode(
activeNode, activeNode,
direction, direction,
@ -173,7 +162,7 @@ const handleMainSceneInput = (
true true
); );
if (!nodeData) return; if (!nodeData) return resetInputCooldown;
const lainMoveAnimation = `jump_${direction}`; const lainMoveAnimation = `jump_${direction}`;
const newLevel = (direction === "up" ? level + 1 : level - 1) const newLevel = (direction === "up" ? level + 1 : level - 1)
@ -311,7 +300,7 @@ const handleMainSceneInput = (
case "change": case "change":
if ( if (
activePauseComponent === "change" && activePauseComponent === "change" &&
gameProgress.gate_level < 4 gameProgress.gate_level > 4
) )
return showPermissionDenied; return showPermissionDenied;
else return displayPrompt; else return displayPrompt;

View file

@ -203,6 +203,8 @@ export const findNode = (
down: [nextPos_down, ([, c]: [number, number]) => nextPos_down([-1, c])], down: [nextPos_down, ([, c]: [number, number]) => nextPos_down([-1, c])],
}; };
const upperLevelLimit = activeSite === "a" ? 22 : 13;
if (startingPoint.matrixIndices) { if (startingPoint.matrixIndices) {
const nextPos = funcs[direction]; const nextPos = funcs[direction];
@ -211,6 +213,8 @@ export const findNode = (
const initialMatrixIdx = matrixIdx; const initialMatrixIdx = matrixIdx;
for (let i = 0; i < (shouldSearchNext ? 2 : 1); i++) { for (let i = 0; i < (shouldSearchNext ? 2 : 1); i++) {
if (level === upperLevelLimit + 1 || level === 0) return;
const nodes = getVisibleNodesMatrix( const nodes = getVisibleNodesMatrix(
matrixIdx, matrixIdx,
level, level,

View file

@ -12,7 +12,7 @@ const IdleMediaScene = () => {
const setInputCooldown = useStore((state) => state.setInputCooldown); const setInputCooldown = useStore((state) => state.setInputCooldown);
useEffect(() => { useEffect(() => {
setInputCooldown(0); setTimeout(() => setInputCooldown(0), 1500);
}, [setInputCooldown]); }, [setInputCooldown]);
useEffect(() => { useEffect(() => {