Merge branch 'get-item-rework' into get-item-rework-rando-next

CMakeLists.txt

@@ -31,15 +31,15 @@ endif()
 # Set target arch type if empty. Visual studio solution generator provides it.
 ################################################################################
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-	if(NOT CMAKE_VS_PLATFORM_NAME)
+    if(NOT CMAKE_VS_PLATFORM_NAME)
-		set(CMAKE_VS_PLATFORM_NAME "x64")
+        set(CMAKE_VS_PLATFORM_NAME "x64")
-	endif()
+    endif()
-	message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
+    message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
 
-	if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
+    if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"
-		OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))
+        OR "${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32"))
-		message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
+        message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
-	endif()
+    endif()
 endif()
 
 ################################################################################
@@ -57,7 +57,7 @@ set(CMAKE_OBJCXX_FLAGS_RELEASE "-O2 -DNDEBUG")
 endif()
 
 if(NOT CMAKE_BUILD_TYPE )
-	set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build." FORCE)
+    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build." FORCE)
 endif()
 
 ################################################################################
@@ -131,7 +131,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_SOURCE_DIR}/scripts/linux/appimage/soh.sh" DESTINATION . COMPONENT appimage)
 endif()
 
 find_package(Python3 COMPONENTS Interpreter)
@@ -177,14 +177,32 @@ add_custom_target(CreateOSXIcons
     COMMENT "Creating OSX icons ..."
     )
 add_dependencies(soh CreateOSXIcons)
+
+add_custom_target(Assets ALL
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/OTRGui/assets/extractor" -Ddst_dir="${CMAKE_BINARY_DIR}/assets/extractor" -P "${CMAKE_SOURCE_DIR}/OTRGui/Overwrite.cmake"
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/OTRExporter/assets" -Ddst_dir="${CMAKE_BINARY_DIR}/assets/game" -P "${CMAKE_SOURCE_DIR}/OTRGui/Overwrite.cmake"
+    COMMAND ${CMAKE_COMMAND} -Dsrc_dir="${CMAKE_SOURCE_DIR}/soh/assets/xml" -Ddst_dir="${CMAKE_BINARY_DIR}/assets/extractor/xmls" -P "${CMAKE_SOURCE_DIR}/OTRGui/Overwrite.cmake"
+    )
+add_dependencies(soh Assets)
+
+install(TARGETS ZAPD DESTINATION ${CMAKE_BINARY_DIR}/assets/extractor)
+
+set(PROGRAM_PERMISSIONS_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+
+install(DIRECTORY ${CMAKE_BINARY_DIR}/assets
+        DESTINATION .
+        PATTERN ZAPD.out
+        PERMISSIONS ${PROGRAM_PERMISSIONS_EXECUTE}
+        )
+
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Windows|NintendoSwitch|CafeOS")
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION . COMPONENT ship RENAME readme.txt )
+install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION . COMPONENT ship RENAME readme.txt )
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	set(CPACK_GENERATOR "External")
+    set(CPACK_GENERATOR "External")
 elseif(CMAKE_SYSTEM_NAME MATCHES "Windows|NintendoSwitch|CafeOS")
     set(CPACK_GENERATOR "ZIP")
 elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")

Jenkinsfile

@@ -23,7 +23,7 @@ pipeline {
                     ])
                     sh '''
                         cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
-                        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
+                        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
                         cmake --build build-cmake --target ExtractAssets --config Release
                     '''
                     stash includes: 'soh/assets/**/*', name: 'assets'

libultraship/libultraship/ControlDeck.cpp

