bouletmarc
/
ACF_CustomMod
mirror of https://github.com/bouletmarc/ACF_CustomMod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "ACF Custom Mod V3 9.3" 

This reverts commit 07098743a8.
This commit is contained in:
bouletmarc 2014-09-14 18:49:28 -04:00
parent 07098743a8
commit 7f1fa8922a
10 changed files with 37 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
changelogcustom.txt
View File

@ -48,16 +48,8 @@ You should wire and link it again.
--Help Menu Cleaned
----SPECIALS NOTES----
-Thanks to SEM for models-
**Thanks to SEM for models**
Turbo and Supercharger are in test
They are working fine, but might be
improved in furtur update. I'm gonna
check the feedback of them
*r107
-9.31 V3
--Improved Turbo Spool Start
--Turbo Add Slightly more torque
--Fixed Changelog Error
--Fixed E2 Function 'acfCustomRpmAdd'
check the feedback of them

4
lua/autorun/acf_globals_custom.lua
View File

@ -1,7 +1,7 @@
ACFCUSTOM = {}
--##############
ACFCUSTOM.VersionCustom = 9.3
ACFCUSTOM.Version2 = 107
ACFCUSTOM.VersionCustom = 9.22
ACFCUSTOM.Version2 = 106
ACFCUSTOM.CurrentVersion2 = 0
print("[[ ACF Custom Loaded ]]")

394
lua/entities/acf_ecu.lua
View File

