Skip to content

Commit

Permalink
Raise minimum size for horizontal turret model change
Browse files Browse the repository at this point in the history
Raised the minimum size before horizontal turrets change to a cylinder model, due to the current model's physics mesh being too small for physics at 12-12.4u
  • Loading branch information
LiddulBOFH committed Apr 21, 2024
1 parent 18e01b4 commit b7ce652
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lua/acf/entities/turrets/turrets.lua
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ do -- Turret drives
GetRingHeight = function(TurretData,Size)
local RingHeight = math.max(Size * TurretData.Ratio,4)

if (TurretData.Type == "Turret-H") and (Size < 12) then
if (TurretData.Type == "Turret-H") and (Size <= 12.5) then
return 12 -- sticc
end

Expand Down Expand Up @@ -141,7 +141,7 @@ do -- Turret drives
Name = "Horizontal Turret",
Description = "The large stable base of a turret.",
Model = "models/acf/core/t_ring.mdl",
ModelSmall = "models/holograms/hq_cylinder.mdl", -- To be used for diameters < 12u, for RWS or other small turrets
ModelSmall = "models/holograms/hq_cylinder.mdl", -- To be used for diameters <= 12.5u, for RWS or other small turrets
Mass = 34, -- At default size, this is the mass of the turret ring. Will scale up/down with diameter difference

Size = {
Expand Down
2 changes: 1 addition & 1 deletion lua/entities/acf_turret/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ do -- Spawn and Update funcs
local Model = Turret.Model
local Size = Data.RingSize

if (Size < 12) and (Data.Turret == "Turret-H") then
if (Size <= 12.5) and (Data.Turret == "Turret-H") then
Model = Turret.ModelSmall
end

Expand Down

0 comments on commit b7ce652

Please sign in to comment.