Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feedback #1

Open
wants to merge 65 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
f105a17
Setting up GitHub Classroom Feedback
github-classroom[bot] Sep 23, 2024
12bede0
Level creation
FacundoDiezF Sep 23, 2024
d535f4c
Paredes Funcionando
FacundoDiezF Sep 23, 2024
c85b2b7
FUNCIONA LOS COMPIS y Cambios en el sistema de niveles, agregamos el …
FacundoDiezF Sep 23, 2024
eb6f518
Cambio en el sistema de movimiento
FacundoDiezF Sep 24, 2024
2861bc7
lampara es pisable
FacundoDiezF Sep 24, 2024
4c98032
El mejor commit de mi vida
lDevecchi Sep 24, 2024
dd588e7
2da parte del mejor commit que vas a ver en toda tu vida
lDevecchi Sep 24, 2024
1026463
Reestructuracion del codigo
FacundoDiezF Sep 24, 2024
760da10
Merge branch 'main' of github.com:pdepjm/2024-o-tpjuego-bestiasalgori…
FacundoDiezF Sep 24, 2024
eac10b4
formato
FacundoDiezF Sep 24, 2024
3c29f26
un poco mas de formato :)
FacundoDiezF Sep 24, 2024
e2258ae
Ahora los azules se pueden pegar entre ellos y se crea clear en el ju…
FacundoDiezF Sep 26, 2024
5486ae0
Implementación inicial de las metas, propensa a futuros cambios. Falt…
valenosa Sep 26, 2024
d022d28
Se sacaron comentarios y se implementó un sistema de referencias dent…
valenosa Sep 26, 2024
bbdc4b4
Reestructuracion de validacion de victoria
FacundoDiezF Sep 26, 2024
24beb8c
el peor menu del mundo
FacundoDiezF Sep 26, 2024
dd01f5a
Delegamos las funcionalidades del cuerpo a un objeto cuerpo, e implem…
valenosa Sep 30, 2024
5e0433d
Merge pull request #2 from pdepjm/agujeros
valenosa Sep 30, 2024
ca33ff4
solucionamos la duplicacion de elementos al reiniciar un nivel
FacundoDiezF Oct 1, 2024
a94d88d
cambio el OnCollide x validacion nuestra xq el onCollide se saltea ob…
FacundoDiezF Oct 1, 2024
8c4f295
Logre hacer que funcione con onCollide peeero hace que se laguee muuu…
FacundoDiezF Oct 2, 2024
9740515
cambio collider
FacundoDiezF Oct 2, 2024
461d8a1
Cambio momento de ejecucion de nuestro collider
FacundoDiezF Oct 3, 2024
0c219c0
Algunos cambios simples. Funciona el levelMenu después de darle a play
valenosa Oct 3, 2024
e0ba03c
Update README.md
FacundoDiezF Oct 10, 2024
c512a58
COrrecciones de tom, no logramos que funcione lo del configTeclado
FacundoDiezF Oct 10, 2024
8b3dbed
se implementan la correcciones que sugrio tom (menos el config teclad…
FacundoDiezF Oct 16, 2024
3d1e19d
Merge pull request #3 from pdepjm/Correcciones
FacundoDiezF Oct 16, 2024
422fd8b
unDo()
FacundoDiezF Oct 16, 2024
cbe6039
Funciona el unDo() peero..
FacundoDiezF Oct 16, 2024
0ac0492
solucion de reset
FacundoDiezF Oct 17, 2024
409acfe
Agrego flag para que el movimiento solo se guarde si no es unDo().
FacundoDiezF Oct 17, 2024
2382e7c
Agrego visual para compis no enganchados y soluciono error de colisio…
FacundoDiezF Oct 17, 2024
0c53c48
Boludeces UI
FacundoDiezF Oct 18, 2024
86f90a7
Si estoy al pedo y puse animaciones y?? cual es el problema
FacundoDiezF Oct 18, 2024
2a2dd7e
test musica
FacundoDiezF Oct 22, 2024
dc1aceb
Aplicamos herencia para los personajes
FacundoDiezF Oct 22, 2024
6d152a4
utilizo super() en herencia de los personajes
FacundoDiezF Oct 22, 2024
96d21c0
Reestructura unDo() y funciona para desactivacion de trampas
FacundoDiezF Oct 22, 2024
4e92c0d
Funciona unDo() con las trampas.
FacundoDiezF Oct 22, 2024
ab81c9a
Validacion de que existan compis para ejecutar un movimiento.
FacundoDiezF Oct 22, 2024
caa6310
l1
FacundoDiezF Oct 23, 2024
7b04744
Niveles creados, y final hecho
lDevecchi Oct 23, 2024
a956ba4
Agrego meta validadora (solo es por optimizacion)
FacundoDiezF Oct 24, 2024
a53a974
El 3er mejor commit que vas a ver en toda tu vida
lDevecchi Oct 24, 2024
30168c8
readme
FacundoDiezF Oct 24, 2024
a81f4f1
Merge branch 'main' of github.com:pdepjm/2024-o-tpjuego-bestiasalgori…
FacundoDiezF Oct 24, 2024
c120c14
Update README.md
FacundoDiezF Oct 24, 2024
b606a9e
Update README.md
FacundoDiezF Oct 24, 2024
b01a8c6
Se plantean los primeros tests
valenosa Oct 30, 2024
9bf8460
Aumento tamaño de pantalla para mejor UI y agrego Creditos
FacundoDiezF Oct 30, 2024
92b307c
Implementación de tests
valenosa Oct 30, 2024
dea8ac3
Merge pull request #4 from pdepjm/test
FacundoDiezF Oct 30, 2024
5f8c6d5
tom la rompio con la config de teclado
FacundoDiezF Oct 31, 2024
1e29bcb
Merge branch 'main' of github.com:pdepjm/2024-o-tpjuego-bestiasalgori…
FacundoDiezF Oct 31, 2024
b524551
.
FacundoDiezF Oct 31, 2024
21a115e
Conceptos Teoricos
FacundoDiezF Nov 6, 2024
9d4d00e
Hotfix del último nivel se inicializaban los sticky
lDevecchi Nov 6, 2024
37dd69b
El commit más importante del juego.
valenosa Nov 7, 2024
9e27ab2
Arreglo diagrama de clases
Matehdez Nov 7, 2024
bf31fae
add Sound FX ;P
valenosa Nov 14, 2024
a93786d
da desde README a la parte teorica
FacundoDiezF Nov 16, 2024
6f48b8f
Merge branch 'main' of github.com:pdepjm/2024-o-tpjuego-bestiasalgori…
FacundoDiezF Nov 16, 2024
714b8f1
Update README.md
valenosa Dec 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"cSpell.words": [
"compi",
"compis"
],
"cSpell.enableFiletypes": [
"!wollok"
]
}
20 changes: 2 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
# (reemplazar nombre de juego acá)

