1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix ARC cashback bug: https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=364578&#msg_364578

Browse Source 
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
This commit is contained in:
rftr
2022-04-15 16:32:07 +00:00
parent 86fd310d6d
commit 02a8c48873
11 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/finances.cpp
+4
View File
@@ -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;
}
}
Laptop/finances.h
+1
View File
@@ -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
};
Strategic/Rebel Command.cpp
+5 -5
View File
@@ -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<RebelCommandAdminActions>(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();
}
Utils/_ChineseText.cpp
+1
View File
@@ -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[] =
Utils/_DutchText.cpp
+2
View File
@@ -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[] =
Utils/_EnglishText.cpp
+1
View File
@@ -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[] =
Utils/_FrenchText.cpp
+2
View File
@@ -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[] =
Utils/_GermanText.cpp
+2
View File
@@ -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[] =
Utils/_ItalianText.cpp
+2
View File
@@ -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[] =
Utils/_PolishText.cpp
+2
View File
@@ -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[] =
Utils/_RussianText.cpp
+2
View File
@@ -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[] =