From e5d70dcccca702e3cef314c2d3727417bcd48452 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 25 Jul 2012 08:24:46 +0000 Subject: [PATCH] New EXE Build (5423) o New feature: food system requires mercs to eat and drink in order to survive - food and water levels are lowered every hour, eat food to survive - not doing so leads to various penalties and ultimately death - added food items for that purpose. Food can degrade over time. Rotten food poisons. - Mercs automatically consume food if hungry/thirsty and food is in their inventories - for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307396/Re_Mercs_need_food_and_water_t.html#Post307396 o New feature: guns can now be fed externally - a machinegun can be fed by another emc if he has an ammo blet in his hands - a merc can also feed his gun with ammo belts in his inventory - the necessary tags can be set in Items.xml in the -tag - this feature can be turned on and off via the JA2_Options.iniReader - for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307574/New_feature_Externally_fed_mac.html#Post307574 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1477 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI | 1 + gamedir/Profiles/UserProfile_JA2113Demo/Ja2_Settings.INI | 1 + gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI | 1 + gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI | 1 + gamedir/Set JA2UB v1.13 Campaign.ini | 4 ++-- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI index 3a2506253..5cd86d335 100644 --- a/gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI +++ b/gamedir/Profiles/UserProfile_JA2113/Ja2_Settings.INI @@ -84,6 +84,7 @@ TOPTION_QUIET_REPAIRING = FALSE TOPTION_QUIET_DOCTORING = FALSE TOPTION_AUTO_FAST_FORWARD_MODE = TRUE TOPTION_ZOMBIES = FALSE +TOPTION_ENABLE_INVENTORY_POPUPS = TRUE TOPTION_CHEAT_MODE_OPTIONS_HEADER = FALSE TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = FALSE TOPTION_CHEAT_MODE_OPTIONS_END = FALSE diff --git a/gamedir/Profiles/UserProfile_JA2113Demo/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_JA2113Demo/Ja2_Settings.INI index 3d2c96cc4..d0146a2d5 100644 --- a/gamedir/Profiles/UserProfile_JA2113Demo/Ja2_Settings.INI +++ b/gamedir/Profiles/UserProfile_JA2113Demo/Ja2_Settings.INI @@ -84,6 +84,7 @@ TOPTION_QUIET_REPAIRING = FALSE TOPTION_QUIET_DOCTORING = FALSE TOPTION_AUTO_FAST_FORWARD_MODE = FALSE TOPTION_ZOMBIES = FALSE +TOPTION_ENABLE_INVENTORY_POPUPS = FALSE TOPTION_CHEAT_MODE_OPTIONS_HEADER = FALSE TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = FALSE TOPTION_CHEAT_MODE_OPTIONS_END = FALSE diff --git a/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI index cfa175bdb..8e90f52ce 100644 --- a/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI +++ b/gamedir/Profiles/UserProfile_JA2113_UB_EN/Ja2_Settings.INI @@ -84,6 +84,7 @@ TOPTION_QUIET_REPAIRING = FALSE TOPTION_QUIET_DOCTORING = FALSE TOPTION_AUTO_FAST_FORWARD_MODE = FALSE TOPTION_ZOMBIES = FALSE +TOPTION_ENABLE_INVENTORY_POPUPS = FALSE TOPTION_CHEAT_MODE_OPTIONS_HEADER = FALSE TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = FALSE TOPTION_CHEAT_MODE_OPTIONS_END = FALSE diff --git a/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI b/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI index 3d2c96cc4..d0146a2d5 100644 --- a/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI +++ b/gamedir/Profiles/UserProfile_JA2Vanilla/Ja2_Settings.INI @@ -84,6 +84,7 @@ TOPTION_QUIET_REPAIRING = FALSE TOPTION_QUIET_DOCTORING = FALSE TOPTION_AUTO_FAST_FORWARD_MODE = FALSE TOPTION_ZOMBIES = FALSE +TOPTION_ENABLE_INVENTORY_POPUPS = FALSE TOPTION_CHEAT_MODE_OPTIONS_HEADER = FALSE TOPTION_FORCE_BOBBY_RAY_SHIPMENTS = FALSE TOPTION_CHEAT_MODE_OPTIONS_END = FALSE diff --git a/gamedir/Set JA2UB v1.13 Campaign.ini b/gamedir/Set JA2UB v1.13 Campaign.ini index 52acd1687..7fefa7dd5 100644 --- a/gamedir/Set JA2UB v1.13 Campaign.ini +++ b/gamedir/Set JA2UB v1.13 Campaign.ini @@ -21,8 +21,8 @@ CONFIG_UB1=Data-UB\Data-Files CONFIG_UB2=Data-UB\Language\EN CONFIG_UB3=Data-UB\Data-Files\Intro.slf PROFIL=Profiles\UserProfile_JA2113_UB_EN -EXE=JA2UB_v1.13_en.exe -EXE_EDITOR=Map-Editor-ub-en.exe +EXE=ja2_UB_5423.exe +EXE_EDITOR=MapEditor_UB_5423.exe [Addon0] Name=None