Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/OpenSHC/AI/AICState/requestGoods.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ namespace AI {
== 0) {
continue;
}
if (DAT_GameState::instance.playerDataArray[i].requestedGoodsArray1Unk[playerID] != 0) {
if (DAT_GameState::instance.playerDataArray[i].goodsRequestTypeByPlayer[playerID] != 0) {
continue;
}

DAT_GameState::instance.playerDataArray[i].requestedGoodsArray1Unk[playerID] = resourceType;
DAT_GameState::instance.playerDataArray[i].requestedGoodsArray2Unk[playerID] = amount;
DAT_GameState::instance.playerDataArray[i].goodsRequestTypeByPlayer[playerID] = resourceType;
DAT_GameState::instance.playerDataArray[i].goodsRequestAmountByPlayer[playerID] = amount;
MACRO_CALL_MEMBER(OpenSHC::AI::AICState_Func::playGoodsRequestBikFromPlayerToPlayer, this)(playerID, i);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/OpenSHC/Game/Player/PlayerData.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ namespace Game {
AISiegeUnitCreation aiSiegeCreationInformation[4][5]; // 0x0000368C length: 400
int attackAssaultDelayRelatedValue; // 0x0000381C length: 4
BOOLEnum isNotNervousByEnemyTroopValue; // 0x00003820 length: 4
short requestedGoodsArray1Unk[10]; // 0x00003824 length: 20
short requestedGoodsArray2Unk[10]; // 0x00003838 length: 20
short goodsRequestTypeByPlayer[10]; // 0x00003824 length: 20
short goodsRequestAmountByPlayer[10]; // 0x00003838 length: 20
int requestStateUnk; // 0x0000384C length: 4
int requestedAttackTargetUnk; // 0x00003850 length: 4
int unitPatrolRecommandRelatedDelayValue; // 0x00003854 length: 4
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#include "../InGameEventUnionVersion.func.hpp"

namespace OpenSHC {
namespace Game {
namespace ScenarioEvents {

// FUNCTION: STRONGHOLDCRUSADER 0x004B77A0
ScenarioEventCondition* InGameEventUnionVersion::initializeScenarioEvent()
{
this->header.month = 0;
this->header.year = 1181;
this->header.tl_type = 3;
Comment thread
TheRedDaemon marked this conversation as resolved.
Resolved
this->data.scenario.ScenarioEventType = 0;
this->data.scenario.actionData = 0;
*(short*)&this->data.scenario.allOrAnyCondition = 1;
Comment thread
TheRedDaemon marked this conversation as resolved.
Resolved
this->data.scenario.repeat = 0;
ScenarioEventCondition* condition = this->data.scenario.conditions;
for (int i = 0; i < countof(this->data.scenario.conditions); ++i) {
condition->enabled = 0;
condition->value = 0;
condition->subType = 0;
++condition;
}
return condition;
}

}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#include "../InGameEventUnionVersion.func.hpp"

namespace OpenSHC {
namespace Game {
namespace ScenarioEvents {

// FUNCTION: STRONGHOLDCRUSADER 0x004B7730
BOOLEnum InGameEventUnionVersion::resetEvent()
{
this->header.month = 0;
this->header.year = 1181;
this->data.invasion.repeatMonths = 0;
this->header.tl_type = 1;
this->data.invasion.crusaderArabian = 0;
this->data.invasion.totalUnitCount = 0;
for (int i = 0; i < countof(this->data.invasion.unitCountsPerUnitType); ++i) {
this->data.invasion.unitCountsPerUnitType[i] = 0;
}
this->data.invasion.invasionPoint = 0;
return FALSE;
}

}
}
}
64 changes: 64 additions & 0 deletions src/OpenSHC/Game/Skirmish/RecalculateAllies.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#include "../Skirmish.func.hpp"

#include "OpenSHC/Map/Units/UnitsState.func.hpp"

#include "OpenSHC/Globals/DAT_AlliesCount.hpp"
#include "OpenSHC/Globals/DAT_GameCore.hpp"
#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp"
#include "OpenSHC/Globals/DAT_LastTeamMemberIndex.hpp"
#include "OpenSHC/Globals/DAT_SomeTeamMemberPlayerIDArray.hpp"
#include "OpenSHC/Globals/DAT_UnitsState.hpp"

namespace OpenSHC {
namespace Game {
namespace Skirmish {

// FUNCTION: STRONGHOLDCRUSADER 0x004AC570
void RecalculateAllies()
{
if ((int)DAT_GameCore::instance.mapTimeInTicks - (int)DAT_GameCore::instance.section1127 > 400
&& MACRO_CALL_MEMBER(Map::Units::UnitsState_Func::getAliveLordForPlayer, DAT_UnitsState::ptr)(
DAT_GameSynchronyState::instance.currentPlayerSlotID)
== 0) {
DAT_AlliesCount::instance = 0;
return;
}
int const team
= DAT_GameState::instance.mapAndTime.playerTeams[DAT_GameSynchronyState::instance.currentPlayerSlotID];
DAT_AlliesCount::instance = 0;
for (int player = 1; player < countof(DAT_GameSynchronyState::instance.currentPlayerFullIDArray);
++player) {
if (player == DAT_GameSynchronyState::instance.currentPlayerSlotID) {
continue;
}
if (DAT_GameSynchronyState::instance.currentPlayerFullIDArray[player] == -1
&& DAT_GameSynchronyState::instance.currentAIArray[player] == 0) {
continue;
}
if ((int)DAT_GameCore::instance.mapTimeInTicks - (int)DAT_GameCore::instance.section1127 > 400
&& MACRO_CALL_MEMBER(Map::Units::UnitsState_Func::getAliveLordForPlayer, DAT_UnitsState::ptr)(
player)
== 0) {
continue;
}
if (team != DAT_GameState::instance.mapAndTime.playerTeams[player]) {
continue;
}
DAT_SomeTeamMemberPlayerIDArray::instance[DAT_AlliesCount::instance] = player;
DAT_AlliesCount::instance += 1;
if (DAT_AlliesCount::instance >= 6) {
break;
}
}
if ((int)DAT_LastTeamMemberIndex::instance >= DAT_AlliesCount::instance) {
DAT_LastTeamMemberIndex::instance = DAT_AlliesCount::instance - 1;
}
if ((int)DAT_LastTeamMemberIndex::instance < 0) {
DAT_LastTeamMemberIndex::instance = 0;
}
}

}
}
}
119 changes: 119 additions & 0 deletions src/OpenSHC/Game/Skirmish/SetupSkirmishBalanceAndOrIntensity.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
#include "../Skirmish.func.hpp"

#include "OpenSHC/Synchrony/GameSynchronyState.func.hpp"

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

namespace OpenSHC {
namespace Game {
namespace Skirmish {

// FUNCTION: STRONGHOLDCRUSADER 0x00429710
void SetupSkirmishBalanceAndOrIntensity()
Comment thread
TheRedDaemon marked this conversation as resolved.
Resolved
{
switch (DAT_GameSynchronyState::instance.skirmishTechLevel) {
case 0:
DAT_GameSynchronyState::instance.skirmishGameIntensityType = 1;
DAT_GameSynchronyState::instance.skirmishGameIntensityType2 = 0;
DAT_GameSynchronyState::instance.skirmishDefaultPopularity = 80;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[0] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[1] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[3] = 1;
break;
case 1:
DAT_GameSynchronyState::instance.skirmishGameIntensityType = 1;
DAT_GameSynchronyState::instance.skirmishGameIntensityType2 = 1;
DAT_GameSynchronyState::instance.skirmishDefaultPopularity = 80;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[0] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[1] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[3] = 1;
break;
case 2:
DAT_GameSynchronyState::instance.skirmishGameIntensityType = 2;
DAT_GameSynchronyState::instance.skirmishGameIntensityType2 = 1;
DAT_GameSynchronyState::instance.skirmishDefaultPopularity = 80;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[0] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[1] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[3] = 1;
break;
case 3:
DAT_GameSynchronyState::instance.skirmishGameIntensityType = 2;
DAT_GameSynchronyState::instance.skirmishGameIntensityType2 = 2;
DAT_GameSynchronyState::instance.skirmishDefaultPopularity = 80;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[0] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[1] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[3] = 1;
break;
case 4:
DAT_GameSynchronyState::instance.skirmishGameIntensityType = 3;
DAT_GameSynchronyState::instance.skirmishGameIntensityType2 = 3;
DAT_GameSynchronyState::instance.skirmishDefaultPopularity = 80;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[0] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[1] = 1;
DAT_GameSynchronyState::instance.skirmishUnknownSetting1[3] = 1;
break;
}

switch (DAT_GameSynchronyState::instance.skirmishGameIntensityType) {
case 1:
for (int i = 0; i < countof(DAT_GameSynchronyState::instance.skirmishIntensityRelatedArray); ++i) {
DAT_GameSynchronyState::instance.skirmishIntensityRelatedArray[i]
= DAT_RenderingDefinedData::instance
.SkirmishIntensityRelatedArray[0][DAT_GameSynchronyState::instance.skirmishTechLevel][i];
}
break;
case 2:
for (int i = 0; i < countof(DAT_GameSynchronyState::instance.skirmishIntensityRelatedArray); ++i) {
DAT_GameSynchronyState::instance.skirmishIntensityRelatedArray[i]
= DAT_RenderingDefinedData::instance
.SkirmishIntensityRelatedArray[1][DAT_GameSynchronyState::instance.skirmishTechLevel][i];
}
break;
case 3:
for (int i = 0; i < countof(DAT_GameSynchronyState::instance.skirmishIntensityRelatedArray); ++i) {
DAT_GameSynchronyState::instance.skirmishIntensityRelatedArray[i]
= DAT_RenderingDefinedData::instance
.SkirmishIntensityRelatedArray[2][DAT_GameSynchronyState::instance.skirmishTechLevel][i];
}
break;
}

switch (DAT_GameSynchronyState::instance.skirmishGameIntensityType2) {
case 0:
for (int i = 0; i < countof(DAT_GameSynchronyState::instance.skirmishBalanceRelatedArrayUnk1); ++i) {
DAT_GameSynchronyState::instance.skirmishBalanceRelatedArrayUnk1[i] = 0;
}
break;
case 1:
for (int i = 0; i < countof(DAT_GameSynchronyState::instance.skirmishBalanceRelatedArrayUnk1); ++i) {
DAT_GameSynchronyState::instance.skirmishBalanceRelatedArrayUnk1[i]
= DAT_RenderingDefinedData::instance
.SkirmishIntensityRelatedArray2[DAT_GameSynchronyState::instance.skirmishTechLevel][i];
}
break;
case 2:
for (int i = 0; i < countof(DAT_GameSynchronyState::instance.skirmishBalanceRelatedArrayUnk1); ++i) {
DAT_GameSynchronyState::instance.skirmishBalanceRelatedArrayUnk1[i]
= DAT_RenderingDefinedData::instance.SkirmishIntensityRelatedArray2[5
+ DAT_GameSynchronyState::instance.skirmishTechLevel][i];
}
break;
case 3:
for (int i = 0; i < countof(DAT_GameSynchronyState::instance.skirmishBalanceRelatedArrayUnk1); ++i) {
DAT_GameSynchronyState::instance.skirmishBalanceRelatedArrayUnk1[i]
= DAT_RenderingDefinedData::instance.SkirmishIntensityRelatedArray2[10
+ DAT_GameSynchronyState::instance.skirmishTechLevel][i];
}
break;
}

MACRO_CALL_MEMBER(Synchrony::GameSynchronyState_Func::queueCommand, DAT_GameSynchronyState::ptr)(
Commands::GCT_CHANGE_GAME_INTENSITY_OR_BALANCE);
DAT_GameSynchronyState::instance.field_0x1072e8 = -1;
DAT_GameSynchronyState::instance.field_0x1072ec = -1;
}

}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#include "../SkirmishLobbySetupStructure.func.hpp"

#include "OpenSHC/Globals/DAT_GameCore.hpp"
#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp"

namespace OpenSHC {
namespace Game {
namespace Skirmish {

// FUNCTION: STRONGHOLDCRUSADER 0x00486C40
void SkirmishLobbySetupStructure::commitSkirmishSettings()
{
this->mapu4int2 = DAT_GameSynchronyState::instance.skirmishAutoSaveEveryMinutes;
this->mbr_0x4 = DAT_GameState::instance.mapAndTime.skirmishFogOfWar;
strcpy(this->mapName, DAT_GameSynchronyState::instance.mapName);
for (int player = 0; player < countof(this->roundTableOrderArray); ++player) {
this->roundTableOrderArray[player] = DAT_GameSynchronyState::instance.DAT_RoundTableOrderArray[player];
this->playerGroupArray[player] = DAT_GameSynchronyState::instance.DAT_PlayerGroupArray[player];
this->currentAIArray[player] = DAT_GameSynchronyState::instance.currentAIArray[player];
this->aiVariationArray[player] = DAT_GameSynchronyState::instance.aiVariationArray[player];
}
this->slot1Position = DAT_GameSynchronyState::instance.playerPositionsArray[0];
this->slot2Position = DAT_GameSynchronyState::instance.playerPositionsArray[1];
this->slot3Position = DAT_GameSynchronyState::instance.playerPositionsArray[2];
this->slot4Position = DAT_GameSynchronyState::instance.playerPositionsArray[3];
this->slot5Position = DAT_GameSynchronyState::instance.playerPositionsArray[4];
this->slot6Position = DAT_GameSynchronyState::instance.playerPositionsArray[5];
this->slot7Position = DAT_GameSynchronyState::instance.playerPositionsArray[6];
this->slot8Position = DAT_GameSynchronyState::instance.playerPositionsArray[7];
this->currentPlayerSlotID = DAT_GameSynchronyState::instance.currentPlayerSlotID;
this->currentAdvantageBalance = DAT_GameSynchronyState::instance.skirmishCurrentAdvantageBalance;
this->currentAdvantageGroup = DAT_GameSynchronyState::instance.skirmishGameIntensityType;
this->mbr_0x80 = DAT_GameSynchronyState::instance.skirmishTechLevel;
for (int player = 0; player < countof(this->playerLordTypeArray); ++player) {
this->playerLordTypeArray[player] = DAT_GameCore::instance.selectedLordTypes[player];
}
this->mbr_0xf0 = DAT_GameCore::instance.field_0x2340;
this->selectedLordType = DAT_GameCore::instance.selectedLordTypeUnk;
this->popularity = DAT_GameSynchronyState::instance.skirmishDefaultPopularity;
this->mapSelectionRelativeSelected = DAT_GameSynchronyState::instance.DAT_MapSelectionRelativeSelected;
this->mapSelectionScrollOffset = DAT_GameSynchronyState::instance.DAT_MapSelectionScrollOffset;
this->mbr_0xfc = DAT_GameSynchronyState::instance.lobbyMapSortOrder;
}

}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#include "../Skirmish.func.hpp"

#include "OpenSHC/UI/GreatestLord.func.hpp"

#include "OpenSHC/Globals/DAT_GameCore.hpp"
#include "OpenSHC/Globals/DAT_GameState.hpp"
#include "OpenSHC/Globals/DAT_GameSynchronyState.hpp"
#include "OpenSHC/Globals/DAT_SkMasterDataEntry.hpp"

namespace OpenSHC {
namespace Game {
namespace Skirmish {

// FUNCTION: STRONGHOLDCRUSADER 0x004D1700
BOOLEnum StoreCurrentGameIntoTemporarySKMasterEntry(int score)
{
DAT_SkMasterDataEntry::instance.score = score;
strcpy(DAT_SkMasterDataEntry::instance.mapName, DAT_GameSynchronyState::instance.mapName);
DAT_SkMasterDataEntry::instance.skMasterScore = MACRO_CALL(UI::GreatestLord_Func::ComputeSkMasterScore)(
DAT_GameSynchronyState::instance.currentPlayerSlotID);
int activePlayerCount = 0;
for (int player = 1; player < countof(DAT_GameSynchronyState::instance.finalResults.active); ++player) {
if (DAT_GameSynchronyState::instance.finalResults.active[player] == 0) {
break;
}
++activePlayerCount;
}
DAT_SkMasterDataEntry::instance.activePlayerCount = activePlayerCount;
for (int player = 1; player < countof(DAT_SkMasterDataEntry::instance.array1); ++player) {
DAT_SkMasterDataEntry::instance.array1[player]
= DAT_GameState::instance.mapAndTime.playerGroupArray[player];
}
for (int player = 1; player < countof(DAT_SkMasterDataEntry::instance.aiArray); ++player) {
DAT_SkMasterDataEntry::instance.aiArray[player]
= DAT_GameSynchronyState::instance.currentAIArray[player];
}
for (int player = 1; player < countof(DAT_SkMasterDataEntry::instance.aliveArray); ++player) {
DAT_SkMasterDataEntry::instance.aliveArray[player]
= DAT_GameState::instance.mapAndTime.playerIsAlive[player];
}
DAT_SkMasterDataEntry::instance.lordType = DAT_GameCore::instance.selectedLordTypeUnk;
MACRO_CALL(Skirmish_Func::StoreLocalTime)();
DAT_SkMasterDataEntry::instance.results = DAT_GameSynchronyState::instance.finalResults;
return TRUE;
}

}
}
}
24 changes: 24 additions & 0 deletions src/OpenSHC/Game/Skirmish/StoreLocalTime.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#include "../Skirmish.func.hpp"

#include "OpenSHC/Globals/DAT_GameCore.hpp"
#include "OpenSHC/Globals/DAT_SkMasterDataEntry.hpp"

namespace OpenSHC {
namespace Game {
namespace Skirmish {

// FUNCTION: STRONGHOLDCRUSADER 0x004C6CD0
void StoreLocalTime()
{
SYSTEMTIME localTime;
GetLocalTime(&localTime);
DAT_SkMasterDataEntry::instance.localTimeDay = localTime.wDay;
DAT_SkMasterDataEntry::instance.localTimeMonth = localTime.wMonth;
DAT_SkMasterDataEntry::instance.localTimeYear = localTime.wYear;
DAT_SkMasterDataEntry::instance.gameDurationInMinutes = (int)DAT_GameCore::instance.gameDuration / 60000;
DAT_SkMasterDataEntry::instance.mapTimeInTicks = DAT_GameCore::instance.mapTimeInTicks;
}

}
}
}
Loading
Loading