Mapa basico y personajes

pdepjm · Oct 2, 2024 · dc5bdb9 · dc5bdb9
1 parent 666a4b4
commit dc5bdb9
Show file tree

Hide file tree

Showing 22 changed files with 111 additions and 8 deletions.
diff --git a/assets/bg.png b/assets/bg.png
diff --git a/assets/bloque.png b/assets/bloque.png
diff --git a/assets/bloqueAgua.png b/assets/bloqueAgua.png
diff --git a/assets/bloqueBoton.png b/assets/bloqueBoton.png
diff --git a/assets/bloqueConAcido6.png b/assets/bloqueConAcido6.png
diff --git a/assets/bloqueConBoton.png b/assets/bloqueConBoton.png
diff --git a/assets/bloqueFuego.png b/assets/bloqueFuego.png
diff --git a/assets/boton.png b/assets/boton.png
diff --git a/assets/cubo.png b/assets/cubo.png
diff --git a/assets/elevador.png b/assets/elevador.png
diff --git a/assets/fireboy3.png b/assets/fireboy3.png
diff --git a/assets/golondrina.png b/assets/golondrina.png
diff --git a/assets/level1.png b/assets/level1.png
diff --git a/assets/palanca.png b/assets/palanca.png
diff --git a/assets/puertaAbierta.png b/assets/puertaAbierta.png
diff --git a/assets/puertaAgua.png b/assets/puertaAgua.png
diff --git a/assets/puertaFuego.png b/assets/puertaFuego.png
diff --git a/assets/watergirl.png b/assets/watergirl.png
diff --git a/elementos.wlk b/elementos.wlk
diff --git a/main.wpgm b/main.wpgm
@@ -1,16 +1,30 @@
 import wollok.game.*
+import mapa.*
+import personajes.*
 
-import pepita.*
 
-program PepitaGame {
-	game.title("Pepita")
-	game.height(10)
-	game.width(10)
-	game.cellSize(100)
 
-	game.addVisual(pepita)
+program FireboyAndWatergirl {
+	game.title("Fireboy and Watergirl")
+	game.height(16)
+	game.width(15)
+	game.cellSize(80)
+	game.boardGround("bg.png")
+	game.addVisual(fireboy)
+	game.addVisual(watergirl)
+	mapa.inciar()
 
-	keyboard.w().onPressDo({ pepita.fly(1) })
+	keyboard.left().onPressDo({fireboy.movIzquierda()})
+	keyboard.right().onPressDo({fireboy.movDerecha()})
+	keyboard.up().onPressDo({fireboy.movSaltar()})
+
+	keyboard.w().onPressDo({watergirl.movSaltar()})
+	keyboard.a().onPressDo({watergirl.movIzquierda()})
+	keyboard.d().onPressDo({watergirl.movDerecha()})
+
+	game.whenCollideDo(fireboy, {elemento =>
+		elemento.tratarColision(fireboy)
+	})
 
 	game.start()
 }
diff --git a/mapa.wlk b/mapa.wlk
@@ -0,0 +1,36 @@
+object mapa
+{
+	method crearBloques(y, xi, xf, tipo) 
+	{
+		(xi..xf).forEach({ x =>
+			const nuevoBloque = new Bloque()
+			nuevoBloque.position(game.at(x, y))
+			nuevoBloque.image(tipo)
+		 	game.addVisual(nuevoBloque)
+		})
+	}
+
+	method inciar() 
+	{
+		self.crearBloques(1, 0, 2, "bloque.png")
+		self.crearBloques(1, 13, 15, "bloque.png")
+		self.crearBloques(2, 6, 10, "bloque.png")
+		self.crearBloques(3, 0, 4, "bloque.png")
+		self.crearBloques(6, 2, 15, "bloque.png")
+		self.crearBloques(9, 0, 12, "bloque.png")
+		self.crearBloques(12, 0, 2, "bloque.png")
+		self.crearBloques(13, 4, 15, "bloque.png")
+
+		self.crearBloques(0, 5, 6, "bloqueFuego.png")
+		self.crearBloques(0, 9, 10, "bloqueAgua.png")
+		self.crearBloques(2, 8, 8, "bloqueConAcido6.png")
+		self.crearBloques(6, 4, 4, "bloqueBoton.png")
+
+	}
+}
+
+class Bloque
+{
+	var property position = game.at(0,0)
+	var property image = ""
+}
diff --git a/personajes.wlk b/personajes.wlk
@@ -0,0 +1,53 @@
+object fireboy
+{
+	var property position = game.at(0,0)
+	var cantSaltos = 0
+	method image() = "fireboy3.png"
+	method movIzquierda()
+	{
+		position = position.left(1)
+	}
+	method movDerecha()
+	{
+		position = position.right(1)
+	}
+	method movSaltar()
+	{
+		if(cantSaltos < 2)
+		{
+			position = position.up(1)
+			cantSaltos += 1
+			game.schedule(800, {
+				position = position.down(1)
+				if(cantSaltos==2) cantSaltos = 0	
+			})
+		}
+	}
+}
+
+object watergirl
+{
+	var property position = game.at(0,2)
+	var cantSaltos = 0
+	method image() = "watergirl.png"
+	method movIzquierda()
+	{
+		position = position.left(1)
+	}
+	method movDerecha()
+	{
+		position = position.right(1)
+	}
+	method movSaltar()
+	{
+		if(cantSaltos < 2)
+		{
+			position = position.up(1)
+			cantSaltos += 1
+			game.schedule(800, {
+				position = position.down(1)
+				if(cantSaltos==2) cantSaltos = 0	
+			})
+		}
+	}
+}