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

Commit 4e96fdf

Browse files
Mogli12Mogli12
committed
v1.4 rc2
- Italian translation by zed636 - tempomat with 3 different speeds - better support of increase RPM mod - bug fix combine w/o handthrottle
1 parent c946132 commit 4e96fdf

File tree

6 files changed

+202
-70
lines changed

6 files changed

+202
-70
lines changed

‎Documents/MotorNeu.xlsx‎

8.74 KB
Binary file not shown.

‎zzzMrGearboxAddon.zip‎

1.04 KB
Binary file not shown.

‎zzzMrGearboxAddon/modDesc.xml‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -15,64 +15,64 @@
1515
</description>
1616
<multiplayer supported="true"/>
1717
<iconFilename>dds/store.dds</iconFilename>
18-
<version>1.3.3.9</version>
18+
<version>1.3.4.0</version>
1919
<l10n>
2020
<text name="mrGearboxMogliVERSION">
21-
<de>Getriebe v1.4 beta 29 von Mogli</de>
22-
<en>Gearbox v1.4 beta 29 by mogli</en></text>
23-
<text name="mrGearboxMogliSHIFTGEARUP"><de>Getriebe: Gang hoch</de><en>Gearbox: Gear up</en></text>
24-
<text name="mrGearboxMogliSHIFTGEARDOWN"><de>Getriebe: Gang runter</de><en>Gearbox: Gear down</en></text>
25-
<text name="mrGearboxMogliSHIFTRANGEUP"><de>Getriebe: Gruppe hoch</de><en>Gearbox: Range up</en></text>
26-
<text name="mrGearboxMogliSHIFTRANGE2UP"><de>Getriebe: Gruppe hoch</de><en>Gearbox: Range up</en></text>
27-
<text name="mrGearboxMogliSHIFTRANGEDOWN"><de>Getriebe: Gruppe 2 runter</de><en>Gearbox: Range 2 down</en></text>
28-
<text name="mrGearboxMogliSHIFTRANGE2DOWN"><de>Getriebe: Gruppe 2 runter</de><en>Gearbox: Range 2 down</en></text>
29-
<text name="mrGearboxMogliNEUTRAL"><de>Getriebe: Neutral</de><en>Gearbox: Neutral</en></text>
30-
<text name="mrGearboxMogliOFF"><de>Manuelles Getriebe [aus]</de><en>manual gearbox [off]</en></text>
31-
<text name="mrGearboxMogliON"><de>Manuelles Getriebe [an]</de><en>manual gearbox [on]</en></text>
32-
<text name="mrGearboxMogliON_OFF"><de>Getriebe: An/Aus</de><en>Gearbox: On/Off</en></text>
33-
<text name="mrGearboxMogliHUD"><de>Getriebe: HUD an/aus</de><en>Gearbox: HUD on/off</en></text>
34-
<text name="mrGearboxMogliAllAuto"><de>Getriebe: Realismus-Schalter</de><en>Gearbox: reality switch</en></text>
35-
<text name="mrGearboxMogliAllAutoON"><de>Getriebe [einfach]</de><en>Gearbox [simplified]</en></text>
36-
<text name="mrGearboxMogliAllAutoOFF"><de>Getriebe [realistisch]</de><en>Gearbox [realistic]</en></text>
37-
<text name="mrGearboxMogliREVERSE"><de>Getriebe: Rückwärts</de><en>Gearbox: Reverse</en></text>
38-
<text name="mrGearboxMogliAUTOCLUTCH2"><de>Getriebe: Autom.Kupplung</de><en>Gearbox: auto clutch</en></text>
39-
<text name="mrGearboxMogliCLUTCH"><de>Getriebe: Kupplung</de><en>Gearbox: clutch</en></text>
40-
<text name="mrGearboxMogliCLUTCH_1"><de>Getriebe: Kupplung öffnen</de><en>Gearbox: clutch open</en></text>
41-
<text name="mrGearboxMogliCLUTCH_2"><de>Getriebe: Kupplung schliessen</de><en>Gearbox: clutch close</en></text>
42-
<text name="mrGearboxMogliCLUTCH_3"><de>Getriebe: Kupplung</de><en>Gearbox: clutch</en></text>
43-
<text name="mrGearboxMogliMINRPM"><de>Getriebe: Handgas</de><en>Gearbox: hand throttle</en></text>
44-
<text name="mrGearboxMogliMINRPM_1"><de>Getriebe: Handgas runter</de><en>Gearbox: hand throttle</en></text>
45-
<text name="mrGearboxMogliMINRPM_2"><de>Getriebe: Handgas rauf</de><en>Gearbox: hand throttle</en></text>
46-
<text name="mrGearboxMogliGEAR1"><de>Getriebe: G27 1</de><en>Gearbox: G27 1</en></text>
47-
<text name="mrGearboxMogliGEAR2"><de>Getriebe: G27 2</de><en>Gearbox: G27 2</en></text>
48-
<text name="mrGearboxMogliGEAR3"><de>Getriebe: G27 3</de><en>Gearbox: G27 3</en></text>
49-
<text name="mrGearboxMogliGEAR4"><de>Getriebe: G27 4</de><en>Gearbox: G27 4</en></text>
50-
<text name="mrGearboxMogliGEAR5"><de>Getriebe: G27 5</de><en>Gearbox: G27 5</en></text>
51-
<text name="mrGearboxMogliGEAR6"><de>Getriebe: G27 6</de><en>Gearbox: G27 6</en></text>
52-
<text name="mrGearboxMogliGEARR"><de>Getriebe: G27 R</de><en>Gearbox: G27 R</en></text>
53-
<text name="mrGearboxMogliGEARFWD"><de>Getriebe: forwärts</de><en>Gearbox: fwd</en></text>
54-
<text name="mrGearboxMogliGEARBACK"><de>Getriebe: rückwärts</de><en>Gearbox: back</en></text>
55-
<text name="mrGearboxMogliSPEEDLIMIT"><de>Getriebe: Begrenzer</de><en>Gearbox: limiter</en></text>
56-
<text name="mrGearboxMogliSWAPSPEED"><de>Getriebe: Tempomat 2</de><en>Gearbox: limiter 2</en></text>
57-
<text name="mrGearboxMogliSETSPEED"><de>Getriebe: Setze Begrenzer</de><en>Gearbox: set limit</en></text>
58-
<text name="mrGearboxMogliACCTOLIMIT"><de>Getriebe: Beschleunigung</de><en>Gearbox: acceleration</en></text>
59-
<text name="mrGearboxMogliDECTOLIMIT"><de>Getriebe: Bremsen</de><en>Gearbox: deceleration</en></text>
60-
<text name="mrGearboxMogliECO"><de>Getriebe: Eco an/aus</de><en>Gearbox: eco on/off</en></text>
61-
<text name="mrGearboxMogliKEEPSPEED"><de>Getriebe: Geschwindigkeit halten</de><en>Gearbox: keep speed</en></text>
21+
<de>Getriebe v1.4 rc2 von Mogli</de>
22+
<en>Gearbox v1.4 rc2 by mogli</en></text>
23+
<text name="mrGearboxMogliSHIFTGEARUP"><de>Getriebe: Gang hoch</de><en>Gearbox: Gear up</en><it>Cambio: marcia su</it></text>
24+
<text name="mrGearboxMogliSHIFTGEARDOWN"><de>Getriebe: Gang runter</de><en>Gearbox: Gear down</en><it>Cambio: marcia giù</it></text>
25+
<text name="mrGearboxMogliSHIFTRANGEUP"><de>Getriebe: Gruppe hoch</de><en>Gearbox: Range up</en><it>Cambio: gruppo su</it></text>
26+
<text name="mrGearboxMogliSHIFTRANGE2UP"><de>Getriebe: Gruppe hoch</de><en>Gearbox: Range up</en><it>Cambio: gruppo giù</it></text>
27+
<text name="mrGearboxMogliSHIFTRANGEDOWN"><de>Getriebe: Gruppe 2 runter</de><en>Gearbox: Range 2 down</en><it>Cambio: gruppo 2 giù</it></text>
28+
<text name="mrGearboxMogliSHIFTRANGE2DOWN"><de>Getriebe: Gruppe 2 runter</de><en>Gearbox: Range 2 down</en><it>Cambio: gruppo 2 giù</it></text>
29+
<text name="mrGearboxMogliNEUTRAL"><de>Getriebe: Neutral</de><en>Gearbox: Neutral</en><it>Cambio: folle</it></text>
30+
<text name="mrGearboxMogliOFF"><de>Manuelles Getriebe [aus]</de><en>manual gearbox [off]</en><it>Cambio manuale: [disattivo]</it></text>
31+
<text name="mrGearboxMogliON"><de>Manuelles Getriebe [an]</de><en>manual gearbox [on]</en><it>Cambio manuale: [attivo]</it></text>
32+
<text name="mrGearboxMogliON_OFF"><de>Getriebe: An/Aus</de><en>Gearbox: On/Off</en><it>Cambio: attivo/disattivo</it></text>
33+
<text name="mrGearboxMogliHUD"><de>Getriebe: HUD an/aus</de><en>Gearbox: HUD on/off</en><it>Cambio: HUD attivo/disattivo</it></text>
34+
<text name="mrGearboxMogliAllAuto"><de>Getriebe: Realismus-Schalter</de><en>Gearbox: reality switch</en><it>Cambio: realtà attivo/disattivo</it></text>
35+
<text name="mrGearboxMogliAllAutoON"><de>Getriebe [einfach]</de><en>Gearbox [simplified]</en><it>Cambio: [semplificato]</it></text>
36+
<text name="mrGearboxMogliAllAutoOFF"><de>Getriebe [realistisch]</de><en>Gearbox [realistic]</en><it>Cambio: [realistico]</it></text>
37+
<text name="mrGearboxMogliREVERSE"><de>Getriebe: Rückwärts</de><en>Gearbox: Reverse</en><it>Cambio: retromarcia</it></text>
38+
<text name="mrGearboxMogliAUTOCLUTCH2"><de>Getriebe: Autom.Kupplung</de><en>Gearbox: auto clutch</en><it>Cambio: frizione automatica</it></text>
39+
<text name="mrGearboxMogliCLUTCH"><de>Getriebe: Kupplung</de><en>Gearbox: clutch</en><it>Cambio: frizione</it></text>
40+
<text name="mrGearboxMogliCLUTCH_1"><de>Getriebe: Kupplung öffnen</de><en>Gearbox: clutch open</en><it>Cambio: frizione aperta</it></text>
41+
<text name="mrGearboxMogliCLUTCH_2"><de>Getriebe: Kupplung schliessen</de><en>Gearbox: clutch close</en><it>Cambio: frizione chiusa</it></text>
42+
<text name="mrGearboxMogliCLUTCH_3"><de>Getriebe: Kupplung</de><en>Gearbox: clutch</en><it>Cambio: frizione</it></text>
43+
<text name="mrGearboxMogliMINRPM"><de>Getriebe: Handgas</de><en>Gearbox: hand throttle</en><it>Cambio: accelleratore a mano</it></text>
44+
<text name="mrGearboxMogliMINRPM_1"><de>Getriebe: Handgas runter</de><en>Gearbox: hand throttle</en><it>Cambio: accelleratore a mano giù</it></text>
45+
<text name="mrGearboxMogliMINRPM_2"><de>Getriebe: Handgas rauf</de><en>Gearbox: hand throttle</en><it>Cambio: accelleratore a mano su</it></text>
46+
<text name="mrGearboxMogliGEAR1"><de>Getriebe: G27 1</de><en>Gearbox: G27 1</en><it>Cambio: G27 1</it></text>
47+
<text name="mrGearboxMogliGEAR2"><de>Getriebe: G27 2</de><en>Gearbox: G27 2</en><it>Cambio: G27 2</it></text>
48+
<text name="mrGearboxMogliGEAR3"><de>Getriebe: G27 3</de><en>Gearbox: G27 3</en><it>Cambio: G27 3</it></text>
49+
<text name="mrGearboxMogliGEAR4"><de>Getriebe: G27 4</de><en>Gearbox: G27 4</en><it>Cambio: G27 4</it></text>
50+
<text name="mrGearboxMogliGEAR5"><de>Getriebe: G27 5</de><en>Gearbox: G27 5</en><it>Cambio: G27 5</it></text>
51+
<text name="mrGearboxMogliGEAR6"><de>Getriebe: G27 6</de><en>Gearbox: G27 6</en><it>Cambio: G27 6</it></text>
52+
<text name="mrGearboxMogliGEARR"><de>Getriebe: G27 R</de><en>Gearbox: G27 R</en><it>Cambio: G27 R</it></text>
53+
<text name="mrGearboxMogliGEARFWD"><de>Getriebe: forwärts</de><en>Gearbox: fwd</en><it>Cambio: avanti</it></text>
54+
<text name="mrGearboxMogliGEARBACK"><de>Getriebe: rückwärts</de><en>Gearbox: back</en><it>Cambio: indietro</it></text>
55+
<text name="mrGearboxMogliSPEEDLIMIT"><de>Getriebe: Begrenzer</de><en>Gearbox: limiter</en><it>Cambio: limitatore</it></text>
56+
<text name="mrGearboxMogliSWAPSPEED"><de>Getriebe: Tempomat 2</de><en>Gearbox: limiter 2</en><it>Cambio: limitatore 2</it></text>
57+
<text name="mrGearboxMogliSETSPEED"><de>Getriebe: Setze Begrenzer</de><en>Gearbox: set limit</en><it>Cambio: imposta limite</it></text>
58+
<text name="mrGearboxMogliACCTOLIMIT"><de>Getriebe: Beschleunigung</de><en>Gearbox: acceleration</en><it>Cambio: accellera</it></text>
59+
<text name="mrGearboxMogliDECTOLIMIT"><de>Getriebe: Bremsen</de><en>Gearbox: deceleration</en><it>Cambio: decellera</it></text>
60+
<text name="mrGearboxMogliECO"><de>Getriebe: Eco an/aus</de><en>Gearbox: eco on/off</en><it>Cambio: Eco attivo/disattivo</it></text>
61+
<text name="mrGearboxMogliKEEPSPEED"><de>Getriebe: Geschwindigkeit halten</de><en>Gearbox: keep speed</en><it>Cambio: mantieni la velocità</it></text>
62+
<text name="mrGearboxMogliTEXT_OFF"><de>Motor aus</de><en>motor off</en><it>Motore: spento</it></text>
63+
<text name="mrGearboxMogliTEXT_AI"><de>Helfer</de><en>AI</en><it>Operaio</it></text>
64+
<text name="mrGearboxMogliTEXT_BRAKE"><de>Handbremse</de><en>handbrake</en><it>Freno a mano</it></text>
65+
<text name="mrGearboxMogliTEXT_DC"><de>Zwischengas</de><en>double clutch</en><it>Doppia frizione</it></text>
66+
<text name="mrGearboxMogliTEXT_NEUTRAL"><de>Neutral</de><en>neutral</en><it>Folle</it></text>
67+
<text name="mrGearboxMogliTEXT_AUTO"><de>Automatik</de><en>automatic</en><it>Automatico</it></text>
68+
<text name="mrGearboxMogliTEXT_MANUAL"><de>Manuell</de><en>manual</en><it>Manuale</it></text>
69+
<text name="mrGearboxMogliTEXT_NOGEAR"><de>Kein Gang</de><en>no gear</en><it>Senza marce</it></text>
70+
<text name="mrGearboxMogliTEXT_VARIO"><de>Stufenlos</de><en>CVT</en><it>Variatore</it></text>
71+
<text name="mrGearboxMogliTEXT_ALLAUTO"><de>Vereinfacht</de><en>simple</en><it>Semplificato</it></text>
72+
<text name="mrGearboxMogliTEXT_ECO"><de>Eco</de><en>eco</en><it>Eco</it></text>
73+
<text name="mrGearboxMogliTEXT_AUTO_HOLD"><de>Auto Hold</de><en>auto hold</en><it>Attesa automatica</it></text>
74+
</l10n>
6275

