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
This commit is contained in:
Wanne
2014-03-24 20:06:38 +00:00
parent 402de5cf3a
commit 6924efdf61
5 changed files with 59 additions and 0 deletions
+1
View File
@@ -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
;******************************************************************************************************************************
;******************************************************************************************************************************
@@ -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>
@@ -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>
@@ -52,4 +52,8 @@
<id>12</id>
<name>Tripwire Roll</name>
</MergeType>
<MergeType>
<id>13</id>
<name>Use (Drain Status)</name>
</MergeType>
</JA2Data>
+1
View File
@@ -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
;******************************************************************************************************************************
;******************************************************************************************************************************