Markus Armbruster
0bdcb5ee19
We maintain a few sector invariants in sct_prewrite(). Since the update bypasses sct_prewrite(), it needs to maintain them itself. The two should be consistent. sct_prewrite() resets work percentage of owned sectors to 100% when there are no civilians. The update's populace() resets it for unowned sectors as well, if they have military. Change sct_prewrite() to reset sct_work = 100 regardless of owner. Also change sct_oninit() to initialize sct_work = 100, so it doesn't change on first write. Update tests/smoke/fairland.xdump for the same reason. The massive test output differences are all due to sct_work. Inconsistencies with the update remain. They will be fixed next. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
285 lines
14 KiB
Text
285 lines
14 KiB
Text
Main startup
|
|
Main prng MT19937 1
|
|
Conn0 output Conn0 2 Empire server ready
|
|
Conn0 input user tester
|
|
Conn0 output Conn0 0 hello tester
|
|
Conn0 input coun red
|
|
Conn0 output Conn0 10 country red does not exist
|
|
Conn0 output Conn0 3 so long...
|
|
Conn1 output Conn1 2 Empire server ready
|
|
Conn1 input user tester
|
|
Conn1 output Conn1 0 hello tester
|
|
Conn1 input coun 1
|
|
Conn1 output Conn1 0 country name 1
|
|
Conn1 input pass 1
|
|
Conn1 output Conn1 0 password ok
|
|
Conn1 input play
|
|
Conn1 login 1 127.0.0.1 tester
|
|
Play#1 output Play#1 2 2
|
|
Play#1 output Play#1 1
|
|
Play#1 output Play#1 1 *** Server configured for testing ***
|
|
Play#1 output Play#1 1 *** If you see this in a game, it is misconfigured! ***
|
|
Play#1 output Play#1 6 0 640
|
|
Play#1 input fire se 2,0 3,-1
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 4.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector 3,-1 for 25 damage.
|
|
Play#1 output Play#1 6 0 639
|
|
Play#1 input fire se 2,0 -1,-1
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 5.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector -1,-1 for 28 damage.
|
|
Play#1 output Play#1 6 0 638
|
|
Play#1 input fire se 2,0 0,-2
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 5.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector 0,-2 for 30 damage.
|
|
Play#1 output Play#1 1 Crumble... SCREEEECH! Splash! Bridge falls at 0,-2!
|
|
Play#1 output Play#1 1 AARGH! tra train #0 tumbles to its doom!
|
|
Play#1 output Play#1 1 sam Sea Sparrow #0 lost!
|
|
Play#1 output Play#1 1 rad radar unit #1 lost!
|
|
Play#1 output Play#1 1 sam Sea Sparrow #1 lost!
|
|
Play#1 output Play#1 1 AARGH! jhb B-52 Strato-Fortress #2 tumbles to its doom!
|
|
Play#1 output Play#1 1 10kt fission warhead #2 lost!
|
|
Play#1 output Play#1 1 10kt fission warhead #0 sinks to the bottom of the sea!
|
|
Play#1 output Play#1 6 0 637
|
|
Play#1 input fire se 2,0 6,0
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 4.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector 6,0 for 46 damage.
|
|
Play#1 output Play#1 6 0 636
|
|
Play#1 input fire se 2,0 1,-3
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 5.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector 1,-3 for 23 damage.
|
|
Play#1 output Play#1 6 0 635
|
|
Play#1 input ctld
|
|
Play#1 output Play#1 1 Bye-bye
|
|
Play#1 logout 1
|
|
Play#1 output Play#1 3 so long...
|
|
Conn2 output Conn2 2 Empire server ready
|
|
Conn2 input user tester
|
|
Conn2 output Conn2 0 hello tester
|
|
Conn2 input coun POGO
|
|
Conn2 output Conn2 0 country name POGO
|
|
Conn2 input pass peter
|
|
Conn2 output Conn2 0 password ok
|
|
Conn2 input play
|
|
Conn2 login 0 127.0.0.1 tester
|
|
Play#0 output Play#0 2 2
|
|
Play#0 output Play#0 1
|
|
Play#0 output Play#0 1 *** Server configured for testing ***
|
|
Play#0 output Play#0 1 *** If you see this in a game, it is misconfigured! ***
|
|
Play#0 output Play#0 6 0 640
|
|
Play#0 input map *
|
|
Play#0 command map
|
|
Play#0 output Play#0 1 1---------0000000000
|
|
Play#0 output Play#0 1 09876543210123456789
|
|
Play#0 output Play#0 1 -5 . . . . . . + . . . -5
|
|
Play#0 output Play#0 1 -4 . . . . . . = . . . -4
|
|
Play#0 output Play#0 1 -3 . . . . . . . . . . -3
|
|
Play#0 output Play#0 1 -2 . . . . . . = . . . -2
|
|
Play#0 output Play#0 1 -1 . . . . . # = . . . -1
|
|
Play#0 output Play#0 1 0 . . . . . c f . @ = 0
|
|
Play#0 output Play#0 1 1 . . . @ = # = . . . 1
|
|
Play#0 output Play#0 1 2 . . . . = = = . . - 2
|
|
Play#0 output Play#0 1 3 . . . . # = # . . . 3
|
|
Play#0 output Play#0 1 4 . . . . . . . . . . 4
|
|
Play#0 output Play#0 1 1---------0000000000
|
|
Play#0 output Play#0 1 09876543210123456789
|
|
Play#0 output Play#0 6 0 640
|
|
Play#0 input ctld
|
|
Play#0 output Play#0 1 Bye-bye
|
|
Play#0 logout 0
|
|
Play#0 output Play#0 3 so long...
|
|
Main shutdown
|
|
Main startup
|
|
Main prng MT19937 1
|
|
Conn0 output Conn0 2 Empire server ready
|
|
Conn0 input user tester
|
|
Conn0 output Conn0 0 hello tester
|
|
Conn0 input coun red
|
|
Conn0 output Conn0 10 country red does not exist
|
|
Conn0 output Conn0 3 so long...
|
|
Conn1 output Conn1 2 Empire server ready
|
|
Conn1 input user tester
|
|
Conn1 output Conn1 0 hello tester
|
|
Conn1 input coun 1
|
|
Conn1 output Conn1 0 country name 1
|
|
Conn1 input pass 1
|
|
Conn1 output Conn1 0 password ok
|
|
Conn1 input play
|
|
Conn1 login 1 127.0.0.1 tester
|
|
Play#1 output Play#1 2 2
|
|
Play#1 output Play#1 1
|
|
Play#1 output Play#1 1 *** Server configured for testing ***
|
|
Play#1 output Play#1 1 *** If you see this in a game, it is misconfigured! ***
|
|
Play#1 output Play#1 6 0 635
|
|
Play#1 input desi 1,1 -
|
|
Play#1 command designate
|
|
Play#1 output Play#1 1 Crumble... SCREEEECH! Splash! Bridge falls at 3,1!
|
|
Play#1 output Play#1 6 0 634
|
|
Play#1 input fire se 2,0 8,2
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 5.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector 8,2 for 28 damage.
|
|
Play#1 output Play#1 6 0 633
|
|
Play#1 input desi 3,3 -
|
|
Play#1 command designate
|
|
Play#1 output Play#1 6 0 632
|
|
Play#1 input desi 1,1 #
|
|
Play#1 command designate
|
|
Play#1 output Play#1 6 0 631
|
|
Play#1 input fire se 2,0 -1,3
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 5.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector -1,3 for 23 damage.
|
|
Play#1 output Play#1 6 0 630
|
|
Play#1 input fire se 2,0 -3,1
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 4.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector -3,1 for 30 damage.
|
|
Play#1 output Play#1 6 0 629
|
|
Play#1 input fire se 2,0 8,2
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 5.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector 8,2 for 35 damage.
|
|
Play#1 output Play#1 6 0 628
|
|
Play#1 input fire se 2,0 1,1
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 5.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector 1,1 for 23 damage.
|
|
Play#1 output Play#1 6 0 627
|
|
Play#1 input fire se 2,0 8,2
|
|
Play#1 command fire
|
|
Play#1 output Play#1 1 Sector 2,0 ready to fire
|
|
Play#1 output Play#1 1 range is 4.00 (4.50)
|
|
Play#1 output Play#1 1 \007Kaboom!!!
|
|
Play#1 output Play#1 1 Shells hit sector 8,2 for 48 damage.
|
|
Play#1 output Play#1 6 0 626
|
|
Play#1 input ctld
|
|
Play#1 output Play#1 1 Bye-bye
|
|
Play#1 logout 1
|
|
Play#1 output Play#1 3 so long...
|
|
Conn2 output Conn2 2 Empire server ready
|
|
Conn2 input user tester
|
|
Conn2 output Conn2 0 hello tester
|
|
Conn2 input coun POGO
|
|
Conn2 output Conn2 0 country name POGO
|
|
Conn2 input pass peter
|
|
Conn2 output Conn2 0 password ok
|
|
Conn2 input play
|
|
Conn2 login 0 127.0.0.1 tester
|
|
Play#0 output Play#0 2 2
|
|
Play#0 output Play#0 1
|
|
Play#0 output Play#0 1 *** Server configured for testing ***
|
|
Play#0 output Play#0 1 *** If you see this in a game, it is misconfigured! ***
|
|
Play#0 output Play#0 6 0 640
|
|
Play#0 input map *
|
|
Play#0 command map
|
|
Play#0 output Play#0 1 1---------0000000000
|
|
Play#0 output Play#0 1 09876543210123456789
|
|
Play#0 output Play#0 1 -5 . . . . . . + . . . -5
|
|
Play#0 output Play#0 1 -4 . . . . . . = . . . -4
|
|
Play#0 output Play#0 1 -3 . . . . . . . . . . -3
|
|
Play#0 output Play#0 1 -2 . . . . . . = . . . -2
|
|
Play#0 output Play#0 1 -1 . . . . . # = . . . -1
|
|
Play#0 output Play#0 1 0 . . . . . c f . @ = 0
|
|
Play#0 output Play#0 1 1 . . . . . # . . . . 1
|
|
Play#0 output Play#0 1 2 . . . . . . . . . - 2
|
|
Play#0 output Play#0 1 3 . . . . # . # . . . 3
|
|
Play#0 output Play#0 1 4 . . . . . . . . . . 4
|
|
Play#0 output Play#0 1 1---------0000000000
|
|
Play#0 output Play#0 1 09876543210123456789
|
|
Play#0 output Play#0 6 0 640
|
|
Play#0 input cens * ?terr=1
|
|
Play#0 command census
|
|
Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970
|
|
Play#0 output Play#0 1 CENSUS del dst
|
|
Play#0 output Play#0 1 own sect eff prd mob uf uf old civ mil uw food work avail fall coa
|
|
Play#0 output Play#0 1 2 2,-4 = 100% 0 .. .. 100 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 1,-3 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 3,-3 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 0,-2 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 2 2,-2 = 100% 0 .. .. 100 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 -1,-1 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 1 1,-1 # 20% 0 .. .. 100 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 2 3,-1 = 80% 0 .. .. 80 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 2 6,0 @ 77% 0 .. .. 77 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 2 8,0 = 100% 0 .. .. 100 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 -3,1 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 -1,1 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 1 1,1 # 17% 0 .. .. 82 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 3,1 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 -2,2 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 0,2 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 2,2 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 2 -1,3 # 16% 0 .. .. 82 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 0 1,3 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 1 3,3 #- 20% 0 .. .. 100 0 0 0 100% 0 0 1
|
|
Play#0 output Play#0 1 20 sectors
|
|
Play#0 output Play#0 6 0 640
|
|
Play#0 input terr * 0
|
|
Play#0 command territory
|
|
Play#0 output Play#0 6 0 640
|
|
Play#0 input read 1
|
|
Play#0 command read
|
|
Play#0 output Play#0 1 No telegrams for 1 at the moment...
|
|
Play#0 output Play#0 6 0 640
|
|
Play#0 input read 2
|
|
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 Country #1 shelled sector 3,-1 for 25 damage.
|
|
Play#0 output Play#0 1 Country #1 shelled sector -1,-1 for 28 damage.
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at -1,-1!
|
|
Play#0 output Play#0 1 Country #1 shelled sector 6,0 for 46 damage.
|
|
Play#0 output Play#0 1 Country #1 shelled sector 1,-3 for 23 damage.
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge tower falls at 1,-3!
|
|
Play#0 output Play#0 1 AARGH! tra train #10 tumbles to its doom!
|
|
Play#0 output Play#0 1 sam Sea Sparrow #10 lost!
|
|
Play#0 output Play#0 1 rad radar unit #11 lost!
|
|
Play#0 output Play#0 1 sam Sea Sparrow #11 lost!
|
|
Play#0 output Play#0 1 AARGH! jhb B-52 Strato-Fortress #12 tumbles to its doom!
|
|
Play#0 output Play#0 1 10kt fission warhead #12 lost!
|
|
Play#0 output Play#0 1 10kt fission warhead #10 sinks to the bottom of the sea!
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at 3,-3!
|
|
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 Country #1 shelled sector 8,2 for 28 damage.
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at 2,2!
|
|
Play#0 output Play#0 1 Country #1 shelled sector -1,3 for 23 damage.
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at 1,3!
|
|
Play#0 output Play#0 1 Country #1 shelled sector -3,1 for 30 damage.
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge tower falls at -3,1!
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at -2,2!
|
|
Play#0 output Play#0 1 Country #1 shelled sector 8,2 for 35 damage.
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at 0,2!
|
|
Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at -1,1!
|
|
Play#0 output Play#0 1 Country #1 shelled sector 8,2 for 48 damage.
|
|
Play#0 output Play#0 6 0 640
|
|
Play#0 input ctld
|
|
Play#0 output Play#0 1 Bye-bye
|
|
Play#0 logout 0
|
|
Play#0 output Play#0 3 so long...
|
|
Main shutdown
|