Skip to content
This repository has been archived by the owner on Jan 19, 2019. It is now read-only.

Commit

Permalink
v3.2 build 5
Browse files Browse the repository at this point in the history 
#423
  • Loading branch information
@Mogli12
Mogli12 committed Sep 24, 2018
1 parent b58df2a commit 8282527
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 27 deletions.
Binary file modified FS17_GearboxAddon.zip
View file
Binary file not shown.
7 changes: 1 addition & 6 deletions FS17_GearboxAddon/gearboxMogli.lua
View file
Expand Up @@ -3899,11 +3899,7 @@ function gearboxMogli:update(dt)

local clutchSpeed = 1 / math.max( self.mrGbMS.ClutchShiftTime, 1 )

if self.mrGbMS.Hydrostatic and self.mrGbMS.HydrostaticLaunch then
if self.mrGbMS.ManualClutch < 1 then
self:mrGbMSetManualClutch( 1 )
end
elseif gearboxMogli.mbIsInputPressed( "gearboxMogliCLUTCH_3" ) then
if gearboxMogli.mbIsInputPressed( "gearboxMogliCLUTCH_3" ) then
self.mrGbML.oneButtonClutchTimer = g_currentMission.time + 100
self:mrGbMSetState( "AutoCloseTimer", self.mrGbML.oneButtonClutchTimer )

Expand All @@ -3912,7 +3908,6 @@ function gearboxMogli:update(dt)
else
self:mrGbMSetManualClutch( math.max( 0, self.mrGbMS.ManualClutch - dt / math.max( self.mrGbMS.ClutchShiftTime * ( self.mrGbMS.ClutchSpeedOneButton - 1 ) * 0.1, 1 ) ))
end
--self:mrGbMSetState( "AutoCloseTimer", self.mrGbML.oneButtonClutchTimer + self.mrGbMS.ManualClutch * self.mrGbMS.ClutchTimeManual )
elseif InputBinding.gearboxMogliCLUTCH ~= nil then
local targetClutchPercent = InputBinding.getDigitalInputAxis(InputBinding.gearboxMogliCLUTCH)
if InputBinding.isAxisZero(targetClutchPercent) then
Expand Down
6 changes: 3 additions & 3 deletions FS17_GearboxAddon/gearboxMogliMotor.lua
View file
Expand Up @@ -2185,7 +2185,9 @@ function gearboxMogliMotor:mrGbMUpdateGear( accelerationPedalRaw, doHandbrake )
targetRequiredRpm = math.max( targetRequiredRpm, result * self.original.ptoMotorRpmRatio )
end
end
if self.vehicle.mrGbMS.ToolIsDirty and lastNoTransmission then
if self.vehicle.mrGbMS.ToolIsDirty
and lastNoTransmission
and not ( g_modIsLoaded["FS17_RpmDependentControls"] ) then
targetRequiredRpm = math.max( targetRequiredRpm, self.vehicle.mrGbMS.HydraulicRpm )
end

Expand Down Expand Up @@ -4577,8 +4579,6 @@ function gearboxMogliMotor:mrGbMUpdateGear( accelerationPedalRaw, doHandbrake )

if self.noTransmission then
self.clutchPercent = 0
elseif self.vehicle.mrGbMS.Hydrostatic and self.vehicle.mrGbMS.HydrostaticLaunch then
self.clutchPercent = 1
else
if self.vehicle:mrGbMGetAutoClutch()
or self.vehicle.mrGbMS.TorqueConverterOrHydro then
Expand Down
18 changes: 9 additions & 9 deletions FS17_GearboxAddon/modDesc.xml
View file
Expand Up @@ -2,19 +2,19 @@
<modDesc descVersion="38">
<author>Mogli aka Biedens</author>
<iconFilename>dds/store.dds</iconFilename>
<version>3.1.0.4</version>
<version>3.1.0.5</version>
<multiplayer supported="true"/>

