From 6924efdf61fffc1b66732607eb6277e20ddd2da7 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 24 Mar 2014 20:06:38 +0000
Subject: [PATCH] Updates/Fixes (by Sevenfm) - Added grenade throwing range
 modifier to item_settings.ini: RANGE_GRENADE_MODIFIER = 1.0 This modifier is
 applied to grenades and regular thrown items. - Added xml tags for merge type
 <13>: you can use u.knife on tripwire roll to get 2 tripwires. Status of
 tripwire roll will be reduced by 2 points. Also lookup table for merges is
 updated for xml editor to work correctly. - Added several new
 loadscreenhints.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2000 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/Item_Settings.ini           |  1 +
 gamedir/Data-1.13/TableData/Items/Merges.xml  |  8 ++++
 .../Data-1.13/TableData/LoadScreenHints.xml   | 45 +++++++++++++++++++
 .../Data-1.13/TableData/Lookup/MergeType.xml  |  4 ++
 gamedir/Data/Item_Settings.ini                |  1 +
 5 files changed, 59 insertions(+)

diff --git a/gamedir/Data-1.13/Item_Settings.ini b/gamedir/Data-1.13/Item_Settings.ini
index ece19a517..f42694741 100644
--- a/gamedir/Data-1.13/Item_Settings.ini
+++ b/gamedir/Data-1.13/Item_Settings.ini
@@ -103,6 +103,7 @@ RANGE_AR_MODIFIER			= 1.0
 RANGE_LMG_MODIFIER			= 1.0
 RANGE_SHOTGUN_MODIFIER		= 1.0
 RANGE_LAUNCHER_MODIFIER		= 1.0
+RANGE_GRENADE_MODIFIER          = 1.0
 ;******************************************************************************************************************************
 
 ;******************************************************************************************************************************
diff --git a/gamedir/Data-1.13/TableData/Items/Merges.xml b/gamedir/Data-1.13/TableData/Items/Merges.xml
index 8b65f30a8..5cf58d03f 100644
--- a/gamedir/Data-1.13/TableData/Items/Merges.xml
+++ b/gamedir/Data-1.13/TableData/Items/Merges.xml
@@ -2217,6 +2217,14 @@
 		<APCost>20</APCost>
 	</MERGE>
 	<MERGE>
+        <firstItemIndex>299</firstItemIndex>
+        <secondItemIndex>1640</secondItemIndex>
+        <firstResultingItemIndex>1524</firstResultingItemIndex>
+        <secondResultingItemIndex>1524</secondResultingItemIndex>
+        <mergeType>13</mergeType>
+        <APCost>20</APCost>
+    </MERGE>
+    <MERGE>
 		<firstItemIndex>300</firstItemIndex>
 		<secondItemIndex>194</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
diff --git a/gamedir/Data-1.13/TableData/LoadScreenHints.xml b/gamedir/Data-1.13/TableData/LoadScreenHints.xml
index 13811daa1..6407844c8 100644
--- a/gamedir/Data-1.13/TableData/LoadScreenHints.xml
+++ b/gamedir/Data-1.13/TableData/LoadScreenHints.xml
@@ -644,4 +644,49 @@ The other tags determine in what category this hint falls, and will be displayed
     <szName>In tactical screen, pressing and holding [RIGHT-MOUSE-BUTTON] over your merc will open up merc's menu similar to the one you have on strategic screen map.</szName>
     <keybind>1</keybind>
   </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>124</uiIndex>
+    <szName>Press [CTRL]+[C] to open Cover Display Menu.</szName>
+    <keybind>1</keybind>
+  </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>125</uiIndex>
+    <szName>Press [CTRL]+[V] to open useful Inventory Manipulations Menu.</szName>
+    <keybind>1</keybind>
+  </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>126</uiIndex>
+    <szName>Press [D] to enter turn-based mode immediately, if there is enemy in sector.</szName>
+    <keybind>1</keybind>
+  </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>127</uiIndex>
+    <szName>Press [CTRL]+[D] to end your interrupt, and there will be no interrupts until next turn.</szName>
+    <keybind>1</keybind>
+  </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>128</uiIndex>
+    <szName>[ALT]+[RIGHTCLICK] opens Skills Menu, where you can call reinforcements with your radio or order artillery strike.</szName>
+    <keybind>1</keybind>
+  </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>129</uiIndex>
+    <szName>You can safely place defensive minefields in captured towns and SAMs, your mercs and militia will avoid them.</szName>
+    <items>1</items>
+  </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>130</uiIndex>
+    <szName>You can inspect trap before trying to disarm it. Recommended if you are happy with your current number of extremities.</szName>
+    <items>1</items>
+  </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>131</uiIndex>
+    <szName>Click with hand cursor on a blue flag, and you will be able to remove flag or inspect trap with useful Disarm Menu.</szName>
+    <items>1</items>
+  </LOADSCREENHINT>
+  <LOADSCREENHINT>
+    <uiIndex>132</uiIndex>
+    <szName>Placing mines, concertina or sandbags is more convenient with [SHIFT] key - you don't need to manually take new item from your inventory.</szName>
+	  <keybind>1</keybind>
+  </LOADSCREENHINT>
 </LOADSCREENHINTS>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Lookup/MergeType.xml b/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
index b76f1392e..4b82a04b7 100644
--- a/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
+++ b/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
@@ -52,4 +52,8 @@
 		<id>12</id>
 		<name>Tripwire Roll</name>
 	</MergeType>
+   <MergeType>
+       <id>13</id>
+       <name>Use (Drain Status)</name>
+   </MergeType>
 </JA2Data>
\ No newline at end of file
diff --git a/gamedir/Data/Item_Settings.ini b/gamedir/Data/Item_Settings.ini
index ece19a517..f42694741 100644
--- a/gamedir/Data/Item_Settings.ini
+++ b/gamedir/Data/Item_Settings.ini
@@ -103,6 +103,7 @@ RANGE_AR_MODIFIER			= 1.0
 RANGE_LMG_MODIFIER			= 1.0
 RANGE_SHOTGUN_MODIFIER		= 1.0
 RANGE_LAUNCHER_MODIFIER		= 1.0
+RANGE_GRENADE_MODIFIER          = 1.0
 ;******************************************************************************************************************************
 
 ;******************************************************************************************************************************