From c900d39454ad5e4db2d3f0ae3c58f588c8bb6f8d Mon Sep 17 00:00:00 2001
From: G-Aleixo <g.aleixo@escolar.ifrn.edu.br>
Date: Thu, 21 Nov 2024 13:28:29 -0300
Subject: [PATCH] =?UTF-8?q?Limpar=20indenta=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.py | 85 +++++++++++++++++++++--------------------------------
 1 file changed, 33 insertions(+), 52 deletions(-)

diff --git a/src/main.py b/src/main.py
index fb8cf6d..892fc53 100644
--- a/src/main.py
+++ b/src/main.py
@@ -4,24 +4,28 @@ import random
 
 posx = [-200, -100, 0, 100, 200]
 posy = [-200, -100, 0, 100, 200]
-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']
+postiro = []
+for i in range(5):
+    for j in range(5):
+        postiro.append(f"{(i-2) * 100} {(j-2) * 100}")
+        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...")
 tl.speed(0)
 
 
-
 #funções
 def linhax(x,y):
-       tl.up(); tl.goto(x,y)
-       tl.down(); tl.goto(x+600,y)
-       pass
+    tl.up(); tl.goto(x,y)
+    tl.down(); tl.goto(x+600,y)
+    pass
 
 def linhay(x,y):
-       tl.up(); tl.goto(x,y)
-       tl.down(); tl.goto(x,y+600)
-       pass
+    tl.up(); tl.goto(x,y)
+    tl.down(); tl.goto(x,y+600)
+    pass
 
 
 #radar screen
@@ -33,18 +37,14 @@ linhay(300,-300)
 linhax(-300,300)
 
 #linhas X
-linhax(-300,-200); tl.write("-200",False,align="right")
-linhax(-300,-100); tl.write("-100",False,align="right")
-linhax(-300,0); tl.write("0",False,align="right")
-linhax(-300,100); tl.write("100",False,align="right")
-linhax(-300,200); tl.write("200",False,align="right")
+for i in range(5):
+    linhax(-300, (i-2)*100)
+    tl.write(str((i-2) * 100), False, align="right")
 
 #linhas Y
-linhay(-200,-300); tl.write("-200",False,align="right")
-linhay(-100,-300); tl.write("-200",False,align="right")
-linhay(0,-300); tl.write("-200",False,align="right")
-linhay(100,-300); tl.write("-200",False,align="right")
-linhay(200,-300); tl.write("-200",False,align="right")
+for i in range(5):
+    linhay((i-2)*100, -300)
+    tl.write(str((i-2) * 100), False, align="right")
 #Tabuleiro pronto
 tl.title("Naval Battle 1943")
 tl.hideturtle()
@@ -63,7 +63,7 @@ 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))
+    e2.goto(random.choice(posx), random.choice(posy))
 
 
 e3 = tl.Turtle()
@@ -71,44 +71,25 @@ 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))
+    e3.goto(random.choice(posx), random.choice(posy))
 if e2.pos() == e3.pos():
-       e3.goto(random.choice(posx), random.choice(posy))
+    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)
-              print("Acerto!")
-              boat.write("U-boat Afundado\n Capitão!",False,align="center")
-              break
-       else:
-              boat.goto(tirox,tiroy)
-              print("errou!")
-              boat.write("Erramos o alvo\n Capitão!",False,align="center")
-              continue
-
-
-
-
-
-
-       
-
-       
-
-
-
-
-
-
-
-
-
-
+    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)
+        print("Acerto!")
+        boat.write("U-boat Afundado\n Capitão!",False,align="center")
+        break
+    else:
+        boat.goto(tirox,tiroy)
+        print("errou!")
+        boat.write("Erramos o alvo\n Capitão!",False,align="center")
+        continue
 
 #Execução
 tl.mainloop()