diff --git a/.github/workflows/GLuaLint.yml b/.github/workflows/GLuaLint.yml index 03eb1fd3..5c1d6d43 100644 --- a/.github/workflows/GLuaLint.yml +++ b/.github/workflows/GLuaLint.yml @@ -4,12 +4,14 @@ on: push: paths: - 'lua/**' + - '!lua/entities/gmod_wire_expression2/**' pull_request: paths: - 'lua/**' + - '!lua/entities/gmod_wire_expression2/**' jobs: Lint: uses: FPtje/GLuaFixer/.github/workflows/glualint.yml@master with: - config: "./.glualint.json" + config: "./.glualint.json" \ No newline at end of file diff --git a/.glualint.json b/.glualint.json index 08dd758e..b6987ce1 100644 --- a/.glualint.json +++ b/.glualint.json @@ -7,8 +7,9 @@ "lint_whitespaceStyle": true, "lint_beginnerMistakes": true, "lint_emptyBlocks": true, - "lint_shadowing": true, + "lint_shadowing": false, "lint_gotos": true, + "lint_goto_identifier": true, "lint_doubleNegations": true, "lint_redundantIfStatements": true, "lint_redundantParentheses": true, @@ -17,8 +18,20 @@ "lint_unusedVars": true, "lint_unusedParameters": true, "lint_unusedLoopVars": true, - "lint_ignoreFiles": [], + "lint_inconsistentVariableStyle": false, + "lint_spaceBetweenParens": false, + "lint_spaceBetweenBrackets": false, + "lint_spaceBetweenBraces": false, + "lint_ignoreFiles": ["lua/entities/gmod_wire_expression2/core/custom/*.lua"], + "lint_spaceBeforeComma": false, + "lint_spaceAfterComma": true, + "lint_maxLineLength": 0, + "prettyprint_spaceBetweenParens": false, + "prettyprint_spaceBetweenBrackets": false, + "prettyprint_spaceBetweenBraces": false, + "prettyprint_spaceEmptyParens": false, + "prettyprint_spaceEmptyBraces": false, "prettyprint_spaceAfterParens": false, "prettyprint_spaceAfterBrackets": false, "prettyprint_spaceAfterBraces": false, @@ -27,7 +40,10 @@ "prettyprint_spaceAfterComma": true, "prettyprint_semicolons": false, "prettyprint_cStyle": false, + "prettyprint_removeRedundantParens": true, + "prettyprint_minimizeParens": false, + "prettyprint_assumeOperatorAssociativity": true, "prettyprint_rejectInvalidCode": false, "prettyprint_indentation": "\t", "log_format": "auto" -} \ No newline at end of file +} diff --git a/lua/acf/entities/ammo_types/glatgm.lua b/lua/acf/entities/ammo_types/glatgm.lua index b3d04b3a..91710c64 100644 --- a/lua/acf/entities/ammo_types/glatgm.lua +++ b/lua/acf/entities/ammo_types/glatgm.lua @@ -1,5 +1,6 @@ local ACF = ACF local AmmoTypes = ACF.Classes.AmmoTypes +local Effects = ACF.Utilities.Effects local Ammo = AmmoTypes.Register("GLATGM", "HEATFS") function Ammo:OnLoaded() @@ -60,38 +61,35 @@ if SERVER then end function Ammo:HEATExplosionEffect(Bullet, Pos) - local Data = EffectData() - Data:SetOrigin(Pos) - Data:SetNormal(Bullet.Flight:GetNormalized()) - Data:SetRadius(math.max(Bullet.FillerMass ^ 0.33 * 8 * 39.37, 1)) + local EffectTable = { + Origin = Pos, + Normal = Bullet.Flight:GetNormalized(), + Radius = math.max(Bullet.FillerMass ^ 0.33 * 8 * 39.37, 1), + } - util.Effect("ACF_GLATGMExplosion", Data) + Effects.CreateEffect("ACF_GLATGMExplosion", EffectTable) end else ACF.RegisterAmmoDecal("GLATGM", "damage/heat_pen", "damage/heat_rico", function(Caliber) return Caliber * 0.1667 end) function Ammo:PenetrationEffect(Effect, Bullet) - local Data = EffectData() - - if Bullet.Detonated then - Data:SetOrigin(Bullet.SimPos) - Data:SetNormal(Bullet.SimFlight:GetNormalized()) - Data:SetScale(Bullet.SimFlight:Length()) - Data:SetMagnitude(Bullet.RoundMass) - Data:SetRadius(Bullet.Caliber) - Data:SetDamageType(DecalIndex(Bullet.AmmoType)) - - util.Effect("ACF_Penetration", Data) - else - local BoomFillerMass = Bullet.FillerMass * ACF.HEATBoomConvert - - Data:SetOrigin(Bullet.SimPos) - Data:SetNormal(Bullet.SimFlight:GetNormalized()) - Data:SetScale(math.max(BoomFillerMass ^ 0.33 * 3 * 39.37, 1)) - Data:SetRadius(Bullet.Caliber) - - util.Effect("ACF_GLATGMExplosion", Data) - + local Detonated = Bullet.Detonated + local EffectName = Detonated and "ACF_Penetration" or "ACF_GLATGMExplosion" + local BoomFillerMass = Bullet.FillerMass * ACF.HEATBoomConvert + local Scale = Detonated and Bullet.SimFlight:Length() or math.max(BoomFillerMass ^ 0.33 * 3 * 39.37, 1) + + local EffectTable = { + Origin = Bullet.SimPos, + Normal = Bullet.SimFlight:GetNormalized(), + Radius = Bullet.Caliber, + Scale = Scale, + Magnitude = Detonated and Bullet.RoundMass or nil, + DamageType = Detonated and DecalIndex(Bullet.AmmoType) or nil, + } + + Effects.CreateEffect(EffectName, EffectTable) + + if not Detonated then Bullet.Detonated = true Effect:SetModel("models/Gibs/wood_gib01e.mdl") diff --git a/lua/entities/acf_glatgm/init.lua b/lua/entities/acf_glatgm/init.lua index 7f70cef6..3f86dcbd 100644 --- a/lua/entities/acf_glatgm/init.lua +++ b/lua/entities/acf_glatgm/init.lua @@ -101,7 +101,7 @@ function MakeACF_GLATGM(Gun, BulletData) Entity.SpiralAngle = Entity.IsSubcaliber and 0 or nil Entity.Position = BulletData.Pos Entity.Velocity = BulletData.Flight:GetNormalized() * Entity.LaunchVel - Entity.Innacuracy = 0 + Entity.Inaccuracy = 0 Entity.Filter[#Entity.Filter + 1] = Entity @@ -124,9 +124,9 @@ end function ENT:ACF_Activate(Recalc) local PhysObj = self.ACF.PhysObj - local Area = PhysObj:GetSurfaceArea() + local Area = PhysObj:GetSurfaceArea() * ACF.InchToCmSq local Armor = self.ForcedArmor - local Health = self.Caliber * 2 + local Health = Area / ACF.Threshold local Percent = 1 if Recalc and self.ACF.Health and self.ACF.MaxHealth then @@ -228,21 +228,21 @@ function ENT:Think() NextAng = WorldAng NextDir = WorldAng:Forward() - self.Innacuracy = 0 + self.Inaccuracy = 0 else - local Spread = self.Innacuracy * DeltaTime * 0.005 + local Spread = self.Inaccuracy * DeltaTime * 0.005 local Added = VectorRand() * Spread NextDir = (self.Velocity:GetNormalized() + Added):GetNormalized() NextAng = NextDir:Angle() - self.Innacuracy = self.Innacuracy + DeltaTime * 50 + self.Inaccuracy = self.Inaccuracy + DeltaTime * 50 end if self.IsSubcaliber then local Current = self.SpiralAngle local SpiralRad = self.SpiralRadius - NextAng:RotateAroundAxis(NextAng:Forward(),Current) + NextAng:RotateAroundAxis(NextAng:Forward(), Current) local Offset = NextDir * self.Speed * DeltaTime + NextAng:Up() * math.sin(Current) * SpiralRad + NextAng:Right() * math.cos(Current) * SpiralRad diff --git a/lua/entities/acf_missile/init.lua b/lua/entities/acf_missile/init.lua index 52544fa9..e9fa7ee4 100644 --- a/lua/entities/acf_missile/init.lua +++ b/lua/entities/acf_missile/init.lua @@ -659,9 +659,9 @@ end function ENT:ACF_Activate(Recalc) local PhysObj = self.ACF.PhysObj - local Area = PhysObj:GetSurfaceArea() + local Area = PhysObj:GetSurfaceArea() * ACF.InchToCmSq local Armor = self.ForcedArmor - local Health = self.Caliber + local Health = Area / ACF.Threshold local Percent = 1 if Recalc and self.ACF.Health and self.ACF.MaxHealth then diff --git a/lua/entities/acf_rack/init.lua b/lua/entities/acf_rack/init.lua index eb92bdcb..4e8438d9 100644 --- a/lua/entities/acf_rack/init.lua +++ b/lua/entities/acf_rack/init.lua @@ -5,14 +5,14 @@ include("shared.lua") -- Local Vars ----------------------------------- -local EMPTY = { Type = "Empty", PropMass = 0, ProjMass = 0, Tracer = 0 } -local hook = hook -local ACF = ACF -local Contraption = ACF.Contraption -local Classes = ACF.Classes -local Utilities = ACF.Utilities -local Clock = Utilities.Clock -local Sounds = Utilities.Sounds +local EMPTY = { Type = "Empty", PropMass = 0, ProjMass = 0, Tracer = 0 } +local HookRun = hook.Run +local ACF = ACF +local Contraption = ACF.Contraption +local Classes = ACF.Classes +local Utilities = ACF.Utilities +local Clock = Utilities.Clock +local Sounds = Utilities.Sounds local MaxDistance = ACF.LinkDistance * ACF.LinkDistance local UnlinkSound = "physics/metal/metal_box_impact_bullet%s.wav" @@ -110,6 +110,7 @@ do -- Spawning and Updating -------------------- Entity.ShortName = Rack.ID Entity.EntType = Rack.EntType Entity.RackData = Rack + Entity.Class = Rack.ID Entity.Caliber = Rack.Caliber or 0 Entity.MagSize = Rack.MagSize or 1 Entity.ForcedIndex = Entity.ForcedIndex and math.max(Entity.ForcedIndex, Entity.MagSize) @@ -306,20 +307,22 @@ end --------------------------------------------- do -- Custom ACF damage ------------------------ local Damage = ACF.Damage + local Effects = ACF.Utilities.Effects local SparkSound = "ambient/energy/spark%s.wav" local function ShowDamage(Rack, Point) local Position = Rack:LocalToWorld(Point.Position) - local Effect = EffectData() - Effect:SetMagnitude(math.Rand(0.5, 1)) - Effect:SetRadius(1) - Effect:SetScale(1) - Effect:SetStart(Position) - Effect:SetOrigin(Position) - Effect:SetNormal(VectorRand()) + local EffectTable = { + Magnitude = math.Rand(0.5, 1), + Radius = 1, + Scale = 1, + Start = Position, + Origin = Position, + Normal = VectorRand(), + } - util.Effect("Sparks", Effect, true, true) + Effects.CreateEffect("Sparks", EffectTable, true, true) Sounds.SendSound(Rack, SparkSound:format(math.random(6)), math.random(55, 65), math.random(99, 101), 1) @@ -413,7 +416,13 @@ do -- Entity Link/Unlink ----------------------- Weapon:UpdateOverlay() Target:UpdateOverlay() - UpdateTotalAmmo(Weapon) + if Weapon.State == "Empty" then -- When linked to an empty weapon, attempt to load it + timer.Simple(0.5, function() -- Delay by 500ms just in case the wiring isn't applied at the same time or whatever weird dupe shit happens + if IsValid(Weapon) and IsValid(Target) and Weapon.State == "Empty" and Target:CanConsume() then + Weapon:Reload() + end + end) + end return true, "Rack linked successfully." end) @@ -430,8 +439,6 @@ do -- Entity Link/Unlink ----------------------- Weapon:UpdateOverlay() Target:UpdateOverlay() - UpdateTotalAmmo(Weapon) - return true, "Weapon unlinked successfully." end @@ -457,9 +464,7 @@ do -- Entity Inputs ---------------------------- Entity.Reloading = tobool(Value) - if Entity:CanReload() then - Entity:Reload() - end + Entity:Reload() end) ACF.AddInputAction("acf_rack", "Unload", function(Entity, Value) @@ -574,6 +579,12 @@ do -- Firing ----------------------------------- end end) end + + timer.Simple(1, function() + if not IsValid(self) then return end + + self:Reload() + end) end end --------------------------------------------- @@ -624,14 +635,17 @@ do -- Loading ---------------------------------- function ENT:CanReload() if self.RetryReload then return false end - if not self.Reloading then return false end if not ACF.RacksCanFire then return false end + if self.Disabled then return false end + if self.MagSize == self.CurrentShot then return false end return true end -- TODO: Once Unloading gets implemented, racks have to unload missiles if no empty mountpoint is found. function ENT:Reload() + if not self:CanReload() then return end + local Index, Point = self:GetNextMountPoint("Empty") local Crate = GetNextCrate(self) @@ -678,9 +692,7 @@ do -- Loading ---------------------------------- self.RetryReload = nil - if self:CanReload() then - self:Reload() - end + self:Reload() end) end end --------------------------------------------- @@ -763,7 +775,8 @@ end --------------------------------------------- do -- Overlay/networking util.AddNetworkString("ACF.RequestRackInfo") - net.Receive("ACF.RequestRackInfo",function(_,Ply) + + net.Receive("ACF.RequestRackInfo", function(_, Ply) local Rack = net.ReadEntity() if not IsValid(Rack) then return end @@ -817,9 +830,7 @@ do -- Misc ------------------------------------- self:Shoot() end - if self:CanReload() then - self:Reload() - end + self:Reload() end function ENT:Disable() @@ -834,6 +845,8 @@ do -- Misc ------------------------------------- WireLib.TriggerOutput(self, "Status", State) WireLib.TriggerOutput(self, "Ready", State == "Loaded" and 1 or 0) + + UpdateTotalAmmo(self) end function ENT:GetNextMountPoint(State, CustomStart) diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_exp.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_base_exp.vtf deleted file mode 100644 index b57097c4..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_base_exp.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_n.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_base_n.vtf deleted file mode 100644 index c052aee1..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_base_n.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_od.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_base_od.vmt deleted file mode 100644 index 486ccaed..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_base_od.vmt +++ /dev/null @@ -1,26 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Base_OD_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Base_N" - "$halflambert" "1" - "$nocull" 1 - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .05 .05 .05 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Base_Exp" - "$phongboost" "0.1" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_c.vtf deleted file mode 100644 index 87134d55..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_d.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_d.vmt deleted file mode 100644 index 6e1deee7..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_d.vmt +++ /dev/null @@ -1,22 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Base_OD_D_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Base_N" - "$halflambert" "1" - "$nocull" 1 - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .05 .05 .05 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Base_Exp" - "$phongboost" "0.1" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_d_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_d_c.vtf deleted file mode 100644 index b8662efe..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_base_od_d_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan.vmt deleted file mode 100644 index 52040e97..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan.vmt +++ /dev/null @@ -1,26 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Base_Tan_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Base_N" - "$halflambert" "1" - "$nocull" 1 - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .05 .05 .05 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Base_Exp" - "$phongboost" "0.1" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_c.vtf deleted file mode 100644 index 09034852..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_d.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_d.vmt deleted file mode 100644 index c650bdf5..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_d.vmt +++ /dev/null @@ -1,22 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Base_Tan_D_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Base_N" - "$halflambert" "1" - "$nocull" 1 - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .05 .05 .05 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Base_Exp" - "$phongboost" "0.1" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_d_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_d_c.vtf deleted file mode 100644 index 2031adb1..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_base_tan_d_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a.vmt deleted file mode 100644 index 49f52d2c..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a.vmt +++ /dev/null @@ -1,25 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_N" - "$halflambert" "1" - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .1 .1 .1 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_Exp" - "$phongboost" "0.6" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a_exp.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a_exp.vtf deleted file mode 100644 index 6e33e362..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a_exp.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a_n.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a_n.vtf deleted file mode 100644 index 777c27c7..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_a_n.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b.vmt deleted file mode 100644 index 8f04763e..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b.vmt +++ /dev/null @@ -1,25 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_N" - "$halflambert" "1" - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .1 .1 .1 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_Exp" - "$phongboost" "0.8" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b_exp.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b_exp.vtf deleted file mode 100644 index 83b814b7..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b_exp.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b_n.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b_n.vtf deleted file mode 100644 index c2410a01..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_b_n.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_a.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_a.vmt deleted file mode 100644 index 08a2bf7c..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_a.vmt +++ /dev/null @@ -1,25 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_OD_A_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_N" - "$halflambert" "1" - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .1 .1 .1 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_Exp" - "$phongboost" "0.2" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_a_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_a_c.vtf deleted file mode 100644 index 4d7b3834..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_a_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_b.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_b.vmt deleted file mode 100644 index aae4d55f..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_b.vmt +++ /dev/null @@ -1,25 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_OD_B_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_N" - "$halflambert" "1" - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .1 .1 .1 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_Exp" - "$phongboost" "0.2" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_b_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_b_c.vtf deleted file mode 100644 index 75211a97..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_od_b_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_a.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_a.vmt deleted file mode 100644 index 87329787..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_a.vmt +++ /dev/null @@ -1,25 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_Silv_A_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_N" - "$halflambert" "1" - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .1 .1 .1 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_Exp" - "$phongboost" "0.2" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_a_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_a_c.vtf deleted file mode 100644 index 7781cb1c..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_a_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_b.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_b.vmt deleted file mode 100644 index aaebd9ec..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_b.vmt +++ /dev/null @@ -1,25 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_Silv_B_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_N" - "$halflambert" "1" - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .1 .1 .1 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_Exp" - "$phongboost" "0.2" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_b_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_b_c.vtf deleted file mode 100644 index 2c4b92cf..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_silv_b_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_a.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_a.vmt deleted file mode 100644 index 559f985d..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_a.vmt +++ /dev/null @@ -1,25 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_Tan_A_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_N" - "$halflambert" "1" - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .1 .1 .1 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_A_Exp" - "$phongboost" "0.2" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_a_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_a_c.vtf deleted file mode 100644 index 39f3c5cb..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_a_c.vtf and /dev/null differ diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_b.vmt b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_b.vmt deleted file mode 100644 index 63f0121c..00000000 --- a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_b.vmt +++ /dev/null @@ -1,25 +0,0 @@ -"VertexlitGeneric" -{ - - "$basetexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_Tan_B_C" - "$bumpmap" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_N" - "$halflambert" "1" - - "$normalmapalphaenvmapmask" 1 - "$envmap" "env_cubemap" - "$envmaptint" "[ .1 .1 .1 ]" - "$envmapFresnel" "0.5" - - "$phong" "1" - "$phongexponenttexture" "models\Kali\vehicles\BO\S75\Veh_S75_Missile_B_Exp" - "$phongboost" "0.2" - "$phongfresnelranges" "[ .2 1.2 8]" - - "$PhongAlbedoTint" "1" - -} - - - - - diff --git a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_b_c.vtf b/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_b_c.vtf deleted file mode 100644 index 6fe96009..00000000 Binary files a/materials/models/kali/vehicles/bo/s75/veh_s75_missile_tan_b_c.vtf and /dev/null differ diff --git a/materials/models/missiles/agm119_d.vmt b/materials/models/missiles/agm119_d.vmt deleted file mode 100644 index 73547013..00000000 --- a/materials/models/missiles/agm119_d.vmt +++ /dev/null @@ -1,7 +0,0 @@ -"VertexLitGeneric" -{ - - $basetexture "models/props/army/agm119_d" - - -} \ No newline at end of file diff --git a/materials/models/missiles/agm119_d.vtf b/materials/models/missiles/agm119_d.vtf deleted file mode 100644 index d6e5e6c7..00000000 Binary files a/materials/models/missiles/agm119_d.vtf and /dev/null differ diff --git a/materials/models/missiles/aim120.vmt b/materials/models/missiles/aim120.vmt new file mode 100644 index 00000000..93417314 --- /dev/null +++ b/materials/models/missiles/aim120.vmt @@ -0,0 +1,12 @@ +"VertexLitGeneric" +{ + "$basetexture" "models/missiles/AIM120" + "$surfaceprop" "metal" + "$envmap" "env_cubemap" + "$envmaptint" "[ .25 .25 .30 ]" + + "$model" 1 + "$HalfLambert" 1 +} + + diff --git a/materials/models/missiles/aim120.vtf b/materials/models/missiles/aim120.vtf new file mode 100644 index 00000000..e87afd6e Binary files /dev/null and b/materials/models/missiles/aim120.vtf differ diff --git a/materials/models/missiles/aim54.vmt b/materials/models/missiles/aim54.vmt new file mode 100644 index 00000000..bdcdf9fd --- /dev/null +++ b/materials/models/missiles/aim54.vmt @@ -0,0 +1,12 @@ +"VertexLitGeneric" +{ + "$basetexture" "models/missiles/AIM54" + "$surfaceprop" "metal" + "$envmap" "env_cubemap" + "$envmaptint" "[ .25 .25 .30 ]" + + "$model" 1 + "$HalfLambert" 1 +} + + diff --git a/materials/models/missiles/aim54.vtf b/materials/models/missiles/aim54.vtf new file mode 100644 index 00000000..9af2aaee Binary files /dev/null and b/materials/models/missiles/aim54.vtf differ diff --git a/materials/models/missiles/aim9.vmt b/materials/models/missiles/aim9.vmt new file mode 100644 index 00000000..76992ca2 --- /dev/null +++ b/materials/models/missiles/aim9.vmt @@ -0,0 +1,12 @@ +"VertexLitGeneric" +{ + "$basetexture" "models/missiles/AIM9" + "$surfaceprop" "metal" + "$envmap" "env_cubemap" + "$envmaptint" "[ .25 .25 .30 ]" + + "$model" 1 + "$HalfLambert" 1 +} + + diff --git a/materials/models/missiles/aim9.vtf b/materials/models/missiles/aim9.vtf new file mode 100644 index 00000000..f8160245 Binary files /dev/null and b/materials/models/missiles/aim9.vtf differ diff --git a/materials/models/missiles/fab250.vmt b/materials/models/missiles/fab250.vmt new file mode 100644 index 00000000..19217d88 --- /dev/null +++ b/materials/models/missiles/fab250.vmt @@ -0,0 +1,13 @@ +"VertexLitGeneric" +{ + "$basetexture" "models/missiles/FAB250" + "$surfaceprop" "metal" + //"$bumpmap" "models/missiles/GBU12_bump" + + //"$envmapmask" "Models/props_combine/combine_binocular01_mask" + //"$selfillum" 0 + "$model" 1 + "$HalfLambert" 1 +} + + diff --git a/materials/models/missiles/fab250.vtf b/materials/models/missiles/fab250.vtf new file mode 100644 index 00000000..dcab5830 Binary files /dev/null and b/materials/models/missiles/fab250.vtf differ diff --git a/models/kali/vehicles/bo/s-75 dvina.dx90.vtx b/models/kali/vehicles/bo/s-75 dvina.dx90.vtx deleted file mode 100644 index dd3724ab..00000000 Binary files a/models/kali/vehicles/bo/s-75 dvina.dx90.vtx and /dev/null differ diff --git a/models/kali/vehicles/bo/s-75 dvina.mdl b/models/kali/vehicles/bo/s-75 dvina.mdl deleted file mode 100644 index ca753a8e..00000000 Binary files a/models/kali/vehicles/bo/s-75 dvina.mdl and /dev/null differ diff --git a/models/kali/vehicles/bo/s-75 dvina.phy b/models/kali/vehicles/bo/s-75 dvina.phy deleted file mode 100644 index 6e63261d..00000000 Binary files a/models/kali/vehicles/bo/s-75 dvina.phy and /dev/null differ diff --git a/models/kali/vehicles/bo/s-75 dvina.vvd b/models/kali/vehicles/bo/s-75 dvina.vvd deleted file mode 100644 index 6de2d293..00000000 Binary files a/models/kali/vehicles/bo/s-75 dvina.vvd and /dev/null differ diff --git a/models/kali/vehicles/bo/v-750 missile.dx90.vtx b/models/kali/vehicles/bo/v-750 missile.dx90.vtx deleted file mode 100644 index 3d4651a0..00000000 Binary files a/models/kali/vehicles/bo/v-750 missile.dx90.vtx and /dev/null differ diff --git a/models/kali/vehicles/bo/v-750 missile.mdl b/models/kali/vehicles/bo/v-750 missile.mdl deleted file mode 100644 index 36567d9a..00000000 Binary files a/models/kali/vehicles/bo/v-750 missile.mdl and /dev/null differ diff --git a/models/kali/vehicles/bo/v-750 missile.phy b/models/kali/vehicles/bo/v-750 missile.phy deleted file mode 100644 index 304d24ff..00000000 Binary files a/models/kali/vehicles/bo/v-750 missile.phy and /dev/null differ diff --git a/models/kali/vehicles/bo/v-750 missile.vvd b/models/kali/vehicles/bo/v-750 missile.vvd deleted file mode 100644 index d57d57a1..00000000 Binary files a/models/kali/vehicles/bo/v-750 missile.vvd and /dev/null differ diff --git a/models/missiles/agm119_b.dx90.vtx b/models/missiles/agm119_b.dx90.vtx deleted file mode 100644 index 1e3ae296..00000000 Binary files a/models/missiles/agm119_b.dx90.vtx and /dev/null differ diff --git a/models/missiles/agm119_b.mdl b/models/missiles/agm119_b.mdl deleted file mode 100644 index 48710a92..00000000 Binary files a/models/missiles/agm119_b.mdl and /dev/null differ diff --git a/models/missiles/agm119_b.phy b/models/missiles/agm119_b.phy deleted file mode 100644 index bdccb126..00000000 Binary files a/models/missiles/agm119_b.phy and /dev/null differ diff --git a/models/missiles/agm119_b.vvd b/models/missiles/agm119_b.vvd deleted file mode 100644 index 73758b6f..00000000 Binary files a/models/missiles/agm119_b.vvd and /dev/null differ diff --git a/models/missiles/agm119_s.dx90.vtx b/models/missiles/agm119_s.dx90.vtx deleted file mode 100644 index 77f3ea83..00000000 Binary files a/models/missiles/agm119_s.dx90.vtx and /dev/null differ diff --git a/models/missiles/agm119_s.mdl b/models/missiles/agm119_s.mdl deleted file mode 100644 index 4a82e24d..00000000 Binary files a/models/missiles/agm119_s.mdl and /dev/null differ diff --git a/models/missiles/agm119_s.phy b/models/missiles/agm119_s.phy deleted file mode 100644 index 3533cb20..00000000 Binary files a/models/missiles/agm119_s.phy and /dev/null differ diff --git a/models/missiles/agm119_s.vvd b/models/missiles/agm119_s.vvd deleted file mode 100644 index d18cda72..00000000 Binary files a/models/missiles/agm119_s.vvd and /dev/null differ diff --git a/models/missiles/aim120.dx90.vtx b/models/missiles/aim120.dx90.vtx new file mode 100644 index 00000000..f3c847a0 Binary files /dev/null and b/models/missiles/aim120.dx90.vtx differ diff --git a/models/missiles/aim120.mdl b/models/missiles/aim120.mdl new file mode 100644 index 00000000..711745b7 Binary files /dev/null and b/models/missiles/aim120.mdl differ diff --git a/models/missiles/aim120.phy b/models/missiles/aim120.phy new file mode 100644 index 00000000..578b5151 Binary files /dev/null and b/models/missiles/aim120.phy differ diff --git a/models/missiles/aim120.vvd b/models/missiles/aim120.vvd new file mode 100644 index 00000000..7effec57 Binary files /dev/null and b/models/missiles/aim120.vvd differ diff --git a/models/missiles/aim54.dx90.vtx b/models/missiles/aim54.dx90.vtx new file mode 100644 index 00000000..14b7c54c Binary files /dev/null and b/models/missiles/aim54.dx90.vtx differ diff --git a/models/missiles/aim54.mdl b/models/missiles/aim54.mdl new file mode 100644 index 00000000..87a4a6d7 Binary files /dev/null and b/models/missiles/aim54.mdl differ diff --git a/models/missiles/aim54.phy b/models/missiles/aim54.phy new file mode 100644 index 00000000..cff1fe3a Binary files /dev/null and b/models/missiles/aim54.phy differ diff --git a/models/missiles/aim54.vvd b/models/missiles/aim54.vvd new file mode 100644 index 00000000..47552cb9 Binary files /dev/null and b/models/missiles/aim54.vvd differ diff --git a/models/missiles/aim9.dx90.vtx b/models/missiles/aim9.dx90.vtx new file mode 100644 index 00000000..e6972dfd Binary files /dev/null and b/models/missiles/aim9.dx90.vtx differ diff --git a/models/missiles/aim9.mdl b/models/missiles/aim9.mdl new file mode 100644 index 00000000..cfbbd917 Binary files /dev/null and b/models/missiles/aim9.mdl differ diff --git a/models/missiles/aim9.phy b/models/missiles/aim9.phy new file mode 100644 index 00000000..dee3e96a Binary files /dev/null and b/models/missiles/aim9.phy differ diff --git a/models/missiles/aim9.vvd b/models/missiles/aim9.vvd new file mode 100644 index 00000000..fb67b05b Binary files /dev/null and b/models/missiles/aim9.vvd differ diff --git a/models/missiles/fab250.dx90.vtx b/models/missiles/fab250.dx90.vtx new file mode 100644 index 00000000..c8bb0e81 Binary files /dev/null and b/models/missiles/fab250.dx90.vtx differ diff --git a/models/missiles/fab250.mdl b/models/missiles/fab250.mdl new file mode 100644 index 00000000..06601a84 Binary files /dev/null and b/models/missiles/fab250.mdl differ diff --git a/models/missiles/fab250.phy b/models/missiles/fab250.phy new file mode 100644 index 00000000..2c145233 Binary files /dev/null and b/models/missiles/fab250.phy differ diff --git a/models/missiles/fab250.vvd b/models/missiles/fab250.vvd new file mode 100644 index 00000000..0353c88b Binary files /dev/null and b/models/missiles/fab250.vvd differ diff --git a/models/missiles/micro.dx90.vtx b/models/missiles/micro.dx90.vtx new file mode 100644 index 00000000..1f4bbe79 Binary files /dev/null and b/models/missiles/micro.dx90.vtx differ diff --git a/models/missiles/micro.mdl b/models/missiles/micro.mdl new file mode 100644 index 00000000..eca7218d Binary files /dev/null and b/models/missiles/micro.mdl differ diff --git a/models/missiles/micro.phy b/models/missiles/micro.phy new file mode 100644 index 00000000..10547721 Binary files /dev/null and b/models/missiles/micro.phy differ diff --git a/models/missiles/micro.vvd b/models/missiles/micro.vvd new file mode 100644 index 00000000..6409bbe6 Binary files /dev/null and b/models/missiles/micro.vvd differ diff --git a/models/missiles/rack_double.dx90.vtx b/models/missiles/rack_double.dx90.vtx new file mode 100644 index 00000000..1b69cb6d Binary files /dev/null and b/models/missiles/rack_double.dx90.vtx differ diff --git a/models/missiles/rack_double.mdl b/models/missiles/rack_double.mdl new file mode 100644 index 00000000..fcb15fac Binary files /dev/null and b/models/missiles/rack_double.mdl differ diff --git a/models/missiles/rack_double.phy b/models/missiles/rack_double.phy new file mode 100644 index 00000000..4d74da6a Binary files /dev/null and b/models/missiles/rack_double.phy differ diff --git a/models/missiles/rack_double.vvd b/models/missiles/rack_double.vvd new file mode 100644 index 00000000..152e1c69 Binary files /dev/null and b/models/missiles/rack_double.vvd differ diff --git a/models/missiles/rack_quad.dx90.vtx b/models/missiles/rack_quad.dx90.vtx new file mode 100644 index 00000000..2a6da11e Binary files /dev/null and b/models/missiles/rack_quad.dx90.vtx differ diff --git a/models/missiles/rack_quad.mdl b/models/missiles/rack_quad.mdl new file mode 100644 index 00000000..14f6d37e Binary files /dev/null and b/models/missiles/rack_quad.mdl differ diff --git a/models/missiles/rack_quad.phy b/models/missiles/rack_quad.phy new file mode 100644 index 00000000..8788e84f Binary files /dev/null and b/models/missiles/rack_quad.phy differ diff --git a/models/missiles/rack_quad.vvd b/models/missiles/rack_quad.vvd new file mode 100644 index 00000000..dfad459c Binary files /dev/null and b/models/missiles/rack_quad.vvd differ diff --git a/sound/acf_missiles/fx/bomb_reload.mp3 b/sound/acf_missiles/fx/bomb_reload.mp3 new file mode 100644 index 00000000..2560e6b3 Binary files /dev/null and b/sound/acf_missiles/fx/bomb_reload.mp3 differ diff --git a/sound/acf_missiles/fx/clunk.mp3 b/sound/acf_missiles/fx/clunk.mp3 new file mode 100644 index 00000000..9dada0f9 Binary files /dev/null and b/sound/acf_missiles/fx/clunk.mp3 differ diff --git a/sound/acf_missiles/fx/weapon_select.mp3 b/sound/acf_missiles/fx/weapon_select.mp3 new file mode 100644 index 00000000..fb837fd7 Binary files /dev/null and b/sound/acf_missiles/fx/weapon_select.mp3 differ diff --git a/sound/acf_missiles/missiles/flare_launch.mp3 b/sound/acf_missiles/missiles/flare_launch.mp3 new file mode 100644 index 00000000..4faf8584 Binary files /dev/null and b/sound/acf_missiles/missiles/flare_launch.mp3 differ diff --git a/sound/acf_missiles/missiles/missile_rocket.mp3 b/sound/acf_missiles/missiles/missile_rocket.mp3 new file mode 100644 index 00000000..755f53bd Binary files /dev/null and b/sound/acf_missiles/missiles/missile_rocket.mp3 differ