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

Commit

Permalink
v3.1 build 52
Browse files Browse the repository at this point in the history 
#376, #374
  • Loading branch information
@Mogli12
Mogli12 committed May 15, 2018
1 parent 247bd59 commit 0c11e55
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 45 deletions.
Binary file modified FS17_GearboxAddon.zip
View file
Binary file not shown.
30 changes: 15 additions & 15 deletions FS17_GearboxAddon/gearboxAddonConfig.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4482,8 +4482,8 @@
<xmlFile name="modernClassicsDLC/jcbFastrac150/jcbFastrac150.xml" engines="1"/>
</mod>

<gearboxMogli autoStartStop="true" speedLimiter="false" maxAIRange2="3" minFuelUsageRatio="235" soundMaxRpm="2600">
<gears defaultGear="4">
<gearboxMogli autoStartStop="true" speedLimiter="false" maxAIRange="3" minFuelUsageRatio="235" soundMaxRpm="2600">
<gears defaultGear="3">
<gear speed="5" name="1"/>
<gear speed="9" name="2"/>
<gear speed="14" name="3"/>
Expand All @@ -4492,10 +4492,10 @@
<gear speed="39" name="6"/>
</gears>

<ranges shiftTimeMs="0" clutchRatio="1" speedMatching="false" defaultRange="1">
<!--ranges shiftTimeMs="0" clutchRatio="1" speedMatching="false" defaultRange="1">
<range ratio="0.8" name="I"/>
<range ratio="1.0" name="II"/>
</ranges>
</ranges-->

<ranges defaultRange="4">
<range ratio="0.192" name="L" forwardOnly="true"/>
Expand All @@ -4512,7 +4512,7 @@
<xmlFile name="modernClassicsDLC/jcbFastrac150/jcbFastrac150.xml" engines="2"/>
</mod>

<gearboxMogli autoStartStop="true" speedLimiter="false" maxAIRange2="3" minFuelUsageRatio="235" soundMaxRpm="2600">
<gearboxMogli autoStartStop="true" speedLimiter="false" maxAIRange="3" minFuelUsageRatio="235" soundMaxRpm="2600">
<gears defaultGear="3">
<gear speed="7" name="1"/>
<gear speed="13" name="2"/>
Expand All @@ -4522,10 +4522,10 @@
<gear speed="55" name="6"/>
</gears>

<ranges shiftTimeMs="0" clutchRatio="1" speedMatching="true" defaultRange="1">
<!--ranges shiftTimeMs="0" clutchRatio="1" speedMatching="true" defaultRange="1">
<range ratio="0.8" name="I"/>
<range ratio="1.0" name="II"/>
</ranges>
</ranges-->

<ranges defaultRange="4">
<range ratio="0.192" name="L" forwardOnly="true"/>
Expand All @@ -4542,8 +4542,8 @@
<xmlFile name="modernClassicsDLC/jcbFastrac150/jcbFastrac150.xml" engines="3"/>
</mod>

<gearboxMogli autoStartStop="true" speedLimiter="false" maxAIRange2="3" minFuelUsageRatio="235" soundMaxRpm="2600">
<gears defaultGear="3">
<gearboxMogli autoStartStop="true" speedLimiter="false" maxAIRange="3" minFuelUsageRatio="235" soundMaxRpm="2600">
<gears defaultGear="2">
<gear speed="8" name="1"/>
<gear speed="15" name="2"/>
<gear speed="23" name="3"/>
Expand All @@ -4552,11 +4552,11 @@
<gear speed="65" name="6"/>
</gears>

<ranges shiftTimeMs="0" clutchRatio="1" speedMatching="true" defaultRange="1">
<!--ranges shiftTimeMs="0" clutchRatio="1" speedMatching="true" defaultRange="1">
<range ratio="0.679" name="I"/>
<range ratio="0.824" name="II"/>
<range ratio="1.000" name="III"/>
</ranges>
</ranges-->