UTN - Facultad Regional Buenos Aires - Materia Paradigmas de Programación

## Equipo de desarrollo:
## example

- completar...
- completar...


## Capturas

![pepita](assets/golondrina.png)

## Reglas de Juego / Instrucciones

(completar...)

## Controles:

- `W` para...
TODO

Binary file added assets/ArrowsPopUp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Azul.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/CloseMenu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Fondo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Ladrillo1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Ladrillo2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Ladrillo3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Ladrillo4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Lampara.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Menu-Reset.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/OpenMenu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Piso1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Piso2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Piso3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Rojo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Salida.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Trampa1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Trampa2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Trampa3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Trampa4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Trampa5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/golondrina.png
Binary file not shown.
256 changes: 256 additions & 0 deletions levels.wlk
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
import stickyBlocks.*
//*==========================| Creacion de Niveles |==========================
//---------(Clase)--------
class Nivel {

method iniciar(){
juegoStickyBlock.clear()
self.clearPositions()

//Dibujo el nivel
new OnlyVisual(image="Menu-Reset.png",position = game.origin()).iniciar()
self.drawGridMap()
self.drawCharacters()
self.drawTopLayer()
}

method clearPositions(){
goalPositions.clear()
stickyBlockPositions.clear()
lampPosition.clear()
}

const initialGridMap

const property siguienteNivel

method drawGridMap(){
var y = 9
var x = 0
initialGridMap.forEach({row =>
row.forEach({cell => cell.decode(x, y, self)
x+=1
})
y-=1
x=0
})
}

//Goal
const goalPositions = []

method addGoalPosition(x,y){
goalPositions.add(game.at(x, y))
}

method cuerpoSobreMeta() = goalPositions.all({goalPos => cuerpo.compis().any({compi => compi.position() == goalPos})})

//Personaje Principal
var property mainCharacterPosition = null

//StickyBlocks
const stickyBlockPositions = []

method addStickyBlockPosition(x,y){
stickyBlockPositions.add(game.at(x, y))
}

method drawCharacters(){

//Instanciamos un StickyBlock pero lo inicializamos como cuerpo
const personajePrincipal = new StickyBlock(position = mainCharacterPosition)
personajePrincipal.iniciar()
personajePrincipal.setAsCuerpo()

//Instanciamos los compis
stickyBlockPositions.forEach({position =>
const stickyBlock = new StickyBlock(position = position)
stickyBlock.iniciar()
})
}

//Top Layer objects
const lampPosition = []

method addLampPosition(x,y){
lampPosition.add(game.at(x-1, y-1))
}

method drawTopLayer(){
lampPosition.forEach({pos =>
const lampara = new Lampara(position = pos)
lampara.iniciar()
})
}
}

