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

Updated to Revision 401 + Changelog

This commit is contained in:
Marc-André Fournier Boulet 2013-07-11 16:49:47 -04:00
parent 0415d59261
commit 85fe5c19c9
13 changed files with 195 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
changelog.txt Normal file
View File

@ -0,0 +1,9 @@
r398
--Repaired the Version Checker
*r399
--Added the changelog back
--Changed Ammo/Gearbox sliders.
*r401
--Merge branch master

6
changelogcustom.txt Normal file
View File

@ -0,0 +1,6 @@
r73
--Updated to Rev.396
*r74
--Updated to Rev.401
--Added Custom Changlog

152
lua/acf/client/cl_acfmenu_gui.lua
View File

@ -115,7 +115,6 @@ function PANEL:Init( )
for MobilityID,MobilityTable in pairs(self.WeaponDisplay["Mobility"]) do
local NodeAdd = Mobility
if MobilityTable.ent == "acf_engine" then
NodeAdd = Engines
if(MobilityTable.category) then
@ -298,7 +297,7 @@ function PANEL:UpdateDisplay( Table )
end
--Create the space to display the custom data
acfmenupanel.CustomDisplay = vgui.Create( "DPanelList", acfmenupanel )
acfmenupanel.CustomDisplay:SetSpacing( 5 )
acfmenupanel.CustomDisplay:SetSpacing( 10 )
acfmenupanel.CustomDisplay:EnableHorizontal( false )
acfmenupanel.CustomDisplay:EnableVerticalScrollbar( false )
acfmenupanel.CustomDisplay:SetSize( acfmenupanel:GetWide(), acfmenupanel:GetTall() )
@ -415,12 +414,12 @@ function ACFHomeGUICreate( Table )
acfmenupanel.CustomDisplay:AddItem( VersionT3 )
-- end version
VersionCustom = vgui.Create( "DLabel" )
VersionCustom:SetText("Custom Version: "..ACF.VersionCustom.."\n")
VersionCustom:SetTextColor(Color(0,0,250,255))
VersionCustom:SetFont( "DefaultBold" )
VersionCustom:SizeToContents()
acfmenupanel.CustomDisplay:AddItem( VersionCustom )
VersionCustomText = vgui.Create( "DLabel" )
VersionCustomText:SetText("Custom Version: "..ACF.VersionCustom.."\n")
VersionCustomText:SetTextColor(Color(0,0,250,255))
VersionCustomText:SetFont( "DefaultBold" )
VersionCustomText:SizeToContents()
acfmenupanel.CustomDisplay:AddItem( VersionCustomText )
------##### HELP CUSTOM MENU
HelpText1 = vgui.Create( "DButton" )
@ -442,28 +441,54 @@ function ACFHomeGUICreate( Table )
TextLog:SetFont( "DefaultBold" )
acfmenupanel.CustomDisplay:AddItem( TextLog )
acfmenupanel["CData"]["Changelist"] = vgui.Create( "DTree" )
for Rev,Changes in pairs(acfmenupanel.Changelog) do
--#################
if acfmenupanel.Changelog2 then
acfmenupanel["CData"]["Changelist2"] = vgui.Create( "DTree" )
for Rev2,Changes in pairs(acfmenupanel.Changelog2) do
local Node = acfmenupanel["CData"]["Changelist2"]:AddNode( "Rev "..Rev2 )
Node.mytable = {}
Node.mytable["rev2"] = Rev2
function Node:DoClick()
acfmenupanel:UpdateAttribs( Node.mytable )
end
Node.Icon:SetImage( "gui/silkicons/newspaper" )
end
acfmenupanel.CData.Changelist2:SetSize( acfmenupanel.CustomDisplay:GetWide(), 60 )
local Node = acfmenupanel["CData"]["Changelist"]:AddNode( "Rev "..Rev )
Node.mytable = {}
Node.mytable["rev"] = Rev
function Node:DoClick()
acfmenupanel:UpdateAttribs( Node.mytable )
end
Node.Icon:SetImage( "gui/silkicons/newspaper" )
acfmenupanel.CustomDisplay:AddItem( acfmenupanel["CData"]["Changelist2"] )
end
acfmenupanel.CData.Changelist:SetSize( acfmenupanel.CustomDisplay:GetWide(), 60 )
acfmenupanel.CustomDisplay:PerformLayout()
acfmenupanel:UpdateAttribs( {Rev2 = table.maxn(acfmenupanel.Changelog2)} )
end
--#################
acfmenupanel.CustomDisplay:AddItem( acfmenupanel["CData"]["Changelist"] )
acfmenupanel.CustomDisplay:PerformLayout()
acfmenupanel:UpdateAttribs( {rev = table.maxn(acfmenupanel.Changelog)} )
if acfmenupanel.Changelog then
acfmenupanel["CData"]["Changelist"] = vgui.Create( "DTree" )
for Rev,Changes in pairs(acfmenupanel.Changelog) do
local Node = acfmenupanel["CData"]["Changelist"]:AddNode( "Rev "..Rev )
Node.mytable = {}
Node.mytable["rev"] = Rev
function Node:DoClick()
acfmenupanel:UpdateAttribs( Node.mytable )
end
Node.Icon:SetImage( "gui/silkicons/newspaper" )
end
acfmenupanel.CData.Changelist:SetSize( acfmenupanel.CustomDisplay:GetWide(), 60 )
acfmenupanel.CustomDisplay:AddItem( acfmenupanel["CData"]["Changelist"] )
acfmenupanel.CustomDisplay:PerformLayout()
acfmenupanel:UpdateAttribs( {rev = table.maxn(acfmenupanel.Changelog)} )
end
end
function ACFHomeGUIUpdate( Table )
--acfmenupanel:CPanelText("Changelog", acfmenupanel.Changelog[Table["rev"]])
@ -475,14 +500,55 @@ function ACFHomeGUIUpdate( Table )
acfmenupanel.CustomDisplay:AddItem( TextLog2 )
acfmenupanel.CustomDisplay:PerformLayout()
TextLog3 = vgui.Create( "DLabel" )
TextLog3:SetText( acfmenupanel.Changelog[Table["rev2"]])
TextLog3:SetTextColor(Color(0,0,200,255))
TextLog3:SetFont( "DefaultBold" )
TextLog3:SizeToContents()
acfmenupanel.CustomDisplay:AddItem( TextLog3 )
acfmenupanel.CustomDisplay:PerformLayout()
local color
local versionstring
if ACF.Version >= ACF.CurrentVersion then
versionstring = "Up To Date"
color = Color(0,225,0,255)
else
versionstring = "Out Of Date"
color = Color(225,0,0,255)
end
acfmenupanel["CData"]["VersionText"]:SetText("\nACF Is "..versionstring.."!")
acfmenupanel["CData"]["VersionText"]:SetColor(color)
acfmenupanel["CData"]["VersionText"]:SetFont( "DefaultBold" )
acfmenupanel["CData"]["VersionText"]:SizeToContents()
acfmenupanel.CustomDisplay:AddItem( acfmenupanel["CData"]["VersionText"] )
local color2
local versionstring2
if ACF.Version2 >= ACF.CurrentVersion2 then
versionstring2 = "Up To Date"
color2 = Color(0,225,0,255)
else
versionstring2 = "Out Of Date"
color2 = Color(225,0,0,255)
end
VersionT3:SetText("ACF Custom Is "..versionstring2.."!\n")
VersionT3:SetColor(color2)
VersionT3:SetFont( "DefaultBold" )
VersionT3:SizeToContents()
acfmenupanel.CustomDisplay:AddItem( VersionT3 )
end
function ACFChangelogHTTPCallBack(contents , size)
local Temp = string.Explode( "*", contents )
acfmenupanel.Changelog = {}
for Key,String in pairs(Temp) do
acfmenupanel.Changelog[tonumber(string.sub(String,2,3))] = string.Trim(string.sub(String, 5))
acfmenupanel.Changelog[tonumber(string.sub(String,2,4))] = string.Trim(string.sub(String, 5))
end
table.SortByKey(acfmenupanel.Changelog,true)
@ -492,7 +558,24 @@ function ACFChangelogHTTPCallBack(contents , size)
acfmenupanel:UpdateDisplay( Table )
end
http.Fetch("http://acf.googlecode.com/svn/trunk/changelog.txt", ACFChangelogHTTPCallBack, function() end)
http.Fetch("http://raw.github.com/nrlulz/ACF/master/changelog.txt", ACFChangelogHTTPCallBack, function() end)
function ACFChangelog2HTTPCallBack(contents , size)
local Temp2 = string.Explode( "*", contents )
acfmenupanel.Changelog2 = {}
for Key,String in pairs(Temp2) do
acfmenupanel.Changelog2[tonumber(string.sub(String,2,4))] = string.Trim(string.sub(String, 5))
end
table.SortByKey(acfmenupanel.Changelog2,true)
local Table = {}
Table.guicreate = (function( Panel, Table ) ACFHomeGUICreate( Table ) end or nil)
Table.guiupdate = (function( Panel, Table ) ACFHomeGUIUpdate( Table ) end or nil)
acfmenupanel:UpdateDisplay( Table )
end
http.Fetch("https://raw.github.com/bouletmarc/ACF_CustomMod/master/changelogcustom.txt", ACFChangelog2HTTPCallBack, function() end)
function PANEL:AmmoSelect( Blacklist )
@ -541,10 +624,16 @@ function PANEL:AmmoSlider(Name, Value, Min, Max, Decimals, Title, Desc) --Variab
if not acfmenupanel["CData"][Name] then
acfmenupanel["CData"][Name] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Name]:SetText( Title )
acfmenupanel["CData"][Name].Label:SetSize( 0 ) --Note : this is intentional
acfmenupanel["CData"][Name]:SetTall( 50 ) -- make the slider taller to fit the new label
acfmenupanel["CData"][Name]:SetMin( 0 )
acfmenupanel["CData"][Name]:SetMax( 1000 )
acfmenupanel["CData"][Name]:SetDecimals( Decimals )
acfmenupanel["CData"][Name.."_label"] = vgui.Create( "DLabel", acfmenupanel["CData"][Name]) -- recreating the label
acfmenupanel["CData"][Name.."_label"]:SetPos( 0,0 )
acfmenupanel["CData"][Name.."_label"]:SetText( Title )
acfmenupanel["CData"][Name.."_label"]:SizeToContents()
acfmenupanel["CData"][Name.."_label"]:SetDark( true )
if acfmenupanel.AmmoData[Name] then
acfmenupanel["CData"][Name]:SetValue(acfmenupanel.AmmoData[Name])
end
@ -563,6 +652,8 @@ function PANEL:AmmoSlider(Name, Value, Min, Max, Decimals, Title, Desc) --Variab
if not acfmenupanel["CData"][Name.."_text"] and Desc then
acfmenupanel["CData"][Name.."_text"] = vgui.Create( "DLabel" )
acfmenupanel["CData"][Name.."_text"]:SetText( Desc or "" )
acfmenupanel["CData"][Name.."_text"]:SetDark( true )
acfmenupanel["CData"][Name.."_text"]:SetTall( 20 )
acfmenupanel.CustomDisplay:AddItem( acfmenupanel["CData"][Name.."_text"] )
end
acfmenupanel["CData"][Name.."_text"]:SetText( Desc )
@ -576,6 +667,7 @@ function PANEL:AmmoCheckbox(Name, Title, Desc) --Variable name in the table, sli
if not acfmenupanel["CData"][Name] then
acfmenupanel["CData"][Name] = vgui.Create( "DCheckBoxLabel" )
acfmenupanel["CData"][Name]:SetText( Title or "" )
acfmenupanel["CData"][Name]:SetDark( true )
acfmenupanel["CData"][Name]:SizeToContents()
if acfmenupanel.AmmoData[Name] != nil then
acfmenupanel["CData"][Name]:SetChecked(acfmenupanel.AmmoData[Name])
@ -594,6 +686,7 @@ function PANEL:AmmoCheckbox(Name, Title, Desc) --Variable name in the table, sli
if not acfmenupanel["CData"][Name.."_text"] and Desc then
acfmenupanel["CData"][Name.."_text"] = vgui.Create( "DLabel" )
acfmenupanel["CData"][Name.."_text"]:SetText( Desc or "" )
acfmenupanel["CData"][Name.."_text"]:SetDark( true )
acfmenupanel.CustomDisplay:AddItem( acfmenupanel["CData"][Name.."_text"] )
end
acfmenupanel["CData"][Name.."_text"]:SetText( Desc )
@ -607,6 +700,7 @@ function PANEL:CPanelText(Name, Desc)
if not acfmenupanel["CData"][Name.."_text"] then
acfmenupanel["CData"][Name.."_text"] = vgui.Create( "DLabel" )
acfmenupanel["CData"][Name.."_text"]:SetText( Desc or "" )
acfmenupanel["CData"][Name.."_text"]:SetDark( true )
acfmenupanel["CData"][Name.."_text"]:SetWrap(true)
acfmenupanel["CData"][Name.."_text"]:SetAutoStretchVertical( true )
acfmenupanel.CustomDisplay:AddItem( acfmenupanel["CData"][Name.."_text"] )

