From 56f98644410ee917e621e96fe5478f40b2accf46 Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 14 Mar 2018 19:46:43 +0000 Subject: [PATCH] - Fix: wrong print format in militia battlereports - Added flag for militia desertion git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8547 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/MilitiaInterface.cpp | 12 +++++++++--- Strategic/Assignments.cpp | 2 +- Strategic/MilitiaIndividual.cpp | 26 +++++++++++++------------- Strategic/MilitiaIndividual.h | 1 + Utils/_ChineseText.cpp | 11 ++++++----- Utils/_DutchText.cpp | 11 ++++++----- Utils/_EnglishText.cpp | 11 ++++++----- Utils/_FrenchText.cpp | 11 ++++++----- Utils/_GermanText.cpp | 11 ++++++----- Utils/_ItalianText.cpp | 11 ++++++----- Utils/_PolishText.cpp | 11 ++++++----- Utils/_RussianText.cpp | 11 ++++++----- 12 files changed, 72 insertions(+), 57 deletions(-) diff --git a/Laptop/MilitiaInterface.cpp b/Laptop/MilitiaInterface.cpp index 3c001dcb3..bd17a66bc 100644 --- a/Laptop/MilitiaInterface.cpp +++ b/Laptop/MilitiaInterface.cpp @@ -131,7 +131,7 @@ MilitiaPersonalDataTableFireConfirmationCallback( UINT8 val ) MILITIA militia; if ( GetMilitia( gusCurrentMilitia, &militia ) ) { - if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) ) + if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) ) { militia.Fire(); @@ -154,7 +154,7 @@ void MilitiaPersonalDataTableFireCallback( GUI_BUTTON *btn, INT32 reason ) MILITIA militia; if ( GetMilitia( gusCurrentMilitia, &militia ) ) { - if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) ) + if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) ) { CHAR16 sString[256]; swprintf( sString, szIdividualMilitiaWebsiteText[1], militia.GetName( ) ); @@ -277,6 +277,12 @@ MilitiaPersonalDataTable::Display( ) DrawTextToScreen( sText, usPosX, usPosY + 5, GetWidth( ), FONT12ARIAL, FONT_MCOLOR_DKGRAY, FONT_MCOLOR_BLACK, FALSE, 0 ); usPosY += 20; } + else if ( militia.flagmask & MILITIAFLAG_DESERTION ) + { + swprintf( sText, szIdividualMilitiaWebsiteText[19] ); + DrawTextToScreen( sText, usPosX, usPosY + 5, GetWidth(), FONT12ARIAL, FONT_MCOLOR_DKGRAY, FONT_MCOLOR_BLACK, FALSE, 0 ); + usPosY += 20; + } else { swprintf( sText, szIdividualMilitiaWebsiteText[7] ); @@ -311,7 +317,7 @@ MilitiaPersonalDataTable::Display( ) } // if we can still fire this guy, set up the button - if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) ) + if ( !(militia.flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) ) { // we can't fire someone if they are in combat if ( SectorOursAndPeaceful( SECTORX( militia.sector ), SECTORY( militia.sector ), 0 ) ) diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index e27925be5..0d5b5baf0 100644 --- a/Strategic/Assignments.cpp +++ b/Strategic/Assignments.cpp @@ -946,7 +946,7 @@ BOOLEAN CanCharacterDoctorMilitia( SOLDIERTYPE *pSoldier ) std::vector::iterator itend = gIndividualMilitiaVector.end(); for ( std::vector::iterator it = gIndividualMilitiaVector.begin(); it != itend; ++it ) { - if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED ) ) && ( *it ).sector == sector ) + if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION ) ) && ( *it ).sector == sector ) { if ( ( *it ).healthratio < 100.0f ) return TRUE; diff --git a/Strategic/MilitiaIndividual.cpp b/Strategic/MilitiaIndividual.cpp index f98e951ca..0464c4b7c 100644 --- a/Strategic/MilitiaIndividual.cpp +++ b/Strategic/MilitiaIndividual.cpp @@ -375,7 +375,7 @@ UINT32 MilitiaIndividual_Heal( UINT32 points, UINT8 aSector ) std::vector::iterator itend = gIndividualMilitiaVector.end(); for ( std::vector::iterator it = gIndividualMilitiaVector.begin(); it != itend; ++it ) { - if ( !( ( *it ).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED ) ) && (*it).sector == aSector && ( *it ).healthratio < 100.0f ) + if ( !( ( *it ).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION ) ) && (*it).sector == aSector && ( *it ).healthratio < 100.0f ) { totalhealthmissing += ( 100.0f - ( *it ).healthratio ); } @@ -388,7 +388,7 @@ UINT32 MilitiaIndividual_Heal( UINT32 points, UINT8 aSector ) for ( std::vector::iterator it = gIndividualMilitiaVector.begin(); it != itend; ++it ) { - if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED ) ) && ( *it ).sector == aSector && ( *it ).healthratio < 100.0f ) + if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION ) ) && ( *it ).sector == aSector && ( *it ).healthratio < 100.0f ) { ( *it ).healthratio += ( 100.0f - ( *it ).healthratio ) * pointstouse / totalhealthmissing; } @@ -575,7 +575,7 @@ UINT32 GetIdOfUnusedIndividualMilitia( UINT8 aSoldierClass, UINT8 aSector ) std::vector::iterator itend = gIndividualMilitiaVector.end(); for ( std::vector::iterator it = gIndividualMilitiaVector.begin( ); it != itend; ++it ) { - if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) && (*it).sector == aSector && (*it).militiarank == militialevel ) + if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) && (*it).sector == aSector && (*it).militiarank == militialevel ) { // fitting data found - now we have to make sure this one isn't already in use BOOLEAN found = FALSE; @@ -625,7 +625,7 @@ BOOLEAN GetIdOfIndividualMilitiaWithClassSector( UINT8 aSoldierClass, UINT8 aSec std::vector::iterator itend = gIndividualMilitiaVector.end(); for ( std::vector::iterator it = gIndividualMilitiaVector.begin(); it != itend; ++it ) { - if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED ) ) && ( *it ).sector == aSector && ( *it ).militiarank == militialevel ) + if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION ) ) && ( *it ).sector == aSector && ( *it ).militiarank == militialevel ) { arId = ( *it ).id; @@ -648,7 +648,7 @@ FLOAT PromoteIndividualMilitiaInSector( UINT8 aSector, FLOAT aPointsToAdd ) std::vector::iterator itend = gIndividualMilitiaVector.end(); for ( std::vector::iterator it = gIndividualMilitiaVector.begin(); it != itend; ++it ) { - if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED ) ) && ( *it ).sector == aSector && ( *it ).militiarank == GREEN_MILITIA ) + if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION ) ) && ( *it ).sector == aSector && ( *it ).militiarank == GREEN_MILITIA ) { MILITIA militia = ( *it ); @@ -691,7 +691,7 @@ FLOAT PromoteIndividualMilitiaInSector( UINT8 aSector, FLOAT aPointsToAdd ) std::vector::iterator itend = gIndividualMilitiaVector.end(); for ( std::vector::iterator it = gIndividualMilitiaVector.begin(); it != itend; ++it ) { - if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED ) ) && ( *it ).sector == aSector && ( *it ).militiarank == REGULAR_MILITIA ) + if ( !( ( *it ).flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION ) ) && ( *it ).sector == aSector && ( *it ).militiarank == REGULAR_MILITIA ) { MILITIA militia = ( *it ); @@ -885,7 +885,7 @@ void MoveIndividualMilitiaProfiles( UINT8 aSourceSector, UINT8 aTargetSector, UI if ( !usGreens && !usRegulars && !usElites ) return; - if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) && (*it).sector == aSourceSector ) + if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) && (*it).sector == aSourceSector ) { if ( usGreens && ( *it ).militiarank == GREEN_MILITIA) { @@ -920,7 +920,7 @@ void DisbandIndividualMilitia( UINT8 aSector, UINT8 usGreens, UINT8 usRegulars, if ( !usGreens && !usRegulars && !usElites ) return; - if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) && (*it).sector == aSector ) + if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) && (*it).sector == aSector ) { if ( usGreens && (*it).militiarank == GREEN_MILITIA) { @@ -951,7 +951,7 @@ void PromoteIndividualMilitia( UINT8 aSector, UINT8 aSoldierClass ) std::vector::iterator itend = gIndividualMilitiaVector.end( ); for ( std::vector::iterator it = gIndividualMilitiaVector.begin( ); it != itend; ++it ) { - if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) && (*it).sector == aSector && (*it).militiarank == militiarank ) + if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) && (*it).sector == aSector && (*it).militiarank == militiarank ) { (*it).militiarank++; @@ -969,7 +969,7 @@ void PromoteIndividualMilitia( UINT8 aSector, UINT8 aSoldierClass ) void PossiblyPromoteIndividualMilitia( MILITIA& aMilitia ) { - if ( !( aMilitia.flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED ) ) ) + if ( !( aMilitia.flagmask & ( MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION ) ) ) { // Flugente: check whether we have the resources to promote militia BOOLEAN fCanPromoteToRegular = TRUE; @@ -1029,7 +1029,7 @@ UINT32 GetDailyUpkeep_IndividualMilitia( UINT32& arNumGreen, UINT32& arNumRegula std::vector::iterator itend = gIndividualMilitiaVector.end( ); for ( std::vector::iterator it = gIndividualMilitiaVector.begin( ); it != itend; ++it ) { - if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) ) + if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) ) { if ( (*it).militiarank == REGULAR_MILITIA ) { @@ -1060,7 +1060,7 @@ void PickIndividualMilitia( UINT8 aSector, UINT8 ubType, UINT16 aNumber ) if ( !aNumber ) return; - if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_NEEDS_SECTOR)) && (*it).sector == aSector ) + if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION | MILITIAFLAG_NEEDS_SECTOR)) && (*it).sector == aSector ) { if ( ubType == (*it).militiarank ) { @@ -1084,7 +1084,7 @@ void DropIndividualMilitia( UINT8 aSector, UINT8 ubType, UINT16 aNumber ) if ( !aNumber ) return; - if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED)) && ((*it).flagmask & MILITIAFLAG_NEEDS_SECTOR) ) + if ( !((*it).flagmask & (MILITIAFLAG_DEAD | MILITIAFLAG_FIRED | MILITIAFLAG_DESERTION )) && ((*it).flagmask & MILITIAFLAG_NEEDS_SECTOR) ) { if ( ubType == (*it).militiarank ) { diff --git a/Strategic/MilitiaIndividual.h b/Strategic/MilitiaIndividual.h index 68c789c76..dda8f8fcd 100644 --- a/Strategic/MilitiaIndividual.h +++ b/Strategic/MilitiaIndividual.h @@ -78,6 +78,7 @@ extern MilitiaOriginData gMilitiaOriginData[MO_MAX]; #define MILITIAFLAG_DEAD 0x00000001 // this guy is dead #define MILITIAFLAG_FIRED 0x00000002 // this guy no longer works for us - we fired him, or didn't have the money to keep them #define MILITIAFLAG_NEEDS_SECTOR 0x00000004 // as the player currently resets militia in a town's sector in the map, this militia's sector is not clear +#define MILITIAFLAG_DESERTION 0x00000008 // this guy deserted class MILITIA { diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 6e5d7172a..34bfa7e18 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -11127,8 +11127,8 @@ STR16 szMilitiaWebSite[] = STR16 szIndividualMilitiaBattleReportText[] = { L"参与行动 %s",//L"Took part in Operation %s", - L"招募日期 %d, %d:%2d in %s",//L"Recruited on Day %d, %d:%2d in %s", - L"加薪日期 %d, %d:%2d",//L"Promoted on Day %d, %d:%2d", + L"招募日期 %d, %d:%02d in %s",//L"Recruited on Day %d, %d:%02d in %s", + L"加薪日期 %d, %d:%02d",//L"Promoted on Day %d, %d:%02d", L"KIA,行动 %s",//L"KIA, Operation %s", L"在行动中受了轻伤 %s",//L"Lightly wounded during Operation %s", @@ -11136,9 +11136,9 @@ STR16 szIndividualMilitiaBattleReportText[] = L"在行动中受了致命伤 %s",//L"Critically wounded during Operation %s", L"在行动中勇敢地战斗 %s",//L"Valiantly fought in Operation %s", - L"从Kerberus安保公司雇佣的时间：%d, %d:%2d 在 %s",//L"Hired from Kerberus on Day %d, %d:%2d in %s", - L"反叛的时间：%d, %d:%2d 在 %s",//L"Defected to us on Day %d, %d:%2d in %s", - L"合同终止的时间：%d, %d:%2d",//L"Contract terminated on Day %d, %d:%2d", + L"从Kerberus安保公司雇佣的时间：%d, %d:%02d 在 %s",//L"Hired from Kerberus on Day %d, %d:%02d in %s", + L"反叛的时间：%d, %d:%02d 在 %s",//L"Defected to us on Day %d, %d:%02d in %s", + L"合同终止的时间：%d, %d:%02d",//L"Contract terminated on Day %d, %d:%02d", }; STR16 szIndividualMilitiaTraitRequirements[] = @@ -11191,6 +11191,7 @@ STR16 szIdividualMilitiaWebsiteText[] = L"%s 在现在载入的区域尚未激活.",//L"%s is not active in the currently loaded sector.", L"%s 已经被提升为熟练民兵",//L"%s has been promoted to regular militia", L"%s 已经被提升为精英民兵",//L"%s has been promoted to elite militia", + L"Status: Deserted", // TODO:Translate }; STR16 szIdividualMilitiaWebsiteFilterText_Dead[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index db51b372e..9f2a0269d 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -11145,8 +11145,8 @@ STR16 szMilitiaWebSite[] = STR16 szIndividualMilitiaBattleReportText[] = { L"Took part in Operation %s", - L"Recruited on Day %d, %d:%2d in %s", - L"Promoted on Day %d, %d:%2d", + L"Recruited on Day %d, %d:%02d in %s", + L"Promoted on Day %d, %d:%02d", L"KIA, Operation %s", L"Lightly wounded during Operation %s", @@ -11154,9 +11154,9 @@ STR16 szIndividualMilitiaBattleReportText[] = L"Critically wounded during Operation %s", L"Valiantly fought in Operation %s", - L"Hired from Kerberus on Day %d, %d:%2d in %s", - L"Defected to us on Day %d, %d:%2d in %s", - L"Contract terminated on Day %d, %d:%2d", + L"Hired from Kerberus on Day %d, %d:%02d in %s", + L"Defected to us on Day %d, %d:%02d in %s", + L"Contract terminated on Day %d, %d:%02d", }; STR16 szIndividualMilitiaTraitRequirements[] = @@ -11209,6 +11209,7 @@ STR16 szIdividualMilitiaWebsiteText[] = L"%s is not active in the currently loaded sector.", L"%s has been promoted to regular militia", L"%s has been promoted to elite militia", + L"Status: Deserted", // TODO:Translate }; STR16 szIdividualMilitiaWebsiteFilterText_Dead[] = diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index cf42df85b..eb26c39d4 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -11129,8 +11129,8 @@ STR16 szMilitiaWebSite[] = STR16 szIndividualMilitiaBattleReportText[] = { L"Took part in Operation %s", - L"Recruited on Day %d, %d:%2d in %s", - L"Promoted on Day %d, %d:%2d", + L"Recruited on Day %d, %d:%02d in %s", + L"Promoted on Day %d, %d:%02d", L"KIA, Operation %s", L"Lightly wounded during Operation %s", @@ -11138,9 +11138,9 @@ STR16 szIndividualMilitiaBattleReportText[] = L"Critically wounded during Operation %s", L"Valiantly fought in Operation %s", - L"Hired from Kerberus on Day %d, %d:%2d in %s", - L"Defected to us on Day %d, %d:%2d in %s", - L"Contract terminated on Day %d, %d:%2d", + L"Hired from Kerberus on Day %d, %d:%02d in %s", + L"Defected to us on Day %d, %d:%02d in %s", + L"Contract terminated on Day %d, %d:%02d", }; STR16 szIndividualMilitiaTraitRequirements[] = @@ -11193,6 +11193,7 @@ STR16 szIdividualMilitiaWebsiteText[] = L"%s is not active in the currently loaded sector.", L"%s has been promoted to regular militia", L"%s has been promoted to elite militia", + L"Status: Deserted", }; STR16 szIdividualMilitiaWebsiteFilterText_Dead[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index f58c887bf..083fadb1f 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -11127,8 +11127,8 @@ STR16 szMilitiaWebSite[] = STR16 szIndividualMilitiaBattleReportText[] = { L"Took part in Operation %s", - L"Recruited on Day %d, %d:%2d in %s", - L"Promoted on Day %d, %d:%2d", + L"Recruited on Day %d, %d:%02d in %s", + L"Promoted on Day %d, %d:%02d", L"KIA, Operation %s", L"Lightly wounded during Operation %s", @@ -11136,9 +11136,9 @@ STR16 szIndividualMilitiaBattleReportText[] = L"Critically wounded during Operation %s", L"Valiantly fought in Operation %s", - L"Hired from Kerberus on Day %d, %d:%2d in %s", - L"Defected to us on Day %d, %d:%2d in %s", - L"Contract terminated on Day %d, %d:%2d", + L"Hired from Kerberus on Day %d, %d:%02d in %s", + L"Defected to us on Day %d, %d:%02d in %s", + L"Contract terminated on Day %d, %d:%02d", }; STR16 szIndividualMilitiaTraitRequirements[] = @@ -11191,6 +11191,7 @@ STR16 szIdividualMilitiaWebsiteText[] = L"%s is not active in the currently loaded sector.", L"%s has been promoted to regular militia", L"%s has been promoted to elite militia", + L"Status: Deserted", // TODO:Translate }; STR16 szIdividualMilitiaWebsiteFilterText_Dead[] = diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index ea6137633..624e57676 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -10957,8 +10957,8 @@ STR16 szMilitiaWebSite[] = STR16 szIndividualMilitiaBattleReportText[] = { L"Took part in Operation %s", - L"Recruited on Day %d, %d:%2d in %s", - L"Promoted on Day %d, %d:%2d", + L"Recruited on Day %d, %d:%02d in %s", + L"Promoted on Day %d, %d:%02d", L"KIA, Operation %s", L"Lightly wounded during Operation %s", @@ -10966,9 +10966,9 @@ STR16 szIndividualMilitiaBattleReportText[] = L"Critically wounded during Operation %s", L"Valiantly fought in Operation %s", - L"Hired from Kerberus on Day %d, %d:%2d in %s", - L"Defected to us on Day %d, %d:%2d in %s", - L"Contract terminated on Day %d, %d:%2d", + L"Hired from Kerberus on Day %d, %d:%02d in %s", + L"Defected to us on Day %d, %d:%02d in %s", + L"Contract terminated on Day %d, %d:%02d", }; STR16 szIndividualMilitiaTraitRequirements[] = @@ -11021,6 +11021,7 @@ STR16 szIdividualMilitiaWebsiteText[] = L"%s is not active in the currently loaded sector.", L"%s has been promoted to regular militia", L"%s has been promoted to elite militia", + L"Status: Deserted", // TODO:Translate }; STR16 szIdividualMilitiaWebsiteFilterText_Dead[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 67459df28..d258b7af0 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -11136,8 +11136,8 @@ STR16 szMilitiaWebSite[] = STR16 szIndividualMilitiaBattleReportText[] = { L"Took part in Operation %s", - L"Recruited on Day %d, %d:%2d in %s", - L"Promoted on Day %d, %d:%2d", + L"Recruited on Day %d, %d:%02d in %s", + L"Promoted on Day %d, %d:%02d", L"KIA, Operation %s", L"Lightly wounded during Operation %s", @@ -11145,9 +11145,9 @@ STR16 szIndividualMilitiaBattleReportText[] = L"Critically wounded during Operation %s", L"Valiantly fought in Operation %s", - L"Hired from Kerberus on Day %d, %d:%2d in %s", - L"Defected to us on Day %d, %d:%2d in %s", - L"Contract terminated on Day %d, %d:%2d", + L"Hired from Kerberus on Day %d, %d:%02d in %s", + L"Defected to us on Day %d, %d:%02d in %s", + L"Contract terminated on Day %d, %d:%02d", }; STR16 szIndividualMilitiaTraitRequirements[] = @@ -11200,6 +11200,7 @@ STR16 szIdividualMilitiaWebsiteText[] = L"%s is not active in the currently loaded sector.", L"%s has been promoted to regular militia", L"%s has been promoted to elite militia", + L"Status: Deserted", // TODO:Translate }; STR16 szIdividualMilitiaWebsiteFilterText_Dead[] = diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 41524415b..bc1687be5 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -11149,8 +11149,8 @@ STR16 szMilitiaWebSite[] = STR16 szIndividualMilitiaBattleReportText[] = { L"Took part in Operation %s", - L"Recruited on Day %d, %d:%2d in %s", - L"Promoted on Day %d, %d:%2d", + L"Recruited on Day %d, %d:%02d in %s", + L"Promoted on Day %d, %d:%02d", L"KIA, Operation %s", L"Lightly wounded during Operation %s", @@ -11158,9 +11158,9 @@ STR16 szIndividualMilitiaBattleReportText[] = L"Critically wounded during Operation %s", L"Valiantly fought in Operation %s", - L"Hired from Kerberus on Day %d, %d:%2d in %s", - L"Defected to us on Day %d, %d:%2d in %s", - L"Contract terminated on Day %d, %d:%2d", + L"Hired from Kerberus on Day %d, %d:%02d in %s", + L"Defected to us on Day %d, %d:%02d in %s", + L"Contract terminated on Day %d, %d:%02d", }; STR16 szIndividualMilitiaTraitRequirements[] = @@ -11213,6 +11213,7 @@ STR16 szIdividualMilitiaWebsiteText[] = L"%s is not active in the currently loaded sector.", L"%s has been promoted to regular militia", L"%s has been promoted to elite militia", + L"Status: Deserted", // TODO:Translate }; STR16 szIdividualMilitiaWebsiteFilterText_Dead[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index c4c34991f..9689b6876 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -11129,8 +11129,8 @@ STR16 szMilitiaWebSite[] = STR16 szIndividualMilitiaBattleReportText[] = { L"Участи в Операции %s", - L"Пришел в день %d, %d:%2d in %s", - L"Повышен в день %d, %d:%2d", + L"Пришел в день %d, %d:%02d in %s", + L"Повышен в день %d, %d:%02d", L"KIA, Operation %s", L"Мелкое ранение в операции %s", @@ -11138,9 +11138,9 @@ STR16 szIndividualMilitiaBattleReportText[] = L"Критическое ранение в операции %s", L"Проявил(а) доблесть в операции %s", - L"Нанят из Цербера в день %d, %d:%2d in %s", - L"Defected to us on Day %d, %d:%2d in %s", - L"Contract terminated on Day %d, %d:%2d", + L"Нанят из Цербера в день %d, %d:%02d in %s", + L"Defected to us on Day %d, %d:%02d in %s", + L"Contract terminated on Day %d, %d:%02d", }; STR16 szIndividualMilitiaTraitRequirements[] = @@ -11193,6 +11193,7 @@ STR16 szIdividualMilitiaWebsiteText[] = L"%s is not active in the currently loaded sector.", L"%s has been promoted to regular militia", L"%s has been promoted to elite militia", + L"Status: Deserted", // TODO:Translate }; STR16 szIdividualMilitiaWebsiteFilterText_Dead[] =