mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-24 23:17:07 +00:00
2661 PR 3/3 Warship Manual Override, Aggro Override, and Heal-at-Port Command (#3501)
Part of [#2661](https://github.com/openfrontio/OpenFrontIO/issues/2661) (split into 3 PRs so they are not too large..) ## Description: Part 3/3 of [#2661](https://github.com/openfrontio/OpenFrontIO/issues/2661). This PR adds the retreat control and override behavior for warships: - Manual override: moving a warship manually cancels retreat and suppresses auto-retreat for 5 seconds - Aggro override: a retreating warship will aggro a nearby enemy transport or warship before continuing retreat - Heal-at-port command for sending a warship to a friendly port manually - Friendly-port validation for HealAtPortExecution - Regression tests for manual override, aggro override, and heal-at-port behavior ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: zixer._ --------- Co-authored-by: iamlewis <lewismmmm@gmail.com> Co-authored-by: evanpelle <evanpelle@gmail.com>
This commit is contained in:
co-authored by
iamlewis
evanpelle
parent
f1d0136a06
commit
742a544a69
@@ -10,7 +10,9 @@ import {
|
||||
Team,
|
||||
Tick,
|
||||
TrainType,
|
||||
TransportShipState,
|
||||
UnitType,
|
||||
WarshipState,
|
||||
} from "./Game";
|
||||
import { TileRef } from "./GameMap";
|
||||
|
||||
@@ -137,7 +139,8 @@ export interface UnitUpdate {
|
||||
lastPos: TileRef;
|
||||
isActive: boolean;
|
||||
reachedTarget: boolean;
|
||||
retreating: boolean;
|
||||
warshipState?: WarshipState;
|
||||
transportShipState?: TransportShipState;
|
||||
targetable: boolean;
|
||||
markedForDeletion: number | false;
|
||||
targetUnitId?: number; // Only for trade ships
|
||||
|
||||
Reference in New Issue
Block a user