Merge branch 'HarbourMasters:develop' into photosensitive

PurpleHato · Nov 23, 2023 · d9471ec · d9471ec
2 parents 3321356 + c3ae829
commit d9471ec
Show file tree

Hide file tree

Showing 897 changed files with 25,338 additions and 16,935 deletions.
diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml
@@ -281,13 +281,20 @@ jobs:
       with:
         submodules: true
     - name: ccache
-      uses: dcvz/ccache-action@27b9f33213c0079872f064f6b6ba0233dfa16ba2
+      uses: hendrikmuhs/ccache-action@v1.2
       with:
         key: ${{ runner.os }}-ccache
-    - uses: ilammy/msvc-dev-cmd@v1
+    - name: vcpkg
+      uses: johnwason/vcpkg-action@v5
+      with:
+        pkgs: zlib bzip2 libpng sdl2 sdl2-net glew glfw3
+        token: ${{ github.token }}
+        triplet: 'x64-windows-static'
+    - name: Configure Developer Command Prompt
+      uses: ilammy/msvc-dev-cmd@v1
     - name: Build SoH
       env: 
-        VCPKG_ROOT: D:/a/vcpkg
+        VCPKG_ROOT: ${{github.workspace}}/vcpkg
       run: |
         set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
         cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache

diff --git a/CMake/Packaging-2.cmake b/CMake/Packaging-2.cmake
@@ -24,7 +24,6 @@ if (CPACK_GENERATOR MATCHES "Bundle")
     set(CPACK_BUNDLE_NAME "soh")
     set(CPACK_BUNDLE_PLIST "macosx/Info.plist")
     set(CPACK_BUNDLE_ICON "macosx/soh.icns")
