From e58ce236b55511d766cc482a7761bbd513af4e8b Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 17 Oct 2013 14:49:52 +0000 Subject: [PATCH] Externalizations (by Buggler) - Externalized airport sectors - Leave equipment in Drassen used airport sector instead of bobbyr shipping location, allowing possibility of separate airport and bobbyr location - Used actual sector names instead of Omerta and Drassen hardcoded text in leave equipment message prompt git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6503 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.h | 11 +++++++- Strategic/Map Screen Helicopter.cpp | 7 ------ Strategic/Map Screen Helicopter.h | 7 ++++++ Strategic/Map Screen Interface.cpp | 8 +++--- Strategic/Merc Contract.cpp | 39 +++++++++++++++-------------- Tactical/Vehicles.cpp | 4 +-- Utils/_ChineseText.cpp | 20 ++------------- Utils/_DutchText.cpp | 20 ++------------- Utils/_EnglishText.cpp | 24 +++--------------- Utils/_FrenchText.cpp | 15 ++--------- Utils/_GermanText.cpp | 20 ++------------- Utils/_ItalianText.cpp | 20 ++------------- Utils/_PolishText.cpp | 19 +++----------- Utils/_RussianText.cpp | 20 ++------------- Utils/_TaiwaneseText.cpp | 24 +++--------------- 15 files changed, 67 insertions(+), 191 deletions(-) diff --git a/GameSettings.h b/GameSettings.h index 4edd2d6e..41da6e3e 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -1700,7 +1700,16 @@ typedef struct UINT8 ubOmertaDropOffY; UINT8 ubOmertaDropOffZ; INT32 iOmertaDropOff; - INT32 iBobbyRDropOff; + INT32 iAirportDropOff; + + //Airport Stuff + UINT8 ubAirportX; + UINT8 ubAirportY; + INT32 iHeliSquadDropOff; + + UINT8 ubAirport2X; + UINT8 ubAirport2Y; + //BobbyR stuff UINT8 ubBobbyRShipDestSectorX; diff --git a/Strategic/Map Screen Helicopter.cpp b/Strategic/Map Screen Helicopter.cpp index d13e3fae..263b3cbb 100644 --- a/Strategic/Map Screen Helicopter.cpp +++ b/Strategic/Map Screen Helicopter.cpp @@ -1718,13 +1718,6 @@ BOOLEAN IsHelicopterOnGroundAtRefuelingSite( UINT8 ubRefuelingSite ) return(FALSE); } -// drassen airport sector -#define AIRPORT_X 13 -#define AIRPORT_Y 2 - -// meduna airport sector -#define AIRPORT2_X 3 -#define AIRPORT2_Y 14 BOOLEAN WillAirRaidBeStopped( INT16 sSectorX, INT16 sSectorY ) { diff --git a/Strategic/Map Screen Helicopter.h b/Strategic/Map Screen Helicopter.h index 45254979..d6d5414a 100644 --- a/Strategic/Map Screen Helicopter.h +++ b/Strategic/Map Screen Helicopter.h @@ -43,6 +43,13 @@ #define HELI_PATH_THROUGH_ENEMEY_AIRSPACE 55 #define HELI_HOT_DROP 56 +// drassen airport sector +#define AIRPORT_X gModSettings.ubAirportX //13 +#define AIRPORT_Y gModSettings.ubAirportY //2 + +// meduna airport sector +#define AIRPORT2_X gModSettings.ubAirport2X //3 +#define AIRPORT2_Y gModSettings.ubAirport2Y //14 // enums for skyrider monologue enum{ diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index b22aa832..6d208540 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -1749,15 +1749,15 @@ void HandleEquipmentLeftInDrassen( UINT32 uiSlotIndex ) while( pItem ) { - if( gWorldSectorX != BOBBYR_SHIPPING_DEST_SECTOR_X || gWorldSectorY != BOBBYR_SHIPPING_DEST_SECTOR_Y || gbWorldSectorZ != BOBBYR_SHIPPING_DEST_SECTOR_Z ) + if( gWorldSectorX != AIRPORT_X || gWorldSectorY != AIRPORT_Y || gbWorldSectorZ != 0 ) { // given this slot value, add to sector item list - AddItemsToUnLoadedSector( BOBBYR_SHIPPING_DEST_SECTOR_X, BOBBYR_SHIPPING_DEST_SECTOR_Y, BOBBYR_SHIPPING_DEST_SECTOR_Z, - gModSettings.iBobbyRDropOff, 1, &( pItem->object ) , 0, WORLD_ITEM_REACHABLE, 0, 1, FALSE ); //10433 + AddItemsToUnLoadedSector( AIRPORT_X, AIRPORT_Y, 0, + gModSettings.iAirportDropOff, 1, &( pItem->object ) , 0, WORLD_ITEM_REACHABLE, 0, 1, FALSE ); //10433 } else { - AddItemToPool( gModSettings.iBobbyRDropOff, &( pItem->object ), 1, 0, WORLD_ITEM_REACHABLE, 0 ); //10433 + AddItemToPool( gModSettings.iAirportDropOff, &( pItem->object ), 1, 0, WORLD_ITEM_REACHABLE, 0 ); //10433 } pItem = pItem->pNext; } diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index b2c272f2..ac155983 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -37,6 +37,7 @@ #include "insurance contract.h" #include "Vehicles.h" #include "email.h" + #include "Map Screen Helicopter.h" #endif #include "GameSettings.h" @@ -91,11 +92,6 @@ BOOLEAN gfContractRenewalSquenceOn = FALSE; BOOLEAN gfInContractMenuFromRenewSequence = FALSE; -// the airport sector -#define AIRPORT_X 13 -#define AIRPORT_Y 2 - - BOOLEAN SaveContractRenewalDataToSaveGameFile( HWFILE hFile ) { UINT32 uiNumBytesWritten; @@ -1107,7 +1103,7 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi CHAR16 sString[ 1024 ]; BOOLEAN fInSector = FALSE; // INT16 zTownIDString[50]; - CHAR16 zShortTownIDString[ 50 ]; + CHAR16 zShortTownIDString[ 50 ], zShortDropOffString[ 50 ], zDropOffString[ 50 ]; // use YES/NO Pop up box, settup for particular screen SGPRect pCenteringRect= {0 + xResOffset, 0, SCREEN_WIDTH - xResOffset, SCREEN_HEIGHT}; @@ -1144,11 +1140,11 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi { if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE ) { - swprintf( sString, pMercHeLeaveString[ 4 ], pSoldier->GetName(), zShortTownIDString ); + swprintf( sString, pMercHeLeaveString[ 1 ], pSoldier->GetName(), zShortTownIDString ); } else { - swprintf( sString, pMercSheLeaveString[ 4 ], pSoldier->GetName(), zShortTownIDString ); + swprintf( sString, pMercSheLeaveString[ 1 ], pSoldier->GetName(), zShortTownIDString ); } fInSector = TRUE; } @@ -1156,61 +1152,66 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi // check if drassen controlled else if( StrategicMap[ ( AIRPORT_X + ( MAP_WORLD_X * AIRPORT_Y ) ) ].fEnemyControlled == FALSE ) { + GetSectorIDString( AIRPORT_X, AIRPORT_Y, 0, zDropOffString, FALSE ); if( ( pSoldier->sSectorX == AIRPORT_X ) && ( pSoldier->sSectorY == AIRPORT_Y ) && ( pSoldier->bSectorZ == 0 ) ) { if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE ) { - swprintf( sString, L"%s %s", pSoldier->GetName(), pMercHeLeaveString[ 3 ] ); + swprintf( sString, pMercHeLeaveString[ 1 ], pSoldier->GetName(), zDropOffString ); } else { - swprintf( sString, L"%s %s", pSoldier->GetName(), pMercSheLeaveString[ 3 ] ); + swprintf( sString, pMercSheLeaveString[ 1 ], pSoldier->GetName(), zDropOffString ); } fInSector = TRUE; } else { // Set string for generic button - swprintf( gzUserDefinedButton2, L"B13" ); + GetShortSectorString( AIRPORT_X, AIRPORT_Y, zShortDropOffString ); + swprintf( gzUserDefinedButton2, L"%s", zShortDropOffString ); //B13 if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE ) { - swprintf( sString, pMercHeLeaveString[ 0 ], pSoldier->GetName(), zShortTownIDString ); + swprintf( sString, pMercHeLeaveString[ 0 ], pSoldier->GetName(), zShortTownIDString, zDropOffString ); } else { - swprintf( sString, pMercSheLeaveString[ 0 ], pSoldier->GetName(), zShortTownIDString ); + swprintf( sString, pMercSheLeaveString[ 0 ], pSoldier->GetName(), zShortTownIDString, zDropOffString ); } } } else { + GetSectorIDString( OMERTA_LEAVE_EQUIP_SECTOR_X, OMERTA_LEAVE_EQUIP_SECTOR_Y, 0, zDropOffString, FALSE ); + if( ( pSoldier->sSectorX == OMERTA_LEAVE_EQUIP_SECTOR_X ) && ( pSoldier->sSectorY == OMERTA_LEAVE_EQUIP_SECTOR_Y ) && ( pSoldier->bSectorZ == 0 ) ) { if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE ) { - swprintf( sString, L"%s %s", pSoldier->GetName(), pMercHeLeaveString[ 2 ] ); + swprintf( sString, pMercHeLeaveString[ 1 ], pSoldier->GetName(), zDropOffString ); } else { - swprintf( sString, L"%s %s", pSoldier->GetName(), pMercSheLeaveString[ 2 ] ); + swprintf( sString, pMercSheLeaveString[ 1 ], pSoldier->GetName() , zDropOffString ); } fInSector = TRUE; } else { // Set string for generic button - swprintf( gzUserDefinedButton2, L"A9" ); + GetShortSectorString( OMERTA_LEAVE_EQUIP_SECTOR_X, OMERTA_LEAVE_EQUIP_SECTOR_Y, zShortDropOffString ); + swprintf( gzUserDefinedButton2, L"%s", zShortDropOffString ); //A9 if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE ) { - swprintf( sString, pMercHeLeaveString[ 1 ], pSoldier->GetName(), zShortTownIDString ); + swprintf( sString, pMercHeLeaveString[ 0 ], pSoldier->GetName(), zShortTownIDString, zDropOffString ); } else { - swprintf( sString, pMercSheLeaveString[ 1 ], pSoldier->GetName(), zShortTownIDString ); + swprintf( sString, pMercSheLeaveString[ 0 ], pSoldier->GetName(), zShortTownIDString, zDropOffString ); } } } @@ -1289,7 +1290,7 @@ void MercDepartEquipmentBoxCallBack( UINT8 bExitValue ) else { // no - if( StrategicMap[ BOBBYR_SHIPPING_DEST_SECTOR_X + ( BOBBYR_SHIPPING_DEST_SECTOR_Y * MAP_WORLD_X ) ].fEnemyControlled == FALSE ) + if( StrategicMap[ AIRPORT_X + ( AIRPORT_Y * MAP_WORLD_X ) ].fEnemyControlled == FALSE ) { HandleMercLeavingEquipmentInDrassen( pLeaveSoldier->ubID ); } diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp index 8039ffc9..f5058457 100644 --- a/Tactical/Vehicles.cpp +++ b/Tactical/Vehicles.cpp @@ -665,7 +665,7 @@ void SetSoldierExitVehicleInsertionData( SOLDIERTYPE *pSoldier, INT32 iId, UINT8 if ( iId == iHelicopterVehicleId && !pSoldier->bInSector ) { - if( pSoldier->sSectorX != BOBBYR_SHIPPING_DEST_SECTOR_X || pSoldier->sSectorY != BOBBYR_SHIPPING_DEST_SECTOR_Y || pSoldier->bSectorZ != BOBBYR_SHIPPING_DEST_SECTOR_Z ) + if( pSoldier->sSectorX != AIRPORT_X || pSoldier->sSectorY != AIRPORT_Y || pSoldier->bSectorZ != 0 ) { if( NumHostilesInSector( pSoldier->sSectorX, pSoldier->sSectorY, pSoldier->bSectorZ ) > 0 && iOldGroupID != 0 && gGameExternalOptions.ubSkyriderHotLZ == 2 ) { @@ -702,7 +702,7 @@ void SetSoldierExitVehicleInsertionData( SOLDIERTYPE *pSoldier, INT32 iId, UINT8 { // This is drassen, make insertion gridno specific... pSoldier->ubStrategicInsertionCode = INSERTION_CODE_GRIDNO; - pSoldier->usStrategicInsertionData = 10125; + pSoldier->usStrategicInsertionData = gModSettings.iHeliSquadDropOff; //10125 } } } diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 7989e946..dc8e30ed 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -3651,15 +3651,7 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"让%s把装备留在他现在所在的地方(%s)，或者在Drassen (B13)登机飞离Tracona，把装备留在那里?", - L"让%s把装备留在他现在所在的地方(%s)，或者在Omerta (A9)登机飞离Tracona，把装备留在那里?", -#else - L"让%s把装备留在他现在所在的地方(%s)，或者在Drassen (B13)登机飞离Arulco，把装备留在那里?", - L"让%s把装备留在他现在所在的地方(%s)，或者在Omerta (A9)登机飞离Arulco，把装备留在那里?", -#endif - L"要离开了，他的装备将被留在Omerta (A9)。", - L"要离开了，他的装备将被留在Drassen (B13)。", + L"让%s把装备留在他现在所在的地方(%s)，或者在(%s)登机飞离，把装备留在那里?", L"%s要离开了，他的装备将被留在%s。", }; @@ -3667,15 +3659,7 @@ STR16 pMercHeLeaveString[] = // female version STR16 pMercSheLeaveString[] = { -#ifdef JA2UB - L"让%s把装备留在她现在所在的地方(%s)，或者在Drassen (B13)登机飞离Tracona，把装备留在那里?", - L"让%s把装备留在她现在所在的地方(%s)，或者在Omerta (A9)登机飞离Tracona，把装备留在那里?", -#else - L"让%s把装备留在她现在所在的地方(%s)，或者在Drassen (B13)登机飞离Arulco，把装备留在那里?", - L"让%s把装备留在她现在所在的地方(%s)，或者在Omerta (A9)登机飞离Arulco，把装备留在那里?", -#endif - L"要离开了，她的装备将被留在Omerta (A9)。", - L"要离开了，她的装备将被留在Drassen (B13)。", + L"让%s把装备留在她现在所在的地方(%s)，或者在(%s)登机飞离，把装备留在那里?", L"%s要离开了，她的装备将被留在%s。", }; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index cd39ac26..e49d4986 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -3651,15 +3651,7 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"Laat %s zijn uitrusting achterlaten waar hij nu is (%s) of in Drassen (B13) bij het nemen van de vlucht uit Tracona?", - L"Laat %s zijn uitrusting achterlaten waar hij nu is (%s) of later in Omerta (A9) bij het nemen van de vlucht uit Tracona?", -#else - L"Laat %s zijn uitrusting achterlaten waar hij nu is (%s) of in Drassen (B13) bij het nemen van de vlucht uit Arulco?", - L"Laat %s zijn uitrusting achterlaten waar hij nu is (%s) of later in Omerta (A9) bij het nemen van de vlucht uit Arulco?", -#endif - L"gaat binnenkort weg en laat zijn uitrusting achter in Omerta (A9).", - L"gaat binnenkort weg en laat zijn uitrusting achter in Drassen (B13).", + L"Laat %s zijn uitrusting achterlaten waar hij nu is (%s) of in (%s) bij het nemen van de vlucht?", L"%s gaat binnenkort weg en laat zijn uitrusting achter in %s.", }; @@ -3667,15 +3659,7 @@ STR16 pMercHeLeaveString[] = // female version STR16 pMercSheLeaveString[] = { -#ifdef JA2UB - L"Laat %s haar uitrusting achterlaten waar ze nu is (%s) of in Drassen (B13) bij het nemen van de vlucht uit Tracona?", - L"Laat %s haar uitrusting achterlaten waar ze nu is (%s) of later in Omerta (A9) bij het nemen van de vlucht uit Tracona?", -#else - L"Laat %s haar uitrusting achterlaten waar ze nu is (%s) of in Drassen (B13) bij het nemen van de vlucht uit Arulco?", - L"Laat %s haar uitrusting achterlaten waar ze nu is (%s) of later in Omerta (A9) bij het nemen van de vlucht uit Arulco?", -#endif - L"gaat binnenkort weg en laat haar uitrusting achter in Omerta (A9).", - L"gaat binnenkort weg en laat haar uitrusting achter in Drassen (B13).", + L"Laat %s haar uitrusting achterlaten waar ze nu is (%s) of in (%s) bij het nemen van de vlucht?", L"%s gaat binnenkort weg en laat haar uitrusting achter in %s.", }; diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index e4cafc85..d8f4c51c 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3651,32 +3651,16 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"Have %s leave his equipment where he is now (%s) or later on in Drassen (B13) upon catching flight out of Tracona?", - L"Have %s leave his equipment where he is now (%s) or later on in Omerta (A9) upon catching flight out of Tracona?", -#else - L"Have %s leave his equipment where he is now (%s) or later on in Drassen (B13) upon catching flight out of Arulco?", - L"Have %s leave his equipment where he is now (%s) or later on in Omerta (A9) upon catching flight out of Arulco?", -#endif - L"is about to leave and will drop off his equipment in Omerta (A9).", - L"is about to leave and will drop off his equipment in Drassen (B13).", - L"%s is about to leave and will drop off his equipment in %s.", + L"Have %s leave his equipment where he is now (%s) or later on in (%s) upon catching flight?", + L"%s is about to leave and will drop off his equipment in (%s).", }; // female version STR16 pMercSheLeaveString[] = { -#ifdef JA2UB - L"Have %s leave her equipment where she is now (%s) or later on in Drassen (B13) upon catching flight out of Tracona?", - L"Have %s leave her equipment where she is now (%s) or later on in Omerta (A9) upon catching flight out of Tracona?", -#else - L"Have %s leave her equipment where she is now (%s) or later on in Drassen (B13) upon catching flight out of Arulco?", - L"Have %s leave her equipment where she is now (%s) or later on in Omerta (A9) upon catching flight out of Arulco?", -#endif - L"is about to leave and will drop off her equipment in Omerta (A9).", - L"is about to leave and will drop off her equipment in Drassen (B13).", - L"%s is about to leave and will drop off her equipment in %s.", + L"Have %s leave her equipment where she is now (%s) or later on in (%s) upon catching flight?", + L"%s is about to leave and will drop off her equipment in (%s).", }; diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 19c5ff8e..741658dc 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -3655,15 +3655,7 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"%s doit-il abandonner son paquetage sur place (%s) ou à Drassen (B13) avant de quitter Tracona ?", - L"%s doit-il abandonner son paquetage sur place (%s) ou à Omerta (A9) avant de quitter Tracona ?", -#else - L"%s doit-il abandonner son paquetage sur place (%s) ou à Drassen (B13) avant de quitter Arulco ?", - L"%s doit-il abandonner son paquetage sur place (%s) ou à Omerta (A9) avant de quitter Arulco ?", -#endif - L"est sur le point de partir et laissera son paquetage à Omerta (A9).", - L"est sur le point de partir et laissera son paquetage à Drassen (B13).", + L"%s doit-il abandonner son paquetage sur place (%s) ou à (%s) avant de quitter ?", L"%s est sur le point de partir et laissera son paquetage en %s.", }; @@ -3671,10 +3663,7 @@ STR16 pMercHeLeaveString[] = // female version STR16 pMercSheLeaveString[] = { - L"%s doit-elle abandonner son paquetage sur place (%s) ou à Drassen (B13) avant de quitter Arulco ?", - L"%s doit-elle abandonner son paquetage sur place (%s) ou à Omerta (A9) avant de quitter Arulco ?", - L"est sur le point de partir et laissera son paquetage à Omerta (A9).", - L"est sur le point de partir et laissera son paquetage à Drassen (B13).", + L"%s doit-elle abandonner son paquetage sur place (%s) ou à (%s) avant de quitter ?", L"%s est sur le point de partir et laissera son paquetage en %s.", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index d9cc1d30..34b19280 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3611,30 +3611,14 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"Soll %s seine Ausrüstung hier lassen (%s) oder in Drassen (B13), wenn er Tracona verlässt?", - L"Soll %s seine Ausrüstung hier lassen (%s) oder in Omerta (A9), wenn er Tracona verlässt?", -#else - L"Soll %s seine Ausrüstung hier lassen (%s) oder in Drassen (B13), wenn er Arulco verlässt?", - L"Soll %s seine Ausrüstung hier lassen (%s) oder in Omerta (A9), wenn er Arulco verlässt?", -#endif - L"geht bald und lässt seine Ausrüstung in Omerta (A9).", - L"geht bald und lässt seine Ausrüstung in Drassen (B13).", + L"Soll %s seine Ausrüstung hier lassen (%s) oder in (%s), wenn er verlässt?", L"%s geht bald und lässt seine Ausrüstung in %s.", }; // female version STR16 pMercSheLeaveString[] = { -#ifdef JA2UB - L"Soll %s ihre Ausrüstung hier lassen (%s) oder in Drassen (B13), bevor sie Tracona verlässt?", - L"Soll %s ihre Ausrüstung hier lassen (%s) oder in Omerta (A9), bevor sie Tracona verlässt?", -#else - L"Soll %s ihre Ausrüstung hier lassen (%s) oder in Drassen (B13), bevor sie Arulco verlässt?", - L"Soll %s ihre Ausrüstung hier lassen (%s) oder in Omerta (A9), bevor sie Arulco verlässt?", -#endif - L"geht bald und lässt ihre Ausrüstung in Omerta (A9).", - L"geht bald und lässt ihre Ausrüstung in Drassen (B13).", + L"Soll %s ihre Ausrüstung hier lassen (%s) oder in (%s), bevor sie verlässt?", L"%s geht bald und lässt ihre Ausrüstung in %s.", }; diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 6ac33bdc..d8ee25b1 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -3644,15 +3644,7 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a Drassen (B13) dopo aver preso il volo da Tracona?", - L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a Omerta (A9) dopo aver preso il volo da Tracona?", -#else - L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a Drassen (B13) dopo aver preso il volo da Arulco?", - L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a Omerta (A9) dopo aver preso il volo da Arulco?", -#endif - L"sta per partire e spedirà il suo equipaggiamento a Omerta (A9).", - L"sta per partire e spedirà il suo equipaggiamento a Drassen (B13).", + L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a (%s) dopo aver preso il volo?", L"%s sta per partire e spedirà il suo equipaggiamento a %s.", }; @@ -3660,15 +3652,7 @@ STR16 pMercHeLeaveString[] = // female version STR16 pMercSheLeaveString[] = { -#ifdef JA2UB - L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a Drassen (B13) dopo aver preso il volo da Tracona?", - L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a Omerta (A9) dopo aver preso il volo da Tracona?", -#else - L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a Drassen (B13) dopo aver preso il volo da Arulco?", - L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a Omerta (A9) dopo aver preso il volo da Arulco?", -#endif - L"sta per partire e spedirà il suo equipaggiamento a Omerta (A9).", - L"sta per partire e spedirà il suo equipaggiamento a Drassen (B13).", + L"Volete che %s lasci il suo equipaggiamento dove si trova ora (%s) o in seguito a (%s) dopo aver preso il volo?", L"%s sta per partire e spedirà il suo equipaggiamento a %s.", }; diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index aab9ac9d..7eff5b8a 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -3661,27 +3661,16 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"Czy %s ma zostawić swój sprzęt w sektorze, w którym się obecnie znajduje (%s), czy w Dressen (B13), skąd odlatuje? ", - L"Czy %s ma zostawić swój sprzęt w sektorze, w którym się obecnie znajduje (%s), czy w Omercie (A9), skąd odlatuje?", -#else - L"Czy %s ma zostawić swój sprzęt w sektorze, w którym się obecnie znajduje (%s), czy w Dressen (B13), skąd odlatuje? ", - L"Czy %s ma zostawić swój sprzęt w sektorze, w którym się obecnie znajduje (%s), czy w Omercie (A9), skąd odlatuje?", -#endif - L"wkrótce odchodzi i zostawi swój sprzęt w Omercie (A9).", - L"wkrótce odchodzi i zostawi swój sprzęt w Drassen (B13).", - L"%s wkrótce odchodzi i zostawi swój sprzęt w %s.", + L"Czy %s ma zostawić swój sprzęt w sektorze, w którym się obecnie znajduje (%s), czy w (%s), skąd odlatuje?", + L"%s wkrótce odchodzi i zostawi swój sprzęt w (%s).", }; // female version STR16 pMercSheLeaveString[] = { - L"Czy %s ma zostawić swój sprzęt w sektorze, w którym się obecnie znajduje (%s), czy w Dressen (B13), skąd odlatuje? ", - L"Czy %s ma zostawić swój sprzęt w sektorze, w którym się obecnie znajduje (%s), czy w Omercie (A9), skąd odlatuje?", - L"wkrótce odchodzi i zostawi swój sprzęt w Omercie (A9).", - L"wkrótce odchodzi i zostawi swój sprzęt w Drassen (B13).", - L"%s wkrótce odchodzi i zostawi swój sprzęt w %s.", + L"Czy %s ma zostawić swój sprzęt w sektorze, w którym się obecnie znajduje (%s), czy w (%s), skąd odlatuje? ", + L"%s wkrótce odchodzi i zostawi swój sprzęt w (%s.", }; diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index b1fce4df..27528161 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3650,15 +3650,7 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"Должен ли %s оставить свою амуницию здесь (в %s) или позже в Драссене (B13) перед отлетом из Траконы?", - L"Должен ли %s оставить свою амуницию здесь (в %s) или позже в Омерте (A9) перед отлетом из Траконы?", -#else - L"Должен ли %s оставить свою амуницию здесь (в %s) или позже в Драссене (B13) перед отлетом?", - L"Должен ли %s оставить свою амуницию здесь (в %s) или позже в Омерте (A9) перед отлетом?", -#endif - L"скоро уходит и оставит свою амуницию в Омерте (А9).", - L"скоро уходит и оставит свою амуницию в Драссене (B13).", + L"Должен ли %s оставить свою амуницию здесь (в %s) или позже (в %s) перед отлетом?", L"%s скоро уходит и оставит свою амуницию в %s.", }; @@ -3666,15 +3658,7 @@ STR16 pMercHeLeaveString[] = // female version STR16 pMercSheLeaveString[] = { -#ifdef JA2UB - L"Должна ли %s оставить свою амуницию здесь (в %s) или позже в Драссене (B13) перед отлетом из Траконы?", - L"Должна ли %s оставить свою амуницию здесь (в %s) или позже в Омерте (A9) перед отлетом из Траконы?", -#else - L"Должна ли %s оставить свою амуницию здесь (в %s) или позже в Драссене (B13) перед отлетом?", - L"Должна ли %s оставить свою амуницию здесь (в %s) или позже в Омерте (A9) перед отлетом?", -#endif - L"скоро уходит и оставит свою амуницию в Омерте (А9).", - L"скоро уходит и оставит свою амуницию в Драссене (B13).", + L"Должна ли %s оставить свою амуницию здесь (в %s) или позже (в %s) перед отлетом?", L"%s скоро уходит и оставит свою амуницию в %s.", }; diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 9c46d91a..b679c40f 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -3655,32 +3655,16 @@ STR16 pMiscMapScreenMouseRegionHelpText[] = // male version of where equipment is left STR16 pMercHeLeaveString[] = { -#ifdef JA2UB - L"Have %s leave his equipment where he is now (%s) or later on in Drassen (B13) upon catching flight out of Tracona?", - L"Have %s leave his equipment where he is now (%s) or later on in Omerta (A9) upon catching flight out of Tracona?", -#else - L"Have %s leave his equipment where he is now (%s) or later on in Drassen (B13) upon catching flight out of Arulco?", - L"Have %s leave his equipment where he is now (%s) or later on in Omerta (A9) upon catching flight out of Arulco?", -#endif - L"is about to leave and will drop off his equipment in Omerta (A9).", - L"is about to leave and will drop off his equipment in Drassen (B13).", - L"%s is about to leave and will drop off his equipment in %s.", + L"Have %s leave his equipment where he is now (%s) or later on in (%s) upon catching flight?", + L"%s is about to leave and will drop off his equipment in (%s).", }; // female version STR16 pMercSheLeaveString[] = { -#ifdef JA2UB - L"Have %s leave her equipment where she is now (%s) or later on in Drassen (B13) upon catching flight out of Tracona?", - L"Have %s leave her equipment where she is now (%s) or later on in Omerta (A9) upon catching flight out of Tracona?", -#else - L"Have %s leave her equipment where she is now (%s) or later on in Drassen (B13) upon catching flight out of Arulco?", - L"Have %s leave her equipment where she is now (%s) or later on in Omerta (A9) upon catching flight out of Arulco?", -#endif - L"is about to leave and will drop off her equipment in Omerta (A9).", - L"is about to leave and will drop off her equipment in Drassen (B13).", - L"%s is about to leave and will drop off her equipment in %s.", + L"Have %s leave her equipment where she is now (%s) or later on in (%s) upon catching flight?", + L"%s is about to leave and will drop off her equipment in (%s).", };