From 6bf3775c3b0ba96eed10bc3b3a576e9fa2be53e5 Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 4 Apr 2013 21:10:28 +0000 Subject: [PATCH] cleaned up trait name displays git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5980 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/AimMembers.cpp | 13 ++--------- Laptop/mercs Files.cpp | Bin 142888 -> 142000 bytes Laptop/personnel.cpp | 33 +++++--------------------- Strategic/Map Screen Interface.cpp | 13 ++--------- Tactical/Interface Panels.cpp | 26 ++++----------------- Tactical/Overhead.cpp | 15 ------------ Tactical/Overhead.h | 2 -- Tactical/SoldierTooltips.cpp | 24 +++++++++---------- Utils/_ChineseText.cpp | 15 ++++++++++-- Utils/_DutchText.cpp | 36 +++++++++++++++++++---------- Utils/_EnglishText.cpp | 32 +++++++++++++++++-------- Utils/_FrenchText.cpp | 16 +++++++++++-- Utils/_GermanText.cpp | 17 +++++++++++--- Utils/_ItalianText.cpp | 36 +++++++++++++++++++---------- Utils/_PolishText.cpp | 17 +++++++++++--- Utils/_RussianText.cpp | 13 ++++++++++- Utils/_TaiwaneseText.cpp | 36 +++++++++++++++++++---------- 17 files changed, 187 insertions(+), 157 deletions(-) diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp index 5724b86d..ccf71a75 100644 --- a/Laptop/AimMembers.cpp +++ b/Laptop/AimMembers.cpp @@ -5616,17 +5616,8 @@ void DisplayAimMemberClickOnFaceHelpText() else { for ( UINT8 ubCnt = 0; ubCnt < bNumSkillTraits; ubCnt++ ) - { - // Flugente: as the whole trait display is fubar, we have to to a special treatment here for new traits - UINT8 display1 = ubTempSkillArray[ubCnt]; - if ( display1 > SCOUTING_NT + NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - else if ( display1 >= AMBIDEXTROUS_NT && display1 <= SCOUTING_NT ) - display1++; - else if ( display1 == NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - - swprintf( sTemp, L"%s\n", gzMercSkillTextNew[ display1 ] ); + { + swprintf( sTemp, L"%s\n", gzMercSkillTextNew[ ubTempSkillArray[ubCnt] ] ); wcscat( sString, sTemp ); } } diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index 7b9d0f638ee040b71053047bacbf5114c69f25ff..826f3f0058dcace45cbccd73be6e9e6c0c24e6c8 100644 GIT binary patch delta 48 zcmZ2+hhxK4j)pCaw|J*-5Mkn*UMI*HGhKm;QE56CKO+yL!t_FMM)7tgA;#@YLQHBh E0E)T{$N&HU delta 633 zcmbu5F-t;W6o%j9B!ag{Z!HaXsVN~RA=0>&MuQ4@1Gli!j7&>!NmFhKQ6LWA94*n* z5H$J|np&cvp+C?csNV1Dq;7G!=R4@6((A;ltm0miJ)y@y1ZME%C=vsNf6- zD546NaS0X*XfV1cv$oLWS))qlF6z8Jgxl@p%}cE+k=|vmjs;JvRb|%a1AWb-bS&^~ z;Dr4>Iuz*G_bW1Yam>EnK+{FKX`d43)_GQ0H3w>MI(>o&sNTKIg!XBsZ7a07K$Nn$ zvJHuCNkK-4x^(Q0ZA%fPr|WLDuOt<44E|5X^+cd zi@C#Svv!bEuWgw-8if-cY!h3ha2-kHJxs5V>kp^-JfCq3FMIU(m8B=<#Lz(X{VS&W qY)jZ2x}klXKdBiI`+whg*WrZ4DVbJ3K}iiSaCK_P%c SCOUTING_NT + NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - else if ( display1 >= AMBIDEXTROUS_NT && display1 <= SCOUTING_NT ) - display1++; - else if ( display1 == NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - if ( ubCnt >= 4 && bNumSkillTraits > 5 ) { fDisplayMoreTraits = TRUE; - swprintf( sString, L"%s\n", gzMercSkillTextNew[ display1 ] ); + swprintf( sString, L"%s\n", gzMercSkillTextNew[ ubTempSkillArray[ubCnt] ] ); wcscat( sString2, sString ); } else { - swprintf( sString, L"%s", gzMercSkillTextNew[ display1 ] ); + swprintf( sString, L"%s", gzMercSkillTextNew[ ubTempSkillArray[ubCnt] ] ); if ( ubTempSkillArray[ubCnt] > NEWTRAIT_MERCSKILL_EXPERTOFFSET ) { @@ -1875,26 +1865,15 @@ void DisplayCharStats(INT32 iId, INT32 iSlot) MSYS_AddRegion( &gSkillTraitHelpTextRegion[ubCnt] ); fAddedTraitRegion[ubCnt] = TRUE; - // Assign the text - UINT8 traitnr = ubTempSkillArray[ubCnt]; - if ( traitnr > NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - { - traitnr = traitnr - (NEWTRAIT_MERCSKILL_EXPERTOFFSET); - } - - // Flugente: as the whole trait display is fubar, we have to to a special treatment here for new traits - UINT8 display2 = ubTempSkillArray[ubCnt]; - if ( display2 == NUM_MAJOR_TRAITS ) - display2 += NUM_MINOR_TRAITS; - - AssignPersonnelSkillTraitHelpText( traitnr, ((ubTempSkillArray[ubCnt] > NEWTRAIT_MERCSKILL_EXPERTOFFSET) ? TRUE : FALSE), Menptr[iId].ubProfile, ubCnt ); + // Assign the text + AssignPersonnelSkillTraitHelpText( ubTempSkillArray[ubCnt], ((ubTempSkillArray[ubCnt] > NEWTRAIT_MERCSKILL_EXPERTOFFSET) ? TRUE : FALSE), Menptr[iId].ubProfile, ubCnt ); } } // if we have more skills than we can display, show "more" and create a tooltip box with the rest of them if ( fDisplayMoreTraits ) { - swprintf( sString, L"%s", gzMercSkillTextNew[ NEWTRAIT_MERCSKILL_OFFSET_ALL + 1 ]); // dispaly "More..." + swprintf( sString, L"%s", gzMercSkillTextNew[ 2 * NEWTRAIT_MERCSKILL_OFFSET_ALL + 1 ]); // display "More..." FindFontRightCoordinates((INT16)(pPersonnelScreenPoints[19].x+(iSlot*TEXT_BOX_WIDTH)),0,TEXT_BOX_WIDTH-20,0,sString, PERS_FONT, &sX, &sY); if( sX <= iMinimumX ) { diff --git a/Strategic/Map Screen Interface.cpp b/Strategic/Map Screen Interface.cpp index a3d74eeb..1d09176a 100644 --- a/Strategic/Map Screen Interface.cpp +++ b/Strategic/Map Screen Interface.cpp @@ -2070,17 +2070,8 @@ void UpdateCharRegionHelpText( void ) else { for ( UINT8 ubCnt = 0; ubCnt < bNumSkillTraits; ubCnt++ ) - { - // Flugente: as the whole trait display is fubar, we have to to a special treatment here for new traits - UINT8 display1 = ubTempSkillArray[ubCnt]; - if ( display1 > SCOUTING_NT + NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - else if ( display1 >= AMBIDEXTROUS_NT && display1 <= SCOUTING_NT ) - display1++; - else if ( display1 == NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - - swprintf( sTemp, L"%s\n", gzMercSkillTextNew[ display1 ] ); + { + swprintf( sTemp, L"%s\n", gzMercSkillTextNew[ ubTempSkillArray[ubCnt] ] ); wcscat( sString, sTemp ); } } diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index 781f4ed9..f7986ee5 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -3001,17 +3001,8 @@ void RenderSMPanel( BOOLEAN *pfDirty ) else { for ( UINT8 ubCnt = 0; ubCnt < bNumSkillTraits; ubCnt++ ) - { - // Flugente: as the whole trait display is fubar, we have to to a special treatment here for new traits - UINT8 display1 = ubTempSkillArray[ubCnt]; - if ( display1 > SCOUTING_NT + NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - else if ( display1 >= AMBIDEXTROUS_NT && display1 <= SCOUTING_NT ) - display1++; - else if ( display1 == NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - - swprintf( sTemp, L"%s\n", gzMercSkillTextNew[ display1 ] ); + { + swprintf( sTemp, L"%s\n", gzMercSkillTextNew[ ubTempSkillArray[ubCnt] ] ); wcscat( pStr, sTemp ); } } @@ -5677,17 +5668,8 @@ void RenderTEAMPanel( BOOLEAN fDirty ) else { for ( UINT8 ubCnt = 0; ubCnt < bNumSkillTraits; ubCnt++ ) - { - // Flugente: as the whole trait display is fubar, we have to to a special treatment here for new traits - UINT8 display1 = ubTempSkillArray[ubCnt]; - if ( display1 > SCOUTING_NT + NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - else if ( display1 >= AMBIDEXTROUS_NT && display1 <= SCOUTING_NT ) - display1++; - else if ( display1 == NEWTRAIT_MERCSKILL_EXPERTOFFSET ) - display1 -= NUM_MINOR_TRAITS; - - swprintf( sTemp, L"%s\n", gzMercSkillTextNew[ display1 ] ); + { + swprintf( sTemp, L"%s\n", gzMercSkillTextNew[ ubTempSkillArray[ubCnt] ] ); wcscat( pStr, sTemp ); } } diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 49e03d08..6115ebf7 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -10100,21 +10100,6 @@ void HandleDisplayingOfPlayerLostDialogue( void ) } #endif -// Flugente: the entire new trait to string thingy is a fucked up mess. I've had it. Heres a function that simply handles that crap. -STR16 GetNewTraitStr(UINT8 aTrait) -{ - if ( aTrait <= DOCTOR_NT ) - ; - else if ( aTrait <= SCOUTING_NT ) - ++aTrait; - else if ( aTrait == COVERT_NT ) - aTrait = 10; - else if ( aTrait >= SCOUTING_NT + NUM_MINOR_TRAITS ) - aTrait -= NUM_MINOR_TRAITS; - - return gzMercSkillTextNew[ aTrait ]; -} - static UINT8 prisonerdialoguetargetID = 0; void PrisonerSurrenderMessageBoxCallBack( UINT8 ubExitValue ) diff --git a/Tactical/Overhead.h b/Tactical/Overhead.h index 08429c28..a303cdd5 100644 --- a/Tactical/Overhead.h +++ b/Tactical/Overhead.h @@ -404,8 +404,6 @@ extern UINT8 NumEnemyInSector(); extern UINT8 NumZombiesInSector(); #endif -STR16 GetNewTraitStr(UINT8 aTrait); // Flugente: deal with the insane new trait to string stuff - void HandleSurrenderOffer( SOLDIERTYPE* pSoldier ); // Flugente: offer the enemy the chance to surrender // setting fForce to TRUE allows dropping of gear in combat (used in auto-resolve instances) diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index 10196046..4efa31e1 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -236,33 +236,33 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) if (( pSoldier->stats.ubSkillTraits[0] == pSoldier->stats.ubSkillTraits[1] ) && pSoldier->stats.ubSkillTraits[0] != 0 ) { CHAR16 pStrAux[50]; - swprintf( pStrAux, L"(%s)", GetNewTraitStr(pSoldier->stats.ubSkillTraits[0])); + swprintf( pStrAux, L"(%s)", gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[0] ]); swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_1], pStrInfo, pStrAux ); - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_2], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[1] + NEWTRAIT_MERCSKILL_EXPERTOFFSET) ); - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_3], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[2]) ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_2], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[1] + NEWTRAIT_MERCSKILL_EXPERTOFFSET ] ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_3], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[2] ] ); //swprintf( pStrInfo, L"%s\n", pStrInfo ); } else if (( pSoldier->stats.ubSkillTraits[1] == pSoldier->stats.ubSkillTraits[2] ) && pSoldier->stats.ubSkillTraits[1] != 0 ) { CHAR16 pStrAux[50]; - swprintf( pStrAux, L"(%s)", GetNewTraitStr(pSoldier->stats.ubSkillTraits[1])); + swprintf( pStrAux, L"(%s)", gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[1] ]); swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_1], pStrInfo, pStrAux ); - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_2], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[2] + NEWTRAIT_MERCSKILL_EXPERTOFFSET) ); - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_3], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[0]) ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_2], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[2] + NEWTRAIT_MERCSKILL_EXPERTOFFSET ] ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_3], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[0] ] ); } else if (( pSoldier->stats.ubSkillTraits[0] == pSoldier->stats.ubSkillTraits[2] ) && pSoldier->stats.ubSkillTraits[0] != 0 ) { CHAR16 pStrAux[50]; - swprintf( pStrAux, L"(%s)", GetNewTraitStr(pSoldier->stats.ubSkillTraits[0])); + swprintf( pStrAux, L"(%s)", gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[0] ]); swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_1], pStrInfo, pStrAux ); - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_2], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[2] + NEWTRAIT_MERCSKILL_EXPERTOFFSET) ); - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_3], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[1]) ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_2], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[2] + NEWTRAIT_MERCSKILL_EXPERTOFFSET ] ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_3], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[1] ] ); } else { - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_1], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[0]) ); - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_2], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[1]) ); - swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_3], pStrInfo, GetNewTraitStr(pSoldier->stats.ubSkillTraits[2]) ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_1], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[0] ] ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_2], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[1] ] ); + swprintf( pStrInfo, gzTooltipStrings[STR_TT_SKILL_TRAIT_3], pStrInfo, gzMercSkillTextNew[ pSoldier->stats.ubSkillTraits[2] ] ); } } else diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index fa5d821a..348d4ab7 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -2131,8 +2131,7 @@ STR16 gzMercSkillTextNew[] = L"格斗家", L"班副", L"技师", - L"救护兵", - L"特工", // L"Covert Ops", + L"救护兵", // Minor traits L"双持", L"近战", @@ -2144,6 +2143,8 @@ STR16 gzMercSkillTextNew[] = L"爆破", L"教学", L"侦察", // 20 + // covert ops is a major trait that was added later + L"特工", // L"Covert Ops", // second names for major skills L"机枪手", L"掷弹兵", @@ -2154,6 +2155,16 @@ STR16 gzMercSkillTextNew[] = L"班长", L"工兵", L"军医", + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 L"间谍", // 30 L"更多...", }; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 869bc39c..2d696c73 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -2118,39 +2118,51 @@ STR16 gzMercSkillText[] = STR16 gzMercSkillTextNew[] = { // Major traits - L"No Skill", - L"Auto Weapons", + L"No Skill", // 0 + L"Auto Weapons", // 1 L"Heavy Weapons", L"Marksman", L"Hunter", - L"Gunslinger", + L"Gunslinger", // 5 L"Hand to Hand", L"Deputy", L"Technician", - L"Paramedic", - L"Covert Ops", // 10 // TODO.Translate + L"Paramedic", // 9 // Minor traits - L"Ambidextrous", + L"Ambidextrous", // 10 L"Melee", L"Throwing", L"Night Ops", L"Stealthy", - L"Athletics", + L"Athletics", // 15 L"Bodybuilding", L"Demolitions", L"Teaching", - L"Scouting", + L"Scouting", // 19 + // covert ops is a major trait that was added later + L"Covert Ops", // 20 // second names for major skills - L"Machinegunner", + L"Machinegunner", // 21 L"Bombardier", L"Sniper", L"Ranger", - L"Gunfighter", + L"Gunfighter", // 25 L"Martial Arts", L"Squadleader", L"Engineer", - L"Doctor", - L"Spy", // 30 // TODO.Translate + L"Doctor", // 20 + // placeholders for minor traits + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 + L"Spy", // 40 L"More...", }; ////////////////////////////////////////////////////////// diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 4ec9154d..0ef8af32 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -2123,7 +2123,7 @@ STR16 gzMercSkillTextNew[] = { // Major traits L"No Skill", // 0 - L"Auto Weapons", + L"Auto Weapons", // 1 L"Heavy Weapons", L"Marksman", L"Hunter", @@ -2131,21 +2131,22 @@ STR16 gzMercSkillTextNew[] = L"Hand to Hand", L"Deputy", L"Technician", - L"Paramedic", - L"Covert Ops", // 10 + L"Paramedic", // 9 // Minor traits - L"Ambidextrous", + L"Ambidextrous", // 10 L"Melee", L"Throwing", L"Night Ops", - L"Stealthy", // 15 - L"Athletics", + L"Stealthy", + L"Athletics", // 15 L"Bodybuilding", L"Demolitions", L"Teaching", - L"Scouting", // 20 + L"Scouting", // 19 + // covert ops is a major trait that was added later + L"Covert Ops", // 20 // second names for major skills - L"Machinegunner", + L"Machinegunner", // 21 L"Bombardier", L"Sniper", L"Ranger", @@ -2153,8 +2154,19 @@ STR16 gzMercSkillTextNew[] = L"Martial Arts", L"Squadleader", L"Engineer", - L"Doctor", - L"Spy", // 30 + L"Doctor", // 20 + // placeholders for minor traits + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 + L"Spy", // 40 L"More...", }; ////////////////////////////////////////////////////////// diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 8a53640b..8286ec7b 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -2136,8 +2136,7 @@ STR16 gzMercSkillTextNew[] = L"Arts martiaux", L"Meneur", L"Technicien", - L"Médecin", - L"Espionnage", // 10 // TODO.Translate !!! "Infiltrateur" ? Char limit ? + L"Médecin", // Minor traits L"Ambidextre", L"Mêlée", @@ -2149,6 +2148,8 @@ STR16 gzMercSkillTextNew[] = L"Sabotage", L"Instructeur", L"Reconnaissance", + // covert ops is a major trait that was added later + L"Espionnage", // 10 // TODO.Translate !!! "Infiltrateur" ? Char limit ? // second names for major skills L"Mitrailleur", L"Bombardier", @@ -2159,6 +2160,17 @@ STR16 gzMercSkillTextNew[] = L"Commandant", L"Ingénieur", L"Chirurgien", + // placeholders for minor traits + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 L"Espion", // 30 L"Plus...", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index b79d2660..c480b083 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -2142,8 +2142,7 @@ STR16 gzMercSkillTextNew[] = L"Faustkämpfer", L"Gruppenführer", L"Mechaniker", - L"Sanitäter", - L"Geheimagent", + L"Sanitäter", // Minor traits L"Beidhänder", L"Messerkämpfer", @@ -2155,7 +2154,8 @@ STR16 gzMercSkillTextNew[] = L"Sprengmeister", L"Ausbilder", L"Aufklärer", - + // covert ops is a major trait that was added later + L"Geheimagent", // second names for major skills L"MG-Veteran", L"Artillerist", @@ -2166,6 +2166,17 @@ STR16 gzMercSkillTextNew[] = L"Zugführer", L"Ingenieur", L"Arzt", + // placeholders for minor traits + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 L"Spion", // 30 L"Mehr...", }; diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 59cdddeb..b0a1a7ea 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -2114,39 +2114,51 @@ STR16 gzMercSkillText[] = STR16 gzMercSkillTextNew[] = { // Major traits - L"No Skill", - L"Auto Weapons", + L"No Skill", // 0 + L"Auto Weapons", // 1 L"Heavy Weapons", L"Marksman", L"Hunter", - L"Gunslinger", + L"Gunslinger", // 5 L"Hand to Hand", L"Deputy", L"Technician", - L"Paramedic", - L"Covert Ops", // 10 // TODO.Translate + L"Paramedic", // 9 // Minor traits - L"Ambidextrous", + L"Ambidextrous", // 10 L"Melee", L"Throwing", L"Night Ops", L"Stealthy", - L"Athletics", + L"Athletics", // 15 L"Bodybuilding", L"Demolitions", L"Teaching", - L"Scouting", + L"Scouting", // 19 + // covert ops is a major trait that was added later + L"Covert Ops", // 20 // second names for major skills - L"Machinegunner", + L"Machinegunner", // 21 L"Bombardier", L"Sniper", L"Ranger", - L"Gunfighter", + L"Gunfighter", // 25 L"Martial Arts", L"Squadleader", L"Engineer", - L"Doctor", - L"Spy", // 30 // TODO.Translate + L"Doctor", // 20 + // placeholders for minor traits + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 + L"Spy", // 40 L"More...", }; ////////////////////////////////////////////////////////// diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index a71350cf..aa2efe3b 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -2139,8 +2139,7 @@ STR16 gzMercSkillTextNew[] = L"Walka Wręcz", L"Zastępca Szeryfa", L"Technik", - L"Paramedyk", - L"Covert Ops", // 10 // TODO.Translate + L"Paramedyk", // Minor traits L"Oburęczność", L"Walka Wręcz", @@ -2152,6 +2151,8 @@ STR16 gzMercSkillTextNew[] = L"Ładunki Wybuchowe", L"Uczenie", L"Zwiad", + // covert ops is a major trait that was added later + L"Covert Ops", // 10 // TODO.Translate // second names for major skills L"Strzelec RKMu", L"Bombardier", @@ -2162,7 +2163,17 @@ STR16 gzMercSkillTextNew[] = L"Dowódca Drużyny", L"Inżynier", L"Doktor", - L"Spy", // 30 // TODO.Translate + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 + L"Spy", // 40 // TODO.Translate L"Więcej...", }; ////////////////////////////////////////////////////////// diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index c3524d49..eada750d 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -2132,7 +2132,6 @@ STR16 gzMercSkillTextNew[] = L"Старшина", //Deputy L"Механик-электронщик", //Technician L"Санитар", //Paramedic - L"Covert Ops", // 10 // TODO.Translate // Minor traits L"Ловкач", //Ambidextrous L"Мастер клинка", //Melee @@ -2144,6 +2143,8 @@ STR16 gzMercSkillTextNew[] = L"Подрывник", //Demolitions L"Инструктор", //Teaching L"Разведчик", //Scouting + // covert ops is a major trait that was added later + L"Covert Ops", // 20 // TODO.Translate // second names for major skills L"Пулемётчик", //Machinegunner L"Артиллерист", //Bombardier @@ -2154,6 +2155,16 @@ STR16 gzMercSkillTextNew[] = L"Командир", //Squadleader L"Инженер", //Engineer L"Доктор", //Doctor + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 L"Шпион", // 30 L"Ещё...", }; diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 47210daf..f3181ea3 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -2122,39 +2122,51 @@ STR16 gzMercSkillText[] = STR16 gzMercSkillTextNew[] = { // Major traits - L"No Skill", - L"Auto Weapons", + L"No Skill", // 0 + L"Auto Weapons", // 1 L"Heavy Weapons", L"Marksman", L"Hunter", - L"Gunslinger", + L"Gunslinger", // 5 L"Hand to Hand", L"Deputy", L"Technician", - L"Paramedic", - L"Covert Ops", // 10 // TODO.Translate + L"Paramedic", // 9 // Minor traits - L"Ambidextrous", + L"Ambidextrous", // 10 L"Melee", L"Throwing", L"Night Ops", L"Stealthy", - L"Athletics", + L"Athletics", // 15 L"Bodybuilding", L"Demolitions", L"Teaching", - L"Scouting", + L"Scouting", // 19 + // covert ops is a major trait that was added later + L"Covert Ops", // 20 // second names for major skills - L"Machinegunner", + L"Machinegunner", // 21 L"Bombardier", L"Sniper", L"Ranger", - L"Gunfighter", + L"Gunfighter", // 25 L"Martial Arts", L"Squadleader", L"Engineer", - L"Doctor", - L"Spy", // 30 // TODO.Translate + L"Doctor", // 20 + // placeholders for minor traits + L"Placeholder", // 30 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 35 + L"Placeholder", + L"Placeholder", + L"Placeholder", + L"Placeholder", // 39 + L"Spy", // 40 L"More...", }; //////////////////////////////////////////////////////////