Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
70ba2f3
reimplement: SHC_3BB0A8C1_0x00530760 100.0% Reimplemented
gynt Nov 10, 2026
d84f6af
reimplement: SHC_3BB0A8C1_0x0051BE20 100.0% Reimplemented
gynt Nov 10, 2026
b3b5651
reimplement: SHC_3BB0A8C1_0x00530B40 100.0% Reimplemented
gynt Nov 10, 2026
404df96
reimplement: SHC_3BB0A8C1_0x00530EB0 100.0% Reimplemented
gynt Nov 10, 2026
2efa75f
reimplement: SHC_3BB0A8C1_0x00549B30 100.0% Reimplemented
gynt Nov 10, 2026
f856c39
reimplement: SHC_3BB0A8C1_0x00530CF0 100.0% Reimplemented
gynt Nov 10, 2026
e8d4b3f
reimplement: SHC_3BB0A8C1_0x00530D70 100.0% Reimplemented
gynt Nov 10, 2026
dadf997
reimplement: SHC_3BB0A8C1_0x00530F20 100.0% Reimplemented
gynt Nov 10, 2026
fcdd14b
reimplement: SHC_3BB0A8C1_0x00530E00 100.0% Reimplemented
gynt Nov 10, 2026
3d161dd
reimplement: SHC_3BB0A8C1_0x005309E0 100.0% Reimplemented
gynt Nov 10, 2026
34730e0
reimplement: SHC_3BB0A8C1_0x00530A90 100.0% Reimplemented
gynt Nov 10, 2026
a1eb68f
units round 1: truth tests for the flags, and no unused using declara…
kotijekriv Nov 10, 2026
c9bd78b
header: DestinationNeededEnum gets DNE_UNKNOWN_2
kotijekriv Nov 10, 2026
24ce8db
header: UnitState gets US_UNKNOWN_121
kotijekriv Nov 10, 2026
85955cb
header: Unit's four work timers are one array, workTimers[4]
kotijekriv Nov 10, 2026
5f50460
units round 1: enum names, the work-timer array, names and measured c…
kotijekriv Nov 10, 2026
e9cbc59
header: PlayStockpileIsFullWarning returns nothing
kotijekriv Nov 10, 2026
68987e7
units round 1: the review's points
kotijekriv Nov 10, 2026
6662533
Merge main (39ed8174d) into reimpl/units-A-round1-100
kotijekriv Nov 10, 2026
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
41 changes: 41 additions & 0 deletions src/OpenSHC/Map/Units/ComputeGoodsProduced.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#include "../Units.func.hpp"

#include "OpenSHC/Game/GameMode.hpp"
#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"

#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

using OpenSHC::WindowsHelper::Enums::BOOLEnum;

// FUNCTION: STRONGHOLDCRUSADER 0x00530D70
int Units::ComputeGoodsProduced(int unitID, int goodsCount, BOOLEnum boost)
{
int productivity = DAT_GameState::instance.playerDataArray[DAT_UnitsState::instance.units[unitID].owner]
.fearFactorProductivityUnk;
DAT_UnitsState::instance.units[unitID].productivityDiv100 = 0;
// Lowered productivity means more breaks, not fewer goods.
if (productivity <= 100) {
productivity = 100;
}
// Every mode but solitary boosts productivity by 50.
if (DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SOLITARY && boost) {
productivity += 50;
}
// Fractional bonus goods are kept as a percentage and added next time.
// the original multiplies by 100 and divides by 100 again (without: quick_diff 0.9737 -> 0.4058)
int const bonusPercentage
= (productivity - 100) * goodsCount * 100 / 100 + DAT_UnitsState::instance.units[unitID].productivityMod100;
// a variable, so one idiv gives quotient and remainder (a literal 100: quick_diff 0.9737 -> 0.7561)
int divisor = 100;
DAT_UnitsState::instance.units[unitID].productivityDiv100 = bonusPercentage / divisor;
DAT_UnitsState::instance.units[unitID].productivityMod100 = bonusPercentage % divisor;
return DAT_UnitsState::instance.units[unitID].productivityDiv100 + goodsCount;
}

}
}
25 changes: 25 additions & 0 deletions src/OpenSHC/Map/Units/DetachLadderman.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#include "../Units.func.hpp"

#include "OpenSHC/Map/Navigation/PathFindingState.func.hpp"
#include "OpenSHC/Map/LogicHelpers/Logic1.hpp"