-    set(CPACK_BUNDLE_STARTUP_COMMAND "../soh/macosx/soh-macos.sh")
+    set(CPACK_BUNDLE_STARTUP_COMMAND "macosx/soh-macos.sh")
     set(CPACK_BUNDLE_APPLE_CERT_APP "-")
 endif()
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(Ship VERSION 7.1.1 LANGUAGES C CXX)
-set(PROJECT_BUILD_NAME "Sulu Bravo" CACHE STRING "")
+project(Ship VERSION 8.0.2 LANGUAGES C CXX)
+set(PROJECT_BUILD_NAME "MacReady Charlie" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
@@ -97,7 +97,7 @@ set_property(TARGET soh PROPERTY APPIMAGE_DESKTOP_FILE "${CMAKE_SOURCE_DIR}/scri
 set_property(TARGET soh PROPERTY APPIMAGE_ICON_FILE "${CMAKE_BINARY_DIR}/sohIcon.png")
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-install(PROGRAMS "${CMAKE_SOURCE_DIR}/scripts/linux/appimage/soh.sh" DESTINATION . COMPONENT appimage)
+install(PROGRAMS "${CMAKE_BINARY_DIR}/linux/soh.sh" DESTINATION . COMPONENT appimage)
 install(FILES "${CMAKE_SOURCE_DIR}/soh.otr" DESTINATION . COMPONENT ship)
 install(TARGETS ZAPD DESTINATION ./assets/extractor COMPONENT extractor)
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/soh/assets/extractor/" DESTINATION ./assets/extractor COMPONENT extractor)
@@ -124,7 +124,7 @@ add_custom_target(
     ExtractAssets
     # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
     COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f oot.otr oot-mq.otr soh.otr
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root ../soh/assets/xml --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Running asset extraction..."
@@ -135,7 +135,7 @@ add_custom_target(
 # Target to generate headers
 add_custom_target(
     ExtractAssetHeaders
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --gen-headers
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root ../soh/assets/xml --gen-headers
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Generating asset headers..."
     DEPENDS ZAPD
@@ -146,7 +146,7 @@ add_custom_target(
     GenerateSohOtr
     # CMake versions prior to 3.17 do not have the rm command, use remove instead for older versions
     COMMAND ${CMAKE_COMMAND} -E $<IF:$<VERSION_LESS:${CMAKE_VERSION},3.17>,remove,rm> -f soh.otr
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.otr "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
     COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -DONLYSOHOTR=On -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter
     COMMENT "Generating soh.otr..."
@@ -219,4 +219,4 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif()
 
 set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_SOURCE_DIR}/CMake/Packaging-2.cmake)
-include(CMake/Packaging.cmake)
+include(CMake/Packaging.cmake)
diff --git a/OTRExporter b/OTRExporter
diff --git a/ZAPDTR b/ZAPDTR
diff --git a/libultraship b/libultraship
diff --git a/scripts/linux/appimage/soh.sh → scripts/linux/appimage/soh.sh.in b/scripts/linux/appimage/soh.sh → scripts/linux/appimage/soh.sh.in
@@ -26,7 +26,6 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
                 ln -s "$HERE"/usr/bin/{assets,soh.elf,ZAPD} "$ASSETDIR"
                 export OLDPWD="$PWD"
                 mkdir -p "$ASSETDIR"/tmp
-                mkdir -p "$ASSETDIR"/Extract
                 ln -s "$romfile" "$ASSETDIR"/tmp/rom.z64
                 cd "$ASSETDIR"
                 ROMHASH=$(sha1sum -b "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }')
@@ -166,14 +165,13 @@ while [[ (! -e "$SHIP_HOME"/oot.otr) || (! -e "$SHIP_HOME"/oot-mq.otr) ]]; do
                     continue;;
                 esac
                 if [[ ! -e "$SHIP_HOME"/"$OTRNAME" ]]; then
-                    cp -r "$ASSETDIR"/assets/game "$ASSETDIR"/Extract/assets
                     if [ -n "$ZENITY" ]; then
                         (echo "# 25%"; echo "25"; sleep 2; echo "# 50%"; echo "50"; sleep 3; echo "# 75%"; echo "75"; sleep 2; echo "# 100%"; echo "100"; sleep 3) |
                         zenity --progress --title="OTR Generating..." --timeout=10 --percentage=0 --icon-name=soh --window-icon=soh.png --height=80 --width=400 &
                     else
                         echo "Processing..."
                     fi
-                    assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" > /dev/null 2>&1
+                    assets/extractor/ZAPD.out ed -eh -i assets/extractor/xmls/"${ROM}" -b tmp/rom.z64 -fl assets/extractor/filelists -o placeholder -osf placeholder -gsf 1 -rconf assets/extractor/Config_"${ROM}".xml -se OTR --otrfile "${OTRNAME}" --portVer "@CMAKE_PROJECT_VERSION@" > /dev/null 2>&1
                     cp "$ASSETDIR"/"$OTRNAME" "$SHIP_HOME"
                 fi
             else

diff --git a/soh/CMakeLists.txt b/soh/CMakeLists.txt
@@ -757,11 +757,16 @@ INSTALL(FILES $<TARGET_PDB_FILE:soh> DESTINATION ./debug COMPONENT ship)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION . COMPONENT ship)
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/linux/appimage/soh.sh.in ${CMAKE_BINARY_DIR}/linux/soh.sh @ONLY)
+endif()
+
 find_program(CURL NAMES curl DOC "Path to the curl program.  Used to download files.")
 execute_process(COMMAND ${CURL} -sSfL https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt -o ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt OUTPUT_VARIABLE RESULT)
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/macosx/Info.plist.in ${CMAKE_BINARY_DIR}/macosx/Info.plist @ONLY)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/macosx/soh-macos.sh.in ${CMAKE_BINARY_DIR}/macosx/soh-macos.sh @ONLY)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/gamecontrollerdb.txt DESTINATION ../MacOS COMPONENT ship)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/soh/soh.otr DESTINATION ../Resources COMPONENT ship)
 elseif(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "NintendoSwitch|CafeOS")

