New feature: mercs with a gun-related trait (New trait system only) can use the 'Focus' skill via the skill menu ([$] in tactical). This skill grants an interrupt modifier bonus in the targeted area, but also a penalty outside of it.

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

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-07-26 13:49:38 +00:00
parent 7b00af164b
commit 0992a423e7
27 changed files with 203 additions and 45 deletions
+2
View File
@@ -2632,6 +2632,8 @@ enum
TEXT_SKILL_DENIAL_NOMORTAR,
TEXT_SKILL_DENIAL_ITSCOMPLICATED,
TEXT_SKILL_DENIAL_NODEMON,
TEXT_SKILL_DENIAL_GUNTRAIT,
TEXT_SKILL_DENIAL_AIMEDGUN,
TEXT_SKILL_DENIAL_MAX,
};
+4 -2
View File
@@ -2825,8 +2825,10 @@ STR16 pTraitSkillsDenialStrings[] =
L" - %s或更高,或\n", //L" - %s or higher or\n",
L" - %d分钟后就绪\n", //L" - %d minutes to be ready\n",
L" - 临区的迫击炮位置\n", //L" - mortar positions in neighbouring sectors\n",
L" - %s|或%s|和%s或%s或更高\n" //L" - %s |o|r %s |a|n|d %s or %s or higher\n"
L" - 恶魔的财产", //L" - posession by a demon"
L" - %s|或%s|和%s或%s或更高\n", //L" - %s |o|r %s |a|n|d %s or %s or higher\n"
L" - 恶魔的财产\n", //L" - posession by a demon"
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] =
+3 -1
View File
@@ -2824,8 +2824,10 @@ STR16 pTraitSkillsDenialStrings[] =
L" - %s or higher or\n",
L" - %d minutes to be ready\n",
L" - mortar positions in neighbouring sectors\n",
L" - %s |o|r %s |a|n|d %s or %s or higher\n"
L" - %s |o|r %s |a|n|d %s or %s or higher\n",
L" - possession by a demon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
+4 -2
View File
@@ -2821,8 +2821,10 @@ STR16 pTraitSkillsDenialStrings[] =
L" - %s or higher or\n",
L" - %d minutes to be ready\n",
L" - mortar positions in neighbouring sectors\n",
L" - %s |o|r %s |a|n|d %s or %s or higher\n"
L" - possession by a demon",
L" - %s |o|r %s |a|n|d %s or %s or higher\n",
L" - possession by a demon\n",
L" - a gun-related trait\n",
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] =
+3 -1
View File
@@ -2833,8 +2833,10 @@ STR16 pTraitSkillsDenialStrings[] =
L" - %s ou plus ou",
L" - %d minutes pour être prêt\n",
L" - positions des mortiers dans les secteurs voisins\n",
L" - %s |o|u %s |e|t %s ou %s ou plus\n"
L" - %s |o|u %s |e|t %s ou %s ou plus\n",
L" - possession par un démon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
+3 -1
View File
@@ -2828,8 +2828,10 @@ STR16 pTraitSkillsDenialStrings[] =
L" - %s oder höher oder\n",
L" - %d Minuten um fertig zu sein\n",
L" - Mörser Positionen in Nachbarsektoren\n",
L" - %s |o|d|e|r %s |u|n|d %s oder %s oder höher\n"
L" - %s |o|d|e|r %s |u|n|d %s oder %s oder höher\n",
L" - besessen von einem Dämon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
+3 -1
View File
@@ -2819,8 +2819,10 @@ STR16 pTraitSkillsDenialStrings[] =
L" - %s or higher or\n",
L" - %d minutes to be ready\n",
L" - mortar positions in neighbouring sectors\n",
L" - %s |o|r %s |a|n|d %s or %s or higher\n"
L" - %s |o|r %s |a|n|d %s or %s or higher\n",
L" - possession by a demon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
+1 -1
View File
@@ -140,7 +140,7 @@ STR16 gzIMPMajorTraitsHelpTextsSniper[]=
L"步枪精确瞄准次数增加 %d次\n",// L"Adds %d more aim clicks for rifle-type guns\n",
L"迅速瞄准:步枪精确瞄准次数加快(即减少)1次\n",//L"Makes aiming faster with rifle-type guns by one aim click\n",
L"迅速瞄准:步枪精确瞄准次数加快(即减少)%d次\n",//L"Makes aiming faster with rifle-type guns by %d aim clicks\n",
L"Focus skill: +%d interrupt modifier in a %d-radius area\n", // TODO.Translate
L"Focus skill: +%d interrupt modifier in marked area\n", // TODO.Translate
};
STR16 gzIMPMajorTraitsHelpTextsRanger[]=
+1 -1
View File
@@ -140,7 +140,7 @@ STR16 gzIMPMajorTraitsHelpTextsSniper[]=
L"Adds %d more aim clicks for rifle-type guns\n",
L"Makes aiming faster with rifle-type guns by one aim click\n",
L"Makes aiming faster with rifle-type guns by %d aim clicks\n",
L"Focus skill: +%d interrupt modifier in a %d-radius area\n", // TODO.Translate
L"Focus skill: +%d interrupt modifier in marked area\n", // TODO.Translate
};
STR16 gzIMPMajorTraitsHelpTextsRanger[]=
+1 -1
View File
@@ -140,7 +140,7 @@ STR16 gzIMPMajorTraitsHelpTextsSniper[]=
L"Adds %d more aim clicks for rifle-type guns\n",
L"Makes aiming faster with rifle-type guns by one aim click\n",
L"Makes aiming faster with rifle-type guns by %d aim clicks\n",
L"Focus skill: +%d interrupt modifier in a %d-radius area\n",
L"Focus skill: +%d interrupt modifier in marked area\n",
};
STR16 gzIMPMajorTraitsHelpTextsRanger[]=
+1 -1
View File
@@ -141,7 +141,7 @@ STR16 gzIMPMajorTraitsHelpTextsSniper[]=
L"Fait viser plus rapidement avec un : réduit d'un niveau de visée\n",
L"Fait viser plus rapidement avec un fusil : réduit de %d niveau(x) de visée\n",
L"Focus skill: +%d interrupt modifier in a %d-radius area\n", // TODO.Translate
L"Focus skill: +%d interrupt modifier in marked area\n", // TODO.Translate
};
STR16 gzIMPMajorTraitsHelpTextsRanger[]=
+1 -1
View File
@@ -140,7 +140,7 @@ STR16 gzIMPMajorTraitsHelpTextsSniper[]=
L"Gibt weitere %d Ziel-Klicks für gewehrartige Waffen\n",
L"Schnelleres Zielen mit Gewehren bei genau einem Zielgenauigkeit-Klick\n",
L"Schnelleres Zielen mit Gewehren bei %d Zielgenauigkeit-Klicks\n",
L"Focus skill: +%d interrupt modifier in a %d-radius area\n", // TODO.Translate
L"Focus skill: +%d interrupt modifier in marked area\n", // TODO.Translate
};
STR16 gzIMPMajorTraitsHelpTextsRanger[]=
+1 -1
View File
@@ -138,7 +138,7 @@ STR16 gzIMPMajorTraitsHelpTextsSniper[]=
L"Adds %d more aim clicks for rifle-type guns\n",
L"Makes aiming faster with rifle-type guns by one aim click\n",
L"Makes aiming faster with rifle-type guns by %d aim clicks\n",
L"Focus skill: +%d interrupt modifier in a %d-radius area\n", // TODO.Translate
L"Focus skill: +%d interrupt modifier in marked area\n", // TODO.Translate
};
STR16 gzIMPMajorTraitsHelpTextsRanger[]=
+1 -1
View File
@@ -140,7 +140,7 @@ STR16 gzIMPMajorTraitsHelpTextsSniper[]=
L"Adds %d more aim clicks for rifle-type guns\n",
L"Makes aiming faster with rifle-type guns by one aim click\n",
L"Makes aiming faster with rifle-type guns by %d aim clicks\n",
L"Focus skill: +%d interrupt modifier in a %d-radius area\n", // TODO.Translate
L"Focus skill: +%d interrupt modifier in marked area\n", // TODO.Translate
};
STR16 gzIMPMajorTraitsHelpTextsRanger[]=
+1 -1
View File
@@ -140,7 +140,7 @@ STR16 gzIMPMajorTraitsHelpTextsSniper[]=
L"+%d кликов прицеливания для оружия типа винтовок\n",
L"Прицеливание оружия типа винтовок быстрее на один клик прицеливания\n",
L"Прицеливание оружия типа винтовок быстрее на %d кликов прицеливания\n",
L"Focus skill: +%d interrupt modifier in a %d-radius area\n", // TODO.Translate
L"Focus skill: +%d interrupt modifier in marked area\n", // TODO.Translate
};
STR16 gzIMPMajorTraitsHelpTextsRanger[]=
+3 -1
View File
@@ -2831,8 +2831,10 @@ STR16 pTraitSkillsDenialStrings[] =
L" - %s or higher or\n",
L" - %d minutes to be ready\n",
L" - mortar positions in neighbouring sectors\n",
L" - %s |o|r %s |a|n|d %s or %s or higher\n"
L" - %s |o|r %s |a|n|d %s or %s or higher\n",
L" - possession by a demon",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
+3 -1
View File
@@ -2825,8 +2825,10 @@ STR16 pTraitSkillsDenialStrings[] =
L" - %s или выше или\n",
L" - %d минут на подготовку\n",
L" - позиции миномётов в соседних секторах\n",
L" - %s |и|л|и %s |и %s или %s или выше\n"
L" - %s |и|л|и %s |и %s или %s или выше\n",
L" - одержим бесами",
L" - a gun-related trait\n", // TODO.Translate
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] =