#include "OpenSHC/Globals/DAT_PathFindingState.hpp"
#include "OpenSHC/Globals/DAT_TileMapState.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

// FUNCTION: STRONGHOLDCRUSADER 0x00530760
void Units::DetachLadderman(int unitID)
{
int const tile = DAT_UnitsState::instance.units[unitID].tile;
DAT_TileMapState::instance.LogicLayer[tile] &= ~OpenSHC::Map::LogicHelpers::L_CLIMBABLE;
DAT_UnitsState::instance.units[unitID].wallDataID = 0;
MACRO_CALL_MEMBER(OpenSHC::Map::Navigation::PathFindingState_Func::updatePathLinkagesInAllEightDirections,
DAT_PathFindingState::ptr)(DAT_UnitsState::instance.units[unitID].y, tile);
DAT_UnitsState::instance.units[unitID].laddermanIsInPosition = 0;
}

}
}
33 changes: 33 additions & 0 deletions src/OpenSHC/Map/Units/FindFirstOpponentWithKeep.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#include "../Units.func.hpp"

#include "OpenSHC/Game/GameMode2.hpp"
#include "OpenSHC/Game/Player/Enums/BuildingEntryInfoEnum.hpp"
#include "OpenSHC/Map/MapType2.hpp"

#include "OpenSHC/Globals/DAT_GameCore.hpp"
#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_MapPropertiesState.hpp"

namespace OpenSHC {
namespace Map {

// FUNCTION: STRONGHOLDCRUSADER 0x0051BE20
int Units::FindFirstOpponentWithKeep()
{
if (DAT_GameCore::instance.gameMode_2 == OpenSHC::Game::GM_BUILDERUnk
&& DAT_MapPropertiesState::instance.SEC_U3_MapType2_1 == OpenSHC::Map::MT_SIEGE) {
return 1;
}
for (int playerID = 2; playerID < 6; ++playerID) {
if (DAT_GameState::instance.playerDataArray[playerID]
.buildingEntryInfos[OpenSHC::Game::Player::Enums::BEIE_KEEP]
.id
> 0) {
return playerID;
}
}
return 0;
}

}
}
40 changes: 40 additions & 0 deletions src/OpenSHC/Map/Units/IncrementAndOptionalUpdateAVValueRelated.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#include "../Units.func.hpp"

#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"

#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

using OpenSHC::WindowsHelper::Enums::BOOLEnum;

// FUNCTION: STRONGHOLDCRUSADER 0x00530B40
void Units::IncrementAndOptionalUpdateAVValueRelated(int unitID, BOOLEnum updateAV)
{
DAT_UnitsState::instance.units[unitID].workTimers[DAT_UnitsState::instance.units[unitID].working] += 1;
// zeroed before the early return, as the original does (after it: quick_diff 0.9811 -> 0.9057)
int activeTimerCount = 0;
if (!updateAV) {
return;
}
DAT_UnitsState::instance.units[unitID].av = 0;
for (int i = 0; i < countof(DAT_UnitsState::instance.units[unitID].workTimers); ++i) {
DAT_UnitsState::instance.units[unitID].av += DAT_UnitsState::instance.units[unitID].workTimers[i];
if (DAT_UnitsState::instance.units[unitID].workTimers[i] > 0) {
++activeTimerCount;
}
}
if (activeTimerCount > 0) {
DAT_UnitsState::instance.units[unitID].av /= activeTimerCount;
}
DAT_UnitsState::instance.units[unitID].working += 1;
if (DAT_UnitsState::instance.units[unitID].working
>= countof(DAT_UnitsState::instance.units[unitID].workTimers)) {
DAT_UnitsState::instance.units[unitID].working = 0;
}
DAT_UnitsState::instance.units[unitID].workTimers[DAT_UnitsState::instance.units[unitID].working] = 0;
}

}
}
44 changes: 44 additions & 0 deletions src/OpenSHC/Map/Units/PlayArmoryIsFullWarning.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#include "../Units.func.hpp"

#include "OpenSHC/Audio/SFX/SFXState.func.hpp"
#include "OpenSHC/Map/Buildings/BuildingLogicalState.hpp"
#include "OpenSHC/Map/Buildings/BuildingType.hpp"
#include "OpenSHC/string-literals.hpp"

