- reworked the tripwire nework flags. This will allow much more complex networks in the future. WARNING: planted tripwires in savegames from previous savegames will behave strangely with this version.

- externalised texts for cleaning, food, corpse handling and covert ops
- tripwire can now be defused even if it does not have a blue flag. When having a wirecutter in the main hand, click on the planted tripwire while crouched, the defuse dialogue will show up.
- corpses spawned from items will behave according to the zombie spawn rules
- fixed a few glitches with the covert ops trait
- fixed a bug that gave the 'mounted' bonus on a roof

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2012-09-02 20:38:17 +00:00
parent da441439ac
commit 41bc80dc3c
25 changed files with 1028 additions and 170 deletions
+75 -1
View File
@@ -651,6 +651,80 @@ extern CHAR16 zHealthStr[][13];
extern STR16 gzHiddenHitCountStr[1];
extern STR16 zVehicleName[ 6 ];
// Flugente: externalised texts for some features
enum
{
STR_COVERT_CAMOFOUND,
STR_COVERT_BACKPACKFOUND,
STR_COVERT_CARRYCORPSEFOUND,
STR_COVERT_CARRY_BADLBE,
STR_COVERT_MILITARYGEARFOUND,
STR_COVERT_TOOMANYGUNS,
STR_COVERT_ITEMSTOOGOOD,
STR_COVERT_TOOMANYATTACHMENTS,
STR_COVERT_ACTIVITIES,
STR_COVERT_NO_CIV,
STR_COVERT_BLEEDING,
STR_COVERT_DRUNKEN_SOLDIER,
STR_COVERT_TOO_CLOSE,
STR_COVERT_CURFEW_BROKEN,
STR_COVERT_CURFEW_BROKEN_NIGHT,
STR_COVERT_NEAR_CORPSE,
STR_COVERT_SUSPICIOUS_EQUIPMENT,
STR_COVERT_TARGETTING_SOLDIER,
STR_COVERT_UNCOVERED,
STR_COVERT_NO_CLOTHES_ITEM,
STR_COVERT_ERROR_OLDTRAITS,
STR_COVERT_NOT_ENOUGH_APS,
STR_COVERT_BAD_PALETTE,
STR_COVERT_NO_SKILL,
STR_COVERT_NO_UNIFORM_FOUND,
TEXT_NUM_COVERT_STR
};
extern STR16 szCovertTextStr[];
enum
{
STR_CORPSE_NO_HEAD_ITEM,
STR_CORPSE_NO_DECAPITATION,
STR_CORPSE_NO_MEAT_ITEM,
STR_CORPSE_NO_GUTTING,
STR_CORPSE_NO_CLOTHESFOUND,
STR_CORPSE_NO_STRIPPING_POSSIBLE,
STR_CORPSE_NO_TAKING,
STR_CORPSE_NO_FREEHAND,
STR_CORPSE_NO_CORPSE_ITEM,
STR_CORPSE_INVALID_CORPSE_ID,
TEXT_NUM_CORPSE_STR
};
extern STR16 szCorpseTextStr[];
enum
{
STR_FOOD_DONOTWANT_EAT,
STR_FOOD_DONOTWANT_DRINK,
STR_FOOD_ATE,
STR_FOOD_DRANK,
STR_FOOD_STR_DAMAGE_FOOD_TOO_MUCH,
STR_FOOD_STR_DAMAGE_FOOD_TOO_LESS,
STR_FOOD_HEALTH_DAMAGE_FOOD_TOO_MUCH,
STR_FOOD_HEALTH_DAMAGE_FOOD_TOO_LESS,
STR_FOOD_STR_DAMAGE_DRINK_TOO_MUCH,
STR_FOOD_STR_DAMAGE_DRINK_TOO_LESS,
STR_FOOD_HEALTH_DAMAGE_DRINK_TOO_MUCH,
STR_FOOD_HEALTH_DAMAGE_DRINK_TOO_LESS,
STR_FOOD_ERROR_NO_FOOD_SYSTEM,
TEXT_NUM_FOOD_STR
};
extern STR16 szFoodTextStr[];
enum
{
AIR_RAID_TURN_STR,
@@ -818,8 +892,8 @@ enum
MERC_VITAL_STATS_WITH_POISON_AND_FOOD_POPUPTEXT,
FUNCTION_SELECTION_STR,
CORPSE_SELECTION_STR,
WEAPON_CLEANING_STR,
TEXT_NUM_TACTICAL_STR
};