@ -1,394 +0,0 @@
AddCSLuaFile()
DEFINE_BASECLASS( "base_wire_entity" )
ENT.PrintName = "ACF Turbo"
ENT.WireDebugName = "ACF Turbo"
if CLIENT then
function ACFTurboGUICreate( Table )
if not acfmenupanelcustom.ModData then
acfmenupanelcustom.ModData = {}
end
if not acfmenupanelcustom.ModData[Table.id] then
acfmenupanelcustom.ModData[Table.id] = {}
acfmenupanelcustom.ModData[Table.id].ModTable = Table.modtable
end
acfmenupanelcustom:CPanelText("Name", Table.name)
acfmenupanelcustom.CData.DisplayModel = vgui.Create( "DModelPanel", acfmenupanelcustom.CustomDisplay )
acfmenupanelcustom.CData.DisplayModel:SetModel( Table.model )
acfmenupanelcustom.CData.DisplayModel:SetCamPos( Vector( 250, 325, 250 ) )
acfmenupanelcustom.CData.DisplayModel:SetLookAt( Vector( 0, 0, 0 ) )
acfmenupanelcustom.CData.DisplayModel:SetFOV( 3 )
acfmenupanelcustom.CData.DisplayModel:SetSize(acfmenupanelcustom:GetWide(),acfmenupanelcustom:GetWide())
acfmenupanelcustom.CData.DisplayModel.LayoutEntity = function( panel, entity ) end
acfmenupanelcustom.CustomDisplay:AddItem( acfmenupanelcustom.CData.DisplayModel )
acfmenupanelcustom:CPanelText("Desc", "Desc : "..Table.desc.."\n\n")
for ID,Value in pairs(acfmenupanelcustom.ModData[Table.id]["ModTable"]) do
if ID == 1 then
ACF_TurboSlider(1, Value, Table.id)
elseif ID == 2 then
ACF_TurboBOV(2, Value, Table.id)
end
end
acfmenupanelcustom.CustomDisplay:PerformLayout()
end
function ACF_TurboSlider(Mod, Value, ID)
acfmenupanelcustom:CPanelText("Spool", " <---- Spool Faster / Boost Bigger ---->")
if Mod and not acfmenupanelcustom.CData[Mod] then
acfmenupanelcustom.CData[Mod] = vgui.Create( "DNumSlider", acfmenupanelcustom.CustomDisplay )
acfmenupanelcustom.CData[Mod]:SetWide(100)
acfmenupanelcustom.CData[Mod]:SetMin(0.01)
acfmenupanelcustom.CData[Mod]:SetMax(1)
acfmenupanelcustom.CData[Mod]:SetDecimals(2)
acfmenupanelcustom.CData[Mod]["Mod"] = Mod
acfmenupanelcustom.CData[Mod]["ID"] = ID
acfmenupanelcustom.CData[Mod]:SetValue(Value)
acfmenupanelcustom.CData[Mod]:SetDark( true )
RunConsoleCommand( "acfcustom_data"..Mod, Value )
acfmenupanelcustom.CData[Mod].OnValueChanged = function( slider, val )
acfmenupanelcustom.ModData[slider.ID]["ModTable"][slider.Mod] = val
RunConsoleCommand( "acfcustom_data"..Mod, val )
end
acfmenupanelcustom.CustomDisplay:AddItem( acfmenupanelcustom.CData[Mod] )
end
end
function ACF_TurboBOV(Mod, Value, ID)
RunConsoleCommand( "acfcustom_data"..Mod, Value )
acfmenupanelcustom.ModData[ID]["ModTable"][Mod] = Value
acfmenupanelcustom:CPanelText("BovText", "\n\nBOV(Blow Off Valve) SoundPath :")
BOVTextEntry = vgui.Create("DTextEntry")
BOVTextEntry:SetWide(100)
BOVTextEntry:SetTall(30)
BOVTextEntry:SetText(Value)
BOVTextEntry.OnTextChanged = function()
local BOVText = BOVTextEntry:GetValue()
RunConsoleCommand( "acfcustom_data"..Mod, BOVText )
acfmenupanelcustom.ModData[ID]["ModTable"][Mod] = BOVText
end
acfmenupanelcustom.CustomDisplay:AddItem( BOVTextEntry )
acfmenupanelcustom:CPanelText("BovText2", "**Put nothing for No BOV sound**")
end
return
end
function ENT:Initialize()
--Persist Values
self.Boost = 0
self.BoostRate = 0
self.BoostRpmStart = 0
self.BoostMax = 1
self.TorqueAdd = 0
self.TorqueAddMax = 1
self.RPMAdd = 1000
self.RPM = 0
self.Throttle = 0
--self.RPMThink = 0
self.GetRpm = true
--think
self.Master = {}
self.CanUpdate = true
self.Legal = true
self.LastActive = 0
self.LegalThink = 0
self.TurboThink = 0
Wire_TriggerOutput(self, "Entity", self)
self.WireDebugName = "ACF Turbo"
end
function MakeACF_Turbo(Owner, Pos, Angle, Id, Data1, Data2)
if not Owner:CheckLimit("_acf_extra") then return false end
local Turbo = ents.Create("acf_turbo")
if not IsValid( Turbo ) then return false end
local EID
local List = list.Get("ACFCUSTOMEnts")
if List.MobilityCustom[Id] then EID = Id else EID = "V1_Turbo" end
local Lookup = List.MobilityCustom[EID]
Turbo:SetAngles(Angle)
Turbo:SetPos(Pos)
Turbo:Spawn()
Turbo:SetPlayer(Owner)
Turbo.Owner = Owner
Turbo.Id = EID
Turbo.Model = Lookup.model
Turbo.SoundPath = Lookup.sound
Turbo.Weight = 30 --this is a basic weight value
Turbo.ModTable = Lookup.modtable
Turbo.ModTable[1] = Data1
Turbo.ModTable[2] = Data2
--Set All Mods
Turbo.Mods1 = Data1 --Slider
Turbo.Mods2 = Data2 --BOV Using
--Turbo Settings
Turbo.SliderVal = tonumber(Turbo.Mods1)
Turbo.BOVSound = tostring(Turbo.Mods2)
--Creating Wire Outputs
local Outputs = {"Boost"}
local OutputsTypes = {"NORMAL"}
Turbo.Outputs = WireLib.CreateSpecialOutputs( Turbo, Outputs, OutputsTypes )
Turbo:SetModel( Turbo.Model )
Turbo:PhysicsInit( SOLID_VPHYSICS )
Turbo:SetMoveType( MOVETYPE_VPHYSICS )
Turbo:SetSolid( SOLID_VPHYSICS )
local phys = Turbo:GetPhysicsObject()
if IsValid( phys ) then
phys:SetMass( Turbo.Weight )
end
Owner:AddCount("_acf_turbo", Turbo)
Owner:AddCleanup( "acfmenu", Turbo )
Turbo:SetNetworkedString( "WireName", Lookup.name )
Turbo:UpdateOverlayText()
Turbo:SetWireOutputs()
return Turbo
end
list.Set( "ACFCvars", "acf_turbo" , {"id", "data1", "data2"} )
duplicator.RegisterEntityClass("acf_turbo", MakeACF_Turbo, "Pos", "Angle", "Id", "Mods1", "Mods2")
function ENT:Update( ArgsTable )
if ArgsTable[1] ~= self.Owner then -- Argtable[1] is the player that shot the tool
return false, "You don't own that engine chip!"
end
local Id = ArgsTable[4] -- Argtable[4] is the turbo ID
local Lookup = list.Get("ACFCUSTOMEnts").MobilityCustom[Id]
if Lookup.model ~= self.Model then
return false, "The new Engine Chip must have the same model!"
end
if self.Id != Id then
self.Id = Id
self.Model = Lookup.model
self.SoundPath = Lookup.sound
self.Weight = 30 --this is a basic weight value
end
self.ModTable[1] = ArgsTable[5]
self.ModTable[2] = ArgsTable[6]
--Set Mods
self.Mods1 = ArgsTable[5] --Slider
self.Mods2 = ArgsTable[6] --BOV Using
--Turbo Settings
self.SliderVal = tonumber(self.Mods1)
self.BOVSound = tostring(self.Mods2)
--Creating Wire Outputs
local Outputs = {"Boost"}
local OutputsTypes = {"NORMAL"}
self.Outputs = WireLib.CreateSpecialOutputs( self, Outputs, OutputsTypes )
self:SetNetworkedString( "WireName", Lookup.name )
self:UpdateOverlayText()
self:SetWireOutputs()
return true, "Turbo updated successfully!"
end
--Set the wire Output
function ENT:SetWireOutputs()
Wire_TriggerOutput(self, "Boost", math.Round(self.Boost,1))
end
--Set the Overlay Text
function ENT:UpdateOverlayText()
local text = ""
text = text .. "Boost: "..math.Round(self.Boost,1).." Psi\n"
text = text .. "Torque Add: "..math.Round(self.TorqueAdd,0).."Tq\n"
if self.BOVSound == "" then
text = text .. "Weight: "..self.Weight.."Kg"
else
text = text .. "Weight: "..self.Weight.."Kg\n"
text = text .. "Using BOV"
end
self:SetOverlayText( text )
end
--think
function ENT:Think()
local Time = CurTime()
if self.LegalThink < Time and self.LastActive+2 > Time then
if self:GetPhysicsObject():GetMass() < self.Mass or self:GetParent():IsValid() then
self.Legal = false
else
self.Legal = true
end
self.LegalThink = Time + (math.floor(1))
end
if self.TurboThink < Time then
/*if self.RPM - self.RPMThink <= -1000 then
--Delete and Create the BOV Sound
if self.BOVSound != "" then
self.SoundBov = CreateSound(self, self.BOVSound)
self.SoundBov:PlayEx((self.Boost/self.BoostMax),100)
end
self.BoostRate = 0
self.Boost = 0
else*/
--Turbo Boost Increasing
if self.Throttle >= 0.5 then
--increase full throttle
if self.RPM >= self.BoostRpmStart then
self.BoostRate = self.Boost+(((self.Boost/4)+0.1)*self.Throttle) --boost rate
if self.Boost < self.BoostMax then
self.Boost = self.BoostRate
else
self.Boost = self.BoostMax
end
end
--Decrease under full throttle
if self.RPM <= self.BoostRpmStart-((self.BoostRpmStart*15)/100) then
self.BoostRate = self.Boost-(((self.Boost/8)-0.1)*self.Throttle) --boost rate
if self.Boost > 0 then
self.Boost = self.BoostRate
elseif self.Boost <= 0 then
self.Boost = 0
end
end
--Turbo Boost Decreasing
elseif self.Throttle > 0 and self.Throttle < 0.5 then
self.BoostRate = self.Boost-(((self.Boost/8)-0.1)*self.Throttle) --boost rate
if self.Boost > 0 then
self.Boost = self.BoostRate
elseif self.Boost <= 0 then
self.Boost = 0
end
--Turbo Boost Stop
else
--Delete and Create the BOV Sound
if self.BOVSound != "" then
self.SoundBov = CreateSound(self, self.BOVSound)
self.SoundBov:PlayEx((self.Boost/self.BoostMax),100)
end
self.BoostRate = 0
self.Boost = 0
end
--end
--Add Torque
self.TorqueAdd = (((self.Boost/self.BoostMax)*100)*self.TorqueAddMax)/100
--Create Turbo Noise Sound
if not self.Sound then
self.Sound = CreateSound(self, self.SoundPath)
self.Sound:PlayEx(0.1,10)
end
--Change the Turbo Noise Pitch
if self.Sound then
self.Sound:ChangePitch(math.min(((((self.Boost/self.BoostMax)*100)*255)/100), 255), 0)
self.Sound:ChangeVolume(self.Boost/self.BoostMax, 0)
end
--Set Overlay & Wire Output
self:UpdateOverlayText()
self:SetWireOutputs()
--self.RPMThink = self.RPM
self.TurboThink = Time + 0.1
end
self:NextThink(Time+0.1)
return true
end
--Get RPM for Turbo
function ENT:GetRPM(IntputRPM, LimitRpm, EngWeight, EngThrottle, Class, Torque, IdleRpm)
--Reset the turbo Weight
if EngWeight/20-(self.SliderVal*10) >= 10 then
if self.Weight != EngWeight/20-(self.SliderVal*10) then
self.Weight = EngWeight/20-(self.SliderVal*10)
local phys = self:GetPhysicsObject()
if IsValid( phys ) then
phys:SetMass( self.Weight )
end
end
else
if self.Weight > 10 or self.Weight < 10 then
self.Weight = 10 --Set the minimum weight
local phys = self:GetPhysicsObject()
if IsValid( phys ) then
phys:SetMass( self.Weight )
end
end
end
--Set Persist Values
if Class == "GenericPetrol" or Class == "Radial" then
--self.BoostRpmStart = (LimitRpm*((self.SliderVal*30)+40))/100 --will vary between 40-70% of the limit rpm range on gazoline
self.BoostRpmStart = IdleRpm+((IdleRpm*((self.SliderVal*130)+150))/100) --will vary between 150-280% of the idle rpm range on gazoline
elseif Class == "GenericDiesel" or Class == "Wankel" then
--self.BoostRpmStart = (LimitRpm*((self.SliderVal*20)+40))/100 --will vary between 40-60% of the limit rpm range on diesel
self.BoostRpmStart = IdleRpm+((IdleRpm*((self.SliderVal*110)+90))/100) --will vary between 90-200% of the idle rpm range on diesel
else
--self.BoostRpmStart = (LimitRpm*((self.SliderVal*25)+40))/100 --will vary between 40-65% of the limit rpm range on others
self.BoostRpmStart = IdleRpm+((IdleRpm*((self.SliderVal*120)+120))/100) --will vary between 120-240% of the idle rpm range on others
end
self.TorqueAddMax = (Torque*((self.SliderVal*35)+50))/100 --will add between 50-85% of the max engine torque
--Set Boost Max (Minimum 7psi)
if self.TorqueAddMax/10 > 7 then self.BoostMax = self.TorqueAddMax/10
else self.BoostMax = 7 end
self.RPM = IntputRPM
self.Throttle = EngThrottle
end
function ENT:PreEntityCopy()
//Wire dupe info
self.BaseClass.PreEntityCopy( self )
end
function ENT:PostEntityPaste( Player, Ent, CreatedEntities )
//Wire dupe info
self.BaseClass.PostEntityPaste( self, Player, Ent, CreatedEntities )
end
function ENT:OnRemove()
for Key,Value in pairs(self.Master) do --Let's unlink ourselves from the engines properly
if IsValid( self.Master[Key] ) then
self.Master[Key]:Unlink( self )
end
end
end