<ranges defaultRange="4">
<range ratio="0.192" name="L" forwardOnly="true"/>
Expand All @@ -4573,8 +4573,8 @@
<xmlFile name="modernClassicsDLC/jcbFastrac150/jcbFastrac150.xml" engines="4"/>
</mod>

<gearboxMogli autoStartStop="true" speedLimiter="true" maxAIRange2="3" minFuelUsageRatio="235" soundMaxRpm="2600">
<gears defaultGear="3">
<gearboxMogli autoStartStop="true" speedLimiter="true" maxAIRange="3" minFuelUsageRatio="235" soundMaxRpm="2600">
<gears defaultGear="2">
<gear speed="10" name="1"/>
<gear speed="18" name="2"/>
<gear speed="27" name="3"/>
Expand All @@ -4583,11 +4583,11 @@
<gear speed="78" name="6"/>
</gears>

<ranges shiftTimeMs="0" clutchRatio="1" speedMatching="true" defaultRange="1">
<!--ranges shiftTimeMs="0" clutchRatio="1" speedMatching="true" defaultRange="1">
<range ratio="0.679" name="I"/>
<range ratio="0.824" name="II"/>
<range ratio="1.000" name="III"/>
</ranges>
</ranges-->

<ranges defaultRange="4">
<range ratio="0.192" name="L" forwardOnly="true"/>
Expand Down
24 changes: 14 additions & 10 deletions FS17_GearboxAddon/gearboxMogli.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,18 +515,22 @@ function gearboxMogli:mrGbMGetFuelUsageRate( getRawValue )
end

function gearboxMogli.getBit3( value, bit )
if bit == 1 then
if value == 1 or value == 3 or value == 5 or value == 7 then
if value <= 0 then
return 0
elseif value >= 7 then
return 1
elseif bit == 1 then
if value == 1 or value == 3 or value == 5 then
return 1
end
return 0
elseif bit == 2 then
if value == 2 or value == 3 or value == 6 or value == 7 then
if value == 2 or value == 3 or value == 6 then
return 1
end
return 0
elseif bit == 3 then
if value == 4 or value == 5 or value == 6 or value == 7 then
if value == 4 or value == 5 or value == 6 then
return 1
end
return 0
Expand All @@ -540,12 +544,12 @@ function gearboxMogli.completeXMLGearboxEntry( xmlFile, baseName, fixEntry )
local newEntry = fixEntry
newEntry.reverseOnly = getXMLBool( xmlFile, baseName .. "#reverseOnly" )
newEntry.forwardOnly = getXMLBool( xmlFile, baseName .. "#forwardOnly" )
newEntry.minGear = getXMLInt(xmlFile, baseName .. "#minGear" )
newEntry.maxGear = getXMLInt(xmlFile, baseName .. "#maxGear" )
newEntry.minRange = getXMLInt(xmlFile, baseName .. "#minRange" )
newEntry.maxRange = getXMLInt(xmlFile, baseName .. "#maxRange" )
newEntry.minRange2 = getXMLInt(xmlFile, baseName .. "#minRange2" )
newEntry.maxRange2 = getXMLInt(xmlFile, baseName .. "#maxRange2" )
newEntry.minGear = getXMLInt( xmlFile, baseName .. "#minGear" )
newEntry.maxGear = getXMLInt( xmlFile, baseName .. "#maxGear" )
newEntry.minRange = getXMLInt( xmlFile, baseName .. "#minRange" )
newEntry.maxRange = getXMLInt( xmlFile, baseName .. "#maxRange" )
newEntry.minRange2 = getXMLInt( xmlFile, baseName .. "#minRange2" )
newEntry.maxRange2 = getXMLInt( xmlFile, baseName .. "#maxRange2" )
newEntry.upShiftMs = getXMLFloat(xmlFile, baseName .. "#upShiftTimeMs" )
newEntry.downShiftMs = getXMLFloat(xmlFile, baseName .. "#downShiftTimeMs" )
return newEntry
Expand Down
18 changes: 9 additions & 9 deletions FS17_GearboxAddon/modDesc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<modDesc descVersion="38">
<author>Mogli aka Biedens</author>
<iconFilename>dds/store.dds</iconFilename>
<version>3.0.5.1</version>
<version>3.0.5.2</version>
<multiplayer supported="true"/>

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

