Merge branch 'develop' of https://github.com/sheepytina/Shipwright into develop

sheepytina · sheepytina · commit 07f19aa90627 · 2023-08-19T13:59:55.000+10:00
diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml
@@ -47,10 +47,7 @@ jobs:
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
         cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
-        cmake --build build-cmake --config Release --target ZAPD
-        mkdir Extract
-        cp -r OTRExporter/assets/ ./Extract/assets
-        ./build-cmake/ZAPD/ZAPD.out botr -se OTR --norom
+        cmake --build build-cmake --config Release --target GenerateSohOtr
     - uses: actions/upload-artifact@v3
       with:
         name: soh.otr
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -132,6 +132,18 @@ add_custom_target(
     DEPENDS ZAPD
 )
 
+# Target to generate only soh.otr
+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 ${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..."
+    DEPENDS ZAPD
+)
+
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     find_package(ImageMagick COMPONENTS convert)
     if (ImageMagick_FOUND)
diff --git a/OTRExporter/extract_assets.py b/OTRExporter/extract_assets.py
@@ -33,16 +33,40 @@ def BuildOTR(xmlPath, rom, zapd_exe=None, genHeaders=None):
         print("Aborting...", file=os.sys.stderr)
         print("\n")
 
+def BuildSohOtr(zapd_exe=None):
+    shutil.copytree("assets", "Extract/assets")
+
+    if not zapd_exe:
+        zapd_exe = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPDTR/ZAPD.out"
+
+    exec_cmd = [zapd_exe, "botr", "-se", "OTR", "--norom"]
+
+    print(exec_cmd)
+    exitValue = subprocess.call(exec_cmd)
+    if exitValue != 0:
+        print("\n")
+        print("Error when building soh.otr file...", file=os.sys.stderr)
+        print("Aborting...", file=os.sys.stderr)
+        print("\n")
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument("-z", "--zapd", help="Path to ZAPD executable", dest="zapd_exe", type=str)
     parser.add_argument("rom", help="Path to the rom", type=str, nargs="?")
     parser.add_argument("--non-interactive", help="Runs the script non-interactively for use in build scripts.", dest="non_interactive", action="store_true")
     parser.add_argument("-v", "--verbose", help="Display rom's header checksums and their corresponding xml folder", dest="verbose", action="store_true")
     parser.add_argument("--gen-headers", help="Generate source headers to be checked in", dest="gen_headers", action="store_true")
+    parser.add_argument("--norom", help="Generate only soh.otr to be bundled to the game", dest="norom", action="store_true")
 
     args = parser.parse_args()
 
+    if args.norom:
+        if (os.path.exists("Extract")):
+            shutil.rmtree("Extract")
+            
+        BuildSohOtr(args.zapd_exe)
+        return
+
     roms = [ Z64Rom(args.rom) ] if args.rom else rom_chooser.chooseROM(args.verbose, args.non_interactive)
     for rom in roms:
         if (os.path.exists("Extract")):
diff --git a/copy-existing-otrs.cmake b/copy-existing-otrs.cmake
@@ -1,11 +1,11 @@
 message(STATUS "Copying otr files...")
 
-if(EXISTS ${SOURCE_DIR}/OTRExporter/oot.otr)
+if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot.otr)
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${SOURCE_DIR})
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${BINARY_DIR}/soh/)
     message(STATUS "Copied oot.otr")
 endif()
-if(EXISTS ${SOURCE_DIR}/OTRExporter/oot-mq.otr)
+if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot-mq.otr)
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.otr ${SOURCE_DIR})
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.otr ${BINARY_DIR}/soh/)
     message(STATUS "Copied oot-mq.otr")
@@ -18,18 +18,18 @@ endif()
 
 # Additionally for Windows, copy the otrs to the target dir, side by side with soh.exe
 if(SYSTEM_NAME MATCHES "Windows")
-    if(EXISTS ${SOURCE_DIR}/OTRExporter/oot.otr)
+    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot.otr)
         execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot.otr ${TARGET_DIR})
     endif()
-    if(EXISTS ${SOURCE_DIR}/OTRExporter/oot-mq.otr)
+    if(NOT ONLYSOHOTR AND EXISTS ${SOURCE_DIR}/OTRExporter/oot-mq.otr)
         execute_process(COMMAND ${CMAKE_COMMAND} -E copy oot-mq.otr ${TARGET_DIR})
     endif()
     if(EXISTS ${SOURCE_DIR}/OTRExporter/soh.otr)
         execute_process(COMMAND ${CMAKE_COMMAND} -E copy soh.otr ${TARGET_DIR})
     endif()
 endif()
 
