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
@@ -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>