diff --git a/cmake/compiler-flags-gl.txt b/cmake/compiler-flags-gl.txt index 650a761a7a..c913c5d910 100644 --- a/cmake/compiler-flags-gl.txt +++ b/cmake/compiler-flags-gl.txt @@ -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 diff --git a/src/OpenSHC/Map/Units/UpdateBurningMan.cpp b/src/OpenSHC/Map/Units/UpdateBurningMan.cpp new file mode 100644 index 0000000000..b78e2c48af --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateBurningMan.cpp @@ -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); + } + +} +} diff --git a/src/OpenSHC/Map/Units/UpdateDrunkard.cpp b/src/OpenSHC/Map/Units/UpdateDrunkard.cpp new file mode 100644 index 0000000000..b12d041e8c --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateDrunkard.cpp @@ -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); + } + +} +} diff --git a/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp b/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp new file mode 100644 index 0000000000..bb48047b93 --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateInnkeeper.cpp @@ -0,0 +1,387 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Map/Buildings/BuildingsState.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Game/Resources/ResourceType.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_UnitHasBecomeIdle.hpp" +#include "OpenSHC/Globals/DAT_UnitPropertiesDefinedData.hpp" +#include "OpenSHC/Globals/DAT_UnitsState.hpp" + +namespace OpenSHC { +namespace Map { + + // FUNCTION: STRONGHOLDCRUSADER 0x00540EC0 + void Units::UpdateInnkeeper() + { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].calculatedOwnerPlayerIndex = 3; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed = 3; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + UnitStateShort const state = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic; + if (state == OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].isDisappearingUnk != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown -= 1; + if ((char)DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown + < 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].isDisappearingUnk = 0; + } + return; + } + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].goToRallyPoint != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].goToRallyPoint = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_RELOAD_WEAPONUnk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetX_2, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetY_2, 0); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_IDLEUnk) { + // serving ale + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0x5a70 + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 1) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0x5aa4 + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 2) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0x5b10 + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .DAT_InnKeeperAnimationIndices[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance] + .animationCycleNumber]; + } + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 257; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 256; + } + if (DAT_UnitHasBecomeIdle::instance == 0) { + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate += 1; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate >= 4) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0; + } + int const storage = MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::getStorageBuildingForResourceTypeAndAmount, + DAT_BuildingsState::ptr)(OpenSHC::Game::Resources::RT_ALE, 1, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner); + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(storage, 1) + == 0) { + return; + } + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[storage].buildingEntryX, + DAT_BuildingsState::instance.buildings[storage].buildingEntryY, 0)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID = storage; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID + = DAT_BuildingsState::instance.buildings[storage].uid; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) { + // fetching ale from the stockpile + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + <= 200) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed = 1; + } + if (!MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance)) { + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::getBuildingResourceAmountByUid, + DAT_BuildingsState::ptr)( + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID, + OpenSHC::Game::Resources::RT_ALE) + <= 0) { + int const storage = MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::getStorageBuildingForResourceTypeAndAmount, + DAT_BuildingsState::ptr)(OpenSHC::Game::Resources::RT_ALE, 1, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner); + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(storage, 1) + != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID + = storage; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID + = DAT_BuildingsState::instance.buildings[storage].uid; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[storage].buildingEntryX, + DAT_BuildingsState::instance.buildings[storage].buildingEntryY, 0); + return; + } + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setWorkplaceBuildingEntryAsTarget, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance, 1)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_RELOAD_WEAPONUnk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetX_2, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetY_2, 0); + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].resourceToDeposit = 1; + // The failure follows the then-arm, as in the original (an early return: quick_diff 1.0000 -> 0.9723) + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setWorkplaceBuildingEntryAsTarget, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance, 1)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_3Unk; + if (!MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetX_2, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetY_2, 0)) { + 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; + } + MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::addResourceToStockpile, DAT_BuildingsState::ptr)( + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID, + OpenSHC::Game::Resources::RT_ALE, -1, 16, 1); + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_3Unk) { + // bringing the ale to the inn + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 129; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + <= 150) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].movementSpeed = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 1; + } + if (!MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance)) { + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_AIM_WEAPONUnk; + DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs += 160; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].resourceToDeposit = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + // The full inn follows the then-arm, as in the original (an early return: quick_diff 1.0000 -> 0.9822) + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + < 400) { + DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .field_0x28a = 300; + int const storage = MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::getStorageBuildingForResourceTypeAndAmount, + DAT_BuildingsState::ptr)(OpenSHC::Game::Resources::RT_ALE, 1, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner); + // The failure follows the then-arm, as in the original (an early return: quick_diff 1.0000 -> 0.9881) + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(storage, 1) + != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID + = storage; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID + = DAT_BuildingsState::instance.buildings[storage].uid; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[storage].buildingEntryX, + DAT_BuildingsState::instance.buildings[storage].buildingEntryY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + return; + } + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + return; + } + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + return; + } + if (state == OpenSHC::Map::Units::States::US_RELOAD_WEAPONUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_IDLEUnk; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_AIM_WEAPONUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .field_0x28a = 300; + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + <= 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::resetUnitMovementState, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_IDLEUnk; + return; + } + if (DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .flagonsOfAleOrCheeseOrReleaseDogs + >= 400) { + return; + } + int const storage = MACRO_CALL_MEMBER( + OpenSHC::Map::Buildings::BuildingsState_Func::getStorageBuildingForResourceTypeAndAmount, + DAT_BuildingsState::ptr)(OpenSHC::Game::Resources::RT_ALE, 1, + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].owner); + if (MACRO_CALL_MEMBER(OpenSHC::Map::Buildings::BuildingsState_Func::buildingIsAccessible, + DAT_BuildingsState::ptr)(storage, 1) + == 0) { + return; + } + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::resetUnitMovementState, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetID_OR_targetBuildingID = storage; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].targetUID + = DAT_BuildingsState::instance.buildings[storage].uid; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + DAT_CurrentUnitSlotID::instance, DAT_BuildingsState::instance.buildings[storage].buildingEntryX, + DAT_BuildingsState::instance.buildings[storage].buildingEntryY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + return; + } + if (state == OpenSHC::Map::Units::States::US_UNKNOWN_108) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + return; + } + if (state == OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown += 1; + if ((char)DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown + > 32) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 32; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker += 1; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker > 32) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_DEATH_01) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirection = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + 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.ANIM_Frames_UnitDeath + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 312; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 288; + } + 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].updateTickTracker = 0; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_DEATH_03) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirection = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + 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.ANIM_Frames_UnitDeath + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 360; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 336; + } + 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].updateTickTracker = 0; + } + return; + } + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].facingDirection = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + 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.ANIM_Frames_UnitDeath + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 336; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 312; + } + 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].updateTickTracker = 0; + } + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_IDLEUnk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::makeUnitStopWalkingByClearingPathProgressState, + DAT_UnitsState::ptr)(DAT_CurrentUnitSlotID::instance); + } + +} +} diff --git a/src/OpenSHC/Map/Units/UpdateMiner.cpp b/src/OpenSHC/Map/Units/UpdateMiner.cpp new file mode 100644 index 0000000000..ad4bb43c0d --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateMiner.cpp @@ -0,0 +1,137 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Game/GameStateStructures.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Game/GameMode.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_GameSynchronyState.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 0x005401D0 + void Units::UpdateMiner() + { + int const unitID = DAT_CurrentUnitSlotID::instance; + int const workplace = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1; + if (DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SOLITARY) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 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].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_UnitsState::instance.units[unitID].isDisappearingUnk != 0) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown -= 1; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown < 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[unitID].isDisappearingUnk = 0; + } + return; + } + if (DAT_UnitsState::instance.units[unitID].goToRallyPoint != 0) { + DAT_UnitsState::instance.units[unitID].goToRallyPoint = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + unitID, DAT_UnitsState::instance.units[unitID].targetX_2, + DAT_UnitsState::instance.units[unitID].targetY_2, 0); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_IDLEUnk) { + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + DAT_BuildingsState::instance.buildings[workplace] + .workers[DAT_UnitsState::instance.units[unitID].workerIndex] = unitID; + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + unitID)) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + unitID); + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_IDLEUnk; + } + return; + } + if (state == OpenSHC::Map::Units::States::US_UNKNOWN_108) { + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + 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[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + if (DAT_UnitsState::instance.units[unitID].killedFlagUnk == 0) { + MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::setLastEncounteredTroopUnit, + DAT_GameState::ptr)(DAT_UnitsState::instance.units[unitID].owner, unitID); + } + } + return; + } + // An else-if chain keeps the shared tail in the second arm (early returns: quick_diff 1.0000 -> 0.9385) + if (state == OpenSHC::Map::Units::States::US_DEATH_01) { + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .ANIM_Frames_UnitDeath[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 280; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 256; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_DISAPPEAR; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + } + } else if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(unitID)) { + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .ANIM_Frames_UnitDeath[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 304; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 280; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + } + } else { + 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); + } + } + +} +} diff --git a/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp b/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp new file mode 100644 index 0000000000..401eee822b --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateQuarryMason.cpp @@ -0,0 +1,158 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Game/GameStateStructures.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/Game/GameMode.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_GameSynchronyState.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 0x00550A50 + void Units::UpdateQuarryMason() + { + int const unitID = DAT_CurrentUnitSlotID::instance; + int const workplace = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1; + if (DAT_GameSynchronyState::instance.currentGameMode != OpenSHC::Game::GM_SOLITARY) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 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].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + if (DAT_UnitsState::instance.units[unitID].isDisappearingUnk != 0) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown -= 1; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown < 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].disappearFadeAlphaCountdown = 0; + DAT_UnitsState::instance.units[unitID].isDisappearingUnk = 0; + } + return; + } + if (DAT_UnitsState::instance.units[unitID].goToRallyPoint != 0) { + DAT_UnitsState::instance.units[unitID].goToRallyPoint = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_STATE_2Unk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + unitID, DAT_UnitsState::instance.units[unitID].targetX_2, + DAT_UnitsState::instance.units[unitID].targetY_2, 0); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_STATE_2Unk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + unitID)) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_IDLEUnk; + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::commitUnitLocation, DAT_UnitsState::ptr)( + unitID); + } + return; + } + if (state == OpenSHC::Map::Units::States::US_IDLEUnk) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_BuildingsState::instance.buildings[workplace] + .workers[DAT_UnitsState::instance.units[unitID].workerIndex] = unitID; + return; + } + if (state == OpenSHC::Map::Units::States::US_UNKNOWN_108) { + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + 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 + .field_0x41bc[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 + 305; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 297 + + 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; + } + // An else-if chain keeps the shared tail in the second arm (early returns: quick_diff 1.0000 -> 0.9507) + if (state == OpenSHC::Map::Units::States::US_DEATH_01) { + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + 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 + .field_0x4ab0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 280; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 256; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + } else if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::checkIfCitizenUnitIsAliveBasedOnState, + DAT_UnitsState::ptr)(unitID)) { + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + 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 + .field_0x4ab0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].gfxNumber = 304; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 280; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + } else 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[DAT_CurrentUnitSlotID::instance].logicalState + = OpenSHC::Map::Units::ULS_REMOVE; + if (DAT_UnitsState::instance.units[unitID].killedFlagUnk == 0) { + MACRO_CALL_MEMBER(OpenSHC::Game::GameStateStructures_Func::setLastEncounteredTroopUnit, + DAT_GameState::ptr)(DAT_UnitsState::instance.units[unitID].owner, unitID); + } + } + // The slot is read again here, as the original does (the workplace local: quick_diff 1.0000 -> 0.8536) + DAT_BuildingsState::instance + .buildings[DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].workplaceBuildingID_1] + .idleTimerUnk = 4000; + } else { + 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); + } + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 4edb3f2020..9a39839496 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -59659,7 +59659,7 @@ SHC_3BB0A8C1_0x0053BB70 | 100.0% | Reimplemented SHC_3BB0A8C1_0x0053BB90 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x0053BC20 | 0.0% | Pending +SHC_3BB0A8C1_0x0053BC20 | 100.0% | Reimplemented SHC_3BB0A8C1_0x0053BE00 | 0.0% | Pending @@ -60331,11 +60331,11 @@ SHC_3BB0A8C1_0x005401C9 | 0.0% | Pending SHC_3BB0A8C1_0x005401CA | 0.0% | Pending -SHC_3BB0A8C1_0x005401D0 | 0.0% | Pending +SHC_3BB0A8C1_0x005401D0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00540440 | 0.0% | Pending -SHC_3BB0A8C1_0x00540EC0 | 0.0% | Pending +SHC_3BB0A8C1_0x00540EC0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x005416B0 | 0.0% | Pending @@ -62521,7 +62521,7 @@ SHC_3BB0A8C1_0x0054E6C0 | 0.0% | Pending SHC_3BB0A8C1_0x0054F860 | 0.0% | Pending -SHC_3BB0A8C1_0x00550A50 | 0.0% | Pending +SHC_3BB0A8C1_0x00550A50 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00550D70 | 0.0% | Pending @@ -65159,7 +65159,7 @@ SHC_3BB0A8C1_0x00566010 | 0.0% | Pending SHC_3BB0A8C1_0x00566750 | 0.0% | Pending -SHC_3BB0A8C1_0x00567320 | 0.0% | Pending +SHC_3BB0A8C1_0x00567320 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00567640 | 0.0% | Pending