display autoflight selections near the indications instead of on the FMA

Octol1ttle · Octol1ttle · commit 62991af04ace · 2025-07-19T23:07:47.000+05:00
Closes #67 Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/api/util/extensions/GuiGraphicsExtensions.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/api/util/extensions/GuiGraphicsExtensions.kt
@@ -37,8 +37,11 @@ val primaryColor: Int
 val secondaryColor: Int
     get() = FAConfig.display.secondaryColor.rgb
 
-val advisoryColor: Int
-    get() = FAConfig.display.advisoryColor.rgb
+val primaryAdvisoryColor: Int
+    get() = FAConfig.display.primaryAdvisoryColor.rgb
+
+val secondaryAdvisoryColor: Int
+    get() = FAConfig.display.secondaryAdvisoryColor.rgb
 
 val cautionColor: Int
     get() = FAConfig.display.cautionColor.rgb
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/config/FAConfigScreen.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/config/FAConfigScreen.kt
@@ -109,9 +109,14 @@ import ru.octol1ttle.flightassistant.config.options.SafetyOptions
                 binding(current::secondaryColor, defaults.secondaryColor)
                 controller(colorPicker())
             }
-            rootOptions.register("colors.advisory") {
+            rootOptions.register("colors.advisory.primary") {
                 setDisplayName()
-                binding(current::advisoryColor, defaults.advisoryColor)
+                binding(current::primaryAdvisoryColor, defaults.primaryAdvisoryColor)
+                controller(colorPicker())
+            }
+            rootOptions.register("colors.advisory.secondary") {
+                setDisplayName()
+                binding(current::secondaryAdvisoryColor, defaults.secondaryAdvisoryColor)
                 controller(colorPicker())
             }
             rootOptions.register("colors.caution") {
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/config/options/DisplayOptions.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/config/options/DisplayOptions.kt
@@ -15,8 +15,12 @@ class DisplayOptions {
     var primaryColor: Color = Color.GREEN
     @SerialEntry
     var secondaryColor: Color = Color.WHITE
+
+    @SerialEntry
+    var primaryAdvisoryColor: Color = Color.CYAN
+
     @SerialEntry
-    var advisoryColor: Color = Color.CYAN
+    var secondaryAdvisoryColor: Color = Color.MAGENTA
 
     @SerialEntry
     var cautionColor: Color = Color.YELLOW
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/autoflight/AutopilotOffAlert.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/autoflight/AutopilotOffAlert.kt
@@ -7,8 +7,8 @@ import ru.octol1ttle.flightassistant.api.alert.AlertData
 import ru.octol1ttle.flightassistant.api.alert.ECAMAlert
 import ru.octol1ttle.flightassistant.api.computer.ComputerView
 import ru.octol1ttle.flightassistant.api.util.FATickCounter
-import ru.octol1ttle.flightassistant.api.util.extensions.advisoryColor
 import ru.octol1ttle.flightassistant.api.util.extensions.drawString
+import ru.octol1ttle.flightassistant.api.util.extensions.primaryAdvisoryColor
 import ru.octol1ttle.flightassistant.api.util.extensions.warningColor
 
 class AutopilotOffAlert(computers: ComputerView) : Alert(computers), ECAMAlert {
@@ -42,7 +42,7 @@ class AutopilotOffAlert(computers: ComputerView) : Alert(computers), ECAMAlert {
     override fun render(guiGraphics: GuiGraphics, firstLineX: Int, otherLinesX: Int, firstLineY: Int): Int {
         var i: Int = guiGraphics.drawString(Component.translatable("alert.flightassistant.autoflight.autopilot_off"), firstLineX, firstLineY, warningColor)
         if (computers.autoflight.autopilotAlert) {
-            i += guiGraphics.drawString(Component.translatable("alert.flightassistant.autoflight.autopilot_off.push_to_silence"), otherLinesX, firstLineY + 11, advisoryColor)
+            i += guiGraphics.drawString(Component.translatable("alert.flightassistant.autoflight.autopilot_off.push_to_silence"), otherLinesX, firstLineY + 11, primaryAdvisoryColor)
         }
 
         return i
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/fault/DisplayFaultAlert.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/fault/DisplayFaultAlert.kt
@@ -7,9 +7,9 @@ import ru.octol1ttle.flightassistant.api.alert.Alert
 import ru.octol1ttle.flightassistant.api.alert.AlertData
 import ru.octol1ttle.flightassistant.api.alert.ECAMAlert
 import ru.octol1ttle.flightassistant.api.computer.ComputerView
-import ru.octol1ttle.flightassistant.api.util.extensions.advisoryColor
 import ru.octol1ttle.flightassistant.api.util.extensions.cautionColor
 import ru.octol1ttle.flightassistant.api.util.extensions.drawString
+import ru.octol1ttle.flightassistant.api.util.extensions.primaryAdvisoryColor
 import ru.octol1ttle.flightassistant.impl.display.HudDisplayHost
 
 class DisplayFaultAlert(computers: ComputerView, val identifier: ResourceLocation) : Alert(computers), ECAMAlert {
@@ -25,7 +25,7 @@ class DisplayFaultAlert(computers: ComputerView, val identifier: ResourceLocatio
         i += guiGraphics.drawString(Component.translatable("alert.flightassistant.fault.hud.$identifier"), firstLineX, firstLineY, cautionColor)
         i +=
             if (HudDisplayHost.countFaults(identifier) == 1) {
-                guiGraphics.drawString(Component.translatable("alert.flightassistant.fault.hud.reset"), otherLinesX, firstLineY + 11, advisoryColor)
+                guiGraphics.drawString(Component.translatable("alert.flightassistant.fault.hud.reset"), otherLinesX, firstLineY + 11, primaryAdvisoryColor)
             } else {
                 0
             }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/fault/computer/ComputerFaultAlert.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/fault/computer/ComputerFaultAlert.kt
@@ -7,8 +7,8 @@ import ru.octol1ttle.flightassistant.api.alert.Alert
 import ru.octol1ttle.flightassistant.api.alert.AlertData
 import ru.octol1ttle.flightassistant.api.alert.ECAMAlert
 import ru.octol1ttle.flightassistant.api.computer.ComputerView
-import ru.octol1ttle.flightassistant.api.util.extensions.advisoryColor
 import ru.octol1ttle.flightassistant.api.util.extensions.drawString
+import ru.octol1ttle.flightassistant.api.util.extensions.primaryAdvisoryColor
 import ru.octol1ttle.flightassistant.impl.computer.ComputerHost
 
 class ComputerFaultAlert(computers: ComputerView,
@@ -31,14 +31,14 @@ class ComputerFaultAlert(computers: ComputerView,
 
         if (extraTexts != null) {
             for (text in extraTexts) {
-                i += guiGraphics.drawString(text, otherLinesX, y, advisoryColor)
+                i += guiGraphics.drawString(text, otherLinesX, y, primaryAdvisoryColor)
                 y += 10
             }
         }
 
         i +=
             if (ComputerHost.getFaultCount(identifier) == 1) {
-                guiGraphics.drawString(Component.translatable("alert.flightassistant.fault.computer.reset"), otherLinesX, y, advisoryColor)
+                guiGraphics.drawString(Component.translatable("alert.flightassistant.fault.computer.reset"), otherLinesX, y, primaryAdvisoryColor)
             } else {
                 0
             }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/flight_controls/ProtectionsLostAlert.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/flight_controls/ProtectionsLostAlert.kt
@@ -6,9 +6,9 @@ import ru.octol1ttle.flightassistant.api.alert.Alert
 import ru.octol1ttle.flightassistant.api.alert.AlertData
 import ru.octol1ttle.flightassistant.api.alert.ECAMAlert
 import ru.octol1ttle.flightassistant.api.computer.ComputerView
-import ru.octol1ttle.flightassistant.api.util.extensions.advisoryColor
 import ru.octol1ttle.flightassistant.api.util.extensions.cautionColor
 import ru.octol1ttle.flightassistant.api.util.extensions.drawString
+import ru.octol1ttle.flightassistant.api.util.extensions.primaryAdvisoryColor
 
 class ProtectionsLostAlert(computers: ComputerView) : Alert(computers), ECAMAlert {
     override val priorityOffset: Int = 10
@@ -25,18 +25,18 @@ class ProtectionsLostAlert(computers: ComputerView) : Alert(computers), ECAMAler
         var y: Int = firstLineY + 1
         if (!computers.data.enabled && computers.data.faultCount <= 1) {
             y += 10
-            i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.enable_air_data"), otherLinesX, y, advisoryColor)
+            i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.enable_air_data"), otherLinesX, y, primaryAdvisoryColor)
         }
         if (!computers.pitch.enabled && computers.pitch.faultCount <= 1) {
             y += 10
-            i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.enable_pitch"), otherLinesX, y, advisoryColor)
+            i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.enable_pitch"), otherLinesX, y, primaryAdvisoryColor)
         }
         y += 10
-        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.max_pitch"), otherLinesX, y, advisoryColor)
+        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.max_pitch"), otherLinesX, y, primaryAdvisoryColor)
         y += 10
-        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.min_pitch"), otherLinesX, y, advisoryColor)
+        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.min_pitch"), otherLinesX, y, primaryAdvisoryColor)
         y += 10
-        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.maneuver_with_care"), otherLinesX, y, advisoryColor)
+        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.flight_controls.protections_lost.maneuver_with_care"), otherLinesX, y, primaryAdvisoryColor)
 
         return i
     }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/thrust/ReverseThrustNotSupportedAlert.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/thrust/ReverseThrustNotSupportedAlert.kt
@@ -6,9 +6,9 @@ import ru.octol1ttle.flightassistant.api.alert.Alert
 import ru.octol1ttle.flightassistant.api.alert.AlertData
 import ru.octol1ttle.flightassistant.api.alert.ECAMAlert
 import ru.octol1ttle.flightassistant.api.computer.ComputerView
-import ru.octol1ttle.flightassistant.api.util.extensions.advisoryColor
 import ru.octol1ttle.flightassistant.api.util.extensions.cautionColor
 import ru.octol1ttle.flightassistant.api.util.extensions.drawString
+import ru.octol1ttle.flightassistant.api.util.extensions.primaryAdvisoryColor
 
 class ReverseThrustNotSupportedAlert(computers: ComputerView) : Alert(computers), ECAMAlert {
     override val priorityOffset: Int = 40
@@ -21,7 +21,7 @@ class ReverseThrustNotSupportedAlert(computers: ComputerView) : Alert(computers)
     override fun render(guiGraphics: GuiGraphics, firstLineX: Int, otherLinesX: Int, firstLineY: Int): Int {
         var i = 0
         i += guiGraphics.drawString(Component.translatable("alert.flightassistant.thrust.reverse_not_supported"), firstLineX, firstLineY, cautionColor)
-        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.thrust.reverse_not_supported.set_forward"), otherLinesX, firstLineY + 11, advisoryColor)
+        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.thrust.reverse_not_supported.set_forward"), otherLinesX, firstLineY + 11, primaryAdvisoryColor)
         return i
     }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/thrust/ThrustLockedAlert.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/thrust/ThrustLockedAlert.kt
@@ -6,9 +6,9 @@ import ru.octol1ttle.flightassistant.api.alert.Alert
 import ru.octol1ttle.flightassistant.api.alert.AlertData
 import ru.octol1ttle.flightassistant.api.alert.ECAMAlert
 import ru.octol1ttle.flightassistant.api.computer.ComputerView
-import ru.octol1ttle.flightassistant.api.util.extensions.advisoryColor
 import ru.octol1ttle.flightassistant.api.util.extensions.cautionColor
 import ru.octol1ttle.flightassistant.api.util.extensions.drawString
+import ru.octol1ttle.flightassistant.api.util.extensions.primaryAdvisoryColor
 
 class ThrustLockedAlert(computers: ComputerView) : Alert(computers), ECAMAlert {
     override val data: AlertData = AlertData.THRUST_LOCKED
@@ -20,7 +20,7 @@ class ThrustLockedAlert(computers: ComputerView) : Alert(computers), ECAMAlert {
     override fun render(guiGraphics: GuiGraphics, firstLineX: Int, otherLinesX: Int, firstLineY: Int): Int {
         var i = 0
         i += guiGraphics.drawString(Component.translatable("alert.flightassistant.thrust.locked"), firstLineX, firstLineY, cautionColor)
-        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.thrust.locked.use_keys"), otherLinesX, firstLineY + 11, advisoryColor)
+        i += guiGraphics.drawString(Component.translatable("alert.flightassistant.thrust.locked.use_keys"), otherLinesX, firstLineY + 11, primaryAdvisoryColor)
         return i
     }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/base/ThrustComputer.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/base/ThrustComputer.kt
@@ -119,6 +119,6 @@ class ThrustComputer(computers: ComputerView) : Computer(computers) {
 
     companion object {
         val ID: ResourceLocation = FlightAssistant.id("thrust")
-        const val TOGA_THRESHOLD: Float = 0.99f
+        const val TOGA_THRESHOLD: Float = 0.99f // TODO: just hardcode it to 1.0f bruh
     }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/builtin/BuiltInLateralModes.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/builtin/BuiltInLateralModes.kt
@@ -22,7 +22,7 @@ data class CoordinatesLateralMode(val targetX: Int, val targetZ: Int) : AutoFlig
         return ControlInput(
             degrees(atan2(-(targetX - computers.data.position.x), targetZ - computers.data.position.z)).toFloat() + 180.0f,
             ControlInput.Priority.NORMAL,
-            Component.translatable("mode.flightassistant.lateral.selected_coordinates", targetX, targetZ)
+            Component.translatable("mode.flightassistant.lateral.selected_coordinates")
         )
     }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/builtin/BuiltInThrustModes.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/builtin/BuiltInThrustModes.kt
@@ -30,7 +30,7 @@ data class SpeedThrustMode(val target: Int) : AutoFlightComputer.ThrustMode {
         return ControlInput(
             (currentThrust + speedCorrection + accelerationDamping).toFloat().coerceIn(0.0f..1.0f),
             ControlInput.Priority.NORMAL,
-            Component.translatable("mode.flightassistant.thrust.speed", target)
+            Component.translatable("mode.flightassistant.thrust.speed")
         )
     }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/builtin/BuiltInVerticalModes.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/builtin/BuiltInVerticalModes.kt
@@ -13,7 +13,7 @@ data class PitchVerticalMode(val target: Float) : AutoFlightComputer.VerticalMod
         return ControlInput(
             target,
             ControlInput.Priority.NORMAL,
-            Component.translatable("mode.flightassistant.vertical.pitch", target.toInt())
+            Component.translatable("mode.flightassistant.vertical.pitch")
         )
     }
 }
@@ -27,7 +27,7 @@ data class SpeedReferenceVerticalMode(val targetSpeed: Int) : AutoFlightComputer
         val acceleration: Double = computers.data.forwardAcceleration * 20
 
         val speedCorrection: Double = (currentSpeed - targetSpeed) * FATickCounter.timePassed.pow(1.5f) * range
-        val accelerationDamping: Double = -acceleration * FATickCounter.timePassed.pow(2.0f) * range
+        val accelerationDamping: Double = acceleration * FATickCounter.timePassed.pow(2.0f) * range
         return ControlInput(
             (currentPitch + speedCorrection + accelerationDamping).toFloat().coerceIn(computers.thrust.getAltitudeHoldPitch()..computers.thrust.getOptimumClimbPitch()),
             ControlInput.Priority.NORMAL,
@@ -46,22 +46,22 @@ data class SelectedAltitudeVerticalMode(val target: Int) : AutoFlightComputer.Ve
         var text: Component
         if (diff >= 0) {
             finalPitch = computers.thrust.getOptimumClimbPitch()
-            text = Component.translatable("mode.flightassistant.vertical.selected_altitude.climb", target)
+            text = Component.translatable("mode.flightassistant.vertical.altitude.climb")
 
             val distanceFromNeutral: Float = finalPitch - neutralPitch
             finalPitch -= distanceFromNeutral * 0.6f * ((200.0f - abs) / 100.0f).coerceIn(0.0f..1.0f)
             finalPitch -= distanceFromNeutral * 0.4f * ((100.0f - abs) / 100.0f).coerceIn(0.0f..1.0f)
         } else {
             finalPitch = -35.0f
-            text = Component.translatable("mode.flightassistant.vertical.selected_altitude.descend", target)
+            text = Component.translatable("mode.flightassistant.vertical.altitude.descend")
 
             val distanceFromNeutral: Float = finalPitch - neutralPitch
             finalPitch -= distanceFromNeutral * 0.4f * ((100.0f - abs) / 50.0f).coerceIn(0.0f..1.0f)
             finalPitch -= distanceFromNeutral * 0.6f * ((50.0f - abs) / 50.0f).coerceIn(0.0f..1.0f)
         }
 
         if (abs <= 5.0f) {
-            text = Component.translatable("mode.flightassistant.vertical.selected_altitude.hold", target)
+            text = Component.translatable("mode.flightassistant.vertical.altitude.hold")
         }
 
         return ControlInput(finalPitch, ControlInput.Priority.NORMAL, text, 1.5f)
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AltitudeDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AltitudeDisplay.kt
@@ -11,6 +11,8 @@ import ru.octol1ttle.flightassistant.api.display.Display
 import ru.octol1ttle.flightassistant.api.display.HudFrame
 import ru.octol1ttle.flightassistant.api.util.extensions.*
 import ru.octol1ttle.flightassistant.config.FAConfig
+import ru.octol1ttle.flightassistant.impl.computer.autoflight.AutoFlightComputer
+import ru.octol1ttle.flightassistant.impl.computer.autoflight.builtin.SelectedAltitudeVerticalMode
 
 class AltitudeDisplay(computers: ComputerView) : Display(computers) {
     override fun allowedByConfig(): Boolean {
@@ -25,6 +27,7 @@ class AltitudeDisplay(computers: ComputerView) : Display(computers) {
             if (FAConfig.display.showAltitudeScale) {
                 renderAltitudeScale(HudFrame.right, centerY)
             }
+            renderAltitudeTarget(HudFrame.right + 2, HudFrame.top - 9)
         }
     }
 
@@ -103,6 +106,15 @@ class AltitudeDisplay(computers: ComputerView) : Display(computers) {
         return true
     }
 
+    private fun GuiGraphics.renderAltitudeTarget(x: Int, y: Int) {
+        val color: Int
+        val active: AutoFlightComputer.VerticalMode? = computers.autoflight.activeVerticalMode
+        if (computers.autoflight.getPitchInput() != null && active is SelectedAltitudeVerticalMode) {
+            color = if (active == computers.autoflight.selectedVerticalMode) primaryAdvisoryColor else secondaryAdvisoryColor
+            drawString(active.target.toString(), x, y, color)
+        }
+    }
+
     override fun renderFaulted(guiGraphics: GuiGraphics) {
         with(guiGraphics) {
             drawString(Component.translatable("short.flightassistant.altitude"), HudFrame.right, centerY - 5, warningColor)
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AutomationModesDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AutomationModesDisplay.kt
@@ -22,7 +22,7 @@ class AutomationModesDisplay(computers: ComputerView) : Display(computers) {
     private val thrustDisplay: ModeDisplay = ModeDisplay(1)
     private val pitchDisplay: ModeDisplay = ModeDisplay(2)
     private val headingDisplay: ModeDisplay = ModeDisplay(3)
-    private val automationStatusDisplay: ModeDisplay = ModeDisplay(5)
+    private val automationStatusDisplay: ModeDisplay = ModeDisplay(4)
 
     override fun allowedByConfig(): Boolean {
         return FAConfig.display.showAutomationModes
@@ -127,16 +127,16 @@ class AutomationModesDisplay(computers: ComputerView) : Display(computers) {
 
     companion object {
         val ID: ResourceLocation = FlightAssistant.id("automation_modes")
-        private const val TOTAL_MODES: Float = 5.0f
+        private const val TOTAL_MODES: Float = 4.0f
     }
 
     class ModeDisplay(private val order: Int) {
         private var lastText: Component? = null
         private var textChangedAt: Int = 0
 
         fun render(guiGraphics: GuiGraphics, text: Component?, active: Boolean = true, borderColor: Int? = null) {
-            val farLeft: Int = HudFrame.left - 35
-            val farRight: Int = HudFrame.right + 35
+            val farLeft: Int = HudFrame.left + 1
+            val farRight: Int = HudFrame.right - 1
             val farWidth: Int = farRight - farLeft
 
             val singleWidth: Int = ((farWidth - (TOTAL_MODES - 1)) / TOTAL_MODES).roundToInt()
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/CoordinatesDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/CoordinatesDisplay.kt
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/FlightDirectorsDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/FlightDirectorsDisplay.kt
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/HeadingDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/HeadingDisplay.kt
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/SpeedDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/SpeedDisplay.kt
diff --git a/src/main/resources/assets/flightassistant/lang/en_us.yml b/src/main/resources/assets/flightassistant/lang/en_us.yml
diff --git a/src/main/resources/assets/flightassistant/lang/ru_ru.yml b/src/main/resources/assets/flightassistant/lang/ru_ru.yml

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import ru.octol1ttle.flightassistant.api.alert.Alert`
`7`	`7`	`import ru.octol1ttle.flightassistant.api.alert.AlertData`
`8`	`8`	`import ru.octol1ttle.flightassistant.api.alert.ECAMAlert`
`9`	`9`	`import ru.octol1ttle.flightassistant.api.computer.ComputerView`
`10`		`-import ru.octol1ttle.flightassistant.api.util.extensions.advisoryColor`
`11`	`10`	`import ru.octol1ttle.flightassistant.api.util.extensions.drawString`
	`11`	`+import ru.octol1ttle.flightassistant.api.util.extensions.primaryAdvisoryColor`
`12`	`12`	`import ru.octol1ttle.flightassistant.impl.computer.ComputerHost`
`13`	`13`
`14`	`14`	`class ComputerFaultAlert(computers: ComputerView,`
`@@ -31,14 +31,14 @@ class ComputerFaultAlert(computers: ComputerView,`
`31`	`31`
`32`	`32`	`if (extraTexts != null) {`
`33`	`33`	`for (text in extraTexts) {`
`34`		`- i += guiGraphics.drawString(text, otherLinesX, y, advisoryColor)`
	`34`	`+ i += guiGraphics.drawString(text, otherLinesX, y, primaryAdvisoryColor)`
`35`	`35`	`y += 10`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`i +=`
`40`	`40`	`if (ComputerHost.getFaultCount(identifier) == 1) {`
`41`		`- guiGraphics.drawString(Component.translatable("alert.flightassistant.fault.computer.reset"), otherLinesX, y, advisoryColor)`
	`41`	`+ guiGraphics.drawString(Component.translatable("alert.flightassistant.fault.computer.reset"), otherLinesX, y, primaryAdvisoryColor)`
`42`	`42`	`} else {`
`43`	`43`	`0`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,6 @@ class ThrustComputer(computers: ComputerView) : Computer(computers) {`
`119`	`119`
`120`	`120`	`companion object {`
`121`	`121`	`val ID: ResourceLocation = FlightAssistant.id("thrust")`
`122`		`- const val TOGA_THRESHOLD: Float = 0.99f`
	`122`	`+ const val TOGA_THRESHOLD: Float = 0.99f // TODO: just hardcode it to 1.0f bruh`
`123`	`123`	`}`
`124`	`124`	`}`