Permalink
Browse files

Updated to latest version

No more hakcxs.
  • Loading branch information...
1 parent 086b76d commit c21c84b31cba2d3de9ced41002f5ab1f373cbf8e @robotboy655 robotboy655 committed May 1, 2015
Showing with 5 additions and 28 deletions.
  1. +5 −28 garrysmod/lua/weapons/weapon_fists.lua
@@ -10,7 +10,7 @@ SWEP.SlotPos = 4
SWEP.Spawnable = true
-SWEP.ViewModel = Model( "models/weapons/c_arms_citizen.mdl" )
+SWEP.ViewModel = Model( "models/weapons/c_hands.mdl" )
SWEP.WorldModel = ""
SWEP.ViewModelFOV = 54
SWEP.UseHands = true
@@ -38,12 +38,6 @@ function SWEP:Initialize()
end
-function SWEP:PreDrawViewModel( vm, wep, ply )
-
- vm:SetMaterial( "engine/occlusionproxy" ) -- Hide that view model with hacky material
-
-end
-
function SWEP:SetupDataTables()
self:NetworkVar( "Float", 0, "NextMeleeAttack" )
@@ -160,29 +154,12 @@ function SWEP:DealDamage()
end
-function SWEP:OnRemove()
-
- if ( IsValid( self.Owner ) && CLIENT && self.Owner:IsPlayer() ) then
- local vm = self.Owner:GetViewModel()
- if ( IsValid( vm ) ) then vm:SetMaterial( "" ) end
- end
-
-end
-
function SWEP:OnDrop()
self:Remove() -- You can't drop fists
end
-function SWEP:Holster()
-
- self:OnRemove()
-
- return true
-
-end
-
function SWEP:Deploy()
local vm = self.Owner:GetViewModel()
@@ -207,7 +184,7 @@ function SWEP:Think()
if ( idletime > 0 && CurTime() > idletime ) then
vm:SendViewModelMatchingSequence( vm:LookupSequence( "fists_idle_0" .. math.random( 1, 2 ) ) )
-
+
self:UpdateNextIdle()
end
@@ -217,15 +194,15 @@ function SWEP:Think()
if ( meleetime > 0 && CurTime() > meleetime ) then
self:DealDamage()
-
+
self:SetNextMeleeAttack( 0 )
end
if ( SERVER && CurTime() > self:GetNextPrimaryFire() + 0.1 ) then
-
+
self:SetCombo( 0 )
-
+
end
end

5 comments on commit c21c84b

@Kefta
Contributor
Kefta commented on c21c84b May 1, 2015

c/v_hands doesn't have the punching animation, it only has admire

@robotboy655
Collaborator

There are no v_hands, and make sure you do not have any c_hands in any of your addons that would override the default ones.

@Kefta
Contributor
Kefta commented on c21c84b May 1, 2015

Yeah there are, in the HL2 .vpk. That's what you converted it from, right?

@robotboy655
Collaborator

No, I removed the mesh from models/weapons/c_arms_citizen.mdl, the animations are from the view model arms MaxOfS2D made.

@Kefta
Contributor
Kefta commented on c21c84b May 1, 2015

Oh, I was talking about v_hands.mdl. Could you change the name to c_arms to prevent confusion?

Please sign in to comment.