Skip to content
Merged
11 changes: 11 additions & 0 deletions cmake/compiler-flags-gl.txt
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,14 @@ src/OpenSHC/UI/HoveredState/clearHoveredState.cpp
src/OpenSHC/UI/HoveredState/Constructor_HoveredState.cpp
src/OpenSHC/UI/Rendering/RenderCurrentButtonOnScreenMenu.cpp
src/OpenSHC/UI/Rendering/RenderCurrentButtonToScreenMenuWithBlendingUnk.cpp
src/OpenSHC/Map/Units/UnitsState/checkIfCitizenUnitIsAliveBasedOnState.cpp
src/OpenSHC/Map/Units/UnitsState/hasTunnelerNotFinishedDigging.cpp
src/OpenSHC/Map/Units/UnitsState/hasUnitReachedDestination.cpp
src/OpenSHC/Map/Units/UnitsState/commitUnitLocation.cpp
src/OpenSHC/Map/Units/UnitsState/makeUnitStopWalkingByClearingPathProgressState.cpp
src/OpenSHC/Map/Units/UnitsState/resumeMovementIfNoAttackTarget.cpp
src/OpenSHC/Map/Units/UpdateBurningMan.cpp
src/OpenSHC/Map/Units/UpdateMiner.cpp
src/OpenSHC/Map/Units/UpdateQuarryMason.cpp
src/OpenSHC/Map/Units/UpdateDrunkard.cpp
src/OpenSHC/Map/Units/UpdateInnkeeper.cpp
100 changes: 100 additions & 0 deletions src/OpenSHC/Map/Units/UpdateBurningMan.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
#include "../Units.func.hpp"

#include "OpenSHC/Map/Units/UnitsState.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_UnitPropertiesDefinedData.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Map {

// FUNCTION: STRONGHOLDCRUSADER 0x0053BC20
void Units::UpdateBurningMan()
{
int const unitID = DAT_CurrentUnitSlotID::instance;
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;
UnitStateShort const state = DAT_UnitsState::instance.units[unitID].state.generic;
if (state == OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber
= DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirectionMapOrientationCorrected
+ 1;
if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::computeLadderClimbPath, DAT_UnitsState::ptr)(
unitID, 0, 0, 0)) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_UNKNOWN_120;
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::changeDestinationByAmount, DAT_UnitsState::ptr)(
DAT_CurrentUnitSlotID::instance, 4);
return;
}
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_STONE_DEATH_03;
MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::makeUnitStopWalkingByClearingPathProgressState,
DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance);
return;
}
if (state == OpenSHC::Map::Units::States::US_UNKNOWN_120) {
DAT_UnitsState::instance.units[unitID].movementSpeed = 2;
DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0;
DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1;
DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16;
if (MACRO_CALL_MEMBER(
OpenSHC::Map::Units::UnitsState_Func::hasTunnelerNotFinishedDigging, DAT_UnitsState::ptr)(unitID)) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_STONE_DEATH_03;
}
return;
}
if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState,
DAT_UnitsState::ptr)(unitID)) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 3;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame
= (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0xb2c
[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber];
if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) {
DAT_UnitHasBecomeIdle::instance = 1;
} else {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber
= DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance]
.facingDirectionMapOrientationCorrected
+ 121 + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame * 8;
}
if (DAT_UnitHasBecomeIdle::instance != 0) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_DISAPPEAR;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0;
}
return;
}
if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown += 1;
if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32;
}
DAT_UnitsState::instance.units[unitID].updateTickTracker += 1;
if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) {
DAT_UnitsState::instance.units[unitID].logicalState = OpenSHC::Map::Units::ULS_REMOVE;
}
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)(unitID);
}

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

#include "OpenSHC/Map/Units/UnitsState.func.hpp"
#include "OpenSHC/Map/Units/Pathfinding/DestinationNeededEnum.hpp"
#include "OpenSHC/Map/Units/States/UnitState.hpp"
#include "OpenSHC/Map/Units/UnitLogicState.hpp"
#include "OpenSHC/Map/Units/UnitType.hpp"

#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp"
#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_UnitHasBecomeIdle.hpp"
#include "OpenSHC/Globals/DAT_UnitPropertiesDefinedData.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"
#include "OpenSHC/Globals/SEC_RNG.hpp"

