Skip to content

Allow toggling whether or not special house is ally to all players #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Metadorius merged 1 commit into from
Aug 11, 2025
Merged

Allow toggling whether or not special house is ally to all players #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions src/Spawner/Spawner.Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,24 @@ void SpawnerConfig::LoadFromINIFile(CCINIClass* pINI)
return;

{ // Game Mode Options
MPModeIndex = pINI->ReadInteger(pSettingsSection, "GameMode", MPModeIndex);
Bases = pINI->ReadBool(pSettingsSection, "Bases", Bases);
Credits = pINI->ReadInteger(pSettingsSection, "Credits", Credits);
BridgeDestroy = pINI->ReadBool(pSettingsSection, "BridgeDestroy", BridgeDestroy);
Crates = pINI->ReadBool(pSettingsSection, "Crates", Crates);
ShortGame = pINI->ReadBool(pSettingsSection, "ShortGame", ShortGame);
SuperWeapons = pINI->ReadBool(pSettingsSection, "Superweapons", SuperWeapons);
BuildOffAlly = pINI->ReadBool(pSettingsSection, "BuildOffAlly", BuildOffAlly);
GameSpeed = pINI->ReadInteger(pSettingsSection, "GameSpeed", GameSpeed);
MultiEngineer = pINI->ReadBool(pSettingsSection, "MultiEngineer", MultiEngineer);
UnitCount = pINI->ReadInteger(pSettingsSection, "UnitCount", UnitCount);
AIPlayers = pINI->ReadInteger(pSettingsSection, "AIPlayers", AIPlayers);
AIDifficulty = pINI->ReadInteger(pSettingsSection, "AIDifficulty", AIDifficulty);
AlliesAllowed = pINI->ReadBool(pSettingsSection, "AlliesAllowed", AlliesAllowed);
HarvesterTruce = pINI->ReadBool(pSettingsSection, "HarvesterTruce", HarvesterTruce);
FogOfWar = pINI->ReadBool(pSettingsSection, "FogOfWar", FogOfWar);
MCVRedeploy = pINI->ReadBool(pSettingsSection, "MCVRedeploy", MCVRedeploy);
MPModeIndex = pINI->ReadInteger(pSettingsSection, "GameMode", MPModeIndex);
Bases = pINI->ReadBool(pSettingsSection, "Bases", Bases);
Credits = pINI->ReadInteger(pSettingsSection, "Credits", Credits);
BridgeDestroy = pINI->ReadBool(pSettingsSection, "BridgeDestroy", BridgeDestroy);
Crates = pINI->ReadBool(pSettingsSection, "Crates", Crates);
ShortGame = pINI->ReadBool(pSettingsSection, "ShortGame", ShortGame);
SuperWeapons = pINI->ReadBool(pSettingsSection, "Superweapons", SuperWeapons);
BuildOffAlly = pINI->ReadBool(pSettingsSection, "BuildOffAlly", BuildOffAlly);
GameSpeed = pINI->ReadInteger(pSettingsSection, "GameSpeed", GameSpeed);
MultiEngineer = pINI->ReadBool(pSettingsSection, "MultiEngineer", MultiEngineer);
UnitCount = pINI->ReadInteger(pSettingsSection, "UnitCount", UnitCount);
AIPlayers = pINI->ReadInteger(pSettingsSection, "AIPlayers", AIPlayers);
AIDifficulty = pINI->ReadInteger(pSettingsSection, "AIDifficulty", AIDifficulty);
AlliesAllowed = pINI->ReadBool(pSettingsSection, "AlliesAllowed", AlliesAllowed);
HarvesterTruce = pINI->ReadBool(pSettingsSection, "HarvesterTruce", HarvesterTruce);
FogOfWar = pINI->ReadBool(pSettingsSection, "FogOfWar", FogOfWar);
MCVRedeploy = pINI->ReadBool(pSettingsSection, "MCVRedeploy", MCVRedeploy);
SpecialHouseIsAlly = pINI->ReadBool(pSettingsSection, "SpecialHouseIsAlly", SpecialHouseIsAlly);

if (INIClassExt::ReadString_WithoutAresHook(pINI, pSettingsSection, "UIGameMode", "", Main::readBuffer, sizeof(Main::readBuffer)) > 0)
MultiByteToWideChar(CP_UTF8, 0, Main::readBuffer, strlen(Main::readBuffer), UIGameMode, std::size(UIGameMode));
Expand Down
2 changes: 2 additions & 0 deletions src/Spawner/Spawner.Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class SpawnerConfig
bool FogOfWar;
bool MCVRedeploy;
wchar_t UIGameMode[60];
bool SpecialHouseIsAlly;

// SaveGame Options
bool LoadSaveGame;
Expand Down Expand Up @@ -163,6 +164,7 @@ class SpawnerConfig
, FogOfWar { false }
, MCVRedeploy { true }
, UIGameMode { L"" }
, SpecialHouseIsAlly { true }

// SaveGame
, LoadSaveGame { false }
Expand Down
14 changes: 11 additions & 3 deletions src/Spawner/Spawner.Hook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ DEFINE_HOOK(0x6BD7C5, WinMain_SpawnerInit, 0x6)
Patch::Apply_CALL(0x68745E, Spawner::AssignHouses); // Read_Scenario_INI
Patch::Apply_CALL(0x68ACFF, Spawner::AssignHouses); // ScenarioClass::Read_INI

Patch::Apply_LJMP(0x5D74A0, 0x5D7570); // MPGameModeClass_AllyTeams
Patch::Apply_LJMP(0x501721, 0x501736); // HouseClass_ComputerParanoid
Patch::Apply_LJMP(0x686A9E, 0x686AC6); // RemoveAIPlayers
Patch::Apply_LJMP(0x5D74A0, 0x5D7570); // MPGameModeClass_AllyTeams
Patch::Apply_LJMP(0x501721, 0x501736); // HouseClass_ComputerParanoid
//Patch::Apply_LJMP(0x686A9E, 0x686AC6); // ReadScenario_InitSomeThings - Moved to a hook to allow conditional toggling of Special house's alliances.
}

{ // NetHack
Expand Down Expand Up @@ -238,3 +238,11 @@ DEFINE_HOOK(0x67E6DA, LoadGame_AfterInit, 0x6)
}

#pragma endregion

DEFINE_HOOK(0x686A9E, ReadScenario_InitSomeThings_SpecialHouseIsAlly, 0x6)
{
if (Spawner::GetConfig()->SpecialHouseIsAlly)
return 0;

return 0x686AC6;
}
Loading