From d4f39d911403d80048a788c9c4c0f3a6e560983d Mon Sep 17 00:00:00 2001 From: ad044 Date: Sat, 10 Oct 2020 02:10:54 +0400 Subject: [PATCH] added more hud positions, 5 left. --- src/components/InputHandler.tsx | 12 +- src/resources/blue_orb_directions.json | 43 +++++ src/resources/blue_orb_huds.json | 248 +++++-------------------- 3 files changed, 98 insertions(+), 205 deletions(-) diff --git a/src/components/InputHandler.tsx b/src/components/InputHandler.tsx index badb8ca..e8d1e0b 100644 --- a/src/components/InputHandler.tsx +++ b/src/components/InputHandler.tsx @@ -406,7 +406,7 @@ const InputHandler = () => { ] ); - const moveAndChangeSpriteFocus = useCallback( + const moveAndChangeBlueOrbFocus = useCallback( ( targetBlueOrbId: string, targetBlueOrbHudData: BlueOrbHudData, @@ -457,7 +457,7 @@ const InputHandler = () => { ] ); - const changeSpriteFocus = useCallback( + const changeBlueOrbFocus = useCallback( ( targetBlueOrbId: string, targetBlueOrbHudData: BlueOrbHudData, @@ -513,7 +513,7 @@ const InputHandler = () => { site_a[targetBlueOrbIdFiltered as keyof typeof site_a].green_text; if (targetBlueOrbIdUnfiltered[0] === "+") { - moveAndChangeSpriteFocus( + moveAndChangeBlueOrbFocus( targetBlueOrbIdFiltered, targetBlueOrbHudData, targetBlueOrbGreenText, @@ -521,7 +521,7 @@ const InputHandler = () => { targetBlueOrbHudId ); } else { - changeSpriteFocus( + changeBlueOrbFocus( targetBlueOrbIdFiltered, targetBlueOrbHudData, targetBlueOrbGreenText, @@ -534,8 +534,8 @@ const InputHandler = () => { lainMoving, spriteUpdateCooldown, currentBlueOrb, - moveAndChangeSpriteFocus, - changeSpriteFocus, + moveAndChangeBlueOrbFocus, + changeBlueOrbFocus, ] ); diff --git a/src/resources/blue_orb_directions.json b/src/resources/blue_orb_directions.json index 9794ea5..01aa73f 100644 --- a/src/resources/blue_orb_directions.json +++ b/src/resources/blue_orb_directions.json @@ -3,12 +3,55 @@ "id": "0414", "hud": "fg_hud_2" }, + "0422_right": { + "id": "0417", + "hud": "bg_hud_1" + }, "0422_up": { "id": "+0506", "hud": "fg_hud_3" }, + "0414_up": { "id": "0422", "hud": "fg_hud_1" + }, + "0414_right": { + "id": "0417", + "hud": "bg_hud_1" + }, + + "0413_down": { + "id": "0405", + "hud": "fg_hud_6" + }, + "0413_left": { + "id": "0417", + "hud": "bg_hud_1" + }, + + "0405_left": { + "id": "0417", + "hud": "bg_hud_1" + }, + "0405_up": { + "id": "0413", + "hud": "fg_hud_5" + }, + + + "0417_left": { + "id": "0422", + "hud": "fg_hud_1" + }, + "0417_down": { + "id": "0414", + "hud": "fg_hud_2" + }, + "0417_right": { + "id": "0413", + "hud": "fg_hud_5" } + + } diff --git a/src/resources/blue_orb_huds.json b/src/resources/blue_orb_huds.json index 1f1456e..814672d 100644 --- a/src/resources/blue_orb_huds.json +++ b/src/resources/blue_orb_huds.json @@ -49,56 +49,6 @@ "initial_position": [1.18, -0.13, -8.7] } }, - "fg3": { - "long": { - "position": [0.85, -0.09, -8.6], - "scale": [1, 0.03, 1], - "type": "mirrored", - "initial_position": [1.85, -0.09, -8.6] - }, - "boring": { - "position": [-0.11, -0.07, -8.6], - "scale": [1, 0.03, 1], - "type": "mirrored", - "initial_position": [-1.11, -0.07, -8.6] - }, - "big": { - "position": [-0.35, -0.12, -8.6], - "scale": [0.5, 0.06, 1], - "type": "mirrored", - "initial_position": [-1.35, -0.12, -8.6] - }, - "big_text": [0.45, -0.05, -8.7], - "medium_text": { - "position": [-0.65, -0.13, -8.7], - "initial_position": [-1.65, -0.13, -8.7] - } - }, - "05": { - "long": { - "position": [0.78, -0.32, -8.6], - "scale": [1, 0.03, 1], - "type": "mirrored", - "initial_position": [1.78, -0.3, -8.6] - }, - "boring": { - "position": [-0.11, -0.3, -8.6], - "scale": [1, 0.03, 1], - "type": "mirrored", - "initial_position": [-1.11, -0.3, -8.6] - }, - "big": { - "position": [-0.25, -0.28, -8.6], - "scale": [0.5, 0.06, 1], - "type": "mirrored", - "initial_position": [-1.25, -0.12, -8.6] - }, - "big_text": [0.45, -0.32, -8.7], - "medium_text": { - "position": [-0.55, -0.32, -8.7], - "initial_position": [-1.55, -0.32, -8.7] - } - }, "fg_hud_3": { "long": { "position": [-0.43, -0.32, -8.6], @@ -124,7 +74,32 @@ "initial_position": [1.12, -0.32, -8.7] } }, - "15": { + "fg_hud_4": { + "long": { + "position": [0.85, 0.18, -8.6], + "scale": [1, 0.03, 1], + "type": "mirrored", + "initial_position": [1.85, 0.18, -8.6] + }, + "boring": { + "position": [-0.11, 0.2, -8.6], + "scale": [1, 0.03, 1], + "type": "mirrored", + "initial_position": [-1.11, 0.2, -8.6] + }, + "big": { + "position": [-0.35, 0.155, -8.6], + "scale": [0.5, 0.06, 1], + "type": "mirrored", + "initial_position": [-1.35, 0.155, -8.6] + }, + "big_text": [0.45, 0.265, -8.7], + "medium_text": { + "position": [-0.65, 0.18, -8.7], + "initial_position": [-1.65, 0.18, -8.7] + } + }, + "fg_hud_5": { "long": { "position": [0.85, -0.09, -8.6], "scale": [1, 0.03, 1], @@ -143,185 +118,60 @@ "type": "mirrored", "initial_position": [-1.35, -0.12, -8.6] }, - "big_text": [], + "big_text": [0.45, -0.05, -8.7], "medium_text": { - "position": [], - "initial_position": [] + "position": [-0.65, -0.13, -8.7], + "initial_position": [-1.65, -0.13, -8.7] } }, - "08": { + "fg_hud_6": { "long": { - "position": [-0.45, -0.09, -8.6], - "scale": [1, 0.03, 1], - "type": "normal", - "initial_position": [-1.45, -0.09, -8.6] - }, - "boring": { - "position": [0.5, -0.07, -8.6], - "scale": [1, 0.03, 1], - "type": "normal", - "initial_position": [1.5, -0.07, -8.6] - }, - "big": { - "position": [0.35, -0.12, -8.6], - "scale": [0.5, 0.06, 1], - "type": "normal", - "initial_position": [1.35, -0.12, -8.6] - }, - "big_text": [], - "medium_text": { - "position": [], - "initial_position": [] - } - }, - "00": { - "long": { - "position": [-0.43, -0.32, -8.6], - "scale": [1, 0.03, 1], - "type": "normal", - "initial_position": [-1.43, -0.3, -8.6] - }, - "boring": { - "position": [0.51, -0.3, -8.6], - "scale": [1, 0.03, 1], - "type": "normal", - "initial_position": [1.51, -0.3, -8.6] - }, - "big": { - "position": [0.3, -0.28, -8.6], - "scale": [0.5, 0.06, 1], - "type": "normal", - "initial_position": [1.3, -0.12, -8.6] - }, - "big_text": [], - "medium_text": { - "position": [], - "initial_position": [] - } - }, - "17": { - "long": { - "position": [0.85, 0.15, -8.6], + "position": [0.78, -0.32, -8.6], "scale": [1, 0.03, 1], "type": "mirrored", - "initial_position": [1.85, 0.15, -8.6] + "initial_position": [1.78, -0.3, -8.6] }, "boring": { - "position": [-0.1, 0.174, -8.6], + "position": [-0.11, -0.3, -8.6], "scale": [1, 0.03, 1], "type": "mirrored", - "initial_position": [-1.1, 0.174, -8.6] + "initial_position": [-1.11, -0.3, -8.6] }, "big": { - "position": [-0.35, 0.13, -8.6], + "position": [-0.25, -0.28, -8.6], "scale": [0.5, 0.06, 1], "type": "mirrored", - "initial_position": [-1.35, 0.13, -8.6] + "initial_position": [-1.25, -0.12, -8.6] }, - "big_text": [], + "big_text": [0.45, -0.32, -8.7], "medium_text": { - "position": [], - "initial_position": [] + "position": [-0.55, -0.32, -8.7], + "initial_position": [-1.55, -0.32, -8.7] } }, - "10": { + "bg_hud_1": { "long": { - "position": [-0.45, -0.09, -8.6], + "position": [-0.3, 0.02, -8.6], "scale": [1, 0.03, 1], "type": "normal", - "initial_position": [-1.45, -0.09, -8.6] + "initial_position": [-1.3, 0.02, -8.6] }, "boring": { - "position": [0.5, -0.07, -8.6], + "position": [0.6, 0.038, -8.6], "scale": [1, 0.03, 1], "type": "normal", - "initial_position": [1.5, -0.07, -8.6] + "initial_position": [1.6, 0.038, -8.6] }, "big": { - "position": [0.35, -0.12, -8.6], + "position": [0.3, 0, -8.6], "scale": [0.5, 0.06, 1], "type": "normal", - "initial_position": [1.35, -0.12, -8.6] + "initial_position": [1.3, 0, -8.6] }, - "big_text": [], + "big_text": [-0.15, 0.08, -8.7], "medium_text": { - "position": [], - "initial_position": [] - } - }, - "20": { - "long": { - "position": [0.85, 0.15, -8.6], - "scale": [1, 0.03, 1], - "type": "mirrored", - "initial_position": [1.85, 0.15, -8.6] - }, - "boring": { - "position": [-0.1, 0.174, -8.6], - "scale": [1, 0.03, 1], - "type": "mirrored", - "initial_position": [-1.1, 0.174, -8.6] - }, - "big": { - "position": [-0.35, 0.13, -8.6], - "scale": [0.5, 0.06, 1], - "type": "mirrored", - "initial_position": [-1.35, 0.13, -8.6] - }, - "big_text": [], - "medium_text": { - "position": [], - "initial_position": [] - } - }, - "10": { - "long": { - "position": [-0.45, -0.09, -8.6], - "scale": [1, 0.03, 1], - "type": "normal", - "initial_position": [-1.45, -0.09, -8.6] - }, - "boring": { - "position": [0.5, -0.07, -8.6], - "scale": [1, 0.03, 1], - "type": "normal", - "initial_position": [1.5, -0.07, -8.6] - }, - "big": { - "position": [0.35, -0.12, -8.6], - "scale": [0.5, 0.06, 1], - "type": "normal", - "initial_position": [1.35, -0.12, -8.6] - }, - "big_text": [], - "medium_text": { - "position": [], - "initial_position": [] - } - }, - "20": { - "long": { - "position": [-0.45, 0.15, -8.6], - "scale": [1, 0.03, 1], - "type": "normal", - "initial_position": [-1.45, 0.15, -8.6] - }, - "boring": { - "position": [0.48, 0.174, -8.6], - "scale": [1, 0.03, 1], - "type": "normal", - "initial_position": [1.48, 0.174, -8.6] - }, - "big": { - "position": [0.36, 0.13, -8.6], - "scale": [0.5, 0.06, 1], - "type": "normal", - "initial_position": [1.36, 0.13, -8.6] - }, - "big_text": [], - "medium_text": { - "position": [], - "initial_position": [] + "position": [0.1, 0, -8.7], + "initial_position": [1.1, 0, -8.7] } } }