//------------------ Representaciones del GridMap ------------------
//---------(Entorno)--------

//Vacio
object v{
method decode(_x,_y,_level){}
}

//Pared
object p{
method decode(x,y,_level){
const pared = new Pared(position = game.at(x, y))
pared.iniciar()
}
}

//Lamparas
object l{
method decode(x,y,level){
p.decode(x, y,level)
level.addLampPosition(x,y)
}
}

//Suelo
object _{
method decode(x,y,_level){
const suelo = new Suelo(position = game.at(x, y))
suelo.iniciar()
}
}

//Trampa
object o{
method decode(x,y,_level){
const agujero = new Agujero(position = game.at(x, y), activa = true)
agujero.iniciar()
}
}

//Trampa
object x{
method decode(x,y,_level){
const agujero = new Agujero(position = game.at(x, y), activa = false)
agujero.iniciar()
}
}

//Meta
object g{
method decode(x,y,level){
const meta = new Meta(position = game.at(x, y))
meta.iniciar()
level.addGoalPosition(x,y)
}
}

//-------(Personajes)-------

//Personaje Principal
object m{
method decode(x,y,level){
//Guardo la posicion del personaje principal
level.mainCharacterPosition(game.at(x, y))

//Creo suelo donde Spawnea el personaje principal
_.decode(x, y,level)
}
}

//Compis
object z{

method decode(x,y,level){
//Guardo la posicion de los stickyBlocks
level.addStickyBlockPosition(x,y)

//Creo suelo donde Spawnea el personaje principal
_.decode(x, y,level)
}
}

//*==========================| Niveles Instanciados |==========================

//Move Tutorial
const nivel1 = new Nivel(
initialGridMap = [
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v],
[v,v,v,v,p,p,p,p,p,p,p,p,p,p,p,v,v,v,v,v],
[v,v,v,v,p,_,_,_,_,p,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,p,_,m,_,_,p,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,l,_,_,_,_,_,_,_,g,_,p,v,v,v,v,v],
[v,v,v,v,p,_,_,_,_,_,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,p,_,_,_,_,_,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,p,p,p,p,p,p,p,p,p,p,p,v,v,v,v,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v]
],
siguienteNivel = nivel2
)

