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

Commit 350365a

Browse files
Mogli12Mogli12
committed
v1.5.0.1
bug fix empty fuel tank
1 parent 83a13ec commit 350365a

File tree

5 files changed

+119
-4
lines changed

5 files changed

+119
-4
lines changed

‎src/mrGearboxMogli.lua‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,9 +2128,11 @@ function mrGearboxMogli:update(dt)
21282128
if self.mrGbMG.realFuelUsage
21292129
and self.isServer then
21302130
if not ( self.isMotorStarted ) then
2131+
self.fuelUsage = 0
2132+
elseif self:getIsHired() and self.lastMovedDistance < mrGearboxMogli.eps then
2133+
-- hired worker but not moving
21312134
self.fuelUsage = 0
2132-
elseif self.motor.fuelCurve ~= nil
2133-
and ( not self:getIsHired() or self.lastMovedDistance > 0 ) then
2135+
elseif self.motor.fuelCurve ~= nil then
21342136
-- see Motorized.lua, line 468
21352137
-- with GearboxAddon the vehicle will consume fuel if it is not hired of the hired worker moved
21362138

@@ -2155,6 +2157,8 @@ function mrGearboxMogli:update(dt)
21552157
g_currentMission.missionStats:updateStats("fuelUsage", fuelUsed);
21562158
end
21572159
end
2160+
else
2161+
self.fuelUsage = self.mrGbMB.fuelUsage
21582162
end
21592163
end
21602164

@@ -6366,7 +6370,6 @@ end
63666370
--**********************************************************************************************************
63676371
function mrGearboxMogliMotor:getTorque( acceleration, limitRpm )
63686372

6369-
--self.lastMotorTorque = 0
63706373
self.lastTransTorque = 0
63716374
self.lastPtoTorque = 0
63726375
self.lastLostTorque = 0
@@ -6383,6 +6386,11 @@ function mrGearboxMogliMotor:getTorque( acceleration, limitRpm )
63836386

63846387
local pt = 0
63856388
self.neededPtoTorque = PowerConsumer.getTotalConsumedPtoTorque(self.vehicle)
6389+
6390+
--if self.vehicle.mrGbMS.EcoMode and self.neededPtoTorque > 0 then
6391+
-- self.neededPtoTorque = self.neededPtoTorque * self.vehicle.mrGbMS.PtoRpm / self.vehicle.mrGbMS.PtoRpmEco
6392+
--end
6393+
63866394
if self.neededPtoTorque > 0 then
63876395
pt = self.neededPtoTorque / self.ptoMotorRpmRatio
63886396
end

‎zzzMrGearboxAddon.zip‎

561 Bytes
Binary file not shown.

‎zzzMrGearboxAddon/modDesc.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Fügt allen konfigurierten Fahrzeugen die Spezialisierung mrGearboxMogli hinzu]]
2121
</description>
2222
<multiplayer supported="true"/>
2323
<iconFilename>dds/store.dds</iconFilename>
24-
<version>1.5.0.0</version>
24+
<version>1.5.0.1</version>
2525

2626
<l10n filenamePrefix="modDesc_l10n">
2727
<text name="mrGearboxMogliVERSION">

‎zzzMrGearboxAddon/mrGearboxMogli.lua‎

42 Bytes
Binary file not shown.

‎zzzMrGearboxAddon/zzzMrGearboxAddonConfig.xml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,6 +2293,9 @@
22932293
<mod name="Fendt_Favorit_824" isPrefix="true">
22942294
<xmlFile name="Fendt_Favorit.xml"/>
22952295
</mod>
2296+
<mod name="FENDT_FAVORIT_PACK" isPrefix="true">
2297+
<xmlFile name="Fendt_Favorit824.xml"/>
2298+
</mod>
22962299

22972300
<gearboxMogli autoStartStop="true" clutchOpenRpm="1300" clutchCloseRpm="1500" torqueConverter="true" minClutchRatio="0.3125" ptoRpm="2031" ptoRpmEco="1598" maxForwardSpeed="51" maxBackwardSpeed="41">
22982301
<gears defaultGear="1" shiftTimeMs="0" speedMatching="true" clutchRatio="1.0">
@@ -6240,6 +6243,110 @@
62406243
</gearboxMogli>
62416244
</vehicle>
62426245

