From d8a7a6c76498bdd03cda2d91050b9b0147b5f67c Mon Sep 17 00:00:00 2001 From: inspectredc <78732756+inspectredc@users.noreply.github.com> Date: Thu, 16 Nov 2023 01:38:21 +0000 Subject: [PATCH 1/3] Use Correct Player Boot Enums in CC (#3403) --- soh/soh/Enhancements/crowd-control/CrowdControl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soh/soh/Enhancements/crowd-control/CrowdControl.cpp b/soh/soh/Enhancements/crowd-control/CrowdControl.cpp index a9f3b1f19..d2e8e03b1 100644 --- a/soh/soh/Enhancements/crowd-control/CrowdControl.cpp +++ b/soh/soh/Enhancements/crowd-control/CrowdControl.cpp @@ -380,13 +380,13 @@ CrowdControl::Effect* CrowdControl::ParseMessage(char payload[512]) { effect->category = kEffectCatBoots; effect->timeRemaining = 30000; effect->giEffect = new GameInteractionEffect::ForceEquipBoots(); - effect->giEffect->parameters[0] = PLAYER_BOOTS_IRON; + effect->giEffect->parameters[0] = EQUIP_VALUE_BOOTS_IRON; break; case kEffectForceHoverBoots: effect->category = kEffectCatBoots; effect->timeRemaining = 30000; effect->giEffect = new GameInteractionEffect::ForceEquipBoots(); - effect->giEffect->parameters[0] = PLAYER_BOOTS_HOVER; + effect->giEffect->parameters[0] = EQUIP_VALUE_BOOTS_HOVER; break; case kEffectSlipperyFloor: effect->category = kEffectCatSlipperyFloor; From 3234256b030f482911fef79731438aedd3e03b0c Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Wed, 15 Nov 2023 22:45:09 -0500 Subject: [PATCH 2/3] bump lus (#3405) --- libultraship | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libultraship b/libultraship index 9509806ae..f717dd265 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 9509806ae3ca6e35882fb976de70c5bde471b8f5 +Subproject commit f717dd265aff2eff359de26915d8ad4e498ffdaf From 0ddb0711ad1b46e434e1587003f1c749b9a222e7 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Wed, 15 Nov 2023 23:22:09 -0500 Subject: [PATCH 3/3] Version bump to MacReady Charlie (#3406) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fccae7f36..53b6b0ac3 100644 --- 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 8.0.1 LANGUAGES C CXX) -set(PROJECT_BUILD_NAME "MacReady 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)