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

- added stun gun and pepper spray (only placeholder images for now).

Browse Source 
- Fix: Kobra had wrong nasAttachmentClass

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1569 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
2012-12-03 23:08:48 +00:00
parent 288b0ed284
commit de94eb605b
6 changed files with 166 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/AmmoStrings.xml
+5
View File
@@ -245,4 +245,9 @@
<AmmoCaliber>Cannon Ball</AmmoCaliber>
<BRCaliber>Cannon Ball</BRCaliber>
</AMMO>
<AMMO>
<uiIndex>49</uiIndex>
<AmmoCaliber>Pepper Spray</AmmoCaliber>
<BRCaliber>Pepper Spray</BRCaliber>
</AMMO>
</AMMOLIST>
gamedir/Data-1.13/TableData/AmmoTypes.xml
+35
View File
@@ -1051,4 +1051,39 @@
<temperatureModificator>-0.1</temperatureModificator>
<ammoflag>1</ammoflag>
</AMMOTYPE>
<AMMOTYPE>
<uiIndex>30</uiIndex>
<name>Pepper Spray</name>
<fontColour>166</fontColour>
<grayed>4</grayed>
<offNormal>1</offNormal>
<onNormal>3</onNormal>
<structureImpactReductionMultiplier>0</structureImpactReductionMultiplier>
<structureImpactReductionDivisor>1</structureImpactReductionDivisor>
<armourImpactReductionMultiplier>0</armourImpactReductionMultiplier>
<armourImpactReductionDivisor>1</armourImpactReductionDivisor>
<beforeArmourDamageMultiplier>0</beforeArmourDamageMultiplier>
<beforeArmourDamageDivisor>1</beforeArmourDamageDivisor>
<afterArmourDamageMultiplier>0</afterArmourDamageMultiplier>
<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
<zeroMinimumDamage>1</zeroMinimumDamage>
<canGoThrough>0</canGoThrough>
<standardIssue>1</standardIssue>
<numberOfBullets>1</numberOfBullets>
<multipleBulletDamageMultiplier>0</multipleBulletDamageMultiplier>
<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
<highExplosive>0</highExplosive>
<explosionSize>0</explosionSize>
<antiTank>0</antiTank>
<dart>0</dart>
<knife>0</knife>
<monsterSpit>0</monsterSpit>
<acidic>0</acidic>
<ignoreArmour>0</ignoreArmour>
<lockBustingPower>0</lockBustingPower>
<tracerEffect>0</tracerEffect>
<spreadPattern />
<temperatureModificator>0</temperatureModificator>
<ammoflag>2</ammoflag>
</AMMOTYPE>
</AMMOTYPELIST>
gamedir/Data-1.13/TableData/Attachments.xml
+5
View File
@@ -10371,6 +10371,11 @@
<itemIndex>1169</itemIndex>
<APCost>8</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>322</attachmentIndex>
<itemIndex>1626</itemIndex>
<APCost>20</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>592</attachmentIndex>
<itemIndex>674</itemIndex>
gamedir/Data-1.13/TableData/Items.xml
+83 -1
View File
@@ -31006,7 +31006,7 @@
<szBRDesc>Kobra is the answer to the needs of Russian special forces operatives who need a gunsight for fast target acquisition. Fits most AK rifles instead of a scope.</szBRDesc>
<usItemClass>268435456</usItemClass>
<AttachmentClass>8</AttachmentClass>
<nasAttachmentClass>65536</nasAttachmentClass>
<nasAttachmentClass>8</nasAttachmentClass>
<ubGraphicType>1</ubGraphicType>
<ubGraphicNum>556</ubGraphicNum>
<ubWeight>4</ubWeight>
@@ -48669,4 +48669,86 @@
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
<ITEM>
<uiIndex>1626</uiIndex>
<szItemName>Stun Gun</szItemName>
<szLongItemName>Stun Gun</szLongItemName>
<szItemDesc>If applied correctly, this stun gun will hit anyone it touches with over 2 million volts. In case you find yourself in need of a drooling, helpless victim.</szItemDesc>
<szBRName>Stun Gun</szBRName>
<szBRDesc>At 2 million V, this baby will leave even the sturdiest men helpless on the floor. Batteries not included!</szBRDesc>
<usItemClass>128</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<ubClassIndex>49</ubClassIndex>
<ubCursor>2</ubCursor>
<ubGraphicType>1</ubGraphicType>
<ubGraphicNum>102</ubGraphicNum>
<ubWeight>4</ubWeight>
<ubPerPocket>4</ubPerPocket>
<ItemSize>13</ItemSize>
<usPrice>60</usPrice>
<ubCoolness>2</ubCoolness>
<bReliability>1</bReliability>
<bRepairEase>-1</bRepairEase>
<Damageable>1</Damageable>
<Repairable>1</Repairable>
<Metal>1</Metal>
<Sinks>1</Sinks>
<Electronic>1</Electronic>
<NeedsBatteries>1</NeedsBatteries>
<ShowStatus>1</ShowStatus>
<BR_NewInventory>4</BR_NewInventory>
<BR_UsedInventory>3</BR_UsedInventory>
<BR_ROF>30</BR_ROF>
<BrassKnuckles>1</BrassKnuckles>
<ItemFlag>1048576</ItemFlag>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
<ITEM>
<uiIndex>1627</uiIndex>
<szItemName>Pepper Spray</szItemName>
<szLongItemName>Pepper Spray</szLongItemName>
<szItemDesc>Well, its better than flailing your ams helplessly.</szItemDesc>
<szBRName>Pepper Spray</szBRName>
<szBRDesc>Repel any thug with this pepper spray. Spray into his face for best effect.</szBRDesc>
<usItemClass>2</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<ubClassIndex>1627</ubClassIndex>
<ubCursor>3</ubCursor>
<ubGraphicNum>1</ubGraphicNum>
<ubWeight>1</ubWeight>
<ubPerPocket>2</ubPerPocket>
<usPrice>8</usPrice>
<ubCoolness>1</ubCoolness>
<Damageable>1</Damageable>
<ShowStatus>1</ShowStatus>
<BR_NewInventory>6</BR_NewInventory>
<BR_ROF>36</BR_ROF>
<DirtIncreaseFactor>20.0</DirtIncreaseFactor>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
<ITEM>
<uiIndex>1628</uiIndex>
<szItemName>Spray Canister</szItemName>
<szLongItemName>Pepper Spray Canister</szLongItemName>
<szItemDesc>If you think you need to carry several of these, consider moving out of town.</szItemDesc>
<szBRName>Pepper Spray Canister</szBRName>
<szBRDesc>Though one might think so, putting this on your food is not the best idea you could have.</szBRDesc>
<usItemClass>1024</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<ubClassIndex>602</ubClassIndex>
<ubGraphicType>1</ubGraphicType>
<ubGraphicNum>363</ubGraphicNum>
<ubWeight>1</ubWeight>
<ubPerPocket>8</ubPerPocket>
<usPrice>2</usPrice>
<ubCoolness>1</ubCoolness>
<Sinks>1</Sinks>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
</ITEMLIST>
gamedir/Data-1.13/TableData/Magazines.xml
+7
View File
@@ -4214,4 +4214,11 @@
<ubAmmoType>29</ubAmmoType>
<ubMagType>0</ubMagType>
</MAGAZINE>
<MAGAZINE>
<uiIndex>602</uiIndex>
<ubCalibre>49</ubCalibre>
<ubMagSize>8</ubMagSize>
<ubAmmoType>30</ubAmmoType>
<ubMagType>0</ubMagType>
</MAGAZINE>
</MAGAZINELIST>
gamedir/Data-1.13/TableData/Weapons.xml
+31
View File
@@ -13131,4 +13131,35 @@
<usOverheatingDamageThreshold>5000</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>500</usOverheatingSingleShotTemperature>
</WEAPON>
<WEAPON>
<uiIndex>1626</uiIndex>
<szWeaponName>Stun Gun</szWeaponName>
<ubWeaponClass>6</ubWeaponClass>
<ubShotsPer4Turns>12</ubShotsPer4Turns>
<ubImpact>4</ubImpact>
<ubDeadliness>0</ubDeadliness>
<usReloadDelay>200</usReloadDelay>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
</WEAPON>
<WEAPON>
<uiIndex>1627</uiIndex>
<szWeaponName>Pepper Spray</szWeaponName>
<ubWeaponClass>1</ubWeaponClass>
<ubWeaponType>1</ubWeaponType>
<ubCalibre>49</ubCalibre>
<ubShotsPer4Turns>22</ubShotsPer4Turns>
<ubBulletSpeed>21</ubBulletSpeed>
<ubMagSize>8</ubMagSize>
<usRange>20</usRange>
<usReloadDelay>200</usReloadDelay>
<BurstAniDelay>100</BurstAniDelay>
<ubAttackVolume>50</ubAttackVolume>
<sSound>299</sSound>
<sReloadSound>100</sReloadSound>
<bBurstAP>20</bBurstAP>
<APsToReload>12</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
<ManualReloadSound>476</ManualReloadSound>
</WEAPON>
</WEAPONLIST>