Skip to content

Commit d7e2d05

Browse files
authored
Merge pull request #127 from Parallaxes/transition-fix
Fixed Transitions
2 parents f01a444 + 920e25c commit d7e2d05

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

assets/js/platformer/GameSetup.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import GameSetterHills from './GameSetterHills.js';
1010
import GameSetterGreece from './GameSetterGreece.js';
1111
import GameSetterQuidditch from './GameSetterQuidditch.js';
1212
import GameSetterWinter from './GameSetterWinter.js';
13-
import GameSetterBoss from './GameSetterBoss.js';
1413
import GameSetterSkibidi from './GameSetterSkibidi.js';
1514
import GameSetterBossFight from './GameSetterBossFight.js'
1615
import GameSetterEnd from './GameSetterEnd.js';
@@ -231,7 +230,6 @@ const GameSetup = {
231230
GameLevelSetup(GameSetterQuidditch, this.path, this.playerOffScreenCallBack);
232231
GameLevelSetup(GameSetterWinter, this.path, this.playerOffScreenCallBack);
233232
GameLevelSetup(GameSetterSkibidi, this.path, this.playerOffScreenCallBack);
234-
GameLevelSetup(GameSetterBoss, this.path, this.playerOffScreenCallBack);
235233
GameLevelSetup(GameSetterBossFight, this.path, this.playerOffScreenCallBack);
236234
// End Game
237235
GameLevelSetup(GameSetterEnd, this.path, this.gameOverCallBack, true);

assets/js/platformer/GameSetterBoss.js renamed to assets/js/platformer/archive/GameSetterBoss.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import BackgroundParallax from './BackgroundParallax.js';
2-
import BackgroundTransitions from './BackgroundTransitions.js';
3-
import Platform from './Platform.js';
4-
import FinishLine from './FinishLine.js';
5-
import Boss from './Boss.js';
6-
import PlayerZombie from './PlayerZombie.js';
7-
import BossItem from './BossItem.js';
8-
import PlayerBoss from './PlayerBoss.js';
9-
import BossFight from './BossFight.js';
1+
import BackgroundParallax from '../BackgroundParallax.js';
2+
import BackgroundTransitions from '../BackgroundTransitions.js';
3+
import Platform from '../Platform.js';
4+
import FinishLine from '../FinishLine.js';
5+
import PlayerHills from '../PlayerHills.js';
6+
import Boss from '../Boss.js';
7+
import PlayerZombie from '../PlayerZombie.js';
8+
import BossItem from '../BossItem.js';
9+
import BossFight from '../BossFight.js';
1010

1111
// Define the GameSetup object literal
1212
const assets = {
@@ -122,7 +122,7 @@ const assets = {
122122
{ name: 'devil', id: 'devil', class:BackgroundParallax, data: assets.backgrounds.devil},
123123
{ name: 'boss', id: 'boss', class: BossFight, data: assets.enemies.boss, xPercentage: 0.5, minPosition: 0.3 },
124124
{ name: 'itemBlock', id: 'jumpPlatform', class: BossItem, data: assets.platforms.itemBlock, xPercentage: 0.2, yPercentage: 0.65 }, //item block is a platform
125-
{ name: 'mario', id: 'player', class: PlayerBoss, data: assets.players.mario },
125+
{ name: 'mario', id: 'player', class: PlayerHills, data: assets.players.mario },
126126
{ name: 'zombie', id: 'player', class: PlayerZombie, data: assets.players.zombie },
127127
{ name: 'grass', id: 'platform', class: Platform, data: assets.platforms.grass },
128128
{ name: 'tube', id: 'finishline', class: FinishLine, data: assets.obstacles.tube, xPercentage: 0.85, yPercentage: 0.855 },

assets/js/platformer/PlayerBoss.js renamed to assets/js/platformer/archive/PlayerBoss.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import GameEnv from './GameEnv.js';
2-
import PlayerBase from './PlayerBase.js';
3-
import GameControl from './GameControl.js';
1+
import GameEnv from '../GameEnv.js';
2+
import PlayerBase from '../PlayerBase.js';
3+
import GameControl from '../GameControl.js';
44
/**
55
* @class PlayerHills class
66
* @description PlayerHills.js key objective is to eent the user-controlled character in the game.

0 commit comments

Comments
 (0)