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

New Feature: Militia Volunteer Pool limits the number of militia we can train. Turned off by default.

Browse Source 
GameDir >= r2210 is recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7746 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-02-22 18:52:41 +00:00
parent caf482614a
commit c7c085b04f
17 changed files with 165 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Town Militia.cpp
+69 -2
View File
@@ -127,6 +127,9 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
UINT8 ubTrainerEffectiveLeadership = FindBestMilitiaTrainingLeadershipInSector ( sMapX, sMapY, pTrainer->bSectorZ, TOWN_MILITIA );
UINT8 iTrainingSquadSize = __min(iMaxMilitiaPerSector, CalcNumMilitiaTrained(ubTrainerEffectiveLeadership, FALSE));
// Flugente: our pool of volunteers limits how many militia can be created
iTrainingSquadSize = min( iTrainingSquadSize, GetVolunteerPool( ) );
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Militia1");
// get town index
@@ -310,6 +313,8 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
++ubMilitiaTrained;
}
AddVolunteers( -ubMilitiaTrained );
if (gfStrategicMilitiaChangesMade)
{
ResetMilitia();
@@ -2142,7 +2147,7 @@ UINT8 CalcNumMilitiaTrained(UINT8 ubBestLeadership, BOOLEAN fMobile)
ubMilitiaToTrain = __max(3, ubMilitiaToTrain);
}
}
return (ubMilitiaToTrain);
}
@@ -2428,4 +2433,66 @@ UINT32 CalcMilitiaUpkeep( void )
}
return (uiTotalPayment);
}
}
// Flugente: our militia volunteer pool is limited
INT32 GetVolunteerPool()
{
// if this feature is off, we simply assume we have reserves
if ( !gGameExternalOptions.fMilitiaVolunteerPool )
return 999999;
// the pool is actually a float number, only return full volunteers though
return (INT32)LaptopSaveInfo.dMilitiaVolunteerPool;
}
// add/remove volunteers from pool
void AddVolunteers( FLOAT asNum )
{
LaptopSaveInfo.dMilitiaVolunteerPool = max( 0, LaptopSaveInfo.dMilitiaVolunteerPool + asNum );
}
FLOAT CalcHourlyVolunteerGain()
{
FLOAT loyalpopulation = 0.0f; // the number of loyal citizens, from which we derive the hourly volunteer gain
FLOAT populationmodifier = 1.0f; // certain sectors/facilities under our control increase the volunteer gain
for ( UINT8 sX = 1; sX < MAP_WORLD_X - 1; ++sX )
{
for ( UINT8 sY = 1; sY < MAP_WORLD_X - 1; ++sY )
{
// not if the enemy controls this sector
if ( StrategicMap[CALCULATE_STRATEGIC_INDEX( sX, sY )].fEnemyControlled )
continue;
UINT8 sector = SECTOR( sX, sY );
SECTORINFO *pSectorInfo = &(SectorInfo[sector]);
if ( !pSectorInfo )
continue;
// TODO: modifier increase for every farm we control
if ( pSectorInfo->ubTraversability[THROUGH_STRATEGIC_MOVE] == FARMLAND || pSectorInfo->ubTraversability[THROUGH_STRATEGIC_MOVE] == FARMLAND_ROAD )
populationmodifier += gGameExternalOptions.dMilitiaVolunteerMultiplierFarm;
UINT8 ubTownID = StrategicMap[CALCULATE_STRATEGIC_INDEX( sX, sY )].bNameId;
if ( ubTownID != BLANK_SECTOR )
{
UINT16 population = GetSectorPopulation( sX, sY );
loyalpopulation += gTownLoyalty[ubTownID].ubRating * population / 100;
}
}
}
FLOAT hourlygain = loyalpopulation * populationmodifier * gGameExternalOptions.dMilitiaVolunteerGainFactorHourly;
return hourlygain;
}
// every hour, controlled sectors add to our volunteer pool
void UpdateVolunteers()
{
AddVolunteers( CalcHourlyVolunteerGain() );
}