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

Implemented new IMP gear selection interface to replace the dropdown menus. Requires GameDir rev 2652.

Browse Source 
Enrico's letter is forced to the first hired merc in old inventory, similar to new inventory in case a free item pocket is not found.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Asdow
2022-08-01 21:15:34 +00:00
parent 058a2cd40f
commit 1f095b7d31
14 changed files with 1553 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/CharProfile.cpp
+2 -1
View File
@@ -703,7 +703,7 @@ void LoadImpGraphics( void )
// Added by SANDRO // Added by SANDRO
LoadAttribStartingLevelFrame( ); LoadAttribStartingLevelFrame( );
LoadColorChoiceFrame( ); LoadColorChoiceFrame( );
LoadImpGearSelection();
return; return;
} }
@@ -757,6 +757,7 @@ void RemoveImpGraphics( void )
// Added by SANDRO // Added by SANDRO
DeleteAttribStartingLevelFrame( ); DeleteAttribStartingLevelFrame( );
DeleteColorChoiceFrame( ); DeleteColorChoiceFrame( );
DeleteImpGearSelection();
return; return;
} }
Laptop/IMP Gear.cpp
+1043 -485
View File
File diff suppressed because it is too large Load Diff
Laptop/IMPVideoObjects.cpp
+64 -1
View File
@@ -40,7 +40,6 @@ UINT32 guiATTRIBUTEBAR;
UINT32 guiBUTTON2IMAGE; UINT32 guiBUTTON2IMAGE;
UINT32 guiBUTTON1IMAGE; UINT32 guiBUTTON1IMAGE;
UINT32 guiBUTTON4IMAGE; UINT32 guiBUTTON4IMAGE;
//UINT32 guiPORTRAITFRAME; // duplicate definition, look up a few lines (jonathanl)
UINT32 guiMAININDENT; UINT32 guiMAININDENT;
UINT32 guiLONGINDENT; UINT32 guiLONGINDENT;
UINT32 guiSHORTINDENT; UINT32 guiSHORTINDENT;
@@ -56,6 +55,10 @@ UINT32 guiSHORT2HINDENT;
// These 2 added - SANDRO // These 2 added - SANDRO
UINT32 guiASTARTLEVEL; UINT32 guiASTARTLEVEL;
UINT32 guiCOLORCHOICEFRAME; UINT32 guiCOLORCHOICEFRAME;
UINT32 gIMPINVENTORY;
SGPRectangle gIMPGearLayout;
SGPRectangle gIMPInvPoolLayout;
// position defines // position defines
#define CHAR_PROFILE_BACKGROUND_TILE_WIDTH 125 #define CHAR_PROFILE_BACKGROUND_TILE_WIDTH 125
@@ -1495,3 +1498,63 @@ void RenderColorChoiceFrame(INT16 sX, INT16 sY)
BOOLEAN LoadImpGearSelection(void)
{
VOBJECT_DESC VObjectDesc;
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
//if (UsingNewInventorySystem())
{
FilenameForBPP("INTERFACE\\ImpGearSelection.sti", VObjectDesc.ImageFile);
}
CHECKF(AddVideoObject(&VObjectDesc, &gIMPINVENTORY));
gIMPGearLayout = { LAPTOP_SCREEN_UL_X + 37, LAPTOP_SCREEN_WEB_UL_Y + 48, 429, 257 };
if (!UsingNewInventorySystem())
{
gIMPGearLayout = { LAPTOP_SCREEN_UL_X + 118, LAPTOP_SCREEN_WEB_UL_Y + 48, 261, 249 };
}
gIMPInvPoolLayout = { LAPTOP_SCREEN_UL_X + 57, LAPTOP_SCREEN_WEB_UL_Y + 68, 389, 217};
return (TRUE);
}
void DeleteImpGearSelection(void)
{
DeleteVideoObjectFromIndex(gIMPINVENTORY);
return;
}
extern BOOLEAN Blt8BPPDataTo16BPPBufferTransparent(UINT16* pBuffer, UINT32 uiDestPitchBYTES, HVOBJECT hSrcVObject, INT32 iX, INT32 iY, UINT16 usIndex);
void RenderImpGearSelection(void)
{
UINT32 uiDestPitchBYTES;
UINT16* pDestBuf;
HVOBJECT hCharListHandle;
UINT8 stiIndex = 0;
if (!UsingNewInventorySystem())
{
stiIndex = 5;
}
pDestBuf = (UINT16*)LockVideoSurface(FRAME_BUFFER, &uiDestPitchBYTES);
GetVideoObject(&hCharListHandle, gIMPINVENTORY);
Blt8BPPDataTo16BPPBufferTransparent(pDestBuf, uiDestPitchBYTES, hCharListHandle, gIMPGearLayout.x, gIMPGearLayout.y, stiIndex);
UnLockVideoSurface(FRAME_BUFFER);
}
void RenderImpGearSelectionGrid(void)
{
UINT32 uiDestPitchBYTES;
UINT16* pDestBuf;
HVOBJECT hCharListHandle;
UINT8 stiIndex = 1;
pDestBuf = (UINT16*)LockVideoSurface(FRAME_BUFFER, &uiDestPitchBYTES);
GetVideoObject(&hCharListHandle, gIMPINVENTORY);
Blt8BPPDataTo16BPPBufferTransparent(pDestBuf, uiDestPitchBYTES, hCharListHandle, gIMPInvPoolLayout.x, gIMPInvPoolLayout.y, stiIndex);
UnLockVideoSurface(FRAME_BUFFER);
}
Laptop/IMPVideoObjects.h
+9
View File
@@ -154,6 +154,11 @@ BOOLEAN LoadColorChoiceFrame( void );
void DeleteColorChoiceFrame( void ); void DeleteColorChoiceFrame( void );
void RenderColorChoiceFrame(INT16 sX, INT16 sY); void RenderColorChoiceFrame(INT16 sX, INT16 sY);
BOOLEAN LoadImpGearSelection(void);
void DeleteImpGearSelection(void);
void RenderImpGearSelection(void);
void RenderImpGearSelectionGrid(void);
// graphical handles // graphical handles
extern UINT32 guiBACKGROUND; extern UINT32 guiBACKGROUND;
@@ -174,6 +179,10 @@ extern UINT32 guiATTRIBUTEFRAME;
extern UINT32 guiATTRIBUTESCREENINDENT1; extern UINT32 guiATTRIBUTESCREENINDENT1;
extern UINT32 guiATTRIBUTESCREENINDENT2; extern UINT32 guiATTRIBUTESCREENINDENT2;
extern UINT32 guiSLIDERBAR; extern UINT32 guiSLIDERBAR;
extern UINT32 gIMPINVENTORY;
extern UINT32 gIMPFIGURES[3];
extern SGPRectangle gIMPGearLayout;
extern SGPRectangle gIMPInvPoolLayout;
#endif #endif
Tactical/Merc Hiring.cpp
+11 -3
View File
@@ -217,10 +217,18 @@ INT8 HireMerc( MERC_HIRE_STRUCT *pHireMerc)
// Give it // Give it
fReturn = AutoPlaceObject( MercPtrs[iNewIndex], &gTempObject, FALSE ); fReturn = AutoPlaceObject( MercPtrs[iNewIndex], &gTempObject, FALSE );
// CHRISL: This condition should resolve the issue of the letter not being issued to the first merc // CHRISL: This condition should resolve the issue of the letter not being issued to the first merc
if(!fReturn && (UsingNewInventorySystem() == true)) if(!fReturn)
{ {
(MercPtrs[iNewIndex]->inv[NUM_INV_SLOTS-1]) = gTempObject; if (UsingNewInventorySystem())
fReturn=TRUE; {
(MercPtrs[iNewIndex]->inv[NUM_INV_SLOTS-1]) = gTempObject;
fReturn=TRUE;
}
else
{
(MercPtrs[iNewIndex]->inv[SMALLPOCK8POS]) = gTempObject;
fReturn = TRUE;
}
} }
Assert( fReturn ); Assert( fReturn );
} }
Utils/Text.h
+1 -2
View File
@@ -3028,8 +3028,7 @@ extern STR16 szSpyText[];
extern STR16 szFoodText[]; extern STR16 szFoodText[];
extern STR16 szIMPGearWebSiteText[]; extern STR16 szIMPGearWebSiteText[];
extern STR16 szIMPGearDropDownText[]; extern STR16 szIMPGearPocketText[];
extern STR16 szIMPGearDropDownNoneText[];
// Flugente: militia movement // Flugente: militia movement
extern STR16 szMilitiaStrategicMovementText[]; extern STR16 szMilitiaStrategicMovementText[];
Utils/_ChineseText.cpp
+52 -46
View File
@@ -11363,62 +11363,68 @@ STR16 szIMPGearWebSiteText[] =
L"额外花费: %d$ (%d$ 预付款)", //L"Additional Cost: %d$ (%d$ prepaid)", L"额外花费: %d$ (%d$ 预付款)", //L"Additional Cost: %d$ (%d$ prepaid)",
}; };
STR16 szIMPGearDropDownText[] = STR16 szIMPGearPocketText[] =
{ {
L"选择LBE背心", //L"Select LBE vest",
L"选择LBE战斗包", //L"Select LBE combat pack",
L"选择LBE背包", //L"Select LBE backpack",
L"选择LBE皮套", //L"Select LBE holster",
L"选择LBE皮套", //L"Select LBE holster",
L"选择主枪", // L"Select main gun",
L"选择弹药", //L"Select ammo",
L"选择手枪", //L"Select sidearm",
L"选择额外弹药", //L"Select additional ammo",
L"选择武器", //L"Select melee weapon",
L"选择头盔", //L"Select helmet", L"选择头盔", //L"Select helmet",
L"选择背心", // L"Select vest", L"选择背心", // L"Select vest",
L"选择裤子", //L"Select pants", L"选择裤子", //L"Select pants",
L"选择头部装备", //L"Select face gear", L"选择头部装备", //L"Select face gear",
L"选择头部装备", // L"Select face gear", L"选择头部装备", // L"Select face gear",
L"选择附加物品", //L"Select additional items", L"选择主枪", // L"Select main gun",
L"选择附加物品", //L"Select additional items", L"选择手枪", //L"Select sidearm",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
};
STR16 szIMPGearDropDownNoneText[] = L"选择LBE背心", //L"Select LBE vest",
{ L"选择LBE皮套", //L"Select left LBE holster",
L"没有LBE背心", //L"No LBE vest", L"选择LBE皮套", //L"Select right LBE holster",
L"没有LBE战斗包", // L"No LBE combat pack", L"选择LBE战斗包", //L"Select LBE combat pack",
L"没有LBE背包", //L"No LBE backpack", L"选择LBE背包", //L"Select LBE backpack",
L"没有LBE皮套", //L"No LBE holster",
L"没有LBE皮套", //L"No LBE holster",
L"没有枪", //L"No gun", L"Select launcher / rifle",
L"没有弹药", //L"No ammo", L"选择武器", //L"Select melee weapon",
L"没有枪", // L"No gun",
L"没有弹药", //L"No ammo",
L"没有武器", //L"No weapon",
L"没有头盔", //L"No helmet", L"选择附加物品", //L"Select additional items", //BIGPOCK1POS
L"没有背心", //L"No vest", L"选择附加物品", //L"Select additional items",
L"没有裤子", //L"No pants", L"选择附加物品", //L"Select additional items",
L"没有头部装备", //L"No face gear", L"选择附加物品", //L"Select additional items",
L"没有头部装备", // L"No face gear", L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"No additional items", L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"No additional items", L"Select medkit", //MEDPOCK1POS
L"选择附加物品", //L"No additional items", L"Select medkit",
L"选择附加物品", //L"No additional items", L"Select medkit",
L"选择附加物品", //L"No additional items", L"Select medkit",
L"选择附加物品", //L"No additional items", L"Select main gun ammo", //SMALLPOCK1POS
L"选择附加物品", //L"No additional items", L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select launcher / rifle ammo", //SMALLPOCK6POS
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select sidearm ammo", //SMALLPOCK11POS
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"选择附加物品", //L"Select additional items", //SMALLPOCK19POS
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items",
L"选择附加物品", //L"Select additional items", //SMALLPOCK30POS
L"Left click to select item / Right click to close window",
}; };
STR16 szMilitiaStrategicMovementText[] = STR16 szMilitiaStrategicMovementText[] =
Utils/_DutchText.cpp
+52 -46
View File
@@ -11373,62 +11373,68 @@ STR16 szIMPGearWebSiteText[] = // TODO.Translate
L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate
}; };
STR16 szIMPGearDropDownText[] = STR16 szIMPGearPocketText[] =
{ {
L"Select LBE vest",
L"Select LBE combat pack",
L"Select LBE backpack",
L"Select LBE holster",
L"Select LBE holster",
L"Select main gun",
L"Select ammo",
L"Select sidearm",
L"Select additional ammo",
L"Select melee weapon",
L"Select helmet", L"Select helmet",
L"Select vest", L"Select vest",
L"Select pants", L"Select pants",
L"Select face gear", L"Select face gear",
L"Select face gear", L"Select face gear",
L"Select additional items", L"Select main gun",
L"Select additional items", L"Select sidearm",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
};
STR16 szIMPGearDropDownNoneText[] = L"Select LBE vest",
{ L"Select left LBE holster",
L"No LBE vest", L"Select right LBE holster",
L"No LBE combat pack", L"Select LBE combat pack",
L"No LBE backpack", L"Select LBE backpack",
L"No LBE holster",
L"No LBE holster",
L"No gun", L"Select launcher / rifle",
L"No ammo", L"Select melee weapon",
L"No gun",
L"No ammo",
L"No weapon",
L"No helmet", L"Select additional items", //BIGPOCK1POS
L"No vest", L"Select additional items",
L"No pants", L"Select additional items",
L"No face gear", L"Select additional items",
L"No face gear", L"Select additional items",
L"Select additional items",
L"No additional items", L"Select additional items",
L"No additional items", L"Select medkit", //MEDPOCK1POS
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select main gun ammo", //SMALLPOCK1POS
L"No additional items", L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select launcher / rifle ammo", //SMALLPOCK6POS
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select sidearm ammo", //SMALLPOCK11POS
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select additional items", //SMALLPOCK19POS
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items", //SMALLPOCK30POS
L"Left click to select item / Right click to close window",
}; };
STR16 szMilitiaStrategicMovementText[] = STR16 szMilitiaStrategicMovementText[] =
Utils/_EnglishText.cpp
+53 -47
View File
@@ -11363,62 +11363,68 @@ STR16 szIMPGearWebSiteText[] =
L"Additional Cost: %d$ (%d$ prepaid)", L"Additional Cost: %d$ (%d$ prepaid)",
}; };
STR16 szIMPGearDropDownText[] = STR16 szIMPGearPocketText[] =
{ {
L"Select LBE vest",
L"Select LBE combat pack",
L"Select LBE backpack",
L"Select LBE holster",
L"Select LBE holster",
L"Select main gun",
L"Select ammo",
L"Select sidearm",
L"Select additional ammo",
L"Select melee weapon",
L"Select helmet", L"Select helmet",
L"Select vest", L"Select vest",
L"Select pants", L"Select leg armor",
L"Select face gear", L"Select face gear",
L"Select face gear", L"Select face gear",
L"Select additional items", L"Select main gun",
L"Select additional items", L"Select sidearm",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
};
STR16 szIMPGearDropDownNoneText[] = L"Select LBE vest",
{ L"Select left LBE holster",
L"No LBE vest", L"Select right LBE holster",
L"No LBE combat pack", L"Select LBE combat pack",
L"No LBE backpack", L"Select LBE backpack",
L"No LBE holster",
L"No LBE holster",
L"No gun", L"Select launcher / rifle",
L"No ammo", L"Select melee weapon",
L"No gun",
L"No ammo",
L"No weapon",
L"No helmet", L"Select additional items", //BIGPOCK1POS
L"No vest", L"Select additional items",
L"No pants", L"Select additional items",
L"No face gear", L"Select additional items",
L"No face gear", L"Select additional items",
L"Select additional items",
L"No additional items", L"Select additional items",
L"No additional items", L"Select kit item", //MEDPOCK1POS
L"No additional items", L"Select kit item",
L"No additional items", L"Select kit item",
L"No additional items", L"Select kit item",
L"No additional items", L"Select main gun ammo", //SMALLPOCK1POS
L"No additional items", L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select launcher / rifle ammo", //SMALLPOCK6POS
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select sidearm ammo", //SMALLPOCK11POS
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select additional items", //SMALLPOCK19POS
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items", //SMALLPOCK30POS
L"Left click to select item / Right click to close window",
}; };
STR16 szMilitiaStrategicMovementText[] = STR16 szMilitiaStrategicMovementText[] =
Utils/_FrenchText.cpp
+52 -46
View File
@@ -11355,62 +11355,68 @@ STR16 szIMPGearWebSiteText[] = // TODO.Translate
L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate
}; };
STR16 szIMPGearDropDownText[] = STR16 szIMPGearPocketText[] =
{ {
L"Select LBE vest",
L"Select LBE combat pack",
L"Select LBE backpack",
L"Select LBE holster",
L"Select LBE holster",
L"Select main gun",
L"Select ammo",
L"Select sidearm",
L"Select additional ammo",
L"Select melee weapon",
L"Select helmet", L"Select helmet",
L"Select vest", L"Select vest",
L"Select pants", L"Select pants",
L"Select face gear", L"Select face gear",
L"Select face gear", L"Select face gear",
L"Select additional items", L"Select main gun",
L"Select additional items", L"Select sidearm",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
};
STR16 szIMPGearDropDownNoneText[] = L"Select LBE vest",
{ L"Select left LBE holster",
L"No LBE vest", L"Select right LBE holster",
L"No LBE combat pack", L"Select LBE combat pack",
L"No LBE backpack", L"Select LBE backpack",
L"No LBE holster",
L"No LBE holster",
L"No gun", L"Select launcher / rifle",
L"No ammo", L"Select melee weapon",
L"No gun",
L"No ammo",
L"No weapon",
L"No helmet", L"Select additional items", //BIGPOCK1POS
L"No vest", L"Select additional items",
L"No pants", L"Select additional items",
L"No face gear", L"Select additional items",
L"No face gear", L"Select additional items",
L"Select additional items",
L"No additional items", L"Select additional items",
L"No additional items", L"Select medkit", //MEDPOCK1POS
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select main gun ammo", //SMALLPOCK1POS
L"No additional items", L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select launcher / rifle ammo", //SMALLPOCK6POS
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select sidearm ammo", //SMALLPOCK11POS
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select additional items", //SMALLPOCK19POS
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items", //SMALLPOCK30POS
L"Left click to select item / Right click to close window",
}; };
STR16 szMilitiaStrategicMovementText[] = STR16 szMilitiaStrategicMovementText[] =
Utils/_GermanText.cpp
+52 -47
View File
@@ -11256,63 +11256,68 @@ STR16 szIMPGearWebSiteText[] =
}; };
// TODO.Translate // TODO.Translate
STR16 szIMPGearDropDownText[] = STR16 szIMPGearPocketText[] =
{ {
L"Select LBE vest",
L"Select LBE combat pack",
L"Select LBE backpack",
L"Select LBE holster",
L"Select LBE holster",
L"Select main gun",
L"Select ammo",
L"Select sidearm",
L"Select additional ammo",
L"Select melee weapon",
L"Select helmet", L"Select helmet",
L"Select vest", L"Select vest",
L"Select pants", L"Select pants",
L"Select face gear", L"Select face gear",
L"Select face gear", L"Select face gear",
L"Select additional items", L"Select main gun",
L"Select additional items", L"Select sidearm",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
};
// TODO.Translate L"Select LBE vest",
STR16 szIMPGearDropDownNoneText[] = L"Select left LBE holster",
{ L"Select right LBE holster",
L"No LBE vest", L"Select LBE combat pack",
L"No LBE combat pack", L"Select LBE backpack",
L"No LBE backpack",
L"No LBE holster",
L"No LBE holster",
L"No gun", L"Select launcher / rifle",
L"No ammo", L"Select melee weapon",
L"No gun",
L"No ammo",
L"No weapon",
L"No helmet", L"Select additional items", //BIGPOCK1POS
L"No vest", L"Select additional items",
L"No pants", L"Select additional items",
L"No face gear", L"Select additional items",
L"No face gear", L"Select additional items",
L"Select additional items",
L"No additional items", L"Select additional items",
L"No additional items", L"Select medkit", //MEDPOCK1POS
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select main gun ammo", //SMALLPOCK1POS
L"No additional items", L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select launcher / rifle ammo", //SMALLPOCK6POS
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select sidearm ammo", //SMALLPOCK11POS
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select additional items", //SMALLPOCK19POS
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items", //SMALLPOCK30POS
L"Left click to select item / Right click to close window",
}; };
// TODO.Translate // TODO.Translate
Utils/_ItalianText.cpp
+52 -46
View File
@@ -11364,62 +11364,68 @@ STR16 szIMPGearWebSiteText[] = // TODO.Translate
L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate
}; };
STR16 szIMPGearDropDownText[] = STR16 szIMPGearPocketText[] =
{ {
L"Select LBE vest",
L"Select LBE combat pack",
L"Select LBE backpack",
L"Select LBE holster",
L"Select LBE holster",
L"Select main gun",
L"Select ammo",
L"Select sidearm",
L"Select additional ammo",
L"Select melee weapon",
L"Select helmet", L"Select helmet",
L"Select vest", L"Select vest",
L"Select pants", L"Select pants",
L"Select face gear", L"Select face gear",
L"Select face gear", L"Select face gear",
L"Select additional items", L"Select main gun",
L"Select additional items", L"Select sidearm",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
};
STR16 szIMPGearDropDownNoneText[] = L"Select LBE vest",
{ L"Select left LBE holster",
L"No LBE vest", L"Select right LBE holster",
L"No LBE combat pack", L"Select LBE combat pack",
L"No LBE backpack", L"Select LBE backpack",
L"No LBE holster",
L"No LBE holster",
L"No gun", L"Select launcher / rifle",
L"No ammo", L"Select melee weapon",
L"No gun",
L"No ammo",
L"No weapon",
L"No helmet", L"Select additional items", //BIGPOCK1POS
L"No vest", L"Select additional items",
L"No pants", L"Select additional items",
L"No face gear", L"Select additional items",
L"No face gear", L"Select additional items",
L"Select additional items",
L"No additional items", L"Select additional items",
L"No additional items", L"Select medkit", //MEDPOCK1POS
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select main gun ammo", //SMALLPOCK1POS
L"No additional items", L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select launcher / rifle ammo", //SMALLPOCK6POS
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select sidearm ammo", //SMALLPOCK11POS
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select additional items", //SMALLPOCK19POS
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items", //SMALLPOCK30POS
L"Left click to select item / Right click to close window",
}; };
STR16 szMilitiaStrategicMovementText[] = STR16 szMilitiaStrategicMovementText[] =
Utils/_PolishText.cpp
+52 -46
View File
@@ -11377,62 +11377,68 @@ STR16 szIMPGearWebSiteText[] = // TODO.Translate
L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate
}; };
STR16 szIMPGearDropDownText[] = STR16 szIMPGearPocketText[] =
{ {
L"Select LBE vest",
L"Select LBE combat pack",
L"Select LBE backpack",
L"Select LBE holster",
L"Select LBE holster",
L"Select main gun",
L"Select ammo",
L"Select sidearm",
L"Select additional ammo",
L"Select melee weapon",
L"Select helmet", L"Select helmet",
L"Select vest", L"Select vest",
L"Select pants", L"Select pants",
L"Select face gear", L"Select face gear",
L"Select face gear", L"Select face gear",
L"Select additional items", L"Select main gun",
L"Select additional items", L"Select sidearm",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
};
STR16 szIMPGearDropDownNoneText[] = L"Select LBE vest",
{ L"Select left LBE holster",
L"No LBE vest", L"Select right LBE holster",
L"No LBE combat pack", L"Select LBE combat pack",
L"No LBE backpack", L"Select LBE backpack",
L"No LBE holster",
L"No LBE holster",
L"No gun", L"Select launcher / rifle",
L"No ammo", L"Select melee weapon",
L"No gun",
L"No ammo",
L"No weapon",
L"No helmet", L"Select additional items", //BIGPOCK1POS
L"No vest", L"Select additional items",
L"No pants", L"Select additional items",
L"No face gear", L"Select additional items",
L"No face gear", L"Select additional items",
L"Select additional items",
L"No additional items", L"Select additional items",
L"No additional items", L"Select medkit", //MEDPOCK1POS
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select medkit",
L"No additional items", L"Select main gun ammo", //SMALLPOCK1POS
L"No additional items", L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select launcher / rifle ammo", //SMALLPOCK6POS
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select sidearm ammo", //SMALLPOCK11POS
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select additional items", //SMALLPOCK19POS
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items",
L"Select additional items", //SMALLPOCK30POS
L"Left click to select item / Right click to close window",
}; };
STR16 szMilitiaStrategicMovementText[] = STR16 szMilitiaStrategicMovementText[] =
Utils/_RussianText.cpp
+58 -52
View File
@@ -11358,62 +11358,68 @@ STR16 szIMPGearWebSiteText[] =
L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate L"Additional Cost: %d$ (%d$ prepaid)", // TODO.Translate
}; };
STR16 szIMPGearDropDownText[] = STR16 szIMPGearPocketText[] =
{ {
L"Выбрать разгр. жилета", L"Выбрать шлем", //L"Select helmet",
L"Выбрать разгр. ранец", L"Выбрать жилет", //L"Select vest",
L"Выбрать разгр. рюкзак", L"Выбрать поножи", //L"Select pants",
L"Выбрать разгр. кобуру", L"Выбрать для лица", //L"Select face gear",
L"Выбрать разгр. кобуру", L"Выбрать для лица", //L"Select face gear",
L"Выбрать осн. оружие",
L"Выбрать патроны",
L"Выбрать доп. оружие",
L"Выбрать доп. патроны",
L"Выбрать оружие ближ. боя",
L"Выбрать шлем",
L"Выбрать жилет",
L"Выбрать поножи",
L"Выбрать для лица",
L"Выбрать для лица",
L"Выбрать доп. предметы", L"Выбрать осн. оружие", //L"Select main gun",
L"Выбрать доп. предметы", L"Выбрать доп. оружие", //L"Select sidearm",
L"Выбрать доп. предметы",
L"Выбрать доп. предметы",
L"Выбрать доп. предметы",
L"Выбрать доп. предметы",
L"Выбрать доп. предметы",
};
STR16 szIMPGearDropDownNoneText[] = L"Выбрать разгр. жилета", //L"Select LBE vest",
{ L"Выбрать разгр. кобуру", //L"Select left LBE holster",
L"Нет разгр. жилета", L"Выбрать разгр. кобуру", //L"Select right LBE holster",
L"Нет разгр. ранца", L"Выбрать разгр. ранец", //L"Select LBE combat pack",
L"Нет разгр. рюкзака", L"Выбрать разгр. рюкзак", //L"Select LBE backpack",
L"Нет разгр. кобуры",
L"Нет разгр. кобуры",
L"Нет оружий",
L"Нет патронов",
L"Нет оружия",
L"Нет патровно",
L"Нет оружия",
L"Нет шлема",
L"Нет жилета",
L"Нет поножей",
L"Нет ничего для лица",
L"Нет ничего для лица",
L"Нет доп. предметов", L"Select launcher / rifle",
L"Нет доп. предметов", L"Выбрать оружие ближ. боя", //L"Select melee weapon",
L"Нет доп. предметов",
L"Нет доп. предметов", L"Выбрать доп. предметы", //L"Select additional items", //BIGPOCK1POS
L"Нет доп. предметов", L"Выбрать доп. предметы", //L"Select additional items",
L"Нет доп. предметов", L"Выбрать доп. предметы", //L"Select additional items",
L"Нет доп. предметов", L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Select medkit", //MEDPOCK1POS
L"Select medkit",
L"Select medkit",
L"Select medkit",
L"Select main gun ammo", //SMALLPOCK1POS
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select main gun ammo",
L"Select launcher / rifle ammo", //SMALLPOCK6POS
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select launcher / rifle ammo",
L"Select sidearm ammo", //SMALLPOCK11POS
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Select sidearm ammo",
L"Выбрать доп. предметы", //L"Select additional items", //SMALLPOCK19POS
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items",
L"Выбрать доп. предметы", //L"Select additional items", //SMALLPOCK30POS
L"Left click to select item / Right click to close window",
}; };
STR16 szMilitiaStrategicMovementText[] = STR16 szMilitiaStrategicMovementText[] =