From 02a8c488733abc7eecdd40da30a531fa63025553 Mon Sep 17 00:00:00 2001 From: rftr Date: Fri, 15 Apr 2022 16:32:07 +0000 Subject: [PATCH] fix ARC cashback bug: https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=364578&#msg_364578 also remove incorrect dependency on fAssignTraitsToEnemy for HVT strikes git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9367 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/finances.cpp | 4 ++++ Laptop/finances.h | 1 + Strategic/Rebel Command.cpp | 10 +++++----- Utils/_ChineseText.cpp | 1 + Utils/_DutchText.cpp | 2 ++ Utils/_EnglishText.cpp | 1 + Utils/_FrenchText.cpp | 2 ++ Utils/_GermanText.cpp | 2 ++ Utils/_ItalianText.cpp | 2 ++ Utils/_PolishText.cpp | 2 ++ Utils/_RussianText.cpp | 2 ++ 11 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Laptop/finances.cpp b/Laptop/finances.cpp index 4fedea82..261f02a8 100644 --- a/Laptop/finances.cpp +++ b/Laptop/finances.cpp @@ -1608,6 +1608,10 @@ void ProcessTransactionString(STR16 pString, FinanceUnitPtr pFinance) case REBEL_COMMAND: swprintf(pString, L"%s", pTransactionText[REBEL_COMMAND]); break; + + case REBEL_COMMAND_SPENDING: + swprintf(pString, L"%s", pTransactionText[REBEL_COMMAND_SPENDING]); + break; } } diff --git a/Laptop/finances.h b/Laptop/finances.h index 6233155c..b617e198 100644 --- a/Laptop/finances.h +++ b/Laptop/finances.h @@ -61,6 +61,7 @@ enum PROMOTE_MILITIA, // Flugente: drill militia MINI_EVENT, // rftr: mini events REBEL_COMMAND, // rftr: rebel command + REBEL_COMMAND_SPENDING, // rftr: rebel command TEXT_NUM_FINCANCES }; diff --git a/Strategic/Rebel Command.cpp b/Strategic/Rebel Command.cpp index eaee3d46..2291b913 100644 --- a/Strategic/Rebel Command.cpp +++ b/Strategic/Rebel Command.cpp @@ -358,7 +358,7 @@ void DropdownSetup() directivesList.push_back(std::make_pair(RCD_CREATE_PROPAGANDA, szRebelCommandDirectivesText[RCDT_CREATE_PROPAGANDA])); if (HighestPlayerProgressPercentage() >= gRebelCommandSettings.uEliteMilitiaProgressRequirement) directivesList.push_back(std::make_pair(RCD_ELITE_MILITIA, szRebelCommandDirectivesText[RCDT_ELITE_MILITIA])); - if (HighestPlayerProgressPercentage() >= gRebelCommandSettings.uHvtStrikesProgressRequirement && gGameExternalOptions.fEnemyRoles == TRUE && gGameExternalOptions.fAssignTraitsToEnemy == TRUE) + if (HighestPlayerProgressPercentage() >= gRebelCommandSettings.uHvtStrikesProgressRequirement && gGameExternalOptions.fEnemyRoles == TRUE) directivesList.push_back(std::make_pair(RCD_HVT_STRIKES, szRebelCommandDirectivesText[RCDT_HVT_STRIKES])); if (HighestPlayerProgressPercentage() >= gRebelCommandSettings.uSpottersProgressRequirement) directivesList.push_back(std::make_pair(RCD_SPOTTERS, szRebelCommandDirectivesText[RCDT_SPOTTERS])); @@ -471,7 +471,7 @@ void ImproveDirective(const RebelCommandDirectives directive) const INT32 cost = rebelCommandSaveInfo.directives[directive].GetCostToImprove(); rebelCommandSaveInfo.directives[directive].Improve(); - LaptopSaveInfo.iCurrentBalance -= cost; + AddTransactionToPlayersBook(REBEL_COMMAND_SPENDING, 0, GetWorldTotalMin(), -cost); RenderWebsite(); } @@ -644,7 +644,7 @@ void SetupAdminActionBox(const UINT8 actionIndex, const UINT16 descriptionText, rebelCommandSaveInfo.regions[iCurrentRegionId].actions[5] = static_cast(adminActionChangeList[adminActionChangeIndex]); UpdateAdminActionChangeList(iCurrentRegionId); - LaptopSaveInfo.iCurrentBalance -= ADMIN_ACTION_CHANGE_COST; + AddTransactionToPlayersBook(REBEL_COMMAND_SPENDING, 0, GetWorldTotalMin(), -ADMIN_ACTION_CHANGE_COST); RenderWebsite(); } @@ -2041,7 +2041,7 @@ FLOAT GetPathfindersSpeedBonus(UINT8 sector) BOOLEAN NeutraliseRole(const SOLDIERTYPE* pSoldier) { - if (!gGameExternalOptions.fRebelCommandEnabled || !gGameExternalOptions.fEnemyRoles || !gGameExternalOptions.fAssignTraitsToEnemy) + if (!gGameExternalOptions.fRebelCommandEnabled || !gGameExternalOptions.fEnemyRoles) return FALSE; if (rebelCommandSaveInfo.iActiveDirective != RCD_HVT_STRIKES) @@ -2685,7 +2685,7 @@ void UpgradeMilitiaStats() { const INT32 cost = gRebelCommandSettings.iMilitiaUpgradeCosts[rebelCommandSaveInfo.iMilitiaStatsLevel++]; - LaptopSaveInfo.iCurrentBalance -= cost; + AddTransactionToPlayersBook(REBEL_COMMAND_SPENDING, 0, GetWorldTotalMin(), -cost); RenderWebsite(); } diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index e13ca01b..f1a20807 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -4661,6 +4661,7 @@ STR16 pTransactionText[] = L"在%s区域训练民兵", //L"Drill militia in %s", Flugente: drill militia L"微型事件", //L"Mini event", rftr: mini events L"从反抗军司令部转移资金", //L"Funds transferred from rebel command", rftr: rebel command + L"Funds transferred to rebel command", // rftr: rebel command }; STR16 pTransactionAlternateText[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 1a385569..54c04899 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -4663,6 +4663,8 @@ STR16 pTransactionText[] = L"Trained workers", // Flugente: train workers L"Drill militia in %s", // Flugente: drill militia // TODO.Translate L"Mini event", // rftr: mini events // TODO: translate + L"Funds transferred from rebel command", // rftr: rebel command + L"Funds transferred to rebel command", // rftr: rebel command }; STR16 pTransactionAlternateText[] = diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 55ff952d..1a51cdee 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -4661,6 +4661,7 @@ STR16 pTransactionText[] = L"Drill militia in %s", // Flugente: drill militia L"Mini event", // rftr: mini events L"Funds transferred from rebel command", // rftr: rebel command + L"Funds transferred to rebel command", // rftr: rebel command }; STR16 pTransactionAlternateText[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index c8be801e..9599c065 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -4667,6 +4667,8 @@ STR16 pTransactionText[] = L"Trained workers", // Flugente: train workers L"Drill militia in %s", // Flugente: drill militia // TODO.Translate L"Mini event", // rftr: mini events // TODO: translate + L"Funds transferred from rebel command", // rftr: rebel command + L"Funds transferred to rebel command", // rftr: rebel command }; STR16 pTransactionAlternateText[] = diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 2d099790..913d67f2 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -4665,6 +4665,8 @@ STR16 pTransactionText[] = L"Arbeiter trainiert", // Flugente: train workers L"Miliz in %s ausbilden", // Flugente: drill militia L"Mini event", // rftr: mini events // TODO: translate + L"Funds transferred from rebel command", // rftr: rebel command + L"Funds transferred to rebel command", // rftr: rebel command }; STR16 pTransactionAlternateText[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index e3386dc6..372db194 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -4657,6 +4657,8 @@ STR16 pTransactionText[] = L"Trained workers", // Flugente: train workers L"Drill militia in %s", // Flugente: drill militia // TODO.Translate L"Mini event", // rftr: mini events // TODO: translate + L"Funds transferred from rebel command", // rftr: rebel command + L"Funds transferred to rebel command", // rftr: rebel command }; STR16 pTransactionAlternateText[] = diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 0407f08e..21b44b9d 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -4668,6 +4668,8 @@ STR16 pTransactionText[] = L"Trained workers", // Flugente: train workers L"Drill militia in %s", // Flugente: drill militia // TODO.Translate L"Mini event", // rftr: mini events // TODO: translate + L"Funds transferred from rebel command", // rftr: rebel command + L"Funds transferred to rebel command", // rftr: rebel command }; STR16 pTransactionAlternateText[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 462dbdb2..8aef6e83 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -4660,6 +4660,8 @@ STR16 pTransactionText[] = L"Trained workers", // Flugente: train workers // TODO.Translate L"Drill militia in %s", // Flugente: drill militia // TODO.Translate L"Mini event", // rftr: mini events // TODO: translate + L"Funds transferred from rebel command", // rftr: rebel command + L"Funds transferred to rebel command", // rftr: rebel command }; STR16 pTransactionAlternateText[] =