Skip to content

Commit 6e7138e

Browse files
committed
fix(GroundProximityComputer): add max distance when raycast misses
Signed-off-by: Octol1ttle <[email protected]>
1 parent cdaa3e6 commit 6e7138e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/FlightPlanComputer.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ class FlightPlanComputer(computers: ComputerBus) : Computer(computers) {
224224
}
225225
FlightPhase.LANDING -> {
226226
val approach = enrouteData.lastOrNull() ?: return null
227-
ManagedAltitudeVerticalMode(approach.coordinatesX, approach.coordinatesZ, approach.altitude, arrivalData.coordinatesX, arrivalData.coordinatesZ, arrivalData.elevation)
228-
.copy(textOverride = Component.translatable("mode.flightassistant.vertical.glide_slope"))
227+
ManagedAltitudeVerticalMode(approach.coordinatesX, approach.coordinatesZ, approach.altitude, arrivalData.coordinatesX, arrivalData.coordinatesZ, arrivalData.elevation, Component.translatable("mode.flightassistant.vertical.glide_slope"))
229228
}
230229
FlightPhase.GO_AROUND -> {
231230
SelectedAltitudeVerticalMode(arrivalData.goAroundAltitude, Component.translatable("mode.flightassistant.vertical.go_around"))
@@ -247,8 +246,7 @@ class FlightPlanComputer(computers: ComputerBus) : Computer(computers) {
247246
}
248247
FlightPhase.LANDING -> {
249248
val approach = enrouteData.lastOrNull() ?: return null
250-
TrackNavigationLateralMode(approach.coordinatesX, approach.coordinatesZ, arrivalData.coordinatesX, arrivalData.coordinatesZ)
251-
.copy(textOverride = Component.translatable("mode.flightassistant.lateral.localizer"))
249+
TrackNavigationLateralMode(approach.coordinatesX, approach.coordinatesZ, arrivalData.coordinatesX, arrivalData.coordinatesZ, Component.translatable("mode.flightassistant.lateral.localizer"))
252250
}
253251
FlightPhase.GO_AROUND -> {
254252
HeadingLateralMode(computers.data.heading.toInt(), Component.translatable("mode.flightassistant.lateral.go_around"))

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/safety/GroundProximityComputer.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ class GroundProximityComputer(computers: ComputerBus) : Computer(computers), Fli
142142
val result: BlockHitResult = raycast(offset)
143143
if (result.type == HitResult.Type.BLOCK) {
144144
distances.add(computers.data.position.distanceTo(result.location))
145+
} else {
146+
distances.add(maxRaycastDistance)
145147
}
146148
}}}
147149

src/main/resources/assets/flightassistant/lang/en_us.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ alert.flightassistant: # TODO: get rid of alert categories, more flexible alert
8383
navigation:
8484
.: NAV
8585
air_data_fault: AIR DATA FAULT
86+
approaching_void_damage_altitude: APPR.ING VOID DMG ALT
8687
chunk_status_fault: CHUNK STATUS FAULT
87-
void_proximity_fault: VOID PROX FAULT
88-
slow_chunk_loading: SLOW CHUNK LOADING
8988
no_chunks_loaded: NO CHUNKS LOADED
90-
approaching_void_damage_altitude: APPR.ING VOID DMG ALT
9189
reached_void_damage_altitude: REACHED VOID DMG ALT
90+
slow_chunk_loading: SLOW CHUNK LOADING
91+
void_proximity_fault: VOID PROX FAULT
9292
thrust:
9393
.: THRUST
9494
fault: SYS FAULT

0 commit comments

Comments
 (0)