[Mod] Spicy Dampé

.github/workflows/generate-builds.yml

@@ -109,9 +109,9 @@ jobs:
  - name: Install latest SDL
  run: |
  export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
- wget https://www.libsdl.org/release/SDL2-2.24.1.tar.gz
- tar -xzf SDL2-2.24.1.tar.gz
- cd SDL2-2.24.1
+ wget https://www.libsdl.org/release/SDL2-2.26.1.tar.gz
+ tar -xzf SDL2-2.26.1.tar.gz
+ cd SDL2-2.26.1
  ./configure
  make -j 10
  sudo make install

CMakeLists.txt

@@ -7,8 +7,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" FORCE)
 
 project(Ship LANGUAGES C CXX
- VERSION 5.1.1)
-set(PROJECT_BUILD_NAME "BRADLEY BRAVO" CACHE STRING "")
+ VERSION 5.1.4)
+set(PROJECT_BUILD_NAME "BRADLEY ECHO" CACHE STRING "")
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
 
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

OTRExporter/extract_assets.py

@@ -32,17 +32,16 @@ def main():
  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")
 
  args = parser.parse_args()
 
- rom_paths = [ args.rom ] if args.rom else rom_chooser.chooseROM(args.non_interactive)
- for rom_path in rom_paths:
- rom = Z64Rom(rom_path)
-
+ 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")):
  shutil.rmtree("Extract")
 
- BuildOTR("../soh/assets/xml/" + rom.version.xml_ver + "/", rom_path, zapd_exe=args.zapd_exe)
+ BuildOTR("../soh/assets/xml/" + rom.version.xml_ver + "/", rom.file_path, zapd_exe=args.zapd_exe)
 
 if __name__ == "__main__":
  main()

OTRExporter/rom_chooser.py

@@ -2,12 +2,13 @@
 
 from rom_info import Z64Rom
 
-def chooseROM(non_interactive=False):
+def chooseROM(verbose=False, non_interactive=False):
  roms = []
 
  for file in glob.glob("*.z64"):
- if Z64Rom.isValidRom(file):
- roms.append(file)
+ rom = Z64Rom(file)
+ if rom.is_valid:
+ roms.append(rom)
 
  if not (roms):
  print("Error: No roms located, place one in the OTRExporter directory", file=os.sys.stderr)
@@ -21,23 +22,28 @@ def chooseROM(non_interactive=False):
  foundMq = False
  foundOot = False
  for rom in roms:
- isMq = Z64Rom.isMqRom(rom)
- if isMq and not foundMq:
+ if rom.isMq and not foundMq:
  romsToExtract.append(rom)
  foundMq = True
- elif not isMq and not foundOot:
+ elif not rom.isMq and not foundOot:
  romsToExtract.append(rom)
  foundOot = True
  return romsToExtract
 
- print(str(len(roms))+ " roms found, please select one by pressing 1-"+str(len(roms)))
+ print(f"{len(roms)} roms found, please select one by pressing 1-{len(roms)}")
+ print()
 
  for i in range(len(roms)):
- print(str(i+1)+ ". " + roms[i])
+ print(f"[{i+1:>2d}] {roms[i].file_path}")
+ if verbose:
+ print(f" Checksum: {roms[i].checksum.value}, Version XML: {roms[i].version.xml_ver}")
+ print()
 
  while(1):
  try:
  selection = int(input())
+ except KeyboardInterrupt:
+ sys.exit(1)
  except:
  print("Bad input. Try again with the number keys.")
  continue

ZAPDTR/ZAPD/ZFile.cpp

