diff --git a/Laptop/email.cpp b/Laptop/email.cpp index 3e64c497..20e473c7 100644 --- a/Laptop/email.cpp +++ b/Laptop/email.cpp @@ -323,7 +323,7 @@ INT32 GetNumberOfPagesToEmail( ); void PreProcessEmail( EmailPtr pMail ); void ModifyInsuranceEmails( UINT16 usMessageId, INT32 *iResults, EmailPtr pMail, UINT8 ubNumberOfRecords ); BOOLEAN ReplaceMercNameAndAmountWithProperData( CHAR16 *pFinishedString, EmailPtr pMail ); - +BOOLEAN ReplaceBiffNameWithProperMercName( CHAR16 *pFinishedString, EmailPtr pMail, CHAR16 *pMercName ); void InitializeMouseRegions() @@ -700,8 +700,7 @@ void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 INT32 iPosition=0; INT32 iCounter=1; - - // starts at iSubjectOffset amd goes iSubjectLength, reading in string + // WANNE: Short work in both ways LoadEncryptedDataFromFile("BINARYDATA\\Email.edt", pSubject, 640*(iMessageOffset), 640); // add message to list @@ -3946,11 +3945,13 @@ void HandleIMPCharProfileResultsMessage( void) // read one record from email file //LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_ONROOF ), MAIL_STRING_SIZE ); - #ifdef GERMAN - wcscpy(pString, L"Dach-Treffer Bonus: "); - #else - wcscpy(pString, L"Rooftop Sniping: "); - #endif + wcscpy(pString, MissingIMPSkillsDescriptions[0]); + + //#ifdef GERMAN + // wcscpy(pString, L"Dach-Treffer Bonus: "); + //#else + //wcscpy(pString, L"Rooftop Sniping: "); + //#endif // add to list AddEmailRecordToList( pString ); @@ -3963,11 +3964,13 @@ void HandleIMPCharProfileResultsMessage( void) // read one record from email file //LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_CAMOUFLAGED ), MAIL_STRING_SIZE ); - #ifdef GERMAN + wcscpy(pString, MissingIMPSkillsDescriptions[1]); + + /*#ifdef GERMAN wcscpy(pString, L"Getarnt: "); #else wcscpy(pString, L"Camouflage: "); - #endif + #endif*/ // add to list AddEmailRecordToList( pString ); @@ -4777,6 +4780,15 @@ void PreProcessEmail( EmailPtr pMail ) return; } + // WANNE: Get the text and replace name! + int iNew113MERCMerc = 0; + if (pMail->usLength == MERC_UP_LEVEL_GASTON || pMail->usLength == MERC_UP_LEVEL_STOGIE || + pMail->usLength == MERC_UP_LEVEL_TEX || pMail->usLength == MERC_UP_LEVEL_BIGGENS) + { + iNew113MERCMerc = pMail->usLength; + pMail->usLength = 2; + } + // list doesn't exist, reload if( !pTempRecord ) { @@ -4785,12 +4797,46 @@ void PreProcessEmail( EmailPtr pMail ) // read one record from email file LoadEncryptedDataFromFile( "BINARYDATA\\Email.edt", pString, MAIL_STRING_SIZE * ( iOffSet + iCounter ), MAIL_STRING_SIZE ); + // WANNE: We have a new 1.13 MERC merc (Text, Gaston, Stogie or Biggens) + if (iNew113MERCMerc != 0) + { + // WANNE: TODO: Replace "Biff" with the name of the 1.13 merc + if (iCounter == 1) + { + wcscpy(pString, L"\0"); + if (iNew113MERCMerc == MERC_UP_LEVEL_GASTON) + { + wcscpy( pString, New113MERCMercMailTexts[0] ); + + } + else if (iNew113MERCMerc == MERC_UP_LEVEL_STOGIE) + { + wcscpy( pString, New113MERCMercMailTexts[1] ); + } + else if (iNew113MERCMerc == MERC_UP_LEVEL_TEX) + { + wcscpy( pString, New113MERCMercMailTexts[2] ); + } + else if (iNew113MERCMerc == MERC_UP_LEVEL_BIGGENS) + { + wcscpy( pString, New113MERCMercMailTexts[3] ); + } + } + } + // add to list AddEmailRecordToList( pString ); // increment email record counter iCounter++; } + + // WANNE: Set the value back + if (iNew113MERCMerc != 0) + { + pMail->usLength = iNew113MERCMerc; + } + giPrevMessageId = giMessageId; } @@ -5030,6 +5076,79 @@ void ModifyInsuranceEmails( UINT16 usMessageId, INT32 *iResults, EmailPtr pMail, giPrevMessageId = giMessageId; } +BOOLEAN ReplaceBiffNameWithProperMercName( CHAR16 *pFinishedString, EmailPtr pMail, CHAR16 *pMercName ) +{ + CHAR16 pTempString[MAIL_STRING_SIZE]; + INT32 iLength=0; + INT32 iCurLocInSourceString=0; + INT32 iLengthOfSourceString = wcslen( pFinishedString ); //Get the length of the source string + CHAR16 *pMercNameString=NULL; + CHAR16 *pSubString=NULL; + BOOLEAN fReplacingMercName = TRUE; + + CHAR16 sMercName[ 32 ] = L"Biff"; //Doesnt need to be translated, inside Email.txt and will be replaced by the mercs name + CHAR16 sSearchString[32]; + + //Copy the original string over to the temp string + wcscpy( pTempString, pFinishedString ); + + //Null out the string + pFinishedString[0] = L'\0'; + + + //Keep looping through to replace all references to the keyword + while( iCurLocInSourceString < iLengthOfSourceString ) + { + iLength = 0; + pSubString = NULL; + + //Find out if the $MERCNAME$ is in the string + pMercNameString = wcsstr( &pTempString[ iCurLocInSourceString ], sMercName ); + + //pAmountString = wcsstr( &pTempString[ iCurLocInSourceString ], sAmount ); + + if( pMercNameString != NULL) + { + fReplacingMercName = TRUE; + pSubString = pMercNameString; + wcscpy( sSearchString, sMercName); + } + else + { + pSubString = NULL; + } + + + // if there is a substring + if( pSubString != NULL ) + { + iLength = pSubString - &pTempString[ iCurLocInSourceString ]; + + //Copy the part of the source string upto the keyword + wcsncat( pFinishedString, &pTempString[ iCurLocInSourceString ], iLength ); + + //increment the source string counter by how far in the keyword is and by the length of the keyword + iCurLocInSourceString+= iLength + wcslen( sSearchString ); + + if( fReplacingMercName ) + { + //add the mercs name to the string + wcscat( pFinishedString, pMercName ); + } + } + else + { + //add the rest of the string + wcscat( pFinishedString, &pTempString[ iCurLocInSourceString ] ); + + iCurLocInSourceString += wcslen( &pTempString[ iCurLocInSourceString ] ); + } + } + + return( TRUE ); +} + + BOOLEAN ReplaceMercNameAndAmountWithProperData( CHAR16 *pFinishedString, EmailPtr pMail ) { // CHAR16 pTempString[MAIL_STRING_SIZE/2 + 1]; diff --git a/Laptop/email.h b/Laptop/email.h index 9d0fbd9a..9369448f 100644 --- a/Laptop/email.h +++ b/Laptop/email.h @@ -134,6 +134,21 @@ #define BOBBY_R_MEDUNA_SHIPMENT ( AIM_MEDICAL_DEPOSIT_NO_REFUND + AIM_MEDICAL_DEPOSIT_NO_REFUND_LENGTH ) #define BOBBY_R_MEDUNA_SHIPMENT_LENGTH 4 +// WANNE: New 1.13 MERC merc mail text for level up that Speck sends +//#define MERC_UP_LEVEL_GASTON (BOBBY_R_MEDUNA_SHIPMENT + BOBBY_R_MEDUNA_SHIPMENT_LENGTH) +//#define MERC_UP_LEVEL_GASTON_LENGTH 2 +//#define MERC_UP_LEVEL_STOGIE (MERC_UP_LEVEL_GASTON + MERC_UP_LEVEL_GASTON_LENGTH) +//#define MERC_UP_LEVEL_STOGIE_LENGTH 2 +//#define MERC_UP_LEVEL_TEX (MERC_UP_LEVEL_STOGIE + MERC_UP_LEVEL_STOGIE_LENGTH) +//#define MERC_UP_LEVEL_TEX_LENGTH 2 +//#define MERC_UP_LEVEL_BIGGENS (MERC_UP_LEVEL_TEX + MERC_UP_LEVEL_TEX_LENGTH) +//#define MERC_UP_LEVEL_BIGGENS_LENGTH 2 + +#define MERC_UP_LEVEL_GASTON 165 +#define MERC_UP_LEVEL_STOGIE 166 +#define MERC_UP_LEVEL_TEX 167 +#define MERC_UP_LEVEL_BIGGENS 168 + struct message{ STR16 pString; diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp index d4bfd6ef..44563727 100644 --- a/Strategic/Auto Resolve.cpp +++ b/Strategic/Auto Resolve.cpp @@ -2862,6 +2862,16 @@ void CalculateAutoResolveInfo() &gpAR->ubYMCreatures, &gpAR->ubYFCreatures, &gpAR->ubAMCreatures, &gpAR->ubAFCreatures ); } + + // WANNE: Quickfix: If we have 0 creatues call the DetermineCreatureTownCompositionBasedOnTacticalInformation(), + // because we called the DetermineCreatureTownComposition() method before which was wrong. + if (gubNumCreaturesAttackingTown == 0) + { + DetermineCreatureTownCompositionBasedOnTacticalInformation( &gubNumCreaturesAttackingTown, + &gpAR->ubYMCreatures, &gpAR->ubYFCreatures, + &gpAR->ubAMCreatures, &gpAR->ubAFCreatures ); + } + gpAR->ubEnemies = (UINT8)min( gpAR->ubYMCreatures + gpAR->ubYFCreatures + gpAR->ubAMCreatures + gpAR->ubAFCreatures, MAX_AR_TEAM_SIZE ); } gfTransferTacticalOppositionToAutoResolve = FALSE; diff --git a/Tactical/Campaign.cpp b/Tactical/Campaign.cpp index b88ebbc8..7f1103f8 100644 --- a/Tactical/Campaign.cpp +++ b/Tactical/Campaign.cpp @@ -1618,7 +1618,42 @@ UINT16 CountSurfaceSectorsVisited( void ) void MERCMercWentUpALevelSendEmail( UINT8 ubMercMercIdValue ) { UINT8 ubEmailOffset = 0; + int iMsgLength = 0; - ubEmailOffset = MERC_UP_LEVEL_BIFF + MERC_UP_LEVEL_LENGTH_BIFF * ( ubMercMercIdValue ); - AddEmail( ubEmailOffset, MERC_UP_LEVEL_LENGTH_BIFF, SPECK_FROM_MERC, GetWorldTotalMin(), -1); + // WANNE: TODO: Tex, Biggins, Stoggy and Gaston have special handling because they are the new MERC merc in 1.13 + // There is no letter template in Email.edt. We have them hardcoded in the source code. + if (ubMercMercIdValue == 124 || ubMercMercIdValue == 125 || ubMercMercIdValue == 126 || ubMercMercIdValue == 127) + { + // Gaston + if (ubMercMercIdValue == 124) + { + ubEmailOffset = MERC_UP_LEVEL_BIFF; + iMsgLength = MERC_UP_LEVEL_GASTON; + } + // Stogie + else if (ubMercMercIdValue == 125) + { + ubEmailOffset = MERC_UP_LEVEL_BIFF; + iMsgLength = MERC_UP_LEVEL_STOGIE; + } + // Tex + else if (ubMercMercIdValue == 126) + { + ubEmailOffset = MERC_UP_LEVEL_BIFF; + iMsgLength = MERC_UP_LEVEL_TEX; + } + // Biggens + else if (ubMercMercIdValue == 127) + { + ubEmailOffset = MERC_UP_LEVEL_BIFF; + iMsgLength = MERC_UP_LEVEL_BIGGENS; + } + } + else + { + iMsgLength = MERC_UP_LEVEL_LENGTH_BIFF; + ubEmailOffset = MERC_UP_LEVEL_BIFF + MERC_UP_LEVEL_LENGTH_BIFF * ( ubMercMercIdValue ); + } + + AddEmail( ubEmailOffset, iMsgLength, SPECK_FROM_MERC, GetWorldTotalMin(), -1); } \ No newline at end of file diff --git a/Utils/Text.h b/Utils/Text.h index 50193d62..0a980de3 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -1526,6 +1526,8 @@ FLOAT GetWeightBasedOnMetricOption( UINT32 uiObjectWeight ); //SB: new 1.13 messages extern STR16 New113Message[]; +extern STR16 New113MERCMercMailTexts[]; +extern STR16 MissingIMPSkillsDescriptions[]; enum { diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index def79978..02732f8b 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -4225,4 +4225,28 @@ STR16 New113Message[] = L"Arrival of new recruits is being rerouted to sector %s, as scheduled drop-off point of sector %s is enemy occupied.", }; +// WANNE: This are the email texts, when one of the 4 new 1.13 MERC mercs have levelled up, that Speck sends +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 New113MERCMercMailTexts[] = +{ + // Gaston: Text from Line 39 in Email.edt + L"Hereby be informed that due to Gastons's past performance his fees for services rendered have undergone an increase. Personally, I'm not surprised. ± ± Speck T. Kline ± ", + // Stogie: Text from Line 43 in Email.edt + L"Please be advised that, as of this moment, Stogies's fees for services rendered have increased to coincide with the increase in his abilities. ± ± Speck T. Kline ± ", + // Tex: Text from Line 45 in Email.edt + L"Please be advised that Tex's experience entitles him to more equitable compensation. He's fees have therefore been increased to more accurately reflect his worth. ± ± Speck T. Kline ± ", + // Biggens: Text from Line 49 in Email.edt + L"Please take note. Due to the improved performance of Biggens his fees for services rendered have undergone an increase. ± ± Speck T. Kline ± ", +}; + +// WANNE: These are the missing skills from the impass.edt file +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 MissingIMPSkillsDescriptions[] = +{ + // Rooftop sniping + L"Rooftop Sniping: Not even ants are on the save side. Each target is mercilessly tracked down! ± ", + // Camouflage + L"Camouflage: Besides you even bushes look synthetic! ± ", +}; + #endif //DUTCH diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 3558a634..39e433fc 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -4220,4 +4220,28 @@ STR16 New113Message[] = L"Arrival of new recruits is being rerouted to sector %s, as scheduled drop-off point of sector %s is enemy occupied.", }; +// WANNE: This are the email texts, when one of the 4 new 1.13 MERC mercs have levelled up, that Speck sends +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 New113MERCMercMailTexts[] = +{ + // Gaston: Text from Line 39 in Email.edt + L"Hereby be informed that due to Gastons's past performance his fees for services rendered have undergone an increase. Personally, I'm not surprised. ± ± Speck T. Kline ± ", + // Stogie: Text from Line 43 in Email.edt + L"Please be advised that, as of this moment, Stogies's fees for services rendered have increased to coincide with the increase in his abilities. ± ± Speck T. Kline ± ", + // Tex: Text from Line 45 in Email.edt + L"Please be advised that Tex's experience entitles him to more equitable compensation. He's fees have therefore been increased to more accurately reflect his worth. ± ± Speck T. Kline ± ", + // Biggens: Text from Line 49 in Email.edt + L"Please take note. Due to the improved performance of Biggens his fees for services rendered have undergone an increase. ± ± Speck T. Kline ± ", +}; + +// WANNE: These are the missing skills from the impass.edt file +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 MissingIMPSkillsDescriptions[] = +{ + // Rooftop sniping + L"Rooftop Sniping: Not even ants are on the save side. Each target is mercilessly tracked down! ± ", + // Camouflage + L"Camouflage: Besides you even bushes look synthetic! ± ", +}; + #endif //ENGLISH \ No newline at end of file diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index d4e282ad..11e8f64c 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -4207,4 +4207,28 @@ STR16 New113Message[] = L"Arrival of new recruits is being rerouted to sector %s, as scheduled drop-off point of sector %s is enemy occupied.", }; +// WANNE: This are the email texts, when one of the 4 new 1.13 MERC mercs have levelled up, that Speck sends +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 New113MERCMercMailTexts[] = +{ + // Gaston: Text from Line 39 in Email.edt + L"Hereby be informed that due to Gastons's past performance his fees for services rendered have undergone an increase. Personally, I'm not surprised. ± ± Speck T. Kline ± ", + // Stogie: Text from Line 43 in Email.edt + L"Please be advised that, as of this moment, Stogies's fees for services rendered have increased to coincide with the increase in his abilities. ± ± Speck T. Kline ± ", + // Tex: Text from Line 45 in Email.edt + L"Please be advised that Tex's experience entitles him to more equitable compensation. He's fees have therefore been increased to more accurately reflect his worth. ± ± Speck T. Kline ± ", + // Biggens: Text from Line 49 in Email.edt + L"Please take note. Due to the improved performance of Biggens his fees for services rendered have undergone an increase. ± ± Speck T. Kline ± ", +}; + +// WANNE: These are the missing skills from the impass.edt file +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 MissingIMPSkillsDescriptions[] = +{ + // Rooftop sniping + L"Rooftop Sniping: Not even ants are on the save side. Each target is mercilessly tracked down! ± ", + // Camouflage + L"Camouflage: Besides you even bushes look synthetic! ± ", +}; + #endif //FRENCH diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 68bd0396..47d79cb2 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -4012,4 +4012,28 @@ STR16 New113Message[] = L"Arrival of new recruits is being rerouted to sector %s, as scheduled drop-off point of sector %s is enemy occupied.", }; +// WANNE: This are the email texts, when one of the 4 new 1.13 MERC mercs have levelled up, that Speck sends +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 New113MERCMercMailTexts[] = +{ + // Gaston: Text from Line 39 in Email.edt + L"Hiermit geben wir zur Kenntnis, daЯ aufgrund von Gastons guten Leistungen in der Vergangenheit sein Sold erhцht wurde. Ich persцnlich bin darьber nicht ьberrascht. ± ± Speck T. Kline ± ", + // Stogie: Text from Line 43 in Email.edt + L"Bitte nehmen Sie zur Kenntnis, daЯ Stogies Bezьge fьr seine geleisteten Dienste mit sofortiger Wirkung erhцht wurden in Anpassung an seine verbesserten Fдhigkeiten. ± ± Speck T. Kline ± ", + // Tex: Text from Line 45 in Email.edt + L"Bitte nehmen Sie zur Kenntnis, daЯ Tex aufgrund seiner Erfahrung Anspruch auf eine angemessenere Entlohnung hat. Seine Bezьge wurden daher ab sofort seinem Wert entsprechend erhцht. ± ± Speck T. Kline ± ", + // Biggens: Text from Line 49 in Email.edt + L"Zur Kenntnisnahme. Aufgrund seiner verbesserten Leistungen wurden Biggens Dienstbezьge erhцht. ± ± Speck T. Kline ± ", +}; + +// WANNE: These are the missing skills from the impass.edt file +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 MissingIMPSkillsDescriptions[] = +{ + // Rooftop sniping + L"Dach-Treffer Bonus: Vor Ihnen sind nicht einmal Ameisen sicher. Jedes anvisierte Ziel wird gnadenlos zur Strecke gebracht! ± ", + // Camouflage + L"Getarnt: Neben Ihnen sehen selbst Strдucher kьnstlich aus! ± ", +}; + #endif //GERMAN diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 6f33a2c4..702254ea 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -4204,4 +4204,28 @@ STR16 New113Message[] = L"Arrival of new recruits is being rerouted to sector %s, as scheduled drop-off point of sector %s is enemy occupied.", }; +// WANNE: This are the email texts, when one of the 4 new 1.13 MERC mercs have levelled up, that Speck sends +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 New113MERCMercMailTexts[] = +{ + // Gaston: Text from Line 39 in Email.edt + L"Hereby be informed that due to Gastons's past performance his fees for services rendered have undergone an increase. Personally, I'm not surprised. ± ± Speck T. Kline ± ", + // Stogie: Text from Line 43 in Email.edt + L"Please be advised that, as of this moment, Stogies's fees for services rendered have increased to coincide with the increase in his abilities. ± ± Speck T. Kline ± ", + // Tex: Text from Line 45 in Email.edt + L"Please be advised that Tex's experience entitles him to more equitable compensation. He's fees have therefore been increased to more accurately reflect his worth. ± ± Speck T. Kline ± ", + // Biggens: Text from Line 49 in Email.edt + L"Please take note. Due to the improved performance of Biggens his fees for services rendered have undergone an increase. ± ± Speck T. Kline ± ", +}; + +// WANNE: These are the missing skills from the impass.edt file +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 MissingIMPSkillsDescriptions[] = +{ + // Rooftop sniping + L"Rooftop Sniping: Not even ants are on the save side. Each target is mercilessly tracked down! ± ", + // Camouflage + L"Camouflage: Besides you even bushes look synthetic! ± ", +}; + #endif //ITALIAN diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index fccac825..0c1c43b5 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -4196,4 +4196,28 @@ STR16 New113Message[] = L"Arrival of new recruits is being rerouted to sector %s, as scheduled drop-off point of sector %s is enemy occupied.", }; +// WANNE: This are the email texts, when one of the 4 new 1.13 MERC mercs have levelled up, that Speck sends +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 New113MERCMercMailTexts[] = +{ + // Gaston: Text from Line 39 in Email.edt + L"Hereby be informed that due to Gastons's past performance his fees for services rendered have undergone an increase. Personally, I'm not surprised. ± ± Speck T. Kline ± ", + // Stogie: Text from Line 43 in Email.edt + L"Please be advised that, as of this moment, Stogies's fees for services rendered have increased to coincide with the increase in his abilities. ± ± Speck T. Kline ± ", + // Tex: Text from Line 45 in Email.edt + L"Please be advised that Tex's experience entitles him to more equitable compensation. He's fees have therefore been increased to more accurately reflect his worth. ± ± Speck T. Kline ± ", + // Biggens: Text from Line 49 in Email.edt + L"Please take note. Due to the improved performance of Biggens his fees for services rendered have undergone an increase. ± ± Speck T. Kline ± ", +}; + +// WANNE: These are the missing skills from the impass.edt file +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 MissingIMPSkillsDescriptions[] = +{ + // Rooftop sniping + L"Rooftop Sniping: Not even ants are on the save side. Each target is mercilessly tracked down! ± ", + // Camouflage + L"Camouflage: Besides you even bushes look synthetic! ± ", +}; + #endif //POLISH diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 4bfc46a8..c0aec98a 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -995,9 +995,9 @@ STR16 gpStrategicString[] = //militia occupying the sector being attacked. Limited to 9-10 chars L"Локация", //надписи в красном окне - L"Врагов", - L"Наемников", - L"Ополченцев", + L"Враг", + L"Наемники", + L"Ополчение", L"Рептионы", L"Кошки-убийцы", L"Сектор", @@ -1398,8 +1398,8 @@ CHAR16 TacticalStr[][ MED_STRING_LENGTH ] = L"Ни у кого из наемников нет аптечки", //пр L"Путь для %s заблокирован", L"Ваши бойцы, захваченные армией Дейдраны, томятся здесь в плену!", - L"Попадание в замок.", - L"Замок разрушен", + L"Замок поврежден.", + L"Замок разрушен.", L"Кто-то с другой стороны пытается открыть эту дверь.", //пр L"Состояние: %d/%d\nТопливо: %d/%d", L"%s не видит %s.", // Cannot see person trying to talk to @@ -2891,7 +2891,7 @@ STR16 BobbyRText[] = L"Вес:", // Weight of all the items of the same type L"Кал.:", // the caliber of the gun - L"Обойма:", // number of rounds of ammo the Magazine can hold + L"Маг:", // number of rounds of ammo the Magazine can hold L"Дист:", // The range of the gun L"Урон:", // Damage of the weapon L"Скор:", // Weapon's Rate Of Fire, acronym ROF @@ -3586,7 +3586,7 @@ STR16 gzGIOScreenText[] = L"Легкий", L"Нормальный", L"Трудный", - L"НЕВОЗМОЖНЫЙ", + L"БЕЗУМИЕ", L"Начать игру", L"Главное меню", L"Дополнительная сложность", @@ -3997,7 +3997,7 @@ STR16 zGioDifConfirmText[]= L"Вы выбрали ЛЕГКИЙ режим. Этот режим предназначен для тех, кто не знаком с Jagged Alliance и стратегическими играми вообще. Ваш выбор определит ход всей игры, так что будьте осторожны. Вы действительно хотите начать игру в этом режиме?", L"Вы выбрали НОРМАЛЬНЫЙ режим. Этот режим предназначен для тех, кто знаком с Jagged Alliance или другими подобными играми. Ваш выбор определит ход всей игры, так что будьте осторожны. Вы действительно хотите начать игру в этом режиме?", L"Вы выбрали ТРУДНЫЙ режим. Предупреждаем: не сетуйте на нас, если вас быстро разгромят. Ваш выбор определит ход всей игры, так что будьте осторожны. Вы действительно хотите начать игру в этом режиме?", - L"Вы выбрали НЕВОЗМОЖНЫЙ режим. Если игра уже пройдена на предыдущих трех уровнях сложности, то нужно подумать о смысле жизни, о происхождении вселенной и вообще... Но если вам все равно на что тратить время и нервы, то можете играть в этом режиме. Страшно?", + L"Вы выбрали режим БЕЗУМИЕ. Если игра уже пройдена на предыдущих трех уровнях сложности, то нужно подумать о смысле жизни, о происхождении вселенной и вообще... Но если вам все равно на что тратить время и нервы, то можете играть в этом режиме. Страшно?", }; STR16 gzLateLocalizedString[] = @@ -4171,7 +4171,7 @@ STR16 gzTooltipStrings[] = L"Каска ", L"Жилет ", L"Брюки", - L"изношен", + L"Одет", L"нет брони", L"%s|П|Н|В: %s\n", L"нет ПНВ", @@ -4213,4 +4213,28 @@ STR16 New113Message[] = L"Точка высадки новых наемников перенесена в %s, так как предыдущая точка высадки %s захвачена противником.", }; +// WANNE: This are the email texts, when one of the 4 new 1.13 MERC mercs have levelled up, that Speck sends +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 New113MERCMercMailTexts[] = +{ + // Gaston: Text from Line 39 in Email.edt + L"Пожалуйста, примите к сведению, что с настоящего момента гонорар Гастона увеличивается вследствие повышения его профессионального уровня. ± ± Спек Т. Кляйн ± ", + // Stogie: Text from Line 43 in Email.edt + L"Пожалуйста, примите к сведению, что повышение боевых навыков лейтенанта Хорга 'Сигары' влечет за собой повышение его гонорара. ± ± Спек Т. Кляйн ± ", + // Tex: Text from Line 45 in Email.edt + L"Прошу принять к сведению, что заслуги Текса позволяют ему требовать более достойной оплаты. Поэтому его гонорар был увеличен, чтобы соответствовать его умениям. ± ± Спек Т. Кляйн ± ", + // Biggens: Text from Line 49 in Email.edt + L"Ставим в известность, что отличная работа полковника Фредерика Биггенса заслуживает поощрения в виде повышения гонорара. Постановление считать действительным с текущего момента. ± ± Спек Т. Кляйн ± ", +}; + +// WANNE: These are the missing skills from the impass.edt file +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 MissingIMPSkillsDescriptions[] = +{ + // Rooftop sniping + L"Стрельба с крыш: Даже муравьи в опасности. Каджая цель безжалостно отслеживается! ± ", + // Camouflage + L"Маскировка: На вашем фоне кусты выглядят синтетическими! ± ", +}; + #endif //RUSSIAN diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 07c8761b..9234489c 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -3976,4 +3976,28 @@ STR16 New113Message[] = L"Arrival of new recruits is being rerouted to sector %s, as scheduled drop-off point of sector %s is enemy occupied.", }; +// WANNE: This are the email texts, when one of the 4 new 1.13 MERC mercs have levelled up, that Speck sends +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 New113MERCMercMailTexts[] = +{ + // Gaston: Text from Line 39 in Email.edt + L"Hereby be informed that due to Gastons's past performance his fees for services rendered have undergone an increase. Personally, I'm not surprised. ± ± Speck T. Kline ± ", + // Stogie: Text from Line 43 in Email.edt + L"Please be advised that, as of this moment, Stogies's fees for services rendered have increased to coincide with the increase in his abilities. ± ± Speck T. Kline ± ", + // Tex: Text from Line 45 in Email.edt + L"Please be advised that Tex's experience entitles him to more equitable compensation. He's fees have therefore been increased to more accurately reflect his worth. ± ± Speck T. Kline ± ", + // Biggens: Text from Line 49 in Email.edt + L"Please take note. Due to the improved performance of Biggens his fees for services rendered have undergone an increase. ± ± Speck T. Kline ± ", +}; + +// WANNE: These are the missing skills from the impass.edt file +// INFO: Do not replace the ± characters. They indicate the (-> Newline) from the edt files +STR16 MissingIMPSkillsDescriptions[] = +{ + // Rooftop sniping + L"Rooftop Sniping: Not even ants are on the save side. Each target is mercilessly tracked down! ± ", + // Camouflage + L"Camouflage: Besides you even bushes look synthetic! ± ", +}; + #endif //TAIWANESE