Reintroduce hittem fix, with regression-test rebuilds as required.

diff --git a/sst.py b/sst.py
index e64abfa65386a6170d0318fccecedd1e2eff7af6..599fe45fdcf977e9124c299c52fb22e0dd1b375e 100755 (executable)
--- a/sst.py
+++ b/sst.py
@@ -1832,7 +1832,6 @@ def hittem(hits):
                 finish(FWON)
             if game.alldone:
                 return
-            kk -= 1        # don't do the increment
             continue
         else: # decide whether or not to emasculate klingon
             if kpow > 0 and withprob(0.9) and kpow <= randreal(0.4, 0.8)*kpini:

diff --git a/test/test2.chk b/test/test2.chk
index 1804de6f3662d2348b3c08c125e523e4049901e1..33e4010764e46dd924aa5a37c118899599d125d3 100644 (file)
--- a/test/test2.chk
+++ b/test/test2.chk
@@ -34,30 +34,27 @@ Shields lowered.
 
 219 unit hit on Klingon at Sector 4 - 7
 ***Klingon at Sector 4 - 7 destroyed.
-192 unit hit on Klingon at Sector 10 - 1
-***Mr. Spock-  "Captain, the vessel at Sector 10 - 1
-   has just lost its firepower."
-708 unit hit on Klingon at Sector 6 - 7
+276 unit hit on Klingon at Sector 6 - 7
 ***Klingon at Sector 6 - 7 destroyed.
-244 unit hit on Klingon at Sector 10 - 1
-***Klingon at Sector 10 - 1 destroyed.
-271 unit hit on Klingon at Sector 7 - 2
+753 unit hit on Commander at Sector 6 - 3
+***Commander at Sector 6 - 3 destroyed.
+245 unit hit on Klingon at Sector 8 - 6
+***Klingon at Sector 8 - 6 destroyed.
+265 unit hit on Klingon at Sector 7 - 2
 ***Klingon at Sector 7 - 2 destroyed.
-279 unit hit on Commander at Sector 6 - 3
+265 unit hit on Klingon at Sector 9 - 5
+***Klingon at Sector 9 - 5 destroyed.
 2175 expended on empty space.
 
 Shields raised.
 Weapons officer Sulu-  "Phasers overheated, sir."
 
-27 unit hit from Klingon at 8 - 6
 
-26 unit hit from Klingon at 9 - 5
-
-
-[CONTINUE?]
 
 
+It is stardate 2149.8.
 
+[CONTINUE?]
 
 
 
@@ -81,7 +78,6 @@ Weapons officer Sulu-  "Phasers overheated, sir."
 
 
 
-It is stardate 2149.8.
 
 The Enterprise has been destroyed in battle.
 

diff --git a/test/test9.chk b/test/test9.chk
index 2d0396ac7020a22e2a34c914c35bfad0a53e6951..ca0648a38a1a7d6a9882a12d4f5c34d6bbed882c 100644 (file)
--- a/test/test9.chk
+++ b/test/test9.chk
@@ -99,54 +99,50 @@ Phasers locked on target. Energy available: 3062.93
 
 129 unit hit on Klingon at Sector 10 - 5
 ***Klingon at Sector 10 - 5 destroyed.
-205 unit hit on Klingon at Sector 3 - 3
-***Klingon at Sector 3 - 3 destroyed.
+218 unit hit on Klingon at Sector 5 - 8
+***Klingon at Sector 5 - 8 destroyed.
 158 unit hit on Klingon at Sector 4 - 8
 ***Klingon at Sector 4 - 8 destroyed.
 436 expended on empty space.
 
-101 unit hit from Klingon at 5 - 8
+79 unit hit from Klingon at 7 - 4
 
-80 unit hit from Klingon at 7 - 4
+40 unit hit from Klingon at 3 - 3
 
 
-Energy left 1557    shields down 100%,   torpedoes left 10
+Energy left 1619    shields down 100%,   torpedoes left 10
 COMMAND> m a 7 10
 
 
-95 unit hit from Klingon at 5 - 8
+62 unit hit from Klingon at 7 - 4
 
-64 unit hit from Klingon at 7 - 4
+35 unit hit from Klingon at 3 - 3
 
 
-Energy left 1398    shields down 100%,   torpedoes left 10
+Energy left 1520    shields down 100%,   torpedoes left 10
 COMMAND> cloak
 Switch cloaking device on? y
 Engineer Scott- "Cloaking device has engaging, Sir..."
 
-88 unit hit from Klingon at 5 - 8
+48 unit hit from Klingon at 7 - 4
 
-54 unit hit from Klingon at 7 - 4
+34 unit hit from Klingon at 3 - 3
 
 
-Energy left 1218    shields down 100%,   torpedoes left 10
+Energy left 1400    shields down 100%,   torpedoes left 10
 Engineer Scott- "Cloaking device has engaged, Sir."
 COMMAND> phasers
 
 Manual or automatic? a
-Phasers locked on target. Energy available: 1218.12
-189 units required. Units to fire= 189
+Phasers locked on target. Energy available: 1400.68
+231 units required. Units to fire= 189
 
-62 unit hit on Klingon at Sector 5 - 8
-***Klingon at Sector 5 - 8 destroyed.
-28 unit hit on Klingon at Sector 7 - 4
-***Mr. Spock-  "Captain, the vessel at Sector 7 - 4
-   has just lost its firepower."
-79 expended on empty space.
+58 unit hit on Klingon at Sector 7 - 4
+***Klingon at Sector 7 - 4 destroyed.
 COMMAND> capture
-Klingon captain at 7 - 4 surrenders.
-162 Klingons commit suicide rather than be taken captive.
-37 captives taken
+Klingon captain at 3 - 3 surrenders.
+46 Klingons commit suicide rather than be taken captive.
+153 captives taken
 ***Klingon at Sector 7 - 10 destroyed.
 COMMAND> cloak off
 Engineer Scott- "Aye, Sir."