[ BETA ] Mobility Update v2.12.7-beta

lua/acf/contraption/contraption_sv.lua

@@ -143,7 +143,7 @@ function Contraption.CalcMassRatio(Ent, Tally)
 			if Tally then
 				local Class = K:GetClass()
 
-				if Class == "acf_engine" then
+				if Class == "acf_engine" or Class == "acf_engine_update" then
 					Power = Power + K.PeakPower * 1.34
 				elseif Class == "acf_fueltank" then
 					Fuel = Fuel + K.Capacity
@@ -180,7 +180,7 @@ function Contraption.CalcMassRatio(Ent, Tally)
 			if Tally then
 				local Class = K:GetClass()
 
-				if Class == "acf_engine" then
+				if Class == "acf_engine" or Class == "acf_engine_update" then
 					Power = Power + K.PeakPower * 1.34
 				elseif Class == "acf_fueltank" then
 					Fuel = Fuel + K.Capacity

lua/acf/core/globals.lua

@@ -29,6 +29,7 @@ do -- ACF global vars
 	ACF.MinimumArmor       = 1 -- Minimum possible armor that can be given to an entity
 	ACF.MaximumArmor       = 5000 -- Maximum possible armor that can be given to an entity
 	ACF.KillIconColor      = Color(200, 200, 48)
+	ACF.MobilityUpdate	   = true -- Enable beta test of the new mobility system
 
 	ACF.GunsCanFire        = true
 	ACF.GunsCanSmoke       = true

lua/acf/core/utilities/util_cl.lua

@@ -97,6 +97,21 @@ do -- Default gearbox menus
 				Base:AddLabel("The dual clutch allows you to apply power and brake each side independently.")
 			end
 
+			ACF.SetClientData("PrimaryClass","acf_gearbox")
+
+			if Data.ClassID ~= "DoubleDiff" then
+				local MobilityUpdate = Base:AddCheckBox("[BETA] Enables new mobility logic")
+				MobilityUpdate:SetClientData("MobilityUpdate", "OnChange")
+				MobilityUpdate:DefineSetter(function(Panel, _, _, Value)
+					Panel:SetValue(Value)
+					if Value then
+						ACF.SetClientData("PrimaryClass","acf_gearbox_update")
+					else
+						ACF.SetClientData("PrimaryClass","acf_gearbox")
+					end
+					return Value
+				end)
+			end
 			-----------------------------------
 
 			local GearBase = Menu:AddCollapsible("Gear Settings")
@@ -117,7 +132,7 @@ do -- Default gearbox menus
 
 				ACF.SetClientData(Variable, Default)
 
-				local Control = GearBase:AddSlider("Gear " .. I, -1, 1, 2)
+				local Control = GearBase:AddSlider("Gear " .. I, -10, 10, 3)
 				Control:SetClientData(Variable, "OnValueChanged")
 				Control:DefineSetter(function(Panel, _, _, Value)
 					Value = math.Round(Value, 2)
@@ -136,7 +151,7 @@ do -- Default gearbox menus
 
 			ACF.SetClientData("FinalDrive", ValuesData.FinalDrive)
 
-			local FinalDrive = GearBase:AddSlider("Final Drive", -1, 1, 2)
+			local FinalDrive = GearBase:AddSlider("Final Drive", -10, 10, 3)
 			FinalDrive:SetClientData("FinalDrive", "OnValueChanged")
 			FinalDrive:DefineSetter(function(Panel, _, _, Value)
 				Value = math.Round(Value, 2)
@@ -147,6 +162,46 @@ do -- Default gearbox menus
 
 				return Value
 			end)
+
+			local RatioConverter = GearBase:AddButton("Convert Ratios")
+			function RatioConverter:DoClickInternal()
+				if ValuesData.FinalDrive ~= 0 then
+					local FinalDrive = 1 / ValuesData.FinalDrive
+					ValuesData.FinalDrive = FinalDrive
+					ACF.SetClientData("FinalDrive", ValuesData.FinalDrive)
+				end
+
+				for I = 1, Gears.Max do
+					local Variable = "Gear" .. I
+					if ValuesData[Variable] ~= 0 then
+						local Ratio = 1 / ValuesData[Variable]
+						ValuesData[Variable] = Ratio
+						ACF.SetClientData(Variable, Ratio)
+					end
+
+				end
+			end
+
+			local PasteCopiedData = GearBase:AddButton("Paste Copied Ratios")
+			function PasteCopiedData:DoClickInternal()
+				if ACF.GetClientString("CopiedGearboxData","No Data") == "No Data" then return end
+				local CopiedData = util.JSONToTable(ACF.GetClientString("CopiedGearboxData","No Data"))
+				table.SortByMember(CopiedData, "Key", true)
+
+				local Ratios = CopiedData[3]["Value"]
+				local FinalDrive = CopiedData[1]["Value"]
+
+				for I = 1, Gears.Max do
+					if Ratios[I] ~= nil then
+						local Variable = "Gear" .. I
+						ValuesData[Variable] = Ratios[I]
+						ACF.SetClientData(Variable, ValuesData[Variable])
+					end
+				end
+
+				ValuesData["FinalDrive"] = FinalDrive
+				ACF.SetClientData("FinalDrive",ValuesData["FinalDrive"])
+			end
 		end
 	end
 
@@ -155,9 +210,9 @@ do -- Default gearbox menus
 			{
 				Name = "Gear 2",
 				Variable = "Gear2",
-				Min = -1,
-				Max = 1,
-				Decimals = 2,
+				Min = -10,
+				Max = 10,
+				Decimals = 3,
 				Default = -0.1,
 			},
 			{
@@ -172,16 +227,16 @@ do -- Default gearbox menus
 				Name = "Max Target RPM",
 				Variable = "MaxRPM",
 				Min = 101,
-				Max = 10000,
+				Max = 12000,
 				Decimals = 0,
 				Default = 5000,
 			},
 			{
 				Name = "Final Drive",
 				Variable = "FinalDrive",
-				Min = -1,
-				Max = 1,
-				Decimals = 2,
+				Min = -10,
+				Max = 10,
+				Decimals = 3,
 				Default = 1,
 			},
 		}
