autonav: Remove the feature

The autonavigation feature has issues:

* Autonavigation orders are executed at the update.  Crafty players
  can use them to get around the update window.

* Usability is poor:

  - The order command is overly complex, not least because it can do
    five different things: clear, suspend, resume, declare route, set
    cargo levels.

  - Unlike every other command involving movement, order does not let
    you specify routes, only destination sectors.

  - Setting cargo levels can silently swap start and end point of a
    circular route, because "this keeps the load_it() procedure
    happy".  Maybe it does, but it surely keeps players confused.

  - Setting "start" cargo levels actually sets the "end" levels, and
    vice versa.  Has always been broken that way.

  - Predicting what exactly autonavigation will do at the update isn't
    easy.

* The info pages documenting it amount to almost 400 non-blank lines
  formatted.  They claim only merchant ships can be given orders.
  This is wrong.  Unlikely to be the only error.

* Few players use it, and its workings at the update a fairly opaque.
  Makes it a nice hidey-hole for bugs.  Here are two:

  - Unlike the scuttle command, autonavigation happily scuttles trade
    ships while they're on the trading block.

  - Unlike the load command, autonavigation can load in friendly and
    allied sectors.

* It's more than 700 lines of rather crufty code nobody wants to
  touch.  Thanks to a big effort in Empire 2, it shares code with the
  navigation command.  It still duplicates load code.  The sharing
  complicates fixing the bugs demonstrated by navi-march-test.

Reviewing, fixing and testing this mess isn't worth the opportunity
cost.  Remove it instead.  Drop commands order, qorder and sorder.
Drop ship selectors xstart, xend, ystart, yend, cargostart, cargoend,
amtstart, amtend, autonav.

xdump ship sheds almost half its columns.  struct shpstr shrinks, on
my system from 200 to 160 bytes.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/prototypes.h b/include/prototypes.h
index cde832c2b263d01b9651fdb7a0381e2ec6defb0c..f7d887ffd57e24092673d1e837b8058779471947 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -64,7 +64,6 @@ extern int would_abandon(struct sctstr *, i_type, int, struct lndstr *);
 extern int nav_map(int, int, int);
 extern int do_unit_move(struct emp_qelem *, int *, double *, double *);
 extern int count_pop(int);
-extern int scuttle_tradeship(struct shpstr *, int);
 extern int line_of_sight(char **rad, int ax, int ay, int bx, int by);
 extern void plane_sona(struct emp_qelem *, int, int, struct shiplist **);
 extern char *prsub(struct shpstr *);
@@ -168,7 +167,6 @@ int newe(void);
 int news(void);
 int nuke(void);
 int offe(void);
-int orde(void);
 int orig(void);
 int para(void);
 int path(void);
@@ -181,7 +179,6 @@ int play(void);
 int powe(void);
 int prod(void);
 int pstat(void);
-int qorde(void);
 int quit(void);
 int rada(void);
 int range(void);
@@ -218,7 +215,6 @@ int shut(void);
 int sinfra(void);
 int skyw(void);
 int sona(void);
-int sorde(void);
 int spy(void);
 int sstat(void);
 int start(void);
@@ -694,11 +690,6 @@ extern void pln_do_upd_mob(struct plnstr *pp);
 extern void move_sat(struct plnstr *);
 /* nat.c */
 extern void prod_nat(int);
-/* nav_ship.c */
-extern int nav_ship(struct shpstr *);
-/* nav_util.c */
-extern int load_it(struct shpstr *, struct sctstr *, int);
-extern void unload_it(struct shpstr *);
 /* nxtitemp.c */
 /* in nsc.h */
 /* plague.c */

diff --git a/include/ship.h b/include/ship.h
index fcdf41a651955558202becd3146e499595221905..fe399c3e8f8865f66f972812c0f406ad764dfdc8 100644 (file)
--- a/include/ship.h
+++ b/include/ship.h
@@ -45,17 +45,6 @@
 #define SHP_TYPE_MAX   46
 #define SHIP_MINEFF    20
 
-/* bit masks for the autonav mode flags */
-
-#define AN_AUTONAV bit(2)
-#define AN_STANDBY bit(3)
-#define AN_LOADING bit(4)
-#define AN_SCUTTLE bit(5)      /* Auto-scuttle of trade ships */
-
-/* TMAX is the number of cargo holds a ship use in the autonav code. */
-#define TMAX 6
-
-
 #define MAXSHPPATH     28
 #define MAXSHPNAMLEN   24
 
@@ -79,13 +68,6 @@ struct shpstr {
     short shp_mission;         /* mission code */
     short shp_radius;          /* mission radius */
     /* end of part matching struct empobj */
-    coord shp_destx[2];                /* location for ship destination */
-    coord shp_desty[2];
-    i_type shp_tstart[TMAX];   /* what goods to pick up at start point */
-    i_type shp_tend[TMAX];     /* what goods to pick up at end point   */
-    short shp_lstart[TMAX];    /* How much do we pick up at the start  */
-    short shp_lend[TMAX];      /* How much do we pick up at the end    */
-    unsigned char shp_autonav; /* autonavigation flags */
     short shp_item[I_MAX+1];   /* amount of items on board */
     short shp_pstage;          /* plague stage */
     short shp_ptime;           /* how many etus remain in this stage */

diff --git a/info/Autofish.t b/info/Autofish.t
deleted file mode 100644 (file)
index 475c50a..0000000
--- a/info/Autofish.t
+++ /dev/null
@@ -1,87 +0,0 @@
-.TH Concept Autofish
-.NA Autofish "How to exploit resources at sea automatically"
-.LV Expert
-Fishing boats and oil derricks let you exploit sea resources.
-Navigating them back and forth between harbor and fishery / offshore
-oil field is rather tedious.  Autonavigation lets you automate this.
-.s1
-It is more commonly used for fishing boats than for oil derricks,
-because oil fields are commonly configured to deplete quickly, and are
-often too far from harbors for the slow oil derricks to make
-autonavigation effective.
-.s1
-This is an example of how to set up a fleet of fishing boats
-so they will take their food produced each update and drop it off
-at the harbor of your choice.  Oil derricks work exactly the same.
-.s1
-See info \*Qorder\*U for a complete description and example of
-syntax for the \*Qorder\*U command.
-.s1
-.NF
-map #1
-   00000000001111111
-   01234567890123456
- -4. . . . . . . . .
- -3 ? ? . . . . . .
- -2? . . . . . . ) .
- -1 ? . . . . . f . .
-  0. . . . . g m . .
-  1 . . . . f * w h .
-  2. . . . . c + + .
-.s1
-You have ships 0,12 and 88 in the harbor at 15,1.
-Sector 16,0 has a very good fert of 93 so you want to use that
-as your fishing grounds.
-.s1
-1) move your ships to sector 16,0
-    "nav 0/12/88 16,0"
-
-2a) set up autonav using the 'order' command.
-    "order 0 des 15,1 16,0"
-    This will establish a circular trade route.
-
-2b) set up food levels for the ship
-    "order 0 level 1 start food 30"
-    "order 0 level 1 end   food 30"
-
-    You can also use a global '*' or a fleet letter here.
-    "order * level 1 start food 30"
-    "order * level 1 end   food 30"
-
-    "order F level 1 start food 30"
-    "order F level 1 end   food 30"
-
-    NOTE: You should set BOTH start and end fields to insure
-          autofish will work correctly and set them at the
-          same levels!
-
-    NOTE: Fishing boats and oil derricks are a special case
-          to the autonav code.  This setup will only work
-          correctly with them.  If you want to use autonav
-          with cargo ships please use the examples found in
-          the \*Qorder\*U command.
-
-repeat 2a,2b for other ships in the area.
-.FI
-.s1
-During the update your fishing boats will now move to the harbor at
-15,1 unload food until it reaches 30, then move back to 15,1 and STOP.
-So unless the ship gets sunk, or something happens to it, like the
-civs starve on board if you don't leave enough food on it,
-the ships will continue to feed your country and you won't even need
-to think about them.
-.s1
-For oil derricks, step 2b becomes:
-.nf
-    "order 0 level 1 start food 30"
-    "order 1 level 2 end   oil 1"
-
-    Note: If food is not required, food cargo levels can be zeroed.
-
-    Note: In this configuration, the end oil level is not important
-          as it is not used.
-.fi
-.s1
-If your ship can't be unloaded because the the harbor is overcrowded,
-it will continue along its route.
-.SA "Autonav, order, navigate, Ships, Populace, Updates"

diff --git a/info/Autonav.t b/info/Autonav.t
deleted file mode 100644 (file)
index 15ee1e6..0000000
--- a/info/Autonav.t
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH Concept Autonavigation
-.NA Autonav "Giving ships automatic sailing orders"
-.LV Expert
-In a very short while after acquiring ships the effort of moving ships after
-every update gets very boring.  And the more ships you have, the more work
-it is.  Hence the concept of autonavigation.  Like any self-respecting
-dictator, you don't personally drive your ships around (except when you want
-to), instead you command you ship captains to take their vessels to a
-specified destination.  This is done via the \*Qorder\*U command.
-.s1
-Each ship can be ordered to proceed to a destination.  During each update,
-the ship will try and use ALL the mobility it has and use the shortest
-possible path.  It will also avoid any known mines (sectors marked
-with an 'X' or 'x' on your bmap).  Note that this movement is all
-done before mobility is accumulated, so that after the update is
-complete the ship will have a full updates worth of mobility
-in case you need to move it by hand.  Should a ship be fired upon
-by forts or strike a mine they will stop moving!  This will prevent
-your ship from foolishly getting sunk in enemy waters.  The
-\*Qorder\*U command covers many special cases.
-.s1
-The autonavigation capability is dependent upon the per country map database
-accessed via the \*Qbmap\*U command.  If you order a vessel to a destination
-that causes it to cross a previously unexplored area, the ship will attempt
-to cross that area as if it were water.  One of the features of the bmap
-functionality is that when a ship is navigated, it automatically uses its
-radar to see the local sectors (much like real life).  This sector information
-is added to the per country map database.  Thus upon running into a previously
-unknown obstruction, that information is added to the map database and on the
-next update, a new path to the destination will be calculated which avoids
-the obstruction.  This process applied iteratively means that a ships will
-eventually find its way around any obstruction, provided that a path exists.
-In reality, this is a limit to this process.  In order to limit the processing
-that is done to find a path to the destination, the internal path string is
-limited to 28 characters.
-.s1
-Autonavigation also supports autotrading.
-By specifying two destinations and two commodities,
-the ship will move back and forth between the two destination loading and
-unloading the appropriate commodities.
-Specific examples can be found in info \*Qorder\*U.
-.s1
-Autonavigation also supports automatic resource production at sea.
-See info \*QAutofish\*U for details.
-.s1
-The same rules for navigating, loading, and unloading apply for
-Autonavigation as they do when you do these things by hand, namely
-that you may only use harbours owned by nations which consider you to
-be a friendly trading partner (see info \*Qrelations\*U).
-.s1
-.SA "navigate, order, Ships, Updates, Autofish"

diff --git a/info/Selector.t b/info/Selector.t
index eb6e0e2abc0a15bb1ba0e94d0f11c5720a451eb9..c3ed1a10fdad759aade8764b4ad8caefb8aea2df 100644 (file)
--- a/info/Selector.t
+++ b/info/Selector.t
@@ -125,7 +125,6 @@ number of planes the ship is carrying
 number of xlight planes the ship is carrying
 .L nchoppers
 number of helicopters the ship is carrying
-.L autonav
 .in
 .s1
 Plane:

diff --git a/info/Trade-ships.t b/info/Trade-ships.t
index 1548dd672654db8c8ed0ec20142dca255a802cc7..96aebbaf3ad71811c1bd94dee0fcaa12522f2a2e 100644 (file)
--- a/info/Trade-ships.t
+++ b/info/Trade-ships.t
@@ -72,21 +72,4 @@ get some bad publicity in the news) Payoff is still based on the distance from
 the harbor where the trade ship was built, not the sector in which it was
 captured.
 .s1
-You can also use the "order" command to set up automated trading routes with
-trade ships and have them navigate and automatically scuttle themselves when
-they reach their destination.  See "info order" for more information on this,
-but basically you can do things like this:
-.NF
-    Step 1) Make a harbor
-    Step 2) Get cms distributed/delivered to your harbor each update.
-    Step 3) Find a destination harbor to sail to
-    Step 4) build tradeships in the harbor each update
-    Step 5) load civs and food on the trade ships each update.
-    Step 6) order the trade ships to sail and autoscuttle in the dest harbor.
-.FI
-.s1
-You can then just repeat steps 4, 5, and 6 each update, and never worry
-about your trade ships again.  Unless someone starts intercepting them,
-that is...
-.s1
-.SA "payoff, order, Ship-types, scuttle, Ships"
+.SA "payoff, Ship-types, scuttle, Ships"

diff --git a/info/Update-sequence.t b/info/Update-sequence.t
index 6b5c9a3f28c1a17826727dcf545cc5b655a0f19f..575c166d985c3f276470008b6dd968aaa9826fca 100644 (file)
--- a/info/Update-sequence.t
+++ b/info/Update-sequence.t
@@ -39,7 +39,6 @@ This document gives a rough order of events during the update.
                 g) then make things
        f) ship building
                 stopped ships are started, but not built (see info stop)
-               ships execute their orders right after building
                finally, if option SAIL is enabled, follow sail paths
        g) plane building
                 stopped planes are started, but not built (see info stop)

diff --git a/info/mission.t b/info/mission.t
index 0405020c920a7be974f0c93e086805158c2d3bf8..9c0435b0c28c00ae83a82208376911077379af10 100644 (file)
--- a/info/mission.t
+++ b/info/mission.t
@@ -31,8 +31,7 @@ That's the price you pay for having automatic defenses.
 .s1
 .L "IMPORTANT NOTES"
 .s1
-Missions can occur during updates.  (Interdicting ships using "sail"
-or "order").
+Missions can occur during updates.  (Interdicting ships using "sail").
 .s1
 Artillery units less than 40% efficient will not fire.
 .s1

diff --git a/info/navigate.t b/info/navigate.t
index a205699732d76e1ff5c34db5e6f8ba06572a5bdd..2033ee5153bed596efda48a424a5ad4b3406ce3c 100644 (file)
--- a/info/navigate.t
+++ b/info/navigate.t
@@ -148,4 +148,4 @@ all the ships in the fleet which are in the same sector.
 While navigating, you cannot enter a sector that belongs to another
 country unless they have FRIENDLY relations with you. This includes bridges, and harbors.
 .s1
-.SA "mine, Ship-types, mission, order, sail, Ships, Transportation, Moving"
+.SA "mine, Ship-types, mission, sail, Ships, Transportation, Moving"

