Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions cmake/compiler-flags-gl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,4 @@ src/OpenSHC/Map/Units/UpdateMiner.cpp
src/OpenSHC/Map/Units/UpdateQuarryMason.cpp
src/OpenSHC/Map/Units/UpdateDrunkard.cpp
src/OpenSHC/Map/Units/UpdateInnkeeper.cpp
src/OpenSHC/Map/Units/UpdateMerchant.cpp
30 changes: 30 additions & 0 deletions src/OpenSHC/Map/Units/CurrentUnitHasHealer.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#include "../Units.func.hpp"

#include "OpenSHC/Map/Units/UnitLogicState.hpp"
#include "OpenSHC/Map/Units/UnitType.hpp"
#include "OpenSHC/WindowsHelper/Enums/BOOLEnum.hpp"

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

namespace OpenSHC {
namespace Map {

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

// FUNCTION: STRONGHOLDCRUSADER 0x0053A020
BOOLEnum Units::CurrentUnitHasHealer()
{
int const currentPlayer = DAT_GameSynchronyState::instance.currentPlayerSlotID;
for (int unitID = 1; unitID < DAT_UnitsState::instance.maxUnitCount; ++unitID) {
if (DAT_UnitsState::instance.units[unitID].logicalState != OpenSHC::Map::Units::ULS_INVISIBLE
&& DAT_UnitsState::instance.units[unitID].owner == currentPlayer
&& DAT_UnitsState::instance.units[unitID].unitType == OpenSHC::Map::Units::UT_HEALER) {
return TRUE;
}
}
return FALSE;
}

}
}
335 changes: 335 additions & 0 deletions src/OpenSHC/Map/Units/UpdateDeer.cpp

Large diffs are not rendered by default.

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

#include "OpenSHC/Game/GameStateStructures.func.hpp"
#include "OpenSHC/Map/Buildings/BuildingsState.func.hpp"
#include "OpenSHC/Map/Units/UnitsState.func.hpp"
#include "OpenSHC/Game/Player/Enums/BuildingEntryInfoEnum.hpp"
#include "OpenSHC/Map/Units/Pathfinding/DestinationNeededEnum.hpp"
#include "OpenSHC/Map/Units/States/UnitState.hpp"
#include "OpenSHC/Map/Units/UnitLogicState.hpp"

#include "OpenSHC/Globals/DAT_BuildingsState.hpp"
#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp"
#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_TroopValueState.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

// FUNCTION: STRONGHOLDCRUSADER 0x005416B0
void Units::UpdateMerchant()
{
int const unitID = DAT_CurrentUnitSlotID::instance;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 1;
UnitStateShort const state = DAT_UnitsState::instance.units[unitID].state.generic;
if (state == OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk) {
DAT_UnitsState::instance.units[unitID].gfxNumber = 1;
DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16;
int const marketplace
= DAT_GameState::instance.playerDataArray[DAT_GameState::instance.mapAndTime.traderVisitsPlayer]
.buildingEntryInfos[OpenSHC::Game::Player::Enums::BEIE_MARKETPLACE]
.id;
if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible,
DAT_BuildingsState::ptr)(marketplace, 1)
!= 0) {
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)(
DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[marketplace].buildingEntryX,
DAT_BuildingsState::instance.buildings[marketplace].buildingEntryY, 0);
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_IDLEUnk;
return;
}
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_REMOVE;
return;
}
if (state == OpenSHC::Map::Units::States::US_IDLEUnk) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed
= DAT_TroopValueState::instance.attackInfo.aiTroops > 1;
DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1;
DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16;
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::clearHiddenFlagAndUpdatePosition,
DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance);
if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)(
DAT_CurrentUnitSlotID::instance)) {
MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::activateTraderState, DAT_GameState::ptr)();
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_JESTER_ROAM_TO;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].engineerManningSiegeStateRef_checkType
= 2;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].cachedState
= OpenSHC::Map::Units::States::US_STATE_2Unk;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0;
}
return;
}
if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) {
DAT_UnitsState::instance.units[unitID].gfxNumber = 1;
DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16;
if (DAT_GameState::instance.mapAndTime.traderRelated2 == 1) {
DAT_UnitsState::instance.units[unitID].destinationNeeded
= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_NEEDED;
DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0;
DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_JESTER_ROAM_TO;
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32;
DAT_UnitsState::instance.units[unitID].engineerManningSiegeStateRef_checkType = -2;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].cachedState
= OpenSHC::Map::Units::States::US_STATE_3Unk;
DAT_UnitsState::instance.units[unitID].updateTickTracker = 0;
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::resetUnitMovementState, DAT_UnitsState::ptr)(
DAT_CurrentUnitSlotID::instance);
}
return;
}
if (state == OpenSHC::Map::Units::States::US_STATE_3Unk) {
if (DAT_UnitsState::instance.units[unitID].destinationNeeded
!= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET) {
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)(
DAT_CurrentUnitSlotID::instance, DAT_GameState::instance.mapAndTime.signpostsMapEdge[0][0].x,
DAT_GameState::instance.mapAndTime.signpostsMapEdge[0][0].y, 0);
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].destinationNeeded
= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET;
}
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed
= DAT_TroopValueState::instance.attackInfo.aiTroops > 1;
// through a pointer, so these two stores come after the stateBasedSpeed store as in the original
Unit* const unit = &DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance];
unit->gfxNumber = 1;
unit->field_0x30_animRelated = 16;
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::clearHiddenFlagAndUpdatePosition,
DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance);
if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)(
DAT_CurrentUnitSlotID::instance)) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_REMOVE;
}
return;
}
if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState,
DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance)) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 1;
DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16;
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::clearHiddenFlagAndUpdatePosition,
DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance);
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_DISAPPEAR;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0;
return;
}
if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown++;
if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32;
}
DAT_UnitsState::instance.units[unitID].updateTickTracker++;
if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) {
DAT_UnitsState::instance.units[unitID].logicalState = OpenSHC::Map::Units::ULS_REMOVE;
}
return;
}
if (state == OpenSHC::Map::Units::States::US_JESTER_ROAM_TO) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown
+= DAT_UnitsState::instance.units[unitID].engineerManningSiegeStateRef_checkType;
if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown < 0) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 0;
} else if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown >= 32) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 31;
}
DAT_UnitsState::instance.units[unitID].updateTickTracker++;
if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 16) {
DAT_UnitsState::instance.units[unitID].updateTickTracker = 0;
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].cachedState;
if ((char)DAT_UnitsState::instance.units[unitID].engineerManningSiegeStateRef_checkType > 0) {
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)(
DAT_CurrentUnitSlotID::instance);
}
MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::updateBuildingSignpostCounter,
DAT_BuildingsState::ptr)(DAT_UnitsState::instance.units[unitID].workplaceBuildingID_1, 2);
}
return;
}
DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk;
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::makeUnitStopWalkingByClearingPathProgressState,
DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance);
}

}
}
Loading
Loading