1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Disrupt ASD now blocks upgrades

Browse Source
This commit is contained in:
rftrdev
2022-11-03 00:08:03 -07:00
parent 32d565eb99
commit 568ee070a8
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/ASD.cpp
+3 -3
View File
@@ -1514,7 +1514,7 @@ UINT32 ASDResourceCostFuel( UINT8 aType )
// if ASD has tanks, it can allow the queen to upgrade soldiers to tanks // if ASD has tanks, it can allow the queen to upgrade soldiers to tanks
BOOLEAN ASDSoldierUpgradeToTank( ) BOOLEAN ASDSoldierUpgradeToTank( )
{ {
if ( gGameExternalOptions.fASDActive && gGameExternalOptions.fASDAssignsTanks ) if ( gGameExternalOptions.fASDActive && gGameExternalOptions.fASDAssignsTanks && RebelCommand::GetASDCanDeployUnits() )
{ {
if ( gASD_Flags & ASDFACT_TANK_UNLOCKED ) if ( gASD_Flags & ASDFACT_TANK_UNLOCKED )
{ {
@@ -1531,7 +1531,7 @@ BOOLEAN ASDSoldierUpgradeToTank( )
BOOLEAN ASDSoldierUpgradeToJeep( ) BOOLEAN ASDSoldierUpgradeToJeep( )
{ {
if ( gGameExternalOptions.fASDActive && gGameExternalOptions.fASDAssignsJeeps ) if ( gGameExternalOptions.fASDActive && gGameExternalOptions.fASDAssignsJeeps && RebelCommand::GetASDCanDeployUnits() )
{ {
if ( gASD_Flags & ASDFACT_JEEP_UNLOCKED ) if ( gASD_Flags & ASDFACT_JEEP_UNLOCKED )
{ {
@@ -1548,7 +1548,7 @@ BOOLEAN ASDSoldierUpgradeToJeep( )
BOOLEAN ASDSoldierUpgradeToRobot( ) BOOLEAN ASDSoldierUpgradeToRobot( )
{ {
if ( gGameExternalOptions.fASDActive && gGameExternalOptions.fASDAssignsRobots ) if ( gGameExternalOptions.fASDActive && gGameExternalOptions.fASDAssignsRobots && RebelCommand::GetASDCanDeployUnits() )
{ {
if ( gASD_Flags & ASDFACT_ROBOT_UNLOCKED ) if ( gASD_Flags & ASDFACT_ROBOT_UNLOCKED )
{ {
Strategic/Rebel Command.cpp
+16
View File
@@ -4671,6 +4671,22 @@ INT16 GetAdditionalDeployRange(const UINT8 insertionCode)
return 0; return 0;
} }
BOOLEAN GetASDCanDeployUnits()
{
if (!gGameExternalOptions.fRebelCommandEnabled)
return TRUE;
const std::unordered_map<RebelCommandAgentMissions, UINT32>::iterator iter = missionMap.find(RCAM_DISRUPT_ASD);
if (iter == missionMap.end())
return TRUE;
MissionSecondEvent evt;
DeserialiseMissionSecondEvent(iter->second, evt);
return evt.isSecondEvent ? FALSE : TRUE;
}
FLOAT GetASDIncomeModifier() FLOAT GetASDIncomeModifier()
{ {
if (!gGameExternalOptions.fRebelCommandEnabled) if (!gGameExternalOptions.fRebelCommandEnabled)
Strategic/Rebel Command.h
+1
View File
@@ -209,6 +209,7 @@ BOOLEAN CanAssignTraitsToMilitia();
BOOLEAN CanTrainMilitiaAnywhere(); BOOLEAN CanTrainMilitiaAnywhere();
UINT8 GetMaxTrainersForTrainMilitiaAnywhere(); UINT8 GetMaxTrainersForTrainMilitiaAnywhere();
INT16 GetAdditionalDeployRange(const UINT8 insertionCode); INT16 GetAdditionalDeployRange(const UINT8 insertionCode);
BOOLEAN GetASDCanDeployUnits();
FLOAT GetASDIncomeModifier(); FLOAT GetASDIncomeModifier();
INT8 GetEnemyEquipmentCoolnessModifier(); INT8 GetEnemyEquipmentCoolnessModifier();
INT8 GetEnemyEquipmentStatusModifier(const INT8 initialStatus); INT8 GetEnemyEquipmentStatusModifier(const INT8 initialStatus);