@@ -190,13 +245,28 @@ do -- Default gearbox menus
 			local Text = "Mass : %s\nTorque Rating : %s n/m - %s fl-lb\n"
 			local Mass = ACF.GetProperMass(Data.Mass)
 			local Torque = math.floor(Data.MaxTorque * 0.73)
-
+			local Gears = Class.Gears
 			Base:AddLabel(Text:format(Mass, Data.MaxTorque, Torque))
 
 			if Data.DualClutch then
 				Base:AddLabel("The dual clutch allows you to apply power and brake each side independently.")
 			end
 
+			ACF.SetClientData("PrimaryClass","acf_gearbox")
+
+			local MobilityUpdate = Base:AddCheckBox("[BETA] Enables new mobility logic")
+			MobilityUpdate:SetClientData("MobilityUpdate", "OnChange")
+			MobilityUpdate:DefineSetter(function(Panel, _, _, Value)
+				Panel:SetValue(Value)
+				if Value then
+					ACF.SetClientData("PrimaryClass","acf_gearbox_update")
+				else
+					ACF.SetClientData("PrimaryClass","acf_gearbox")
+				end
+				return Value
+			end)
+
+			Base:AddLabel("With the mobility update enabled \"Max Target RPM\" is unused.")
 			-----------------------------------
 
 			local GearBase = Menu:AddCollapsible("Gear Settings")
@@ -205,7 +275,7 @@ do -- Default gearbox menus
 
 			local ValuesData = Values[Class.ID]
 
-			ACF.SetClientData("Gear1", 0.01)
+			ACF.SetClientData("Gear1", 0.001)
 
 			for _, GearData in ipairs(CVTData) do
 				local Variable = GearData.Variable
@@ -231,6 +301,39 @@ do -- Default gearbox menus
 					return Value
 				end)
 			end
+
+			local RatioConverter = GearBase:AddButton("Convert Ratios")
+			function RatioConverter:DoClickInternal()
+				if ValuesData.FinalDrive ~= 0 then
+					local FinalDrive = 1 / ValuesData.FinalDrive
+					ValuesData.FinalDrive = FinalDrive
+					ACF.SetClientData("FinalDrive", ValuesData.FinalDrive)
+				end
+				local Gear2 = 1 / ValuesData.Gear2
+				ValuesData.Gear2 = Gear2
+				ACF.SetClientData("Gear2",Gear2)
+			end
+
+			local PasteCopiedData = GearBase:AddButton("Paste Copied Ratios")
+			function PasteCopiedData:DoClickInternal()
+				if ACF.GetClientString("CopiedGearboxData","No Data") == "No Data" then return end
+				local CopiedData = util.JSONToTable(ACF.GetClientString("CopiedGearboxData","No Data"))
+				table.SortByMember(CopiedData, "Key", true)
+
+				local Ratios = CopiedData[3]["Value"]
+				local FinalDrive = CopiedData[1]["Value"]
+
+				for I = 1, Gears.Max do
+					if Ratios[I] ~= nil then
+						local Variable = "Gear" .. I
+						ValuesData[Variable] = Ratios[I]
+						ACF.SetClientData(Variable, ValuesData[Variable])
+					end
+				end
+
+				ValuesData["FinalDrive"] = FinalDrive
+				ACF.SetClientData("FinalDrive",ValuesData["FinalDrive"])
+			end
 		end
 	end
 
