Consertar um monte de coisa

src/main.py

@@ -2,14 +2,13 @@
 import turtle as tl
 import random
 
-posx = [-200, -100, 0, 100, 200]
+posx = [0, 1, 2, 3, 4]
-posy = [-200, -100, 0, 100, 200]
+posy = [0, 1, 2, 3, 4]
 postiro = []
-for i in range(5):
+for i in range(len(posx)):
-    for j in range(5):
+    for j in range(len(posy)):
-        postiro.append(f"{(i-2) * 100} {(j-2) * 100}")
+        postiro.append(f"{i-2} {j-2}")
-        print((i-2) * 100, (j-2) * 100)
+
-#postiro = ['-200 -200', '-200 -100', '-200 0', '-200 100', '-200 200',  '-100 -200', '-100 -100', '-100 0', '-100 100', '-100 200',  '0 -200', '0 -100', '0 0', '0 100', '0 200',  '100 -200', '100 -100', '100 0', '100 100', '100 200',  '200 -200', '200 -100', '200 0', '200 100', '200 200']
 
 tl.setup(650,650,None,None)
 tl.title("Naval Battle 1943 Loading...")
@@ -39,12 +38,13 @@ linhax(-300,300)
 #linhas X
 for i in range(5):
     linhax(-300, (i-2)*100)
-    tl.write(str((i-2) * 100), False, align="right")
+    tl.write(str(i), False, align="right")
 
 #linhas Y
 for i in range(5):
     linhay((i-2)*100, -300)
-    tl.write(str((i-2) * 100), False, align="right")
+    tl.write(str(i), False, align="right")
+
 #Tabuleiro pronto
 tl.title("Naval Battle 1943")
 tl.hideturtle()
@@ -52,44 +52,44 @@ boat = tl.Turtle()
 boat.up(); boat.goto(0,0); boat.left(90)
 
 #Enemies
-e1 = tl.Turtle()
+AMOUNT_OF_ENEMIES = 3
-e1.up()
+enemies = []
-e1.color("red")
-e1.goto(-100,-100)
 
+for i in range(AMOUNT_OF_ENEMIES):
+    enemy = tl.Turtle()
+    enemy.up()
+    enemy.color("red")
+    pos = [random.choice(posy), random.choice(posy)]
+    enemy.goto((pos[0] - 2) * 100, (pos[1] - 2) * 100)
     
-e2 = tl.Turtle()
+    enemies.append([enemy, pos])
-e2.up()
-e2.color("red")
-e2.goto(random.choice(posx), random.choice(posy))
-if e1.pos() == e2.pos():
-    e2.goto(random.choice(posx), random.choice(posy))
-
-
-e3 = tl.Turtle()
-e3.up()
-e3.color("red")
-e3.goto(random.choice(posx), random.choice(posy))
-if e1.pos() == e3.pos():
-    e3.goto(random.choice(posx), random.choice(posy))
-if e2.pos() == e3.pos():
-    e3.goto(random.choice(posx), random.choice(posy))
 
 #partidas
 win = False
 while win == False:
     tirox = tl.numinput("linha X do disparo","Em qual quadrante X devemos disparar a artilharia")
     tiroy = tl.numinput("linha Y do disparo","Em qual quadrante Y devemos disparar a artilharia")
-    if (tirox,tiroy) == e1.pos():
+    
-        boat.goto(tirox,tiroy)
+    if tirox == None or tiroy == None:
+        tl.exitonclick()
+    
+    boat.goto((tirox - 2) * 100, (tiroy - 2) * 100)
+    
+    acerto = False
+    for enemy in enemies:
+        if [tirox,tiroy] == enemy[1]:
+            hit_enemy: list[tl.Turtle, list[int, int]] = enemy
+            acerto = True
+            break
+    if acerto:
         print("Acerto!")
         boat.write("U-boat Afundado\n Capitão!",False,align="center")
-        break
+        hit_enemy[0].hideturtle()
+        enemies.remove(hit_enemy)
     else:
-        boat.goto(tirox,tiroy)
         print("errou!")
         boat.write("Erramos o alvo\n Capitão!",False,align="center")
-        continue
+    acerto = False
 
 #Execução
 tl.mainloop()