1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- stacks of binders can be merged

Browse Source 
- new item: when planting tripwire roll (Item# 1640), a tripwrie item is created, thereby making planting multiple wires much easier

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1796 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
2013-09-29 17:03:58 +00:00
parent c0e61959d6
commit 14333998a1
2 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/Items/Items.xml
+35 -1
View File
@@ -181,6 +181,7 @@
<randomitemcoolnessmodificator>0</randomitemcoolnessmodificator>
<FlashLightRange>0</FlashLightRange>
<ItemChoiceTimeSetting>0</ItemChoiceTimeSetting>
<buddyitem>0</buddyitem>
<STAND_MODIFIERS>
<FlatBase>0</FlatBase>
<PercentBase>0</PercentBase>
@@ -48961,7 +48962,7 @@
<uiIndex>1636</uiIndex>
<szItemName>Flashlight</szItemName>
<szLongItemName>Flashlight</szLongItemName>
<szItemDesc>I am... the light! No wait, that ain't right. I'm just a flashlight. But I'm still useful. If everything else fails, use me to knock people over the hea.</szItemDesc>
<szItemDesc>I am... the light! No wait, that ain't right. I'm just a flashlight. But I'm still useful. If everything else fails, use me to knock people over the head with.</szItemDesc>
<szBRName>Flashlight</szBRName>
<szBRDesc>We say: let there be light! Batteries included.</szBRDesc>
<usItemClass>128</usItemClass>
@@ -49089,4 +49090,37 @@
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
<ITEM>
<uiIndex>1640</uiIndex>
<szItemName>Tripwire Roll</szItemName>
<szLongItemName>Tripwire Roll</szLongItemName>
<szItemDesc>TRipwire can be deployed directly frm this roll.</szItemDesc>
<szBRName>Tripwire Roll</szBRName>
<szBRDesc>A roll of tripwire. In case you need to boobytrap your house, your car, and your cat.</szBRDesc>
<usItemClass>512</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<ubClassIndex>86</ubClassIndex>
<ubCursor>18</ubCursor>
<ubGraphicType>2</ubGraphicType>
<ubGraphicNum>66</ubGraphicNum>
<ubWeight>3</ubWeight>
<ItemSize>26</ItemSize>
<usPrice>200</usPrice>
<ubCoolness>3</ubCoolness>
<Damageable>1</Damageable>
<Metal>1</Metal>
<BigGunList>1</BigGunList>
<BR_NewInventory>40</BR_NewInventory>
<BR_UsedInventory>25</BR_UsedInventory>
<Mine>1</Mine>
<TripWireActivation>1</TripWireActivation>
<TripWire>1</TripWire>
<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
<usActionItemFlag>17</usActionItemFlag> <!-- net 1, lvl 1-->
<ItemFlag>16777216</ItemFlag>
<buddyitem>1524</buddyitem>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
</ITEMLIST>
gamedir/Data-1.13/TableData/Items/Merges.xml
+24
View File
@@ -5744,6 +5744,22 @@
<mergeType>9</mergeType>
<APCost>32</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1524</firstItemIndex>
<secondItemIndex>1640</secondItemIndex>
<firstResultingItemIndex>1640</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>12</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1524</firstItemIndex>
<secondItemIndex>1524</secondItemIndex>
<firstResultingItemIndex>1640</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1546</firstItemIndex>
<secondItemIndex>1546</secondItemIndex>
@@ -5784,4 +5800,12 @@
<mergeType>4</mergeType>
<APCost>32</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1632</firstItemIndex>
<secondItemIndex>1632</secondItemIndex>
<firstResultingItemIndex>1632</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>1</mergeType>
<APCost>32</APCost>
</MERGE>
</MERGELIST>