<l10n filenamePrefix="modDesc_l10n">
<text name="gearboxMogliVERSION">
<de>Getriebe v3.2 build 4 von Mogli</de>
<en>Gearbox v3.2 build 4 by mogli</en>
<it>Cambio v3.2 build 4 by mogli</it>
<fr>Transmission v3.2 build 4 by mogli</fr>
<cz>Řazení v3.2 build 4 by mogli</cz>
<pl>Skrzynia biegów v3.2 build 4 by mogli</pl>
<ru>Gearbox v3.2 build 4 by mogli</ru>
<ro>Gearbox v3.2 build 4 by mogli</ro>
<de>Getriebe v3.2 build 5 von Mogli</de>
<en>Gearbox v3.2 build 5 by mogli</en>
<it>Cambio v3.2 build 5 by mogli</it>
<fr>Transmission v3.2 build 5 by mogli</fr>
<cz>Řazení v3.2 build 5 by mogli</cz>
<pl>Skrzynia biegów v3.2 build 5 by mogli</pl>
<ru>Gearbox v3.2 build 5 by mogli</ru>
<ro>Gearbox v3.2 build 5 by mogli</ro>
</text>
</l10n>

Expand Down
7 changes: 1 addition & 6 deletions src/gearboxMogli.lua
View file
Expand Up @@ -3899,11 +3899,7 @@ function gearboxMogli:update(dt)

local clutchSpeed = 1 / math.max( self.mrGbMS.ClutchShiftTime, 1 )

if self.mrGbMS.Hydrostatic and self.mrGbMS.HydrostaticLaunch then
if self.mrGbMS.ManualClutch < 1 then
self:mrGbMSetManualClutch( 1 )
end
elseif gearboxMogli.mbIsInputPressed( "gearboxMogliCLUTCH_3" ) then
if gearboxMogli.mbIsInputPressed( "gearboxMogliCLUTCH_3" ) then
self.mrGbML.oneButtonClutchTimer = g_currentMission.time + 100
self:mrGbMSetState( "AutoCloseTimer", self.mrGbML.oneButtonClutchTimer )

Expand All @@ -3912,7 +3908,6 @@ function gearboxMogli:update(dt)
else
self:mrGbMSetManualClutch( math.max( 0, self.mrGbMS.ManualClutch - dt / math.max( self.mrGbMS.ClutchShiftTime * ( self.mrGbMS.ClutchSpeedOneButton - 1 ) * 0.1, 1 ) ))
end
--self:mrGbMSetState( "AutoCloseTimer", self.mrGbML.oneButtonClutchTimer + self.mrGbMS.ManualClutch * self.mrGbMS.ClutchTimeManual )
elseif InputBinding.gearboxMogliCLUTCH ~= nil then
local targetClutchPercent = InputBinding.getDigitalInputAxis(InputBinding.gearboxMogliCLUTCH)
if InputBinding.isAxisZero(targetClutchPercent) then
Expand Down
6 changes: 3 additions & 3 deletions src/gearboxMogliMotor.lua
View file
Expand Up @@ -2185,7 +2185,9 @@ function gearboxMogliMotor:mrGbMUpdateGear( accelerationPedalRaw, doHandbrake )
targetRequiredRpm = math.max( targetRequiredRpm, result * self.original.ptoMotorRpmRatio )
end
end
if self.vehicle.mrGbMS.ToolIsDirty and lastNoTransmission then
if self.vehicle.mrGbMS.ToolIsDirty
and lastNoTransmission
and not ( g_modIsLoaded["FS17_RpmDependentControls"] ) then
targetRequiredRpm = math.max( targetRequiredRpm, self.vehicle.mrGbMS.HydraulicRpm )
end

Expand Down Expand Up @@ -4577,8 +4579,6 @@ function gearboxMogliMotor:mrGbMUpdateGear( accelerationPedalRaw, doHandbrake )

if self.noTransmission then
self.clutchPercent = 0
elseif self.vehicle.mrGbMS.Hydrostatic and self.vehicle.mrGbMS.HydrostaticLaunch then
self.clutchPercent = 1
else
if self.vehicle:mrGbMGetAutoClutch()
or self.vehicle.mrGbMS.TorqueConverterOrHydro then
Expand Down

0 comments on commit 8282527

Please sign in to comment.