63-
<text name="mrGearboxMogliTEXT_OFF"> <de>Motor aus</de> <en>motor off</en></text>
64-
<text name="mrGearboxMogliTEXT_AI"> <de>Helfer</de> <en>AI</en></text>
65-
<text name="mrGearboxMogliTEXT_BRAKE"> <de>Handbremse</de> <en>handbrake</en></text>
66-
<text name="mrGearboxMogliTEXT_DC"> <de>Zwischengas</de><en>double clutch</en></text>
67-
<text name="mrGearboxMogliTEXT_NEUTRAL"><de>Neutral</de> <en>neutral</en></text>
68-
<text name="mrGearboxMogliTEXT_AUTO"> <de>Automatik</de> <en>automatic</en></text>
69-
<text name="mrGearboxMogliTEXT_MANUAL"> <de>Manuell</de> <en>manual</en></text>
70-
<text name="mrGearboxMogliTEXT_NOGEAR"> <de>Kein Gang</de> <en>no gear</en></text>
71-
<text name="mrGearboxMogliTEXT_VARIO"> <de>Stufenlos</de> <en>CVT</en></text>
72-
<text name="mrGearboxMogliTEXT_ALLAUTO"><de>Vereinfacht</de><en>simple</en></text>
73-
<text name="mrGearboxMogliTEXT_ECO"> <de>Eco</de> <en>eco</en></text>
74-
<text name="mrGearboxMogliTEXT_AUTO_HOLD"><de>Auto Hold</de><en>auto hold</en></text>
75-
</l10n>
7676
<inputBindings>
7777
<input name="mrGearboxMogliSHIFTGEARUP" key1="KEY_leftbracket" button="BUTTON_3" category="VEHICLE" />
7878
<input name="mrGearboxMogliSHIFTGEARDOWN" key1="KEY_quote" button="BUTTON_4" category="VEHICLE" />

