diff --git a/assets/js/platformer3x/GameSetup.js b/assets/js/platformer3x/GameSetup.js index 5287a27d..30cd7b6b 100644 --- a/assets/js/platformer3x/GameSetup.js +++ b/assets/js/platformer3x/GameSetup.js @@ -278,14 +278,18 @@ const GameSetup = { quidditch: { src: "/images/platformer/backgrounds/quidditch2.jpg"}, space: { src: "/images/platformer/backgrounds/planet.jpg" }, castles: { src: "/images/platformer/backgrounds/castles.png" }, - loading: { src: "/images/platformer/backgrounds/greenscreen.png" }, - complete: { src: "/images/platformer/backgrounds/OneStar.png" }, - complete2: { src: "/images/platformer/backgrounds/TwoStar.png" }, - complete3: {src: "/images/platformer/backgrounds/ThreeStar.png" }, - end: { src: "/images/platformer/backgrounds/Congratulations!!!.png" }, winter: {src: "/images/platformer/backgrounds/winter.png" }, snow: {src: "/images/platformer/backgrounds/snowfall.png" }, mini: { src: "/images/platformer/backgrounds/mini.png" }, + }, + transitions: { + loading: { src: "/images/platformer/transitions/greenscreen.png" }, + hillsEnd: { src: "/images/platformer/transitions/hillsEnd.png" }, + winterEnd: { src: "/images/platformer/transitions/winterEnd.png" }, + greeceEnd: { src: "/images/platformer/transitions/greeceEnd.png" }, + waterEnd: { src: "/images/platformer/transitions/waterEnd.png" }, + quidditchEnd: { src: "/images/platformer/transitions/quidditchEnd.png" }, + miniEnd: { src: "/images/platformer/transitions/miniEnd.png" }, }, players: { mario: { @@ -618,7 +622,7 @@ const GameSetup = { { name: 'coin', id: 'coin', class: Coin, data: this.assets.obstacles.coin, xPercentage: 0.5898, yPercentage: 0.900 }, { name: 'mario', id: 'player', class: PlayerHills, data: this.assets.players.mario }, { name: 'tube', id: 'tube', class: Tube, data: this.assets.obstacles.tube }, - { name: 'loading', id: 'background', class: BackgroundTransitions, data: this.assets.backgrounds.loading }, + { name: 'loading', id: 'background', class: BackgroundTransitions, data: this.assets.transitions.loading }, ]; let hillsGameObjects = allHillsGameObjects.filter(obj => !obj.difficulties || obj.difficulties.includes(difficulty)); // Hills Game Level added to the GameEnv ... @@ -682,7 +686,7 @@ const GameSetup = { { name: 'dragon', id: 'dragon', class: Dragon, data: this.assets.enemies.dragon, xPercentage: 0.5, minPosition: 0.05}, { name: 'knight', id: 'player', class: PlayerGreece, data: this.assets.players.knight }, { name: 'flag', id: 'flag', class: Flag, data: this.assets.obstacles.flag }, - { name: 'complete2', id: 'background', class: BackgroundTransitions, data: this.assets.backgrounds.complete2 }, + { name: 'hillsEnd', id: 'background', class: BackgroundTransitions, data: this.assets.transitions.hillsEnd }, ]; // Greece Game Level added to the GameEnv ... new GameLevel( {tag: "ancient greece", callback: this.playerOffScreenCallBack, objects: greeceGameObjects} ); @@ -760,7 +764,7 @@ const GameSetup = { { name: 'mario', id: 'player', class: PlayerMini, data: this.assets.players.mario }, { name: 'tubeD', id: 'tubeD', class: Tube1, data: this.assets.obstacles.tubeD}, { name: 'tube', id: 'tube', class: Tube, data: this.assets.obstacles.tube }, - // { name: 'complete', id: 'background', class: BackgroundTransitions, data: this.assets.backgrounds.complete }, + { name: 'greeceEnd', id: 'background', class: BackgroundTransitions, data: this.assets.transitions.greeceEnd }, ]; // Space Game Level added to the GameEnv ... new GameLevel( {tag: "mini", callback: this.playerOffScreenCallBack, objects: miniGameObjects} ); @@ -794,7 +798,7 @@ const GameSetup = { { name: 'coin', id: 'coin', class: Coin, data: this.assets.obstacles.coin, xPercentage: 0.5898, yPercentage: 0.900 }, { name: 'mario', id: 'player', class: PlayerHills, data: this.assets.players.mario }, { name: 'tube', id: 'tube', class: Tube, data: this.assets.obstacles.tube }, - { name: 'loading', id: 'background', class: BackgroundTransitions, data: this.assets.backgrounds.loading }, + { name: 'miniEnd', id: 'background', class: BackgroundTransitions, data: this.assets.transitions.miniEnd }, ]; let waterGameObjects = allWaterGameObjects.filter(obj => !obj.difficulties || obj.difficulties.includes(difficulty)); // Water Game Level added to the GameEnv ... @@ -806,7 +810,6 @@ const GameSetup = { // GameObject(s), the order is important to z-index... { name: 'quidditch', id: 'background', class: Background, data: this.assets.backgrounds.quidditch }, { name: 'turf', id: 'platform', class: Platform, data: this.assets.platforms.turf }, - { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: this.assets.platforms.cobblestone, xPercentage: 0.1, yPercentage: 0.81 }, { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: this.assets.platforms.cobblestone, xPercentage: 0.14, yPercentage: 0.81 }, { name: 'blocks', id: 'jumpPlatform', class: BlockPlatform, data: this.assets.platforms.cobblestone, xPercentage: 0.18, yPercentage: 0.81 }, @@ -854,7 +857,7 @@ const GameSetup = { { name: 'harry', id: 'player', class: PlayerQuidditch, data: this.assets.players.harry }, { name: 'tube', id: 'tube', class: Tube, data: this.assets.obstacles.tube }, - //{ name: 'loading', id: 'background', class: BackgroundTransitions, data: this.assets.backgrounds.loading }, + { name: 'waterEnd', id: 'background', class: BackgroundTransitions, data: this.assets.transitions.waterEnd }, ]; // Quidditch Game Level added to the GameEnv ... @@ -894,7 +897,7 @@ const GameSetup = { { name: 'snowman', id: 'snowman', class: Snowman, data: this.assets.enemies.Snowman, xPercentage: 0.5, minPosition: 0.1, difficulties: ["normal", "hard", "impossible"]}, { name: 'mario', id: 'player', class: PlayerWinter, data: this.assets.players.whitemario }, { name: 'cabin', id: 'cabin', class: Cabin, data: this.assets.obstacles.cabin }, - { name: 'complete', id: 'background', class: BackgroundTransitions, data: this.assets.backgrounds.complete }, + { name: 'quidditchEnd', id: 'background', class: BackgroundTransitions, data: this.assets.transitions.quidditchEnd }, ]; // Winter Game Level added to the GameEnv ... new GameLevel( {tag: "winter", callback: this.playerOffScreenCallBack, objects: winterObjects} ); @@ -902,7 +905,7 @@ const GameSetup = { // Game Over Level definition... const endGameObjects = [ - { name:'background', class: Background, id: 'background', data: this.assets.backgrounds.end} + { name:'background', class: Background, id: 'background', data: this.assets.transitions.winterEnd} ]; // Game Over screen added to the GameEnv ... new GameLevel( {tag: "end", callback: this.gameOverCallBack, objects: endGameObjects } ); diff --git a/images/platformer/backgrounds/ThreeStar.png b/images/platformer/backgrounds/ThreeStar.png deleted file mode 100644 index 049a3c81..00000000 Binary files a/images/platformer/backgrounds/ThreeStar.png and /dev/null differ diff --git a/images/platformer/backgrounds/TwoStar.png b/images/platformer/backgrounds/TwoStar.png deleted file mode 100644 index 166db90d..00000000 Binary files a/images/platformer/backgrounds/TwoStar.png and /dev/null differ diff --git a/images/platformer/backgrounds/bluescreen.png b/images/platformer/backgrounds/bluescreen.png deleted file mode 100644 index 181754b2..00000000 Binary files a/images/platformer/backgrounds/bluescreen.png and /dev/null differ diff --git a/images/platformer/backgrounds/completed.png b/images/platformer/backgrounds/completed.png deleted file mode 100644 index 8529d6a1..00000000 Binary files a/images/platformer/backgrounds/completed.png and /dev/null differ diff --git a/images/platformer/backgrounds/loading.png b/images/platformer/backgrounds/loading.png deleted file mode 100644 index 1c297bab..00000000 Binary files a/images/platformer/backgrounds/loading.png and /dev/null differ diff --git a/images/platformer/backgrounds/testing.jpg b/images/platformer/backgrounds/testing.jpg deleted file mode 100644 index 7f604663..00000000 Binary files a/images/platformer/backgrounds/testing.jpg and /dev/null differ diff --git a/images/platformer/obstacles/snowflakewithoutbg.png b/images/platformer/obstacles/snowflakewithoutbg.png deleted file mode 100644 index 5222eca9..00000000 Binary files a/images/platformer/obstacles/snowflakewithoutbg.png and /dev/null differ diff --git a/images/platformer/transitions/greeceEnd.png b/images/platformer/transitions/greeceEnd.png new file mode 100644 index 00000000..053e1beb Binary files /dev/null and b/images/platformer/transitions/greeceEnd.png differ diff --git a/images/platformer/backgrounds/greenscreen.png b/images/platformer/transitions/greenscreen.png similarity index 100% rename from images/platformer/backgrounds/greenscreen.png rename to images/platformer/transitions/greenscreen.png diff --git a/images/platformer/backgrounds/OneStar.png b/images/platformer/transitions/hillsEnd.png similarity index 100% rename from images/platformer/backgrounds/OneStar.png rename to images/platformer/transitions/hillsEnd.png diff --git a/images/platformer/transitions/miniEnd.png b/images/platformer/transitions/miniEnd.png new file mode 100644 index 00000000..6ee8708c Binary files /dev/null and b/images/platformer/transitions/miniEnd.png differ diff --git a/images/platformer/transitions/quidditchEnd.png b/images/platformer/transitions/quidditchEnd.png new file mode 100644 index 00000000..dc73c68c Binary files /dev/null and b/images/platformer/transitions/quidditchEnd.png differ diff --git a/images/platformer/transitions/waterEnd.png b/images/platformer/transitions/waterEnd.png new file mode 100644 index 00000000..67ceb3e9 Binary files /dev/null and b/images/platformer/transitions/waterEnd.png differ diff --git a/images/platformer/backgrounds/Congratulations!!!.png b/images/platformer/transitions/winterEnd.png similarity index 100% rename from images/platformer/backgrounds/Congratulations!!!.png rename to images/platformer/transitions/winterEnd.png