slomal bahui

koptilnya/engine_remastered/powertrain/gearboxes/base.txt

@@ -14,9 +14,9 @@ function Gearbox:initialize(vehicle, name, config)
         Downshift = 'number'
     }
     self.wireOutputs = {
-        Gearbox_RPM = 'number',
-        Gearbox_Torque = 'number',
-        Gearbox_Ratio = 'number'
+        [string.format('%s_RPM', self.name)] = 'number',
+        [string.format('%s_Torque', self.name)] = 'number',
+        [string.format('%s_Ratio', self.name)] = 'number'
     }
 
     self.type = config.Type or 'MANUAL'
@@ -28,9 +28,9 @@ end
 function Gearbox:updateWireOutputs()
     PowertrainComponent.updateWireOutputs(self)
     
-    wire.ports.Gearbox_RPM = self:getRPM()
-    wire.ports.Gearbox_Torque = self.torque
-    wire.ports.Gearbox_Ratio = self.ratio
+    wire.ports[string.format('%s_RPM', self.name)] = self:getRPM()
+    wire.ports[string.format('%s_Torque', self.name)] = self.torque
+    wire.ports[string.format('%s_Ratio', self.name)] = self.ratio
 end
 
 function Gearbox:queryInertia()
@@ -52,18 +52,18 @@ function Gearbox:queryAngularVelocity(angularVelocity)
 end
 
 function Gearbox:forwardStep(torque, inertia)
+    self.torque = torque * self.ratio
+
     if self.output == nil then
         return torque
     end
 
     if self.ratio == 0 then
-        self.output:forwardStep(0, self.inertia)
+        self.output:forwardStep(0, self.inertia * 0.5)
 
         return torque
     end
 
-    self.torque = torque * self.ratio
-
     return self.output:forwardStep(self.torque, (inertia + self.inertia) * math.pow(self.ratio, 2)) / self.ratio
 end
 

koptilnya/engine_remastered/powertrain/gearboxes/manual.txt

@@ -1,9 +1,11 @@
 --@include /koptilnya/libs/watcher.txt
+--@include /koptilnya/libs/utils.txt
 --@include ./base.txt
 
 local BaseGearbox = require('./base.txt')
 
 require('/koptilnya/libs/watcher.txt')
+require('/koptilnya/libs/utils.txt')
 
 local ManualGearbox = class('ManualGearbox', BaseGearbox)
 
@@ -13,7 +15,7 @@ function ManualGearbox:initialize(vehicle, name, config)
     if CLIENT then return end
 
     table.merge(self.wireOutputs, {
-        Gearbox_Gear = 'number'
+        [string.format('%s_Gear', self.name)] = 'number'
     })
 
     self.ratios = config.Ratios or { 3.6, 2.2, 1.5, 1.2, 1.0, 0.8}
@@ -22,6 +24,8 @@ function ManualGearbox:initialize(vehicle, name, config)
     self.gear = 0
 
     function shiftFunc()
+        if wire.ports.Clutch == 0 then return 0 end
+
         local upshift = wire.ports.Upshift or 0
         local downshift = wire.ports.Downshift or 0
 
@@ -40,13 +44,17 @@ end
 function ManualGearbox:updateWireOutputs()
     BaseGearbox.updateWireOutputs(self)
 
-    wire.ports.Gearbox_Gear = self.gear
+    wire.ports[string.format('%s_Gear', self.name)] = self.gear
 end
 
 function ManualGearbox:setGear(gear)
     if gear >= -1 and gear <= #self.ratios then
         self.gear = gear
         self:recalcRatio()
+
+        net.start('GEARBOX_GEAR')
+        net.writeInt(gear, 5)
+        net.send(self.vehicle.playersConnectedToHUD, true)
     end
 end
 
@@ -65,9 +73,9 @@ function ManualGearbox:shift(dir)
 end
 
 function ManualGearbox:forwardStep(torque, inertia)
-    local result = BaseGearbox.forwardStep(self, torque, inertia)
-
     self.shiftWatcher()
+    
+    local result = BaseGearbox.forwardStep(self, torque, inertia)
 
     return result
 end