‎zzzMrGearboxAddon/mrGearboxMogli.lua‎

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ mrGearboxMogliGlobals.brakeNeutralLimit = -0.3
153153
mrGearboxMogliGlobals.DefaultRevUpMs0 = 1000 -- ms
154154
mrGearboxMogliGlobals.DefaultRevUpMs1 = 10000 -- ms
155155
mrGearboxMogliGlobals.DefaultRevDownMs = 2000 -- ms
156-
mrGearboxMogliGlobals.HydroSpeedIdleRedux = 0.04 -- default reduce by 10 km/h per second => 0.4 km/h with const. RPM and w/o acc.
156+
mrGearboxMogliGlobals.HydroSpeedIdleRedux = 0.02 -- 0.04 -- default reduce by 10 km/h per second => 0.4 km/h with const. RPM and w/o acc.
157157
mrGearboxMogliGlobals.motorLoadVolumeBrake = 1.2 -- make some noise with motor brake
158158
mrGearboxMogliGlobals.motorLoadVolumeFrom = 0 -- this is for scaling motorLoad to volume
159159
mrGearboxMogliGlobals.motorLoadVolumeTo = 1 -- this is for scaling motorLoad to volume
@@ -1894,7 +1894,15 @@ function mrGearboxMogli:update(dt)
18941894
self.mrGbML.smoothLittle = Utils.clamp( mrGearboxMogli.smoothLittle * self.mrGbML.smoothBase, 0, 1 )
18951895

