****************************************************************************

** Merged Source Code from Development trunk, for the Spring 2011 Release **
****************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here.
  New Features are only included in the Development trunk
o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-05-26 11:04:47 +00:00
parent c999420bb7
commit 6e2bdd557c
191 changed files with 17816 additions and 6106 deletions
+11 -8
View File
@@ -1,4 +1,6 @@
// WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
//#pragma setlocale("ITALIAN")
#ifdef PRECOMPILEDHEADERS
#include "Utils All.h"
#include "_Ja25Italiantext.h"
@@ -413,17 +415,17 @@ STR16 gzIMPOldSkillTraitsHelpTexts[]=
STR16 gzIMPNewCharacterTraitsHelpTexts[]=
{
L"A: No advantage.\nD: No disadvantage.",
L"A: Has better performance when couple of mercs are nearby.\nD: Gains no morale when no other merc is nearby.",
L"A: Has better performance when a couple of mercs are nearby.\nD: Gains no morale when no other merc is nearby.",
L"A: Has better performance when no other merc is nearby.\nD: Gains no morale when in a group.",
L"A: His morale sinks a little slower and grows faster than normal.\nD: Has lesser chance to detect traps and mines.",
L"A: Has bonus on training militia and is better at communication with people.\nD: Gains no morale for actions of other mercs.",
L"A: Slightly faster learning when assigned on practicing or as a student.\nD: Has lesser suppression and fear resistance.",
L"A: His energy goes down a bit slower except on assignments as doctor, repairman, militia trainer or if learning certain skills.\nD: His wisdom, leadership, explosives, mechanical and medical skills improve slightly slower.",
L"A: Has slightly better chance to hit on burst/autofire and inflicts slightly bigger damage in close combat\n Gains a little more morale for killing.\nD: Has penalty for actions which needs patience like repairing items, picking locks, removing traps, doctoring, training militia.",
L"A: Has bonus for actions which needs patience like repairing items, picking locks, removing traps, doctoring and training militia.\nD: His interrupts chance is slightly lowered.",
L"A: Incresed resistance to suppression and fear.\n Morale loss for taking damage and companions deaths is lower for him.\nD: Can be hit easier and enemy penalty for moving target is lesser in his case.",
L"A: His energy goes down a bit slower except on assignments such as doctor, repairman, militia trainer or if learning certain skills.\nD: His wisdom, leadership, explosives, mechanical and medical skills improve slightly slower.",
L"A: Has slightly better chance to hit on burst/autofire and inflicts slightly bigger damage in close combat\n Gains a little more morale for killing.\nD: Has penalty for actions which need patience like repairing items, picking locks, removing traps, doctoring, training militia.",
L"A: Has bonus for actions which need patience like repairing items, picking locks, removing traps, doctoring and training militia.\nD: His interrupt chance is slightly lowered.",
L"A: Increased resistance to suppression and fear.\n Morale loss for taking damage and companions deaths is lower for him.\nD: Can be hit easier and enemy penalty for moving target is lesser in his case.",
L"A: He gains morale when on non-combat assignments (except training militia).\nD: Gains no morale for killing.",
L"A: Has bigger chance for inflicting stat loss and can inflict special painful wounds when able to\n Gains bonus morale for inflicting stat loss.\nD: Has penalty for communication with people and his morale sinks faster if not fighting.",
L"A: Has greater chance of inflicting stat loss, which may also inflict special painful wounds.\n Gains bonus morale for inflicting stat loss.\nD: Has penalty for communication with people and his morale sinks faster if not fighting.",
L"A: Has better performance when there are some mercs of opposite gender nearby.\nD: Morale of other mercs of the same gender grows slower if nearby.",
};
@@ -435,9 +437,9 @@ STR16 gzIMPDisabilitiesHelpTexts[]=
L"Can suffer panic attack if left alone in certain situations.",
L"His overall performance is reduced if underground.",
L"If trying to swim he can easily drown.",
L"A look at large insects can make a big problems\nand being in tropical sectors also reduce his performance a bit.",
L"A look at large insects can cause big problems\nand being in tropical sectors also reduce his performance a bit.",
L"Sometimes forgets what orders he got and therefore loses some APs if in combat.",
L"He can go psycho and shoot like mad once per a while\nand can lose morale if unable to do that with given weapon.",
L"He can go psycho and shoot like mad once in a while\nand can lose morale if unable to do so with given weapon.",
};
@@ -464,6 +466,7 @@ STR16 gzDisplayCoverText[]=
{
L"Copertura: %d/100 %s, Luminosità: %d/100",
L"Gittata dell'arma: %d/%d tiles, Probabilità di colpire: %d/100",
L"Gittata dell'arma: %d/%d tiles, Muzzle Stability: %d/100",
L"Disabilita visualizzazione copertura",
L"Mostra visuale del mercenario",
L"Mostra zone di pericolo per il mercenario",