Skip to content

Commit 7851171

Browse files
authored
Merge pull request #130 from casonpollak/main
Finishing greece level
2 parents 8a10fb7 + 268de8a commit 7851171

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

assets/js/platformer/GameSetterQuidditch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ const assets = {
189189

190190
{ name: 'harry', id: 'player', class: PlayerQuidditch, data: assets.players.harry },
191191
{ name: 'tube', id: 'finishline', class: FinishLine, data: assets.obstacles.tube, xPercentage: 0.85, yPercentage: 0.855 },
192-
{ name: 'tubeU', id: 'minifinishline', class: FinishLine, data: assets.obstacles.tubeU, xPercentage: 0.69, yPercentage: 0.9 },
192+
/// { name: 'tubeU', id: 'minifinishline', class: FinishLine, data: assets.obstacles.tubeU, xPercentage: 0.69, yPercentage: 0.9 },
193193
{ name: 'waterEnd', id: 'background', class: BackgroundTransitions, data: assets.transitions.waterEnd },
194194

195195
];

assets/js/platformer/PlayerGreece.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@ export class PlayerGreece extends PlayerBase {
104104
this.state.movement.right = true;
105105
}
106106
break;
107-
case "finishline":
108-
if(this.collisionData.touchPoints.this.other.id && GameEnv.hasFlag.length == 1){
107+
case "flyingIsland":
108+
//When the flying island is touched whilst the player has the flag, it transitions to the next level
109+
if(this.collisionData.touchPoints.this.top && GameEnv.hasFlag.length == 1){
109110
const index = GameEnv.levels.findIndex(level => level.tag === "Quidditch");
110111
GameControl.transitionToLevel(GameEnv.levels[index]);
112+
break;
111113
}
112114
console.log("finish line checks")
113115
console.log(GameEnv.gameObjects)

0 commit comments

Comments
 (0)