18961896
local processInput = true
1897-
if self.mrGbMS.NoDisable then
1897+
1898+
if self.hasChangedGearBoxAddon then
1899+
-- IncreaseRPMWhileTipping.lua
1900+
if not self.mrGbMS.IsOnOff then
1901+
self:mrGbMSetState( "IsOn", false )
1902+
self.mrGbML.turnedOffByIncreaseRPMWhileTipping = true
1903+
end
1904+
processInput = false
1905+
elseif self.mrGbMS.NoDisable then
18981906
self:mrGbMSetIsOnOff( true )
18991907
elseif mrGearboxMogli.mbIsActiveForInput(self, false) and mrGearboxMogli.mbHasInputEvent( "mrGearboxMogliON_OFF" ) then
19001908
if self.isMotorStarted
@@ -1932,12 +1940,19 @@ function mrGearboxMogli:update(dt)
19321940
end
19331941

19341942
if self.mrGbMB.soundModified and not ( self.mrGbMS.IsOn ) then
1935-
--Utils.stopSample( self.sampleMotor )
1936-
--Utils.stopSample( self.sampleMotorRun )
1937-
--Utils.stopSample( self.sampleMotorRun2 )
19381943
if self.isMotorStarted then
1939-
self:stopMotor()
1940-
self.mrGbML.turnOnMotorTimer = g_currentMission.time + 200
1944+
if self.mrGbML.turnedOffByIncreaseRPMWhileTipping then
1945+
Utils.stopSample( self.sampleMotor )
1946+
Utils.stopSample( self.sampleMotorRun )
1947+
Utils.stopSample( self.sampleMotorRun2 )
1948+
if self.mrGbML.motor ~= nil and self.mrGbMB.motor ~= nil then
1949+
mrGearboxMogliMotor.copyRuntimeValues( self.mrGbML.motor, self.mrGbMB.motor )
1950+
self.motor = self.mrGbMB.motor
1951+
end
1952+
else
1953+
self:stopMotor()
1954+
self.mrGbML.turnOnMotorTimer = g_currentMission.time + 200
1955+
end
19411956
end
19421957