@@ -73,12 +73,7 @@ namespace Ship {
     }
 
 	void ControlDeck::WriteToPad(OSContPad* pad) const {
-
-	#ifdef __SWITCH__
-		bool shouldBlockGameInput = CVar_GetS32("gOpenMenuBar", 0);
-	#else
 		bool shouldBlockGameInput = CVar_GetS32("gOpenMenuBar", 0) && CVar_GetS32("gControlNav", 0);
-	#endif
 
 		for (size_t i = 0; i < virtualDevices.size(); i++) {
 			const std::shared_ptr<Controller> backend = physicalDevices[virtualDevices[i]];

libultraship/libultraship/ImGuiImpl.cpp

@@ -484,12 +484,7 @@ namespace SohImGui {
             io->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
         }
 
-    #ifdef __SWITCH__
+        if (CVar_GetS32("gControlNav", 0) && CVar_GetS32("gOpenMenuBar", 0)) {
-        bool enableControllerNavigation = true;
-    #else
-        bool enableControllerNavigation = CVar_GetS32("gControlNav", 0);
-    #endif
-        if (enableControllerNavigation && CVar_GetS32("gOpenMenuBar", 0)) {
             io->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad | ImGuiConfigFlags_NavEnableKeyboard;
         } else {
             io->ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad;
@@ -921,19 +916,15 @@ namespace SohImGui {
 
         ImGui::DockSpace(dockId, ImVec2(0.0f, 0.0f), ImGuiDockNodeFlags_None | ImGuiDockNodeFlags_NoDockingInCentralNode);
 
-        if (ImGui::IsKeyPressed(TOGGLE_BTN) || ImGui::IsKeyPressed(TOGGLE_PAD_BTN)) {
+        if (ImGui::IsKeyPressed(TOGGLE_BTN) ||
+           (ImGui::IsKeyPressed(TOGGLE_PAD_BTN) && CVar_GetS32("gControlNav", 0))) {
             bool menu_bar = CVar_GetS32("gOpenMenuBar", 0);
             CVar_SetS32("gOpenMenuBar", !menu_bar);
             needs_save = true;
             GlobalCtx2::GetInstance()->GetWindow()->SetMenuBar(menu_bar);
             ShowCursor(menu_bar, Dialogues::dMenubar);
             GlobalCtx2::GetInstance()->GetWindow()->GetControlDeck()->SaveControllerSettings();
-        #ifdef __SWITCH__
+            if (CVar_GetS32("gControlNav", 0) && CVar_GetS32("gOpenMenuBar", 0)) {
-            bool enableControllerNavigation = true;
-        #else
-            bool enableControllerNavigation = CVar_GetS32("gControlNav", 0);
-        #endif
-            if (enableControllerNavigation && CVar_GetS32("gOpenMenuBar", 0)) {
                 io->ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad | ImGuiConfigFlags_NavEnableKeyboard;
             } else {
                 io->ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad;

libultraship/libultraship/WiiUController.cpp

@@ -406,6 +406,14 @@ namespace Ship {
             x *= scale;
             y *= scale;
         }
+
+        if (isRightStick) {
+            getRightStickX(virtualSlot) = x;
+            getRightStickY(virtualSlot) = y;
+        } else {
+            getLeftStickX(virtualSlot) = x;
+            getLeftStickY(virtualSlot) = y;
+        }
     }
 
     void WiiUController::CreateDefaultBinding(int32_t virtualSlot) {

libultraship/libultraship/WiiUGamepad.cpp

@@ -279,6 +279,14 @@ namespace Ship {
             x *= scale;
             y *= scale;
         }
+
+        if (isRightStick) {
+            getRightStickX(virtualSlot) = x;
+            getRightStickY(virtualSlot) = y;
+        } else {
+            getLeftStickX(virtualSlot) = x;
+            getLeftStickY(virtualSlot) = y;
+        }
     }
 
     void WiiUGamepad::CreateDefaultBinding(int32_t virtualSlot) {

soh/macosx/soh-macos.sh

@@ -1,8 +1,69 @@
-#!/bin/sh
+#!/bin/bash
-BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/.*//'`"
-RESOURCES="$BUNDLE/Contents/Resources"
 
-export DYLD_FRAMEWORK_PATH=$RESOURCES/Frameworks
+SNAME="$(dirname $0)"
-export DYLD_LIBRARY_PATH=$RESOURCES/bin
+export DATA_SHARE="$HOME/Library/Application Support/com.shipofharkinian.soh"
+export SNAME
+export RESPATH="${SNAME%/MacOS*}/Resources"
+export LIBPATH="${SNAME%/MacOS*}/Frameworks"
+export DYLD_FALLBACK_LIBRARY_PATH="$LIBPATH"
 
-exec "$RESOURCES/soh-macos"
+while [ ! -e "$DATA_SHARE/oot.otr" ]; do
+	ASSETDIR="$(mktemp -d /tmp/assets-XXXXX)"
+	export ASSETDIR
+	cp -r "$RESPATH/assets" "$ASSETDIR"
+	mkdir -p "$ASSETDIR"/tmp
+	mkdir -p "$ASSETDIR"/Extract/assets
+	DROPROM="$(osascript -ss - "$ASSETDIR" <<-EOF
+	set romFile to choose file of type {"b64","n64","v64","z64"} with prompt "Please select your ROM:"
+	set destinationFolder to POSIX file "$ASSETDIR"
+	tell application "Finder"
+	duplicate romFile to destinationFolder
+	end tell
+	EOF
+	)"
+	"$DROPROM"
+	for rom in "$ASSETDIR"/*.*64
+	do
+		if [ ! -e "$rom" ]; then
+			echo "no ROM"
+			osascript -e 'display dialog "Select ROM to generate OTR" giving up after 5'
+			rm -r "$ASSETDIR"
+			exit
+		fi 
+	done
+	cp "$ASSETDIR"/*.*64 "$ASSETDIR"/tmp/rom.z64
+	cp -r "$ASSETDIR"/assets/game/ship_of_harkinian "$ASSETDIR"/Extract/assets/
+	cd "$ASSETDIR" || return
+	ROMHASH="$(shasum "$ASSETDIR"/tmp/rom.z64 | awk '{ print $1 }')" 
+	case "$ROMHASH" in
+	cee6bc3c2a634b41728f2af8da54d9bf8cc14099)
+		export ROM=GC_NMQ_D;;
+	0227d7c0074f2d0ac935631990da8ec5914597b4)
+		export ROM=GC_NMQ_PAL_F;;
+	*)
+		WRONGHASH="$(osascript -ss - "$ROMHASH" <<-EOF
+		display dialog "Incompatible ROM hash $ROMHASH" \
+		with title "Incompatible ROM hash" \
+		with icon caution \
+		giving up after 5
+		EOF
+		)"
+		"$WRONGHASH"
+		rm -r "$ASSETDIR"
+		exit;;
+	esac
+	echo "$ROM"
+
+	osascript -e 'display notification "Processing OTR..." with title "SOH: Generating OTR"'
+	assets/extractor/ZAPD.out ed -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
+	if [ -e "$PWD"/oot.otr ]; then
+		osascript -e 'display notification "OTR Successfully Generated" with title "SOH: Generating OTR"'
+		if [ ! -e "$DATA_SHARE" ]; then	mkdir "$DATA_SHARE"; fi
+			cp "$ASSETDIR"/oot.otr "$DATA_SHARE"
+			rm -r "$ASSETDIR"
+		fi
+		break
+done
+
+"$RESPATH"/soh-macos
+exit

soh/soh/Enhancements/bootcommands.c

@@ -25,6 +25,9 @@ void BootCommands_Init()
     CVar_RegisterS32("gDebugEnabled", 0);
     CVar_RegisterS32("gLanguages", 0); //0 = English / 1 = German / 2 = French
     CVar_RegisterS32("gHudColors", 1); //0 = N64 / 1 = NGC / 2 = Custom
+#ifdef __SWITCH__
+    CVar_RegisterS32("gControlNav", 1); // always enable controller nav on switch
+#endif
 }
 
 //void BootCommands_ParseBootArgs(char* str)

soh/src/overlays/actors/ovl_En_Box/z_en_box.c

@@ -481,8 +481,12 @@ void EnBox_WaitOpen(EnBox* this, GlobalContext* globalCtx) {
             }
             // Chests need to have a negative getItemId in order to not immediately give their item
             // when approaching.
-            sItem.getItemId = 0 - sItem.getItemId;
+            if (gSaveContext.n64ddFlag) {
-            GiveItemEntryFromActorWithFixedRange(&this->dyna.actor, globalCtx, sItem);
+                sItem.getItemId = 0 - sItem.getItemId;
+                GiveItemEntryFromActorWithFixedRange(&this->dyna.actor, globalCtx, sItem);
+            } else {
+                func_8002F554(&this->dyna.actor, globalCtx, -(this->dyna.actor.params >> 5 & 0x7F));
+            }
         }
         if (Flags_GetTreasure(globalCtx, this->dyna.actor.params & 0x1F)) {
             EnBox_SetupAction(this, EnBox_Open);
@@ -594,7 +598,7 @@ void EnBox_Update(Actor* thisx, GlobalContext* globalCtx) {
     }
 
     if (((!gSaveContext.n64ddFlag && ((this->dyna.actor.params >> 5 & 0x7F) == 0x7C)) ||
-         (gSaveContext.n64ddFlag && sItem.getItemId == RG_ICE_TRAP)) && 
+         (gSaveContext.n64ddFlag && ABS(sItem.getItemId) == RG_ICE_TRAP)) && 
         this->actionFunc == EnBox_Open && this->skelanime.curFrame > 45 &&
         this->iceSmokeTimer < 100) EnBox_SpawnIceSmoke(this, globalCtx);
 }

soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c

@@ -323,13 +323,9 @@ void func_80ABF708(EnOkarinaTag* this, GlobalContext* globalCtx) {
 }
 
 void GivePlayerRandoRewardSunSong(EnOkarinaTag* song, GlobalContext* globalCtx, RandomizerCheck check) {
-    if (song->actor.parent != NULL && song->actor.parent->id == GET_PLAYER(globalCtx)->actor.id &&
+    Flags_SetTreasure(globalCtx, 0x1F);
-        !Flags_GetTreasure(globalCtx, 0x1F)) {
+    GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, GI_LETTER_ZELDA);
-        Flags_SetTreasure(globalCtx, 0x1F);
+    GiveItemEntryFromActor(&song->actor, globalCtx, getItemEntry, 10000.0f, 100.0f);
-    } else if (!Flags_GetTreasure(globalCtx, 0x1F)) {
-        GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(check, GI_LETTER_ZELDA);
-        GiveItemEntryFromActor(&song->actor, globalCtx, getItemEntry, 10000.0f, 100.0f);
-    }
 }
 
 void func_80ABF7CC(EnOkarinaTag* this, GlobalContext* globalCtx) {