diff --git a/info/order.t b/info/order.t
deleted file mode 100644 (file)
index d42857e..0000000
--- a/info/order.t
+++ /dev/null
@@ -1,160 +0,0 @@
-.TH Command ORDER
-.NA order "Order a ship to auto-navigate"
-.LV Expert
-.SY "order <SHIP/FLEET> [c|r|s|d|l]
-You use the \*Qorder\*U command to give sailing orders to ships.
-At each update, ships sailing under orders \*Qautonavigate\*U toward a
-specific destination sector.  Telegrams notify you of arrivals.
-.s1
-ONLY merchant ship may be given orders, but in order to move during the
-update a ship must have at least one crew (which may be civilian or military,
-but not an uncompensated worker).  Merchant ships are those that
-have 0 for their firing range and gun limit values.
-.s1
-Note that your ships sailing on orders will be interdicted just as if
-you were navigating them by hand.
-.s1
-.EX order <SHIP/FLEET> c      Clear Orders
-.s1
-     Use the clear option to wipe out any orders the ship
-currently has.  This will remove all starting and ending
-points and clear all the cargo levels for the ship.
-.s1
-.EX order <SHIP/FLEET> s      Suspend Orders
-.s1
-     If you want to keep orders but don't want the ship
-to move during the update use the suspend option.
-A quick look at \*Qsorder\*U
-will display the eta time as suspended.
-As long as a ship is suspended it will be unable to move
-during the update.
-.s1
-.EX order <SHIP/FLEET> r      Resume Orders
-     Resume will allow ships that have a suspended order to move
-again.
-.s1
-.EX order <SHIP/FLEET> d <dest1> [dest2|scuttle|-]   Declare Orders
-.s1
-To declare an order you have 3 options.
-.NF
-     1) Order a ship to any sector on the map.
-       When it arrives it will clear its orders.
-
-     2) Order a ship to any sector, load goods,
-        move to a second sector and unload goods.
-        Continue to loop between the 2 points.
-
-     3) Order a ship to any sector on the map.
-        When it arrives, it will scuttle itself if it is in a harbor that
-          is at least 2% efficient.  This is useful for tradeships.
-
-Example:  You have a cargo ship (#6) in your harbor at sector 6,0
-You want to move good between that harbor and another harbor at
-sector 14,0.
-
- order 6 d 6,0 14,0
-
-This reads:
- Cargo Ship #6, move to sector 6,0 load goods, sail to sector 14,0
- unload cargo then load again and sail back to 6,0.
-
-Example: You have a tradeship (#666) at sea in sector -10,0 and you
-want to move it to a friendly harbor at 20,4.
-
- order 666 d 20,4 -
-
-The ship will now move to sector 20,4 with the most efficient path.
-
-Example: You have a tradeship (#666) at sea in sector -10,0 and you
-want to move it to a friendly harbor at 20,4, and then scuttle itself.
-
- order 666 d 20,4 scuttle
-
-The ship will now move to sector 20,4 with the most efficient path,
-and scuttle itself when done.
-
-Note that only trade ships can be given auto-scuttle orders, and won't
-scuttle themselves at sea.
-.FI
-.s1
-.EX order <SHIP/FLEET> l <hold> <start/end> <COMM> <amount>
-.s1
-Set cargo Levels.
-.NF
-Example: Cargo ship #109 is at your harbor in sector 10,0.
-You have agreed to trade 200 lcm and 100 hcm to your friend and
-he will give you 100 shells each update.  His harbor is at -10,2.
-Using 'order declare' you set up your start point 10,0 and end point -10,2
-
-order 109 l 1 start lcm   200
-order 109 l 2 start hcm   100
-order 109 l 1 end   shell 100
-
-When your finished the output would look like this.
-
-sorder 109
-shp #   type           x,y     start   end     len  eta
-  109   cargo ship 2  10,0      10,0   -10,2    11   1
-
-qorder 109
-shp #   type           [Starting]  (Ending)
-  109   cargo ship 2   [1-l:200 2-h:100 ] , (1-s:100 )
-
-.FI
-.s1
-AutoNav Features.
-.s1
-Whenever a ship is autoloading cargo, it will always wait until it loads
-to capacity.  If a ship does not load fully it will not move!!!
-Remember 'ships need food!!' unless the NOFOOD option is enabled.
-Set one of your cargo holds to load food or your ship will starve at sea.
-When unloading cargo, the ship will unload all goods
-listed in the cargo holds ONLY!  It will not unload any extra good
-manually placed on the ship.
-.s1
-If you are dealing with civilians 1 will be left in either the
-sector or the harbor depending if your loading or unloading.
-In either case when you arrive at the other harbor all but 1 civ
-will be dumped into the harbor.  Be careful if you set civilians
-as one of your cargo levels.
-.s1
-You can set any commodity in the game to be loaded on the ship.
-However if you tell a ship to load a commodity it can not hold it
-will be ignored.  Example:  If you tell a battleship to load
-Lcm, and of course it does not have that capability, see 'show ship
-capability' that level will be ignored at the update.
-Planes and Units are not commodities so they can not be loaded this way.
-.s1
-At update time, the most direct path from the ship to destination
-is calculated.  Each ship is then autonavigated along that path to
-the best of its mobility.  The path is calculated from what the player
-knows of the world (what you can see using the \*Qbmap\*U command).
-Open sea, bridges, harbors, and unexplored regions of the world
-are considered to be navigable.  Your friend's harbors and bridges
-may be uses as long as the harbor >= 2% and the bridge >= 60%.
-Your ships will also try to avoid any mines you have declared on your
-bmap.  'x' or 'X' characters.  Should your ship hit a mine the ship
-will stop moving and its orders suspended.  You bmap will also be updated
-with a 'x' marking the sector for you.
-.s1
-If a ship sails in range of enemy forts they will be fired upon.
-Setting your ship to autonavigate into an area with good fort
-cover could result in many ships getting sunk fast.
-However you could put an invasion fleet off someone's coast in a hurry.
-.s1
-If the ship has a 'sweep' flag
-ships will try and sweep any mines if any are present as they move.
-.s1
-Radar operates continuously as the ship moves along the path, constantly
-adding sector information to the known world map.
-.s1
-The autonav code will try and use as much mobility as possible and this
-is all done before mobility is gained from the update.
-After an update has completed
-your ship will have mobility so it can be moved by hand if needed.
-.s1
-Ships with capability fish or oil can be setup to \*Qload\*U
-from the sea sector.
-See info \*QAutofish\*U for details.
-.s1
-.SA "sorder, qorder, bmap, navigate, ship, Autofish, Autonav, Ships"

diff --git a/info/qorder.t b/info/qorder.t
deleted file mode 100644 (file)
index 695648d..0000000
--- a/info/qorder.t
+++ /dev/null
@@ -1,27 +0,0 @@
-.TH Command QORDER
-.NA qorder "Query the auto-navigation orders of a ship"
-.LV Expert
-.SY "qorder <SHIP/FLEET>"
-.s1
-\*Qqorder\*U shows current commodity levels on a ship.
-Ships with no orders are not listed.
-The report indicates:
-.NF
-     shp#          ship number
-     ship type     type of ship (cargo ship, destroyer, etc)
-     Starting      The first sector to move and cargo hold levels.
-     Ending       The destination sector to and cargo hold levels.
-
-shp#     ship type           [Starting]  ,  (Ending)
-   6 cargo ship 1      [1-s:50 2-l:500]  ,  ( 1-g:50 )
-  54 cargo ship 1                   [ ]  ,  (1-h:1000)
-1003 destroyer 2               [1-s:40]  ,  ( )
-.FI
-This report reads.
-Cargo Ship #6 will sail to its starting sector, displayed
-in the sorder, and load cargo hold 1 with 50 shells and cargo hold 2 with 500
-light construction materials.  Then sail to the ending sector, again
-displayed in the sorder command, unload the cargo and load cargo hold
-1 with 50 guns.
-.s1
-.SA "order, sorder, bmap, navigate, ship, Ships, Autonav, Autofish"

diff --git a/info/sail.t b/info/sail.t
index 4a511180c38df08a99ee69e5ddbb4bd3eaff1cdd..447fbd13b20e7fc7dc31cf8adae19c92fe8490ae 100644 (file)
--- a/info/sail.t
+++ b/info/sail.t
@@ -46,7 +46,7 @@ for the ships specified to be removed.
 .s1
 The PATH is a normal empire path specification. You may *not* give a
 destination sector on the command line, or at any time while giving
-the route.  Use the \*Qorder\*U command if you wish this functionality.
+the route.
 .s1
 When getting a path interactively, empire will show you the information
 you have (from your bmap) concerning the current area, to help you plot

diff --git a/info/sorder.t b/info/sorder.t
deleted file mode 100644 (file)
index e3abf9d..0000000
--- a/info/sorder.t
+++ /dev/null
@@ -1,35 +0,0 @@
-.TH Command SORDER
-.NA sorder "Show ship order statistical information"
-.LV Expert
-.SY "sorder <SHIP/FLEET>"
-.s1
-\*Qsorder\*U shows some statistical information on ships that
-have been given orders.
-The report indicates:
-.NF
-     shp#        ship number.
-     ship type   type of ship (cargo ship, destroyer, etc)
-     x,y         ships current position
-     start       The first  destination for the ship.
-     end         The second destination for the ship.
-     len         The number of sector required to get from its
-                 current position to the start sector.
-     eta         The estimated number of updates required to
-                 reach the start sector.
-
-shp #    ship type     x,y   start   end   len  eta
-   #6  cargo ship 1    6,0    2,0    20,0   2    1
-  #10  destroyer 1   -10,0   20,2           17   2
-.FI
-This report reads:
-Cargo ship #6 is currently at sector 6,0 and has orders to sail to
-sector 2,0.  It will arrive and load any cargo set for that ship,
-see qorder, and then sail to sector 20,0.  It currently needs to
-sail 2 sectors and will arrive in 1 update at sector 2,0.
-
-Destroyer 1 is at sector -10,0 and only has orders to sail to sector
-20,2.  It needs to move 17 sectors and will arrive at 20,2 in 2 updates.
-When it arrives order will be cleared since only one destination
-order was given to it.
-.s1
-.SA "order, qorder, bmap, navigate, ship, Ships, Autonav, Autofish"

diff --git a/info/version.t b/info/version.t
index 3f3b0127708a4ca92b934ef9dcdf7b1b5b063053..9dcfd1596cf27dfb6a621bc34594cd08b8b9bd29 100644 (file)
--- a/info/version.t
+++ b/info/version.t
@@ -54,7 +54,6 @@ Max interdiction range                8       8       --      8
 
 The maximum amount of mobility used for land unit combat is 5.00.
 
-Ships on autonavigation may use 6 cargo holds per ship.
 Fire ranges are scaled by 1.00.
 Flak damage is scaled by 1.75.
 Torpedo damage is 2d40+38.

diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c
index d3c85772626929c5faa66371b79e079d86f413d7..4c0e90fb753992df792b46caaae78137dca0db06 100644 (file)
--- a/src/lib/commands/foll.c
+++ b/src/lib/commands/foll.c
@@ -77,11 +77,6 @@ foll(void)
            pr("Ship #%d can't follow itself!\n", leader);
            continue;
        }
-       if ((ship.shp_autonav & AN_AUTONAV)
-           && !(ship.shp_autonav & AN_STANDBY)) {
-           pr("Ship #%d has other orders!\n", ship.shp_uid);
-           continue;
-       }
        count++;
        ship.shp_mission = 0;
        *ship.shp_path = 'f';

diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
deleted file mode 100644 (file)
index 92503a2..0000000
--- a/src/lib/commands/orde.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                Ken Stevens, Steve McClure, Markus Armbruster
- *
- *  Empire is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  ---
- *
- *  See files README, COPYING and CREDITS in the root of the source
- *  tree for related information and legal notices.  It is expected
- *  that future projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  orde.c: Turn on/off autonavigation
- *
- *  Known contributors to this file:
- *     Chad Zabel, 1994
- *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2013
- */
-
-#include <config.h>
-
-#include "commands.h"
-#include "item.h"
-#include "optlist.h"
-#include "path.h"
-#include "ship.h"
-
-/*
- *  Command syntax:
- *
- *  ORDER <ship>                                 Show orders
- *  ORDER <ship> c[ancel]                        Cancel orders
- *  ORDER <ship> s[top]                                  Suspend orders
- *  ORDER <ship> r[esume]                        Resume orders
- *  ORDER <ship> d[eclare] <dest1>               Set destination
- *              d[eclare] <dest1> <dest2>
- *  ORDER <ship> l[evel]   <field> <start/end> <comm> <level>
- *
- * New syntax:
- *  qorder <ship>    display cargo levels
- *  sorder <ship>    display statistical info
- */
-
-int
-orde(void)
-{
-    int sub, level;
-    int scuttling = 0;
-    struct nstr_item nb;
-    struct shpstr ship;
-    struct ichrstr *i1;
-    coord p0x, p0y, p1x, p1y;
-    int i;
-    char *p, *p1, *dest;
-    char buf1[128];
-    char buf[1024];
-    char prompt[128];
-
-    if (!snxtitem(&nb, EF_SHIP, player->argp[1], NULL))
-       return RET_SYN;
-    while (!player->aborted && nxtitem(&nb, (&ship))) {
-       if (!player->owner || ship.shp_own == 0)
-           continue;
-       if (opt_SAIL) {
-           if (*ship.shp_path) {
-               pr("Ship #%d has a \"sail\" path!\n", ship.shp_uid);
-               continue;
-           }
-       }
-       sprintf(prompt,
-               "Ship #%d, declare, cancel, suspend, resume, level? ",
-               ship.shp_uid);
-       p = getstarg(player->argp[2], prompt, buf);
-       if (player->aborted || !p || !*p)
-           return RET_FAIL;
-       if (!check_ship_ok(&ship))
-           return RET_FAIL;
-       switch (*p) {
-       default:
-           pr("Bad order type!\n");
-           return RET_SYN;
-       case 'c':               /* clear ship fields  */
-           ship.shp_mission = 0;
-           ship.shp_autonav &= ~(AN_AUTONAV + AN_STANDBY + AN_LOADING);
-           for (i = 0; i < TMAX; i++) {
-               ship.shp_tstart[i] = I_NONE;
-               ship.shp_tend[i] = I_NONE;
-               ship.shp_lstart[i] = 0;
-               ship.shp_lend[i] = 0;
-           }
-           break;
-       case 's':               /* suspend ship movement  */
-           ship.shp_mission = 0;
-           ship.shp_autonav |= AN_STANDBY;
-           break;
-       case 'r':               /* resume ship movement   */
-           ship.shp_mission = 0;
-           ship.shp_autonav &= ~AN_STANDBY;
-           break;
-       case 'd':               /* declare path */
-           scuttling = 0;
-           /* Need location */
-           p = getstarg(player->argp[3], "Destination? ", buf);
-           if (!p || !*p)
-               return RET_SYN;
-           if (!sarg_xy(p, &p0x, &p0y))
-               return RET_SYN;
-           p1x = p0x;
-           p1y = p0y;
-
-           p = getstarg(player->argp[4], "Second dest? ", buf);
-           if (!p)
-               return RET_FAIL;
-           if (!check_ship_ok(&ship))
-               return RET_FAIL;
-           if (!*p || !strcmp(p, "-")) {
-               pr("A one-way order has been accepted.\n");
-           } else if (!strncmp(p, "s", 1)) {
-               if (!(mchr[(int)ship.shp_type].m_flags & M_TRADE)) {
-                   pr("You can't auto-scuttle that ship!\n");
-                   return RET_SYN;
-               }
-               pr("A scuttle order has been accepted.\n");
-               scuttling = 1;
-           } else {
-               if (!sarg_xy(p, &p1x, &p1y))
-                   return RET_SYN;
-               pr("A circular order has been accepted.\n");
-           }
-
-           /*
-            *  Set new destination and trade type fields.
-            */
-           ship.shp_mission = 0;
-           ship.shp_destx[1] = p1x;
-           ship.shp_desty[1] = p1y;
-           ship.shp_destx[0] = p0x;
-           ship.shp_desty[0] = p0y;
-
-           ship.shp_autonav &= ~(AN_STANDBY | AN_LOADING);
-           ship.shp_autonav |= AN_AUTONAV;
-
-           if (scuttling)
-               ship.shp_autonav |= AN_SCUTTLE;
-           break;
-
-           /* set cargo levels on the ship */
-
-       case 'l':
-           /* convert player->argp[3] to an integer */
-           sprintf(buf1, "Field (1-%d) ", TMAX);
-           if (!getstarg(player->argp[3], buf1, buf))
-               return RET_SYN;
-           if (!check_ship_ok(&ship))
-               return RET_FAIL;
-           sub = atoi(buf);
-           /* check to make sure value in within range. */
-           if (sub > TMAX || sub < 1) {
-               pr("Value must range from 1 to %d\n", TMAX);
-               return RET_FAIL;
-           }
-
-           /* to keep sub in range of our arrays
-              subtract 1 so the new range is 0-(TMAX-1)
-            */
-           sub = sub - 1;;
-
-           if (ship.shp_autonav & AN_AUTONAV) {
-               dest = getstarg(player->argp[4], "Start or end? ", buf);
-               if (!dest)
-                   return RET_FAIL;
-               switch (*dest) {
-               default:
-                   pr("You must enter 'start' or 'end'\n");
-                   return RET_SYN;
-               case 'e':
-               case 'E':
-                   i1 = whatitem(player->argp[5], "Commodity? ");
-                   if (!i1)
-                       return RET_FAIL;
-                   p1 = getstarg(player->argp[6], "Amount? ", buf);
-                   if (!p1)
-                       return RET_SYN;
-                   if (!check_ship_ok(&ship))
-                       return RET_FAIL;
-                   level = atoi(p1);
-                   if (level < 0) {
-                       level = 0;      /* prevent negatives. */
-                       pr("You must use positive number! Level set to 0.\n");
-                   }
-                   ship.shp_tstart[sub] = i1->i_uid;
-                   ship.shp_lstart[sub] = level;
-                   pr("Order set\n");
-                   break;
-               case 's':
-               case 'S':
-                   i1 = whatitem(player->argp[5], "Commodity? ");
-                   if (!i1)
-                       return RET_FAIL;
-                   p1 = getstarg(player->argp[6], "Amount? ", buf);
-                   if (!p1)
-                       return RET_SYN;
-                   if (!check_ship_ok(&ship))
-                       return RET_FAIL;
-                   level = atoi(p1);
-                   if (level < 0) {
-                       level = 0;
-                       pr("You must use positive number! Level set to 0.\n");
-                   }
-                   ship.shp_tend[sub] = i1->i_uid;
-                   ship.shp_lend[sub] = level;
-                   pr("Order Set\n");
-                   break;
-               }
-           } else
-               pr("You need to 'declare' a ship path first, see 'info order'\n");
-
-           break;
-       }                       /* end of switch (*p) */
-
-
-
-       /*
-        *  Set loading flag if ship is already in one
-        *  of the specified harbors and a cargo has been
-        *  specified.
-        */
-
-       if (((ship.shp_x == ship.shp_destx[0])
-            && (ship.shp_y == ship.shp_desty[0])
-            && (ship.shp_lstart[0] != ' '))
-           || ((ship.shp_x == ship.shp_desty[1])
-               && (ship.shp_y == ship.shp_desty[1])
-               && (ship.shp_lstart[1] != ' '))) {
-
-           coord tcord;
-           i_type tcomm;
-           short lev[TMAX];
-           int i;
-
-           ship.shp_autonav |= AN_LOADING;
-
-           /*  swap variables, this keeps
-              the load_it() procedure happy. CZ
-            */
-           tcord = ship.shp_destx[0];
-           ship.shp_destx[0] = ship.shp_destx[1];
-           ship.shp_destx[1] = tcord;
-           tcord = ship.shp_desty[0];
-           ship.shp_desty[0] = ship.shp_desty[1];
-           ship.shp_desty[1] = tcord;
-
-           for (i = 0; i < TMAX; i++) {
-               lev[i] = ship.shp_lstart[i];
-               ship.shp_lstart[i] = ship.shp_lend[i];
-               ship.shp_lend[i] = lev[i];
-               tcomm = ship.shp_tstart[i];
-               ship.shp_tstart[i] = ship.shp_tend[i];
-               ship.shp_tend[i] = tcomm;
-           }
-       }
-
-       putship(ship.shp_uid, &ship);
-    }
-    return RET_OK;
-}
-
-static int
-eta_calc(struct shpstr *sp, int len)
-{
-    double mobcost, mobil;
-    int i, nupdates;
-
-    i = len;
-    nupdates = 1;
-
-    mobcost = shp_mobcost(sp);
-    mobil = sp->shp_mobil;
-    while (i) {
-       if (mobil > 0) {
-           mobil -= mobcost;
-           i--;
-       } else {
-           mobil += (ship_mob_scale * (float)etu_per_update);
-           nupdates++;
-       }
-    }
-    return nupdates;
-}
-
-static void
-prhold(int hold, i_type itype, int amt)
-{
-    if (itype != I_NONE && amt != 0) {
-       if (CANT_HAPPEN(itype <= I_NONE || itype > I_MAX))
-           return;
-       pr("%d-", hold + 1);
-       pr("%c", ichr[itype].i_mnem);
-       pr(":");
-       pr("%d ", amt);
-    }
-}
-
-int
-qorde(void)
-{
-    int nships = 0;
-    int i;
-    struct nstr_item nb;
-    struct shpstr ship;
-
-    if (!snxtitem(&nb, EF_SHIP, player->argp[1], NULL))
-       return RET_SYN;
-    while (nxtitem(&nb, (&ship))) {
-       if (!player->owner || ship.shp_own == 0)
-           continue;
-       if (!(ship.shp_autonav & AN_AUTONAV)
-           && (!opt_SAIL || !ship.shp_path[0]))
-           continue;
-
-       if (!nships) {          /* 1st ship, print banner */
-           if (player->god)
-               pr("own ");
-           pr("shp#     ship type    ");
-           pr("[Starting]       (Ending)\n");
-       }
-       nships++;
-       if (player->god)
-           pr("%3d ", ship.shp_own);
-       pr("%4d", nb.cur);
-       pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
-
-       if (ship.shp_autonav & AN_AUTONAV) {
-           pr(" [");
-           for (i = 0; i < TMAX; i++)
-               prhold(i, ship.shp_tend[i], ship.shp_lend[i]);
-           pr("] , (");
-           for (i = 0; i < TMAX; i++)
-               prhold(i, ship.shp_tstart[i], ship.shp_lstart[i]);
-           pr(")");
-           if (ship.shp_autonav & AN_SCUTTLE)
-               pr(" scuttling");
-           pr("\n");
-       } else
-           pr(" has a sail path\n");
-
-       if (ship.shp_name[0] != 0) {
-           if (player->god)
-               pr("    ");
-           pr("       %s\n", ship.shp_name);
-       }
-    }
-    if (!nships) {
-       if (player->argp[1])
-           pr("%s: No ship(s)\n", player->argp[1]);
-       else
-           pr("%s: No ship(s)\n", "");
-       return RET_FAIL;
-    } else
-       pr("%d ship%s\n", nships, splur(nships));
-    return RET_OK;
-}
-
-int
-sorde(void)
-{
-    int nships = 0;
-    int len, updates;
-    double c;
-    struct nstr_item nb;
-    struct shpstr ship;
-
-    if (!snxtitem(&nb, EF_SHIP, player->argp[1], NULL))
-       return RET_SYN;
-    while (nxtitem(&nb, (&ship))) {
-       if (!player->owner || ship.shp_own == 0)
-           continue;
-       if (!(ship.shp_autonav & AN_AUTONAV)
-           && (!opt_SAIL || !ship.shp_path[0]))
-           continue;
-
-       if (!nships) {          /* 1st ship, print banner */
-           if (player->god)
-               pr("own ");
-           pr("shp#     ship type       x,y      start      end   "
-              " len  eta\n");
-       }
-       nships++;
-       if (player->god)
-           pr("%3d ", ship.shp_own);
-       pr("%4d", nb.cur);
-       pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
-       prxy(" %4d,%-4d", ship.shp_x, ship.shp_y);
-
-       if (ship.shp_autonav & AN_AUTONAV) {
-           /* Destination 1 */
-           prxy(" %4d,%-4d", ship.shp_destx[1], ship.shp_desty[1]);
-
-           /* Destination 2 */
-           if ((ship.shp_destx[1] != ship.shp_destx[0])
-               || (ship.shp_desty[1] != ship.shp_desty[0])) {
-               prxy(" %4d,%-4d", ship.shp_destx[0], ship.shp_desty[0]);
-           } else
-               pr("          ");
-
-           if (ship.shp_autonav & AN_STANDBY)
-               pr(" suspended");
-           else if (ship.shp_autonav & AN_LOADING)
-               pr(" loading");
-           else {
-               /* ETA calculation */
-               c = path_find(ship.shp_x, ship.shp_y,
-                             ship.shp_destx[0], ship.shp_desty[0],
-                             ship.shp_own, MOB_SAIL);
-               if (c < 0)
-                   pr(" no route possible");
-               else if (c == 0)
-                   pr(" has arrived");
-               else {
-                   /* distance to destination */
-                   len = (int)c;
-                   updates = eta_calc(&ship, len);
-                   pr(" %3d %4d", len, updates);
-               }
-           }
-           if (ship.shp_autonav & AN_SCUTTLE)
-               pr(" (scuttling)");
-           pr("\n");
-       } else
-           pr(" has a sail path\n");
-
-       if (ship.shp_name[0] != 0) {
-           if (player->god)
-               pr("    ");
-           pr("       %s\n", ship.shp_name);
-       }
-    }
-    if (!nships) {
-       if (player->argp[1])
-           pr("%s: No ship(s)\n", player->argp[1]);
-       else
-           pr("%s: No ship(s)\n", "");
-       return RET_FAIL;
-    } else
-       pr("%d ship%s\n", nships, splur(nships));
-    return RET_OK;
-}

diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c
index 3117e56b947d940f3499ba86847c4eb43c1b0c25..2547a6855d3312cff40cf05e6901a69a2065e444 100644 (file)
--- a/src/lib/commands/sail.c
+++ b/src/lib/commands/sail.c
@@ -62,8 +62,6 @@ show_sail(struct nstr_item *nstr)
        pr("   %3d   ", ship.shp_follow);
        if (ship.shp_path[0]) {
            pr("%s", ship.shp_path);
-       } else if ((ship.shp_autonav & AN_AUTONAV)) {
-           pr("Has orders");
        }
        pr("\n");
        if (ship.shp_name[0] != 0) {
@@ -112,11 +110,6 @@ cmd_sail_ship(struct nstr_item *nstr)
     while (nxtitem(nstr, &ship)) {
        if (!player->owner || ship.shp_own == 0)
            continue;
-       if ((ship.shp_autonav & AN_AUTONAV) &&
-           !(ship.shp_autonav & AN_STANDBY)) {
-           pr("Ship #%d has other orders!\n", ship.shp_uid);
-           continue;
-       }
 
        pr("Ship #%d at %s\n", ship.shp_uid,
           xyas(ship.shp_x, ship.shp_y, player->cnum));

diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index 8da295a4becac879ac396ee422afaf44686728cc..ba3a26d628f68cfdbc3dd948db436c3c50245b72 100644 (file)
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -27,7 +27,7 @@
  *  scut.c: Scuttle ships, planes or land units
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2012
+ *     Markus Armbruster, 2004-2014
  */
 
 #include <config.h>
@@ -38,6 +38,8 @@
 #include "optlist.h"
 #include "unit.h"
 
+static int scuttle_tradeship(struct shpstr *);
+
 int
 scut(void)
 {
@@ -94,7 +96,7 @@ scut(void)
        if (type == EF_SHIP) {
            mp = &mchr[(int)item.ship.shp_type];
            if (mp->m_flags & M_TRADE) {
-               if (!scuttle_tradeship(&item.ship, 1))
+               if (!scuttle_tradeship(&item.ship))
                    continue;
            }
        } else if (type == EF_LAND) {
@@ -117,8 +119,8 @@ scut(void)
     return RET_OK;
 }
 
-int
-scuttle_tradeship(struct shpstr *sp, int interactive)
+static int
+scuttle_tradeship(struct shpstr *sp)
 {
     float cash = 0;
     float ally_cash = 0;
@@ -127,7 +129,6 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
     struct mchrstr *mp;
     struct natstr *np;
     char buf[512];
-    struct natstr *natp;
 
     mp = &mchr[(int)sp->shp_type];
     getsect(sp->shp_x, sp->shp_y, &sect);
@@ -136,8 +137,8 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
        dist = mapdist(sp->shp_x, sp->shp_y,
                       sp->shp_orig_x, sp->shp_orig_y);
        /* Don't disclose distance to to pirates */
-       if (sp->shp_own == sp->shp_orig_own)
-           mpr(sp->shp_own, "%s has gone %d sects\n", prship(sp), dist);
+       if (player->cnum == sp->shp_orig_own)
+           pr("%s has gone %d sects\n", prship(sp), dist);
        if (dist < trade_1_dist)
            cash = 0;
        else if (dist < trade_2_dist)
@@ -156,23 +157,13 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
     }
 
     if (!cash && (dist < 0 || sp->shp_own == sp->shp_orig_own)) {
-       if (interactive) {
-           pr("You won't get any money if you scuttle in %s!",
-              xyas(sp->shp_x, sp->shp_y, player->cnum));
-           sprintf(buf, "Are you sure you want to scuttle %s? ", prship(sp));
-           return confirm(buf);
-       } else
-           return 0;
+       pr("You won't get any money if you scuttle in %s!",
+          xyas(sp->shp_x, sp->shp_y, player->cnum));
+       sprintf(buf, "Are you sure you want to scuttle %s? ", prship(sp));
+       return confirm(buf);
     }
 
-    if (interactive) {
-       player->dolcost -= cash;
-    } else {
-       natp = getnatp(sp->shp_own);
-       natp->nat_money += cash;
-       putnat(natp);
-       wu(0, sp->shp_own, "You just made $%d.\n", (int)cash);
-    }
+    player->dolcost -= cash;
 
     if (ally_cash) {
        np = getnatp(sect.sct_own);

diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c
index 9af04effd3b00e9fc66c99025a1158c15b75afe7..746e5f5a81a5bfd47fc9d47a844d628ef147b358 100644 (file)
--- a/src/lib/commands/vers.c
+++ b/src/lib/commands/vers.c
@@ -33,7 +33,7 @@
  *     Ken Stevens
  *     Steve McClure
  *     Ron Koenderink, 2005-2006
- *     Markus Armbruster, 2005-2013
+ *     Markus Armbruster, 2005-2014
  */
 
 #include <config.h>
@@ -156,7 +156,6 @@ vers(void)
        pr("The starting mobility when acquiring a sector or unit is %d.\n",
           -(etu_per_update / sect_mob_neg_factor));
     pr("\n");
-    pr("Ships on autonavigation may use %i cargo holds per ship.\n", TMAX);
     if (have_trade_ships()) {
        pr("Trade-ships that go at least %d sectors get a return of %.1f%% per sector.\n",
           trade_1_dist, trade_1 * 100.0);

diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c
index afdf62c6727fbed9accd5bfb132c941a8732bb4a..35b74b2a9910abd9c677683366d5c7fe6ca80143 100644 (file)
--- a/src/lib/common/nsc.c
+++ b/src/lib/common/nsc.c
@@ -231,17 +231,6 @@ struct castr ship_ca[] = {
 #define CURSTR struct shpstr
     NSC_GENITEM(EF_SHIP, EF_SHIP_CHR),
     {"fleet", fldoff(shp_fleet), NSC_STRINGY, 1, NULL, EF_BAD, 0},
-    {"xstart", fldoff(shp_destx[0]), NSC_XCOORD, 0, NULL, EF_BAD, 0},
-    {"xend", fldoff(shp_destx[1]), NSC_XCOORD, 0, NULL, EF_BAD, 0},
-    {"ystart", fldoff(shp_desty[0]), NSC_YCOORD, 0, NULL, EF_BAD, 0},
-    {"yend", fldoff(shp_desty[1]), NSC_YCOORD, 0, NULL, EF_BAD, 0},
-    {"cargostart", fldoff(shp_tstart), NSC_SITYPE(i_type), TMAX, NULL,
-     EF_ITEM, 0},
-    {"cargoend", fldoff(shp_tend), NSC_SITYPE(i_type), TMAX, NULL,
-     EF_ITEM, 0},
-    {"amtstart", fldoff(shp_lstart), NSC_SHORT, TMAX, NULL, EF_BAD, 0},
-    {"amtend", fldoff(shp_lend), NSC_SHORT, TMAX, NULL, EF_BAD, 0},
-    {"autonav", fldoff(shp_autonav), NSC_UCHAR, 0, NULL, EF_BAD, 0},
     NSC_IVEC(fldoff(shp_item), ""),
     {"pstage", fldoff(shp_pstage), NSC_SHORT, 0, NULL,
      EF_PLAGUE_STAGES, NSC_DEITY},

diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c
index 591eab323f54d7726c86a701e317fd865702882f..688d608b18959286997d85327531b6afc7952b46 100644 (file)
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -175,7 +175,6 @@ struct cmndstr player_coms[] = {
     {"nuke <NUKES>", 0, nuke, 0, NORM},
     {"offer <loan> <NAT> [<NUM> <DAYS> <IRATE>]",
      1, offe, C_MOD, NORM + MONEY + CAP},
-    {"order <SHIPS> <c|s|r|d|l>", 1, orde, C_MOD, NORM + CAP},
     {"origin <SECT|COUNTRY|~>", 1, orig, C_MOD, NORM},
     {"paradrop <cargo-PLANES> <fighter-PLANES> <ap-SECT> <PATH|DESTINATION>",
      3, para, C_MOD, NORM + MONEY + CAP},
@@ -193,7 +192,6 @@ struct cmndstr player_coms[] = {
     {"pray", 0, tele, C_MOD, NORM},
     {"production <SECTS>", 0, prod, 0, NORM},
     {"pstat <PLANES>", 0, pstat, 0, NORM},
-    {"qorder <SHIPS>", 0, qorde, 0, NORM},
     {"quit", 0, quit, 0, 0},
     {"radar <SHIPS | SECTS>", 1, rada, C_MOD, NORM + CAP},
     {"range <PLANES> <range>", 1, range, C_MOD, NORM + CAP},
@@ -240,7 +238,6 @@ struct cmndstr player_coms[] = {
     {"skywatch <SECTS>", 1, skyw, C_MOD, NORM + CAP},
     {"smap <SECTS|SHIP> [s|l|n|p|*|h]", 0, map, C_MOD, NORM},
     {"sonar <SHIPS> <brief?>", 1, sona, C_MOD, NORM + CAP},
-    {"sorder <SHIPS>", 0, sorde, 0, NORM},
     {"spy <SECTS>", 1, spy, C_MOD, NORM + CAP},
     {"sstat <SHIPS>", 0, sstat, 0, NORM},
     {"start <TYPE> <SECTS|PLANES|SHIPS|UNITS|NUKES>", 1, start, C_MOD, NORM},

diff --git a/src/lib/subs/unitsub.c b/src/lib/subs/unitsub.c
index e8f95ed3b72f161399001757246540a5c496828f..c907782613105c9ec165f8ee692a99ec4dcf87e9 100644 (file)
--- a/src/lib/subs/unitsub.c
+++ b/src/lib/subs/unitsub.c
@@ -329,7 +329,6 @@ unit_wipe_orders(struct empobj *unit)
     struct shpstr *sp;
     struct plnstr *pp;
     struct lndstr *lp;
-    int i;
 
     unit->group = 0;
     unit->opx = unit->opy = 0;
@@ -339,15 +338,6 @@ unit_wipe_orders(struct empobj *unit)
     switch (unit->ef_type) {
     case EF_SHIP:
        sp = (struct shpstr *)unit;
-       sp->shp_destx[0] = sp->shp_desty[0] = 0;
-       sp->shp_destx[1] = sp->shp_desty[1] = 0;
-       for (i = 0; i < TMAX; ++i) {
-           sp->shp_tstart[i] = I_NONE;
-           sp->shp_tend[i] = I_NONE;
-           sp->shp_lstart[i] = 0;
-           sp->shp_lend[i] = 0;
-       }
-       sp->shp_autonav = 0;
        sp->shp_mobquota = 0;
        sp->shp_path[0] = 0;
        sp->shp_follow = sp->shp_uid;

diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
deleted file mode 100644 (file)
index 2010d11..0000000
--- a/src/lib/update/nav_ship.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                Ken Stevens, Steve McClure, Markus Armbruster
- *
- *  Empire is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  ---
- *
- *  See files README, COPYING and CREDITS in the root of the source
- *  tree for related information and legal notices.  It is expected
- *  that future projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  nav_ship.c: Navigate ships and such
- *
- *  Known contributors to this file:
- *     Chad Zabel, 1994
- *     Ken Stevens, 1995
- *     Markus Armbruster, 2004-2011
- */
-
-#include <config.h>
-
-#include "nsc.h"
-#include "path.h"
-#include "update.h"
-#include "empobj.h"
-#include "unit.h"
-
-static void swap(struct shpstr *);
-
-static void
-scuttle_it(struct shpstr *sp)
-{
-    struct sctstr *sectp;
-
-    sp->shp_autonav &= ~AN_SCUTTLE;
-    if (!(sectp = getsectp(sp->shp_x, sp->shp_y))) {
-       wu(0, 0, "bad sector (%d,%d) ship %d\n",
-          sp->shp_x, sp->shp_y, sp->shp_uid);
-       return;
-    }
-    if (CANT_HAPPEN(!(mchr[sp->shp_type].m_flags & M_TRADE)))
-       return;
-    if (!scuttle_tradeship(sp, 0)) {
-       wu(0, sp->shp_own,
-          "%s doesn't pay here!  Not scuttled.\n", prship(sp));
-       return;
-    }
-    wu(0, sp->shp_own, "Scuttling %s in sector %s\n",
-       prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
-    if (sectp->sct_own == sp->shp_own)
-       unit_drop_cargo((struct empobj *)sp, sectp->sct_own);
-    sp->shp_effic = 0;
-    putship(sp->shp_uid, sp);
-}
-
-static void
-nav_check_atdest(struct shpstr *sp)
-{
-    if ((sp->shp_x == sp->shp_destx[0]) && (sp->shp_y == sp->shp_desty[0])) {
-       if ((sp->shp_destx[0] == sp->shp_destx[1]) &&
-           (sp->shp_desty[0] == sp->shp_desty[1])) {
-
-           /* End of road */
-
-           sp->shp_autonav &= ~AN_AUTONAV;
-           wu(0, sp->shp_own, "%s arrived at %s, finished\n",
-              prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
-           if (sp->shp_autonav & AN_SCUTTLE) {
-               scuttle_it(sp);
-           }
-       } else {
-           /* unload all cargo */
-           unload_it(sp);
-           wu(0, sp->shp_own, "%s arrived at %s\n",
-              prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
-           /* Swap */
-           swap(sp);
-       }
-    } else
-       sp->shp_autonav &= ~AN_LOADING;
-}
-
-/* flip the 2 fields that deal with autonav movement. */
-/* CZ 6/1/94                                         */
-
-static void
-swap(struct shpstr *sp)
-{
-    coord tcord;
-    i_type tcomm[TMAX];
-    short lev[TMAX];
-    int i;
-
-    tcord = sp->shp_destx[0];
-    sp->shp_destx[0] = sp->shp_destx[1];
-    sp->shp_destx[1] = tcord;
-    tcord = sp->shp_desty[0];
-    sp->shp_desty[0] = sp->shp_desty[1];
-    sp->shp_desty[1] = tcord;
-
-    for (i = 0; i < TMAX; ++i) {
-       lev[i] = sp->shp_lstart[i];
-       tcomm[i] = sp->shp_tstart[i];
-    }
-
-    for (i = 0; i < TMAX; ++i) {
-       sp->shp_lstart[i] = sp->shp_lend[i];
-       sp->shp_tstart[i] = sp->shp_tend[i];
-    }
-
-    for (i = 0; i < TMAX; ++i) {
-       sp->shp_lend[i] = lev[i];
-       sp->shp_tend[i] = tcomm[i];
-    }
-
-    /* set load bit */
-    sp->shp_autonav |= AN_LOADING;
-}
-
-/*  New Autonav code.
- *  Chad Zabel
- *  6-1-94
- */
-
-static int
-nav_loadship(struct shpstr *sp)
-{
-    struct sctstr *sectp;
-    int i, didsomething[TMAX], rel;
-
-    for (i = 0; i < TMAX; i++)
-       didsomething[i] = 0;
-
-    /* Turn off the loading flag.
-     * if any of the loads fail on the ship
-     * it will be turned back on.
-     */
-
-    sp->shp_autonav &= ~AN_LOADING;
-
-    if (!(sectp = getsectp(sp->shp_x, sp->shp_y)))
-       return 0;               /* safety */
-
-    rel = relations_with(sectp->sct_own, sp->shp_own);
-
-    /* loop through each field for that ship */
-    for (i = 0; i < TMAX; ++i) {
-       /* check and see if the data fields have been set. */
-
-       if (sp->shp_tend[i] == I_NONE || sp->shp_lend[i] == 0) {
-           /* nothing to do move on. */
-           didsomething[i] = 1;
-           continue;
-       }
-       if (sectp->sct_own == 0) {
-           /* either sea or deity harbor */
-           didsomething[i] = 1;
-           continue;
-       }
-       if (!sect_has_dock(sectp)) {
-           /* we can only load in harbors */
-           didsomething[i] = 1;
-           continue;
-       }
-       if (rel >= FRIENDLY)
-           didsomething[i] = load_it(sp, sectp, i);
-    }
-
-    /* check for any unsucessful loads */
-    /* if we have any return 0 to stop */
-    /* the nav_ship loop.              */
-
-    for (i = 0; i < TMAX; i++) {
-       if (didsomething[i] == 0)
-           return 0;
-    }
-    /* All loads were succesful */
-    return 1;
-}
-
-static int
-nav_load_ship_at_sea(struct shpstr *sp)
-{
-    int i;
-    int n_items;
-    int max_amt, item_amt;
-    struct mchrstr *mcp;
-    struct sctstr *sectp;
-    struct check_list_st {
-       long cap;
-       i_type item;
-    } check_list[] = {{M_FOOD, I_FOOD}, {M_OIL, I_OIL}};
-
-    n_items = sizeof(check_list) / sizeof(check_list[0]);
-
-    mcp = &mchr[(int)sp->shp_type];
-    sectp = getsectp(sp->shp_x, sp->shp_y);
-    for (i = 0; i < n_items; i++) {
-       if (mcp->m_flags & check_list[i].cap) {
-           item_amt = sp->shp_item[check_list[i].item];
-           max_amt = mcp->m_item[check_list[i].item];
-           if (item_amt < max_amt && sectp->sct_type == SCT_WATER)
-               return 1;
-       }
-    }
-    return 0;
-}
-
-/* new autonav code.
- *
- * 1. Try and move to the next sector/harbor given by the player.
- * 2. Once we reach a harbor try and load all cargo holds for that ship.
- * 3. If the ship reaches its max levels set by the player try to use
- *    up all mobility getting to the next harbor.
- * Continue to loop until the ship runs out of mobility, a load fails,
- * the ship gets sunk (forts,ect..), the ship hits a mine.
- *
- * Questions, bugs (fixes) , or new ideas should be directed at
- * Chad Zabel.
- * 6-1-94
- * Modified to use shp_nav by Ken Stevens 1995
- */
-int
-nav_ship(struct shpstr *sp)
-{
-    char *cp;
-    int stopping;
-    int quit;
-    int didsomething = 0;
-    char buf[1024];
-    struct emp_qelem ship_list;
-    struct emp_qelem *qp, *newqp;
-    struct ulist *mlp;
-    int dummyint;
-    double dummydouble;
-    int dir;
-
-    /* just return if no autonaving to do for this ship */
-    if (!(sp->shp_autonav & AN_AUTONAV) || (sp->shp_autonav & AN_STANDBY))
-       return 0;
-
-    /* Make a list of one ships so we can use the navi.c code */
-    emp_initque(&ship_list);
-    mlp = shp_insque(sp, &ship_list);
-    ef_mark_fresh(EF_SHIP, &mlp->unit.ship);
-
-    do {
-       if ((sp->shp_mobil > 0) && (!(sp->shp_autonav & AN_LOADING)) &&
-           (!(sp->shp_autonav & AN_STANDBY))) {
-           shp_nav(&ship_list, &dummydouble, &dummydouble, &dummyint,
-                   sp->shp_own);
-           if (QEMPTY(&ship_list))
-               return 0;
-
-           if (path_find(sp->shp_x, sp->shp_y,
-                         sp->shp_destx[0], sp->shp_desty[0],
-                         sp->shp_own, MOB_SAIL) < 0) {
-               wu(0, sp->shp_own,
-                  "%s bad path, ship put on standby\n", prship(sp));
-               sp->shp_autonav |= AN_STANDBY;
-               putship(sp->shp_uid, sp);
-
-               /* We need to free the ship list */
-               qp = ship_list.q_forw;
-               while (qp != &ship_list) {
-                   newqp = qp->q_forw;
-                   emp_remque(qp);
-                   free(qp);
-                   qp = newqp;
-               }
-               return -1;
-           }
-           path_find_route(buf, sizeof(buf), sp->shp_x, sp->shp_y,
-                           sp->shp_destx[0], sp->shp_desty[0]);
-           stopping = 0;
-
-           cp = buf;
-           while (*cp && !stopping && sp->shp_own && mlp->mobil > 0.0) {
-               dir = diridx(*cp++);
-               stopping |= shp_nav_one_sector(&ship_list, dir,
-                                              sp->shp_own, 0);
-           }
-
-           /* Ship not sunk */
-           if (sp->shp_own)
-               nav_check_atdest(sp);
-       }
-
-       quit = 0;               /* stop loop */
-
-       /* Try to load the ship */
-       if (sp->shp_autonav & AN_LOADING) {
-           didsomething = nav_loadship(sp);
-           if (didsomething)
-               quit = 1;
-       }
-       /* special case for fishing boats and oil derricks */
-       if (nav_load_ship_at_sea(sp))
-           quit = 0;
-       /* reset flag and check if we can move. */
-
-    } while (quit);            /* end loop */
-
-    putship(sp->shp_uid, sp);
-
-    /* We need to free the ship list (just in case) */
-    qp = ship_list.q_forw;
-    while (qp != &ship_list) {
-       newqp = qp->q_forw;
-       emp_remque(qp);
-       free(qp);
-       qp = newqp;
-    }
-    return 0;
-}

diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c
deleted file mode 100644 (file)
index 3e83ae5..0000000
--- a/src/lib/update/nav_util.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                Ken Stevens, Steve McClure, Markus Armbruster
- *
- *  Empire is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  ---
- *
- *  See files README, COPYING and CREDITS in the root of the source
- *  tree for related information and legal notices.  It is expected
- *  that future projects/authors will amend these files as needed.
- *
- *  ---
- *
- *  nav_util.c: Utilities for autonav and sail
- *
- *  Known contributors to this file:
- *
- */
-
-#include <config.h>
-
-#include "item.h"
-#include "nsc.h"
-#include "plague.h"
-#include "ship.h"
-#include "update.h"
-
-/* load a specific ship given its
- * location and what field to modify.
- * new autonav code
- * Chad Zabel 6/1/94
- */
-int
-load_it(struct shpstr *sp, struct sctstr *psect, int i)
-{
-    int shipown, amount, ship_amt, sect_amt;
-    int abs_max, max_amt, transfer;
-    i_type comm;
-    struct mchrstr *vship;
-
-    amount = sp->shp_lend[i];
-    shipown = sp->shp_own;
-    comm = sp->shp_tend[i];
-    if (CANT_HAPPEN(comm <= I_NONE || comm > I_MAX))
-       return 0;
-
-    ship_amt = sp->shp_item[comm];
-    sect_amt = psect->sct_item[comm];
-
-    /* check for disloyal civilians */
-    if (psect->sct_oldown != shipown && comm == I_CIVIL) {
-       wu(0, shipown,
-          "Ship #%d - unable to load disloyal civilians at %s.",
-          sp->shp_uid, xyas(psect->sct_x, psect->sct_y, shipown));
-       return 0;
-    }
-    if (comm == I_CIVIL || comm == I_MILIT)
-       sect_amt--;             /* leave 1 civ or mil to hold the sector. */
-    vship = &mchr[(int)sp->shp_type];
-    abs_max = max_amt = vship->m_item[comm];
-
-    if (!abs_max)
-       return 0;               /* can't load the ship, skip to the end. */
-
-    max_amt = MIN(sect_amt, max_amt - ship_amt);
-    if (max_amt <= 0 && (ship_amt != abs_max)) {
-       sp->shp_autonav |= AN_LOADING;
-       return 0;
-    }
-
-
-    transfer = amount - ship_amt;
-    if (transfer > sect_amt) { /* not enough in the   */
-       transfer = sect_amt;    /* sector to fill the  */
-       sp->shp_autonav |= AN_LOADING;  /* ship, set load flag */
-    }
-    if (ship_amt + transfer > abs_max) /* Do not load more    */
-       transfer = abs_max - ship_amt;  /* then the max alowed */
-    /* on the ship.        */
-
-    if (transfer <= 0)
-       return 0;               /* nothing to move */
-
-
-    sp->shp_item[comm] = ship_amt + transfer;
-    if (comm == I_CIVIL || comm == I_MILIT)
-       sect_amt++;             /*adjustment */
-    psect->sct_item[comm] = sect_amt - transfer;
-
-    /* deal with the plague */
-    if (psect->sct_pstage == PLG_INFECT && sp->shp_pstage == PLG_HEALTHY)
-       sp->shp_pstage = PLG_EXPOSED;
-    if (sp->shp_pstage == PLG_INFECT && psect->sct_pstage == PLG_HEALTHY)
-       psect->sct_pstage = PLG_EXPOSED;
-
-    return 1;                  /* we did someloading return 1 to keep */
-    /* our loop happy in nav_ship()        */
-
-}
-
-/* unload_it
- * A guess alot of this looks like load_it but because of its location
- * in the autonav code I had to split the 2 procedures up.
- * unload_it dumps all the goods from the ship to the harbor.
- * ONLY goods in the trade fields will be unloaded.
- * new autonav code
- * Chad Zabel 6/1/94
- */
-void
-unload_it(struct shpstr *sp)
-{
-    struct sctstr *sectp;
-    int i;
-    int landowner;
-    int shipown;
-    i_type comm;
-    int sect_amt;
-    int ship_amt;
-    int max_amt;
-
-    sectp = getsectp(sp->shp_x, sp->shp_y);
-
-    landowner = sectp->sct_own;
-    shipown = sp->shp_own;
-
-    for (i = 0; i < TMAX; ++i) {
-       if (sp->shp_tend[i] == I_NONE || sp->shp_lend[i] == 0)
-           continue;
-       if (landowner == 0)
-           continue;
-       if (sectp->sct_type != SCT_HARBR)
-           continue;
-
-       comm = sp->shp_tend[i];
-       if (CANT_HAPPEN(comm <= I_NONE || comm > I_MAX))
-           continue;
-       ship_amt = sp->shp_item[comm];
-       sect_amt = sectp->sct_item[comm];
-
-       /* check for disloyal civilians */
-       if (sectp->sct_oldown != shipown && comm == I_CIVIL) {
-           wu(0, sp->shp_own,
-              "Ship #%d - unable to unload civilians into a disloyal sector at %s.",
-              sp->shp_uid, xyas(sectp->sct_x, sectp->sct_y, sp->shp_own));
-           continue;
-       }
-       if (comm == I_CIVIL)
-           ship_amt--;         /* This leaves 1 civs on board the ship */
-
-       max_amt = MIN(ship_amt, ITEM_MAX - sect_amt);
-       if (max_amt <= 0)
-           continue;
-
-       sp->shp_item[comm] = ship_amt - max_amt;
-       sectp->sct_item[comm] = sect_amt + max_amt;
-
-       if (sectp->sct_pstage == PLG_INFECT && sp->shp_pstage == PLG_HEALTHY)
-           sp->shp_pstage = PLG_EXPOSED;
-       if (sp->shp_pstage == PLG_INFECT && sectp->sct_pstage == PLG_HEALTHY)
-           sectp->sct_pstage = PLG_EXPOSED;
-    }
-}

diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index d3d6f5fc0ffb6a64ca538d37491ea1b551154a22..8e557935fa186da6b41e6a549a54c5ca5f17f3d9 100644 (file)
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -75,8 +75,6 @@ prod_ship(int etus, int natnum, struct bp *bp, int build)
        np = getnatp(sp->shp_own);
        start_money = np->nat_money;
        upd_ship(sp, etus, np, bp, build);
-       if (build && !player->simulation)       /* make sure to only autonav once */
-           nav_ship(sp);       /* autonav the ship */
        sea_money[sp->shp_own] += np->nat_money - start_money;
        if (!build || np->nat_money != start_money)
            k++;

diff --git a/tests/actofgod/final.xdump b/tests/actofgod/final.xdump
index c0c90c881d84428a84a59a2a329a5ae4decf8652..400fe94954511f0a215b082a08831fe6ea216bdc 100644 (file)
--- a/tests/actofgod/final.xdump
+++ b/tests/actofgod/final.xdump
@@ -168,15 +168,15 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 0 -1 -1 0 0 0 0 0 0 0 0 0 0 -1 -1 0 0 0 1 0 50 50 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
-0 0 1 -1 2 0 2 0 100 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 1 0 0 0 0 0 healthy 0 0 0 "" 0 "" 1 -1 3 () ""
-1 98 1 -1 2 20 0 0 100 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" 1 -1 3 () ""
-2 2 3 -1 2 20 -127 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" 1 -1 3 (group) ""
-3 3 1 -1 2 20 -127 0 20 0 0 none 0 "a" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" 1 -1 3 (injured) "jj"
-4 3 1 -1 2 100 127 0 32767 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 0 0 0 0 0 0 0 0 0 0 0 0 exposed 32767 0 0 "" 4 "" 1 -1 3 () ""
-5 3 1 -1 2 100 127 0 32767 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50 0 0 0 0 0 0 0 0 0 0 0 0 exposed 32767 0 0 "" 5 "" 1 -1 3 () ""
-6 1 0 0 10 20 0 0 50 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+0 0 1 -1 2 0 2 0 100 0 0 none 0 "" 0 1 0 0 0 0 0 0 1 0 0 0 0 0 healthy 0 0 0 "" 0 "" 1 -1 3 () ""
+1 98 1 -1 2 20 0 0 100 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" 1 -1 3 () ""
+2 2 3 -1 2 20 -127 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" 1 -1 3 (group) ""
+3 3 1 -1 2 20 -127 0 20 0 0 none 0 "a" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" 1 -1 3 (injured) "jj"
+4 3 1 -1 2 100 127 0 32767 0 0 none 0 "" 0 50 0 0 0 0 0 0 0 0 0 0 0 0 exposed 32767 0 0 "" 4 "" 1 -1 3 () ""
+5 3 1 -1 2 100 127 0 32767 0 0 none 0 "" 0 50 0 0 0 0 0 0 0 0 0 0 0 0 exposed 32767 0 0 "" 5 "" 1 -1 3 () ""
+6 1 0 0 10 20 0 0 50 0 0 none 0 "" 0 0 0 5 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/bridgefall/final.xdump b/tests/bridgefall/final.xdump
index 730f1d2cd1e2667cb8c2e5a00284822ad63932cf..9bc290a9ebc6550875ecb94c5e14ddde5fe34ac3 100644 (file)
--- a/tests/bridgefall/final.xdump
+++ b/tests/bridgefall/final.xdump
@@ -15,7 +15,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 2 3 -1 28 80 0 0 0 0 0 0 0 0 3 -1 0 0 0 1 28 0 0 0 0 0 2 80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/build/final.xdump b/tests/build/final.xdump
index d5fab2fd9f749512ae1c6ad7cf901f7b4e8dccf6..5190bd4ba9383cc96187692ca7e247da03315b20 100644 (file)
--- a/tests/build/final.xdump
+++ b/tests/build/final.xdump
@@ -61,13 +61,13 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 6 -1 -1 13 100 127 0 0 0 0 0 0 0 -1 -1 0 0 0 1 13 0 0 0 0 0 6 100 90 0 0 0 0 0 0 0 900 2000 2000 0 900 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
-0 1 2 0 9 20 0 0 100 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 2 0 1 () ""
-1 1 2 0 9 20 0 0 100 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" 2 0 1 () ""
-2 1 4 0 9 20 0 0 90 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" 4 0 1 () ""
-3 6 -3 -1 10 20 0 0 45 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" -3 -1 6 () ""
-4 6 -1 -1 10 20 0 0 45 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 4 "" -1 -1 6 () ""
-49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+0 1 2 0 9 20 0 0 100 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 2 0 1 () ""
+1 1 2 0 9 20 0 0 100 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" 2 0 1 () ""
+2 1 4 0 9 20 0 0 90 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" 4 0 1 () ""
+3 6 -3 -1 10 20 0 0 45 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" -3 -1 6 () ""
+4 6 -1 -1 10 20 0 0 45 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 4 "" -1 -1 6 () ""
+49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/fairland/final.xdump b/tests/fairland/final.xdump
index 91e653b61bb8708075788a42b654749dce02d45b..3438a338c8c305dc8af5e7adb68782750b9130de 100644 (file)
--- a/tests/fairland/final.xdump
+++ b/tests/fairland/final.xdump
@@ -1026,7 +1026,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 0 -1 -1 0 0 0 0 0 0 0 0 0 0 -1 -1 0 -33 0 1 0 0 0 74 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/files/final.xdump b/tests/files/final.xdump
index ebeb46c1fd973ccffe8d989b16c7dca7efa9ea94..b8ddd5e3537bd8ccd79a8b404d910cdf6f2c2e02 100644 (file)
--- a/tests/files/final.xdump
+++ b/tests/files/final.xdump
@@ -2,7 +2,7 @@ config sect
 owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist ydist avail elev work coastal newdes min gold fert ocontent uran oldown civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad c_dist m_dist s_dist g_dist p_dist i_dist d_dist b_dist f_dist o_dist l_dist h_dist u_dist r_dist c_del m_del s_del g_del p_del i_del d_del b_del f_del o_del l_del h_del u_del r_del mines pstage ptime che che_target fallout access road rail dfense
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump
index 6e31bdb6cb1ab43b1f4065e0e393887029972beb..ab297f9372f462a94fb02eb781c4f60a0622c656 100644 (file)
--- a/tests/fire/final.xdump
+++ b/tests/fire/final.xdump
@@ -22,24 +22,24 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 -1 -1 24 100 127 0 0 0 0 0 0 0 -1 -1 0 0 0 0 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
-0 2 -12 0 6 20 0 0 0 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
-1 1 3 1 13 59 127 0 150 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 200 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" -12 0 0 () ""
-2 1 3 1 13 60 127 0 150 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 196 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" -12 0 0 () ""
-3 1 3 1 13 100 87 0 150 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 162 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" -12 0 0 () ""
-5 1 10 0 17 100 117 0 100 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 24 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 5 "" -12 0 0 () ""
-6 1 3 3 17 100 127 0 100 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 36 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 6 "" -12 0 0 () ""
-9 1 3 1 2 98 124 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 9 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 9 "" -12 0 0 () ""
-10 0 2 2 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 10 "" -12 0 0 () ""
-11 0 6 0 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 11 "" -12 0 0 () ""
-12 2 2 2 18 68 86 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 12 "" -12 0 0 () ""
-13 2 6 0 18 72 91 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 13 "" -12 0 0 () ""
-20 0 2 2 2 0 0 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 0 "" 20 "" -12 0 0 () ""
-21 0 6 0 2 0 0 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 80 80 0 0 healthy 0 0 0 "" 21 "" -12 0 0 () ""
-22 2 2 2 2 58 74 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 58 59 0 0 healthy 0 0 0 "" 22 "" -12 0 0 () ""
-23 2 6 0 2 78 98 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 0 "" 23 "" -12 0 0 () ""
-24 2 6 0 2 32 40 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 32 32 0 0 healthy 0 0 0 "" 24 "" -12 0 0 () ""
-49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+0 2 -12 0 6 20 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+1 1 3 1 13 59 127 0 150 0 0 none 0 "" 0 13 200 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" -12 0 0 () ""
+2 1 3 1 13 60 127 0 150 0 0 none 0 "" 0 13 196 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" -12 0 0 () ""
+3 1 3 1 13 100 87 0 150 0 0 none 0 "" 0 13 162 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" -12 0 0 () ""
+5 1 10 0 17 100 117 0 100 0 0 none 0 "" 0 5 24 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 5 "" -12 0 0 () ""
+6 1 3 3 17 100 127 0 100 0 0 none 0 "" 0 5 36 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 6 "" -12 0 0 () ""
+9 1 3 1 2 98 124 0 20 0 0 none 0 "" 0 10 10 9 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 9 "" -12 0 0 () ""
+10 0 2 2 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 10 "" -12 0 0 () ""
+11 0 6 0 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 11 "" -12 0 0 () ""
+12 2 2 2 18 68 86 0 60 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 12 "" -12 0 0 () ""
+13 2 6 0 18 72 91 0 60 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 13 "" -12 0 0 () ""
+20 0 2 2 2 0 0 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 0 "" 20 "" -12 0 0 () ""
+21 0 6 0 2 0 0 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 80 80 0 0 healthy 0 0 0 "" 21 "" -12 0 0 () ""
+22 2 2 2 2 58 74 0 20 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 58 59 0 0 healthy 0 0 0 "" 22 "" -12 0 0 () ""
+23 2 6 0 2 78 98 0 20 0 0 none 0 "" 0 4 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 0 "" 23 "" -12 0 0 () ""
+24 2 6 0 2 32 40 0 20 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 32 32 0 0 healthy 0 0 0 "" 24 "" -12 0 0 () ""
+49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/navi-march/final.xdump b/tests/navi-march/final.xdump
index 349b9a3b3092c873b9cbbb374c6510c67a048630..9c42ab939ef05fcd22fd826291a7c9022ee82b52 100644 (file)
--- a/tests/navi-march/final.xdump
+++ b/tests/navi-march/final.xdump
@@ -123,79 +123,79 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 1 -1 9 1 0 0 0 0 0 0 0 0 1 -1 0 0 0 1 9 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
-0 1 1 1 9 100 127 0 40 1 1 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 1 1 1 () ""
-1 1 1 1 2 100 127 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" 1 1 1 () ""
-2 1 1 1 17 100 127 0 70 1 1 none 1 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" 1 1 1 () ""
-3 1 1 1 1 100 127 0 35 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" 1 1 1 () ""
-4 1 1 1 7 100 127 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 4 "" 1 1 1 (bombed) "hhhhn"
-5 1 1 1 16 100 127 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 5 "" 1 1 1 () ""
-10 1 -1 -1 9 100 117 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 10 "" 1 1 1 () ""
-11 2 0 0 9 100 127 0 40 0 0 interdiction 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 11 "" 1 1 1 (bombed) "hhhhn"
-12 1 0 0 9 100 127 0 40 0 0 interdiction 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 12 "" 1 1 1 (bombed) "hhhhn"
-13 1 0 0 9 100 127 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 13 "" 1 1 1 () ""
-20 1 0 0 9 100 117 0 40 1 1 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 20 "" 1 1 1 () ""
-21 1 3 1 9 100 127 0 40 3 1 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 21 "" 1 1 1 () ""
-22 1 3 -1 9 100 117 0 40 2 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 22 "" 1 1 1 () ""
-23 1 6 0 9 100 127 0 40 6 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 23 "" 1 1 1 () ""
-24 1 1 1 9 100 117 0 40 2 2 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 24 "" 1 1 1 () ""
-25 1 4 2 9 100 127 0 40 4 2 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 25 "" 1 1 1 () ""
-26 1 2 2 2 100 127 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 26 "" 1 1 1 () ""
-27 1 1 -1 9 100 127 0 40 1 -1 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 27 "" 1 1 1 () ""
-30 1 10 -6 9 100 108 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 30 "" 1 1 1 () ""
-31 0 11 -5 9 0 53 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 31 "" 1 1 1 () ""
-32 1 10 -6 9 75 105 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 32 "" 1 1 1 () ""
-33 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 33 "" 1 1 1 () ""
-34 1 10 -6 9 100 108 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 34 "" 1 1 1 () ""
-35 1 10 -6 9 66 103 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 35 "" 1 1 1 () ""
-36 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 36 "" 1 1 1 () ""
-37 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 37 "" 1 1 1 () ""
-38 1 10 -6 9 69 104 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 38 "" 1 1 1 () ""
-39 1 10 -6 9 64 103 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 39 "" 1 1 1 () ""
-50 1 1 1 9 100 117 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 50 "" 1 1 1 () ""
-51 1 4 0 9 100 127 0 40 4 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 51 "" 1 1 1 () ""
-52 1 2 0 9 100 117 0 40 4 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 52 "" 1 1 1 () ""
-53 1 4 0 9 100 127 0 40 4 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 53 "" 1 1 1 () ""
-54 1 0 0 9 100 99 0 40 1 1 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 54 "" 1 1 1 () ""
-55 1 -1 -1 2 100 97 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 55 "" 1 1 1 () ""
-56 1 -1 -1 9 100 108 0 40 1 1 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 56 "" 1 1 1 () ""
-57 1 -1 -1 2 100 97 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 57 "" 1 1 1 () ""
-58 1 1 1 2 100 127 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 58 "" 1 1 1 () ""
-59 1 1 1 2 100 127 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 59 "" 1 1 1 () ""
-60 1 5 1 9 100 127 0 40 5 1 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 60 "" 1 1 1 () ""
-61 1 3 -1 9 100 127 0 40 3 -1 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 61 "" 1 1 1 () ""
-62 1 -13 1 9 100 117 0 40 -12 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 62 "" 1 1 1 () ""
-63 1 -5 1 9 100 117 0 40 -4 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 63 "" 1 1 1 () ""
-64 1 -8 0 9 100 127 0 40 -8 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 64 "" 1 1 1 () ""
-65 1 -9 1 2 100 127 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 65 "" 1 1 1 () ""
-70 1 -14 0 9 100 117 0 40 -12 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 70 "" 1 1 1 () ""
-71 1 -6 0 9 100 117 0 40 -4 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 71 "" 1 1 1 () ""
-72 1 -8 0 9 100 127 0 40 -8 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 72 "" 1 1 1 () ""
-80 1 -4 -4 2 100 68 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 80 "" 1 1 1 () ""
-81 1 -4 -4 2 100 68 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 81 "" 1 1 1 () ""
-82 1 -3 -3 2 100 -13 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 82 "" 1 1 1 () ""
-83 1 -1 -1 2 100 -13 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 83 "" 1 1 1 () ""
-84 1 0 0 2 100 0 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 84 "" 1 1 1 () ""
-90 1 0 -4 9 100 81 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 90 "" 1 1 1 () ""
-91 1 -3 1 9 100 108 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 91 "" 1 1 1 () ""
-92 1 0 0 9 100 127 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 92 "" 1 1 1 () ""
-100 1 3 -1 17 100 108 0 200 8 0 none 3 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 100 "" 1 1 1 () ""
-101 1 3 -1 1 100 84 0 35 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 101 "" 1 1 1 () ""
-102 1 3 -1 7 100 85 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 102 "" 1 1 1 () ""
-110 1 10 -2 16 100 113 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 84 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 110 "" 1 1 1 () ""
-111 1 10 -2 16 100 113 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 97 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 111 "" 1 1 1 () ""
-121 1 13 -3 16 100 85 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 121 "" 1 1 1 () ""
-122 1 13 -3 16 100 85 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 122 "" 1 1 1 () ""
-128 1 11 -3 16 100 -12 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 5 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 128 "" 1 1 1 () ""
-129 1 10 -2 16 100 99 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 100 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 129 "" 1 1 1 () ""
-130 1 11 -5 16 43 1 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 10 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 130 "" 1 1 1 () ""
-131 1 11 -5 16 58 20 0 40 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 11 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 131 "" 1 1 1 () ""
-135 1 11 -5 9 70 82 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 135 "" 1 1 1 () ""
-136 1 11 -5 9 69 81 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 136 "" 1 1 1 () ""
-137 1 11 -5 9 100 117 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 137 "" 1 1 1 () ""
-138 1 11 -5 9 80 93 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 138 "" 1 1 1 () ""
-139 1 11 -5 9 74 86 0 40 9 -5 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 139 "" 1 1 1 () ""
-149 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+0 1 1 1 9 100 127 0 40 1 1 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 1 1 1 () ""
+1 1 1 1 2 100 127 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" 1 1 1 () ""
+2 1 1 1 17 100 127 0 70 1 1 none 1 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" 1 1 1 () ""
+3 1 1 1 1 100 127 0 35 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" 1 1 1 () ""
+4 1 1 1 7 100 127 0 40 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 4 "" 1 1 1 (bombed) "hhhhn"
+5 1 1 1 16 100 127 0 40 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 5 "" 1 1 1 () ""
+10 1 -1 -1 9 100 117 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 10 "" 1 1 1 () ""
+11 2 0 0 9 100 127 0 40 0 0 interdiction 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 11 "" 1 1 1 (bombed) "hhhhn"
+12 1 0 0 9 100 127 0 40 0 0 interdiction 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 12 "" 1 1 1 (bombed) "hhhhn"
+13 1 0 0 9 100 127 0 40 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 13 "" 1 1 1 () ""
+20 1 0 0 9 100 117 0 40 1 1 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 20 "" 1 1 1 () ""
+21 1 3 1 9 100 127 0 40 3 1 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 21 "" 1 1 1 () ""
+22 1 3 -1 9 100 117 0 40 2 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 22 "" 1 1 1 () ""
+23 1 6 0 9 100 127 0 40 6 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 23 "" 1 1 1 () ""
+24 1 1 1 9 100 117 0 40 2 2 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 24 "" 1 1 1 () ""
+25 1 4 2 9 100 127 0 40 4 2 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 25 "" 1 1 1 () ""
+26 1 2 2 2 100 127 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 26 "" 1 1 1 () ""
+27 1 1 -1 9 100 127 0 40 1 -1 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 27 "" 1 1 1 () ""
+30 1 10 -6 9 100 108 0 40 9 -5 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 30 "" 1 1 1 () ""
+31 0 11 -5 9 0 53 0 40 9 -5 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 31 "" 1 1 1 () ""
+32 1 10 -6 9 75 105 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 32 "" 1 1 1 () ""
+33 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 33 "" 1 1 1 () ""
+34 1 10 -6 9 100 108 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 34 "" 1 1 1 () ""
+35 1 10 -6 9 66 103 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 35 "" 1 1 1 () ""
+36 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 36 "" 1 1 1 () ""
+37 1 10 -6 9 80 106 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 37 "" 1 1 1 () ""
+38 1 10 -6 9 69 104 0 40 9 -5 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 38 "" 1 1 1 () ""
+39 1 10 -6 9 64 103 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 39 "" 1 1 1 () ""
+50 1 1 1 9 100 117 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 50 "" 1 1 1 () ""
+51 1 4 0 9 100 127 0 40 4 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 51 "" 1 1 1 () ""
+52 1 2 0 9 100 117 0 40 4 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 52 "" 1 1 1 () ""
+53 1 4 0 9 100 127 0 40 4 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 53 "" 1 1 1 () ""
+54 1 0 0 9 100 99 0 40 1 1 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 54 "" 1 1 1 () ""
+55 1 -1 -1 2 100 97 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 55 "" 1 1 1 () ""
+56 1 -1 -1 9 100 108 0 40 1 1 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 56 "" 1 1 1 () ""
+57 1 -1 -1 2 100 97 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 57 "" 1 1 1 () ""
+58 1 1 1 2 100 127 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 58 "" 1 1 1 () ""
+59 1 1 1 2 100 127 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 59 "" 1 1 1 () ""
+60 1 5 1 9 100 127 0 40 5 1 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 60 "" 1 1 1 () ""
+61 1 3 -1 9 100 127 0 40 3 -1 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 61 "" 1 1 1 () ""
+62 1 -13 1 9 100 117 0 40 -12 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 62 "" 1 1 1 () ""
+63 1 -5 1 9 100 117 0 40 -4 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 63 "" 1 1 1 () ""
+64 1 -8 0 9 100 127 0 40 -8 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 64 "" 1 1 1 () ""
+65 1 -9 1 2 100 127 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 65 "" 1 1 1 () ""
+70 1 -14 0 9 100 117 0 40 -12 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 70 "" 1 1 1 () ""
+71 1 -6 0 9 100 117 0 40 -4 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 71 "" 1 1 1 () ""
+72 1 -8 0 9 100 127 0 40 -8 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 72 "" 1 1 1 () ""
+80 1 -4 -4 2 100 68 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 80 "" 1 1 1 () ""
+81 1 -4 -4 2 100 68 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 81 "" 1 1 1 () ""
+82 1 -3 -3 2 100 -13 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 82 "" 1 1 1 () ""
+83 1 -1 -1 2 100 -13 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 83 "" 1 1 1 () ""
+84 1 0 0 2 100 0 0 20 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 84 "" 1 1 1 () ""
+90 1 0 -4 9 100 81 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 90 "" 1 1 1 () ""
+91 1 -3 1 9 100 108 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 91 "" 1 1 1 () ""
+92 1 0 0 9 100 127 0 40 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 92 "" 1 1 1 () ""
+100 1 3 -1 17 100 108 0 200 8 0 none 3 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 100 "" 1 1 1 () ""
+101 1 3 -1 1 100 84 0 35 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 101 "" 1 1 1 () ""
+102 1 3 -1 7 100 85 0 40 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 102 "" 1 1 1 () ""
+110 1 10 -2 16 100 113 0 40 0 0 none 0 "" 0 5 84 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 110 "" 1 1 1 () ""
+111 1 10 -2 16 100 113 0 40 0 0 none 0 "" 0 5 97 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 111 "" 1 1 1 () ""
+121 1 13 -3 16 100 85 0 40 0 0 none 0 "" 0 5 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 121 "" 1 1 1 () ""
+122 1 13 -3 16 100 85 0 40 0 0 none 0 "" 0 5 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 122 "" 1 1 1 () ""
+128 1 11 -3 16 100 -12 0 40 0 0 none 0 "" 0 5 5 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 128 "" 1 1 1 () ""
+129 1 10 -2 16 100 99 0 40 0 0 none 0 "" 0 5 100 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 129 "" 1 1 1 () ""
+130 1 11 -5 16 43 1 0 40 0 0 none 0 "" 0 3 10 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 130 "" 1 1 1 () ""
+131 1 11 -5 16 58 20 0 40 0 0 none 0 "" 0 3 11 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 131 "" 1 1 1 () ""
+135 1 11 -5 9 70 82 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 135 "" 1 1 1 () ""
+136 1 11 -5 9 69 81 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 136 "" 1 1 1 () ""
+137 1 11 -5 9 100 117 0 40 9 -5 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 137 "" 1 1 1 () ""
+138 1 11 -5 9 80 93 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 138 "" 1 1 1 () ""
+139 1 11 -5 9 74 86 0 40 9 -5 none 0 "" 0 1 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 139 "" 1 1 1 () ""
+149 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump
index 84d0bfe65cf099d08b5df64218300d8a812a55f6..57b01de75fa750708fe5f9a0eb8f2cbe2a7c6f8a 100644 (file)
--- a/tests/retreat/final.xdump
+++ b/tests/retreat/final.xdump
@@ -24,157 +24,157 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 -1 -1 15 100 127 0 0 0 0 0 0 0 -1 -1 0 0 0 0 15 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
-0 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -3 1 1 () ""
-1 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" -3 1 1 () ""
-2 1 -3 1 2 91 115 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" -3 1 1 (injured torped sonared helpless bombed depth-charged boarded) "bgyujnbgy"
-3 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" -3 1 1 () ""
-4 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 4 "" -3 1 1 (group helpless) "b"
-5 1 -5 1 17 96 63 0 70 0 0 none 0 "a" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 5 "" -3 1 1 () ""
-6 1 -1 3 18 100 97 0 165 0 0 none 0 "a" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 21 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 6 "" -3 1 1 () ""
-7 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-8 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-9 2 -4 -2 17 60 127 0 70 0 0 none 0 "a" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 38 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 9 "" -3 1 1 () ""
-10 2 4 4 2 83 53 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 10 "" -3 1 1 () ""
-11 2 1 3 2 91 99 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 11 "" -3 1 1 () ""
-12 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-13 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-14 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-15 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-16 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-17 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-18 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-19 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-20 2 -3 1 2 95 121 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 20 "" -3 1 1 (helpless) "u"
-21 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-22 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-23 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-24 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-25 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-26 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-27 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-28 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-29 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-30 0 0 2 2 0 117 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 30 "" -3 1 1 (injured) "n"
-31 2 0 2 2 94 119 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "nnnn" 31 "" -3 1 1 (injured) "n"
-32 2 0 2 2 94 119 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 32 "" -3 1 1 (injured) "n"
-33 2 2 2 2 94 120 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 33 "" -3 1 1 (injured) "n"
-34 2 3 1 2 92 116 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 34 "" -3 1 1 (injured) "n"
-35 2 0 2 2 94 0 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 35 "" -3 1 1 (injured) "n"
-36 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-37 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-38 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-39 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-40 2 1 3 10 91 -7 0 45 0 2 none 1 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 40 "" -3 1 1 (injured) "nnnh"
-41 2 1 3 10 96 108 0 45 0 2 none 1 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 41 "" -3 1 1 (injured) "uh"
-42 2 -4 2 10 95 120 0 45 -4 2 interdiction 1 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 42 "" -3 1 1 (injured) "ugggh"
-43 2 -6 4 16 76 86 0 40 0 0 none 0 "m" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 43 "" -3 1 1 (group injured) "g"
-44 2 -6 4 16 63 70 0 40 0 0 none 0 "m" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 44 "" -3 1 1 (group injured) "g"
-45 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-46 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-47 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-48 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-49 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-50 2 -9 1 18 67 33 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 50 "" -3 1 1 () ""
-51 2 -9 1 18 64 27 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 51 "" -3 1 1 () ""
-52 2 -9 1 18 73 44 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 52 "" -3 1 1 () ""
-53 2 -4 -2 18 73 92 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 53 "" -3 1 1 (helpless) "gg"
-54 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-55 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-56 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-57 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-58 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-59 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-60 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 60 "" -3 1 1 (injured helpless bombed) "nn"
-61 2 2 4 17 84 83 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 61 "" -3 1 1 () ""
-62 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 62 "" -3 1 1 (injured helpless bombed) "nn"
-63 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 63 "" -3 1 1 (injured helpless bombed) "nn"
-64 2 2 4 17 51 26 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 64 "" -3 1 1 () ""
-65 2 2 4 17 87 89 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 65 "" -3 1 1 () ""
-66 2 2 4 17 65 53 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 66 "" -3 1 1 () ""
-67 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 67 "" -3 1 1 (helpless bombed) "nn"
-68 2 2 4 17 62 46 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 68 "" -3 1 1 () ""
-69 2 2 4 17 48 21 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 69 "" -3 1 1 () ""
-70 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-71 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-72 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-73 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-74 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-75 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-76 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-77 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-78 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-79 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-80 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 80 "" -3 1 1 (injured helpless bombed) "nn"
-81 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 81 "" -3 1 1 (injured helpless bombed) "nn"
-82 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 82 "" -3 1 1 (injured helpless bombed) "nn"
-83 2 2 4 17 29 -28 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 83 "" -3 1 1 () ""
-84 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 84 "" -3 1 1 (injured helpless bombed) "nn"
-85 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-86 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-87 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-88 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-89 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-90 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-91 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-92 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-93 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-94 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-95 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-96 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-97 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-98 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-99 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-100 2 2 4 2 38 37 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 100 "" -3 1 1 () ""
-101 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 101 "" -3 1 1 (injured torped helpless) "nn"
-102 2 2 4 2 64 62 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 102 "" -3 1 1 () ""
-103 2 2 4 2 21 20 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 103 "" -3 1 1 () ""
-104 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 104 "" -3 1 1 (injured torped helpless) "nn"
-105 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-106 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-107 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-108 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-109 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-110 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-111 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-112 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-113 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-114 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-115 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-116 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-117 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-118 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-119 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-120 2 -9 1 18 100 93 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 120 "" -3 1 1 () ""
-121 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-122 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-123 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-124 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-125 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-126 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-127 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-128 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-129 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-130 2 -9 1 12 100 95 0 60 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 130 "" -3 1 1 () ""
-131 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-132 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-133 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-134 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-135 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-136 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-137 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-138 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-139 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-140 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-141 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-142 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-143 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-144 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-145 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-146 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-147 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-148 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-149 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+0 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -3 1 1 () ""
+1 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 1 "" -3 1 1 () ""
+2 1 -3 1 2 91 115 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" -3 1 1 (injured torped sonared helpless bombed depth-charged boarded) "bgyujnbgy"
+3 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 3 "" -3 1 1 () ""
+4 1 -3 1 2 100 127 0 20 0 0 none 0 "a" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 4 "" -3 1 1 (group helpless) "b"
+5 1 -5 1 17 96 63 0 70 0 0 none 0 "a" 0 9 31 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 5 "" -3 1 1 () ""
+6 1 -1 3 18 100 97 0 165 0 0 none 0 "a" 0 10 21 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 6 "" -3 1 1 () ""
+7 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+8 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+9 2 -4 -2 17 60 127 0 70 0 0 none 0 "a" 0 10 38 1 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 9 "" -3 1 1 () ""
+10 2 4 4 2 83 53 0 20 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 10 "" -3 1 1 () ""
+11 2 1 3 2 91 99 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 11 "" -3 1 1 () ""
+12 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+13 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+14 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+15 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+16 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+17 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+18 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+19 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+20 2 -3 1 2 95 121 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 20 "" -3 1 1 (helpless) "u"
+21 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+22 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+23 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+24 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+25 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+26 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+27 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+28 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+29 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+30 0 0 2 2 0 117 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 30 "" -3 1 1 (injured) "n"
+31 2 0 2 2 94 119 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "nnnn" 31 "" -3 1 1 (injured) "n"
+32 2 0 2 2 94 119 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 32 "" -3 1 1 (injured) "n"
+33 2 2 2 2 94 120 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 33 "" -3 1 1 (injured) "n"
+34 2 3 1 2 92 116 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 34 "" -3 1 1 (injured) "n"
+35 2 0 2 2 94 0 0 20 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 35 "" -3 1 1 (injured) "n"
+36 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+37 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+38 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+39 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+40 2 1 3 10 91 -7 0 45 0 2 none 1 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 40 "" -3 1 1 (injured) "nnnh"
+41 2 1 3 10 96 108 0 45 0 2 none 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 41 "" -3 1 1 (injured) "uh"
+42 2 -4 2 10 95 120 0 45 -4 2 interdiction 1 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 42 "" -3 1 1 (injured) "ugggh"
+43 2 -6 4 16 76 86 0 40 0 0 none 0 "m" 0 7 3 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 43 "" -3 1 1 (group injured) "g"
+44 2 -6 4 16 63 70 0 40 0 0 none 0 "m" 0 7 2 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 44 "" -3 1 1 (group injured) "g"
+45 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+46 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+47 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+48 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+49 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+50 2 -9 1 18 67 33 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 50 "" -3 1 1 () ""
+51 2 -9 1 18 64 27 0 60 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 51 "" -3 1 1 () ""
+52 2 -9 1 18 73 44 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 52 "" -3 1 1 () ""
+53 2 -4 -2 18 73 92 0 60 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 53 "" -3 1 1 (helpless) "gg"
+54 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+55 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+56 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+57 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+58 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+59 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+60 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 60 "" -3 1 1 (injured helpless bombed) "nn"
+61 2 2 4 17 84 83 0 70 0 0 none 0 "" 0 8 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 61 "" -3 1 1 () ""
+62 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 62 "" -3 1 1 (injured helpless bombed) "nn"
+63 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 63 "" -3 1 1 (injured helpless bombed) "nn"
+64 2 2 4 17 51 26 0 70 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 64 "" -3 1 1 () ""
+65 2 2 4 17 87 89 0 70 0 0 none 0 "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 65 "" -3 1 1 () ""
+66 2 2 4 17 65 53 0 70 0 0 none 0 "" 0 7 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 66 "" -3 1 1 () ""
+67 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 67 "" -3 1 1 (helpless bombed) "nn"
+68 2 2 4 17 62 46 0 70 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 68 "" -3 1 1 () ""
+69 2 2 4 17 48 21 0 70 0 0 none 0 "" 0 5 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 69 "" -3 1 1 () ""
+70 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+71 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+72 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+73 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+74 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+75 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+76 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+77 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+78 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+79 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+80 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 80 "" -3 1 1 (injured helpless bombed) "nn"
+81 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 81 "" -3 1 1 (injured helpless bombed) "nn"
+82 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 82 "" -3 1 1 (injured helpless bombed) "nn"
+83 2 2 4 17 29 -28 0 70 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 83 "" -3 1 1 () ""
+84 2 0 2 17 100 127 0 70 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 84 "" -3 1 1 (injured helpless bombed) "nn"
+85 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+86 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+87 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+88 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+89 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+90 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+91 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+92 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+93 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+94 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+95 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+96 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+97 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+98 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+99 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+100 2 2 4 2 38 37 0 20 0 0 none 0 "" 0 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 100 "" -3 1 1 () ""
+101 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 101 "" -3 1 1 (injured torped helpless) "nn"
+102 2 2 4 2 64 62 0 20 0 0 none 0 "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 102 "" -3 1 1 () ""
+103 2 2 4 2 21 20 0 20 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 103 "" -3 1 1 () ""
+104 2 0 2 2 100 127 0 20 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 104 "" -3 1 1 (injured torped helpless) "nn"
+105 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+106 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+107 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+108 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+109 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+110 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+111 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+112 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+113 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+114 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+115 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+116 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+117 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+118 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+119 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+120 2 -9 1 18 100 93 0 60 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 120 "" -3 1 1 () ""
+121 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+122 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+123 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+124 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+125 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+126 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+127 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+128 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+129 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+130 2 -9 1 12 100 95 0 60 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 130 "" -3 1 1 () ""
+131 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+132 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+133 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+134 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+135 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+136 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+137 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+138 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+139 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+140 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+141 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+142 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+143 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+144 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+145 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+146 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+147 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+148 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+149 0 0 0 0 0 127 0 0 0 0 none 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/smoke/16/01-1 b/tests/smoke/16/01-1
index 2078c45967ddd44942265bd0df981cd2cfcf80ec..ff16c00bcd41ec12aa3ae68968ba19d3d2c12c45 100644 (file)
--- a/tests/smoke/16/01-1
+++ b/tests/smoke/16/01-1
@@ -7,12 +7,9 @@ load c 3/4 999
 nav 3 6,0
 h
 nav 3 vh
-order 3 des 5,-1 6,0
-order 3 level 1 end oil 1
+__cmd added -2 -2 0
 nav 4 nvh
-order 4 des 5,-1 6,0
-order 4 level 1 start food 30
-order 4 level 1 end food 30
+__cmd added -3 -3 0
 tran p 0/1/2 11,-1
 reco 0 . 11,-1 ujbgh
 bomb 1 . stat 11,-1 ujh

diff --git a/tests/smoke/fairland.xdump b/tests/smoke/fairland.xdump
index 10b5202133a91bf91111a08093f853f70d6fddd9..3bc62e8a869beea47a70830d7164137f1857cdc6 100644 (file)
--- a/tests/smoke/fairland.xdump
+++ b/tests/smoke/fairland.xdump
@@ -1026,7 +1026,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 0 -1 -1 4 0 0 0 0 0 0 0 0 0 -1 -1 0 61 0 1 4 63 33 0 0 17 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range ship land harden flags access theta

diff --git a/tests/smoke/final.xdump b/tests/smoke/final.xdump
index 29744c514ab227f69d14acc183bf8dd299d666ff..b807d40faffab5a37b8abffef528dcd2eef3f21b 100644 (file)
--- a/tests/smoke/final.xdump
+++ b/tests/smoke/final.xdump
@@ -581,7 +581,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 1 4 -14 29 100 127 0 0 0 0 0 0 0 11 -11 650 43 100 1 29 34 0 28 0 0 1 1000 0 0 0 0 0 0 457 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 6 -14 10 100 127 0 0 0 0 0 0 0 11 -11 0 89 100 0 10 100 69 0 0 97 1 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 8 -14 10 100 127 0 0 0 0 0 0 0 11 -11 0 82 100 0 10 96 60 0 0 77 1 1000 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
-1 10 -14 12 100 127 0 0 0 0 0 0 0 11 -11 628 50 100 1 12 45 19 13 0 0 1 962 5 200 10 0 1 1 0 870 1 200 200 0 0 0 0 200 10 0 0 0 0 0 0 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
+1 10 -14 12 100 127 0 0 0 0 0 0 0 11 -11 628 50 100 1 12 45 19 13 0 0 1 962 5 200 10 0 1 1 0 0 1 200 200 0 0 0 0 200 10 0 0 0 0 0 0 200 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 12 -14 28 100 127 0 0 0 0 0 0 0 11 -11 110 -4 100 1 28 0 0 45 11 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 14 -14 28 100 127 0 0 0 0 0 0 0 11 -11 110 -22 100 1 28 0 0 63 46 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 1 0 0 0 0 0
 1 16 -14 25 100 127 0 0 0 0 0 0 0 11 -11 645 7 100 1 25 0 0 100 98 0 1 1000 23 20 0 20 0 0 0 0 0 0 0 1 0 0 0 20 0 20 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
@@ -1026,13 +1026,13 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 0 -1 -1 4 0 0 0 0 0 0 0 0 0 -1 -1 0 61 0 1 4 63 33 0 0 17 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0
 /config
 config ship
-uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
-0 1 18 -12 6 100 127 0 0 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 10 -14 1 () ""
-1 1 10 -14 2 100 127 0 31 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 300 25 0 0 0 0 0 0 0 0 100 100 0 0 healthy 0 0 0 "" 1 "" 10 -14 1 () ""
-2 1 10 -14 15 100 127 0 44 0 0 none 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" 10 -14 1 () ""
-3 1 10 -14 8 100 127 0 51 0 0 none 0 "" 11 10 -13 -14 -1 -1 -1 -1 -1 -1 9 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 0 0 0 0 0 4 990 0 0 0 0 0 0 0 0 449 0 0 0 0 healthy 0 0 0 "" 3 "" 10 -14 1 () ""
-4 1 11 -13 1 100 127 0 51 0 0 none 0 "" 10 11 -14 -13 8 -1 -1 -1 -1 -1 8 -1 -1 -1 -1 -1 30 0 0 0 0 0 30 0 0 0 0 0 4 300 0 0 0 0 0 0 0 30 0 0 0 0 0 healthy 0 0 0 "" 4 "" 10 -14 1 () ""
-49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
+0 1 18 -12 6 100 127 0 0 0 0 none 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 10 -14 1 () ""
+1 1 10 -14 2 100 127 0 31 0 0 none 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 healthy 0 0 0 "" 1 "" 10 -14 1 () ""
+2 1 10 -14 15 100 127 0 44 0 0 none 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 2 "" 10 -14 1 () ""
+3 1 11 -13 8 100 127 0 51 0 0 none 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 healthy 0 0 0 "" 3 "" 10 -14 1 () ""
+4 1 11 -13 1 100 127 0 51 0 0 none 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 healthy 0 0 0 "" 4 "" 10 -14 1 () ""
+49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 /config
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index 379a960332860ebfa5fb0247ab91c1104d2af20e..91a634d0a72d43c143296e4c049dfa42a44ae176 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -211,15 +211,6 @@
     Play#0 output Play#0 1 "mission" 6 0 0 34
     Play#0 output Play#0 1 "radius" 6 0 0 -1
     Play#0 output Play#0 1 "fleet" 13 0 1 -1
-    Play#0 output Play#0 1 "xstart" 9 0 0 -1
-    Play#0 output Play#0 1 "xend" 9 0 0 -1
-    Play#0 output Play#0 1 "ystart" 10 0 0 -1
-    Play#0 output Play#0 1 "yend" 10 0 0 -1
-    Play#0 output Play#0 1 "cargostart" 4 0 6 16
-    Play#0 output Play#0 1 "cargoend" 4 0 6 16
-    Play#0 output Play#0 1 "amtstart" 6 0 6 -1
-    Play#0 output Play#0 1 "amtend" 6 0 6 -1
-    Play#0 output Play#0 1 "autonav" 5 0 0 -1
     Play#0 output Play#0 1 "civil" 6 0 0 -1
     Play#0 output Play#0 1 "milit" 6 0 0 -1
     Play#0 output Play#0 1 "shell" 6 0 0 -1
@@ -246,7 +237,7 @@
     Play#0 output Play#0 1 "builder" 5 1 0 8
     Play#0 output Play#0 1 "rflags" 8 8 0 46
     Play#0 output Play#0 1 "rpath" 13 0 10 -1
-    Play#0 output Play#0 1 /49
+    Play#0 output Play#0 1 /40
     Play#0 output Play#0 6 0 640
     Play#0 input xdump meta plane
     Play#0 command xdump
@@ -1366,15 +1357,6 @@
     Play#2 output Play#2 1 "mission" 6 0 0 34
     Play#2 output Play#2 1 "radius" 6 0 0 -1
     Play#2 output Play#2 1 "fleet" 13 0 1 -1
-    Play#2 output Play#2 1 "xstart" 9 0 0 -1
-    Play#2 output Play#2 1 "xend" 9 0 0 -1
-    Play#2 output Play#2 1 "ystart" 10 0 0 -1
-    Play#2 output Play#2 1 "yend" 10 0 0 -1
-    Play#2 output Play#2 1 "cargostart" 4 0 6 16
-    Play#2 output Play#2 1 "cargoend" 4 0 6 16
-    Play#2 output Play#2 1 "amtstart" 6 0 6 -1
-    Play#2 output Play#2 1 "amtend" 6 0 6 -1
-    Play#2 output Play#2 1 "autonav" 5 0 0 -1
     Play#2 output Play#2 1 "civil" 6 0 0 -1
     Play#2 output Play#2 1 "milit" 6 0 0 -1
     Play#2 output Play#2 1 "shell" 6 0 0 -1
@@ -1396,7 +1378,7 @@
     Play#2 output Play#2 1 "name" 13 0 24 -1
     Play#2 output Play#2 1 "rflags" 8 8 0 46
     Play#2 output Play#2 1 "rpath" 13 0 10 -1
-    Play#2 output Play#2 1 /44
+    Play#2 output Play#2 1 /35
     Play#2 output Play#2 6 0 636
     Play#2 input xdump meta plane
     Play#2 command xdump
@@ -14508,13 +14490,8 @@
     Play#1 output Play#1 1 [oil:88] od   oil derrick (#3) @ 6,0 0% sea
     Play#1 output Play#1 1 od   oil derrick (#3) stopped at 6,0
     Play#1 output Play#1 6 0 632
-    Play#1 input order 3 des 5,-1 6,0
-    Play#1 command order
-    Play#1 output Play#1 1 A circular order has been accepted.
-    Play#1 output Play#1 6 0 631
-    Play#1 input order 3 level 1 end oil 1
-    Play#1 command order
-    Play#1 output Play#1 1 Order set
+    Play#1 input __cmd added -2 -2 0
+    Play#1 command __cmd
     Play#1 output Play#1 6 0 630
     Play#1 input nav 4 nvh
     Play#1 command navigate
@@ -14522,17 +14499,8 @@
     Play#1 output Play#1 1 [fert:84] ft   fishing trawler (#4) @ 6,0 0% sea
     Play#1 output Play#1 1 ft   fishing trawler (#4) stopped at 6,0
     Play#1 output Play#1 6 0 629
-    Play#1 input order 4 des 5,-1 6,0
-    Play#1 command order
-    Play#1 output Play#1 1 A circular order has been accepted.
-    Play#1 output Play#1 6 0 628
-    Play#1 input order 4 level 1 start food 30
-    Play#1 command order
-    Play#1 output Play#1 1 Order Set
-    Play#1 output Play#1 6 0 627
-    Play#1 input order 4 level 1 end food 30
-    Play#1 command order
-    Play#1 output Play#1 1 Order set
+    Play#1 input __cmd added -3 -3 0
+    Play#1 command __cmd
     Play#1 output Play#1 6 0 626
     Play#1 input tran p 0/1/2 11,-1
     Play#1 command transport
@@ -15574,11 +15542,11 @@
     Play#0 input xdump ship *
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP ship 0
-    Play#0 output Play#0 1 0 1 18 -12 6 100 127 0 0 0 0 0 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 "" 10 -14 1 0 ""
-    Play#0 output Play#0 1 1 1 10 -14 2 100 127 0 31 0 0 0 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 300 25 0 0 0 0 0 0 0 0 100 100 0 0 0 0 0 0 "" 1 "" 10 -14 1 0 ""
-    Play#0 output Play#0 1 2 1 10 -14 15 100 127 0 44 0 0 0 0 "" 0 0 0 0 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 2 "" 10 -14 1 0 ""
-    Play#0 output Play#0 1 3 1 10 -14 8 100 127 0 51 0 0 0 0 "" 11 10 -13 -14 -1 -1 -1 -1 -1 -1 9 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 0 0 0 0 0 4 990 0 0 0 0 0 0 0 0 449 0 0 0 0 0 0 0 0 "" 3 "" 10 -14 1 0 ""
-    Play#0 output Play#0 1 4 1 11 -13 1 100 127 0 51 0 0 0 0 "" 10 11 -14 -13 8 -1 -1 -1 -1 -1 8 -1 -1 -1 -1 -1 30 0 0 0 0 0 30 0 0 0 0 0 4 300 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 0 0 "" 4 "" 10 -14 1 0 ""
+    Play#0 output Play#0 1 0 1 18 -12 6 100 127 0 0 0 0 0 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 "" 10 -14 1 0 ""
+    Play#0 output Play#0 1 1 1 10 -14 2 100 127 0 31 0 0 0 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 0 0 0 0 "" 1 "" 10 -14 1 0 ""
+    Play#0 output Play#0 1 2 1 10 -14 15 100 127 0 44 0 0 0 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 2 "" 10 -14 1 0 ""
+    Play#0 output Play#0 1 3 1 11 -13 8 100 127 0 51 0 0 0 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 0 0 0 0 "" 3 "" 10 -14 1 0 ""
+    Play#0 output Play#0 1 4 1 11 -13 1 100 127 0 51 0 0 0 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 0 0 0 0 "" 4 "" 10 -14 1 0 ""
     Play#0 output Play#0 1 /5
     Play#0 output Play#0 6 0 640
     Play#0 input xdump plane *
@@ -16329,11 +16297,11 @@
     Play#1 input xdump ship *
     Play#1 command xdump
     Play#1 output Play#1 1 XDUMP ship 0
-    Play#1 output Play#1 1 0 1 13 1 6 100 127 0 0 -5 13 0 0 "" -5 -5 13 13 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 "" 0 ""
-    Play#1 output Play#1 1 1 1 5 -1 2 100 127 0 31 -5 13 0 0 "" -5 -5 13 13 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 300 25 0 0 0 0 0 0 0 0 100 100 0 0 0 0 "" 1 "" 0 ""
-    Play#1 output Play#1 1 2 1 5 -1 15 100 127 0 44 -5 13 0 0 "" -5 -5 13 13 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 2 "" 0 ""
-    Play#1 output Play#1 1 3 1 5 -1 8 100 127 0 51 -5 13 0 0 "" 6 5 0 -1 -1 -1 -1 -1 -1 -1 9 -1 -1 -1 -1 -1 0 0 0 0 0 0 1 0 0 0 0 0 4 990 0 0 0 0 0 0 0 0 449 0 0 0 0 0 0 "" 3 "" 0 ""
-    Play#1 output Play#1 1 4 1 6 0 1 100 127 0 51 -5 13 0 0 "" 5 6 -1 0 8 -1 -1 -1 -1 -1 8 -1 -1 -1 -1 -1 30 0 0 0 0 0 30 0 0 0 0 0 4 300 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 "" 4 "" 0 ""
+    Play#1 output Play#1 1 0 1 13 1 6 100 127 0 0 -5 13 0 0 "" 0 25 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 "" 0 ""
+    Play#1 output Play#1 1 1 1 5 -1 2 100 127 0 31 -5 13 0 0 "" 300 25 0 0 0 0 0 0 0 0 100 100 0 0 0 0 "" 1 "" 0 ""
+    Play#1 output Play#1 1 2 1 5 -1 15 100 127 0 44 -5 13 0 0 "" 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 2 "" 0 ""
+    Play#1 output Play#1 1 3 1 6 0 8 100 127 0 51 -5 13 0 0 "" 990 0 0 0 0 0 0 0 0 449 0 0 0 0 0 0 "" 3 "" 0 ""
+    Play#1 output Play#1 1 4 1 6 0 1 100 127 0 51 -5 13 0 0 "" 300 0 0 0 0 0 0 0 900 0 0 0 0 0 0 0 "" 4 "" 0 ""
     Play#1 output Play#1 1 /5
     Play#1 output Play#1 6 0 640
     Play#1 input xdump plane *