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

New feature: individual militia creates small militia profiles that track a militia's history and allow it to be recreated, thereby maintaining the illusion of persistent militia.

Browse Source 
Requires GameDir >= r2316.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23044&goto=345324&#msg_345324

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-05-06 14:51:24 +00:00
parent 67927ed723
commit 9f52c940a8
75 changed files with 6740 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/PMC.cpp
+24 -10
View File
@@ -38,10 +38,9 @@
#include "militia control.h"
#include "Town Militia.h"
#include "Strategic Town Loyalty.h"
#include "MilitiaIndividual.h"
#endif
extern INT32 ReadFieldByField( HWFILE hFile, PTR pDest, UINT32 uiFieldSize, UINT32 uiElementSize, UINT32 uiCurByteCount );
std::vector<PMCReinforcesHireEvent> gPMCHiringEvents;
PMCGlobalData gPMCData;
@@ -274,16 +273,24 @@ PMCPersonnelData pmcdata[2];
// how much does it cost to hire a militia from the PMC?
UINT16 GetMilitiaCostPMC( UINT8 aSoldierClass )
{
switch ( aSoldierClass )
// Flugente: if individual militia is on, the upfront payment is much smaller (a single day's wage). In exchange, we have to pay higher wages for these guys
if ( gGameExternalOptions.fIndividualMilitia )
{
case REGULAR_MILITIA:
return (4 * gGameExternalOptions.iMilitiaTrainingCost * gGameExternalOptions.iRegularCostModifier) / gGameExternalOptions.iTrainingSquadSize + 7 * gGameExternalOptions.usDailyCostTownRegular;
break;
return gMilitiaOriginData[MO_PMC].dailycost[aSoldierClass];
}
else
{
switch ( aSoldierClass )
{
case REGULAR_MILITIA:
return (4 * gGameExternalOptions.iMilitiaTrainingCost * gGameExternalOptions.iRegularCostModifier) / gGameExternalOptions.iTrainingSquadSize + 7 * gGameExternalOptions.usDailyCostTown[REGULAR_MILITIA];
break;
case ELITE_MILITIA:
// elites are upgradded regulars, so we pay for the basic + specail training
return ((4 * gGameExternalOptions.iMilitiaTrainingCost * gGameExternalOptions.iRegularCostModifier) + (2 * gGameExternalOptions.iMilitiaTrainingCost * gGameExternalOptions.iVeteranCostModifier)) / gGameExternalOptions.iTrainingSquadSize + 7 * gGameExternalOptions.usDailyCostTownElite;
break;
case ELITE_MILITIA:
// elites are upgraded regulars, so we pay for the basic + special training
return ((4 * gGameExternalOptions.iMilitiaTrainingCost * gGameExternalOptions.iRegularCostModifier) + (2 * gGameExternalOptions.iMilitiaTrainingCost * gGameExternalOptions.iVeteranCostModifier)) / gGameExternalOptions.iTrainingSquadSize + 7 * gGameExternalOptions.usDailyCostTown[ELITE_MILITIA];
break;
}
}
return 0;
@@ -752,6 +759,13 @@ void HandlePMCArrival( UINT8 usId )
StrategicAddMilitiaToSector( SECTORX( (*it).usSectorToArrive ), SECTORY( (*it).usSectorToArrive ), REGULAR_MILITIA, (*it).usRegulars );
StrategicAddMilitiaToSector( SECTORX( (*it).usSectorToArrive ), SECTORY( (*it).usSectorToArrive ), ELITE_MILITIA, (*it).usVeterans );
// Flugente: create individual militia
for ( int i = 0; i < (*it).usRegulars; ++i )
CreateNewIndividualMilitia( REGULAR_MILITIA, MO_PMC, (*it).usSectorToArrive );
for ( int i = 0; i < (*it).usVeterans; ++i )
CreateNewIndividualMilitia( ELITE_MILITIA, MO_PMC, (*it).usSectorToArrive );
// if this is in the current sector, militia will be updated
ResetMilitia( );