empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sail: Remove option SAIL

Browse source 
SAIL has issues:

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

* The route is fixed at command time.  You can't let the update find
  the best route, like it does for distribution.

* The info pages documenting it amount to almost 100 non-blank lines
  formatted.  They claim you can follow friendly ships.  This is
  wrong.  They also show incorrect follow syntax.  Unlikely to be the
  only errors.

* Few players use it.  Makes it a nice hidey-hole for bugs.  Here are
  two nice ones:

  - If follow's second argument is negative, the code attempts to
    follow an uninitialized ship.  Could well be a remote hole.

  - If ship #1 follows #2 follows #3 follows #2, the update goes into
    an infinite loop.

* It's more than 500 lines of rather crufty code nobody wants to
  touch.  Thanks to a big effort in Empire 2, it shares some code with
  the navigation command.  It still duplicates other navigation 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 follow, mquota, sail and
unsail.  Drop ship selectors mquota, path, follow.

struct shpstr shrinks some more, on my system from 160 to 120 bytes.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-12-24 21:42:51 +01:00
parent 48e656c057
commit dc73207a99
37 changed files with 297 additions and 1157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/smoke/fairland.xdump
View file

@ -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 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 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

14
tests/smoke/final.xdump
View file

@ -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 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 () ""
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 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 "" 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 "" 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 "" 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 "" 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 "" 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 () ""
/config
config plane
uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta

40
tests/smoke/journal.log
View file

