diff --git a/Testers.json b/Testers.json index 9a431e4..f919dcb 100644 --- a/Testers.json +++ b/Testers.json @@ -32,6 +32,7 @@ { "Tester": "airrstarr.near" }, { "Tester": "sebaslopez.near" }, { "Tester": "miles1.near" }, + { "Tester": "talalawais.near" }, { "Tester": "6a47bcdc8b65d1e20c2dd96984489ab974a3c79efb725d556060a918288f44b0"}, { "Tester": "08e729e8b5084ceb086b840948a72da4f9221c56d449ca07c45447aa895927d7"}, { "Tester": "c923edb57811bda1387b004ec7c07fe980a040555bda38a7ec7bc00cf0cbed30"}, diff --git a/src/Scenes/ColiseoScene.js b/src/Scenes/ColiseoScene.js index 276f959..630def3 100644 --- a/src/Scenes/ColiseoScene.js +++ b/src/Scenes/ColiseoScene.js @@ -53,7 +53,6 @@ export default class Coliseo extends Phaser.Scene{ async Start(){ this.loadingScreen = new LoadingScreen(this); this.incursion = await Near.GetActiveIncursion(); - console.log(this.incursion); let duration = 108_000_000; if(this.incursion.status == "Null" || parseInt(Date.now()) > parseInt(this.incursion.finish_time.toString().substring(0, 13)) + duration){ @@ -87,7 +86,6 @@ export default class Coliseo extends Phaser.Scene{ if(battleIncursion.room.health <= 0){ await this.loadingScreen.OnComplete(); await Alert.Fire(this, Translate.Translate("TleDeadBurrito"), Translate.Translate("MsgDeadBurrito"), Translate.Translate("BtnAccept")); - this.CreateIncursionInfo(); } else this.scene.start("ColiseoBattle"); @@ -141,6 +139,7 @@ export default class Coliseo extends Phaser.Scene{ Range = (start, end) => Array(end - start + 1).fill().map((_, idx) => start + idx); BackToPradera = () =>{ clearInterval(this.counterInterval); + localStorage.setItem("openDoor", true); this.scene.start("Pradera"); } ConfirmIncursion = async() => { diff --git a/src/Scenes/MainMenuScene.js b/src/Scenes/MainMenuScene.js index 71fc298..96cc544 100644 --- a/src/Scenes/MainMenuScene.js +++ b/src/Scenes/MainMenuScene.js @@ -108,7 +108,6 @@ export default class MainMenu extends Phaser.Scene{ this.sound.add("acoustic-motivation", { loop: true, volume: SettingsButton.GetVolume()}).play(); await this.loadingScreen.OnComplete(); - console.log(this.ShortName("6a47bcdc8b65d1e20c2dd96984489ab974a3c79efb725d556060a918288f44b0")) } diff --git a/src/Scenes/PraderaScene.js b/src/Scenes/PraderaScene.js index 726b497..3e3fde5 100644 --- a/src/Scenes/PraderaScene.js +++ b/src/Scenes/PraderaScene.js @@ -2,6 +2,7 @@ import { Alert, LoadingScreen, SettingsButton, TokenHud, BurritoHud, BackMainMen import * as Near from '../Near.js'; import {Translate} from '../Language/Translate.js' import { Cactus } from '../Helpers/Objects.js'; +import Coliseo from './ColiseoScene.js'; export default class Pradera extends Phaser.Scene{ tmpX = 0; @@ -21,6 +22,7 @@ export default class Pradera extends Phaser.Scene{ preload(){ this.game.sound.stopAll(); this.sound.removeAll(); + } create(){ this.loadingScreen = new LoadingScreen(this); @@ -36,7 +38,6 @@ export default class Pradera extends Phaser.Scene{ this.footStepsSFX.play(); if(localStorage.getItem("burrito_selected") == null){ - console.log("no burrito"); await this.loadingScreen.OnComplete(); this.add.image(0, 0, "cell_1").setOrigin(0,0) this.add.image(0, 0, "cell_1_details_1").setOrigin(0,0) @@ -57,7 +58,6 @@ export default class Pradera extends Phaser.Scene{ } this.incursion = await Near.GetActiveIncursion(); - console.log(this.incursion); if(this.incursion.status == "Null" || parseInt(Date.now()) > parseInt(this.incursion.finish_time.toString().substring(0, 13)) + 108000000){ this.coliseum_top = this.InsertImageInQuadrant({quadrant: {x: 1, y: 2}, image: {path:"coliseo_up_normal"}, offset: {x: 0, y:0}, depth : 2}); @@ -324,9 +324,12 @@ export default class Pradera extends Phaser.Scene{ [cell_13, cell_14, cell_15, cell_16, ], [cDesert, cDesert, cDesert, cDesert, ], ]; - - this.InsertImageInQuadrant({quadrant: {x: 1, y: 3}, animation: {path:"coliseo_puerta", end: 53, repeat: 0}, offset: {x:0, y:0}, depth: -1}); - + if(localStorage.getItem("openDoor") == null){ + this.InsertImageInQuadrant({quadrant: {x: 1, y: 3}, animation: {path:"coliseo_puerta", end: 53, repeat: 0}, offset: {x:0, y:0}, depth: -1}); + } else{ + this.InsertImageInQuadrant({quadrant: {x: 1, y: 3}, image: {path:"coliseo_down_roto" }, offset: {x:0, y:0}, depth: 1}); + } + this.zoneBattles_pradera = this.physics.add.group(); this.zoneBattles_desierto = this.physics.add.group(); this.anims.create({key: "sandStormAnim_1", frameRate:30, frames: this.anims.generateFrameNumbers("sand_storm_1", {start: 0, end:28}), repeat: -1}); @@ -514,32 +517,40 @@ export default class Pradera extends Phaser.Scene{ this.burrito.body.stop(); this.followCharacter = false; this.StopAnimation(); - this.canMove =false; - this.tweens.timeline({ - duration:1500, - delay:100, - tweens:[{ - targets: this.cameras.main, - scrollX: x, - scrollY: y, - onComplete: () => { - this.footStepsSFX.setMute(false); - if(currentQuadrant.x === 1 && currentQuadrant.y == 3 && this.openDoor && this.mustOpenDoor){ - setTimeout(() => { - this.sound.add("open_gates", { loop: false, volume: SettingsButton.GetVolume()}).play(); - this.coliseum_down.play("coliseo_puerta_anim"); - this.cameras.main.shake(1200, 0.005); - this.openDoor = false; - setTimeout(() => { - this.canMove=true; - }, 2000); - }, 500); - } else{ - this.canMove = true; + this.canMove =false; + this.tweens.timeline({ + duration:1500, + delay:100, + tweens:[{ + targets: this.cameras.main, + scrollX: x, + scrollY: y, + onComplete: () => { + this.footStepsSFX.setMute(false); + if(currentQuadrant.x === 1 && currentQuadrant.y == 3 && this.openDoor && this.mustOpenDoor){ + if(!localStorage.getItem("openDoor") || localStorage.getItem("openDoor") == null){ + setTimeout(() => { + this.sound.add("open_gates", { loop: false, volume: SettingsButton.GetVolume()}).play(); + this.coliseum_down.play("coliseo_puerta_anim"); + this.cameras.main.shake(1200, 0.005); + this.openDoor = false; + setTimeout(() => { + this.canMove=true; + }, 2000); + }, 2000); + } else{ + localStorage.removeItem("openDoor"); + this.canMove = true; + this.openDoor = false; + } + } else{ + this.canMove = true; + + } } - } - }] - }) + }] + }) + this.tmpX = x; this.tmpY = y; } diff --git a/src/index.js b/src/index.js index 380b899..da2dc87 100644 --- a/src/index.js +++ b/src/index.js @@ -52,4 +52,4 @@ const config = { (async()=>await Translate.LoadJson())(); (async()=>await Near.Initialize())(); -new Phaser.Game(config); +new Phaser.Game(config); \ No newline at end of file