Merge pull request #96 from KemGus/master

Bunch of improvements

lua/acf/shared/guns/atrifle.lua

@@ -16,7 +16,7 @@ ACF_defineGun("7.92mmATR", { --id
 	name = "7.92mm Anti Tank Rifle",
 	desc = "The 7.92 Anti Tank Rifle is somone's desperate attempt to fend off hordes of tracked beasts in the trenches",
 	model = "models/machinegun/machinegun_762mm.mdl",
-	sound = "acf_extra/tankfx/gnomefather/7mm1.wav",
+	sound = "ace_weapons/multi_sound/7_62mm_multi.mp3",
 	gunclass = "ATR",
 	caliber = 0.792,
 	weight = 8,
@@ -34,7 +34,7 @@ ACF_defineGun("14.5mmATR", { --id
 	name = "14.5mm Anti Tank Rifle",
 	desc = "Commonly used by soviets as a budget way to kill tanks, still worthless.",
 	model = "models/machinegun/machinegun_145mm.mdl",
-	sound = "acf_extra/tankfx/gnomefather/7mm1.wav",
+	sound = "ace_weapons/multi_sound/12_7mm_multi.mp3",
 	gunclass = "ATR",
 	caliber = 1.45,
 	weight = 15,
@@ -52,7 +52,7 @@ ACF_defineGun("20mmATR", { --id
 	name = "20mm Anti Tank Rifle",
 	desc = "Collosal anti tank rifle, good for putting a hole through side armor at point blank, that is if you can carry it.",
 	model = "models/machinegun/machinegun_20mm.mdl",
-	sound = "acf_extra/tankfx/gnomefather/7mm1.wav",
+	sound = "ace_weapons/sweps/multi_sound/amr_multi.mp3",
 	gunclass = "ATR",
 	caliber = 2.0,
 	weight = 23,

lua/acf/shared/guns/grenadelauncher.lua

@@ -18,7 +18,7 @@ ACF_defineGun("40mmGL", { --id
 	name = "40mm Grenade Launcher",
 	desc = "The 40mm chews up infantry but is about as useful as tits on a nun for fighting armor.  Often found on 4x4s rolling through the third world.",
 	model = "models/launcher/40mmgl.mdl",
-	sound = "weapons/acf_gun/grenadelauncher.wav",
+	sound = "ace_weapons/multi_sound/30mm_hmg_multi.mp3",
 	gunclass = "GL",
 	caliber = 4.0,
 	weight = 55,
@@ -35,7 +35,7 @@ ACF_defineGun("20mmGL", { --id
 	name = "20mm Grenade Launcher",
 	desc = "The 20mm is the embodyment of wimpy weapons, although it has a large clip and can fire HE it is bloody weak							using 40mm GL as placeholder bc the 20mm mini is borked",
 	model = "models/launcher/20mmgl.mdl",
-	sound = "weapons/acf_gun/grenadelauncher.wav",
+	sound = "ace_weapons/multi_sound/12_7mm_multi.mp3",
 	gunclass = "GL",
 	caliber = 3.01,
 	weight = 10,
@@ -52,7 +52,7 @@ ACF_defineGun("40mmGLSingle", { --id
 	name = "40mm Single Grenade Launcher",
 	desc = "The 40mm grenade projecter excels at launching a small 40mm charge at nearby infantry or defending a tank from an incoming rocket.",
 	model = "models/launcher/40mmsl.mdl",
-	sound = "weapons/acf_gun/grenadelauncher.wav",
+	sound = "ace_weapons/multi_sound/smoke_multi.mp3",
 	gunclass = "GL",
 	caliber = 4.0,
 	weight = 5,

lua/acf/shared/guns/mortar.lua

@@ -15,7 +15,7 @@ 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.",
 	model = "models/mortar/mortar_60mm.mdl",
-	sound = "weapons/ACF_Gun/mortar_new.wav",
+	sound = "ace_weapons/multi_sound/40mm_multi.mp3",
 	gunclass = "MO",
 	caliber = 6.0,
 	weight = 80,
@@ -31,7 +31,7 @@ ACF_defineGun("80mmM", {
 	name = "80mm Mortar",
 	desc = "The 80mm is a common infantry support weapon, with a good bit more boom than its little cousin.",
 	model = "models/mortar/mortar_80mm.mdl",
-	sound = "weapons/ACF_Gun/mortar_new.wav",
+	sound = "ace_weapons/multi_sound/40mm_multi.mp3",
 	gunclass = "MO",
 	caliber = 8.0,
 	weight = 210,
@@ -46,7 +46,7 @@ ACF_defineGun("120mmM", {
 	name = "120mm Mortar",
 	desc = "The versatile 120 is sometimes vehicle-mounted to provide quick boomsplat to support the infantry.  Carries more boom in its boomsplat, has good HEAT performance, and is more accurate in high-angle firing.",
 	model = "models/mortar/mortar_120mm.mdl",
-	sound = "weapons/ACF_Gun/mortar_new.wav",
+	sound = "ace_weapons/multi_sound/40mm_multi.mp3",
 	gunclass = "MO",
 	caliber = 12.0,
 	weight = 440,
@@ -61,7 +61,7 @@ ACF_defineGun("150mmM", {
 	name = "150mm Mortar",
 	desc = "The perfect balance between the 120mm and the 200mm. Can prove a worthy main gun weapon, as well as a mighty good mortar emplacement",
 	model = "models/mortar/mortar_150mm.mdl",
-	sound = "weapons/ACF_Gun/mortar_new.wav",
+	sound = "ace_weapons/multi_sound/40mm_multi.mp3",
 	gunclass = "MO",
 	caliber = 15.0,
 	weight = 680,
@@ -76,7 +76,7 @@ ACF_defineGun("200mmM", {
 	name = "200mm Mortar",
 	desc = "The 200mm is a beast, often used against fortifications.  Though enormously powerful, feel free to take a nap while it reloads",
 	model = "models/mortar/mortar_200mm.mdl",
-	sound = "weapons/ACF_Gun/mortar_new.wav",
+	sound = "ace_weapons/multi_sound/40mm_multi.mp3",
 	gunclass = "MO",
 	caliber = 20.0,
 	weight = 980,
@@ -91,7 +91,7 @@ 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 = "weapons/ACF_Gun/mortar_new.wav",
+	sound = "ace_weapons/multi_sound/40mm_multi.mp3",
 	gunclass = "MO",
 	caliber = 5.0,
 	weight = 40,
@@ -107,7 +107,7 @@ 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.",
 	model = "models/mortar/mortar_280mm.mdl",
-	sound = "weapons/ACF_Gun/mortar_new.wav",
+	sound = "ace_weapons/multi_sound/howitzer_multi.mp3",
 	gunclass = "MO",
 	caliber = 28.0,
 	weight = 2000,
@@ -122,7 +122,7 @@ ACF_defineGun("380mmM", {
 	name = "380mm Mortar",
 	desc = "Massive payload, with a reload time to match. Found in rare WW2 siege artillery pieces.",
 	model = "models/mortar/mortar_300mm.mdl",
-	sound = "weapons/ACF_Gun/mortar_new.wav",
+	sound = "ace_weapons/multi_sound/howitzer_multi.mp3",
 	gunclass = "MO",
 	caliber = 38.0,
 	weight = 5000,

lua/acf/shared/guns/rotaryautocannon.lua

@@ -17,7 +17,7 @@ ACF_defineGun("14.5mmRAC", { --id
 	name = "14.5mm Rotary Autocannon",
 	desc = "A lightweight rotary autocannon, a great support weapon for effortlessly shredding infantry and technicals alike.",
 	model = "models/rotarycannon/kw/14_5mmrac.mdl",
-	sound = "weapons/acf_gun/mg_fire2.wav",
+	sound = "ace_weapons/multi_sound/12_7mm_multi.mp3",
 	gunclass = "RAC",
 	caliber = 1.45,
 	weight = 160,
@@ -33,7 +33,7 @@ ACF_defineGun("20mmRAC", {
 	name = "20mm Rotary Autocannon",
 	desc = "The 20mm is able to chew up light armor with decent penetration or put up a big flak screen. Typically mounted on ground attack aircraft, SPAAGs and the ocassional APC.",
 	model = "models/rotarycannon/kw/20mmrac.mdl",
-	sound = "weapons/acf_gun/mg_fire2.wav",
+	sound = "ace_weapons/multi_sound/20mm_hmg_multi.mp3",
 	gunclass = "RAC",
 	caliber = 2.0,
 	weight = 420,
@@ -49,7 +49,7 @@ ACF_defineGun("30mmRAC", {
 	name = "30mm Rotary Autocannon",
 	desc = "The 30mm is the bane of ground-attack aircraft, able to tear up light armor without giving one single fuck.  Also seen in the skies above dead T-72s.",
 	model = "models/rotarycannon/kw/30mmrac.mdl",
-	sound = "weapons/acf_gun/mg_fire2.wav",
+	sound = "ace_weapons/multi_sound/30mm_hmg_multi.mp3",
 	gunclass = "RAC",
 	caliber = 3.0,
 	weight = 610,

lua/acf/shared/guns/semiauto.lua

@@ -17,7 +17,7 @@ ACF_defineGun("25mmSA", { --id
 	name = "25mm Semiautomatic Cannon",
 	desc = "The 25mm semiauto can quickly put five rounds downrange, being lethal, yet light.",
 	model = "models/autocannon/semiautocannon_25mm.mdl",
-	sound = "acf_extra/tankfx/gnomefather/25mm1.wav",
+	sound = "ace_weapons/multi_sound/20mm_multi.mp3",
 	gunclass = "SA",
 	caliber = 2.5,
 	weight = 75,
@@ -35,7 +35,7 @@ ACF_defineGun("37mmSA", {
 	name = "37mm Semiautomatic Cannon",
 	desc = "The 37mm is surprisingly powerful, its five-round clips boasting a respectable payload and a high muzzle velocity.",
 	model = "models/autocannon/semiautocannon_37mm.mdl",
-	sound = "acf_extra/tankfx/gnomefather/25mm1.wav",
+	sound = "ace_weapons/multi_sound/30mm_multi.mp3",
 	gunclass = "SA",
 	caliber = 3.7,
 	weight = 180,
@@ -53,7 +53,7 @@ ACF_defineGun("45mmSA", { --
 	name = "45mm Semiautomatic Cannon",
 	desc = "The 45mm can easily shred light armor, with a respectable rate of fire, but its armor penetration pales in comparison to regular cannons.",
 	model = "models/autocannon/semiautocannon_45mm.mdl",
-	sound = "acf_extra/tankfx/gnomefather/25mm1.wav",
+	sound = "ace_weapons/multi_sound/40mm_multi.mp3",
 	gunclass = "SA",
 	caliber = 4.5,
 	weight = 495,
@@ -71,7 +71,7 @@ ACF_defineGun("57mmSA", {
 	name = "57mm Semiautomatic Cannon",
 	desc = "The 57mm is a respectable light armament, offering considerable penetration and moderate fire rate.",
 	model = "models/autocannon/semiautocannon_57mm.mdl",
-	sound = "acf_extra/tankfx/gnomefather/25mm1.wav",
+	sound = "ace_weapons/multi_sound/50mm_multi.mp3",
 	gunclass = "SA",
 	caliber = 5.7,
 	weight = 780,
@@ -89,7 +89,7 @@ ACF_defineGun("76mmSA", {
 	name = "76mm Semiautomatic Cannon",
 	desc = "The 76mm semiauto is a fearsome weapon, able to put 12 76mm rounds downrange in 7 seconds.",
 	model = "models/autocannon/semiautocannon_76mm.mdl",
-	sound = "acf_extra/tankfx/gnomefather/25mm1.wav",
+	sound = "ace_weapons/multi_sound/75mm_multi.mp3",
 	gunclass = "SA",
 	caliber = 7.62,
 	weight = 1700,

lua/entities/ace_flare/cl_init.lua

@@ -19,7 +19,7 @@ function ENT:Draw()
 
 	if CurTime() > self.LightUpdate and not self.StopLight then
 		self.LightUpdate = CurTime() + 0.05
-		ACF_RenderLight(self:EntIndex(), 1000, Color(255, 128, 48), self:GetPos())
+		ACF_RenderLight(self:EntIndex(), 20000, Color(194, 145, 39), self:GetPos())
 	end
 end