Merge branch 'develop' into aManchipelago

2025-07-04 13:22:17 +02:00
parent 4aacc1bc0c 237dcfec74
commit 1b9e03b92f
88 changed files with 1202 additions and 1177 deletions
--- a/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json
+++ b/soh/assets/custom/accessibility/texts/kaleidoscope_eng.json
@@ -2,6 +2,7 @@
    "health": "Health - $0 Hearts",
    "magic": "Magic - $0",
    "rupees": "Rupees - $0",
+    "keys": "Keys - $0",
    "floor": "Floor $0",
    "basement": "Basement $0",
    "item_menu": "Select Item",
--- a/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json
+++ b/soh/assets/custom/accessibility/texts/kaleidoscope_fra.json
@@ -2,6 +2,7 @@
    "health": "Vie - $0 Coeurs",
    "magic": "Magie - $0",
    "rupees": "Rubis - $0",
+    "keys": "Clés - $0",
    "floor": "Étage $0",
    "basement": "Sous-sol $0",
    "item_menu": "Inventaire",
--- a/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json
+++ b/soh/assets/custom/accessibility/texts/kaleidoscope_ger.json
@@ -2,6 +2,7 @@
    "health": "Energie - $0 Herzen",
    "magic": "Magie - $0",
    "rupees": "Rubine - $0",
+    "keys": "Schlüssel - $0",
    "floor": "Etage $0",
    "basement": "Keller $0",
    "item_menu": "Gegenstände",
--- a/soh/assets/custom/presets/Main
+++ b/soh/assets/custom/presets/Main
@@ -44,6 +44,9 @@
                "SkipText": 1,
                "TextSpeed": 5,
                "TimeFlowFileSelect": 1,
+                "TimeSavers": {
+                    "SkipJabuJabuFish": 1
+                },
                "TwoHandedIdle": 1,
                "VisualAgony": 1,
                "WidescreenActorCulling": 1
--- a/soh/assets/custom/presets/Main
+++ b/soh/assets/custom/presets/Main
@@ -116,6 +116,7 @@
                        "Story": 1
                    },
                    "SkipForcedDialog": 3,
+                    "SkipJabuJabuFish": 1,
                    "SkipMiscInteractions": 1,
                    "SkipOwlInteractions": 1,
                    "SkipTowerEscape": 1,