-if(NOT EXISTS ${SOURCE_DIR}/oot.otr AND NOT EXISTS ${SOURCE_DIR}/oot-mq.otr)
+if(NOT ONLYSOHOTR AND (NOT EXISTS ${SOURCE_DIR}/oot.otr AND NOT EXISTS ${SOURCE_DIR}/oot-mq.otr))
     message(FATAL_ERROR "Failed to copy. No OTR files found.")
 endif()
 if(NOT EXISTS ${SOURCE_DIR}/soh.otr)
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
@@ -414,6 +414,17 @@ void SaveManager::InitMeta(int fileNum) {
     }
     fileMetaInfo[fileNum].healthCapacity = gSaveContext.healthCapacity;
     fileMetaInfo[fileNum].questItems = gSaveContext.inventory.questItems;
+    for (int i = 0; i < ARRAY_COUNT(fileMetaInfo[fileNum].inventoryItems); i++) {
+        fileMetaInfo[fileNum].inventoryItems[i] = gSaveContext.inventory.items[i];
+    }
+    fileMetaInfo[fileNum].equipment = gSaveContext.inventory.equipment;
+    fileMetaInfo[fileNum].upgrades = gSaveContext.inventory.upgrades;
+    fileMetaInfo[fileNum].isMagicAcquired = gSaveContext.isMagicAcquired;
+    fileMetaInfo[fileNum].isDoubleMagicAcquired = gSaveContext.isDoubleMagicAcquired;
+    fileMetaInfo[fileNum].rupees = gSaveContext.rupees;
+    fileMetaInfo[fileNum].gsTokens = gSaveContext.inventory.gsTokens;
+    fileMetaInfo[fileNum].isDoubleDefenseAcquired = gSaveContext.isDoubleDefenseAcquired;
+    fileMetaInfo[fileNum].gregFound = Flags_GetRandomizerInf(RAND_INF_GREG_FOUND);
     fileMetaInfo[fileNum].defense = gSaveContext.inventory.defenseHearts;
     fileMetaInfo[fileNum].health = gSaveContext.health;
 
diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
@@ -19,6 +19,16 @@ typedef struct {
     s16 buildVersionMajor;
     s16 buildVersionMinor;
     s16 buildVersionPatch;
+
+    u8 inventoryItems[24];
+    u16 equipment;
+    u32 upgrades;
+    u8 isMagicAcquired;
+    u8 isDoubleMagicAcquired;
+    s16 rupees;
+    s16 gsTokens;
+    u8 isDoubleDefenseAcquired;
+    u8 gregFound;
 } SaveFileMetaInfo;
 
 #ifdef __cplusplus
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
@@ -975,6 +975,8 @@ void DrawEnhancementsMenu() {
                                 "This might affect other decal effects\n");
             UIWidgets::PaddedEnhancementSliderInt("Text Spacing: %d", "##TEXTSPACING", "gTextSpacing", 4, 6, "", 6, true, true, true);
             UIWidgets::Tooltip("Space between text characters (useful for HD font textures)");
+            UIWidgets::PaddedEnhancementCheckbox("More info in file select", "gFileSelectMoreInfo", true, false);
+            UIWidgets::Tooltip("Shows what items you have collected in the file select screen, like in N64 randomizer");
             ImGui::EndMenu();
         }
 
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c

Original file line number	Diff line number	Diff line change
`@@ -975,6 +975,8 @@ void DrawEnhancementsMenu() {`
`975`	`975`	`"This might affect other decal effects\n");`
`976`	`976`	`UIWidgets::PaddedEnhancementSliderInt("Text Spacing: %d", "##TEXTSPACING", "gTextSpacing", 4, 6, "", 6, true, true, true);`
`977`	`977`	`UIWidgets::Tooltip("Space between text characters (useful for HD font textures)");`
	`978`	`+ UIWidgets::PaddedEnhancementCheckbox("More info in file select", "gFileSelectMoreInfo", true, false);`
	`979`	`+ UIWidgets::Tooltip("Shows what items you have collected in the file select screen, like in N64 randomizer");`
`978`	`980`	`ImGui::EndMenu();`
`979`	`981`	`}`
`980`	`982`