@@ -297,6 +400,7 @@ do -- Default gearbox menus
 				Base:AddLabel("The dual clutch allows you to apply power and brake each side independently.")
 			end
 
+			ACF.SetClientData("PrimaryClass","acf_gearbox")
 			-----------------------------------
 
 			local GearBase = Menu:AddCollapsible("Gear Settings")
@@ -456,6 +560,27 @@ do -- Default gearbox menus
 					ACF.SetClientData("Shift" .. I, Gear * Multiplier)
 				end
 			end
+
+			local PasteCopiedData = GearBase:AddButton("Paste Copied Ratios")
+			function PasteCopiedData:DoClickInternal()
+				if ACF.GetClientString("CopiedGearboxData","No Data") == "No Data" then return end
+				local CopiedData = util.JSONToTable(ACF.GetClientString("CopiedGearboxData","No Data"))
+				table.SortByMember(CopiedData, "Key", true)
+
+				local Ratios = CopiedData[3]["Value"]
+				local FinalDrive = CopiedData[1]["Value"]
+
+				for I = 1, Gears.Max do
+					if Ratios[I] ~= nil then
+						local Variable = "Gear" .. I
+						ValuesData[Variable] = Ratios[I]
+						ACF.SetClientData(Variable, ValuesData[Variable])
+					end
+				end
+
+				ValuesData["FinalDrive"] = FinalDrive
+				ACF.SetClientData("FinalDrive",ValuesData["FinalDrive"])
+			end
 		end
 	end
 end

lua/acf/entities/engines/b4.lua

@@ -17,6 +17,8 @@ do
 		Mass		 = 60,
 		Torque		 = 131,
 		FlywheelMass = 0.06,
+		FlywheelMassUpdate = 8,
+		Displacement = 1.4,
 		RPM = {
 			Idle	= 600,
 			Limit	= 4500,
@@ -36,6 +38,8 @@ do
 		Mass		 = 125,
 		Torque		 = 225,
 		FlywheelMass = 0.15,
+		FlywheelMassUpdate = 11,
+		Displacement = 2.1,
 		RPM = {
 			Idle	= 700,
 			Limit	= 5000,
@@ -55,6 +59,8 @@ do
 		Mass		 = 135,
 		Torque		 = 310,
 		FlywheelMass = 0.4,
+		FlywheelMassUpdate = 25,
+		Displacement = 2.4,
 		RPM = {
 			Idle	= 550,
 			Limit	= 2800,
@@ -74,6 +80,8 @@ do
 		Mass		 = 210,
 		Torque		 = 315,
 		FlywheelMass = 0.15,
+		FlywheelMassUpdate = 13,
+		Displacement = 3.2,
 		RPM = {
 			Idle	= 900,
 			Limit	= 6500

lua/acf/entities/engines/b6.lua

@@ -17,6 +17,8 @@ do
 		Mass		 = 100,
 		Torque		 = 170,
 		FlywheelMass = 0.08,
+		FlywheelMassUpdate = 7,
+		Displacement = 2.8,
 		RPM = {
 			Idle	= 750,
 			Limit	= 7250,
@@ -36,6 +38,8 @@ do
 		Mass		 = 240,
 		Torque		 = 412,
 		FlywheelMass = 0.11,
+		FlywheelMassUpdate = 13,
+		Displacement = 5.0,
 		RPM = {
 			Idle	= 900,
 			Limit	= 6800,
@@ -55,6 +59,8 @@ do
 		Mass		 = 480,
 		Torque		 = 606,
 		FlywheelMass = 0.65,
+		FlywheelMassUpdate = 35,
+		Displacement = 8.3,
 		RPM = {
 			Idle	= 500,
 			Limit	= 4200,
@@ -74,6 +80,8 @@ do
 		Mass		 = 725,
 		Torque		 = 1375,
 		FlywheelMass = 1,
+		FlywheelMassUpdate = 60,
+		Displacement = 15.8,
 		RPM = {
 			Idle	= 620,
 			Limit	= 4900,
@@ -93,6 +101,8 @@ do
 		Mass		 = 1600,
 		Torque		 = 1995,
 		FlywheelMass = 3,
+		FlywheelMassUpdate = 125,
+		Displacement = 14.5,
 		RPM = {
 			Idle	= 620,
 			Limit	= 2550,