@@ -221,7 +221,7 @@ void ZFile::ParseXML(tinyxml2::XMLElement* reader, const std::string& filename)
  // Check for repeated attributes.
  if (offsetXml != nullptr)
  {
- rawDataIndex = strtol(StringHelper::Split(offsetXml, "0x")[1].c_str(), NULL, 16);
+ rawDataIndex = strtol(StringHelper::Split(std::string(offsetXml), "0x")[1].c_str(), NULL, 16);
 
  if (offsetSet.find(offsetXml) != offsetSet.end())
  {
@@ -831,7 +831,7 @@ void ZFile::GenerateSourceHeaderFiles()
  xmlPath = StringHelper::Replace(xmlPath, "\\", "/");
  auto pathList = StringHelper::Split(xmlPath, "/");
  std::string outPath = "";
- 
+
  for (int i = 0; i < 3; i++)
  outPath += pathList[i] + "/";
 
@@ -1192,7 +1192,7 @@ std::string ZFile::ProcessTextureIntersections([[maybe_unused]] const std::strin
 
  if (declarations.find(currentOffset) != declarations.end())
  declarations.at(currentOffset)->size = currentTex->GetRawDataSize();
- 
+
  currentTex->DeclareVar(GetName(), "");
  }
  else

soh/include/vt.h

@@ -32,4 +32,11 @@
 #define VT_RST VT_SGR("")
 #define VT_CLS VT_ED(2)
 
+#ifdef USE_BELL
+// ASCII BEL character, plays an alert tone
+#define BEL '\a'
+#else
+#define BEL '\0'
+#endif
+
 #endif

soh/macosx/Info.plist.in

@@ -29,6 +29,8 @@
  <string>@CMAKE_PROJECT_VERSION@</string>
  <key>NSHumanReadableCopyright</key>
  <string>Copyright 2022 HarbourMasters.</string>
+ <key>LSApplicationCategoryType</key>
+ <string>public.app-category.games</string>
  <key>LSMinimumSystemVersion</key>
  <string>10.15</string>
 </dict>

soh/soh/Enhancements/crowd-control/CrowdControl.cpp

@@ -101,7 +101,7 @@ void CrowdControl::Disable() {
 
 void CrowdControl::ListenToServer() {
  while (isEnabled) {
- while (!connected) {
+ while (!connected && isEnabled) {
  SPDLOG_TRACE("[CrowdControl] Attempting to make connection to server...");
  tcpsock = SDLNet_TCP_Open(&ip);
 
@@ -112,8 +112,10 @@ void CrowdControl::ListenToServer() {
  }
  }
 
- auto socketSet = SDLNet_AllocSocketSet(1);
- SDLNet_TCP_AddSocket(socketSet, tcpsock);
+ SDLNet_SocketSet socketSet = SDLNet_AllocSocketSet(1);
+ if (tcpsock) {
+ SDLNet_TCP_AddSocket(socketSet, tcpsock);
+ }
 
  // Listen to socket messages
  while (connected && tcpsock && isEnabled) {

soh/soh/Enhancements/debugger/debugSaveEditor.h

@@ -36,6 +36,7 @@ const std::vector<FlagTable> flagTables = {
  { 0x09, "Used Deku Tree Blue Warp" },
  { 0x0A, "Played Saria's Song for Mido as Adult" },
  { 0x0C, "Met Deku Tree" },
+ { 0x0F, "Spoke to Mido about Saria's whereabouts" },
  { 0x10, "Spoke to Child Malon at Castle or Market" },
  { 0x11, "Spoke to Ingo at Ranch before Talon returns" },
  { 0x12, "Obtained Pocket Egg" },
@@ -219,7 +220,7 @@ const std::vector<FlagTable> flagTables = {
  { 0x24, "Spoke to Kokiri Boy Cutting Grass" },
  { 0x26, "Spoke to Kokiri Girl on Shop Awning" },
  { 0x28, "Spoke to Kokiri Girl About Training Center" },
- { 0x31, "Spoke to Kokiri Boy on Bed in Mido's House" },
+ { 0x41, "Spoke to Kokiri Boy on Bed in Mido's House" },
  { 0x51, "Spoke to Kokiri Girl in Saria's House" },
  { 0x59, "Spoke to Know-It-All Bro. About Temple" },
  { 0x61, "Spoke to Know-It-All Bro. About Saria" },

soh/soh/Enhancements/enemyrandomizer.cpp

@@ -259,6 +259,10 @@ bool IsEnemyFoundToRandomize(int16_t sceneNum, int8_t roomNum, int16_t actorId,
  // Only randomize the initial deku scrub actor (single and triple attack), not the flower they spawn.
  case ACTOR_EN_DEKUNUTS:
  return (params == -256 || params == 768);
+ // Don't randomize the OoB wallmaster in the silver rupee room because it's only there to
+ // not trigger unlocking the door after killing the other wallmaster in authentic gameplay.
+ case ACTOR_EN_WALLMAS:
+ return (!(!isMQ && sceneNum == SCENE_MEN && roomNum == 2 && posX == -2345));
  // Only randomize initial floormaster actor (it can split and does some spawning on init).
  case ACTOR_EN_FLOORMAS:
  return (params == 0 || params == -32768);

soh/soh/Enhancements/item-tables/ItemTableManager.cpp

@@ -23,7 +23,10 @@ bool ItemTableManager::AddItemEntry(uint16_t tableID, uint16_t getItemID, GetIte
 GetItemEntry ItemTableManager::RetrieveItemEntry(uint16_t tableID, uint16_t itemID) {
  try {
  ItemTable* itemTable = RetrieveItemTable(tableID);
- return itemTable->at(itemID);
+ GetItemEntry getItemEntry = itemTable->at(itemID);
+ getItemEntry.drawItemId = getItemEntry.itemId;
+ getItemEntry.drawModIndex = getItemEntry.modIndex;
+ return getItemEntry;
  } catch (std::out_of_range& oor) { return GET_ITEM_NONE; }
 }
 

soh/soh/Enhancements/item-tables/ItemTableTypes.h

@@ -52,5 +52,7 @@ typedef struct GetItemEntry {
  /* 0x0C */ uint16_t collectable; // determines whether the item can be collected on the overworld. Will be true in most cases.
  /* 0x0E */ GetItemFrom getItemFrom;
  /* 0x0F */ GetItemCategory getItemCategory; // Primarily made and used for chest size/texture matches contents
+ /* 0x10 */ uint16_t drawItemId; // Will be a copy of itemId unless the item is an ice trap. Needed for particles to function on ice traps.
+ /* 0x11 */ uint16_t drawModIndex; // Will be a copy of modIndex unless the item is an ice trap. Needed for particles to function on ice traps.
  CustomDrawFunc drawFunc;
-};  // size = 0x0F
+}; // size = 0x11

soh/soh/Enhancements/presets.cpp

@@ -55,9 +55,8 @@ void DrawPresetSelector(PresetType presetTypeId) {
 
  ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(6.0f, 4.0f));
  if (ImGui::Button(("Apply Preset##" + presetTypeCvar).c_str())) {
- if (selectedPresetId == 0) {
- clearCvars(presetTypeDef.cvarsToClear);
- } else {
+ clearCvars(presetTypeDef.cvarsToClear);
+ if (selectedPresetId != 0) {
  applyPreset(selectedPresetDef.entries);
  }
  SohImGui::RequestCvarSaveOnNextTick();

soh/soh/Enhancements/presets.h

@@ -350,7 +350,7 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
  // Text Speed (1 to 5)
  PRESET_ENTRY_S32("gTextSpeed", 5),
  // King Zora Speed (1 to 5)
- PRESET_ENTRY_S32("gMweepSpeed", 2),
+ PRESET_ENTRY_S32("gMweepSpeed", 5),
  // Faster Block Push (+0 to +5)
  PRESET_ENTRY_S32("gFasterBlockPush", 5),
  // Better Owl
@@ -394,8 +394,6 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
  PRESET_ENTRY_S32("gBombchusOOB", 1),
  // Skip save confirmation
  PRESET_ENTRY_S32("gSkipSaveConfirmation", 1),
- // King Zora Speed (1 to 5)
- PRESET_ENTRY_S32("gMweepSpeed", 5),
  // Biggoron Forge Time (0 to 3)
  PRESET_ENTRY_S32("gForgeTime", 0),
  // Vine/Ladder Climb speed (+0 to +12)
@@ -467,7 +465,7 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
  // Text Speed (1 to 5)
  PRESET_ENTRY_S32("gTextSpeed", 5),
  // King Zora Speed (1 to 5)
- PRESET_ENTRY_S32("gMweepSpeed", 2),
+ PRESET_ENTRY_S32("gMweepSpeed", 5),
  // Faster Block Push (+0 to +5)
  PRESET_ENTRY_S32("gFasterBlockPush", 5),
  // Better Owl
@@ -480,9 +478,6 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
  // Inject Item Counts in messages
  PRESET_ENTRY_S32("gInjectItemCounts", 1),
 
- // Pause link animation (0 to 16)
- PRESET_ENTRY_S32("gPauseLiveLink", 1),
-
  // Dynamic Wallet Icon
  PRESET_ENTRY_S32("gDynamicWalletIcon", 1),
  // Always show dungeon entrances
@@ -511,8 +506,6 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
  PRESET_ENTRY_S32("gBombchusOOB", 1),
  // Skip save confirmation
  PRESET_ENTRY_S32("gSkipSaveConfirmation", 1),
- // King Zora Speed (1 to 5)
- PRESET_ENTRY_S32("gMweepSpeed", 5),
  // Biggoron Forge Time (0 to 3)
  PRESET_ENTRY_S32("gForgeTime", 0),
  // Vine/Ladder Climb speed (+0 to +12)

soh/soh/Enhancements/randomizer/3drando/fill.cpp

@@ -295,8 +295,8 @@ std::vector<uint32_t> GetAccessibleLocations(const std::vector<uint32_t>& allowe
  if (mode == SearchMode::GeneratePlaythrough && exit.IsShuffled() && !exit.IsAddedToPool() && !noRandomEntrances) {
  entranceSphere.push_back(&exit);
  exit.AddToPool();
- // Don't list a coupled entrance from both directions
- if (exit.GetReplacement()->GetReverse() != nullptr && !Settings::DecoupleEntrances) {
+ // Don't list a two-way coupled entrance from both directions
+ if (exit.GetReverse() != nullptr && exit.GetReplacement()->GetReverse() != nullptr && !Settings::DecoupleEntrances) {
  exit.GetReplacement()->GetReverse()->AddToPool();
  }
  }

soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp

@@ -418,6 +418,10 @@ void HintTable_Init_Exclude_Overworld() {
  Text{"a #carpet guru# sells", /*french*/"#un marchand du désert# vend", /*spanish*/"el #genio de una alfombra# vende"},
  });
 
+ hintTable[GC_MEDIGORON] = HintText::Exclude({
+ //obscure text
+ Text{"#Medigoron# sells", /*french*/"#Medigoron# vend", /*spanish*/"#Medigoron# vende"},
+ });
 
  hintTable[KAK_IMPAS_HOUSE_FREESTANDING_POH] = HintText::Exclude({
  //obscure text

soh/soh/Enhancements/randomizer/3drando/item_list.cpp

@@ -286,6 +286,11 @@ Item& ItemFromGIID(const int giid) {
  }
  index++;
  }
+
+ // there are vanilla items that don't exist in the item table we're reading from here
+ // if we made it this far, it means we didn't find an item in the table
+ // if we don't return anything, the game will crash, so, as a workaround, return greg
+ return itemTable[GREEN_RUPEE];
 }
 
 //This function should only be used to place items containing hint text