diff --git a/soh/assets/custom/accessibility/texts/filechoose_eng.json b/soh/assets/custom/accessibility/texts/filechoose_eng.json
@@ -0,0 +1,29 @@
+{
+    "file1": "File 1",
+    "file2": "File 2",
+    "file3": "File 3",
+    "options": "Options",
+    "copy": "Copy",
+    "erase": "Erase",
+    "quit": "Quit",
+    "confirm": "Yes",
+    "end": "End",
+    "hyphen": "Hyphen",
+    "period": "Period",
+    "space": "Space",
+    "backspace": "Backspace",
+    "capital_letter": "Capital $0",
+    "audio_stereo": "Sound - Stereo",
+    "audio_mono": "Sound - Mono",
+    "audio_headset": "Sound - Headset",
+    "audio_surround": "Sound - Surround",
+    "target_switch": "Targeting Mode - Switch",
+    "target_hold": "Targeting Mode - Hold",
+    "language_english": "Language - English",
+    "language_german": "Language - German",
+    "language_french": "Language - French",
+    "quest_sel_vanilla": "Quest - Original",
+    "quest_sel_mq": "Quest - Master Quest",
+    "quest_sel_randomizer": "Quest - Randomizer",
+    "quest_sel_boss_rush": "Quest - Boss Rush"
+}
diff --git a/soh/assets/custom/accessibility/texts/filechoose_fra.json b/soh/assets/custom/accessibility/texts/filechoose_fra.json
@@ -0,0 +1,29 @@
+{
+    "file1": "Fichier 1",
+    "file2": "Fichier 2",
+    "file3": "Fichier 3",
+    "options": "Options",
+    "copy": "Copier",
+    "erase": "Effacer",
+    "quit": "Retour",
+    "confirm": "Oui",
+    "end": "Fin",
+    "hyphen": "Trait d'union",
+    "period": "Point",
+    "space": "Espace",
+    "backspace": "Retour arrière",
+    "capital_letter": "Majuscule $0",
+    "audio_stereo": "Son - Stéréo",
+    "audio_mono": "Son - Mono",
+    "audio_headset": "Son - Casque",
+    "audio_surround": "Son - Surround",
+    "target_switch": "Visée - Fixe",
+    "target_hold": "Visée - Maintenue",
+    "language_english": "Langue - Anglaise",
+    "language_german": "Langue - Allemande",
+    "language_french": "Langue - Français",
+    "quest_sel_vanilla": "Quête - Originale",
+    "quest_sel_mq": "Quête - Master Quest",
+    "quest_sel_randomizer": "Quête - Randomizer",
+    "quest_sel_boss_rush": "Quête - Boss Rush"
+}
diff --git a/soh/assets/custom/accessibility/texts/filechoose_ger.json b/soh/assets/custom/accessibility/texts/filechoose_ger.json
@@ -0,0 +1,29 @@
+{
+    "file1": "Datei 1",
+    "file2": "Datei 2",
+    "file3": "Datei 3",
+    "options": "Optionen",
+    "copy": "Kopieren",
+    "erase": "Löschen",
+    "quit": "Zurück",
+    "confirm": "Ja",
+    "end": "Ende",
+    "hyphen": "Bindestrich",
+    "period": "Punkt",
+    "space": "Raum",
+    "backspace": "Rücktaste",
+    "capital_letter": "Großbuchstabe $0",
+    "audio_stereo": "Sound - Stereo",
+    "audio_mono": "Sound - Mono",
+    "audio_headset": "Sound - Kopfhörer",
+    "audio_surround": "Sound - Surround",
+    "target_switch": "Zielerfassung - Einmal drücken",
+    "target_hold": "Zielerfassung - Trigger halten",
+    "language_english": "Sprache - Englisch",
+    "language_german": "Sprache - Deutsch",
+    "language_french": "Sprache - Französisch",
+    "quest_sel_vanilla": "Quest - Original",
+    "quest_sel_mq": "Quest - Master Quest",
+    "quest_sel_randomizer": "Quest - Randomizer",
+    "quest_sel_boss_rush": "Quest - Bosse Rush"
+}
+1 −1		ZAPD/Globals.h
+19 −17		ZAPD/Main.cpp
+10 −2		ZAPD/ZResource.cpp