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 47 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
2febd9c
Setting up GitHub Classroom Feedback
github-classroom[bot] Sep 27, 2024
4d52430
Add files via upload
franco-lapalma Oct 4, 2024
71f212e
Hago que los meteoritos caigan y las balas suban
tomasRodriguezSpuch Oct 12, 2024
5e751ed
Agrego bordes y mejoro la fluidez
tomasRodriguezSpuch Oct 22, 2024
c30b4b8
agregue colisiones
franco-lapalma Oct 23, 2024
8401590
agrego meteoritos especiales, agrego vida a los meteoritos
franco-lapalma Oct 24, 2024
ecb029b
Update mainExample.wpgm
marsegovia Oct 25, 2024
15326d0
Update example.wlk
marsegovia Oct 25, 2024
cec359f
Update mainExample.wpgm
marsegovia Oct 25, 2024
97366b0
Update example.wlk
marsegovia Oct 25, 2024
5c7fcc4
Update mainExample.wpgm
marsegovia Nov 1, 2024
b554423
Update example.wlk
marsegovia Nov 1, 2024
73c3715
agregando cosas
franco-lapalma Nov 7, 2024
5622da1
Fondo niveles
tomasRodriguezSpuch Nov 7, 2024
7ceb1a9
niveles
franco-lapalma Nov 7, 2024
4e2a2fe
Merge branch 'master' of https://github.com/pdepviernestm/2024-tpo-ga…
franco-lapalma Nov 7, 2024
9eaa6f8
Agego habilidad
tomasRodriguezSpuch Nov 7, 2024
782da37
Update README.md
franco-lapalma Nov 7, 2024
83eb451
update
franco-lapalma Nov 8, 2024
030ed19
Merge branch 'master' of https://github.com/pdepviernestm/2024-tpo-ga…
franco-lapalma Nov 8, 2024
c9e2824
cambio de nombres
franco-lapalma Nov 8, 2024
ec1edc7
Agrego reducir velocidad
marsegovia Nov 8, 2024
db51dd9
agrego reducirvelocidad
marsegovia Nov 8, 2024
2887499
cambio valores de velocidad
marsegovia Nov 8, 2024
0b40687
Update mainExample.wpgm
franco-lapalma Nov 8, 2024
be4d142
Update example.wlk
franco-lapalma Nov 8, 2024
523457e
Add files via upload
franco-lapalma Nov 8, 2024
989c03c
Add files via upload
franco-lapalma Nov 8, 2024
2a750c2
Add files via upload
franco-lapalma Nov 8, 2024
324a18d
Add files via upload
franco-lapalma Nov 8, 2024
eec268f
Delete assets/escudo_activado.png
franco-lapalma Nov 8, 2024
2bfcc8d
Delete assets/fondo-gris.jpg
franco-lapalma Nov 8, 2024
1a71c2f
recducirVel
marsegovia Nov 8, 2024
bcc7981
velocidadCambiada
marsegovia Nov 8, 2024
5c8eb15
algo que faltaba
marsegovia Nov 9, 2024
fbb4f66
solucionando habilidades y agregando clases
franco-lapalma Nov 13, 2024
4833af5
agrego muchas cosas
franco-lapalma Nov 14, 2024
0d96c8f
agregando mas cosas
franco-lapalma Nov 14, 2024
3b1d3bd
error chiquito
franco-lapalma Nov 14, 2024
607cda9
reduzco un poco la velocidad por nivel
franco-lapalma Nov 14, 2024
f231116
Update README.md
franco-lapalma Nov 15, 2024
5ea6cc0
Add files via upload
franco-lapalma Nov 15, 2024
cb50869
Delete Presentación1.pptx
franco-lapalma Nov 15, 2024
a5230be
Add files via upload
franco-lapalma Nov 15, 2024
0832784
agrego menu
marsegovia Nov 28, 2024
608526c
Add files via upload
marsegovia Nov 28, 2024
87f3f64
ajustando hitbox
franco-lapalma Nov 29, 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
Binary file added Presentación1 (1).pptx
Binary file not shown.
29 changes: 18 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
# Nombre del juego (<- borrar y completar)
# Meteoric Space

## Equipo de desarrollo

- Alguien
- Persona
- etc.

