Merge pull request STINKpython#1 from STINKpython/orderCode

feat(configuraciones): change letter PISO
indec-it · Jan 5, 2023 · c83fff9 · c83fff9
2 parents 910b9d9 + 36e8144
commit c83fff9
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 14 deletions.
diff --git a/__pycache__/configuraciones.cpython-39.pyc b/__pycache__/configuraciones.cpython-39.pyc
diff --git a/__pycache__/gui_form.cpython-39.pyc b/__pycache__/gui_form.cpython-39.pyc
diff --git a/__pycache__/gui_manager.cpython-39.pyc b/__pycache__/gui_manager.cpython-39.pyc
diff --git a/__pycache__/gui_nivel.cpython-39.pyc b/__pycache__/gui_nivel.cpython-39.pyc
diff --git a/__pycache__/gui_progressbar.cpython-39.pyc b/__pycache__/gui_progressbar.cpython-39.pyc
diff --git a/__pycache__/gui_widget.cpython-39.pyc b/__pycache__/gui_widget.cpython-39.pyc
diff --git a/configuraciones.py b/configuraciones.py
@@ -10,8 +10,7 @@
 FPS = 120
 
 #RUTA DE IMAGENES
-RUTA_IMAGEN = r"C:\Users\lucia\Documents\Castle Defense\recursos\\"  #RUTA DE IMAGENES
-RUTA_MUSICA = r"C:\Users\lucia\Documents\JUEGO_FINAL\sounds\\"   #RUTA DE MUSICA
+RUTA_IMAGEN = './recursos/'#RUTA DE IMAGENES
 
 #DIRECCION DONDE MIRA EL PERSONAJKE
 IZQUIERDA = -1
@@ -42,7 +41,7 @@
 
 #TILED
 PLATAFORMA = "P"
-PISO = "O"
+PISO = "5"
 MURO = "M"
 LOOT = "B"
 CAJA = "C"
@@ -51,8 +50,8 @@
 TOP_ACIDO = "T"
 MOBILE = "U"
 
-CORAZON = RUTA_IMAGEN + r"Menu\Button\Health_Dot.png"
-BALA = RUTA_IMAGEN + r"Menu\Button\Armor_Bar_Dot.png"
+CORAZON = RUTA_IMAGEN + r"Menu/Button/Health_Dot.png"
+BALA = RUTA_IMAGEN + r"Menu/Button/Armor_Bar_Dot.png"
 
 
 
diff --git a/gui_manager.py b/gui_manager.py
@@ -9,7 +9,7 @@ class FormManager():
     """
     def __init__(self,pantalla) -> None:
         self.pantalla = pantalla
-        self.form_nivel_1 = self.crear_nivel("nivel_1",RUTA_IMAGEN + "fondo\MetalSlug-Mission2.jpg")
+        self.form_nivel_1 = self.crear_nivel("nivel_1",RUTA_IMAGEN + "fondo/MetalSlug-Mission2.jpg")
         self.niveles = [self.form_nivel_1]
 
     def crear_nivel(self,nivel,fondo):

diff --git a/gui_nivel.py b/gui_nivel.py
@@ -15,14 +15,14 @@ def __init__(self, name, master_surface, x=0, y=0, w=ANCHO_VENTANA, h=ALTO_VENTA
         self.puntuacion = 0
         super().__init__(name, master_surface, x, y, w, h, color_background, imagen_background, color_border, active)
 
-        self.text1 = Widget(master=self,x=450,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface\Marco.png",text=None,font=None,font_size=None,font_color=None)
-        self.text2 = Widget(master=self,x=480,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface\Marco.png",text=None,font=None,font_size=None,font_color=None)
-        self.text3 = Widget(master=self,x=510,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface\Marco.png",text=None,font=None,font_size=None,font_color=None)
-        self.text4 = Widget(master=self,x=540,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface\Marco.png",text=None,font=None,font_size=None,font_color=None)
-        self.text5 = Widget(master=self,x=570,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface\Marco.png",text=None,font=None,font_size=None,font_color=None)
-        self.text6 = Widget(master=self,x=600,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface\Marco.png",text=None,font=None,font_size=None,font_color=None)
-        self.text7 = Widget(master=self,x=630,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface\Marco.png",text=None,font=None,font_size=None,font_color=None)
-        self.text8 = Widget(master=self,x=660,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface\Marco.png",text=None,font=None,font_size=None,font_color=None)
+        self.text1 = Widget(master=self,x=450,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface/Marco.png",text=None,font=None,font_size=None,font_color=None)
+        self.text2 = Widget(master=self,x=480,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface/Marco.png",text=None,font=None,font_size=None,font_color=None)
+        self.text3 = Widget(master=self,x=510,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface/Marco.png",text=None,font=None,font_size=None,font_color=None)
+        self.text4 = Widget(master=self,x=540,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface/Marco.png",text=None,font=None,font_size=None,font_color=None)
+        self.text5 = Widget(master=self,x=570,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface/Marco.png",text=None,font=None,font_size=None,font_color=None)
+        self.text6 = Widget(master=self,x=600,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface/Marco.png",text=None,font=None,font_size=None,font_color=None)
+        self.text7 = Widget(master=self,x=630,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface/Marco.png",text=None,font=None,font_size=None,font_color=None)
+        self.text8 = Widget(master=self,x=660,y=45,w=25,h=25,color_background=None,color_border=DORADO,image_background=RUTA_IMAGEN + "interface/Marco.png",text=None,font=None,font_size=None,font_color=None)
         self.text9 = Widget(master=self,x=600,y=10,w=100,h=25,color_background=None,color_border=None,image_background=None,text="{0}".format(self.tiempo_juego),font="IMPACT",font_size=30,font_color=WHITE)
         self.text10 = Widget(master=self,x=300,y=10,w=100,h=25,color_background=None,color_border=None,image_background=None,text="{0}".format(self.puntuacion),font="IMPACT",font_size=30,font_color=WHITE)