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

If CAN_FAN_THE_HAMMER is set for Gunslingers in Skills_Settings.ini, they can use burst fire if using revolvers with fBurstOnlyByFanTheHammer set to 1 and burst data set in Weapons.xml if they are in hipfire mode.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2460 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
2019-01-24 21:55:47 +00:00
parent f7ecbaf1ed
commit f7e31e768b
4 changed files with 2445 additions and 2326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/Skills_Settings.INI
+6
View File
@@ -278,6 +278,12 @@ RELOAD_SPEED_HANDGUNS_BONUS = 25
; restriction ON for this to make sense)
POSSIBLE_AIM_CLICK_ADDED_HANDGUNS = 1
; If set to true, revolvers (or any other gun with the <fBurstOnlyByFanTheHammer>-tag set in Weapons.xml) can access their hidden burst mode if
; - we have this trait
; - we use this gun with both hands
; - we are in hipfire mode (USE_SCOPE_MODES = TRUE in JA2_Options.ini, visible by the 'eye' icon over our gun)
CAN_FAN_THE_HAMMER = TRUE
; NOTE: This traits also gives access to the 'Focus' skill, description and values can be seen in the [Sniper] section of this file.
;******************************************************************************************************************************
gamedir/Data-1.13/TableData/Items/Weapons.xml
+118 -13
View File
@@ -46,6 +46,7 @@
<usOverheatingDamageThreshold>5000</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>80</usOverheatingSingleShotTemperature>
<HeavyGun>0</HeavyGun>
<fBurstOnlyByFanTheHammer>0</fBurstOnlyByFanTheHammer> <!-- any one-handed gun with this tag can access its burst mode only if the user is a gunslinger holding it in alternate aim mode (eye symbol on gun) -->
</WEAPON>
<WEAPON>
<uiIndex>1</uiIndex>
@@ -212,7 +213,6 @@
<sReloadSound>100</sReloadSound>
<sLocknLoadSound>106</sLocknLoadSound>
<SilencedSound>156</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -224,6 +224,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>13500</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>40</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>6</uiIndex>
@@ -247,7 +256,6 @@
<sReloadSound>100</sReloadSound>
<sLocknLoadSound>106</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -259,6 +267,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18000</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>65</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>7</uiIndex>
@@ -2057,7 +2074,6 @@
<sReloadSound>100</sReloadSound>
<sLocknLoadSound>106</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -2069,6 +2085,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18000</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>65</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>67</uiIndex>
@@ -7296,7 +7321,6 @@
<sReloadSound>100</sReloadSound>
<sLocknLoadSound>106</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>24</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -7308,6 +7332,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18750</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>75</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>708</uiIndex>
@@ -8383,7 +8416,6 @@
<sReloadSound>100</sReloadSound>
<sLocknLoadSound>106</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>24</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -8395,6 +8427,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18752</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>75</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>737</uiIndex>
@@ -9703,7 +9744,6 @@
<sReloadSound>100</sReloadSound>
<sLocknLoadSound>106</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -9715,6 +9755,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18750</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>110</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>5</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>8</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>772</uiIndex>
@@ -9737,7 +9786,6 @@
<sReloadSound>100</sReloadSound>
<sLocknLoadSound>106</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -9749,6 +9797,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18750</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>110</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>5</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>8</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>773</uiIndex>
@@ -10826,7 +10883,6 @@
<sReloadSound>99</sReloadSound>
<sLocknLoadSound>105</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -10838,6 +10894,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18750</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>75</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>888</uiIndex>
@@ -10861,7 +10926,6 @@
<sReloadSound>99</sReloadSound>
<sLocknLoadSound>105</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>18</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -10873,6 +10937,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18000</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>65</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>889</uiIndex>
@@ -11001,7 +11074,6 @@
<sReloadSound>99</sReloadSound>
<sLocknLoadSound>105</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -11013,6 +11085,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18750</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>75</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>893</uiIndex>
@@ -11036,7 +11117,6 @@
<sReloadSound>99</sReloadSound>
<sLocknLoadSound>105</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -11047,6 +11127,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18750</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>75</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>894</uiIndex>
@@ -11070,7 +11159,6 @@
<sReloadSound>99</sReloadSound>
<sLocknLoadSound>105</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -11082,6 +11170,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18000</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>65</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>896</uiIndex>
@@ -12786,7 +12883,6 @@
<sReloadSound>100</sReloadSound>
<sLocknLoadSound>106</sLocknLoadSound>
<SilencedSound>157</SilencedSound>
<bBurstAP>20</bBurstAP>
<APsToReload>20</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
@@ -12798,6 +12894,15 @@
<usOverheatingJamThreshold>20000</usOverheatingJamThreshold>
<usOverheatingDamageThreshold>18000</usOverheatingDamageThreshold>
<usOverheatingSingleShotTemperature>65</usOverheatingSingleShotTemperature>
<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
<ubShotsPerBurst>6</ubShotsPerBurst>
<ubBurstPenalty>8</ubBurstPenalty>
<BurstAniDelay>27</BurstAniDelay>
<sBurstSound>54</sBurstSound>
<sSilencedBurstSound>111</sSilencedBurstSound>
<bBurstAP>10</bBurstAP>
<bRecoilX>2</bRecoilX>
<bRecoilY>12</bRecoilY>
</WEAPON>
<WEAPON>
<uiIndex>1195</uiIndex>
gamedir/Data/Skills_Settings.INI
+8 -1
View File
@@ -278,6 +278,12 @@ RELOAD_SPEED_HANDGUNS_BONUS = 25
; restriction ON for this to make sense)
POSSIBLE_AIM_CLICK_ADDED_HANDGUNS = 1
; If set to true, revolvers (or any other gun with the <fBurstOnlyByFanTheHammer>-tag set in Weapons.xml) can access their hidden burst mode if
; - we have this trait
; - we use this gun with both hands
; - we are in hipfire mode (USE_SCOPE_MODES = TRUE in JA2_Options.ini, visible by the 'eye' icon over our gun)
CAN_FAN_THE_HAMMER = TRUE
; NOTE: This traits also gives access to the 'Focus' skill, description and values can be seen in the [Sniper] section of this file.
;******************************************************************************************************************************
@@ -749,10 +755,11 @@ COVERT_ELITES_UNCOVER_RADIUS = 6
; if set to TRUE, disguises will blow if you are bleeding and close to the enemy
COVERT_DETECTEDIFBLEEDING = FALSE
; THIS SETTING HAS BEEN DEACTIVATED UNTIL FURTHER NOTICE
; if set to TRUE, if a spy is uncovered, he will automatically strip his uniform
; if set to FALSE, if a spy is uncovered, he will not automatically strip his uniform,
; and redisguise automatically after 3 turns not seen by the enemy
COVERT_STRIPIFUNCOVERED = FALSE
; COVERT_STRIPIFUNCOVERED = FALSE
;******************************************************************************************************************************
;******************************************************************************************************************************
gamedir/Data/TableData/Items/Weapons.xml
+2313 -2312
View File
File diff suppressed because it is too large Load Diff