19431958
self.mrGbMB.soundModified = false
@@ -1981,6 +1996,12 @@ function mrGearboxMogli:update(dt)
19811996
self.lastRoundPerMinute = 0
19821997
end
19831998

1999+
if self.mrGbMS.IsOnOff
2000+
and self.mrGbML.turnedOffByIncreaseRPMWhileTipping
2001+
and not ( self.hasChangedGearBoxAddon ) then
2002+
self.mrGbML.turnedOffByIncreaseRPMWhileTipping = false
2003+
end
2004+
19842005
if self.isMotorStarted and self.motor.minRpm > 0 and self.mrGbMS.IsOnOff then
19852006
if self.mrGbML.motor == nil then
19862007
-- initialize as late as possible
@@ -5373,8 +5394,22 @@ function mrGearboxMogli:newUpdateWheelsPhysics( superFunc, dt, currentSpeed, acc
53735394
local decHts = Utils.clamp( ( 1.4142 * math.min( 0, acceleration ) )^2, self.mrGbMG.HydroSpeedIdleRedux, 1 )
53745395
local newHts = math.min( math.max( acceleration * m, oldHts - decHts * 0.001 * dt * self.mrGbMS.DecelerateToLimit ), oldHts + 0.001 * dt * self.mrGbMS.AccelerateToLimit )
53755396

5376-
if -0.7071 <= acceleration and acceleration <= 0 then
5377-
acceleration = 0
5397+
if acceleration < 0 then
5398+
if self.axisForwardIsAnalog then
5399+
self.mrGbML.hydroTargetTimer = nil
5400+
if acceleration > -0.7071 then
5401+
acceleration = 0
5402+
end
5403+
else
5404+
if self.mrGbML.hydroTargetTimer == nil then
5405+
self.mrGbML.hydroTargetTimer = g_currentMission.time + 2000
5406+
end
5407+
if g_currentMission.time < self.mrGbML.hydroTargetTimer then
5408+
acceleration = 0
5409+
end
5410+
end
5411+
elseif self.mrGbML.hydroTargetTimer ~= nil then
5412+
self.mrGbML.hydroTargetTimer = nil
53785413
end
53795414

53805415
self.mrGbML.hydroTargetSpeed = Utils.clamp( newHts, 0, m )
@@ -6731,8 +6766,6 @@ function mrGearboxMogliMotor:mrGbMUpdateGear( accelerationPedal )
67316766
end
67326767
end
67336768

6734-
self.vehicle:mrGbMSetState( "ConstantRpm", self.ptoOn )
6735-
67366769
-- acceleration pedal and speed limit
67376770
local requestedTorque = self.motorLoad + self.lastPtoTorque + self.lastLostTorque + self.lastMissingTorque
67386771
local currentSpeedLimit = self.currentSpeedLimit
@@ -6811,6 +6844,9 @@ function mrGearboxMogliMotor:mrGbMUpdateGear( accelerationPedal )
68116844
end
68126845
end
68136846

6847+
self.vehicle:mrGbMSetState( "ConstantRpm", self.ptoOn )
6848+
6849+
68146850
--if handThrottle >= 0
68156851
-- and handThrottleRpm < self.minRequiredRpm
68166852
-- and self.ratedRpm > self.idleRpm + mrGearboxMogli.eps then

0 commit comments

Comments
 (0)