From 4ece4c30ea9934da29dbef57bbab6d909463ba0c Mon Sep 17 00:00:00 2001 From: JetBoom Date: Tue, 11 Nov 2014 19:15:49 -0500 Subject: [PATCH] SetHoldType -> SetWeaponHoldType No idea who coded the new weapon hold type setting but it's horrible and broken. --- .../weapons/swep_construction_kit/menu/weapon.lua | 2 +- .../entities/weapons/swep_construction_kit/server.lua | 2 +- .../entities/weapons/swep_construction_kit/shared.lua | 2 +- .../entities/weapons/weapon_zs_arsenalcrate/shared.lua | 2 +- .../entities/weapons/weapon_zs_barricadekit/shared.lua | 2 +- .../entities/weapons/weapon_zs_base/shared.lua | 6 +++--- .../entities/weapons/weapon_zs_basemelee/shared.lua | 4 ++-- .../entities/weapons/weapon_zs_detpack/shared.lua | 2 +- .../entities/weapons/weapon_zs_detpackremote.lua | 2 +- .../zombiesurvival/entities/weapons/weapon_zs_drone.lua | 2 +- .../entities/weapons/weapon_zs_dronecontrol.lua | 2 +- .../entities/weapons/weapon_zs_ffemitter/shared.lua | 2 +- .../zombiesurvival/entities/weapons/weapon_zs_fists.lua | 8 ++++---- .../entities/weapons/weapon_zs_grenade/shared.lua | 2 +- .../entities/weapons/weapon_zs_gunturret/shared.lua | 2 +- .../entities/weapons/weapon_zs_gunturretcontrol.lua | 2 +- .../zombiesurvival/entities/weapons/weapon_zs_manhack.lua | 2 +- .../entities/weapons/weapon_zs_manhackcontrol.lua | 2 +- .../entities/weapons/weapon_zs_medicalkit.lua | 2 +- .../entities/weapons/weapon_zs_messagebeacon/shared.lua | 2 +- .../entities/weapons/weapon_zs_resupplybox/shared.lua | 2 +- .../entities/weapons/weapon_zs_spotlamp/shared.lua | 2 +- .../zombiesurvival/entities/weapons/weapon_zs_stone.lua | 2 +- .../entities/weapons/weapon_zs_zebulletstorm.lua | 4 ++-- gamemodes/zombiesurvival/gamemode/languages/english.lua | 2 +- 25 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/menu/weapon.lua b/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/menu/weapon.lua index 051c38a..7c88bf0 100644 --- a/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/menu/weapon.lua +++ b/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/menu/weapon.lua @@ -172,7 +172,7 @@ local pweapon_holdtype = SimplePanel( pweapon ) end hbox.OnSelect = function(panel,index,value) if (!value) then return end - wep:SetHoldType( value ) + wep:SetWeaponHoldType( value ) wep.HoldType = value RunConsoleCommand("swepck_setholdtype", value) end diff --git a/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/server.lua b/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/server.lua index f95e985..4fe4246 100644 --- a/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/server.lua +++ b/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/server.lua @@ -29,7 +29,7 @@ local function Cmd_SetHoldType( pl, cmd, args ) local holdtype = args[1] local wep = GetSCKSWEP( pl ) if (IsValid(wep) and holdtype and table.HasValue( wep:GetHoldTypes(), holdtype )) then - wep:SetHoldType( holdtype ) + wep:SetWeaponHoldType( holdtype ) wep.HoldType = holdtype end diff --git a/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/shared.lua b/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/shared.lua index 0e369ea..e8fd247 100644 --- a/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/swep_construction_kit/shared.lua @@ -76,7 +76,7 @@ local sck_class = "" function SWEP:Initialize() - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) self:SetIronSights( true ) self:ResetIronSights() diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua index ecad36d..6a5401e 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua @@ -18,7 +18,7 @@ SWEP.WalkSpeed = SPEED_NORMAL SWEP.FullWalkSpeed = SPEED_SLOWEST function SWEP:Initialize() - self:SetHoldType("slam") + self:SetWeaponHoldType("slam") self:SetDeploySpeed(1.1) self:HideViewAndWorldModel() end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua index 0885615..4cb9099 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua @@ -21,7 +21,7 @@ end SWEP.WalkSpeed = SPEED_SLOWEST function SWEP:Initialize() - self:SetHoldType("rpg") + self:SetWeaponHoldType("rpg") self:SetDeploySpeed(1.1) end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua index 1066217..fc55bc2 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua @@ -33,7 +33,7 @@ SWEP.EmptyWhenPurchased = true function SWEP:Initialize() if not self:IsValid() then return end --??? - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) self:SetDeploySpeed(1.1) -- Maybe we didn't want to convert the weapon to the new system... @@ -89,9 +89,9 @@ function SWEP:SetIronsights(b) if self.IronSightsHoldType then if b then - self:SetHoldType(self.IronSightsHoldType) + self:SetWeaponHoldType(self.IronSightsHoldType) else - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) end end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua index 411ae90..6a60a50 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua @@ -44,7 +44,7 @@ SWEP.SwingOffset = Vector(0, 0, 0) function SWEP:Initialize() self:SetDeploySpeed(1.1) - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) self:SetWeaponSwingHoldType(self.SwingHoldType) if CLIENT then @@ -54,7 +54,7 @@ end function SWEP:SetWeaponSwingHoldType(t) local old = self.ActivityTranslate - self:SetHoldType(t) + self:SetWeaponHoldType(t) local new = self.ActivityTranslate self.ActivityTranslate = old self.ActivityTranslateSwing = new diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua index 2e87153..eefaa35 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua @@ -18,7 +18,7 @@ SWEP.WalkSpeed = SPEED_NORMAL SWEP.FullWalkSpeed = SPEED_SLOW function SWEP:Initialize() - self:SetHoldType("slam") + self:SetWeaponHoldType("slam") self:SetDeploySpeed(1.1) self:HideViewAndWorldModel() end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpackremote.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpackremote.lua index ed2c585..06e4b09 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpackremote.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpackremote.lua @@ -34,7 +34,7 @@ SWEP.NoPickupNotification = true SWEP.HoldType = "slam" function SWEP:Initialize() - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) end if SERVER then diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua index 84fdb44..b0c7866 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua @@ -50,7 +50,7 @@ SWEP.Secondary.Ammo = "none" SWEP.WalkSpeed = SPEED_FAST function SWEP:Initialize() - self:SetHoldType("grenade") + self:SetWeaponHoldType("grenade") self:SetDeploySpeed(1.1) if CLIENT then diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_dronecontrol.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_dronecontrol.lua index 4f7a7e3..70d9899 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_dronecontrol.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_dronecontrol.lua @@ -40,7 +40,7 @@ SWEP.NoPickupNotification = true SWEP.HoldType = "slam" function SWEP:Initialize() - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) self:SetDeploySpeed(10) end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua index d57b12d..6b8c986 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua @@ -18,7 +18,7 @@ SWEP.WalkSpeed = SPEED_NORMAL SWEP.FullWalkSpeed = SPEED_SLOWEST function SWEP:Initialize() - self:SetHoldType("slam") + self:SetWeaponHoldType("slam") self:SetDeploySpeed(1.1) self:HideViewAndWorldModel() end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_fists.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_fists.lua index d816cda..11d9745 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_fists.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_fists.lua @@ -29,8 +29,8 @@ local SwingSound = Sound( "weapons/slam/throw.wav" ) local HitSound = Sound( "Flesh.ImpactHard" ) function SWEP:Initialize() - --self:SetHoldType("normal") - self:SetHoldType("fist") + --self:SetWeaponHoldType("normal") + self:SetWeaponHoldType("fist") end function SWEP:PreDrawViewModel(vm, wep, pl) @@ -50,7 +50,7 @@ function SWEP:UpdateNextIdle() end function SWEP:PrimaryAttack(right) - --self:SetHoldType("fist") + --self:SetWeaponHoldType("fist") self:SetNextIdleHoldType(CurTime() + 2) self.Owner:SetAnimation(PLAYER_ATTACK1) self.WalkSpeed = 165 @@ -197,7 +197,7 @@ function SWEP:Think() local idle_holdtype_time = self:GetNextIdleHoldType() if idle_holdtype_time > 0 and curtime >= idle_holdtype_time then - --self:SetHoldType("normal") + --self:SetWeaponHoldType("normal") self:SetNextIdleHoldType(0) self.WalkSpeed = SPEED_NORMAL self.Owner:ResetSpeed() diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua index c5d4684..a0800b1 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua @@ -18,7 +18,7 @@ SWEP.Secondary.Ammo = "none" SWEP.WalkSpeed = SPEED_FAST function SWEP:Initialize() - self:SetHoldType("grenade") + self:SetWeaponHoldType("grenade") self:SetDeploySpeed(1.1) end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_gunturret/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_gunturret/shared.lua index 7fb46c6..ecf038e 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_gunturret/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_gunturret/shared.lua @@ -18,7 +18,7 @@ SWEP.WalkSpeed = SPEED_NORMAL SWEP.FullWalkSpeed = SPEED_SLOWEST function SWEP:Initialize() - self:SetHoldType("slam") + self:SetWeaponHoldType("slam") self:SetDeploySpeed(1.1) self:HideViewAndWorldModel() end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_gunturretcontrol.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_gunturretcontrol.lua index 411b9dd..5afbe74 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_gunturretcontrol.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_gunturretcontrol.lua @@ -40,7 +40,7 @@ SWEP.NoPickupNotification = true SWEP.HoldType = "slam" function SWEP:Initialize() - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) self:SetDeploySpeed(10) end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua index 7865125..b2a775c 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua @@ -53,7 +53,7 @@ SWEP.Secondary.Ammo = "none" SWEP.WalkSpeed = SPEED_FAST function SWEP:Initialize() - self:SetHoldType("grenade") + self:SetWeaponHoldType("grenade") self:SetDeploySpeed(1.1) if CLIENT then diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhackcontrol.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhackcontrol.lua index 8180404..0d99f81 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhackcontrol.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhackcontrol.lua @@ -42,7 +42,7 @@ SWEP.NoPickupNotification = true SWEP.HoldType = "slam" function SWEP:Initialize() - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) self:SetDeploySpeed(10) end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua index 9927bb8..bb11d4c 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua @@ -40,7 +40,7 @@ SWEP.NoMagazine = true SWEP.HoldType = "slam" function SWEP:Initialize() - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) self:SetDeploySpeed(1.1) end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua index 76fbac0..3d62ae9 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua @@ -18,7 +18,7 @@ SWEP.WalkSpeed = SPEED_NORMAL SWEP.FullWalkSpeed = SPEED_SLOW function SWEP:Initialize() - self:SetHoldType("slam") + self:SetWeaponHoldType("slam") self:SetDeploySpeed(1.1) self:HideViewAndWorldModel() end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua index b0aeceb..3c29674 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua @@ -18,7 +18,7 @@ SWEP.WalkSpeed = SPEED_NORMAL SWEP.FullWalkSpeed = SPEED_SLOWEST function SWEP:Initialize() - self:SetHoldType("slam") + self:SetWeaponHoldType("slam") self:SetDeploySpeed(1.1) self:HideViewAndWorldModel() end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua index 759fab9..d36c81c 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua @@ -18,7 +18,7 @@ SWEP.WalkSpeed = SPEED_NORMAL SWEP.FullWalkSpeed = SPEED_SLOWEST function SWEP:Initialize() - self:SetHoldType("slam") + self:SetWeaponHoldType("slam") self:SetDeploySpeed(1.1) self:HideViewAndWorldModel() end diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua index 3ecb2ee..0650cf8 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua @@ -50,7 +50,7 @@ SWEP.Secondary.Ammo = "none" SWEP.WalkSpeed = SPEED_FAST function SWEP:Initialize() - self:SetHoldType("grenade") + self:SetWeaponHoldType("grenade") self:SetDeploySpeed(1.1) if CLIENT then diff --git a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_zebulletstorm.lua b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_zebulletstorm.lua index 29fc7e4..edc1c53 100644 --- a/gamemodes/zombiesurvival/entities/weapons/weapon_zs_zebulletstorm.lua +++ b/gamemodes/zombiesurvival/entities/weapons/weapon_zs_zebulletstorm.lua @@ -28,9 +28,9 @@ function SWEP:SetIronsights(b) if self.IronSightsHoldType then if b then - self:SetHoldType(self.IronSightsHoldType) + self:SetWeaponHoldType(self.IronSightsHoldType) else - self:SetHoldType(self.HoldType) + self:SetWeaponHoldType(self.HoldType) end end diff --git a/gamemodes/zombiesurvival/gamemode/languages/english.lua b/gamemodes/zombiesurvival/gamemode/languages/english.lua index 0ea7614..4993a6f 100644 --- a/gamemodes/zombiesurvival/gamemode/languages/english.lua +++ b/gamemodes/zombiesurvival/gamemode/languages/english.lua @@ -235,7 +235,7 @@ LANGUAGE.controls_zombie = "> PRIMARY: Claws\n> SECONDARY: Scream\n> RELOA LANGUAGE.controls_poison_zombie = "> PRIMARY: Claws\n> SECONDARY: Flesh toss\n> RELOAD: Scream" LANGUAGE.controls_fast_zombie = "> PRIMARY: Claws\n> SECONDARY: Lunge / Climb (next to wall)\n> RELOAD: Scream" LANGUAGE.controls_bloated_zombie = "> PRIMARY: Claws\n> SECONDARY: Moan\n> SPRINT: Feign death\n> ON DEATH: Poison Gibs" -LANGUAGE.controls_ghoul = "> PRIMARY: Poison claws\n> SECONDARY: Flesh toss\n> SPRINT: Feign death\n> RELOAD: Scream\n> ON HIT HUMAN: Slow\n> ON HIT BY HUMAN: Poison ejection" +LANGUAGE.controls_ghoul = "> PRIMARY: Poison claws\n> SECONDARY: Flesh toss\n> SPRINT: Feign death\n> RELOAD: Scream\n> ON HIT HUMAN: Slow" LANGUAGE.controls_headcrab = "> PRIMARY: Lunge attack\n> RELOAD: Burrow" LANGUAGE.controls_fast_headcrab = "> PRIMARY: Lunge attack" LANGUAGE.controls_poison_headcrab = "> PRIMARY: Lunge attack\n> SECONDARY: Spit poison\n> ON HIT HUMAN: Deadly poison\n> ON HIT POISON IN EYES: Blind\n> RELOAD: Scream"