X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.py;h=33149f30dcd454bec93b83d6f344a993d5121dfd;hp=f2b0bd0ec2bf70eb6ae6e6c6eb65013a58cff59c;hb=3590e0facac5ef56922642ab463ba1ccffd58464;hpb=ec0c6c4b54b2eac3f1de1768dd342d2ed1390f6f

diff --git a/src/sst.py b/src/sst.py
index f2b0bd0..33149f3 100644
--- a/src/sst.py
+++ b/src/sst.py
@@ -1283,7 +1283,7 @@ def torpedo(origin, bearing, dispersion, number, nburst):
 	if iquad==IHDOT:
 	    continue
 	# hit something 
-	if damaged(DSRSENS) and not game.condition=="docked":
+	if not damaged(DSRSENS) or game.condition == "docked":
 	    skip(1);	# start new line after text track 
 	if iquad in (IHE, IHF): # Hit our ship 
 	    skip(1)
@@ -1356,21 +1356,17 @@ def torpedo(origin, bearing, dispersion, number, nburst):
 	    if game.quad[bumpto.i][bumpto.j] == IHBLANK:
 		prout(_(" buffeted into black hole."))
 		deadkl(w, iquad, bumpto)
-		return None
 	    if game.quad[bumpto.i][bumpto.j] != IHDOT:
-		# can't move into object 
 		prout(_(" damaged but not destroyed."))
-		return None
-	    proutn(_(" damaged--"))
-	    enemy.kloc = bumpto
-            game.quad[w.i][w.j]=IHDOT
-            game.quad[bumpto.i][bumpto.j]=iquad
-            prout(_(" displaced by blast to Sector %s ") % bumpto)
-            for enemy in game.enemies:
-                enemy.kdist = enemy.kavgd = (game.sector-enemy.kloc).distance()
-            game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist))
+            else:
+                prout(_(" damaged-- displaced by blast to Sector %s ")%bumpto)
+                enemy.kloc = bumpto
+                game.quad[w.i][w.j]=IHDOT
+                game.quad[bumpto.i][bumpto.j]=iquad
+                for enemy in game.enemies:
+                    enemy.kdist = enemy.kavgd = (game.sector-enemy.kloc).distance()
+                game.enemies.sort(lambda x, y: cmp(x.kdist, y.kdist))
             return None
-	    break
 	elif iquad == IHB: # Hit a base 
 	    skip(1)
 	    prout(_("***STARBASE DESTROYED.."))
@@ -3525,7 +3521,7 @@ def tracktorpedo(origin, w, step, i, n, iquad):
 	if step == 1:
 	    if n != 1:
 		skip(1)
-		proutn(_("Track for %s torpedo number %d-  ") % (game.quad[origin.i][origin.j],i+1))
+		proutn(_("Track for torpedo number %d-  ") % (i+1))
 	    else:
 		skip(1)
 		proutn(_("Torpedo track- "))