@ -228,16 +228,13 @@
Play#0 output Play#0 1 "pstage" 6 1 0 42
Play#0 output Play#0 1 "ptime" 6 1 0 -1
Play#0 output Play#0 1 "access" 6 0 0 -1
Play#0 output Play#0 1 "mquota" 5 0 0 -1
Play#0 output Play#0 1 "path" 13 0 28 -1
Play#0 output Play#0 1 "follow" 8 0 0 -1
Play#0 output Play#0 1 "name" 13 0 24 -1
Play#0 output Play#0 1 "xbuilt" 9 1 0 -1
Play#0 output Play#0 1 "ybuilt" 10 1 0 -1
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 /40
Play#0 output Play#0 1 /37
Play#0 output Play#0 6 0 640
Play#0 input xdump meta plane
Play#0 command xdump
@ -692,7 +689,6 @@
Play#0 output Play#0 1 "NO_PLAGUE" 8 0 0 -1
Play#0 output Play#0 1 "RAILWAYS" 8 0 0 -1
Play#0 output Play#0 1 "RES_POP" 8 0 0 -1
Play#0 output Play#0 1 "SAIL" 8 0 0 -1
Play#0 output Play#0 1 "SUPER_BARS" 8 0 0 -1
Play#0 output Play#0 1 "TECH_POP" 8 0 0 -1
Play#0 output Play#0 1 "btu_build_rate" 12 0 0 -1
@ -769,7 +765,7 @@
Play#0 output Play#0 1 "trade_3" 12 0 0 -1
Play#0 output Play#0 1 "trade_ally_bonus" 12 0 0 -1
Play#0 output Play#0 1 "trade_ally_cut" 12 0 0 -1
Play#0 output Play#0 1 /111
Play#0 output Play#0 1 /110
Play#0 output Play#0 6 0 640
Play#0 input xdump meta meta
Play#0 command xdump
@ -1372,13 +1368,10 @@
Play#2 output Play#2 1 "uw" 6 0 0 -1
Play#2 output Play#2 1 "rad" 6 0 0 -1
Play#2 output Play#2 1 "access" 6 0 0 -1
Play#2 output Play#2 1 "mquota" 5 0 0 -1
Play#2 output Play#2 1 "path" 13 0 28 -1
Play#2 output Play#2 1 "follow" 8 0 0 -1
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 /35
Play#2 output Play#2 1 /32
Play#2 output Play#2 6 0 636
Play#2 input xdump meta plane
Play#2 command xdump
@ -1797,7 +1790,6 @@
Play#2 output Play#2 1 "NO_PLAGUE" 8 0 0 -1
Play#2 output Play#2 1 "RAILWAYS" 8 0 0 -1
Play#2 output Play#2 1 "RES_POP" 8 0 0 -1
Play#2 output Play#2 1 "SAIL" 8 0 0 -1
Play#2 output Play#2 1 "SUPER_BARS" 8 0 0 -1
Play#2 output Play#2 1 "TECH_POP" 8 0 0 -1
Play#2 output Play#2 1 "btu_build_rate" 12 0 0 -1
@ -1874,7 +1866,7 @@
Play#2 output Play#2 1 "trade_3" 12 0 0 -1
Play#2 output Play#2 1 "trade_ally_bonus" 12 0 0 -1
Play#2 output Play#2 1 "trade_ally_cut" 12 0 0 -1
Play#2 output Play#2 1 /111
Play#2 output Play#2 1 /110
Play#2 output Play#2 6 0 636
Play#2 input xdump meta meta
Play#2 command xdump
@ -15542,11 +15534,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 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 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 "" 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 "" 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 "" 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 "" 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 "" 10 -14 1 0 ""
Play#0 output Play#0 1 /5
Play#0 output Play#0 6 0 640
Play#0 input xdump plane *
@ -16004,7 +15996,7 @@
Play#0 input xdump version *
Play#0 command xdump
Play#0 output Play#0 1 XDUMP version 0
Play#0 output Play#0 1 "Wolfpack\\040Empire\\0404.3.32" 99 "Deity\\040forgot\\040to\\040edit\\040econfig" "careless@invalid" 64 32 60 0 0 1 "" "" "" 1 0 1 0 1 1 0 0 0 0 1 0 0 0 0 1 1 0 1 1 0 1 0 0 0.00120000 1440 640 15 5 120 0 1.00000 96.0000 2.00000 2.00000 192.000 48.0000 600000. 600000. 1.00000 127 100 1000.00 10.0000 300 3000.00 100.000 1.00000 2.00000 127 -0.00100000 1.00000 2.00000 127 -0.00100000 1.50000 3.00000 127 -0.00100000 40 8 8 8 1.75000 5.00000 1.00000 0.300000 0.100000 0.500000 1.00000 2 0.00250000 0.00833330 -0.0833333 -0.00833330 0.00177770 0.00600000 0.250000 0.000500000 0.00130000 0.00120000 0.00500000 50 0.00600000 0.00500000 0.00000 7200 7200 1.00000 0.990000 8 14 25 0.0250000 0.0350000 0.0500000 0.200000 0.100000
Play#0 output Play#0 1 "Wolfpack\\040Empire\\0404.3.32" 99 "Deity\\040forgot\\040to\\040edit\\040econfig" "careless@invalid" 64 32 60 0 0 1 "" "" "" 1 0 1 0 1 1 0 0 0 0 1 0 0 0 0 1 1 0 1 1 0 0 0 0.00120000 1440 640 15 5 120 0 1.00000 96.0000 2.00000 2.00000 192.000 48.0000 600000. 600000. 1.00000 127 100 1000.00 10.0000 300 3000.00 100.000 1.00000 2.00000 127 -0.00100000 1.00000 2.00000 127 -0.00100000 1.50000 3.00000 127 -0.00100000 40 8 8 8 1.75000 5.00000 1.00000 0.300000 0.100000 0.500000 1.00000 2 0.00250000 0.00833330 -0.0833333 -0.00833330 0.00177770 0.00600000 0.250000 0.000500000 0.00130000 0.00120000 0.00500000 50 0.00600000 0.00500000 0.00000 7200 7200 1.00000 0.990000 8 14 25 0.0250000 0.0350000 0.0500000 0.200000 0.100000
Play#0 output Play#0 1 /1
Play#0 output Play#0 6 0 640
Play#0 input xdump meta *
@ -16297,11 +16289,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 "" 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 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 ""
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 ""
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 ""
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 ""
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 ""
Play#1 output Play#1 1 /5
Play#1 output Play#1 6 0 640
Play#1 input xdump plane *
@ -16736,7 +16728,7 @@
Play#1 input xdump version *
Play#1 command xdump
Play#1 output Play#1 1 XDUMP version 0
Play#1 output Play#1 1 "Wolfpack\\040Empire\\0404.3.32" 99 "Deity\\040forgot\\040to\\040edit\\040econfig" "careless@invalid" 64 32 60 0 0 1 "" "" "" 1 0 1 0 1 1 0 0 0 0 1 0 0 0 0 1 1 0 1 1 0 1 0 0 0.00120000 1440 640 15 5 120 0 1.00000 96.0000 2.00000 2.00000 192.000 48.0000 600000. 600000. 1.00000 127 100 1000.00 10.0000 300 3000.00 100.000 1.00000 2.00000 127 -0.00100000 1.00000 2.00000 127 -0.00100000 1.50000 3.00000 127 -0.00100000 40 8 8 8 1.75000 5.00000 1.00000 0.300000 0.100000 0.500000 1.00000 2 0.00250000 0.00833330 -0.0833333 -0.00833330 0.00177770 0.00600000 0.250000 0.000500000 0.00130000 0.00120000 0.00500000 50 0.00600000 0.00500000 0.00000 7200 7200 1.00000 0.990000 8 14 25 0.0250000 0.0350000 0.0500000 0.200000 0.100000
Play#1 output Play#1 1 "Wolfpack\\040Empire\\0404.3.32" 99 "Deity\\040forgot\\040to\\040edit\\040econfig" "careless@invalid" 64 32 60 0 0 1 "" "" "" 1 0 1 0 1 1 0 0 0 0 1 0 0 0 0 1 1 0 1 1 0 0 0 0.00120000 1440 640 15 5 120 0 1.00000 96.0000 2.00000 2.00000 192.000 48.0000 600000. 600000. 1.00000 127 100 1000.00 10.0000 300 3000.00 100.000 1.00000 2.00000 127 -0.00100000 1.00000 2.00000 127 -0.00100000 1.50000 3.00000 127 -0.00100000 40 8 8 8 1.75000 5.00000 1.00000 0.300000 0.100000 0.500000 1.00000 2 0.00250000 0.00833330 -0.0833333 -0.00833330 0.00177770 0.00600000 0.250000 0.000500000 0.00130000 0.00120000 0.00500000 50 0.00600000 0.00500000 0.00000 7200 7200 1.00000 0.990000 8 14 25 0.0250000 0.0350000 0.0500000 0.200000 0.100000
Play#1 output Play#1 1 /1
Play#1 output Play#1 6 0 640
Play#1 input xdump meta *