- New Feature: Allow attaching and using underbarrel weapons (by Flugente & JMich, Pics by smeagol)

o Updated XML files and added new KAC masterkey which can be used as an underbarrel weapon
o Raider and Kelly have one in their starting kit 4 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1380 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Wanne
2012-04-01 15:38:40 +00:00
parent 72af0a6819
commit 531f4134c3
11 changed files with 373 additions and 32 deletions
Binary file not shown.
Binary file not shown.
+10 -1
View File
@@ -1760,9 +1760,18 @@ CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35
; Should a 'thermometer' for guns and replacable barrels be displayed?
OVERHEATING_DISPLAY_THERMOMETER = TRUE
; If a barrel is not in someone's inventory, it cools down a little bit better
; Starting amount of red colour in the temperature bar. Must be in [0, 255]
OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET = 100
; If a barrel is not in someone's inventory, it cools down a little bit better.
OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15
; Should the temperature of all items lying on the ground in a sector be set to zero upon loading a different sector?
; Due to engine limitations, the temperature will otherwise stay what I was when another sector was loaded.
; This can be exploited, but why would you do that?
; Note: This only applies to items lying on the ground. The inventory of your mercs will cool down wherever they are.
OVERHEATING_SET_ZERO_UPON_NEW_SECTOR = TRUE
;******************************************************************************************************************************
;******************************************************************************************************************************
+3 -3
View File
@@ -135,10 +135,10 @@
<szSlotName>Underbarrel Attachments</szSlotName>
<nasAttachmentClass>512</nasAttachmentClass>
<nasLayoutClass>1</nasLayoutClass>
<usDescPanelPosX>58</usDescPanelPosX>
<usDescPanelPosX>18</usDescPanelPosX>
<usDescPanelPosY>120</usDescPanelPosY>
<fMultiShot>0</fMultiShot>
<fBigSlot>0</fBigSlot>
<fBigSlot>1</fBigSlot>
</ATTACHMENTSLOT>
<ATTACHMENTSLOT>
<uiSlotIndex>14</uiSlotIndex>
@@ -146,7 +146,7 @@
<nasAttachmentClass>1024</nasAttachmentClass>
<nasLayoutClass>1</nasLayoutClass>
<usDescPanelPosX>18</usDescPanelPosX>
<usDescPanelPosY>120</usDescPanelPosY>
<usDescPanelPosY>148</usDescPanelPosY>
<fMultiShot>0</fMultiShot>
<fBigSlot>0</fBigSlot>
</ATTACHMENTSLOT>
+252
View File
@@ -30738,4 +30738,256 @@
<APCost>8</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>12</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>13</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>21</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>23</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>632</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>633</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>350</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>624</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>646</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>651</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>652</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>653</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>655</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>662</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>665</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>713</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>714</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>749</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>750</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>751</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>752</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>755</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>762</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>782</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>781</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>787</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>788</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>790</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>791</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>792</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>793</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>795</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>796</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>797</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>896</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>1070</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>1072</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>1077</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>1332</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>1187</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>671</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1522</attachmentIndex>
<itemIndex>342</itemIndex>
<APCost>20</APCost>
<NASOnly>0</NASOnly>
</ATTACHMENT>
</ATTACHMENTLIST>
+34
View File
@@ -45099,4 +45099,38 @@
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
<ITEM>
<uiIndex>1522</uiIndex>
<szItemName>KAC Masterkey</szItemName>
<szLongItemName>KAC Masterkey</szLongItemName>
<szItemDesc>The 12-gauge Masterkey shotgun can be mounted under standard rifles as a breaching tool when used with special ammo.</szItemDesc>
<szBRName>KAC Masterkey</szBRName>
<szBRDesc>Tired of having to pack an Assault Rifle and an additional Shotgun? With this specially adapted shotgun, you can carry 2 in 1!</szBRDesc>
<usItemClass>2</usItemClass>
<nasAttachmentClass>512</nasAttachmentClass>
<nasLayoutClass>1</nasLayoutClass>
<ubClassIndex>1522</ubClassIndex>
<ubCursor>3</ubCursor>
<ubGraphicNum>369</ubGraphicNum>
<ubWeight>24</ubWeight>
<ItemSize>5</ItemSize>
<usPrice>1900</usPrice>
<ubCoolness>5</ubCoolness>
<bRepairEase>3</bRepairEase>
<Damageable>1</Damageable>
<Repairable>1</Repairable>
<WaterDamages>1</WaterDamages>
<Metal>1</Metal>
<Sinks>1</Sinks>
<ShowStatus>1</ShowStatus>
<TwoHanded>1</TwoHanded>
<BigGunList>1</BigGunList>
<BR_NewInventory>4</BR_NewInventory>
<BR_UsedInventory>1</BR_UsedInventory>
<BR_ROF>24</BR_ROF>
<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
</ITEMLIST>
+28 -26
View File
@@ -8095,6 +8095,7 @@
<lBPackStatus>0</lBPackStatus>
</GEARKIT>
<GEARKIT>
<mGearKitName>Breaching</mGearKitName>
<mPriceMod>0</mPriceMod>
<mHelmet>293</mHelmet>
<mHelmetStatus>0</mHelmetStatus>
@@ -8105,16 +8106,16 @@
<mLeg>294</mLeg>
<mLegDrop>0</mLegDrop>
<mLegStatus>0</mLegStatus>
<mWeapon>775</mWeapon>
<mWeapon>671</mWeapon>
<mWeaponDrop>0</mWeaponDrop>
<mWeaponStatus>92</mWeaponStatus>
<mBig0>107</mBig0>
<mBig0Status>0</mBig0Status>
<mBig0Quantity>2</mBig0Quantity>
<mBig0>1522</mBig0>
<mBig0Status>97</mBig0Status>
<mBig0Quantity>1</mBig0Quantity>
<mBig0Drop>0</mBig0Drop>
<mBig1>416</mBig1>
<mBig1Status>0</mBig1Status>
<mBig1Quantity>1</mBig1Quantity>
<mBig1>415</mBig1>
<mBig1Status>100</mBig1Status>
<mBig1Quantity>2</mBig1Quantity>
<mBig1Drop>0</mBig1Drop>
<mBig2>994</mBig2>
<mBig2Status>91</mBig2Status>
@@ -8127,12 +8128,12 @@
<mSmall0>213</mSmall0>
<mSmall0Status>89</mSmall0Status>
<mSmall0Quantity>1</mSmall0Quantity>
<mSmall1>0</mSmall1>
<mSmall1Status>0</mSmall1Status>
<mSmall1Quantity>0</mSmall1Quantity>
<mSmall2>0</mSmall2>
<mSmall2Status>0</mSmall2Status>
<mSmall2Quantity>0</mSmall2Quantity>
<mSmall1>413</mSmall1>
<mSmall1Status>100</mSmall1Status>
<mSmall1Quantity>2</mSmall1Quantity>
<mSmall2>531</mSmall2>
<mSmall2Status>100</mSmall2Status>
<mSmall2Quantity>2</mSmall2Quantity>
<mSmall3>0</mSmall3>
<mSmall3Status>0</mSmall3Status>
<mSmall3Quantity>0</mSmall3Quantity>
@@ -8154,8 +8155,8 @@
<lLeftThighStatus>0</lLeftThighStatus>
<lRightThigh>0</lRightThigh>
<lRightThighStatus>0</lRightThighStatus>
<lCPack>0</lCPack>
<lCPackStatus>0</lCPackStatus>
<lCPack>1098</lCPack>
<lCPackStatus>96</lCPackStatus>
<lBPack>0</lBPack>
<lBPackStatus>0</lBPackStatus>
</GEARKIT>
@@ -31112,6 +31113,7 @@
<lBPackStatus>0</lBPackStatus>
</GEARKIT>
<GEARKIT>
<mGearKitName>Breaching</mGearKitName>
<mPriceMod>0</mPriceMod>
<mHelmet>285</mHelmet>
<mHelmetStatus>93</mHelmetStatus>
@@ -31133,20 +31135,20 @@
<mBig1Status>100</mBig1Status>
<mBig1Quantity>1</mBig1Quantity>
<mBig1Drop>0</mBig1Drop>
<mBig2>631</mBig2>
<mBig2Status>99</mBig2Status>
<mBig2>1522</mBig2>
<mBig2Status>98</mBig2Status>
<mBig2Quantity>1</mBig2Quantity>
<mBig2Drop>0</mBig2Drop>
<mBig3>401</mBig3>
<mBig3Status>100</mBig3Status>
<mBig3Quantity>2</mBig3Quantity>
<mBig3>0</mBig3>
<mBig3Status>0</mBig3Status>
<mBig3Quantity>0</mBig3Quantity>
<mBig3Drop>0</mBig3Drop>
<mSmall0>0</mSmall0>
<mSmall0Status>0</mSmall0Status>
<mSmall0Quantity>0</mSmall0Quantity>
<mSmall1>0</mSmall1>
<mSmall1Status>0</mSmall1Status>
<mSmall1Quantity>0</mSmall1Quantity>
<mSmall0>414</mSmall0>
<mSmall0Status>100</mSmall0Status>
<mSmall0Quantity>2</mSmall0Quantity>
<mSmall1>415</mSmall1>
<mSmall1Status>100</mSmall1Status>
<mSmall1Quantity>2</mSmall1Quantity>
<mSmall2>0</mSmall2>
<mSmall2Status>0</mSmall2Status>
<mSmall2Quantity>0</mSmall2Quantity>
+34
View File
@@ -13060,4 +13060,38 @@
<sSound>87</sSound>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
</WEAPON>
<WEAPON>
<uiIndex>1522</uiIndex>
<szWeaponName>KAC Masterkey</szWeaponName>
<ubWeaponClass>5</ubWeaponClass>
<ubWeaponType>8</ubWeaponType>
<ubCalibre>5</ubCalibre>
<ubReadyTime>20</ubReadyTime>
<ubShotsPer4Turns>10.41</ubShotsPer4Turns>
<ubBulletSpeed>22</ubBulletSpeed>
<ubImpact>36</ubImpact>
<ubDeadliness>26</ubDeadliness>
<ubMagSize>4</ubMagSize>
<usRange>90</usRange>
<usReloadDelay>200</usReloadDelay>
<BurstAniDelay>100</BurstAniDelay>
<ubAttackVolume>85</ubAttackVolume>
<ubHitVolume>8</ubHitVolume>
<sSound>435</sSound>
<sBurstSound>126</sBurstSound>
<sReloadSound>103</sReloadSound>
<sLocknLoadSound>109</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>16</APsToReload>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
<APsToReloadManually>10</APsToReloadManually>
<ManualReloadSound>481</ManualReloadSound>
<nAccuracy>20</nAccuracy>
<ubAimLevels>3</ubAimLevels>
<Handling>9</Handling>
<usOverheatingJamThreshold>4000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>5000</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>134</usOverheatingSingleShotTemperature>
</WEAPON>
</WEAPONLIST>
Binary file not shown.
+12 -2
View File
@@ -1757,11 +1757,21 @@ CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35
;******************************************************************************************************************************
; Should a 'thermometer' for guns and replacable barrels be displayed?
OVERHEATING_DISPLAY_THERMOMETER = TRUE
OVERHEATING_DISPLAY_THERMOMETER = FALSE
; If a barrel is not in someone's inventory, it cools down a little bit better
; Starting amount of red colour in the temperature bar. Must be in [0, 255]
OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET = 100
; If a barrel is not in someone's inventory, it cools down a little bit better.
OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15
; Should the temperature of all items lying on the ground in a sector be set to zero upon loading a different sector?
; Due to engine limitations, the temperature will otherwise stay what I was when another sector was loaded.
; This can be exploited, but why would you do that?
; Note: This only applies to items lying on the ground. The inventory of your mercs will cool down wherever they are.
OVERHEATING_SET_ZERO_UPON_NEW_SECTOR = FALSE
;******************************************************************************************************************************
;******************************************************************************************************************************
Binary file not shown.