namespace OpenSHC {
namespace Map {

// FUNCTION: STRONGHOLDCRUSADER 0x00567320
void Units::UpdateDrunkard()
{
int const unitID = DAT_CurrentUnitSlotID::instance;
DAT_GameState::instance.playerDataArray[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner]
.field_0x2174 += 1;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 0;
if (DAT_UnitsState::instance.units[unitID].field_0x3f4 > 1) {
DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR;
}
UnitStateShort const state = DAT_UnitsState::instance.units[unitID].state.generic;
if (state == OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk) {
return;
}
if (state == OpenSHC::Map::Units::States::US_IDLEUnk) {
DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16;
if (DAT_UnitsState::instance.units[unitID].destinationNeeded
!= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET) {
if (!MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::computeLadderClimbPath,
DAT_UnitsState::ptr)(unitID, 0, 0, 0)) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_DISAPPEAR;
} else {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].destinationNeeded
= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_HAS_BEEN_SET;
}
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed
= (SEC_RNG::instance.currentNumber2 & 3) + 6;
return;
}
if (MACRO_CALL_MEMBER(
OpenSHC::Map::Units::UnitsState_Func::hasTunnelerNotFinishedDigging, DAT_UnitsState::ptr)(unitID)) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_STATE_3Unk;
DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0;
}
return;
}
if (state == OpenSHC::Map::Units::States::US_STATE_3Unk) {
DAT_UnitsState::instance.units[unitID].animationSpeed = 4;
DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0;
if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 0) {
DAT_UnitsState::instance.units[unitID].animationFrame
= (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp
.field_0x634c[DAT_UnitsState::instance.units[unitID].animationCycleNumber];
if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) {
DAT_UnitHasBecomeIdle::instance = 1;
} else {
DAT_UnitsState::instance.units[unitID].gfxNumber
= DAT_UnitsState::instance.units[unitID].animationFrame + 256;
}
} else {
if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 1) {
DAT_UnitsState::instance.units[unitID].animationFrame
= (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp
.field_0x63a0[DAT_UnitsState::instance.units[unitID].animationCycleNumber];
} else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 2) {
DAT_UnitsState::instance.units[unitID].animationFrame
= (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp
.field_0x63d4[DAT_UnitsState::instance.units[unitID].animationCycleNumber];
}
if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) {
DAT_UnitHasBecomeIdle::instance = 1;
} else {
DAT_UnitsState::instance.units[unitID].gfxNumber
= DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 121
+ DAT_UnitsState::instance.units[unitID].animationFrame * 8;
}
}
if (DAT_UnitHasBecomeIdle::instance != 0) {
DAT_UnitsState::instance.units[unitID].substate += 1;
if (DAT_UnitsState::instance.units[unitID].substate > 2) {
DAT_UnitsState::instance.units[unitID].substate = 0;
}
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].destinationNeeded
= OpenSHC::Map::Units::Pathfinding::DNE_DESTINATION_NEEDED;
DAT_UnitsState::instance.units[unitID].resourceToDeposit += 1;
// >= 6 gives the original's setl (< 6 with the arms swapped: quick_diff 1.0000 -> 0.9848)
if (DAT_UnitsState::instance.units[unitID].resourceToDeposit >= 6) {
DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR;
} else {
DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_IDLEUnk;
}
}
return;
}
if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) {
DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1;
DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState
= OpenSHC::Map::Units::ULS_TRANSITIONING;
DAT_UnitsState::instance.units[unitID].unitTypeToChangeInto = OpenSHC::Map::Units::UT_PEASANT;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state_2 = 0;
DAT_UnitsState::instance.units[unitID].buildingID = 0;
return;
}
if (state == OpenSHC::Map::Units::States::US_MELEE_ATTACK) {
DAT_UnitsState::instance.units[unitID].animationSpeed = 3;
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0;
DAT_UnitsState::instance.units[unitID].animationFrame
= (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp
.drunkard[DAT_UnitsState::instance.units[unitID].animationCycleNumber];
if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) {
DAT_UnitsState::instance.units[unitID].gfxNumber
= DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 1;
DAT_UnitHasBecomeIdle::instance = 1;
} else {
DAT_UnitsState::instance.units[unitID].gfxNumber
= DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected - 7
+ DAT_UnitsState::instance.units[unitID].animationFrame * 8;
}
if (DAT_UnitHasBecomeIdle::instance != 0) {
DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0;
MACRO_CALL_MEMBER(
OpenSHC::Map::Units::UnitsState_Func::resumeMovementIfNoAttackTarget, DAT_UnitsState::ptr)(unitID);
}
return;
}
if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState,
DAT_UnitsState::ptr)(unitID)) {
DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic
= OpenSHC::Map::Units::States::US_DISAPPEAR;
DAT_UnitsState::instance.units[unitID].updateTickTracker = 0;
return;
}
if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown += 1;
if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 32) {
DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown = 32;
}
DAT_UnitsState::instance.units[unitID].updateTickTracker += 1;
if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 32) {
DAT_UnitsState::instance.units[unitID].logicalState = OpenSHC::Map::Units::ULS_REMOVE;
}
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)(unitID);
}

}
}
Loading
Loading