From 53779635ce57930faec63ff3a47d3311bbe1effc Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Sun, 23 Oct 2022 01:53:23 -0700 Subject: [PATCH] Put Soldier Bounties mission into alphabetic order --- Strategic/Rebel Command.cpp | 64 ++++++++++++++++++------------------- Strategic/Rebel Command.h | 2 +- Utils/_ChineseText.cpp | 4 +-- Utils/_DutchText.cpp | 4 +-- Utils/_EnglishText.cpp | 4 +-- Utils/_FrenchText.cpp | 4 +-- Utils/_GermanText.cpp | 4 +-- Utils/_ItalianText.cpp | 4 +-- Utils/_PolishText.cpp | 4 +-- Utils/_RussianText.cpp | 4 +-- 10 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Strategic/Rebel Command.cpp b/Strategic/Rebel Command.cpp index e7508f43d..50e63095c 100644 --- a/Strategic/Rebel Command.cpp +++ b/Strategic/Rebel Command.cpp @@ -2171,8 +2171,8 @@ BOOLEAN SetupMissionAgentBox(UINT16 x, UINT16 y, INT8 index) case RCAM_REDUCE_UNALERTED_ENEMY_VISION: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_REDUCE_UNALERTED_ENEMY_VISION_TITLE]); break; case RCAM_SABOTAGE_INFANTRY_EQUIPMENT: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_SABOTAGE_INFANTRY_EQUIPMENT_TITLE]); break; case RCAM_SABOTAGE_MECHANICAL_UNITS: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_SABOTAGE_MECHANICAL_UNITS_TITLE]); break; - case RCAM_TRAIN_MILITIA_ANYWHERE: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_TRAIN_MILITIA_ANYWHERE_TITLE]); break; case RCAM_SOLDIER_BOUNTIES_KINGPIN: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_SOLDIER_BOUNTIES_KINGPIN_TITLE]); break; + case RCAM_TRAIN_MILITIA_ANYWHERE: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_TRAIN_MILITIA_ANYWHERE_TITLE]); break; default: swprintf(sText, L"Mission Index: %d", rebelCommandSaveInfo.availableMissions[index]); break; } @@ -2189,8 +2189,8 @@ BOOLEAN SetupMissionAgentBox(UINT16 x, UINT16 y, INT8 index) case RCAM_REDUCE_UNALERTED_ENEMY_VISION: missionDurationBase = gRebelCommandSettings.iReduceUnalertedEnemyVisionDuration; break; case RCAM_SABOTAGE_INFANTRY_EQUIPMENT: missionDurationBase = gRebelCommandSettings.iSabotageInfantryEquipmentDuration; break; case RCAM_SABOTAGE_MECHANICAL_UNITS: missionDurationBase = gRebelCommandSettings.iSabotageMechanicalUnitsDuration; break; - case RCAM_TRAIN_MILITIA_ANYWHERE: missionDurationBase = gRebelCommandSettings.iTrainMilitiaAnywhereDuration; break; case RCAM_SOLDIER_BOUNTIES_KINGPIN: missionDurationBase = gRebelCommandSettings.iSoldierBountiesKingpinDuration; break; + case RCAM_TRAIN_MILITIA_ANYWHERE: missionDurationBase = gRebelCommandSettings.iTrainMilitiaAnywhereDuration; break; default: break; } @@ -2210,8 +2210,8 @@ BOOLEAN SetupMissionAgentBox(UINT16 x, UINT16 y, INT8 index) case RCAM_REDUCE_UNALERTED_ENEMY_VISION: missionSuccessChanceBase = gRebelCommandSettings.iReduceUnalertedEnemyVisionSuccessChance; break; case RCAM_SABOTAGE_INFANTRY_EQUIPMENT: missionSuccessChanceBase = gRebelCommandSettings.iSabotageInfantryEquipmentSuccessChance; break; case RCAM_SABOTAGE_MECHANICAL_UNITS: missionSuccessChanceBase = gRebelCommandSettings.iSabotageMechanicalUnitsSuccessChance; break; - case RCAM_TRAIN_MILITIA_ANYWHERE: missionSuccessChanceBase = gRebelCommandSettings.iTrainMilitiaAnywhereSuccessChance; break; case RCAM_SOLDIER_BOUNTIES_KINGPIN: missionSuccessChanceBase = gRebelCommandSettings.iSoldierBountiesKingpinSuccessChance; break; + case RCAM_TRAIN_MILITIA_ANYWHERE: missionSuccessChanceBase = gRebelCommandSettings.iTrainMilitiaAnywhereSuccessChance; break; default: break; } @@ -2228,8 +2228,8 @@ BOOLEAN SetupMissionAgentBox(UINT16 x, UINT16 y, INT8 index) case RCAM_REDUCE_UNALERTED_ENEMY_VISION: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_REDUCE_UNALERTED_ENEMY_VISION_DESC]); break; case RCAM_SABOTAGE_INFANTRY_EQUIPMENT: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_SABOTAGE_INFANTRY_EQUIPMENT_DESC]); break; case RCAM_SABOTAGE_MECHANICAL_UNITS: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_SABOTAGE_MECHANICAL_UNITS_DESC]); break; - case RCAM_TRAIN_MILITIA_ANYWHERE: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_TRAIN_MILITIA_ANYWHERE_DESC]); break; case RCAM_SOLDIER_BOUNTIES_KINGPIN: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_SOLDIER_BOUNTIES_KINGPIN_DESC], gRebelCommandSettings.iSoldierBountiesKingpinPayout_Limit); break; + case RCAM_TRAIN_MILITIA_ANYWHERE: swprintf(sText, szRebelCommandAgentMissionsText[RCAMT_TRAIN_MILITIA_ANYWHERE_DESC]); break; default: swprintf(sText, L"Mission description goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut faucibus libero dui. Etiam facilisis posuere dictum. Etiam a velit viverra, interdum eros non, placerat lectus. Vivamus ut lorem id velit tempus auctor. Donec molestie, erat at molestie malesuada, diam purus tincidunt eros, vel hendrerit mi elit vitae leo. Suspendisse dui lectus, malesuada eu elementum at, viverra eu odio."); break; } @@ -2412,15 +2412,6 @@ BOOLEAN SetupMissionAgentBox(UINT16 x, UINT16 y, INT8 index) } break; - case RCAM_TRAIN_MILITIA_ANYWHERE: - { - intModifier = max(intModifier, 1); - CHAR16 text[100]; - swprintf(text, szRebelCommandText[RCT_MISSION_BONUS_MAX_TRAINERS], intModifier, locSkillText[intModifierSkill]); - agentBonusText.push_back(text); - } - break; - case RCAM_SOLDIER_BOUNTIES_KINGPIN: { floatModifier = max(floatModifier, 1.f); @@ -2452,6 +2443,15 @@ BOOLEAN SetupMissionAgentBox(UINT16 x, UINT16 y, INT8 index) } break; + case RCAM_TRAIN_MILITIA_ANYWHERE: + { + intModifier = max(intModifier, 1); + CHAR16 text[100]; + swprintf(text, szRebelCommandText[RCT_MISSION_BONUS_MAX_TRAINERS], intModifier, locSkillText[intModifierSkill]); + agentBonusText.push_back(text); + } + break; + default: break; } @@ -2775,14 +2775,6 @@ void PrepareMission(INT8 index) } break; - case RCAM_TRAIN_MILITIA_ANYWHERE: - { - missionTitle = RCAMT_TRAIN_MILITIA_ANYWHERE_TITLE; - missionSuccessChance = gRebelCommandSettings.iTrainMilitiaAnywhereSuccessChance; - missionDuration = gRebelCommandSettings.iTrainMilitiaAnywhereDuration; - } - break; - case RCAM_SOLDIER_BOUNTIES_KINGPIN: { missionTitle = RCAMT_SOLDIER_BOUNTIES_KINGPIN_TITLE; @@ -2791,6 +2783,14 @@ void PrepareMission(INT8 index) } break; + case RCAM_TRAIN_MILITIA_ANYWHERE: + { + missionTitle = RCAMT_TRAIN_MILITIA_ANYWHERE_TITLE; + missionSuccessChance = gRebelCommandSettings.iTrainMilitiaAnywhereSuccessChance; + missionDuration = gRebelCommandSettings.iTrainMilitiaAnywhereDuration; + } + break; + default: break; } @@ -4200,16 +4200,6 @@ void SetupInfo() {gRebelCommandSettings.iSabotageMechanicalUnitsStatLoss_Covert, gRebelCommandSettings.iSabotageMechanicalUnitsStatLoss_Demolitions, gRebelCommandSettings.iSabotageMechanicalUnitsStatLoss_Heavy_Weapons}, {MissionHelpers::SABOTAGE_MECHANICAL_UNITS_COVERT, MissionHelpers::SABOTAGE_MECHANICAL_UNITS_DEMOLITIONS, MissionHelpers::SABOTAGE_MECHANICAL_UNITS_HEAVY_WEAPONS} }); - //RCAM_TRAIN_MILITIA_ANYWHERE - MissionHelpers::missionInfo.push_back( - { - {COVERT_NT, SURVIVAL_NT, TEACHING_NT}, - {-1, CAMOUFLAGED_OT, TEACHING_OT}, - {gRebelCommandSettings.iTrainMilitiaAnywhereDuration_Bonus_Covert, gRebelCommandSettings.iTrainMilitiaAnywhereDuration_Bonus_Survival, gRebelCommandSettings.iTrainMilitiaAnywhereDuration_Bonus_Teaching}, - {0.f, 0.f, 0.f}, - {gRebelCommandSettings.iTrainMilitiaAnywhereMaxTrainers, gRebelCommandSettings.iTrainMilitiaAnywhereMaxTrainers, gRebelCommandSettings.iTrainMilitiaAnywhereMaxTrainers_Teaching}, - {0, 0, MissionHelpers::TRAIN_MILITIA_ANYWHERE_TEACHING} - }); //RCAM_SOLDIER_BOUNTIES_KINGPIN MissionHelpers::missionInfo.push_back( { @@ -4220,6 +4210,16 @@ void SetupInfo() {0, 0, gRebelCommandSettings.iSoldierBountiesKingpinPayout_Limit_Snitch, gRebelCommandSettings.iSoldierBountiesKingpinPayout_Limit_Demolitions}, {0, MissionHelpers::SOLDIER_BOUNTIES_KINGPIN_OFFICER_PAYOUTS, 0, MissionHelpers::SOLDIER_BOUNTIES_KINGPIN_VEHICLE_PAYOUTS} }); + //RCAM_TRAIN_MILITIA_ANYWHERE + MissionHelpers::missionInfo.push_back( + { + {COVERT_NT, SURVIVAL_NT, TEACHING_NT}, + {-1, CAMOUFLAGED_OT, TEACHING_OT}, + {gRebelCommandSettings.iTrainMilitiaAnywhereDuration_Bonus_Covert, gRebelCommandSettings.iTrainMilitiaAnywhereDuration_Bonus_Survival, gRebelCommandSettings.iTrainMilitiaAnywhereDuration_Bonus_Teaching}, + {0.f, 0.f, 0.f}, + {gRebelCommandSettings.iTrainMilitiaAnywhereMaxTrainers, gRebelCommandSettings.iTrainMilitiaAnywhereMaxTrainers, gRebelCommandSettings.iTrainMilitiaAnywhereMaxTrainers_Teaching}, + {0, 0, MissionHelpers::TRAIN_MILITIA_ANYWHERE_TEACHING} + }); } void UpgradeMilitiaStats() @@ -4639,8 +4639,8 @@ void HandleStrategicEvent(const UINT32 eventParam) case RCAM_REDUCE_UNALERTED_ENEMY_VISION: case RCAM_SABOTAGE_INFANTRY_EQUIPMENT: case RCAM_SABOTAGE_MECHANICAL_UNITS: - case RCAM_TRAIN_MILITIA_ANYWHERE: case RCAM_SOLDIER_BOUNTIES_KINGPIN: + case RCAM_TRAIN_MILITIA_ANYWHERE: { validMission = TRUE; } diff --git a/Strategic/Rebel Command.h b/Strategic/Rebel Command.h index fbd4109d7..4ce6e04e7 100644 --- a/Strategic/Rebel Command.h +++ b/Strategic/Rebel Command.h @@ -95,8 +95,8 @@ enum RebelCommandAgentMissions RCAM_REDUCE_UNALERTED_ENEMY_VISION, // aka Lower Readiness RCAM_SABOTAGE_INFANTRY_EQUIPMENT, // aka Sabotage Equipment RCAM_SABOTAGE_MECHANICAL_UNITS, // aka Sabotage Vehicles - RCAM_TRAIN_MILITIA_ANYWHERE, RCAM_SOLDIER_BOUNTIES_KINGPIN, + RCAM_TRAIN_MILITIA_ANYWHERE, RCAM_NUM_MISSIONS, diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 822eb169f..bc67a3ce0 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -12097,10 +12097,10 @@ STR16 szRebelCommandAgentMissionsText[] = L"Disrupt enemy supply chains and prevent the enemy from maintaining their gear properly. Enemy soldiers use equipment that is worse than normal.", L"Sabotage Vehicles", L"Sabotage vehicle maintenance hubs to reduce their combat effectiveness and readiness. Enemy vehicles encountered have reduced stats.", - L"Train Militia Anywhere", - L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", L"Soldier Bounties (Kingpin)", L"Get a payout for enemy kills. Negotiate with Kingpin, who feels he can use your presence here to indirectly weaken the Queen's power. Bounties are deposited into your account at midnight and are limited to $%d per day.", + L"Train Militia Anywhere", + L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", }; STR16 szRobotText[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index d5409d804..35bbac4fd 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -12107,10 +12107,10 @@ STR16 szRebelCommandAgentMissionsText[] = L"Disrupt enemy supply chains and prevent the enemy from maintaining their gear properly. Enemy soldiers use equipment that is worse than normal.", L"Sabotage Vehicles", L"Sabotage vehicle maintenance hubs to reduce their combat effectiveness and readiness. Enemy vehicles encountered have reduced stats.", - L"Train Militia Anywhere", - L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", L"Soldier Bounties (Kingpin)", L"Get a payout for enemy kills. Negotiate with Kingpin, who feels he can use your presence here to indirectly weaken the Queen's power. Bounties are deposited into your account at midnight and are limited to $%d per day.", + L"Train Militia Anywhere", + L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", }; STR16 szRobotText[] = // TODO: Translate diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 4ff777845..331bae0d5 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -12097,10 +12097,10 @@ STR16 szRebelCommandAgentMissionsText[] = L"Disrupt enemy supply chains and prevent the enemy from maintaining their gear properly. Enemy soldiers use equipment that is worse than normal.", L"Sabotage Vehicles", L"Sabotage vehicle maintenance hubs to reduce their combat effectiveness and readiness. Enemy vehicles encountered have reduced stats.", - L"Train Militia Anywhere", - L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", L"Soldier Bounties (Kingpin)", L"Get a payout for enemy kills. Negotiate with Kingpin, who feels he can use your presence here to indirectly weaken the Queen's power. Bounties are deposited into your account at midnight and are limited to $%d per day.", + L"Train Militia Anywhere", + L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", }; STR16 szRobotText[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 0ea13767e..a04b38db8 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -12089,10 +12089,10 @@ STR16 szRebelCommandAgentMissionsText[] = L"Disrupt enemy supply chains and prevent the enemy from maintaining their gear properly. Enemy soldiers use equipment that is worse than normal.", L"Sabotage Vehicles", L"Sabotage vehicle maintenance hubs to reduce their combat effectiveness and readiness. Enemy vehicles encountered have reduced stats.", - L"Train Militia Anywhere", - L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", L"Soldier Bounties (Kingpin)", L"Get a payout for enemy kills. Negotiate with Kingpin, who feels he can use your presence here to indirectly weaken the Queen's power. Bounties are deposited into your account at midnight and are limited to $%d per day.", + L"Train Militia Anywhere", + L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", }; STR16 szRobotText[] = // TODO: Translate diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 275ca0d0a..576d94cc7 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -12011,10 +12011,10 @@ STR16 szRebelCommandAgentMissionsText[] = L"Disrupt enemy supply chains and prevent the enemy from maintaining their gear properly. Enemy soldiers use equipment that is worse than normal.", L"Sabotage Vehicles", L"Sabotage vehicle maintenance hubs to reduce their combat effectiveness and readiness. Enemy vehicles encountered have reduced stats.", - L"Train Militia Anywhere", - L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", L"Soldier Bounties (Kingpin)", L"Get a payout for enemy kills. Negotiate with Kingpin, who feels he can use your presence here to indirectly weaken the Queen's power. Bounties are deposited into your account at midnight and are limited to $%d per day.", + L"Train Militia Anywhere", + L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", }; STR16 szRobotText[] = // TODO: Translate diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index ad0d2c355..321075a2a 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -12098,10 +12098,10 @@ STR16 szRebelCommandAgentMissionsText[] = L"Disrupt enemy supply chains and prevent the enemy from maintaining their gear properly. Enemy soldiers use equipment that is worse than normal.", L"Sabotage Vehicles", L"Sabotage vehicle maintenance hubs to reduce their combat effectiveness and readiness. Enemy vehicles encountered have reduced stats.", - L"Train Militia Anywhere", - L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", L"Soldier Bounties (Kingpin)", L"Get a payout for enemy kills. Negotiate with Kingpin, who feels he can use your presence here to indirectly weaken the Queen's power. Bounties are deposited into your account at midnight and are limited to $%d per day.", + L"Train Militia Anywhere", + L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", }; STR16 szRobotText[] = // TODO: Translate diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index ffe9bbf50..958d425c6 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -12111,10 +12111,10 @@ STR16 szRebelCommandAgentMissionsText[] = L"Disrupt enemy supply chains and prevent the enemy from maintaining their gear properly. Enemy soldiers use equipment that is worse than normal.", L"Sabotage Vehicles", L"Sabotage vehicle maintenance hubs to reduce their combat effectiveness and readiness. Enemy vehicles encountered have reduced stats.", - L"Train Militia Anywhere", - L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", L"Soldier Bounties (Kingpin)", L"Get a payout for enemy kills. Negotiate with Kingpin, who feels he can use your presence here to indirectly weaken the Queen's power. Bounties are deposited into your account at midnight and are limited to $%d per day.", + L"Train Militia Anywhere", + L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", }; STR16 szRobotText[] = // TODO: Translate diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 35edf34ba..2cc5aeec7 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -12092,10 +12092,10 @@ STR16 szRebelCommandAgentMissionsText[] = L"Disrupt enemy supply chains and prevent the enemy from maintaining their gear properly. Enemy soldiers use equipment that is worse than normal.", L"Sabotage Vehicles", L"Sabotage vehicle maintenance hubs to reduce their combat effectiveness and readiness. Enemy vehicles encountered have reduced stats.", - L"Train Militia Anywhere", - L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", L"Soldier Bounties (Kingpin)", L"Get a payout for enemy kills. Negotiate with Kingpin, who feels he can use your presence here to indirectly weaken the Queen's power. Bounties are deposited into your account at midnight and are limited to $%d per day.", + L"Train Militia Anywhere", + L"Create training areas in the wilderness that can be quickly set up and torn down. Militia can be trained in uncontested sectors outside of town.", }; STR16 szRobotText[] = // TODO: Translate