From 4dee3218aab1f77e8187c733075b91e07d207bea Mon Sep 17 00:00:00 2001 From: silversurfer Date: Mon, 11 Nov 2013 12:50:06 +0000 Subject: [PATCH] - New camo handling: Camo Kits can now only be used to paint naked skin which usually means face and hands. Clothing will take care of the rest Together they can reach 100% camo. CAMO_KIT_USABLE_AREA = 5 in Ja2_Options.ini sets the area that can be painted. CAMO_LBE_OVER_VEST_MODIFIER = 0.2 CAMO_LBE_OVER_PANTS_MODIFIER = 0.6 These two set the amount of camo that armor vest/pants can provide if LBE is worn over them. http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327902/Re_Code_Snippets.html#Post327902 - New Mine avoidance for civilians (by Sevenfm) Civilians can now avoid player placed mines. CIVILIANS_AVOID_PLAYER_MINES = TRUE in Ja2_Options.INI takes care of that. I set the default to TRUE which will allow players to use mine fields in city sectors. http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327817/Re_Code_Snippets.html#Post327817 - Smoke effects and explosive attachments (by Sevenfm) Normal explosions can now cause a smoke effect. Explosives can be attached to other exlosives to create a more potent bundle. Ja2_Options.INI has some new options for that: ADD_SMOKE_AFTER_EXPLOSION = FALSE ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327918/Re_Code_Snippets.html#Post327918 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1866 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/Item_Settings.ini | 5 +- gamedir/Data-1.13/Ja2_Options.INI | 40 ++++++++ .../Data-1.13/TableData/Items/Explosives.xml | 61 +++++++++++++ gamedir/Data-1.13/TableData/Items/Items.xml | 91 +++++++++++++++++++ 4 files changed, 195 insertions(+), 2 deletions(-) diff --git a/gamedir/Data-1.13/Item_Settings.ini b/gamedir/Data-1.13/Item_Settings.ini index 4a1c01421..a19e7af03 100644 --- a/gamedir/Data-1.13/Item_Settings.ini +++ b/gamedir/Data-1.13/Item_Settings.ini @@ -259,10 +259,11 @@ HANDLING_LAUNCHER_MODIFIER = 1.0 ;****************************************************************************************************************************** ;****************************************************************************************************************************** -; This modifier sets the amount of camouflage on armor that applies when LBE is worn over the armor (NIV only). +; These modifiers set the amount of camouflage on armor that applies when LBE is worn over the armor (NIV only). ; Valid values are from 0.0 to 1.0. 0.0 means no camo bonus from armor, 1.0 means full bonus even if LBE is worn over the armor. ; Default is 0.2 -CAMO_LBE_OVER_ARMOR_MODIFIER = 0.2 +CAMO_LBE_OVER_VEST_MODIFIER = 0.2 +CAMO_LBE_OVER_PANTS_MODIFIER = 0.6 ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 65720603b..927aab564 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -891,6 +891,36 @@ ALLOW_WEAR_SUPPRESSOR = TRUE ALLOW_LAZY_CIVILIANS = TRUE +;------------------------------------------------------------------------------------------------------------------------------ +; Default: FALSE +; Neutral civilians can detect and avoid mines planted by player +;------------------------------------------------------------------------------------------------------------------------------ + +CIVILIANS_AVOID_PLAYER_MINES = TRUE + +;------------------------------------------------------------------------------------------------------------------------------ +; Default: FALSE +; Add small smoke after explosion (only outdoor, not underground, only regular type explosion) +;------------------------------------------------------------------------------------------------------------------------------ + +ADD_SMOKE_AFTER_EXPLOSION = FALSE + +;------------------------------------------------------------------------------------------------------------------------------ +; Default: FALSE +; Added attachments explode if they have usItemClass 256 or 512 (grenade or explosive), have ubVolatility>0 and +; one of attachments is rubber band or duct tape +;------------------------------------------------------------------------------------------------------------------------------ + +ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE + +;------------------------------------------------------------------------------------------------------------------------------ +; Default: FALSE +; Allow special explosive attachments (items with tags , and add special explosion effects) +; one of attachments must be rubber band or duct tape +;------------------------------------------------------------------------------------------------------------------------------ + +ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE + ;------------------------------------------------------------------------------------------------------------------------------ ; Default: 100 ; Chance to say annoying phrase. @@ -1709,6 +1739,16 @@ SOLDIER_PROFILES_MILITIA = FALSE CAMO_REMOVING = TRUE +;------------------------------------------------------------------------------------------------------------------------------ +; This setting defines the percentage area of a characters body that can be painted with camo kits. Usually only the face and hands +; can be painted with camo. The rest of the body has to be camouflaged by clothing and armor which are already colored. +; Setting this to 0 means camo kits are useless. At 100 camo kits can paint the whole body but cloth camo is useless. +; Valid values are from 0 to 100. +; default is 5 +;------------------------------------------------------------------------------------------------------------------------------ + +CAMO_KIT_USABLE_AREA = 5 + ;------------------------------------------------------------------------------------------------------------------------------ ; Enhanced Close Combat System ; diff --git a/gamedir/Data-1.13/TableData/Items/Explosives.xml b/gamedir/Data-1.13/TableData/Items/Explosives.xml index 282bbcd1f..a578ca043 100644 --- a/gamedir/Data-1.13/TableData/Items/Explosives.xml +++ b/gamedir/Data-1.13/TableData/Items/Explosives.xml @@ -1920,4 +1920,65 @@ 0 0 + + 96 + 6 + 0 + 0 + 1 + 0 + 0 + 7 + 2 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 97 + 8 + 40 + 30 + 5 + 15 + 0 + 10 + 5 + 2 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0.25 + + + 98 + 0 + 0 + 0 + 1 + 5 + 0 + 1 + 0 + 0 + 1 + 0 + 30 + 0 + 3 + 40 + 0 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index e30a90414..e7409d06e 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -51093,4 +51093,95 @@ + + 1702 + SMALL_SMOKE + SMALL_SMOKE + + SMALL_SMOKE + + 256 + 1 + 96 + 6 + 1 + 98 + 6 + 4 + 52 + 50 + 3 + -2 + 1 + 1 + 1 + 1 + 1 + 4 + 1 + 100.0 + + + + + + 1703 + GAS_EXPLOSION + GAS_EXPLOSION + GAS_EXPLOSION + GAS_EXPLOSION + GAS_EXPLOSION + 512 + 1 + 1 + 97 + 2 + 11 + 1 + 60 + 500 + 3 + -4 + 1 + 1 + 4 + 1 + 100.0 + + + + + + 1704 + FRAG_EXPLOSION + FRAG_EXPLOSION + FRAG_EXPLOSION + FRAG_EXPLOSION + FRAG_EXPLOSION + 256 + 1 + 1 + 98 + 6 + 1 + 49 + 6 + 4 + 40 + 200 + 3 + -4 + 1 + 1 + 1 + 1 + 1 + 4512 + 4 + 1 + 100.0 + + + + \ No newline at end of file