-Added check in CONSIDERED_NEUTRAL macro for SOLDIER_COVERT_CIV and SOLDIER_COVERT_SOLDIER flags. This should prevent enemies from targeting a disguised merc with sniper and spread fire.

-Added screen messages when disguise changes to indicate civilian or soldier disguise
-Enabled mercs disguised as soldiers to carry >2 guns, if the additional guns are covert or hidden


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2012-11-09 08:10:23 +00:00
parent 5844c7265c
commit e98c1ce83c
15 changed files with 32 additions and 8 deletions
+2 -1
View File
@@ -681,7 +681,8 @@ enum
STR_COVERT_BAD_PALETTE,
STR_COVERT_NO_SKILL,
STR_COVERT_NO_UNIFORM_FOUND,
STR_COVERT_DISGUISED_AS_CIVILIAN,
STR_COVERT_DISGUISED_AS_SOLDIER,
TEXT_NUM_COVERT_STR
};
+2
View File
@@ -7441,6 +7441,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=
+2
View File
@@ -7434,6 +7434,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=
+2
View File
@@ -7422,6 +7422,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=
+2
View File
@@ -7408,6 +7408,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=
+2
View File
@@ -7249,6 +7249,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=
+2
View File
@@ -7421,6 +7421,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=
+2
View File
@@ -7435,6 +7435,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=
+2
View File
@@ -7387,6 +7387,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=
+2
View File
@@ -7438,6 +7438,8 @@ STR16 szCovertTextStr[]=
L"Bad palette found!",
L"You need the covert skill to do this!",
L"No uniform found!",
L"%s is now disguised as a civilian.",
L"%s is now disguised as a soldier.",
};
STR16 szCorpseTextStr[]=