TheHeckinBuild™

.github/workflows/apt-deps.txt

@@ -1 +1 @@
-libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev nlohmann-json3-dev libtinyxml2-dev libspdlog-dev ninja-build libogg-dev libopus-dev opus-tools libopusfile-dev libvorbis-dev libespeak-ng-dev
+libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev nlohmann-json3-dev libtinyxml2-dev libspdlog-dev ninja-build libogg-dev libopus-dev opus-tools libopusfile-dev libvorbis-dev libespeak-ng-dev libwebsocketpp-dev

.github/workflows/generate-builds.yml

@@ -74,81 +74,7 @@ jobs:
         path: soh.o2r
         retention-days: 3
 
-  build-macos:
-    needs: generate-soh-otr
-    runs-on: macos-14
-    steps:
-    - name: Git Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-    - name: Configure ccache
-      uses: hendrikmuhs/ccache-action@v1.2
-      with:
-        create-symlink: true
-        save: ${{ github.ref_name == github.event.repository.default_branch }}
-        key: ${{ runner.os }}-14-ccache-${{ github.ref }}-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-14-ccache-${{ github.ref }}
-          ${{ runner.os }}-14-ccache
-    # Needed to apply sudo for macports cache restore
-    - name: Install gtar wrapper
-      run: |
-        sudo mv /opt/homebrew/bin/gtar /opt/homebrew/bin/gtar.orig
-        sudo cp .github/workflows/gtar /opt/homebrew/bin/gtar
-        sudo chmod +x /opt/homebrew/bin/gtar
-    - name: Restore Cached MacPorts
-      id: restore-cache-macports
-      uses: actions/cache/restore@v4
-      with:
-        key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}-
-          ${{ runner.os }}-14-macports-
-        path: /opt/local/
-    # Updated PATH applies to the next step and onwards
-    - name: Install MacPorts (if necessary)
-      run: |
-        if command -v /opt/local/bin/port 2>&1 >/dev/null; then
-          echo "MacPorts already installed"
-        else
-          echo "Installing MacPorts"
-          wget https://github.com/macports/macports-base/releases/download/v2.11.5/MacPorts-2.11.5-14-Sonoma.pkg
-          sudo installer -pkg ./MacPorts-2.11.5-14-Sonoma.pkg -target /
-        fi
-        echo "/opt/local/bin:/opt/local/sbin" >> "$GITHUB_PATH"
-    - name: Install dependencies
-      run: |
-        brew uninstall --ignore-dependencies libpng
-        sudo port install $(cat .github/workflows/macports-deps.txt)
-        brew install ninja
-    - name: Download soh.o2r
-      uses: actions/download-artifact@v4
-      with:
-        name: soh.o2r
-        path: build-cmake/soh
-    - name: Build SoH
-      run: |
-        export PATH="/usr/lib/ccache:/opt/homebrew/opt/ccache/libexec:/usr/local/opt/ccache/libexec:$PATH"
-        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DBUILD_REMOTE_CONTROL=1
-        cmake --build build-cmake --config Release --parallel 10
-        (cd build-cmake && cpack)
-
-        mv _packages/*.dmg SoH.dmg
-        mv README.md readme.txt
-    - name: Upload build
-      uses: actions/upload-artifact@v4
-      with:
-        name: soh-mac
-        path: |
-          SoH.dmg
-          readme.txt
-    - name: Save Cache MacPorts
-      if: ${{ github.ref_name == github.event.repository.default_branch }}
-      uses: actions/cache/save@v4
-      with:
-        key: ${{ steps.restore-cache-macports.outputs.cache-primary-key }}
-        path: /opt/local/
+  # macOS job removed
 
   build-linux:
     needs: generate-soh-otr
@@ -233,6 +159,23 @@ jobs:
         make
         sudo make install
         sudo cp -av /usr/local/lib/libzip* /lib/x86_64-linux-gnu/
+    - name: Install valijson
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        if [ ! -d "deps/valijson-1.0.6" ]; then
+          wget https://github.com/tristanpenman/valijson/archive/refs/tags/v1.0.6.tar.gz
+          tar -xzf v1.0.6.tar.gz -C deps
+        fi
+        cd deps/valijson-1.0.6
+        mkdir -p build
+        cd build
+        cmake ..
+        sudo cmake --install .
+    - name: Patch websocketpp
+      run: |
+        sudo sed -i 's/endpoint<connection,config>(/endpoint(/g' /usr/include/websocketpp/endpoint.hpp
+        sudo sed -i 's/basic<concurrency,names>(/basic(/g' /usr/include/websocketpp/logger/basic.hpp
+        sudo sed -i 's/server<config>(/server(/g' /usr/include/websocketpp/roles/server_endpoint.hpp
     - name: Download soh.o2r
       uses: actions/download-artifact@v4
       with:
@@ -250,13 +193,21 @@ jobs:
       env:
         CC: gcc-12
         CXX: g++-12
+
+    # NEW: include oot_soh.apworld in Linux artifact
+    - name: Add oot_soh.apworld to Linux artifact
+      run: |
+        mkdir -p Archipelago/custom_worlds
+        cp archipelago/oot_soh.apworld Archipelago/custom_worlds/oot_soh.apworld
+
     - name: Upload build
       uses: actions/upload-artifact@v4
       with:
         name: soh-linux
         path: |
           soh.appimage
           readme.txt
+          Archipelago
     - name: Save Cache deps folder
       if: ${{ github.ref_name == github.event.repository.default_branch }}
       uses: actions/cache/save@v4
@@ -316,6 +267,13 @@ jobs:
         mv _packages/*.zip _packages/soh-windows.zip
     - name: Unzip package
       run: Expand-Archive -Path _packages/soh-windows.zip -DestinationPath soh-windows
+
+    # NEW: include oot_soh.apworld in Windows artifact
+    - name: Add oot_soh.apworld to Windows artifact
+      run: |
+        New-Item -ItemType Directory -Force -Path "soh-windows/Archipelago/custom_worlds" | Out-Null
+        Copy-Item "archipelago/oot_soh.apworld" "soh-windows/Archipelago/custom_worlds/oot_soh.apworld" -Force
+
     - name: Upload build
       uses: actions/upload-artifact@v4
       with:

.github/workflows/macports-deps.txt

@@ -1 +1 @@
-libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal libogg +universal libopus +universal opusfile +universal libvorbis +universal
+libsdl2 +universal libsdl2_net +universal libpng +universal glew +universal libzip +universal nlohmann-json +universal tinyxml2 +universal libogg +universal libopus +universal opusfile +universal libvorbis +universal openssl +universal websocketpp +universal

.gitmodules

@@ -7,3 +7,9 @@
 [submodule "OTRExporter"]
 	path = OTRExporter
 	url = https://github.com/harbourmasters/OTRExporter
+[submodule "subprojects/wswrap"]
+	path = subprojects/wswrap
+	url = https://github.com/black-sliver/wswrap.git
+[submodule "subprojects/apclientpp"]
+	path = subprojects/apclientpp
+	url = https://github.com/black-sliver/apclientpp.git

CMakeLists.txt

@@ -38,7 +38,7 @@ math(EXPR PATCH_INDEX "${PROJECT_VERSION_PATCH}")
 # Use the patch number to select the correct word
 list(GET NATO_PHONETIC_ALPHABET ${PATCH_INDEX} PROJECT_PATCH_WORD)
 
-set(PROJECT_BUILD_NAME "Copper ${PROJECT_PATCH_WORD}" CACHE STRING "" FORCE)
+set(PROJECT_BUILD_NAME "TheHeckinBuild" CACHE STRING "" FORCE)
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "" FORCE)
 
 execute_process(
@@ -86,7 +86,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(VCPKG_TARGET_TRIPLET x64-windows-static)
 
     vcpkg_bootstrap()
-    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3 nlohmann-json tinyxml2 spdlog libogg libvorbis opus opusfile)
+    vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3 nlohmann-json tinyxml2 spdlog libogg libvorbis opus opusfile openssl valijson)
     if (CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache|sccache")
         set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded)
     endif()

RogueLike.md

@@ -0,0 +1,38 @@
+# Game Design Document
+The gist of this idea is you play through the game similar to a randomizer, fulfilling the objectives to reach and beat Ganon, but instead of getting items from checks, they are granted with a leveling/reward system. Among other things like buffs and debuffs.
+
+## Starting out UX
+When beginning a game, you will have multiple randomly rolled selections to make, including a starting location, starting item, starting song
+
+## Gameplay
+As you progress through the game, you will be rewarded XP for doing various actions throughout the world. When you have enough XP you will level up and you will be presented with a selection of buffs, items, or other rewards to choose from to enhance your character for the rest of the run. Actions include interacting with things, breaking things, killing enemies, talking with NPCs and completing their quests, etc. 
+
+TODO:
+- Health upgrades not implemented
+- Defense doesn't do anything yet (maybe damage mitigation?)
+- Speed doesn't do anything yet (will effect movement speed of bunny hood)
+- Quests system in early stages, only two quests currently
+- Don't have a global enemy spawning mechanism yet, just relying on existing enemy spawn points
+- Not all checks have been replaced with XP rewards yet
+- Not sure what to do about ammo yet
+- Not sure what to do about shops yet
+- Weighted list of XP amounts to grant for every check and enemy. For instance you shouldn't get that much XP for opening chests in Mido's house, but doing frog song minigame is huge etc
+
+## Difficulty Scaling
+The main thing that will scale is enemy health & damage to link. Difficulty increases in levels, it will increase each time you kill a major boss, and there will also be a timer that eventually increases your difficulty based on time spent not gaining any experience.
+
+TODO:
+- Damage to link scaling not implemented yet
+- Defeating bosses to increase difficulty not implemented yet
+- Hyper enemies / enemy size scaling could play into this?
+
+## Permanent progression
+As you continue playing, the idea is you would very slowly gain a currency to grant you very small bonuses that will benefit you in every following run. Starting health is an example of a potential purchase-able thing, or starting with ocarina or bunny hood. It's likely that this currency would be earned from killing bosses and completing quests
+
+TODO:
+- Permanent progression system not implemented yet
+
+## Ideas:
+- Lock the player in certain areas to spawn specified waves of enemies before the player can proceed? i.e Hyrule Field or places without a Clear Room
+- Utilize the trick from MM to hide/unhide Inventory Items based on what is earned?
+- Ammo could have a timed regen based on upgrades? For instance you can only hold 1 stick, and if you break it, it regens after 5 minutes, unless you get an upgrade to hold 2 sticks, then it regens after 4 minutes, etc

soh/CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.26.0 FATAL_ERROR)
+include(FetchContent)
 
 set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
 
@@ -282,30 +283,123 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	endif()
 	set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR})
 endif()
+
+include(FetchContent)
+
 ################################################################################
-# Find/download Dr Libs (For custom audio)
+# apclientpp + dependencies
 ################################################################################
-include(FetchContent)
+add_compile_definitions(ASIO_STANDALONE)
+
+if(BUILD_REMOTE_CONTROL)
+    if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+        FetchContent_Declare(
+            valijson
+            GIT_REPOSITORY https://github.com/tristanpenman/valijson.git
+            GIT_TAG v1.0.6
+        )
+        FetchContent_MakeAvailable(valijson)
+        target_include_directories(${PROJECT_NAME} PRIVATE ${valijson_SOURCE_DIR}/include)
+    else()
+        find_package(valijson REQUIRED)
+    endif()
+
+    FetchContent_Declare(
+            asio
+            GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
+            GIT_TAG asio-1-30-2
+    )
+    FetchContent_MakeAvailable(asio)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${asio_SOURCE_DIR}/asio/include)
+
+    # websocketpp has been temporarily removed from vcpkg, see
+    # https://github.com/microsoft/vcpkg/pull/42678#issuecomment-2914451436
+    if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+        FetchContent_Declare(
+            websocketpp
+            GIT_REPOSITORY https://github.com/zaphoyd/websocketpp.git
+            GIT_TAG 0.8.2
+        )
+        FetchContent_Populate(websocketpp)
+        target_include_directories(${PROJECT_NAME} PRIVATE ${websocketpp_SOURCE_DIR})
+    else()
+        find_package(websocketpp REQUIRED)
+    endif()
+
+    FetchContent_Declare(
+            wswrap
+            GIT_REPOSITORY https://github.com/black-sliver/wswrap.git
+            GIT_TAG 47438193ec50427ee28aadf294ba57baefd9f3f1
+    )
+    FetchContent_MakeAvailable(wswrap)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${wswrap_SOURCE_DIR}/include)
+
+    FetchContent_Declare(
+            apclientpp
+            GIT_REPOSITORY https://github.com/black-sliver/apclientpp.git
+            GIT_TAG 65638b7479f6894eda172e603cffa79762c0ddc1
+    )
+    FetchContent_MakeAvailable(apclientpp)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${apclientpp_SOURCE_DIR})
+endif()
 
+# Find/download Dr Libs (For custom audio)
+################################################################################
 FetchContent_Declare(
         dr_libs
         GIT_REPOSITORY https://github.com/mackron/dr_libs.git
         GIT_TAG da35f9d6c7374a95353fd1df1d394d44ab66cf01
 )
 FetchContent_MakeAvailable(dr_libs)
 
+################################################################################
+# Compile definitions
+################################################################################
 find_package(SDL2)
 set(SDL2-INCLUDE ${SDL2_INCLUDE_DIRS})
 
 if (BUILD_REMOTE_CONTROL)
     find_package(SDL2_net)
 
     if(NOT SDL2_net_FOUND)
-        message(STATUS "SDL2_net not found (it's possible the version installed is too old). Disabling BUILD_REMOTE_CONTROL.")
+        # todo: make archi optional so this can build with BUILD_REMOTE_CONTROL off
+        message(FATAL_ERROR "SDL2_net not found (it's possible the version installed is too old).")
         set(BUILD_REMOTE_CONTROL 0)
     else()
         set(SDL2-NET-INCLUDE ${SDL_NET_INCLUDE_DIRS})
     endif()
+
+    set(OPENSSL_USE_STATIC_LIBS ON)
+
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        file(STRINGS /etc/os-release distro REGEX "^NAME=")
+        string(REGEX REPLACE "NAME=\"(.*)\"" "\\1" distro "${distro}")
+
+        if(${distro} MATCHES "Fedora Linux")
+            set(OPENSSL_USE_STATIC_LIBS OFF)
+        endif()
+    endif()
+
+    find_package(OpenSSL)
+    if(NOT OPENSSL_FOUND)
+        # todo: make archi optional so this can build with BUILD_REMOTE_CONTROL off
+        message(FATAL_ERROR "OpenSSL not found (it's possible the version installed is too old).")
+        set(BUILD_REMOTE_CONTROL 0)
+    endif()
+
+    FetchContent_Declare(
+        sslCertStore
+        URL https://curl.se/ca/cacert.pem
+        DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/networking
+        DOWNLOAD_NO_EXTRACT TRUE
+    )
+
+    FetchContent_MakeAvailable(
+        sslCertStore
+    )
+
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/networking/cacert.pem DESTINATION ./networking COMPONENT ship)
+
 endif()
 
 if (ESPEAK)
@@ -410,6 +504,7 @@ endif()
 # Compile and link options
 ################################################################################
 if(MSVC)
+    target_compile_options(${PROJECT_NAME} PUBLIC "/Zc:__cplusplus")
     if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
         target_compile_options(${PROJECT_NAME} PRIVATE
             $<$<CONFIG:Debug>:
@@ -643,6 +738,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 			"SDL2::SDL2;"
 			"SDL2::SDL2main;"
             "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net-static>"
+            "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:OpenSSL::SSL>"
+            "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:OpenSSL::Crypto>"
 			"glfw;"
 			"winmm;"
 			"imm32;"
@@ -710,6 +807,8 @@ else()
 		"Opus::opus"
 		"Opusfile::Opusfile"
         "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:SDL2_net::SDL2_net>"
+        "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:OpenSSL::SSL>"
+        "$<$<BOOL:${BUILD_REMOTE_CONTROL}>:OpenSSL::Crypto>"
 		${CMAKE_DL_LIBS}
 		Threads::Threads
 	)

soh/assets/custom/objects/custom_snowball/mat_snowball_snow

@@ -0,0 +1,16 @@
+<DisplayList Version="0">
+	<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1"  />
+	<PipeSync/>
+	<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
+	<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TT_NONE="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
+	<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
+	<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
+	<SetPrimColor M="0" L="0" R="255" G="255" B="255" A="255"/>
+	<SetTextureImage Path="objects/custom_snowball/LightNoise.rgba32" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_32b_LOAD_BLOCK" Width="1"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_32b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="0" ShiftS="0" MaskT="0" ShiftT="0"/>
+	<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="128"/>
+	<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_32b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
+	<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
+	<EndDisplayList/>
+</DisplayList>
+