Skip to content

Commit

Permalink
small nan° fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhooL committed Apr 8, 2022
1 parent 886efb7 commit f5f081c
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 8 deletions.
26 changes: 24 additions & 2 deletions FS22_EnhancedVehicle.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
--
-- Author: Majo76
-- email: [email protected]
-- @Date: 18.02.2022
-- @Version: 1.2.1.0
-- @Date: 08.04.2022
-- @Version: 1.2.2.0

--[[
CHANGELOG
2022-04-08 - V1.2.2.0
* fix for rare "nan°" angle display
* translation updates
2022-02-18 - V1.2.1.0
+ added "tüdelü" sound when approaching headland trigger (thx "andre020478" for the sample)
+ added config menu option to specify the distance to headland for the alarm sound
Expand Down Expand Up @@ -1677,6 +1681,9 @@ function FS22_EnhancedVehicle:onActionCall(actionName, keyStatus, arg4, arg5, ar
snapToAngle = self.vData.rot
end
self.vData.want[4] = Round(closestAngle(self.vData.rot, snapToAngle), 0)
if (self.vData.want[4] ~= self.vData.want[4]) then
self.vData.want[4] = 0
end
if self.vData.want[4] == 360 then self.vData.want[4] = 0 end

-- if track is enabled -> set angle to track angle
Expand Down Expand Up @@ -1706,6 +1713,9 @@ function FS22_EnhancedVehicle:onActionCall(actionName, keyStatus, arg4, arg5, ar
end
FS22_EnhancedVehicle:updateTrack(self, true, rot2, false, 0, true, 0, 0)
self.vData.want[4] = rot2
if (self.vData.want[4] ~= self.vData.want[4]) then
self.vData.want[4] = 0
end

-- update headland
self.vData.track.isOnField = FS22_EnhancedVehicle:getHeadlandInfo(self) and 10 or 0
Expand All @@ -1730,6 +1740,9 @@ function FS22_EnhancedVehicle:onActionCall(actionName, keyStatus, arg4, arg5, ar
-- turn snap on
self.vData.want[5] = true
self.vData.want[4] = Round(self.vData.is[4] + 180, 0)
if (self.vData.want[4] ~= self.vData.want[4]) then
self.vData.want[4] = 0
end
if self.vData.want[4] >= 360 then self.vData.want[4] = self.vData.want[4] - 360 end
-- if track is enabled -> also rotate track
if self.vData.opMode == 2 and self.vData.track.isCalculated then
Expand All @@ -1746,6 +1759,9 @@ function FS22_EnhancedVehicle:onActionCall(actionName, keyStatus, arg4, arg5, ar
--
if self.vData.is[5] then
self.vData.want[4] = Round(self.vData.is[4] + 1 * (keyStatus >= 0 and 1 or -1), 0)
if (self.vData.want[4] ~= self.vData.want[4]) then
self.vData.want[4] = 0
end
if self.vData.want[4] >= 360 then self.vData.want[4] = self.vData.want[4] - 360 end
if self.vData.want[4] < 0 then self.vData.want[4] = self.vData.want[4] + 360 end
-- if track is enabled -> also rotate track
Expand All @@ -1763,6 +1779,9 @@ function FS22_EnhancedVehicle:onActionCall(actionName, keyStatus, arg4, arg5, ar
-- 45°
if self.vData.is[5] then
self.vData.want[4] = Round(self.vData.is[4] + 45 * (keyStatus >= 0 and 1 or -1), 0)
if (self.vData.want[4] ~= self.vData.want[4]) then
self.vData.want[4] = 0
end
if self.vData.want[4] >= 360 then self.vData.want[4] = self.vData.want[4] - 360 end
if self.vData.want[4] < 0 then self.vData.want[4] = self.vData.want[4] + 360 end
_snap = true
Expand All @@ -1776,6 +1795,9 @@ function FS22_EnhancedVehicle:onActionCall(actionName, keyStatus, arg4, arg5, ar
-- 90°
if self.vData.is[5] then
self.vData.want[4] = Round(self.vData.is[4] + 90 * (keyStatus >= 0 and 1 or -1), 0)
if (self.vData.want[4] ~= self.vData.want[4]) then
self.vData.want[4] = 0
end
if self.vData.want[4] >= 360 then self.vData.want[4] = self.vData.want[4] - 360 end
if self.vData.want[4] < 0 then self.vData.want[4] = self.vData.want[4] + 360 end
_snap = true
Expand Down
4 changes: 2 additions & 2 deletions modDesc.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<modDesc descVersion="63">
<modDesc descVersion="64">
<author>Majo76</author>
<contributors>dziuch</contributors>

<version>1.2.1.0</version>
<version>1.2.2.0</version>

<title>
<de>EnhancedVehicle</de>
Expand Down
12 changes: 8 additions & 4 deletions ui/FS22_EnhancedVehicle_HUD.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
--
-- Author: Majo76
-- email: [email protected]
-- @Date: 24.01.2022
-- @Version: 1.2.0.0
-- @Date: 08.04.2022
-- @Version: 1.2.2.0

-- Thanks to Wopster for the inspiration to implement a HUD in this way
-- but unfortunately I can't use it that exact way (for now)
Expand Down Expand Up @@ -714,8 +714,12 @@ function FS22_EnhancedVehicle_HUD:drawHUD()
-- prepare text
snap_txt2 = ''
if self.vehicle.vData.is[5] then
snap_txt = string.format("%.1f°", self.vehicle.vData.is[4])
if (Round(self.vehicle.vData.rot, 0) ~= Round(self.vehicle.vData.is[4], 0)) then
local degree = self.vehicle.vData.is[4]
if (degree ~= degree) then
degree = 0
end
snap_txt = string.format("%.1f°", degree)
if (Round(self.vehicle.vData.rot, 0) ~= Round(degree, 0)) then
snap_txt2 = string.format("%.1f°", self.vehicle.vData.rot)
end
else
Expand Down

0 comments on commit f5f081c

Please sign in to comment.