mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
Split in-town and loyalty mission prep checks
This commit is contained in:
@@ -350,6 +350,7 @@ enum RebelCommandText // keep this synced with szRebelCommandText in the text fi
|
||||
RCT_MISSION_BONUS_OFFICER_PAYOUT,
|
||||
RCT_MISSION_BONUS_VEHICLE_PAYOUT,
|
||||
RCT_MISSION_BONUS_DURATION,
|
||||
RCT_MISSION_CANT_START_NOT_IN_TOWN,
|
||||
RCT_MISSION_CANT_START_LOW_LOYALTY,
|
||||
RCT_MISSION_CANT_START_AGENT_UNAVAILABLE,
|
||||
RCT_MISSION_CANT_START_CONTRACT_EXPIRING,
|
||||
@@ -2595,7 +2596,12 @@ BOOLEAN SetupMissionAgentBox(UINT16 x, UINT16 y, INT8 index)
|
||||
const INT32 worldMin = GetWorldTotalMin();
|
||||
const INT32 remaining = endTime - worldMin;
|
||||
|
||||
if (townId < FIRST_TOWN || townId >= NUM_TOWNS || !gfTownUsesLoyalty[townId] || (townLoyalty < gRebelCommandSettings.iMinLoyaltyForMission && rebelCommandSaveInfo.availableMissions[index] != RCAM_SEND_SUPPLIES_TO_TOWN))
|
||||
if (townId < FIRST_TOWN || townId >= NUM_TOWNS || !gfTownUsesLoyalty[townId])
|
||||
{
|
||||
canStartMission = FALSE;
|
||||
swprintf(sText, szRebelCommandText[RCT_MISSION_CANT_START_NOT_IN_TOWN]);
|
||||
}
|
||||
else if (townLoyalty < gRebelCommandSettings.iMinLoyaltyForMission && rebelCommandSaveInfo.availableMissions[index] != RCAM_SEND_SUPPLIES_TO_TOWN)
|
||||
{
|
||||
canStartMission = FALSE;
|
||||
swprintf(sText, szRebelCommandText[RCT_MISSION_CANT_START_LOW_LOYALTY]);
|
||||
|
||||
@@ -11961,6 +11961,7 @@ STR16 szRebelCommandText[] =
|
||||
L"Bonus for officers (%s)",
|
||||
L"Bonus for vehicles (%s)",
|
||||
L"Duration +%d hours (%s)",
|
||||
L"Agent not in town",
|
||||
L"Town loyalty too low",
|
||||
L"Agent unavailable",
|
||||
L"Agent contract expiring",
|
||||
|
||||
@@ -11971,6 +11971,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
|
||||
L"Bonus for officers (%s)",
|
||||
L"Bonus for vehicles (%s)",
|
||||
L"Duration +%d hours (%s)",
|
||||
L"Agent not in town",
|
||||
L"Town loyalty too low",
|
||||
L"Agent unavailable",
|
||||
L"Agent contract expiring",
|
||||
|
||||
@@ -11961,6 +11961,7 @@ STR16 szRebelCommandText[] =
|
||||
L"Bonus for officers (%s)",
|
||||
L"Bonus for vehicles (%s)",
|
||||
L"Duration +%d hours (%s)",
|
||||
L"Agent not in town",
|
||||
L"Town loyalty too low",
|
||||
L"Agent unavailable",
|
||||
L"Agent contract expiring",
|
||||
|
||||
@@ -11953,6 +11953,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
|
||||
L"Bonus for officers (%s)",
|
||||
L"Bonus for vehicles (%s)",
|
||||
L"Duration +%d hours (%s)",
|
||||
L"Agent not in town",
|
||||
L"Town loyalty too low",
|
||||
L"Agent unavailable",
|
||||
L"Agent contract expiring",
|
||||
|
||||
@@ -11875,6 +11875,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
|
||||
L"Bonus for officers (%s)",
|
||||
L"Bonus for vehicles (%s)",
|
||||
L"Duration +%d hours (%s)",
|
||||
L"Agent not in town",
|
||||
L"Town loyalty too low",
|
||||
L"Agent unavailable",
|
||||
L"Agent contract expiring",
|
||||
|
||||
@@ -11962,6 +11962,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
|
||||
L"Bonus for officers (%s)",
|
||||
L"Bonus for vehicles (%s)",
|
||||
L"Duration +%d hours (%s)",
|
||||
L"Agent not in town",
|
||||
L"Town loyalty too low",
|
||||
L"Agent unavailable",
|
||||
L"Agent contract expiring",
|
||||
|
||||
@@ -11975,6 +11975,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
|
||||
L"Bonus for officers (%s)",
|
||||
L"Bonus for vehicles (%s)",
|
||||
L"Duration +%d hours (%s)",
|
||||
L"Agent not in town",
|
||||
L"Town loyalty too low",
|
||||
L"Agent unavailable",
|
||||
L"Agent contract expiring",
|
||||
|
||||
@@ -11956,6 +11956,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
|
||||
L"Bonus for officers (%s)",
|
||||
L"Bonus for vehicles (%s)",
|
||||
L"Duration +%d hours (%s)",
|
||||
L"Agent not in town",
|
||||
L"Town loyalty too low",
|
||||
L"Agent unavailable",
|
||||
L"Agent contract expiring",
|
||||
|
||||
Reference in New Issue
Block a user