//Friend Tutorial
const nivel2 = new Nivel(
initialGridMap = [
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v],
[v,v,v,v,p,p,p,p,p,p,p,p,p,p,p,v,v,v,v,v],
[v,v,v,v,p,_,_,_,_,p,_,z,_,_,p,v,v,v,v,v],
[v,v,v,v,p,_,m,_,_,p,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,l,_,_,_,_,_,_,g,_,_,l,v,v,v,v,v],
[v,v,v,v,p,_,_,_,z,_,_,g,g,_,p,v,v,v,v,v],
[v,v,v,v,p,_,_,_,_,_,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,p,p,p,p,p,p,p,p,p,p,p,v,v,v,v,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v]
],
siguienteNivel = nivel3
)

// Friends Levels
const nivel3 = new Nivel(
initialGridMap = [
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v],
[v,v,v,v,p,p,p,p,p,p,p,p,p,p,p,v,v,v,v,v],
[v,v,v,v,p,z,p,_,_,_,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,p,_,g,_,_,_,_,_,_,z,p,v,v,v,v,v],
[v,v,v,v,l,g,g,g,_,p,_,_,_,_,l,v,v,v,v,v],
[v,v,v,v,p,m,g,_,_,p,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,p,_,_,z,_,p,z,_,_,_,p,v,v,v,v,v],
[v,v,v,v,p,p,p,p,p,p,p,p,p,p,p,v,v,v,v,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v]
],
siguienteNivel = nivel4
)

const nivel4 = new Nivel(
initialGridMap = [
[v,v,v,v,v,v,v,p,p,p,l,p,p,p,v,v,v,v,v,v],
[v,v,v,v,p,p,p,p,_,z,_,_,_,p,p,p,p,v,v,v],
[v,v,p,p,p,_,_,_,_,_,_,_,_,_,_,_,p,p,p,v],
[v,v,p,_,_,_,_,z,_,_,z,_,_,_,_,_,_,_,p,v],
[v,v,p,_,_,_,_,_,_,_,_,_,z,_,z,_,_,_,p,v],
[v,v,l,_,_,m,_,_,_,p,p,p,p,_,_,_,_,_,l,v],
[v,v,p,_,_,_,_,_,_,g,g,g,g,_,_,_,_,_,p,v],
[v,v,p,_,_,_,_,_,_,_,g,g,_,_,_,_,_,_,p,v],
[v,v,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v]
],
siguienteNivel = null
)



const nivelEjemplo = new Nivel(
initialGridMap = [
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v],
[v,v,v,v,p,p,p,p,p,p,p,p,p,p,p,v,v,v,v,v],
[v,v,v,v,p,_,_,_,_,p,_,z,_,_,p,v,v,v,v,v],
[v,v,v,v,p,_,m,_,_,p,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,l,_,x,_,_,_,_,o,g,g,l,v,v,v,v,v],
[v,v,v,v,p,_,_,_,z,_,_,_,g,_,p,v,v,v,v,v],
[v,v,v,v,p,_,_,_,_,_,_,_,_,_,p,v,v,v,v,v],
[v,v,v,v,p,p,p,p,p,p,p,p,p,p,p,v,v,v,v,v],
[v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v,v]
],
siguienteNivel = nivel2
)


16 changes: 0 additions & 16 deletions main.wpgm

This file was deleted.

8 changes: 8 additions & 0 deletions mainStickyBlocks.wpgm
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import wollok.game.*

import stickyBlocks.juegoStickyBlock

program StickyBlock {
juegoStickyBlock.iniciar()
game.start()
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "2024-o-tpijuego",
"name": "stickyBlocks",
"version": "1.0.0",
"resourceFolder": "assets",
"wollokVersion": "4.0.0",
"author": "usuario",
"author": "facundo",
"license": "ISC"
}
16 changes: 0 additions & 16 deletions pepita.wlk

This file was deleted.

9 changes: 0 additions & 9 deletions pruebas.wtest

This file was deleted.

Loading