diff --git a/cmake/compiler-flags-gl.txt b/cmake/compiler-flags-gl.txt index 226cdc7ca6..18dce0ff70 100644 --- a/cmake/compiler-flags-gl.txt +++ b/cmake/compiler-flags-gl.txt @@ -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 diff --git a/src/OpenSHC/Map/Units/CurrentUnitHasHealer.cpp b/src/OpenSHC/Map/Units/CurrentUnitHasHealer.cpp new file mode 100644 index 0000000000..2f5ed89884 --- /dev/null +++ b/src/OpenSHC/Map/Units/CurrentUnitHasHealer.cpp @@ -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; + } + +} +} diff --git a/src/OpenSHC/Map/Units/UpdateDeer.cpp b/src/OpenSHC/Map/Units/UpdateDeer.cpp new file mode 100644 index 0000000000..46c10ef2a4 --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateDeer.cpp @@ -0,0 +1,335 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Audio/SFX/SFXState.func.hpp" +#include "OpenSHC/Map/Units/TribesState.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/DE/SHCDE/eSFX.hpp" +#include "OpenSHC/Map/Units/SomeTribeBehaviorType.hpp" +#include "OpenSHC/Map/Units/States/UnitState.hpp" +#include "OpenSHC/Map/Units/UnitLogicState.hpp" + +#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp" +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_GameState.hpp" +#include "OpenSHC/Globals/DAT_SFXState.hpp" +#include "OpenSHC/Globals/DAT_TribesState.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 0x00541DE0 + void Units::UpdateDeer() + { + int const unitID = DAT_CurrentUnitSlotID::instance; + // declared at the top: declaring it in the movement case loses the match + int frameOffset = 1; + // read at the top: reading it just before the switch loses the match + int const tribe = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].tribeID; + DAT_GameState::instance.mapAndTime.deerCount++; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + if (DAT_UnitsState::instance.units[unitID].antelopeBasedRngValue == 0) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 1; + } else if (DAT_UnitsState::instance.units[unitID].antelopeBasedRngValue == 1) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 2; + } else if (DAT_UnitsState::instance.units[unitID].antelopeBasedRngValue == 2) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 3; + } + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 0 + && DAT_UnitsState::instance.units[unitID].state.generic != OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown--; + } + switch (DAT_UnitsState::instance.units[unitID].state.generic) { + case OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + if (DAT_UnitsState::instance.units[unitID].closestEnemyMicroDistance > 200) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setUnitFacingDirectionTowardsTarget, + DAT_UnitsState::ptr)(unitID, DAT_TribesState::instance.tribes[tribe].selectionTargetUnitID); + if (DAT_TribesState::instance.tribes[tribe].tribeBehaviorType == OpenSHC::Map::Units::STBT_1) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_205; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_203; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_204; + DAT_UnitsState::instance.units[unitID].field_0x3f2++; + if (DAT_UnitsState::instance.units[unitID].field_0x3f2 > 10) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::TribesState_Func::scatterTribeUnitsRandomly, + DAT_TribesState::ptr)(DAT_UnitsState::instance.units[unitID].tribeID); + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_209: + DAT_UnitsState::instance.units[unitID].field_0x3f2 = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + if (((DAT_UnitsState::instance.units[unitID].fixedRng ^ DAT_GameCore::instance.mapTimeInTicks) & 0x7f) + == 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + unitID, DAT_UnitsState::instance.units[unitID].targetX, + DAT_UnitsState::instance.units[unitID].targetY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_MOVE_TO_DESTINATION; + } + return; + case OpenSHC::Map::Units::States::US_MOVE_TO_DESTINATION: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x3f2 = 0; + if (DAT_UnitsState::instance.units[unitID].substate == 100) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 20; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed + = (DAT_UnitsState::instance.units[unitID].fixedRng & 7) + 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 321; + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x69a8[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].substate = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].seated = 0; + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected; + return; + } + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected - 8 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + return; + } + if (DAT_UnitsState::instance.units[unitID].field_0x3c2 != 0) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 20; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 5; + if (DAT_UnitsState::instance.units[unitID].animationCycleNumberHasJustIncremented) { + DAT_UnitsState::instance.units[unitID].animationFrame--; + } + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].substate = 0; + DAT_UnitsState::instance.units[unitID].seated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance] + .facingDirectionMapOrientationCorrected + + 257; + DAT_UnitsState::instance.units[unitID].field_0x3c2 = 0; + return; + } + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + return; + } + if (DAT_TribesState::instance.tribes[tribe].predatorNearby == 0 + || DAT_UnitsState::instance.units[unitID].currentIndexInPathPlan + > DAT_UnitsState::instance.units[unitID].totalSizeOfPathPlan - 2) { + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 8; + } else { + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 1; + DAT_UnitsState::instance.units[unitID].moveInstructionSpeedDelayTracker = 0; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + frameOffset = 129; + DAT_UnitsState::instance.units[unitID].movementSpeed = 1; + } + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = frameOffset; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + unitID)) { + // through a pointer, so these two stores stay ahead of the epilogue, as in the original + Unit* const unit = &DAT_UnitsState::instance.units[unitID]; + unit->animationCycleNumber = 0; + unit->substate = 0; + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_202: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x3f2 = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 129; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_203: + DAT_UnitsState::instance.units[unitID].field_0x3f2 = 0; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 2; + DAT_UnitsState::instance.units[unitID].field_0x3c2 = 1; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x671c[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } 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_0x6804[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_0x6784[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 3) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x6804[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 + 257; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].substate++; + if (DAT_UnitsState::instance.units[unitID].substate > 3) { + DAT_UnitsState::instance.units[unitID].substate = 0; + } + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_204: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x68a4[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } 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_0x68f4[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_0x68a4[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate == 3) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x68f4[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 + 257; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].substate++; + if (DAT_UnitsState::instance.units[unitID].substate > 3) { + DAT_UnitsState::instance.units[unitID].substate = 0; + } + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_205: + DAT_UnitsState::instance.units[unitID].field_0x3f2 = 0; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 4; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 321; + if (DAT_UnitsState::instance.units[unitID].seated == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x6984[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 + 88; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected - 8 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + } else { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x69cc[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 + 96; + DAT_UnitHasBecomeIdle::instance = 1; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + += DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected - 8 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].seated = 1; + } + return; + case 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[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp.field_0x6acc + [DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationCycleNumberHasJustIncremented + && DAT_UnitsState::instance.units[unitID].animationCycleNumber == 15) { + MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playSFXAtLocation, DAT_SFXState::ptr)( + DAT_UnitsState::instance.units[unitID].x, DAT_UnitsState::instance.units[unitID].y, + OpenSHC::DE::SHCDE::FX_DEER_FALL); + } + if (DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber = 480; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_117; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + return; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].gfxNumber + = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationFrame + 460; + return; + case OpenSHC::Map::Units::States::US_DEATH_02: + case OpenSHC::Map::Units::States::US_DEATH_03: + case OpenSHC::Map::Units::States::US_STONE_DEATH_01: + case OpenSHC::Map::Units::States::US_STONE_DEATH_02: + case OpenSHC::Map::Units::States::US_STONE_DEATH_03: + 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 + .field_0x6b0c[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_117; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + return; + } + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 448; + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_117: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].updateTickTracker++; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 500) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + return; + case 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; + } + } + +} +} diff --git a/src/OpenSHC/Map/Units/UpdateMerchant.cpp b/src/OpenSHC/Map/Units/UpdateMerchant.cpp new file mode 100644 index 0000000000..ca45e4697c --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateMerchant.cpp @@ -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); + } + +} +} diff --git a/src/OpenSHC/Map/Units/UpdateRabbit.cpp b/src/OpenSHC/Map/Units/UpdateRabbit.cpp new file mode 100644 index 0000000000..aac324410b --- /dev/null +++ b/src/OpenSHC/Map/Units/UpdateRabbit.cpp @@ -0,0 +1,303 @@ +#include "../Units.func.hpp" + +#include "OpenSHC/Audio/SFX/SFXState.func.hpp" +#include "OpenSHC/Map/Units/UnitsState.func.hpp" +#include "OpenSHC/DE/SHCDE/eSFX.hpp" +#include "OpenSHC/Map/LogicHelpers/Logic1.hpp" +#include "OpenSHC/Map/Units/States/UnitState.hpp" +#include "OpenSHC/Map/Units/UnitLogicState.hpp" + +#include "OpenSHC/Globals/DAT_CurrentUnitSlotID.hpp" +#include "OpenSHC/Globals/DAT_GameCore.hpp" +#include "OpenSHC/Globals/DAT_GameState.hpp" +#include "OpenSHC/Globals/DAT_SFXState.hpp" +#include "OpenSHC/Globals/DAT_TileMapState.hpp" +#include "OpenSHC/Globals/DAT_TribesState.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 0x00542630 + void Units::UpdateRabbit() + { + int const unitID = DAT_CurrentUnitSlotID::instance; + DAT_GameState::instance.mapAndTime.wildlifeCount++; + // read at the top: reading it where it is used loses the match + int const tribe = DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].tribeID; + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex + = DAT_UnitsState::instance.units[unitID].fixedRng & 0xf; + if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 9) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 2; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 10 + || DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 11) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 3; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 12) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 4; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 13) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 6; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 14) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 8; + } else if (DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex == 15) { + DAT_UnitsState::instance.units[unitID].calculatedOwnerPlayerIndex = 3; + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].stateBasedSpeed = 0; + if ((char)DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown > 0 + && DAT_UnitsState::instance.units[unitID].state.generic != OpenSHC::Map::Units::States::US_DISAPPEAR) { + DAT_UnitsState::instance.units[unitID].disappearFadeAlphaCountdown--; + } + // rabbits eat the crops on their tile and on the four neighbouring tiles + int const tile = DAT_UnitsState::instance.units[unitID].tile; + if ((DAT_TileMapState::instance.LogicLayer[tile] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[tile] = 0; + } + int neighbour + = DAT_TileMapState::instance.directionTranslationMatrix[DAT_UnitsState::instance.units[unitID].y][0] + tile; + if ((DAT_TileMapState::instance.LogicLayer[neighbour] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[neighbour] = 0; + } + neighbour + = DAT_TileMapState::instance.directionTranslationMatrix[DAT_UnitsState::instance.units[unitID].y][4] + tile; + if ((DAT_TileMapState::instance.LogicLayer[neighbour] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[neighbour] = 0; + } + neighbour + = DAT_TileMapState::instance.directionTranslationMatrix[DAT_UnitsState::instance.units[unitID].y][2] + tile; + if ((DAT_TileMapState::instance.LogicLayer[neighbour] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[neighbour] = 0; + } + neighbour + = DAT_TileMapState::instance.directionTranslationMatrix[DAT_UnitsState::instance.units[unitID].y][6] + tile; + if ((DAT_TileMapState::instance.LogicLayer[neighbour] + & (OpenSHC::Map::LogicHelpers::L_FARM_FIELD_WHEAT | OpenSHC::Map::LogicHelpers::L_FARM_FIELD_HOP)) + != 0) { + DAT_TileMapState::instance.DamageLayer[neighbour] = 0; + } + switch (DAT_UnitsState::instance.units[unitID].state.generic) { + case OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + if (DAT_UnitsState::instance.units[unitID].closestEnemyMicroDistance > 0) { + if ((unitID & 1) != 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setUnitFacingDirectionTowardsTarget, + DAT_UnitsState::ptr)(unitID, DAT_TribesState::instance.tribes[tribe].selectionTargetUnitID); + } + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_203; + return; + } + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_UNKNOWN_204; + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_209: + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 16; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSheetFrameOffset = 1; + if (((DAT_UnitsState::instance.units[unitID].fixedRng ^ DAT_GameCore::instance.mapTimeInTicks) & 0x7f) + == 0) { + MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::setDestinationForUnit, DAT_UnitsState::ptr)( + unitID, DAT_UnitsState::instance.units[unitID].targetX, + DAT_UnitsState::instance.units[unitID].targetY, 0); + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_MOVE_TO_DESTINATION; + } + return; + case OpenSHC::Map::Units::States::US_MOVE_TO_DESTINATION: + case OpenSHC::Map::Units::States::US_UNKNOWN_120: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 16; + DAT_UnitsState::instance.units[unitID].animationSheetFrameOffset = 1; + DAT_UnitsState::instance.units[unitID].moveInstructionSpeedDelayTracker = 0; + DAT_UnitsState::instance.units[unitID].moveDelay = 0; + DAT_UnitsState::instance.units[unitID].stateBasedSpeed = 0; + DAT_UnitsState::instance.units[unitID].field_0x32d = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 1; + if (DAT_UnitsState::instance.units[unitID].substate == 100) { + DAT_UnitsState::instance.units[unitID].movementSpeed = 40; + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 4; + DAT_UnitsState::instance.units[unitID].rabbitMovementSlowdown++; + if (DAT_UnitsState::instance.units[unitID].rabbitMovementSlowdown + > (DAT_UnitsState::instance.units[unitID].fixedRng & 0xf)) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0; + DAT_UnitsState::instance.units[unitID].movementSpeed + = (DAT_UnitsState::instance.units[unitID].fixedRng & 1) + 1; + } + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x720c[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[unitID].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].seated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].substate = 0; + DAT_UnitsState::instance.units[unitID].movementSpeed + = (DAT_UnitsState::instance.units[unitID].fixedRng & 1) + 1; + } + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + return; + } + DAT_UnitsState::instance.units[unitID].movementSpeed + = (DAT_UnitsState::instance.units[unitID].fixedRng & 1) + 1; + if (MACRO_CALL_MEMBER(OpenSHC::Map::Units::UnitsState_Func::hasUnitReachedDestination, DAT_UnitsState::ptr)( + unitID)) { + // through a pointer, so these two stores stay ahead of the epilogue, as in the original + Unit* const unit = &DAT_UnitsState::instance.units[unitID]; + unit->animationCycleNumber = 0; + unit->substate = 0; + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_203: + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x3c2 = 1; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].seated = 1; + if ((unitID & 3) == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x7178[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if ((unitID & 3) == 1) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x71a0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if ((unitID & 3) == 2) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x71d4[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x7268[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitHasBecomeIdle::instance = 1; + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + return; + } + if ((unitID & 3) == 3) { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].facingDirectionMapOrientationCorrected + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } 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[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_204: + DAT_UnitsState::instance.units[unitID].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationSpeed = 2; + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].seated = 1; + if (DAT_UnitsState::instance.units[unitID].substate == 0) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x7268[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + } else if (DAT_UnitsState::instance.units[unitID].substate == 1) { + DAT_UnitsState::instance.units[unitID].animationFrame + = (char)DAT_UnitPropertiesDefinedData::instance.Frames_Shared_UnitClimbingUp + .field_0x72a0[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 + 249 + + DAT_UnitsState::instance.units[unitID].animationFrame * 8; + } + if (DAT_UnitHasBecomeIdle::instance != 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].animationCycleNumber = 0; + DAT_UnitsState::instance.units[unitID].substate++; + if (DAT_UnitsState::instance.units[unitID].substate > 1) { + DAT_UnitsState::instance.units[unitID].substate = 0; + } + DAT_UnitsState::instance.units[unitID].state.generic + = OpenSHC::Map::Units::States::US_DETERMINE_NEXT_STATEUnk; + } + return; + case OpenSHC::Map::Units::States::US_DEATH_01: + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 4; + 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_0x72e0[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_117; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 384; + } + if (DAT_UnitsState::instance.units[unitID].animationCycleNumberHasJustIncremented + && DAT_UnitsState::instance.units[unitID].animationCycleNumber == 1) { + MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playSFXAtLocation, DAT_SFXState::ptr)( + DAT_UnitsState::instance.units[unitID].x, DAT_UnitsState::instance.units[unitID].y, + OpenSHC::DE::SHCDE::FX_RABBIT_DIE); + } + return; + case OpenSHC::Map::Units::States::US_DEATH_02: + case OpenSHC::Map::Units::States::US_DEATH_03: + case OpenSHC::Map::Units::States::US_STONE_DEATH_01: + case OpenSHC::Map::Units::States::US_STONE_DEATH_02: + case OpenSHC::Map::Units::States::US_STONE_DEATH_03: + DAT_UnitsState::instance.units[unitID].facingDirection = 0; + DAT_UnitsState::instance.units[unitID].animationSpeed = 4; + 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_0x7310[DAT_UnitsState::instance.units[unitID].animationCycleNumber]; + if (DAT_UnitsState::instance.units[unitID].animationFrame <= 0) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].state.generic + = OpenSHC::Map::Units::States::US_UNKNOWN_117; + DAT_UnitsState::instance.units[unitID].updateTickTracker = 0; + } else { + DAT_UnitsState::instance.units[unitID].gfxNumber + = DAT_UnitsState::instance.units[unitID].animationFrame + 408; + } + if (DAT_UnitsState::instance.units[unitID].animationCycleNumberHasJustIncremented + && DAT_UnitsState::instance.units[unitID].animationCycleNumber == 1) { + MACRO_CALL_MEMBER(OpenSHC::Audio::SFX::SFXState_Func::playSFXAtLocation, DAT_SFXState::ptr)( + DAT_UnitsState::instance.units[unitID].x, DAT_UnitsState::instance.units[unitID].y, + OpenSHC::DE::SHCDE::FX_RABBIT_DIE); + } + return; + case OpenSHC::Map::Units::States::US_UNKNOWN_117: + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].field_0x30_animRelated = 0; + DAT_UnitsState::instance.units[unitID].updateTickTracker++; + if (DAT_UnitsState::instance.units[unitID].updateTickTracker > 5) { + DAT_UnitsState::instance.units[DAT_CurrentUnitSlotID::instance].updateTickTracker = 0; + DAT_UnitsState::instance.units[unitID].state.generic = OpenSHC::Map::Units::States::US_DISAPPEAR; + } + return; + case 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; + } + } + +} +} diff --git a/src/OpenSHC/UI/Rendering/RenderAnimatedTutorialFloatOverlay.cpp b/src/OpenSHC/UI/Rendering/RenderAnimatedTutorialFloatOverlay.cpp new file mode 100644 index 0000000000..161d29cb16 --- /dev/null +++ b/src/OpenSHC/UI/Rendering/RenderAnimatedTutorialFloatOverlay.cpp @@ -0,0 +1,98 @@ +#include "../Rendering.func.hpp" + +#include "OpenSHC/UI/Rendering/TextureRenderCore.func.hpp" +#include "OpenSHC/IO/Graphics/GmID.hpp" +#include "OpenSHC/Rendering/Enums/RenderTarget.hpp" +#include "OpenSHC/Rendering/ScreenResolutionEnum.hpp" + +#include "OpenSHC/Globals/DAT_00df5540.hpp" +#include "OpenSHC/Globals/DAT_TextureRenderCoreObject.hpp" +#include "OpenSHC/Globals/DAT_ViewportRenderState.hpp" +#include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" +#include "OpenSHC/Globals/INT_00df563c.hpp" +#include "OpenSHC/Globals/INT_00df5640.hpp" + +namespace OpenSHC { +namespace UI { + + // Draws the animated GID_FLOATS_NEW frames to the screen menu and, with the camera offset, to the map. + // FUNCTION: STRONGHOLDCRUSADER 0x004BC790 + void Rendering::RenderAnimatedTutorialFloatOverlay(int x, int y) + { + if (DAT_00df5540::instance != 0) { + return; + } + if (!(INT_00df5640::instance & 1)) { + INT_00df5640::instance |= 1; + INT_00df563c::instance = timeGetTime(); + } + DWORD const now = timeGetTime(); + int frame = (now - INT_00df563c::instance) / 60; + if (frame >= 10) { + frame = 0; + INT_00df563c::instance = now; + } + // two steps: one subtraction loses the match + x -= 8; + y -= 32; + int resolutionYOffset = 0; + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1024x768) { + resolutionYOffset = 168; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x1024) { + resolutionYOffset = 424; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x1200) { + resolutionYOffset = 600; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1280x720) { + resolutionYOffset = 120; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1440x900) { + resolutionYOffset = 300; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1080) { + resolutionYOffset = 480; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1920x1200) { + resolutionYOffset = 600; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1440) { + resolutionYOffset = 840; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_2560x1600) { + resolutionYOffset = 1000; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1366x768) { + resolutionYOffset = 168; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1360x768) { + resolutionYOffset = 168; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1680x1050) { + // fixme: every other offset is the screen height - 600 (450 here); the original has 4050 + resolutionYOffset = 4050; + } + if (DAT_WindowAndDirectDraw::instance.currentGameResolution == OpenSHC::Rendering::SRE_1600x900) { + resolutionYOffset = 300; + } + RenderTargetInt const previousDrawBuffer = DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue; + x -= 28; + y -= 69; + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_SCREEN_MENU; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderGMWithAlphaMask, + DAT_TextureRenderCoreObject::ptr)(OpenSHC::IO::Graphics::GID_FLOATS_NEW, frame + 261, + DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth + x, y + resolutionYOffset, + OpenSHC::IO::Graphics::GID_FLOATS_NEW, frame + 271, 0); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = OpenSHC::Rendering::Enums::RT_MAP_GAME; + MACRO_CALL_MEMBER(OpenSHC::UI::Rendering::TextureRenderCore_Func::renderGMWithAlphaMask, + DAT_TextureRenderCoreObject::ptr)(OpenSHC::IO::Graphics::GID_FLOATS_NEW, frame + 261, + DAT_ViewportRenderState::instance.viewportState.currentCameraOffsetX + + DAT_WindowAndDirectDraw::instance.mainMenuBorderWidth + x, + DAT_ViewportRenderState::instance.viewportState.currentCameraOffsetY + resolutionYOffset + y, + OpenSHC::IO::Graphics::GID_FLOATS_NEW, frame + 271, 0); + DAT_TextureRenderCoreObject::instance.drawBufferChoiceValue = previousDrawBuffer; + } + +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index 6ec8017690..a230c51a87 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -30097,7 +30097,7 @@ SHC_3BB0A8C1_0x004BC6F0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004BC770 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x004BC790 | 0.0% | Pending +SHC_3BB0A8C1_0x004BC790 | 100.0% | Reimplemented SHC_3BB0A8C1_0x004BC910 | 100.0% | Reimplemented @@ -59425,7 +59425,7 @@ SHC_3BB0A8C1_0x0053A017 | 0.0% | Pending SHC_3BB0A8C1_0x0053A018 | 0.0% | Pending -SHC_3BB0A8C1_0x0053A020 | 0.0% | Pending +SHC_3BB0A8C1_0x0053A020 | 100.0% | Reimplemented SHC_3BB0A8C1_0x0053A070 | 0.0% | Pending @@ -60337,11 +60337,11 @@ SHC_3BB0A8C1_0x00540440 | 0.0% | Pending SHC_3BB0A8C1_0x00540EC0 | 100.0% | Reimplemented -SHC_3BB0A8C1_0x005416B0 | 0.0% | Pending +SHC_3BB0A8C1_0x005416B0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00541A30 | 0.0% | Pending -SHC_3BB0A8C1_0x00541DE0 | 0.0% | Pending +SHC_3BB0A8C1_0x00541DE0 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00542528 | 0.0% | Pending @@ -60787,7 +60787,7 @@ SHC_3BB0A8C1_0x00542628 | 0.0% | Pending SHC_3BB0A8C1_0x00542629 | 0.0% | Pending -SHC_3BB0A8C1_0x00542630 | 0.0% | Pending +SHC_3BB0A8C1_0x00542630 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00542C0C | 0.0% | Pending