From 0e6a6024d0ed0f76e6627c8f95d876e4279377af Mon Sep 17 00:00:00 2001 From: Araozu Date: Thu, 31 Dec 2020 09:22:02 -0500 Subject: [PATCH] Modificar formula para el puntaje (de nuevo) --- public/img/formula-puntaje.png | Bin 0 -> 5335 bytes src/components/carta.vue | 2 +- src/views/Juego/components/pantalla-ganador.vue | 10 +++++----- src/views/Tutorial/views/Puntaje.vue | 6 ++++-- 4 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 public/img/formula-puntaje.png diff --git a/public/img/formula-puntaje.png b/public/img/formula-puntaje.png new file mode 100644 index 0000000000000000000000000000000000000000..13f76db83660ec20c9b8e0905b8ca0c66b8852ee GIT binary patch literal 5335 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 PsRSTZpTf&w<{$nKn;|ix literal 0 HcmV?d00001 diff --git a/src/components/carta.vue b/src/components/carta.vue index a54af4b..e230cff 100644 --- a/src/components/carta.vue +++ b/src/components/carta.vue @@ -185,7 +185,7 @@ export default defineComponent({ opacity: 1 !important .c-carta - opacity: 0.85 + opacity: 0.95 position: relative font: size: calc(var(--phx) * 4 * var(--escala)) diff --git a/src/views/Juego/components/pantalla-ganador.vue b/src/views/Juego/components/pantalla-ganador.vue index a00e893..7cf9022 100644 --- a/src/views/Juego/components/pantalla-ganador.vue +++ b/src/views/Juego/components/pantalla-ganador.vue @@ -33,6 +33,10 @@ const aumentarValorA = (ref: Ref, valorDestino: number) => { }; +const formulaPuntos = (x: number) => 1000 * Math.floor( + 3 * x + (x ** 3 * 125) / 1000 +); + export default defineComponent({ name: "pantalla-ganador", components: {grupoCartas}, @@ -92,11 +96,7 @@ export default defineComponent({ for (const y of yaku.value) { n += obtValorYaku(y) } - if (n === 0) return 100; - - const preValor = 1000 + (270 * n ** 2) - (18 * n ** 3); - // Eliminar los 2 ultimos nĂºmeros. - return Math.floor(preValor / 100) * 100; + return formulaPuntos(n); }); const obtTextoYaku = (y: Yaku) => { diff --git a/src/views/Tutorial/views/Puntaje.vue b/src/views/Tutorial/views/Puntaje.vue index bcc819d..9bfef46 100644 --- a/src/views/Tutorial/views/Puntaje.vue +++ b/src/views/Tutorial/views/Puntaje.vue @@ -6,7 +6,7 @@ div p Luego se obtienen los puntos otorgados por los bonus. p La suma de estos dos es la cantidad de puntos total. Para obtener las monedas se usa la formula: - p floor((5x^2) / 5) * 1500 + 500x + img(:src="'/img/formula-puntaje.png'" style="height: 100px; width: auto;") p En la siguiente tabla se muestran los valores comunes: @@ -29,7 +29,9 @@ div