Expand Down
2 changes: 1 addition & 1 deletion FS17_GearboxAddon/modDesc_l10n_de.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Fügt allen konfigurierten Fahrzeugen die Spezialisierung gearboxMogli hinzu]]>
<text name="gearboxMogliTEXT_AllAutoMode_7" text="Gänge, Gruppen 1 und 2"/>

<text name="gearboxMogliTEXT_DiffLock" text="Differentialsperren"/>
<text name="gearboxMogliTEXT_DiffLock_2wd" text="Vorderradantrieb"/>
<text name="gearboxMogliTEXT_DiffLock_2wd" text="Hinterradantrieb"/>
<text name="gearboxMogliTEXT_DiffLock_4wd" text="Allradantrieb"/>
<text name="gearboxMogliTEXT_DiffLock_open" text="offen"/>
<text name="gearboxMogliTEXT_DiffLock_lsd" text="selbst sperrend"/>
Expand Down
24 changes: 14 additions & 10 deletions src/gearboxMogli.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,18 +515,22 @@ function gearboxMogli:mrGbMGetFuelUsageRate( getRawValue )
end

function gearboxMogli.getBit3( value, bit )
if bit == 1 then
if value == 1 or value == 3 or value == 5 or value == 7 then
if value <= 0 then
return 0
elseif value >= 7 then
return 1
elseif bit == 1 then
if value == 1 or value == 3 or value == 5 then
return 1
end
return 0
elseif bit == 2 then
if value == 2 or value == 3 or value == 6 or value == 7 then
if value == 2 or value == 3 or value == 6 then
return 1
end
return 0
elseif bit == 3 then
if value == 4 or value == 5 or value == 6 or value == 7 then
if value == 4 or value == 5 or value == 6 then
return 1
end
return 0
Expand All @@ -540,12 +544,12 @@ function gearboxMogli.completeXMLGearboxEntry( xmlFile, baseName, fixEntry )
local newEntry = fixEntry
newEntry.reverseOnly = getXMLBool( xmlFile, baseName .. "#reverseOnly" )
newEntry.forwardOnly = getXMLBool( xmlFile, baseName .. "#forwardOnly" )
newEntry.minGear = getXMLInt(xmlFile, baseName .. "#minGear" )
newEntry.maxGear = getXMLInt(xmlFile, baseName .. "#maxGear" )
newEntry.minRange = getXMLInt(xmlFile, baseName .. "#minRange" )
newEntry.maxRange = getXMLInt(xmlFile, baseName .. "#maxRange" )
newEntry.minRange2 = getXMLInt(xmlFile, baseName .. "#minRange2" )
newEntry.maxRange2 = getXMLInt(xmlFile, baseName .. "#maxRange2" )
newEntry.minGear = getXMLInt( xmlFile, baseName .. "#minGear" )
newEntry.maxGear = getXMLInt( xmlFile, baseName .. "#maxGear" )
newEntry.minRange = getXMLInt( xmlFile, baseName .. "#minRange" )
newEntry.maxRange = getXMLInt( xmlFile, baseName .. "#maxRange" )
newEntry.minRange2 = getXMLInt( xmlFile, baseName .. "#minRange2" )
newEntry.maxRange2 = getXMLInt( xmlFile, baseName .. "#maxRange2" )
newEntry.upShiftMs = getXMLFloat(xmlFile, baseName .. "#upShiftTimeMs" )
newEntry.downShiftMs = getXMLFloat(xmlFile, baseName .. "#downShiftTimeMs" )
return newEntry
Expand Down

0 comments on commit 0c11e55

Please sign in to comment.