diff --git a/lua/acf/shared/guns/cannon.lua b/lua/acf/shared/guns/cannon.lua index acf252d8..8f247f2e 100644 --- a/lua/acf/shared/guns/cannon.lua +++ b/lua/acf/shared/guns/cannon.lua @@ -54,7 +54,7 @@ ACF_defineGun("75mmC", { caliber = 7.5, weight = 660, year = 1942, - maxrof = 25, -- maximum rounds per minute + maxrof = 24, -- maximum rounds per minute round = { maxlength = 78, propweight = 3.8 @@ -70,7 +70,7 @@ ACF_defineGun("85mmC", { caliber = 8.5, weight = 1030, year = 1944, - maxrof = 23, -- maximum rounds per minute + maxrof = 20, -- maximum rounds per minute round = { maxlength = 85.5, propweight = 6.65 @@ -86,7 +86,7 @@ ACF_defineGun("100mmC", { caliber = 10.0, weight = 1400, year = 1944, - maxrof = 19, -- maximum rounds per minute + maxrof = 15, -- maximum rounds per minute round = { maxlength = 93, propweight = 9.5 diff --git a/lua/acf/shared/guns/howitzer.lua b/lua/acf/shared/guns/howitzer.lua index a8ea0b5c..f72ac21d 100644 --- a/lua/acf/shared/guns/howitzer.lua +++ b/lua/acf/shared/guns/howitzer.lua @@ -6,6 +6,7 @@ ACF_defineGunClass("HW", { desc = ACFTranslation.GunClasses[8], muzzleflash = "120mm_muzzleflash_noscale", rofmod = 1.5, + maxrof = 20, -- maximum rounds per minute year = 1900, sound = "ace_weapons/multi_sound/howitzer_multi.mp3", @@ -18,8 +19,9 @@ ACF_defineGun("75mmHW", { --id model = "models/howitzer/howitzer_75mm.mdl", sound = "ace_weapons/multi_sound/howitzer_multi.mp3", gunclass = "HW", - caliber = 7.5, + caliber = 24, weight = 550, + maxrof = 20, -- maximum rounds per minute year = 1900, round = { maxlength = 60, @@ -35,6 +37,7 @@ ACF_defineGun("105mmHW", { gunclass = "HW", caliber = 10.5, weight = 980, + maxrof = 14, -- maximum rounds per minute year = 1900, round = { maxlength = 86, @@ -50,6 +53,7 @@ ACF_defineGun("122mmHW", { gunclass = "HW", caliber = 12.2, weight = 1450, + maxrof = 11, -- maximum rounds per minute year = 1900, round = { maxlength = 106, @@ -65,6 +69,7 @@ ACF_defineGun("155mmHW", { gunclass = "HW", caliber = 15.5, weight = 2100, + maxrof = 9, -- maximum rounds per minute year = 1900, round = { maxlength = 124, @@ -79,6 +84,7 @@ ACF_defineGun("203mmHW", { sound = "ace_weapons/multi_sound/howitzer_multi.mp3", gunclass = "HW", caliber = 20.3, + maxrof = 4, -- maximum rounds per minute weight = 3900, year = 1900, round = { @@ -96,6 +102,7 @@ ACF_defineGun("240mmHW", { gunclass = "HW", caliber = 24.0, weight = 8000, + maxrof = 3, -- maximum rounds per minute year = 1900, round = { maxlength = 192.0, @@ -111,6 +118,7 @@ ACF_defineGun("290mmHW", { gunclass = "HW", caliber = 29, weight = 26800, + maxrof = 2.1, -- maximum rounds per minute year = 1900, round = { maxlength = 360, @@ -126,6 +134,7 @@ ACF_defineGun("406mmHW", { gunclass = "HW", caliber = 40.6, weight = 50000, + maxrof = 1.5, -- maximum rounds per minute year = 1920, round = { maxlength = 540, diff --git a/lua/acf/shared/guns/mortar.lua b/lua/acf/shared/guns/mortar.lua index 6607bbfa..7a69795c 100644 --- a/lua/acf/shared/guns/mortar.lua +++ b/lua/acf/shared/guns/mortar.lua @@ -6,11 +6,29 @@ ACF_defineGunClass("MO", { desc = ACFTranslation.GunClasses[10], muzzleflash = "40mm_muzzleflash_noscale", rofmod = 2, + maxrof = 35, -- maximum rounds per minute year = 1915, sound = "ace_weapons/multi_sound/40mm_multi.mp3", } ) +ACF_defineGun("50mmM", { --id + name = "50mm Mortar", + desc = "The 50mm is an uncommon light mortar often seen at or before the begening of ww2, it fires a light 50mm rounds that is good for splatting infantry.", + model = "models/mortar/mortar_50mm.mdl", + sound = "ace_weapons/multi_sound/40mm_multi.mp3", + gunclass = "MO", + caliber = 5.0, + weight = 40, + rofmod = 1.25, + maxrof = 50, -- maximum rounds per minute + year = 1930, + round = { + maxlength = 25, + propweight = 0.03 + } +} ) + ACF_defineGun("60mmM", { --id name = "60mm Mortar", desc = "The 60mm is a common light infantry support weapon, with a high rate of fire but a puny payload.", @@ -20,6 +38,7 @@ ACF_defineGun("60mmM", { --id caliber = 6.0, weight = 80, rofmod = 1.25, + maxrof = 35, -- maximum rounds per minute year = 1930, round = { maxlength = 30, @@ -35,6 +54,7 @@ ACF_defineGun("80mmM", { gunclass = "MO", caliber = 8.0, weight = 210, + maxrof = 27, -- maximum rounds per minute year = 1915, round = { maxlength = 38, @@ -50,6 +70,7 @@ ACF_defineGun("120mmM", { gunclass = "MO", caliber = 12.0, weight = 440, + maxrof = 16, -- maximum rounds per minute year = 1935, round = { maxlength = 45, @@ -65,6 +86,7 @@ ACF_defineGun("150mmM", { gunclass = "MO", caliber = 15.0, weight = 680, + maxrof = 9, -- maximum rounds per minute year = 1945, round = { maxlength = 60, @@ -80,6 +102,7 @@ ACF_defineGun("200mmM", { gunclass = "MO", caliber = 20.0, weight = 980, + maxrof = 5, -- maximum rounds per minute year = 1940, round = { maxlength = 90, @@ -87,22 +110,6 @@ ACF_defineGun("200mmM", { } } ) -ACF_defineGun("50mmM", { --id - name = "50mm Mortar", - desc = "The 50mm is an uncommon light mortar often seen at or before the begening of ww2, it fires a light 50mm rounds that is good for splatting infantry.", - model = "models/mortar/mortar_50mm.mdl", - sound = "ace_weapons/multi_sound/40mm_multi.mp3", - gunclass = "MO", - caliber = 5.0, - weight = 40, - rofmod = 1.25, - year = 1930, - round = { - maxlength = 25, - propweight = 0.03 - } -} ) - ACF_defineGun("280mmM", { name = "280mm Mortar", desc = "Massive payload, with a reload time to match. Found in rare WW2 siege artillery pieces. It's the perfect size for a jeep.", @@ -111,6 +118,7 @@ ACF_defineGun("280mmM", { gunclass = "MO", caliber = 28.0, weight = 2000, + maxrof = 2.3, -- maximum rounds per minute year = 1945, round = { maxlength = 150, @@ -126,6 +134,7 @@ ACF_defineGun("380mmM", { gunclass = "MO", caliber = 38.0, weight = 5000, + maxrof = 2, -- maximum rounds per minute year = 1941, round = { maxlength = 180, diff --git a/lua/acf/shared/guns/shortcannon.lua b/lua/acf/shared/guns/shortcannon.lua index 35615fef..71a98527 100644 --- a/lua/acf/shared/guns/shortcannon.lua +++ b/lua/acf/shared/guns/shortcannon.lua @@ -21,7 +21,8 @@ ACF_defineGun("37mmSC", { gunclass = "SC", caliber = 3.7, weight = 55, - rofmod = 1.4, + rofmod = 45, + maxrof = 40, -- maximum rounds per minute year = 1915, round = { maxlength = 45, @@ -37,6 +38,7 @@ ACF_defineGun("50mmSC", { gunclass = "SC", caliber = 5.0, weight = 300, + maxrof = 37, -- maximum rounds per minute year = 1915, round = { maxlength = 63, @@ -52,6 +54,7 @@ ACF_defineGun("75mmSC", { gunclass = "SC", caliber = 7.5, weight = 480, + maxrof = 25, -- maximum rounds per minute year = 1936, round = { maxlength = 76, @@ -66,6 +69,7 @@ ACF_defineGun("85mmSC", { gunclass = "SC", caliber = 8.5, weight = 1250, + maxrof = 23, -- maximum rounds per minute year = 1942, round = { maxlength = 84.5, @@ -81,6 +85,7 @@ ACF_defineGun("100mmSC", { gunclass = "SC", caliber = 10.0, weight = 1000, + maxrof = 18, -- maximum rounds per minute year = 1940, round = { maxlength = 93, @@ -96,6 +101,7 @@ ACF_defineGun("120mmSC", { gunclass = "SC", caliber = 12.0, weight = 1400, + maxrof = 13, -- maximum rounds per minute year = 1944, round = { maxlength = 110, @@ -111,6 +117,7 @@ ACF_defineGun("140mmSC", { gunclass = "SC", caliber = 14.0, weight = 2050, + maxrof = 9, -- maximum rounds per minute year = 1999, round = { maxlength = 127, @@ -126,6 +133,7 @@ ACF_defineGun("170mmSC", { gunclass = "SC", caliber = 17.0, weight = 3200, + maxrof = 6.7, -- maximum rounds per minute year = 1999, round = { maxlength = 147, diff --git a/lua/acf/shared/guns/smoothcannon.lua b/lua/acf/shared/guns/smoothcannon.lua index 3576f16b..eaedbc5d 100644 --- a/lua/acf/shared/guns/smoothcannon.lua +++ b/lua/acf/shared/guns/smoothcannon.lua @@ -6,6 +6,7 @@ ACF_defineGunClass("SBC", { desc = ACFTranslation.GunClasses[15], muzzleflash = "120mm_muzzleflash_noscale", rofmod = 1.7, + maxrof = 20, -- maximum rounds per minute sound = "ace_weapons/multi_sound/120mm_multi.mp3", year = 1960, @@ -21,6 +22,7 @@ ACF_defineGun("50mmSBC", { gunclass = "SBC", caliber = 5.0, weight = 650, + maxrof = 35, -- maximum rounds per minute year = 1965, round = { maxlength = 63, @@ -36,6 +38,7 @@ ACF_defineGun("75mmSBC", { gunclass = "SBC", caliber = 7.5, weight = 900, + maxrof = 24, -- maximum rounds per minute year = 1960, round = { maxlength = 78, @@ -51,6 +54,7 @@ ACF_defineGun("100mmSBC", { gunclass = "SBC", caliber = 10.0, weight = 1700, + maxrof = 15, -- maximum rounds per minute year = 1960, round = { maxlength = 93, @@ -66,6 +70,7 @@ ACF_defineGun("120mmSBC", { gunclass = "SBC", caliber = 12.0, weight = 3200, + maxrof = 12, -- maximum rounds per minute year = 1970, round = { maxlength = 115, @@ -81,6 +86,7 @@ ACF_defineGun("140mmSBC", { gunclass = "SBC", caliber = 14.0, weight = 4300, + maxrof = 8.5, -- maximum rounds per minute year = 1995, round = { maxlength = 140, @@ -97,6 +103,7 @@ ACF_defineGun("170mmSBC", { gunclass = "SBC", caliber = 17.0, weight = 12350, + maxrof = 4, -- maximum rounds per minute year = 1990, round = { maxlength = 180,