Skip to content

Reimpl/map units updatefunctions #204

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

Draft
gynt wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Reimpl/map units updatefunctions #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c343f29
reimplement UpdateBurningAnimal1 100%
Aug 18, 2026
df05885
reimplement UpdateBurningAnimal2 100%
Aug 18, 2026
d8ba907
reimplement UpdateSiegeTent 69.44% stuck
Aug 18, 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
79 changes: 79 additions & 0 deletions src/OpenSHC/Map/Units/UpdateBurningAnimal1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#include "OpenSHC/Map/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 {

using OpenSHC::Map::Units::UnitLogicState;
using OpenSHC::Map::Units::States::UnitState;

/*
decompilerscript: committed: 2025-01-30 21:57:43.216000 */

// FUNCTION: STRONGHOLDCRUSADER 0x005309E0
void __stdcall 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 = ((UnitState)2);

return;
}

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0;

int iVar1 = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber;

if (0x15 <= iVar1) {

DAT_UnitHasBecomeIdle::instance = 1;

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_REMOVE;

return;
}

bool bVar3 = DAT_UnitHasBecomeIdle::instance != 0;

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = iVar1 + 1;

if (bVar3) {

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_REMOVE;
}

return;
}

}
}
79 changes: 79 additions & 0 deletions src/OpenSHC/Map/Units/UpdateBurningAnimal2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
#include "OpenSHC/Map/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 {

using OpenSHC::Map::Units::UnitLogicState;
using OpenSHC::Map::Units::States::UnitState;

/*
decompilerscript: committed: 2025-01-30 21:57:43.216000 */

// FUNCTION: STRONGHOLDCRUSADER 0x00530A90
void __stdcall Units ::UpdateBurningAnimal2()

{

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 = ((UnitState)2);

return;
}

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0;

int iVar1 = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber;

if (0x11 <= iVar1) {

DAT_UnitHasBecomeIdle::instance = 1;

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_REMOVE;

return;
}

bool bVar3 = DAT_UnitHasBecomeIdle::instance != 0;

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = iVar1 + 1;

if (bVar3) {

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_REMOVE;
}

return;
}

}
}
76 changes: 76 additions & 0 deletions src/OpenSHC/Map/Units/UpdateSiegeTent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#include "OpenSHC/Map/Navigation/DirectionAlgorithmState.func.hpp"
#include "OpenSHC/Map/Units.func.hpp"
#include "OpenSHC/Map/Units/UnitLogicState.hpp"
#include "OpenSHC/Map/Units/UnitType.hpp"

#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp"
#include "OpenSHC/Globals/DAT_DirectionAlgorithmState.hpp"
#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

using OpenSHC::Map::Units::UnitLogicState;
using OpenSHC::Map::Units::UnitType;

/*
decompilerscript: committed: 2025-01-30 21:57:43.216000 */

// FUNCTION: STRONGHOLDCRUSADER 0x005307B0
void __stdcall Units ::UpdateSiegeTent()

{

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0;

int uVar5 = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].fixedRng + 1 & 3;

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = uVar5;

if (4 <= uVar5) {

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 2;
}

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber
= DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber + 1;

if (500 < DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber) {

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_TRANSITIONING;

if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].fixedRng % 4 < 2) {

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].unitTypeToChangeInto
= OpenSHC::Map::Units::UT_S_CATAPULT;
} else {

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].unitTypeToChangeInto
= OpenSHC::Map::Units::UT_S_TREBUCHET;
}

int iVar4 = DAT_GameState::instance.playerDataArray[1].keep.yEntry;

int iVar3 = DAT_GameState::instance.playerDataArray[1].keep.xEntry;

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state_2 = 6;

MACRO_CALL_MEMBER(
OpenSHC::Map::Navigation::DirectionAlgorithmState_Func::calculatePreferredRelativeOrientation,
DAT_DirectionAlgorithmState::ptr)(
(int)DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].x,
(int)((int)(DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].y)), iVar3, iVar4);

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirection
= DAT_DirectionAlgorithmState::instance.orientation;

DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field265_0x3bc = 0;
}

return;
}

}
}