7
lua/autorun/acf_globals.lua
View File

@ -2,11 +2,11 @@ ACF = {}
ACF.AmmoTypes = {}
ACF.MenuFunc = {}
ACF.AmmoBlacklist = {}
ACF.Version = 397 -- Make sure to change this as the version goes up or the update check is for nothing! -wrex
ACF.Version = 401 -- Make sure to change this as the version goes up or the update check is for nothing! -wrex
ACF.CurrentVersion = 0 -- just defining a variable, do not change
--##############
ACF.VersionCustom = 7.13
ACF.Version2 = 73
ACF.VersionCustom = 7.14
ACF.Version2 = 74
ACF.CurrentVersion2 = 0
print("[[ ACF Loaded ]]")
@ -264,7 +264,6 @@ function ACF_UpdateChecking( )
end
ACF_UpdateChecking( )
function ACF_ChatVersionPrint(ply)
if not ACF.Version or ACF.Version < ACF.CurrentVersion then
timer.Simple( 2,function()

2
lua/entities/ACF_Chips/cl_init.lua
View File

@ -101,6 +101,7 @@ function ACF_ChipSlider1(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Torque Adding "..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 10 )
acfmenupanel["CData"][Mod]:SetMax( 1000 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -122,6 +123,7 @@ function ACF_ChipSlider2(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Adding "..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 100 )
acfmenupanel["CData"][Mod]:SetMax( 5000 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )

5
lua/entities/ACF_Engine2/cl_init.lua
View File

@ -117,6 +117,7 @@ function ACF_ModingSlider1(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Torque"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 40 )
acfmenupanel["CData"][Mod]:SetMax( 1000 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -138,6 +139,7 @@ function ACF_ModingSlider2(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Idle Rpm"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 600 )
acfmenupanel["CData"][Mod]:SetMax( 1500 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -159,6 +161,7 @@ function ACF_ModingSlider3(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Peak Minimum Rpm"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 1300 )
acfmenupanel["CData"][Mod]:SetMax( 4500 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -180,6 +183,7 @@ function ACF_ModingSlider4(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Rpm"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 4500 )
acfmenupanel["CData"][Mod]:SetMax( 12000 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -201,6 +205,7 @@ function ACF_ModingSlider5(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Flywheel Mass"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 0.01 )
acfmenupanel["CData"][Mod]:SetMax( 1 )
acfmenupanel["CData"][Mod]:SetDecimals( 2 )

5
lua/entities/ACF_Engine4/cl_init.lua
View File

@ -117,6 +117,7 @@ function ACF_ModdingSlider1(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Torque"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 950 )
acfmenupanel["CData"][Mod]:SetMax( 3000 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -138,6 +139,7 @@ function ACF_ModdingSlider2(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Idle Rpm"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 300 )
acfmenupanel["CData"][Mod]:SetMax( 1000 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -159,6 +161,7 @@ function ACF_ModdingSlider3(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Peak Minimum Rpm"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 500 )
acfmenupanel["CData"][Mod]:SetMax( 2000 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -180,6 +183,7 @@ function ACF_ModdingSlider4(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Rpm"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 1500 )
acfmenupanel["CData"][Mod]:SetMax( 6500 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )
@ -201,6 +205,7 @@ function ACF_ModdingSlider5(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Flywheel Mass"..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 1 )
acfmenupanel["CData"][Mod]:SetMax( 8 )
acfmenupanel["CData"][Mod]:SetDecimals( 1 )

6
lua/entities/ACF_Gearbox2/cl_init.lua
View File

@ -122,6 +122,7 @@ function ACF_CvtSlider1(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Gear "..Gear )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( -1 )
acfmenupanel["CData"][Gear]:SetMax( 1 )
acfmenupanel["CData"][Gear]:SetDecimals( 2 )
@ -143,6 +144,7 @@ function ACF_CvtSlider2(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Rpm maximum"..Gear )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 1500 )
acfmenupanel["CData"][Gear]:SetMax( 10000 )
acfmenupanel["CData"][Gear]:SetDecimals( 0 )
@ -164,6 +166,7 @@ function ACF_CvtSlider3(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Ratio Minimum"..Gear )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 0.001 )
acfmenupanel["CData"][Gear]:SetMax( 0.5 )
acfmenupanel["CData"][Gear]:SetDecimals( 3 )
@ -185,6 +188,7 @@ function ACF_CvtSlider4(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Ratio Maximum"..Gear )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 0.25 )
acfmenupanel["CData"][Gear]:SetMax( 2 )
acfmenupanel["CData"][Gear]:SetDecimals( 2 )
@ -206,6 +210,7 @@ function ACF_CvtSlider5(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Rpm minimum"..Gear )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 1000 )
acfmenupanel["CData"][Gear]:SetMax( 8000 )
acfmenupanel["CData"][Gear]:SetDecimals( 0 )
@ -227,6 +232,7 @@ function ACF_CvtSlider6(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Declutch Rpm"..Gear )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 1000 )
acfmenupanel["CData"][Gear]:SetMax( 4000 )
acfmenupanel["CData"][Gear]:SetDecimals( 0 )

6
lua/entities/ACF_Gearbox3/cl_init.lua
View File

@ -131,6 +131,7 @@ function ACF_AutoSlider1(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Gear "..Gear )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 0.01 )
acfmenupanel["CData"][Gear]:SetMax( 1 )
acfmenupanel["CData"][Gear]:SetDecimals( 2 )
@ -152,6 +153,7 @@ function ACF_AutoSlider2(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Reverse Gear" )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( -1 )
acfmenupanel["CData"][Gear]:SetMax( -0.01 )
acfmenupanel["CData"][Gear]:SetDecimals( 2 )
@ -173,6 +175,7 @@ function ACF_AutoSlider3(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Declutch Rpm" )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 1000 )
acfmenupanel["CData"][Gear]:SetMax( 4000 )
acfmenupanel["CData"][Gear]:SetDecimals( 0 )
@ -194,6 +197,7 @@ function ACF_AutoSlider4(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Minimum Rpm" )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 2000 )
acfmenupanel["CData"][Gear]:SetMax( 6000 )
acfmenupanel["CData"][Gear]:SetDecimals( 0 )
@ -215,6 +219,7 @@ function ACF_AutoSlider5(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Maximum Rpm" )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 4000 )
acfmenupanel["CData"][Gear]:SetMax( 15000 )
acfmenupanel["CData"][Gear]:SetDecimals( 0 )
@ -236,6 +241,7 @@ function ACF_AutoSlider6(Gear, Value, ID, Desc)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Final Drive" )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetMin( 0.05 )
acfmenupanel["CData"][Gear]:SetMax( 1 )
acfmenupanel["CData"][Gear]:SetDecimals( 2 )

1
lua/entities/ACF_Nos/cl_init.lua
View File

@ -97,6 +97,7 @@ function ACF_NosSlider1(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Torque Adding "..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 20 )
acfmenupanel["CData"][Mod]:SetMax( 200 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )

1
lua/entities/ACF_Vtec/cl_init.lua
View File

@ -95,6 +95,7 @@ function ACF_VtecSlider(Mod, Value, ID, Desc)
if Mod and not acfmenupanel["CData"][Mod] then
acfmenupanel["CData"][Mod] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Mod]:SetText( Desc or "Kick Rpm "..Mod )
acfmenupanel["CData"][Mod].Label:SizeToContents()
acfmenupanel["CData"][Mod]:SetMin( 1500 )
acfmenupanel["CData"][Mod]:SetMax( 8000 )
acfmenupanel["CData"][Mod]:SetDecimals( 0 )

31
lua/entities/acf_gearbox/cl_init.lua
View File

@ -66,7 +66,12 @@ function ACFGearboxGUICreate( Table )
acfmenupanel.GearboxData[Table.id]["GearTable"] = Table.geartable
end
acfmenupanel:CPanelText("Name", Table.name)
--acfmenupanel:CPanelText("Name", Table.name)
TextName = vgui.Create( "DLabel" )
TextName:SetText( "Name : "..Table.name)
TextName:SetTextColor(Color(0,0,200,255))
TextName:SetFont( "CloseCaption_BoldItalic" )
acfmenupanel.CustomDisplay:AddItem( TextName )
acfmenupanel.CData.DisplayModel = vgui.Create( "DModelPanel", acfmenupanel.CustomDisplay )
acfmenupanel.CData.DisplayModel:SetModel( Table.model )
@ -77,7 +82,12 @@ function ACFGearboxGUICreate( Table )
acfmenupanel.CData.DisplayModel.LayoutEntity = function( panel , entity ) end
acfmenupanel.CustomDisplay:AddItem( acfmenupanel.CData.DisplayModel )
acfmenupanel:CPanelText("Desc", Table.desc) --Description (Name, Desc)
--acfmenupanel:CPanelText("Desc", Table.desc)
TextDesc = vgui.Create( "DLabel" )
TextDesc:SetText( "Desc : "..Table.desc)
TextDesc:SetTextColor(Color(0,0,200,255))
TextDesc:SetFont( "DefaultBold" )
acfmenupanel.CustomDisplay:AddItem( TextDesc )
if (acfmenupanel.GearboxData[Table.id]["GearTable"][-2] or 0) != 0 then
ACF_GearsSlider(2, acfmenupanel.GearboxData[Table.id]["GearTable"][2], Table.id)
@ -95,9 +105,19 @@ function ACFGearboxGUICreate( Table )
end
end
acfmenupanel:CPanelText("Desc", Table.desc)
acfmenupanel:CPanelText("MaxTorque", "Clutch Maximum Torque Rating : "..(Table.maxtq).."n-m / "..math.Round(Table.maxtq*0.73).."ft-lb")
acfmenupanel:CPanelText("Weight", "Weight : "..Table.weight.."kg")
--acfmenupanel:CPanelText("Desc", Table.desc)
--acfmenupanel:CPanelText("MaxTorque", "Clutch Maximum Torque Rating : "..(Table.maxtq).."n-m / "..math.Round(Table.maxtq*0.73).."ft-lb")
TextTorque = vgui.Create( "DLabel" )
TextTorque:SetText( "Max Torque Rating : "..(Table.maxtq).."n-m / "..math.Round(Table.maxtq*0.73).."ft-lb")
TextTorque:SetTextColor(Color(0,0,200,255))
TextTorque:SetFont( "DefaultBold" )
acfmenupanel.CustomDisplay:AddItem( TextTorque )
--acfmenupanel:CPanelText("Weight", "Weight : "..(Table.weight).." kg")
TextWeight = vgui.Create( "DLabel" )
TextWeight:SetText( "Weight : "..(Table.weight).." kg")
TextWeight:SetTextColor(Color(0,0,200,255))
TextWeight:SetFont( "DefaultBold" )
acfmenupanel.CustomDisplay:AddItem( TextWeight )
acfmenupanel.CustomDisplay:PerformLayout()
maxtorque = Table.maxtq
@ -108,6 +128,7 @@ function ACF_GearsSlider(Gear, Value, ID, Desc, CVT)
if Gear and not acfmenupanel["CData"][Gear] then
acfmenupanel["CData"][Gear] = vgui.Create( "DNumSlider", acfmenupanel.CustomDisplay )
acfmenupanel["CData"][Gear]:SetText( Desc or "Gear "..Gear )
acfmenupanel["CData"][Gear].Label:SizeToContents()
acfmenupanel["CData"][Gear]:SetDark( true )
acfmenupanel["CData"][Gear]:SetMin( CVT and 1 or -1 )
acfmenupanel["CData"][Gear]:SetMax( CVT and 10000 or 1 )

6
lua/entities/acf_gun/init.lua
View File

@ -236,7 +236,7 @@ end
function ENT:TriggerInput( iname , value )
if (iname == "Unload" and value > 0) then
timer.Simple( 0, self.UnloadAmmo() )
self:UnloadAmmo()
elseif ( iname == "Fire" and value > 0 and ACF.GunfireEnabled ) then
if self.NextFire < CurTime() then
self.User = self:GetUser(self.Inputs["Fire"].Src)
@ -247,10 +247,8 @@ function ENT:TriggerInput( iname , value )
self.Firing = true
elseif ( iname == "Fire" and value <= 0 ) then
self.Firing = false
elseif ( iname == "Reload" and value > 0 ) then
elseif ( iname == "Reload" and value ~= 0 ) then
self.Reloading = true
elseif ( iname == "Reload" and value <= 0 ) then
self.Reloading = false
end
end