New feature: mercs can drag people and corpses

Requires GameDir >= r2386.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23508&goto=350989&#msg_350989

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-09-17 22:16:30 +00:00
parent 5becfe9004
commit 6031257dcd
26 changed files with 621 additions and 97 deletions
+4
View File
@@ -168,6 +168,7 @@ enum
SKILLMENU_X_MILITIA,
SKILLMENU_ALL_MILITIA,
SKILLMENU_MORE,
SKILLMENU_CORPSES,
};
extern STR16 pSkillMenuStrings[]; //Flugente
@@ -2637,6 +2638,9 @@ enum
TEXT_SKILL_DENIAL_NODEMON,
TEXT_SKILL_DENIAL_GUNTRAIT,
TEXT_SKILL_DENIAL_AIMEDGUN,
TEXT_SKILL_DENIAL_PRONEPERSONORCORPSE,
TEXT_SKILL_DENIAL_CROUCH,
TEXT_SKILL_DENIAL_FREEHANDS,
TEXT_SKILL_DENIAL_MAX,
};
+9 -7
View File
@@ -2783,9 +2783,6 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] =
{
// sniper
L"聚焦", //L"Focus",
// radio operator
L"火炮攻击", //L"Artillery Strike",
L"通讯干扰", //L"Jam communications",
@@ -2796,24 +2793,25 @@ STR16 pTraitSkillsMenuStrings[] =
// various
L"侦查员",
L"聚焦", //L"Focus",
L"Drag", // TODO.Translate
};
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"提高中断修正 (malus outside of area)", //L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"命令某分区发动火炮攻击。", //L"Order an artillery strike from sector...",
L"所有通讯频率加入空白噪音,阻断正常通讯。", //L"Fill all radio frequencies with white noise, making communications impossible.",
L"查找干扰信号源。", //L"Scan for jamming signals.",
L"使用无线电设备持续监听敌军动向。", //L"Use your radio equipment to continously listen for enemy movement",
L"从邻区呼叫支援。", //L"Call in reinforcements from neighbouring sectors.",
L"关闭无线电设备以节约电池。", //L"Turn off radio set to save batteries.",
L"Turn off radio set.", // TODO.Translate
// various
L"侦查一个区域,友军狙击手在瞄准你所观察到的目标时会增加命中率值。",
L"提高中断修正 (malus outside of area)", //L"Increase interrupt modifier (malus outside of area)",
L"Drag a person or corpse while you move.", // TODO.Translate
};
STR16 pTraitSkillsDenialStrings[] =
@@ -2829,6 +2827,9 @@ STR16 pTraitSkillsDenialStrings[] =
L" - 恶魔的财产\n", //L" - posession by a demon"
L" - 与枪有关的特长\n", //L" - a gun-related trait\n",
L" - 针对枪\n", //L" - aimed gun\n",
L" - prone person or corpse next to merc\n", // TODO.Translate
L" - crouched position\n",
L" - free main hand\n",
};
STR16 pSkillMenuStrings[] =
@@ -2840,6 +2841,7 @@ STR16 pSkillMenuStrings[] =
L"所有民兵",
L"More",
L"Corpse: %s", // TODO.Translate
};
STR16 pSnitchMenuStrings[] =
+9 -7
View File
@@ -2782,9 +2782,6 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Artillery Strike",
L"Jam communications",
@@ -2795,24 +2792,25 @@ STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
// various
L"Spotter", // TODO.Translate
L"Focus",
L"Drag",
};
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Order an artillery strike from sector...",
L"Fill all radio frequencies with white noise, making communications impossible.",
L"Scan for jamming signals.",
L"Use your radio equipment to continously listen for enemy movement.",
L"Call in reinforcements from neighbouring sectors.",
L"Turn off radio set to save batteries.",
L"Turn off radio set.", // TODO.Translate
// various
L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate
L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate
L"Drag a person or corpse while you move.",
};
STR16 pTraitSkillsDenialStrings[] =
@@ -2828,6 +2826,9 @@ STR16 pTraitSkillsDenialStrings[] =
L" - possession by a demon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
L" - prone person or corpse next to merc\n", // TODO.Translate
L" - crouched position\n",
L" - free main hand\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
@@ -2839,6 +2840,7 @@ STR16 pSkillMenuStrings[] = // TODO.Translate
L"All Militia",
L"More",
L"Corpse: %s", // TODO.Translate
};
// TODO.Translate
+8 -2
View File
@@ -2794,6 +2794,7 @@ STR16 pTraitSkillsMenuStrings[] =
// various
L"Spotter",
L"Focus",
L"Drag",
};
//Flugente: short description of the above skills for the skill selection menu
@@ -2805,11 +2806,12 @@ STR16 pTraitSkillsMenuDescStrings[] =
L"Scan for jamming signals.",
L"Use your radio equipment to continously listen for enemy movement.",
L"Call in reinforcements from neighbouring sectors.",
L"Turn off radio set to save batteries.",
L"Turn off radio set.",
// various
L"Observe an area, granting allied snipers a bonus to cth on anything you see.",
L"Increase interrupt modifier (penalty outside of area)",
L"Increase interrupt modifier (penalty outside of area).",
L"Drag a person or corpse while you move.",
};
STR16 pTraitSkillsDenialStrings[] =
@@ -2825,6 +2827,9 @@ STR16 pTraitSkillsDenialStrings[] =
L" - possession by a demon\n",
L" - a gun-related trait\n",
L" - aimed gun\n",
L" - prone person or corpse next to merc\n",
L" - crouched position\n",
L" - free main hand\n",
};
STR16 pSkillMenuStrings[] =
@@ -2836,6 +2841,7 @@ STR16 pSkillMenuStrings[] =
L"All Militia",
L"More",
L"Corpse: %s",
};
STR16 pSnitchMenuStrings[] =
+9 -7
View File
@@ -2791,9 +2791,6 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] =
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Tir d'artillerie",
L"Brouiller les communications",
@@ -2804,24 +2801,25 @@ STR16 pTraitSkillsMenuStrings[] =
// various
L"Guetteur",
L"Focus", // TODO.Translate
L"Drag",
};
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Ordonner un tir d'artillerie au secteur...",
L"Brouiller toutes les fréquences radios pour rendre les communications impossibles.",
L"Pour trouver une fréquence émettrice.",
L"Utiliser votre radio pour connaître les mouvements de l'ennemi.",
L"Appeler des renforts des secteurs voisins.",
L"Éteindre la radio pour économiser la batterie.",
L"Éteindre la radio.",
// various
L"Observer une zone avec un tireur d'élite donne un bonus de CDT sur tout ce que vous voyez.",
L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate
L"Drag a person or corpse while you move.",
};
STR16 pTraitSkillsDenialStrings[] =
@@ -2837,6 +2835,9 @@ STR16 pTraitSkillsDenialStrings[] =
L" - possession par un démon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
L" - prone person or corpse next to merc\n", // TODO.Translate
L" - crouched position\n",
L" - free main hand\n",
};
STR16 pSkillMenuStrings[] =
@@ -2848,6 +2849,7 @@ STR16 pSkillMenuStrings[] =
L"Tous",
L"More", // TODO.Translate
L"Corpse: %s", // TODO.Translate
};
STR16 pSnitchMenuStrings[] =
+9 -7
View File
@@ -2786,9 +2786,6 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] =
{
// sniper
L"Fokus",
// radio operator
L"Artillerie befehligen",
L"Kommunikation stören",
@@ -2799,24 +2796,25 @@ STR16 pTraitSkillsMenuStrings[] =
// various
L"Spotter",
L"Fokus",
L"Greifen",
};
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Artillerieschlag befehligen von einem Sektor...",
L"Alle Funkfrequenzen mit weißem Rauschen füllen, sodass eine Kommunikation nicht mehr möglich ist.",
L"Nach Störsignalen scannen.",
L"Das Radiogerät verwenden, um feindliche Bewegungen zu orten.",
L"Verstärkung aus dem Nachbarsektor anfordern.",
L"Radiogerät ausschalten, um Batterien zu sparen.",
L"Radiogerät ausschalten.",
// various
L"Bestimmtes Gebiet beobachten, damit Scharfschützen einen Bonus auf deren Treffsicherheit erhalten.",
L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate
L"Drag a person or corpse while you move.",
};
STR16 pTraitSkillsDenialStrings[] =
@@ -2832,6 +2830,9 @@ STR16 pTraitSkillsDenialStrings[] =
L" - besessen von einem Dämon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
L" - prone person or corpse next to merc\n", // TODO.Translate
L" - crouched position\n",
L" - free main hand\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
@@ -2843,6 +2844,7 @@ STR16 pSkillMenuStrings[] = // TODO.Translate
L"All Militia",
L"More", // TODO.Translate
L"Corpse: %s", // TODO.Translate
};
// TODO.Translate
+9 -7
View File
@@ -2777,9 +2777,6 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Artillery Strike",
L"Jam communications",
@@ -2790,24 +2787,25 @@ STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
// various
L"Spotter", // TODO.Translate
L"Focus", // TODO.Translate
L"Drag",
};
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Order an artillery strike from sector...",
L"Fill all radio frequencies with white noise, making communications impossible.",
L"Scan for jamming signals.",
L"Use your radio equipment to continously listen for enemy movement.",
L"Call in reinforcements from neighbouring sectors.",
L"Turn off radio set to save batteries.",
L"Turn off radio set.", // TODO.Translate
// various
L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate
L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate
L"Drag a person or corpse while you move.",
};
STR16 pTraitSkillsDenialStrings[] =
@@ -2823,6 +2821,9 @@ STR16 pTraitSkillsDenialStrings[] =
L" - possession by a demon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
L" - prone person or corpse next to merc\n", // TODO.Translate
L" - crouched position\n",
L" - free main hand\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
@@ -2834,6 +2835,7 @@ STR16 pSkillMenuStrings[] = // TODO.Translate
L"All Militia",
L"More", // TODO.Translate
L"Corpse: %s", // TODO.Translate
};
// TODO.Translate
+9 -7
View File
@@ -2789,9 +2789,6 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Artillery Strike",
L"Jam communications",
@@ -2802,24 +2799,25 @@ STR16 pTraitSkillsMenuStrings[] = // TODO.Translate
// various
L"Spotter", // TODO.Translate
L"Focus", // TODO.Translate
L"Drag",
};
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Order an artillery strike from sector...",
L"Fill all radio frequencies with white noise, making communications impossible.",
L"Scan for jamming signals.",
L"Use your radio equipment to continously listen for enemy movement.",
L"Call in reinforcements from neighbouring sectors.",
L"Turn off radio set to save batteries.",
L"Turn off radio set.", // TODO.Translate
// various
L"Observe an area, granting allied snipers a bonus to cth on anything you see.", // TODO.Translate
L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate
L"Drag a person or corpse while you move.",
};
STR16 pTraitSkillsDenialStrings[] =
@@ -2835,6 +2833,9 @@ STR16 pTraitSkillsDenialStrings[] =
L" - possession by a demon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
L" - prone person or corpse next to merc\n", // TODO.Translate
L" - crouched position\n",
L" - free main hand\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
@@ -2846,6 +2847,7 @@ STR16 pSkillMenuStrings[] = // TODO.Translate
L"All Militia",
L"More", // TODO.Translate
L"Corpse: %s", // TODO.Translate
};
STR16 pSnitchMenuStrings[] =
+9 -7
View File
@@ -2783,9 +2783,6 @@ STR16 pMilitiaControlMenuStrings[] =
//Flugente
STR16 pTraitSkillsMenuStrings[] =
{
// sniper
L"Focus", // TODO.Translate
// radio operator
L"Артналет",
L"Постановка помех",
@@ -2796,24 +2793,25 @@ STR16 pTraitSkillsMenuStrings[] =
// various
L"Наблюдатель",
L"Focus", // TODO.Translate
L"Drag",
};
//Flugente: short description of the above skills for the skill selection menu
STR16 pTraitSkillsMenuDescStrings[] =
{
// sniper
L"Increase interrupt modifier (malus outside of area)", // TODO.Translate
// radio operator
L"Вызвать артиллерийский удар из сектора...",
L"Заполнить эфир помехами, чтобы сделать невозможным использование средств связи.",
L"Искать источник помех.",
L"Использовать радиопрослушку для обнаружения противника.",
L"Вызвать подкрепления из соседних секторов.",
L"Выключить радиостанцию для экономии батарей.",
L"Turn off radio set.", // TODO.Translate
// various
L"Наблюдать за местностью, чтобы обеспечить более меткую стрельбу своим снайперам.",
L"Increase interrupt modifier (penalty outside of area).", // TODO.Translate
L"Drag a person or corpse while you move.",
};
STR16 pTraitSkillsDenialStrings[] =
@@ -2829,6 +2827,9 @@ STR16 pTraitSkillsDenialStrings[] =
L" - одержим бесами",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
L" - prone person or corpse next to merc\n", // TODO.Translate
L" - crouched position\n",
L" - free main hand\n",
};
STR16 pSkillMenuStrings[] =
@@ -2840,6 +2841,7 @@ STR16 pSkillMenuStrings[] =
L"Все ополченцы",
L"More", // TODO.Translate
L"Corpse: %s", // TODO.Translate
};
STR16 pSnitchMenuStrings[] =