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

agrego herencia a el menu y assets distintos para clientes #44

Merged
merged 1 commit into from
Nov 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 assets/cliente_normal.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/cliente_paciente.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/cliente_quisquilloso.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions clientes.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import adminClientes.*
import wollok.game.*


class Cliente inherits Persona(position = game.at(86,25)){
class Cliente inherits Persona(position = game.at(86,15)){
var pedidoQueEspero = []
var emocion = neutral
var nivelDePaciencia = null
Expand Down Expand Up @@ -98,10 +98,10 @@ class Cliente inherits Persona(position = game.at(86,25)){

}

class ClienteNormal inherits Cliente(nivelDePaciencia = 40000, image = "image_clieneNormal.png", name = "clienteNormal"){
class ClienteNormal inherits Cliente(nivelDePaciencia = 40000, image = "cliente_normal.png", name = "clienteNormal"){
const disponibilidadParaTip = 50

override method reaccionBuena(){
override method reaccionBuena(){ //cliente_normal.png
emocion = feliz
self.celebrar()
super()
Expand All @@ -127,9 +127,9 @@ class ClienteNormal inherits Cliente(nivelDePaciencia = 40000, image = "image_cl
}
}

class ClientePaciente inherits ClienteNormal(nivelDePaciencia = 45000, image = "image_clienePaciente.png", name = "clientePaciente", disponibilidadParaTip = 100){
class ClientePaciente inherits ClienteNormal(nivelDePaciencia = 45000, image = "cliente_paciente.png", name = "clientePaciente", disponibilidadParaTip = 100){

override method reaccionMala(){
override method reaccionMala(){ //cliente_paciente.png
emocion = neutral
}
}
Expand All @@ -142,9 +142,9 @@ class Emotion {
}
}

class ClienteQuisquilloso inherits Cliente(nivelDePaciencia = 30000, image = "image_clieneQuisquilloso.png", name = "clienteQuisquilloso"){
class ClienteQuisquilloso inherits Cliente(nivelDePaciencia = 30000, image = "cliente_quisquilloso.png", name = "clienteQuisquilloso"){

override method reaccionBuena(){
override method reaccionBuena(){ //cliente_quisquilloso.png
emocion = neutral
super()
}
Expand Down
56 changes: 16 additions & 40 deletions comestibles.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -237,43 +237,19 @@ class Hongo inherits Ingrediente( image = "hongo_inicial.png", imgProcesadoFinal
}
}

object ingredienteMasa {
override method toString() {
return "Masa"
}
}
object ingredienteQueso {
override method toString() {
return "Queso"
}
}
object ingredienteTomate {
override method toString() {
return "Tomate"
}
}
object ingredienteSalsa{
override method toString() {
return "Salsa"
}
}
object ingredienteAceituna {
override method toString() {
return "Aceituna"
}
}
object ingredienteHuevo {
override method toString() {
return "Huevo"
}
}
object ingredienteAtun {
override method toString() {
return "Atun"
}
}
object ingredienteHongo {
override method toString() {
return "Hongo"
}
}
class IngredienteMenu{
const nombreEnMenu = null

method nombreIngrediente() {
return nombreEnMenu
}
}

object ingredienteMasa inherits IngredienteMenu(nombreEnMenu = "Masa") {}
object ingredienteQueso inherits IngredienteMenu(nombreEnMenu = "Queso") {}
object ingredienteTomate inherits IngredienteMenu(nombreEnMenu = "Tomate") {}
object ingredienteSalsa inherits IngredienteMenu(nombreEnMenu = "Salsa") {}
object ingredienteAceituna inherits IngredienteMenu(nombreEnMenu = "Aceituna") {}
object ingredienteHuevo inherits IngredienteMenu(nombreEnMenu = "Huevo") {}
object ingredienteAtun inherits IngredienteMenu(nombreEnMenu = "Atun") {}
object ingredienteHongo inherits IngredienteMenu(nombreEnMenu = "Hongo") {}