- TOMAS RODRÍGUEZ SPUCH
- FRANCO LAPALMA
- SEGOVIA MARTIN
## Capturas
![image](https://github.com/user-attachments/assets/f3fa6d38-e72d-42ee-857c-cf2fd25044a4)

(agregar)
![image](https://github.com/user-attachments/assets/3ab3a42e-960e-4893-a2db-65bf2e51bd0d)

## Reglas de Juego / Instrucciones
![image](https://github.com/user-attachments/assets/6d7f3147-9eb5-4f80-b285-1aea79119d1a)

(Escribirlas)

## Reglas de Juego / Instrucciones

Estas despegando de la tierra pero una lluvia de meteoritos se interpone en tu camino, debes destruirlos hasta llegar a tu destino.
Mientras más subas, más rapido caeran los meteoritos y de diferente tipo apareceran.
## Controles
Desplazamiento: Usa las teclas WASD para desplazarte por el mapa.
Disparar: presiona la tecla C para disparar tus municiones.
Habilidades especiales: presiona las teclas Z-X-V para activar las diferentes habilidades cuando esten disponibles.

## Otros

- Curso/Facultad
- Versión de wollok
- Una vez terminado, no tenemos problemas en que el repositorio sea público / queremos manternerlo privado
- Curso: K2005 Facultad: UTN FRBA
- Versión de wollok -0.2.11
- Una vez terminado, no tenemos problemas en que el repositorio sea público
Binary file added assets/bala.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/controles.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/duro.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/escudo_activado.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-nivel-2.jpg
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-nivel-3.jpg
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-nivel-4.jpg
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-nivel-5.jpg
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.jpg
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/howtoplay.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/hud.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/icono_escudo_disponible1.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/icono_escudo_no_disponible.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/inicio (6).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/meteorito.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/municion_activa.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/municion_sinMunicion.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/nave.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/pantalla de fin.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/pantalla de inicio8.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/pepita.png
Binary file not shown.
Binary file added assets/ralentizacion.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/ralentizacion_desactivada.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/veloz.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
197 changes: 197 additions & 0 deletions example.wlk
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
class ObjetoJuego {
var position
var property image

method position() = position
method position(newPos) {
position = newPos
}
method image() = image
method image(newImage) {
image = newImage
}
}
class EntidadesVivas inherits ObjetoJuego{
var property vida = 0
var rango_X = 4
var rango_Y = 4
var ajuste_X=0
var ajuste_Y=0
method colisionaCon(otraEntidad) {
return (otraEntidad.position().x() >= position.x() - rango_X && otraEntidad.position().x() <= position.x() + rango_X + ajuste_X) &&
(otraEntidad.position().y() >= position.y() - rango_Y && otraEntidad.position().y() <= position.y() + rango_Y + ajuste_Y)
}
}
class Nave inherits EntidadesVivas {
var property municionesDisponibles = 12

method gastarMunicion(){municionesDisponibles-=1}

method disparar() {
if(municionesDisponibles>0 && vida==2){
self.gastarMunicion()
return new Bala(position= position.right(4))
}
else return
if(municionesDisponibles>0){
self.gastarMunicion()
return new Bala(position= position.right(3))
}
else return


}

method sumarMunicion(municionNueva){
municionesDisponibles += municionNueva
}
method perderVida() {
vida = vida - 1
image = "nave.png"
}
method ponerEscudo(){
vida=2
image="escudo_activado.png"

}

}
class Bala inherits ObjetoJuego(image = "bala.png"){
}

class Meteorito inherits EntidadesVivas(image = "meteorito.png",rango_X=3,rango_Y=5,ajuste_X=1) {
var velocidad = 0
method recibirDisparo() {
vida = vida - 1
}
method mover() {
position = position.down(velocidad)
}

}



class Nivel inherits ObjetoJuego(image= "fondo.jpg", position=game.at(9, 0)) {
var nivel = 1
var property meteoritosEliminados = 0
var property tiempoRestante = 0
var meteoritosParaEliminacion = 10
var property velocidadMeteoritos = 2
var property balas_disponibles = 2*meteoritosParaEliminacion
var property contadorMunicion = 0
var property contadorEscudo = 0
var property contadorVelocidad = 0
method incrementarNivel() {
nivel += 1
meteoritosEliminados = 0
meteoritosParaEliminacion += 5
velocidadMeteoritos += 0.5
return nivel
}



method eliminarMeteorito() {
meteoritosEliminados += 1
contadorMunicion += 1
contadorEscudo += 1
contadorVelocidad += 1
if (self.meteoritosRestantes() == 0) {
self.incrementarNivel()
image= fondo.cambiarFondo(self.nivelActual())
}
}


method nivelActual() = nivel
method meteoritosRestantes() = meteoritosParaEliminacion - meteoritosEliminados
method generarMeteoritoDuro() = nivel >= 3
method generarMeteoritoVeloz() = nivel >= 4

method iniciar_nave(){
const nave = new Nave(vida=1,position=game.at(30,6),image="nave.png",rango_X=3,rango_Y=3,ajuste_X=5,ajuste_Y=1,municionesDisponibles=balas_disponibles)
return nave
}

method reducirVelocidad(duracion) {
tiempoRestante = duracion
velocidadMeteoritos -= 2

}
method reducirTiempo(tiempo){
tiempoRestante-=tiempo
}

method aumentarVelocidad(aumento){
velocidadMeteoritos += aumento
}


method crearMeteorito(tipo) {
const x = fondo.limite_izquierdo().randomUpTo(fondo.limite_derecho()).truncate(0)
const y = 75
var velocidadExtra = 0
var vida = 1
var imagen = tipo + ".png"

if (tipo == "duro") {
vida = 2
} else if (tipo == "veloz") {
velocidadExtra = 2
}
const meteorito = new Meteorito(position = game.at(x, y), velocidad = self.velocidadMeteoritos() + velocidadExtra, vida = vida, image = imagen)
return meteorito
}



}
object fondo{
var property image ="fondo.jpg"
method limite_derecho() = 99
method limite_izquierdo() = 9
method limite_arriba() = 80
method limite_abajo() = 0
method cambiarFondo(nivel) {
if (nivel >= 2 && nivel <= 5) {
self.image("fondo-nivel-" + nivel + ".jpg")
return self.image()
}else return 1
}}
object sumar_minicion {
var property position = game.at(120, 51)
var property image = "municion_sinMunicion.png"
const property balas_a_agregar = 10

method cambiarFondo(fondo){
image = fondo
}
}
object poner_Escudo{
var property position = game.at(120,29)
var property image = "icono_escudo_no_disponible.png"
method cambiarFondo(fondo){
image = fondo
}
}

object reducir_velocidad{
var property position = game.at(120, 8)
var property image = "ralentizacion_desactivada.png"

method cambiarFondo(fondo){
image = fondo
}



}








Loading
Loading