4
lua/entities/acf_engine_custom.lua
View File

@ -801,11 +801,11 @@ function ENT:CalcRPM()
self.Sound:Stop()
end
self.Sound = nil
local MakeSound = math.random(1,3)
local MakeSound = math.random(1,4)
if MakeSound <= 1 and self.Sound2 and self.Sound2:IsPlaying() then self.Sound2:Stop() end
if MakeSound <= 1 then
self.Sound2 = CreateSound(self, "ambient/explosions/explode_4.wav")
self.Sound2:PlayEx(0.7,100)
self.Sound2:PlayEx(0.5,100)
end
end
if( self.FlyRPM <= self.CutRpm - self.CutValue and self.CutMode == 1 ) then

4
lua/entities/acf_enginemaker.lua
View File

@ -1030,11 +1030,11 @@ function ENT:CalcRPM()
self.Sound:Stop()
end
self.Sound = nil
local MakeSound = math.random(1,3)
local MakeSound = math.random(1,4)
if MakeSound <= 1 and self.Sound2 and self.Sound2:IsPlaying() then self.Sound2:Stop() end
if MakeSound <= 1 then
self.Sound2 = CreateSound(self, "ambient/explosions/explode_4.wav")
self.Sound2:PlayEx(0.7,100)
self.Sound2:PlayEx(0.5,100)
end
end
if( self.FlyRPM <= self.CutRpm - self.CutValue and self.CutMode == 1 ) then