#include "OpenSHC/Globals/BOOLEnum_00ee0fe0.hpp"
#include "OpenSHC/Globals/DAT_BuildingsState.hpp"
#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp"
#include "OpenSHC/Globals/DAT_SFXState.hpp"
#include "OpenSHC/Globals/DWORD_00ee0fdc.hpp"
#include "OpenSHC/Globals/SEC_RNG.hpp"

namespace OpenSHC {
namespace Map {

// FUNCTION: STRONGHOLDCRUSADER 0x00530F20
void Units::PlayArmoryIsFullWarning()
{
// guard of the function-local static holding the last warning time
if (!(BOOLEnum_00ee0fe0::instance & TRUE)) {
BOOLEnum_00ee0fe0::instance |= TRUE;
DWORD_00ee0fdc::instance = timeGetTime() - 60000;
}
if (timeGetTime() - DWORD_00ee0fdc::instance <= 60000) {
return;
}
int const currentPlayer = DAT_GameSynchronyState::instance.currentPlayerSlotID;
for (int buildingID = 1; buildingID < DAT_BuildingsState::instance.maxBuildingsCount; ++buildingID) {
if (DAT_BuildingsState::instance.buildings[buildingID].logicalState == OpenSHC::Map::Buildings::BLS_NORMAL
&& DAT_BuildingsState::instance.buildings[buildingID].buildingType == OpenSHC::Map::Buildings::BT_ARMORY
&& DAT_BuildingsState::instance.buildings[buildingID].owner == currentPlayer) {
// "The armory is full my lord"
MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playWAVSFX, DAT_SFXState::ptr)(
s_placement_warning12_wav_005abc08);
DWORD_00ee0fdc::instance = timeGetTime() - SEC_RNG::instance.currentNumber2 % 5000;
return;
}
}
}

}
}
32 changes: 32 additions & 0 deletions src/OpenSHC/Map/Units/PlayStockpileIsFullWarning.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#include "../Units.func.hpp"

#include "OpenSHC/Audio/SFX/SFXState.func.hpp"
#include "OpenSHC/string-literals.hpp"

#include "OpenSHC/Globals/BOOLEnum_00ee0fd8.hpp"
#include "OpenSHC/Globals/DAT_SFXState.hpp"
#include "OpenSHC/Globals/DWORD_00ee0fd4.hpp"
#include "OpenSHC/Globals/SEC_RNG.hpp"

namespace OpenSHC {
namespace Map {

// FUNCTION: STRONGHOLDCRUSADER 0x00530EB0
void Units::PlayStockpileIsFullWarning()
{
// guard of the function-local static holding the last warning time
if (!(BOOLEnum_00ee0fd8::instance & TRUE)) {
BOOLEnum_00ee0fd8::instance |= TRUE;
DWORD_00ee0fd4::instance = timeGetTime() - 60000;
}
if (timeGetTime() - DWORD_00ee0fd4::instance <= 60000) {
return;
}
// "The stockpile is full my lord"
MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playWAVSFX, DAT_SFXState::ptr)(
s_placement_warning11_wav_005abbf0);
DWORD_00ee0fd4::instance = timeGetTime() - SEC_RNG::instance.currentNumber2 % 5000;
}

}
}
74 changes: 74 additions & 0 deletions src/OpenSHC/Map/Units/SetRestingForUnit.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
#include "../Units.func.hpp"

#include "OpenSHC/Map/Buildings/BuildingsState.func.hpp"
#include "OpenSHC/Map/Units/UnitsState.func.hpp"
#include "OpenSHC/Map/Units/Pathfinding/DestinationNeededEnum.hpp"
#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"

#include "OpenSHC/Globals/DAT_BuildingsState.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

using OpenSHC::WindowsHelper::Enums::BOOLEnum;

