load unload: Don't treat unowned sectors specially

load and unload silently skip unowned sectors, unlike lload and
lunload.  Probably goes back to Chainsaw option ALLYHARBOR.

Drop that.  Deities can now load and unload in unowned harbors and
canals.  Mortals are now notified they can't.

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

diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index 376845aa27f8f74556c750f938b97ee29ddf79c9..e2021034f5779dfe9c3ef22e1a8f01e596416f4e 100644 (file)
--- a/src/lib/commands/load.c
+++ b/src/lib/commands/load.c
@@ -113,8 +113,6 @@ load(void)
 
        if (!getsect(ship.shp_x, ship.shp_y, &sect))    /* XXX */
            continue;
-       if (!sect.sct_own)
-           continue;
        if (!player->owner) {
            if (ship.shp_own != player->cnum)
                continue;

diff --git a/tests/load-tend/02-load-POGO b/tests/load-tend/02-load-POGO
index 4f2ddac7adc8adfe0c32e8f97f77282d83fa26b1..0329591fc30f93f40c856cde9ae6837a32fada80 100644 (file)
--- a/tests/load-tend/02-load-POGO
+++ b/tests/load-tend/02-load-POGO
@@ -2,11 +2,9 @@
 |
 | Can load / unload regardless of ownership
 | except civilians still refuse to change allegiance
-| odd: except ships can't in unowned sectors
 |
 ||| load / unload commodities
 || #94 in neutral 2% h, #4 in unowned 2% h, #5 in 0% h, #90 dead: #94 works
-| odd: #4 doesn't work
 load f 94/4/5/90 1
 unload m 94/4/5/90 1
 || #80 in occupied 2% h: does not work
@@ -18,10 +16,10 @@ lunload m 94/54/90 1
 |
 ||| load / unload planes
 || #94 in neutral 2% h, #4 in unowned 2% h, #5 in 0% h, #90 dead: #94 works
-| odd: #4 doesn't work
 load plane 94 184
 load plane 4/5/90 4/5/180
 unload plane 94/4/5/90 194/154/155/190
+| odd: sam#154 dies
 || #94 in neutral sector, #54 in unowned sector, #90 dead: #94/54 work
 lload plane 94 214
 lload plane 90/54 210/34
@@ -30,10 +28,10 @@ lunload plane 94/54/90 224/204/220
 |
 ||| load / unload lands
 || #94 in neutral 2% h, #4 in unowned 2% h, #5 in 0% h, #90 dead: #94 works
-| odd: #4 doesn't work
 load land 94 214
 load land 4/5/90 4/5/210
 unload land 94/4/5/90 224/184/185/220
+| odd: linf#184 dies
 || #94 in neutral sector, #54 in unowned sector, #90 dead: #94/54 work
 lload land 94 244
 lload land 90/54 240/34

diff --git a/tests/load-tend/99-POGO b/tests/load-tend/99-POGO
index f3ca80586dfcbc8ea22df418771f20465fabbd92..d99e7b051071ac4fd80924f3fcb5ee447fccc6f4 100644 (file)
--- a/tests/load-tend/99-POGO
+++ b/tests/load-tend/99-POGO
@@ -8,9 +8,9 @@ lcarg *
 read 0
 read 1
 | BUG: POGO gives away sam#184/214 silently
-| BUG: POGO destroys sam#204 silently
+| BUG: POGO destroys sam#154/204 silently
 | BUG: POGO gives away linf#214/244 silently
-| BUG: POGO destroys linf#234 silently
+| BUG: POGO destroys linf#184/234 silently
 read 2
 read 3
 read 4

diff --git a/tests/load-tend/final.xdump b/tests/load-tend/final.xdump
index a70d137af5c0a5b85881d4f8060f1972f9eb242e..e70304b9ecd918e3a9522f76406702ff7d14d022 100644 (file)
--- a/tests/load-tend/final.xdump
+++ b/tests/load-tend/final.xdump
@@ -4,7 +4,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 2 2 0 12 2 0 0 0 0 0 0 0 0 2 0 0 0 100 1 12 0 0 0 0 0 2 100 124 1 1 0 9950 0 20 100 0 9950 0 0 200 0 0 0 0 0 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
 3 4 0 12 2 0 0 0 0 0 0 0 0 4 0 0 0 100 1 12 0 0 0 0 0 3 100 106 1 1 0 9950 0 20 100 0 9950 0 0 200 0 0 0 0 0 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
 4 6 0 12 2 0 0 0 0 0 0 0 0 6 0 0 0 100 1 12 0 0 0 0 0 4 100 100 1 1 0 9950 0 20 100 0 9950 0 0 200 0 0 0 0 0 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
-0 8 0 12 2 0 0 0 0 0 0 0 0 8 0 0 0 100 1 12 0 0 0 0 0 0 100 101 1 1 0 9950 0 20 99 0 9950 0 0 200 0 0 0 0 0 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
+0 8 0 12 2 0 0 0 0 0 0 0 0 8 0 0 0 100 1 12 0 0 0 0 0 0 100 102 1 1 0 9950 0 20 98 0 9950 0 0 200 0 0 0 0 0 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
 1 -6 0 12 2 0 0 0 0 0 0 0 0 -6 0 0 0 100 1 12 0 0 0 0 0 1 100 50 0 0 0 9999 0 10 100 0 9999 1 0 200 0 0 0 0 0 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
 1 -4 0 12 2 0 0 0 0 0 0 0 0 -4 0 0 0 100 1 12 0 0 0 0 0 1 110 50 0 0 0 9999 0 10 99 0 9999 0 0 200 0 0 0 0 0 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
 1 -2 0 12 2 0 0 0 0 0 0 0 0 -2 0 0 0 100 1 12 0 0 0 0 0 2 99 50 1 1 0 9999 0 10 100 0 9999 0 0 200 0 0 0 0 0 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
@@ -42,7 +42,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
 1 1 2 0 23 100 90 0 145 0 0 none 0 "a" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 2 0 2 () ""
 2 1 4 0 23 100 90 0 145 0 0 none 0 "a" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 4 0 3 () ""
 3 1 6 0 23 100 90 0 145 0 0 none 0 "a" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 6 0 4 () ""
-4 1 8 0 23 100 90 0 145 0 0 none 0 "a" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 8 0 5 () ""
+4 1 8 0 23 100 90 0 145 0 0 none 0 "a" 0 5 0 0 0 0 0 0 1 0 0 0 0 0 healthy 0 0 "" 8 0 5 () ""
 5 1 1 1 23 100 90 0 145 0 0 none 0 "a" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 1 1 1 () ""
 6 1 3 1 23 100 90 0 145 0 0 none 0 "a" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 3 1 2 () ""
 7 1 5 1 23 100 90 0 145 0 0 none 0 "a" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 5 1 3 () ""
@@ -119,7 +119,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
 1 1 2 0 27 100 60 0 180 0 0 none 0 "A" 2 0 -1 -1 () 0 0.00000
 2 1 4 0 27 100 60 0 180 0 0 none 0 "A" 2 0 -1 -1 () 0 0.00000
 3 1 6 0 27 100 60 0 180 0 0 none 0 "A" 2 0 -1 -1 () 0 0.00000
-4 1 8 0 27 100 60 0 180 0 0 none 0 "A" 2 0 -1 -1 () 0 0.00000
+4 1 8 0 27 100 60 0 180 0 0 none 0 "A" 2 0 4 -1 () 0 0.00000
 5 1 1 1 27 100 60 0 180 0 0 none 0 "A" 2 0 -1 -1 () 0 0.00000
 6 1 3 1 27 100 60 0 180 0 0 none 0 "A" 2 0 -1 -1 () 0 0.00000
 7 1 5 1 27 100 60 0 180 0 0 none 0 "A" 2 0 -1 -1 () 0 0.00000
@@ -260,7 +260,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
 151 2 2 0 27 100 60 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000
 152 3 4 0 27 100 60 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000
 153 1 6 0 27 100 60 0 180 6 0 none 0 "B" 2 0 3 -1 () 0 0.00000
-154 1 8 0 27 100 60 0 180 8 0 none 0 "B" 2 0 4 -1 () 0 0.00000
+154 0 8 0 27 0 60 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000
 155 1 1 1 27 100 60 0 180 1 1 none 0 "B" 2 0 5 -1 () 0 0.00000
 156 1 3 1 27 100 60 0 180 3 1 none 0 "B" 2 0 6 -1 () 0 0.00000
 157 1 5 1 27 100 60 0 180 5 1 none 0 "B" 2 0 7 -1 () 0 0.00000
@@ -313,7 +313,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 1 1 2 0 1 100 60 0 40 0 0 none 0 "A" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 2 1 4 0 1 100 60 0 40 0 0 none 0 "A" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 3 1 6 0 1 100 60 0 40 0 0 none 0 "A" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-4 1 8 0 1 100 60 0 40 0 0 none 0 "A" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+4 1 8 0 1 100 60 0 40 0 0 none 0 "A" 4 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 5 1 1 1 1 100 60 0 40 0 0 none 0 "A" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 6 1 3 1 1 100 60 0 40 0 0 none 0 "A" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 7 1 5 1 1 100 60 0 40 0 0 none 0 "A" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
@@ -406,7 +406,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 181 2 2 0 1 100 60 0 40 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 182 3 4 0 1 100 60 0 40 0 0 none 0 "" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 183 1 6 0 1 100 60 0 40 6 0 none 0 "B" 3 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-184 1 8 0 1 100 60 0 40 8 0 none 0 "B" 4 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+184 0 8 0 1 0 60 0 40 0 0 none 0 "" -1 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 185 1 1 1 1 100 60 0 40 1 1 none 0 "B" 5 0 42 () "" 0 0 0 0 0 0 0 0 9 0 0 0 0 0 healthy 0 -1 0
 186 1 3 1 1 100 60 0 40 3 1 none 0 "B" 6 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 187 1 5 1 1 100 60 0 40 5 1 none 0 "B" 7 0 42 () "" 0 6 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
@@ -527,11 +527,13 @@ timestamp owner type id x y
 0 1 3 231 2 0
 0 1 2 184 0 0
 0 4 2 194 0 0
+0 1 2 154 8 0
 0 1 2 214 0 0
 0 4 2 224 0 0
 0 1 2 204 8 0
 0 1 3 214 0 0
 0 4 3 224 0 0
+0 1 3 184 8 0
 0 1 3 244 0 0
 0 4 3 254 0 0
 0 1 3 234 8 0

diff --git a/tests/load-tend/journal.log b/tests/load-tend/journal.log
index eb7be8d8dea11cf7dcd7a6f39790fa9183ac203e..6ad2ee83076fc3a94dae8d13d0edc54d80e0f589 100644 (file)
--- a/tests/load-tend/journal.log
+++ b/tests/load-tend/journal.log
@@ -77,25 +77,31 @@
     Play#1 output Play#1 1 You don't own 2,0
     Play#1 output Play#1 1 You don't own 4,0
     Play#1 output Play#1 1 You don't own 6,0
+    Play#1 output Play#1 1 You don't own 8,0
     Play#1 output Play#1 1 The harbor at 1,1 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,1
     Play#1 output Play#1 1 You don't own 5,1
     Play#1 output Play#1 1 You don't own 7,1
+    Play#1 output Play#1 1 You don't own 9,1
     Play#1 output Play#1 1 Sector 1,3 is not a harbor or canal.
     Play#1 output Play#1 1 You don't own 2,4
     Play#1 output Play#1 1 You don't own 4,4
     Play#1 output Play#1 1 You don't own 6,4
+    Play#1 output Play#1 1 You don't own 8,4
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,5
     Play#1 output Play#1 1 You don't own 5,5
     Play#1 output Play#1 1 You don't own 7,5
+    Play#1 output Play#1 1 You don't own 9,5
     Play#1 output Play#1 1 You don't own 2,4
     Play#1 output Play#1 1 You don't own 4,4
     Play#1 output Play#1 1 You don't own 6,4
+    Play#1 output Play#1 1 You don't own 8,4
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,5
     Play#1 output Play#1 1 You don't own 5,5
     Play#1 output Play#1 1 You don't own 7,5
+    Play#1 output Play#1 1 You don't own 9,5
     Play#1 output Play#1 1 No ships affected
     Play#1 output Play#1 6 0 635
     Play#1 input load f 0/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/28/29/30/31/32/33/34/90/92/93/94/95 1
@@ -104,27 +110,33 @@
     Play#1 output Play#1 1 You don't own 2,0
     Play#1 output Play#1 1 You don't own 4,0
     Play#1 output Play#1 1 You don't own 6,0
+    Play#1 output Play#1 1 You don't own 8,0
     Play#1 output Play#1 1 The harbor at 1,1 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,1
     Play#1 output Play#1 1 You don't own 5,1
     Play#1 output Play#1 1 You don't own 7,1
+    Play#1 output Play#1 1 You don't own 9,1
     Play#1 output Play#1 1 Sector 1,3 is not a harbor or canal.
     Play#1 output Play#1 1 1 food loaded onto ls   landing ship (#15) at 0,4
     Play#1 output Play#1 1 You don't own 2,4
     Play#1 output Play#1 1 You don't own 4,4
     Play#1 output Play#1 1 You don't own 6,4
+    Play#1 output Play#1 1 You don't own 8,4
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,5
     Play#1 output Play#1 1 You don't own 5,5
     Play#1 output Play#1 1 You don't own 7,5
+    Play#1 output Play#1 1 You don't own 9,5
     Play#1 output Play#1 1 1 food loaded onto fb   fishing boat (#25) at 0,4
     Play#1 output Play#1 1 You don't own 2,4
     Play#1 output Play#1 1 You don't own 4,4
     Play#1 output Play#1 1 You don't own 6,4
+    Play#1 output Play#1 1 You don't own 8,4
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,5
     Play#1 output Play#1 1 You don't own 5,5
     Play#1 output Play#1 1 You don't own 7,5
+    Play#1 output Play#1 1 You don't own 9,5
     Play#1 output Play#1 1 1 food loaded onto ls   landing ship (#92) at 0,0
     Play#1 output Play#1 1 1 food loaded onto ls   landing ship (#93) at 0,0
     Play#1 output Play#1 1 5 ships loaded
@@ -171,27 +183,33 @@
     Play#1 output Play#1 1 You don't own 2,0
     Play#1 output Play#1 1 You don't own 4,0
     Play#1 output Play#1 1 You don't own 6,0
+    Play#1 output Play#1 1 You don't own 8,0
     Play#1 output Play#1 1 The harbor at 1,1 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,1
     Play#1 output Play#1 1 You don't own 5,1
     Play#1 output Play#1 1 You don't own 7,1
+    Play#1 output Play#1 1 You don't own 9,1
     Play#1 output Play#1 1 Sector 1,3 is not a harbor or canal.
     Play#1 output Play#1 1 1 food loaded onto ls   landing ship (#15) at 0,4
     Play#1 output Play#1 1 You don't own 2,4
     Play#1 output Play#1 1 You don't own 4,4
     Play#1 output Play#1 1 You don't own 6,4
+    Play#1 output Play#1 1 You don't own 8,4
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,5
     Play#1 output Play#1 1 You don't own 5,5
     Play#1 output Play#1 1 You don't own 7,5
+    Play#1 output Play#1 1 You don't own 9,5
     Play#1 output Play#1 1 1 food loaded onto fb   fishing boat (#25) at 0,4
     Play#1 output Play#1 1 You don't own 2,4
     Play#1 output Play#1 1 You don't own 4,4
     Play#1 output Play#1 1 You don't own 6,4
+    Play#1 output Play#1 1 You don't own 8,4
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,5
     Play#1 output Play#1 1 You don't own 5,5
     Play#1 output Play#1 1 You don't own 7,5
+    Play#1 output Play#1 1 You don't own 9,5
     Play#1 output Play#1 1 5 food loaded onto ls   landing ship (#92) at 0,0
     Play#1 output Play#1 1 5 food loaded onto ls   landing ship (#93) at 0,0
     Play#1 output Play#1 1 5 ships loaded
@@ -220,23 +238,29 @@
     Play#1 command unload
     Play#1 output Play#1 1 1 food loaded onto ls   landing ship (#0) at 0,0
     Play#1 output Play#1 1 You can't unload into an unfriendly harbor
+    Play#1 output Play#1 1 You can't unload into an unfriendly harbor
     Play#1 output Play#1 1 The harbor at 1,1 is not 2% efficient yet.
     Play#1 output Play#1 1 The harbor at 3,1 is not 2% efficient yet.
     Play#1 output Play#1 1 The harbor at 5,1 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly harbor
+    Play#1 output Play#1 1 You can't unload into an unfriendly harbor
     Play#1 output Play#1 1 Sector 1,3 is not a harbor or canal.
     Play#1 output Play#1 1 1 food loaded onto ls   landing ship (#15) at 0,4
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 3,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 5,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 1 food loaded onto fb   fishing boat (#25) at 0,4
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 3,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 5,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 3 ships unloaded
     Play#1 output Play#1 6 0 624
     Play#1 input unload f a -9
@@ -511,27 +535,33 @@
     Play#1 output Play#1 1 You don't own 2,0
     Play#1 output Play#1 1 You don't own 4,0
     Play#1 output Play#1 1 You don't own 6,0
+    Play#1 output Play#1 1 You don't own 8,0
     Play#1 output Play#1 1 The harbor at 1,1 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,1
     Play#1 output Play#1 1 You don't own 5,1
     Play#1 output Play#1 1 You don't own 7,1
+    Play#1 output Play#1 1 You don't own 9,1
     Play#1 output Play#1 1 Sector 1,3 is not a harbor or canal.
     Play#1 output Play#1 1 1 military unloaded from ls   landing ship (#15) at 0,4
     Play#1 output Play#1 1 You don't own 2,4
     Play#1 output Play#1 1 You don't own 4,4
     Play#1 output Play#1 1 You don't own 6,4
+    Play#1 output Play#1 1 You don't own 8,4
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,5
     Play#1 output Play#1 1 You don't own 5,5
     Play#1 output Play#1 1 You don't own 7,5
+    Play#1 output Play#1 1 You don't own 9,5
     Play#1 output Play#1 1 1 military unloaded from fb   fishing boat (#25) at 0,4
     Play#1 output Play#1 1 You don't own 2,4
     Play#1 output Play#1 1 You don't own 4,4
     Play#1 output Play#1 1 You don't own 6,4
+    Play#1 output Play#1 1 You don't own 8,4
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You don't own 3,5
     Play#1 output Play#1 1 You don't own 5,5
     Play#1 output Play#1 1 You don't own 7,5
+    Play#1 output Play#1 1 You don't own 9,5
     Play#1 output Play#1 1 3 ships loaded
     Play#1 output Play#1 6 0 597
     Play#1 input load m a -4
@@ -558,27 +588,33 @@
     Play#1 output Play#1 1 3 military unloaded from ls   landing ship (#1) at 2,0
     Play#1 output Play#1 1 3 military unloaded from ls   landing ship (#2) at 4,0
     Play#1 output Play#1 1 You can't unload into an unfriendly harbor
+    Play#1 output Play#1 1 You can't unload into an unfriendly harbor
     Play#1 output Play#1 1 The harbor at 1,1 is not 2% efficient yet.
     Play#1 output Play#1 1 The harbor at 3,1 is not 2% efficient yet.
     Play#1 output Play#1 1 The harbor at 5,1 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly harbor
+    Play#1 output Play#1 1 You can't unload into an unfriendly harbor
     Play#1 output Play#1 1 Sector 1,3 is not a harbor or canal.
     Play#1 output Play#1 1 1 military unloaded from ls   landing ship (#15) at 0,4
     Play#1 output Play#1 1 3 military unloaded from ls   landing ship (#16) at 2,4
     Play#1 output Play#1 1 3 military unloaded from ls   landing ship (#17) at 4,4
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 3,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 5,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 1 military unloaded from fb   fishing boat (#25) at 0,4
     Play#1 output Play#1 1 3 military unloaded from fb   fishing boat (#26) at 2,4
     Play#1 output Play#1 1 3 military unloaded from fb   fishing boat (#27) at 4,4
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 3,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 5,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 9 ships unloaded
     Play#1 output Play#1 6 0 593
     Play#1 input unload m a -2
@@ -601,21 +637,27 @@
     Play#1 input unload m 0/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/28/29/30/31/32/33/34/90/92/93/94/95 0
     Play#1 command unload
     Play#1 output Play#1 1 You can't unload into an unfriendly harbor
+    Play#1 output Play#1 1 You can't unload into an unfriendly harbor
     Play#1 output Play#1 1 The harbor at 1,1 is not 2% efficient yet.
     Play#1 output Play#1 1 The harbor at 3,1 is not 2% efficient yet.
     Play#1 output Play#1 1 The harbor at 5,1 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly harbor
+    Play#1 output Play#1 1 You can't unload into an unfriendly harbor
     Play#1 output Play#1 1 Sector 1,3 is not a harbor or canal.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 3,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 5,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 3,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 5,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 No ships affected
     Play#1 output Play#1 6 0 590
     Play#1 input unload m 0/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/28/29/30/31/32/33/34/90/92/93/94/95 1
@@ -624,27 +666,33 @@
     Play#1 output Play#1 1 1 military unloaded from ls   landing ship (#1) at 2,0
     Play#1 output Play#1 1 1 military unloaded from ls   landing ship (#2) at 4,0
     Play#1 output Play#1 1 You can't unload into an unfriendly harbor
+    Play#1 output Play#1 1 You can't unload into an unfriendly harbor
     Play#1 output Play#1 1 The harbor at 1,1 is not 2% efficient yet.
     Play#1 output Play#1 1 The harbor at 3,1 is not 2% efficient yet.
     Play#1 output Play#1 1 The harbor at 5,1 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly harbor
+    Play#1 output Play#1 1 You can't unload into an unfriendly harbor
     Play#1 output Play#1 1 Sector 1,3 is not a harbor or canal.
     Play#1 output Play#1 1 1 military unloaded from ls   landing ship (#15) at 0,4
     Play#1 output Play#1 1 1 military unloaded from ls   landing ship (#16) at 2,4
     Play#1 output Play#1 1 1 military unloaded from ls   landing ship (#17) at 4,4
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 3,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 5,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 1 military unloaded from fb   fishing boat (#25) at 0,4
     Play#1 output Play#1 1 1 military unloaded from fb   fishing boat (#26) at 2,4
     Play#1 output Play#1 1 1 military unloaded from fb   fishing boat (#27) at 4,4
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 The city at 1,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 3,5 is not 2% efficient yet.
     Play#1 output Play#1 1 The city at 5,5 is not 2% efficient yet.
     Play#1 output Play#1 1 You can't unload into an unfriendly city
+    Play#1 output Play#1 1 You can't unload into an unfriendly city
     Play#1 output Play#1 1 9 ships unloaded
     Play#1 output Play#1 6 0 589
     Play#1 input unload m a 1
@@ -1948,14 +1996,16 @@
     Play#0 input load f 94/4/5/90 1
     Play#0 command load
     Play#0 output Play#0 1 1 food loaded onto ls   landing ship (#94) at 0,0
+    Play#0 output Play#0 1 1 food loaded onto ls   landing ship (#4) at 8,0
     Play#0 output Play#0 1 The harbor at 1,1 is not 2% efficient yet.
-    Play#0 output Play#0 1 1 ship loaded
+    Play#0 output Play#0 1 2 ships loaded
     Play#0 output Play#0 6 0 639
     Play#0 input unload m 94/4/5/90 1
     Play#0 command unload
     Play#0 output Play#0 1 1 military unloaded from ls   landing ship (#94) at 0,0
+    Play#0 output Play#0 1 1 military unloaded from ls   landing ship (#4) at 8,0
     Play#0 output Play#0 1 The harbor at 1,1 is not 2% efficient yet.
-    Play#0 output Play#0 1 1 ship unloaded
+    Play#0 output Play#0 1 2 ships unloaded
     Play#0 output Play#0 6 0 638
     Play#0 input load c 80 1
     Play#0 command load
@@ -1986,15 +2036,18 @@
     Play#0 output Play#0 6 0 633
     Play#0 input load plane 4/5/90 4/5/180
     Play#0 command load
+    Play#0 output Play#0 1 sam  Sea Sparrow #4 loaded onto ls   landing ship (#4) at 8,0.
     Play#0 output Play#0 1 The harbor at 1,1 is not 2% efficient yet.
-    Play#0 output Play#0 1 No ships affected
+    Play#0 output Play#0 1 1 ship loaded
     Play#0 output Play#0 6 0 632
     Play#0 input unload plane 94/4/5/90 194/154/155/190
     Play#0 command unload
     Play#0 output Play#0 1 sam  Sea Sparrow #194 unloaded from ls   landing ship (#94) at 0,0.
     Play#0 output Play#0 1 You can only load light planes, helos, xtra-light, or missiles onto ships.
+    Play#0 output Play#0 1 sam  Sea Sparrow #154 unloaded from ls   landing ship (#4) at 8,0.
+    Play#0 output Play#0 1 You can only load light planes, helos, xtra-light, or missiles onto ships.
     Play#0 output Play#0 1 The harbor at 1,1 is not 2% efficient yet.
-    Play#0 output Play#0 1 1 ship unloaded
+    Play#0 output Play#0 1 2 ships unloaded
     Play#0 output Play#0 6 0 631
     Play#0 input lload plane 94 214
     Play#0 command lload
@@ -2022,14 +2075,17 @@
     Play#0 output Play#0 6 0 627
     Play#0 input load land 4/5/90 4/5/210
     Play#0 command load
+    Play#0 output Play#0 1 WARNING: linf light infantry #4 is out of supply!
+    Play#0 output Play#0 1 linf light infantry #4 loaded onto ls   landing ship (#4) at 8,0.
     Play#0 output Play#0 1 The harbor at 1,1 is not 2% efficient yet.
-    Play#0 output Play#0 1 No ships affected
+    Play#0 output Play#0 1 1 ship loaded
     Play#0 output Play#0 6 0 626
     Play#0 input unload land 94/4/5/90 224/184/185/220
     Play#0 command unload
     Play#0 output Play#0 1 linf light infantry #224 unloaded from ls   landing ship (#94) at 0,0.
+    Play#0 output Play#0 1 linf light infantry #184 unloaded from ls   landing ship (#4) at 8,0.
     Play#0 output Play#0 1 The harbor at 1,1 is not 2% efficient yet.
-    Play#0 output Play#0 1 1 ship unloaded
+    Play#0 output Play#0 1 2 ships unloaded
     Play#0 output Play#0 6 0 625
     Play#0 input lload land 94 244
     Play#0 command lload
@@ -2706,7 +2762,7 @@
     Play#0 output Play#0 1   2    2,0    h    2%       0 .. ..      100  124    0  100 100%    0    0   1
     Play#0 output Play#0 1   3    4,0    h    2%       0 .. ..      100  106    0  100 100%    0    0   1
     Play#0 output Play#0 1   4    6,0    h    2%       0 .. ..      100  100    0  100 100%    0    0   1
-    Play#0 output Play#0 1   0    8,0    h    2%       0 .. ..      100  101    0   99 100%    0    0   1
+    Play#0 output Play#0 1   0    8,0    h    2%       0 .. ..      100  102    0   98 100%    0    0   1
     Play#0 output Play#0 1   1   -3,1    h    0%       0 .. ..      100  100    0  100 100%    0    0   1
     Play#0 output Play#0 1   1    1,1    h    0%       0 .. ..      100  106    0   91 100%    0    0   1
     Play#0 output Play#0 1   2    3,1    h    0%       0 .. ..      100  106    0  100 100%    0    0   1
@@ -2774,7 +2830,7 @@
     Play#0 output Play#0 1   1    1 ls   landing shi    2,0    a  100%   0   0   0   0  0  0  0  0  90  145
     Play#0 output Play#0 1   1    2 ls   landing shi    4,0    a  100%   0   0   0   0  0  0  0  0  90  145
     Play#0 output Play#0 1   1    3 ls   landing shi    6,0    a  100%   0   6   0   0  0  0  1  1  90  145
-    Play#0 output Play#0 1   1    4 ls   landing shi    8,0    a  100%   0   6   0   0  0  0  1  1  90  145
+    Play#0 output Play#0 1   1    4 ls   landing shi    8,0    a  100%   0   5   0   1  0  0  1  1  90  145
     Play#0 output Play#0 1   1    5 ls   landing shi    1,1    a  100%   0   6   0   0  0  0  1  1  90  145
     Play#0 output Play#0 1   1    6 ls   landing shi    3,1    a  100%   0   6   0   0  0  0  1  1  90  145
     Play#0 output Play#0 1   1    7 ls   landing shi    5,1    a  100%   0   6   0   0  0  0  1  1  90  145
@@ -2850,7 +2906,7 @@
     Play#0 output Play#0 1    1 ls      2,0    a 100%   0   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1    2 ls      4,0    a 100%   0   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1    3 ls      6,0    a 100%   0   6   0   0   0   0   0   0   0   0   0   0   0
-    Play#0 output Play#0 1    4 ls      8,0    a 100%   0   6   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    4 ls      8,0    a 100%   0   5   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1    5 ls      1,1    a 100%   0   6   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1    6 ls      3,1    a 100%   0   6   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1    7 ls      5,1    a 100%   0   6   0   0   0   0   0   0   0   0   0   0   0
@@ -2926,7 +2982,7 @@
     Play#0 output Play#0 1   1    1 sam  Sea Sparrow       2,0    A  100%  60  18  180   2    0
     Play#0 output Play#0 1   1    2 sam  Sea Sparrow       4,0    A  100%  60  18  180   2    0
     Play#0 output Play#0 1   1    3 sam  Sea Sparrow       6,0    A  100%  60  18  180   2    0
-    Play#0 output Play#0 1   1    4 sam  Sea Sparrow       8,0    A  100%  60  18  180   2    0
+    Play#0 output Play#0 1   1    4 sam  Sea Sparrow       8,0    A  100%  60  18  180   2    0    4S
     Play#0 output Play#0 1   1    5 sam  Sea Sparrow       1,1    A  100%  60  18  180   2    0
     Play#0 output Play#0 1   1    6 sam  Sea Sparrow       3,1    A  100%  60  18  180   2    0
     Play#0 output Play#0 1   1    7 sam  Sea Sparrow       5,1    A  100%  60  18  180   2    0
@@ -3065,7 +3121,6 @@
     Play#0 output Play#0 1   2  151 sam  Sea Sparrow       2,0       100%  60  18  180   2    0
     Play#0 output Play#0 1   3  152 sam  Sea Sparrow       4,0       100%  60  18  180   2    0
     Play#0 output Play#0 1   1  153 sam  Sea Sparrow       6,0    B  100%  60  18  180   2    0    3S
-    Play#0 output Play#0 1   1  154 sam  Sea Sparrow       8,0    B  100%  60  18  180   2    0    4S
     Play#0 output Play#0 1   1  155 sam  Sea Sparrow       1,1    B  100%  60  18  180   2    0    5S
     Play#0 output Play#0 1   1  156 sam  Sea Sparrow       3,1    B  100%  60  18  180   2    0    6S
     Play#0 output Play#0 1   1  157 sam  Sea Sparrow       5,1    B  100%  60  18  180   2    0    7S
@@ -3109,7 +3164,7 @@
     Play#0 output Play#0 1   1  231 sam  Sea Sparrow      -2,0       100%  60  18  180   2    0  121L
     Play#0 output Play#0 1   1  232 sam  Sea Sparrow      -2,0       100%  60  18  180   2    0
     Play#0 output Play#0 1   1  233 sam  Sea Sparrow      -2,0       100%  60  18  180   2    0  123L
-    Play#0 output Play#0 1 187 planes
+    Play#0 output Play#0 1 186 planes
     Play#0 output Play#0 6 0 640
     Play#0 input land *
     Play#0 command land
@@ -3118,7 +3173,7 @@
     Play#0 output Play#0 1   1    1 linf light infa    2,0    A  100%   6   0  60   0  40  42%  0  0
     Play#0 output Play#0 1   1    2 linf light infa    4,0    A  100%   6   0  60   0  40  42%  0  0
     Play#0 output Play#0 1   1    3 linf light infa    6,0    A  100%   6   0  60   0  40  42%  0  0
-    Play#0 output Play#0 1   1    4 linf light infa    8,0    A  100%   6   0  60   0  40  42%  0  0
+    Play#0 output Play#0 1   1    4 linf light infa    8,0    A  100%   6   0  60   0  40  42%  0  0    4S
     Play#0 output Play#0 1   1    5 linf light infa    1,1    A  100%   6   0  60   0  40  42%  0  0
     Play#0 output Play#0 1   1    6 linf light infa    3,1    A  100%   6   0  60   0  40  42%  0  0
     Play#0 output Play#0 1   1    7 linf light infa    5,1    A  100%   6   0  60   0  40  42%  0  0
@@ -3198,7 +3253,6 @@
     Play#0 output Play#0 1   2  181 linf light infa    2,0       100%   0   0  60   0  40  42%  0  0
     Play#0 output Play#0 1   3  182 linf light infa    4,0       100%   6   0  60   0  40  42%  0  0
     Play#0 output Play#0 1   1  183 linf light infa    6,0    B  100%   6   0  60   0  40  42%  0  0    3S
-    Play#0 output Play#0 1   1  184 linf light infa    8,0    B  100%   6   0  60   0  40  42%  0  0    4S
     Play#0 output Play#0 1   1  185 linf light infa    1,1    B  100%   0   0  60   9  40  42%  0  0    5S
     Play#0 output Play#0 1   1  186 linf light infa    3,1    B  100%   0   0  60   0  40  42%  0  0    6S
     Play#0 output Play#0 1   1  187 linf light infa    5,1    B  100%   6   0  60   0  40  42%  0  0    7S
@@ -3257,7 +3311,7 @@
     Play#0 output Play#0 1   1  350 sup  supply        1,-1      100%   1   0  60   1  50  42%  0  0  200S
     Play#0 output Play#0 1   1  351 sup  supply        1,-1      100%  20   0  60   1  50  42%  0  0  200S
     Play#0 output Play#0 1   1  352 sup  supply        1,-1      100%   0   0  60   0  50  42%  0  0  201S
-    Play#0 output Play#0 1 143 units
+    Play#0 output Play#0 1 142 units
     Play#0 output Play#0 6 0 640
     Play#0 input lcarg *
     Play#0 command lcargo
@@ -3346,7 +3400,6 @@
     Play#0 output Play#0 1  181 linf    2,0       100%   0   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  182 linf    4,0       100%   0   6   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  183 linf    6,0    B  100%   0   6   0   0   0   0   0   0   0   0   0   0   0
-    Play#0 output Play#0 1  184 linf    8,0    B  100%   0   6   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  185 linf    1,1    B  100%   0   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  186 linf    3,1    B  100%   0   0   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  187 linf    5,1    B  100%   0   6   0   0   0   0   0   0   0   0   0   0   0
@@ -3405,7 +3458,7 @@
     Play#0 output Play#0 1  350 sup     1,-1      100%   0   1   0   5   9   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  351 sup     1,-1      100%   0  20   0   0   0   0   0   0   0   0   0   0   0
     Play#0 output Play#0 1  352 sup     1,-1      100%   0   0   0   0  10   0   0   0   0   0   0   0   0
-    Play#0 output Play#0 1 143 units
+    Play#0 output Play#0 1 142 units
     Play#0 output Play#0 6 0 640
     Play#0 input read 0
     Play#0 command read
@@ -3415,12 +3468,15 @@
     Play#0 command read
     Play#0 output Play#0 1
     Play#0 output Play#0 1 > BULLETIN from POGO, (#0)  dated Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1 POGO loaded 1 food onto ls   landing ship (#4) at 8,0
     Play#0 output Play#0 1 POGO unloaded 1 military from ls   landing ship (#94) at 0,0
     Play#0 output Play#0 1 POGO loaded 1 food onto tra  train #54 at 8,0
     Play#0 output Play#0 1 POGO unloaded 1 military from tra  train #94 at 0,0
+    Play#0 output Play#0 1 POGO sam  Sea Sparrow #4 loaded on your ls   landing ship (#4) at 8,0
     Play#0 output Play#0 1 POGO sam  Sea Sparrow #194 unloaded in your harbor at 0,0
     Play#0 output Play#0 1 POGO sam  Sea Sparrow #34 loaded on tra  train #54 at 8,0
     Play#0 output Play#0 1 POGO sam  Sea Sparrow #224 unloaded at your sector at 0,0
+    Play#0 output Play#0 1 POGO linf light infantry #4 loaded on your ls   landing ship (#4) at 8,0
     Play#0 output Play#0 1 POGO linf light infantry #224 unloaded in your harbor at 0,0
     Play#0 output Play#0 1 POGO linf light infantry #34 loaded on your tra  train #54 at 8,0
     Play#0 output Play#0 1 POGO linf light infantry #254 unloaded in your harbor at 0,0