13
lua/entities/acf_turbo.lua
View File

@ -335,7 +335,7 @@ function ENT:Think()
end
--Get RPM for Turbo
function ENT:GetRPM(IntputRPM, LimitRpm, EngWeight, EngThrottle, Class, Torque, IdleRpm)
function ENT:GetRPM(IntputRPM, LimitRpm, EngWeight, EngThrottle, Class, Torque)
--Reset the turbo Weight
if EngWeight/20-(self.SliderVal*10) >= 10 then
if self.Weight != EngWeight/20-(self.SliderVal*10) then
@ -356,16 +356,13 @@ function ENT:GetRPM(IntputRPM, LimitRpm, EngWeight, EngThrottle, Class, Torque,
end
--Set Persist Values
if Class == "GenericPetrol" or Class == "Radial" then
--self.BoostRpmStart = (LimitRpm*((self.SliderVal*30)+40))/100 --will vary between 40-70% of the limit rpm range on gazoline
self.BoostRpmStart = IdleRpm+((IdleRpm*((self.SliderVal*130)+150))/100) --will vary between 150-280% of the idle rpm range on gazoline
self.BoostRpmStart = (LimitRpm*((self.SliderVal*30)+40))/100 --will vary between 40-70% of the limit rpm range on gazoline
elseif Class == "GenericDiesel" or Class == "Wankel" then
--self.BoostRpmStart = (LimitRpm*((self.SliderVal*20)+40))/100 --will vary between 40-60% of the limit rpm range on diesel
self.BoostRpmStart = IdleRpm+((IdleRpm*((self.SliderVal*110)+90))/100) --will vary between 90-200% of the idle rpm range on diesel
self.BoostRpmStart = (LimitRpm*((self.SliderVal*20)+40))/100 --will vary between 40-60% of the limit rpm range on diesel
else
--self.BoostRpmStart = (LimitRpm*((self.SliderVal*25)+40))/100 --will vary between 40-65% of the limit rpm range on others
self.BoostRpmStart = IdleRpm+((IdleRpm*((self.SliderVal*120)+120))/100) --will vary between 120-240% of the idle rpm range on others
self.BoostRpmStart = (LimitRpm*((self.SliderVal*25)+40))/100 --will vary between 40-65% of the limit rpm range on others
end
self.TorqueAddMax = (Torque*((self.SliderVal*35)+50))/100 --will add between 50-85% of the max engine torque
self.TorqueAddMax = (Torque*((self.SliderVal*35)+40))/100 --will add between 40-75% of the max engine torque
--Set Boost Max (Minimum 7psi)
if self.TorqueAddMax/10 > 7 then self.BoostMax = self.TorqueAddMax/10
else self.BoostMax = 7 end

11
lua/entities/gmod_wire_expression2/core/custom/acfcustomfunctions.lua
View File

@ -280,10 +280,17 @@ e2function void entity:acfCustomTqAdd( number torqueadd )
end
-- Sets the MaxRpmAdd value for an ACF engine
e2function void entity:acfCustomRpmAdd( number maxrpm )
e2function void entity:acfCustomMaxRpmAdd( number maxrpm )
if not isEngine(this) then return end
if not isOwner(self, this) then return end
this:TriggerInput("RpmAdd", maxrpm)
this:TriggerInput("MaxRpmAdd", maxrpm)
end
-- Sets the LimitRpmAdd value for an ACF engine
e2function void entity:acfCustomLimitRpmAdd( number limitrpm )
if not isEngine(this) then return end
if not isOwner(self, this) then return end
this:TriggerInput("LimitRpmAdd", limitrpm)
end
-- Sets the FlywheelMass value for an ACF engine

3
lua/entities/gmod_wire_expression2/core/custom/cl_acfcustomdescriptions.lua
View File

@ -21,7 +21,8 @@ E2Helper.Descriptions["acfCustomPower"] = "Returns the current power (in kW) of
E2Helper.Descriptions["acfCustomInPowerband"] = "Returns 1 if the ACF Custom engine RPM is inside the powerband."
E2Helper.Descriptions["acfCustomThrottle"] = "Gets/sets Throttle (0-100) for an ACF Custom engine."
E2Helper.Descriptions["acfCustomTqAdd"] = "Sets Torque Add for an ACF Custom engine."
E2Helper.Descriptions["acfCustomRpmAdd"] = "Add Rpm for an ACF Custom engine."
E2Helper.Descriptions["acfCustomMaxRpmAdd"] = "Sets Max Rpm Add for an ACF Custom engine."
E2Helper.Descriptions["acfCustomLimitRpmAdd"] = "Sets Limit Rpm Add for an ACF Custom engine."
E2Helper.Descriptions["acfCustomFlywheelMass"] = "Sets Flywheel Mass for an ACF Custom engine."
E2Helper.Descriptions["acfCustomIdle"] = "Sets Idle Rpm for an ACF Custom engine."
E2Helper.Descriptions["acfCustomDisableCut"] = "Sets Disable Cutoff(rev limiter) for an ACF Custom engine."

21
lua/weapons/gmod_tool/stools/acfcustom.lua
View File

@ -99,18 +99,14 @@ function TOOL:LeftClick( trace )
--Set Welding Chips to Trace.Entity
local Welding = false
if ClassMenu == "acf_chips" and Class == "prop_physics" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_engine" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_engine_custom" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_enginemaker" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_gearbox" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_gearboxcvt" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_gearboxair" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_gearboxauto" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_fueltank" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_rads" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_turbo" then Welding = true end
if ClassMenu == "acf_chips" and Class == "acf_supercharger" then Welding = true end
if Class == "prop_physics" and ClassMenu == "acf_chips" then Welding = true end
if Class == "acf_engine" and ClassMenu == "acf_chips" then Welding = true end
if Class == "acf_engine_custom" and ClassMenu == "acf_chips" then Welding = true end
if Class == "acf_enginemaker" and ClassMenu == "acf_chips" then Welding = true end
if Class == "acf_gearbox" and ClassMenu == "acf_chips" then Welding = true end
if Class == "acf_gearboxcvt" and ClassMenu == "acf_chips" then Welding = true end
if Class == "acf_gearboxair" and ClassMenu == "acf_chips" then Welding = true end
if Class == "acf_gearboxauto" and ClassMenu == "acf_chips" then Welding = true end
local bone = trace.PhysicsBone
@ -175,6 +171,7 @@ function TOOL:LeftClick( trace )
--Make ArgTable
local ArgTable2 = {}
ArgTable2[1] = trace.HitPos + trace.HitNormal
--ArgTable2[2] = trace.HitNormal:Angle():Up():Angle()
ArgTable2[2] = trace.HitNormal:Angle() + Angle(90,0,0)
for Number2, Key2 in pairs( ArgList[ACFCUSTOM.Weapons[Type][Id]["ent"]] ) do
ArgTable2[ Number2+2 ] = self:GetClientInfo( Key2 )

8
lua/weapons/gmod_tool/stools/acfsoundcustom.lua
View File

@ -17,7 +17,7 @@ local function ReplaceSound( ply , Entity , data)
timer.Simple(1, function()
if Entity:GetClass() == "acf_engine_custom" or Entity:GetClass() == "acf_enginemaker" then
Entity.SoundPath = sound
Entity.SoundPitch = ply:GetInfo("acfsoundcustom_pitch")
Entity.SoundPitch = ply:GetInfo("acfcustomsound_pitch")
elseif Entity:GetClass() == "acf_turbo" or Entity:GetClass() == "acf_supercharger" then
Entity.SoundPath = sound
end
@ -57,7 +57,7 @@ function TOOL:RightClick(trace)
local pl = self:GetOwner();
if trace.Entity:GetClass() == "acf_engine_custom" or trace.Entity:GetClass() == "acf_enginemaker" then
self:GetOwner():ConCommand("wire_soundemitter_sound "..trace.Entity.SoundPath);
self:GetOwner():ConCommand("acfsoundcustom_pitch "..trace.Entity.SoundPitch);
self:GetOwner():ConCommand("acfcustomsound_pitch "..trace.Entity.SoundPitch);
ACFCUSTOM_SendNotify( pl, true, "Engine Sound copied successfully!" );
elseif trace.Entity:GetClass() == "acf_turbo" or trace.Entity:GetClass() == "acf_supercharger" then
self:GetOwner():ConCommand("wire_soundemitter_sound "..trace.Entity.SoundPath);
@ -71,7 +71,7 @@ function TOOL:Reload( trace )
if trace.Entity:GetClass() == "acf_engine_custom" or trace.Entity:GetClass() == "acf_enginemaker" then
local Id = trace.Entity.Id
local List = list.Get("ACFCUSTOMEnts")
self:GetOwner():ConCommand("acfsoundcustom_pitch " ..(List["MobilityCustom"][Id]["pitch"] or 1));
self:GetOwner():ConCommand("acfcustomsound_pitch " ..(List["MobilityCustom"][Id]["pitch"] or 1));
ReplaceSound( self:GetOwner(), trace.Entity, {List["MobilityCustom"][Id]["sound"]} )
elseif trace.Entity:GetClass() == "acf_turbo" or trace.Entity:GetClass() == "acf_supercharger" then
local Id = trace.Entity.Id
@ -140,7 +140,7 @@ function TOOL.BuildCPanel(panel)
panel:AddControl("Slider", {
Label = "Pitch:",
Command = "acfsoundcustom_pitch",
Command = "acfcustomsound_pitch",
Type = "Float",
Min = "0.1",
Max = "2",