From 3b287e5981af5f1f3ee2f3021441c087ee362566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=93=D1=80=D0=B0=D1=87=D1=91?=
 =?UTF-8?q?=D0=B2?= <igrachev@smart-ts.ru>
Date: Sun, 28 Mar 2021 19:28:45 +0500
Subject: [PATCH] Included missing engine files

---
 koptilnya/engine_rework/constants.txt  | 3 ---
 koptilnya/engine_rework/controller.txt | 4 ++--
 koptilnya/engine_rework/engine.txt     | 7 ++-----
 koptilnya/engine_rework/input.txt      | 4 ++--
 koptilnya/libs/constants.txt           | 4 +++-
 5 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 koptilnya/engine_rework/constants.txt

diff --git a/koptilnya/engine_rework/constants.txt b/koptilnya/engine_rework/constants.txt
deleted file mode 100644
index ab4dd5b..0000000
--- a/koptilnya/engine_rework/constants.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-NULL_ENTITY = entity(0)
-CURRENT_PLAYER = player()
-OWNER = owner()
diff --git a/koptilnya/engine_rework/controller.txt b/koptilnya/engine_rework/controller.txt
index 927b716..3c74605 100644
--- a/koptilnya/engine_rework/controller.txt
+++ b/koptilnya/engine_rework/controller.txt
@@ -1,11 +1,11 @@
 -- @name Engine
 -- @author DarkSupah, Opti1337, .hemp
 -- @shared
--- @include ./constants.txt
+-- @include ../libs/constants.txt
 -- @include ./engine.txt
 -- @include ./gearbox.txt
 -- @include ./input.txt
-require("./constants.txt")
+require("../libs/constants.txt")
 require("./engine.txt")
 require("./gearbox.txt")
 require("./input.txt")
diff --git a/koptilnya/engine_rework/engine.txt b/koptilnya/engine_rework/engine.txt
index 686de7c..9dc9cec 100644
--- a/koptilnya/engine_rework/engine.txt
+++ b/koptilnya/engine_rework/engine.txt
@@ -83,7 +83,7 @@ if SERVER then
         local frac = (RPMfrac * tableCount) % 1
         local minActiveThrottle = self.config.idleRPM / self.config.maxRPM
 
-        local value = math.max(minActiveThrottle, self.throttle) * math.lerp(frac, lerpFromVal, lerpToVal) * self.peakTq
+        local value = math.lerp(frac, lerpFromVal, lerpToVal) * self.peakTq
 
         local overdrive = math.clamp(1 - self.gearboxRPM / self.desiredRPM, -1, 0)
 
@@ -91,11 +91,8 @@ if SERVER then
         local maxRPM = self.config.maxRPM
         local brakeTorqueCoeff = self.config.brakeTorqueCoeff
 
-        local brakeTorque = -value * math.max(1 - self.throttle, idleRPM / maxRPM, -overdrive) *
-                                (self.gearboxRPM / maxRPM) * brakeTorqueCoeff
-
         local RPMLimiter = math.clamp(1 - self.throttle * (self.gearboxRPM / self.desiredRPM), self.throttle, 1)
-        local netTq = value * math.max(self.throttle, idleRPM / maxRPM) * RPMLimiter + brakeTorque
+        local netTq = value * math.max(self.throttle, idleRPM / maxRPM) * RPMLimiter
 
         self.torque = netTq
     end
diff --git a/koptilnya/engine_rework/input.txt b/koptilnya/engine_rework/input.txt
index 36deb29..ba87b93 100644
--- a/koptilnya/engine_rework/input.txt
+++ b/koptilnya/engine_rework/input.txt
@@ -1,5 +1,5 @@
--- @include ./constants.txt
-require("./constants.txt")
+-- @include ../libs/constants.txt
+require("../libs/constants.txt")
 
 InputController = class("InputController")
 
diff --git a/koptilnya/libs/constants.txt b/koptilnya/libs/constants.txt
index 572a731..fee1b0f 100644
--- a/koptilnya/libs/constants.txt
+++ b/koptilnya/libs/constants.txt
@@ -1 +1,3 @@
-NULL_ENTITY = entity(0)
\ No newline at end of file
+NULL_ENTITY = entity(0)
+CURRENT_PLAYER = player()
+OWNER = owner()
\ No newline at end of file