// FUNCTION: STRONGHOLDCRUSADER 0x00549B30
BOOLEnum Units::SetRestingForUnit(int unitID)
{
DAT_UnitsState::instance.units[unitID].idle += 1;
BOOLEnum restedEnough = FALSE;
if (DAT_UnitsState::instance.units[unitID].idle > DAT_UnitsState::instance.units[unitID].target) {
restedEnough = TRUE;
}
if (DAT_UnitsState::instance.units[unitID].destinationNeeded
!= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET) {
DAT_UnitsState::instance.units[unitID].destinationNeeded
= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET;
int const buildingID
= MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::pickARandomPositiveFearFactorBuilding,
DAT_BuildingsState::ptr)(DAT_UnitsState::instance.units[unitID].owner);
if (buildingID != 0) {
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)(
unitID, DAT_BuildingsState::instance.buildings[buildingID].buildingEntryX,
DAT_BuildingsState::instance.buildings[buildingID].buildingEntryY, 0);
} else {
// No positive fear factor building available, resume normal state
DAT_UnitsState::instance.units[unitID].state.generic
= DAT_UnitsState::instance.units[unitID].cachedState;
DAT_UnitsState::instance.units[unitID].destinationNeeded
= OpenSHC::Map::Units::Pathfinding::DNE_UNKNOWN_2;
}
}
if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)(
unitID)) {
if (restedEnough) {
// idle against target again, as the original tests it twice
if (DAT_UnitsState::instance.units[unitID].idle > DAT_UnitsState::instance.units[unitID].target) {
DAT_UnitsState::instance.units[unitID].banked
= DAT_UnitsState::instance.units[unitID].idle - DAT_UnitsState::instance.units[unitID].target;
}
DAT_UnitsState::instance.units[unitID].field_0x2fe = 0;
DAT_UnitsState::instance.units[unitID].state.generic
= DAT_UnitsState::instance.units[unitID].cachedState;
DAT_UnitsState::instance.units[unitID].destinationNeeded
= OpenSHC::Map::Units::Pathfinding::DNE_UNKNOWN_2;
return TRUE;
}
if (DAT_UnitsState::instance.units[unitID].unitTypeSpecificRestingState > 0
&& DAT_UnitsState::instance.units[unitID].field_0x2fe == 0) {
DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0;
DAT_UnitsState::instance.units[unitID].state.generic
= DAT_UnitsState::instance.units[unitID].unitTypeSpecificRestingState;
DAT_UnitsState::instance.units[unitID].field_0x2fe = 1;
return FALSE;
}
DAT_UnitsState::instance.units[unitID].destinationNeeded
= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_NEEDED;
DAT_UnitsState::instance.units[unitID].field_0x2fe = 0;
}
return TRUE;
}

}
}
34 changes: 34 additions & 0 deletions src/OpenSHC/Map/Units/SetStateToFreetimeWalking.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#include "../Units.func.hpp"

#include "OpenSHC/Map/Units/States/UnitState.hpp"
#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"

#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

using OpenSHC::WindowsHelper::Enums::BOOLEnum;

// FUNCTION: STRONGHOLDCRUSADER 0x00530CF0
BOOLEnum Units::SetStateToFreetimeWalking(int unitID, int shouldFindNewGoodThing, int substateCount)
{
if (DAT_UnitsState::instance.units[unitID].field_0x2fe != 1) {
return FALSE;
}
DAT_UnitsState::instance.units[unitID].idle += 1;
if (!shouldFindNewGoodThing) {
return FALSE;
}
DAT_UnitsState::instance.units[unitID].substate += 1;
DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0;
if (DAT_UnitsState::instance.units[unitID].substate >= substateCount) {
DAT_UnitsState::instance.units[unitID].substate = 0;
}
// resting
DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_UNKNOWN_121;
return TRUE;
}

}
}
49 changes: 49 additions & 0 deletions src/OpenSHC/Map/Units/UpdateBurningAnimal1.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#include "../Units.func.hpp"

#include "OpenSHC/Map/Units/States/UnitState.hpp"
#include "OpenSHC/Map/Units/UnitLogicState.hpp"

#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp"
#include "OpenSHC/Globals/DAT_UnitHasBecomeIdle.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

// FUNCTION: STRONGHOLDCRUSADER 0x005309E0
void Units::UpdateBurningAnimal1()
{
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].dying = 1;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].isSelected = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 3;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 8;
if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
== OpenSHC::Map::Units::States::US_IDLEUnk) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 1;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_STATE_2Unk;
return;
}
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0;
int const animationCycle = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber;
if (animationCycle >= 21) {
DAT_UnitHasBecomeIdle::instance = 1;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_REMOVE;
return;
}
bool const unitHadBecomeIdle = DAT_UnitHasBecomeIdle::instance != 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = animationCycle + 1;
if (unitHadBecomeIdle) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_REMOVE;
}
}

}
}
Loading
Loading