6246+
<vehicle>
6247+
<mod name="Claas_tucano_320">
6248+
<link href="http://www.modhoster.de/mods/claas-tucano-320--2" />
6249+
<xmlFile name="Claas_tucano320.xml"/>
6250+
</mod>
6251+
6252+
<!-- http://www.claas.de/blueprint/servlet/blob/363840/dfd033407c44716953b7faaf6d91e2dc/224846-dataRaw.pdf -->
6253+
<!-- http://www.dmg-duisburg.de/html/d_c_om906la.html -->
6254+
<gearboxMogli soundMaxRpm="1700" disableManual="true" speedLimiter="true" maxForwardSpeed="26.5" maxBackwardSpeed="26.5" enableAI="true" maxAIGear="2">
6255+
<combine defaultWidth="5.4"/>
6256+
<blowOffVentilSound volume="0"/>
6257+
6258+
<hydrostatic profile="Combine"/>
6259+
<gears shiftTimeMs="1000" clutchRatio="1" defaultGear="3">
6260+
<gear speed="5.8" name="1"/> <!-- 0.05 1.47 4 8-->
6261+
<gear speed="11.59" name="2"/> <!-- 0.1 2.94 8 15-->
6262+
<gear speed="23.19" name="3"/> <!-- 0.2 5.89 15 31-->
6263+
</gears>
6264+
6265+
<!-- OM 906 LA (in older versions?) -->
6266+
<realEngine idleRpm="900" ratedRpm="2200">
6267+
<!-- 2200: 220(220) | 2200: 220(220) | 1200..1600: 900(900) | 85 | 0.8 | 299 | 1.7 | 2300 | 1360: 210 -->
6268+
<torque rpm="350" motorTorque="421" fuelUsageRatio="240.4"/>
6269+
<torque rpm="700" motorTorque="697" fuelUsageRatio="223"/>
6270+
<torque rpm="900" motorTorque="824" fuelUsageRatio="216.3"/>
6271+
<torque rpm="1000" motorTorque="866" fuelUsageRatio="213.9"/>
6272+
<torque rpm="1100" motorTorque="892" fuelUsageRatio="212"/>
6273+
<torque rpm="1200" motorTorque="900" fuelUsageRatio="210.8"/>
6274+
<torque rpm="1300" motorTorque="900" fuelUsageRatio="210.1"/>
6275+
<torque rpm="1400" motorTorque="900" fuelUsageRatio="210.1"/>
6276+
<torque rpm="1500" motorTorque="900" fuelUsageRatio="210.6"/>
6277+
<torque rpm="1600" motorTorque="900" fuelUsageRatio="211.9"/>
6278+
<torque rpm="1700" motorTorque="873" fuelUsageRatio="213.8"/>
6279+
<torque rpm="1800" motorTorque="843" fuelUsageRatio="216.4"/>
6280+
<torque rpm="1850" motorTorque="827" fuelUsageRatio="217.9"/>
6281+
<torque rpm="1900" motorTorque="811" fuelUsageRatio="219.6"/>
6282+
<torque rpm="1950" motorTorque="790" fuelUsageRatio="221.5"/>
6283+
<torque rpm="2000" motorTorque="771" fuelUsageRatio="223.5"/>
6284+
<torque rpm="2050" motorTorque="753" fuelUsageRatio="225.7"/>
6285+
<torque rpm="2100" motorTorque="735" fuelUsageRatio="228.1"/>
6286+
<torque rpm="2150" motorTorque="718" fuelUsageRatio="230.6"/>
6287+
<torque rpm="2200" motorTorque="702" fuelUsageRatio="233.3"/>
6288+
<torque rpm="2250" motorTorque="669" fuelUsageRatio="236"/>
6289+
<torque rpm="2300" motorTorque="593" fuelUsageRatio="248.4"/>
6290+
<torque rpm="2350" motorTorque="485" fuelUsageRatio="274.9"/>
6291+
<torque rpm="2400" motorTorque="348" fuelUsageRatio="318.7"/>
6292+
<torque rpm="2450" motorTorque="184" fuelUsageRatio="382.5"/>
6293+
<torque rpm="2500" motorTorque="0" fuelUsageRatio="466.7"/>
6294+
</realEngine>
6295+
</gearboxMogli>
6296+
</vehicle>
6297+
6298+
<vehicle>
6299+
<mod name="Claas_tucano_320">
6300+
<link href="http://www.modhoster.de/mods/claas-tucano-320--2" />
6301+
<xmlFile name="Claas_tucano320_tan.xml"/>
6302+
</mod>
6303+
6304+
<!-- http://www.claas.de/blueprint/servlet/blob/363840/dfd033407c44716953b7faaf6d91e2dc/224846-dataRaw.pdf -->
6305+
<!-- http://www.dmg-duisburg.de/html/d_c_om906la.html -->
6306+
<gearboxMogli soundMaxRpm="1700" disableManual="true" speedLimiter="true" maxForwardSpeed="26.5" maxBackwardSpeed="26.5" enableAI="true" maxAIGear="2">
6307+
<combine defaultWidth="5.4"/>
6308+
<blowOffVentilSound volume="0"/>
6309+
6310+
<hydrostatic profile="Combine"/>
6311+
<gears shiftTimeMs="1000" clutchRatio="1" defaultGear="3">
6312+
<gear speed="5.8" name="1"/> <!-- 0.05 1.47 4 8-->
6313+
<gear speed="11.59" name="2"/> <!-- 0.1 2.94 8 15-->
6314+
<gear speed="23.19" name="3"/> <!-- 0.2 5.89 15 31-->
6315+
</gears>
6316+
6317+
<!-- OM 906 LA (in older versions?) -->
6318+
<realEngine idleRpm="900" ratedRpm="2200">
6319+
<!-- 2200: 190(190) | 2200: 190(190) | 1200..1600: 750(750) | 85 | 0.7 | 299 | 1.7 | 2300 | 1360: 210 -->
6320+
<torque rpm="350" motorTorque="351" fuelUsageRatio="240.4"/>
6321+
<torque rpm="700" motorTorque="581" fuelUsageRatio="223"/>
6322+
<torque rpm="900" motorTorque="687" fuelUsageRatio="216.3"/>
6323+
<torque rpm="1000" motorTorque="722" fuelUsageRatio="213.9"/>
6324+
<torque rpm="1100" motorTorque="743" fuelUsageRatio="212"/>
6325+
<torque rpm="1200" motorTorque="750" fuelUsageRatio="210.8"/>
6326+
<torque rpm="1300" motorTorque="750" fuelUsageRatio="210.1"/>
6327+
<torque rpm="1400" motorTorque="750" fuelUsageRatio="210.1"/>
6328+
<torque rpm="1500" motorTorque="750" fuelUsageRatio="210.6"/>
6329+
<torque rpm="1600" motorTorque="750" fuelUsageRatio="211.9"/>
6330+
<torque rpm="1700" motorTorque="732" fuelUsageRatio="213.8"/>
6331+
<torque rpm="1800" motorTorque="712" fuelUsageRatio="216.4"/>
6332+
<torque rpm="1850" motorTorque="701" fuelUsageRatio="217.9"/>
6333+
<torque rpm="1900" motorTorque="689" fuelUsageRatio="219.6"/>
6334+
<torque rpm="1950" motorTorque="677" fuelUsageRatio="221.5"/>
6335+
<torque rpm="2000" motorTorque="664" fuelUsageRatio="223.5"/>
6336+
<torque rpm="2050" motorTorque="650" fuelUsageRatio="225.7"/>
6337+
<torque rpm="2100" motorTorque="635" fuelUsageRatio="228.1"/>
6338+
<torque rpm="2150" motorTorque="620" fuelUsageRatio="230.6"/>
6339+
<torque rpm="2200" motorTorque="606" fuelUsageRatio="233.3"/>
6340+
<torque rpm="2250" motorTorque="577" fuelUsageRatio="236"/>
6341+
<torque rpm="2300" motorTorque="512" fuelUsageRatio="248.4"/>
6342+
<torque rpm="2350" motorTorque="419" fuelUsageRatio="274.9"/>
6343+
<torque rpm="2400" motorTorque="300" fuelUsageRatio="318.7"/>
6344+
<torque rpm="2450" motorTorque="159" fuelUsageRatio="382.5"/>
6345+
<torque rpm="2500" motorTorque="0" fuelUsageRatio="466.7"/>
6346+
</realEngine>
6347+
</gearboxMogli>
6348+
</vehicle>
6349+
62436350
<vehicle>
62446351
<mod name="ClassDominator">
62456352
<xmlFile name="dominator.xml" />

0 commit comments

Comments
 (0)