Merge branch 'nighthawkcoders:main' into main

nighthawkcoders · Feb 14, 2025 · 6604257 · 6604257
2 parents dc5c103 + d7e2d05
commit 6604257
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/assets/js/platformer/GameSetup.js b/assets/js/platformer/GameSetup.js
@@ -10,7 +10,6 @@ import GameSetterHills from './GameSetterHills.js';
 import GameSetterGreece from './GameSetterGreece.js';
 import GameSetterQuidditch from './GameSetterQuidditch.js';
 import GameSetterWinter from './GameSetterWinter.js';
-import GameSetterBoss from './GameSetterBoss.js';
 import GameSetterSkibidi from './GameSetterSkibidi.js';
 import GameSetterBossFight from './GameSetterBossFight.js'
 import GameSetterEnd from './GameSetterEnd.js';
@@ -231,7 +230,6 @@ const GameSetup = {
     GameLevelSetup(GameSetterQuidditch, this.path, this.playerOffScreenCallBack);
     GameLevelSetup(GameSetterWinter, this.path, this.playerOffScreenCallBack);
     GameLevelSetup(GameSetterSkibidi, this.path, this.playerOffScreenCallBack);
-    GameLevelSetup(GameSetterBoss, this.path, this.playerOffScreenCallBack);
     GameLevelSetup(GameSetterBossFight, this.path, this.playerOffScreenCallBack);
     // End Game
     GameLevelSetup(GameSetterEnd, this.path, this.gameOverCallBack, true);

diff --git a/assets/js/platformer/GameSetterBoss.js → ...s/js/platformer/archive/GameSetterBoss.js b/assets/js/platformer/GameSetterBoss.js → ...s/js/platformer/archive/GameSetterBoss.js
@@ -1,12 +1,12 @@
-import BackgroundParallax from './BackgroundParallax.js';
-import BackgroundTransitions from './BackgroundTransitions.js';
-import Platform from './Platform.js';
-import FinishLine from './FinishLine.js';
-import Boss from './Boss.js';
-import PlayerZombie from './PlayerZombie.js';
-import BossItem from './BossItem.js';
-import PlayerBoss from './PlayerBoss.js';
-import BossFight from './BossFight.js';
+import BackgroundParallax from '../BackgroundParallax.js';
+import BackgroundTransitions from '../BackgroundTransitions.js';
+import Platform from '../Platform.js';
+import FinishLine from '../FinishLine.js';
+import PlayerHills from '../PlayerHills.js';
+import Boss from '../Boss.js';
+import PlayerZombie from '../PlayerZombie.js';
+import BossItem from '../BossItem.js';
+import BossFight from '../BossFight.js';
 
 // Define the GameSetup object literal
 const assets = {  
@@ -122,7 +122,7 @@ const assets = {
     { name: 'devil', id: 'devil', class:BackgroundParallax, data: assets.backgrounds.devil},
     { name: 'boss', id: 'boss', class: BossFight, data: assets.enemies.boss, xPercentage: 0.5, minPosition: 0.3 },
     { name: 'itemBlock', id: 'jumpPlatform', class: BossItem, data: assets.platforms.itemBlock, xPercentage: 0.2, yPercentage: 0.65 }, //item block is a platform
-    { name: 'mario', id: 'player', class: PlayerBoss, data: assets.players.mario },
+    { name: 'mario', id: 'player', class: PlayerHills, data: assets.players.mario },
     { name: 'zombie', id: 'player', class: PlayerZombie, data: assets.players.zombie },
     { name: 'grass', id: 'platform', class: Platform, data: assets.platforms.grass },
     { name: 'tube', id: 'finishline', class: FinishLine, data: assets.obstacles.tube, xPercentage: 0.85, yPercentage: 0.855 },

diff --git a/assets/js/platformer/PlayerBoss.js → assets/js/platformer/archive/PlayerBoss.js b/assets/js/platformer/PlayerBoss.js → assets/js/platformer/archive/PlayerBoss.js
@@ -1,6 +1,6 @@
-import GameEnv from './GameEnv.js';
-import PlayerBase from './PlayerBase.js';
-import GameControl from './GameControl.js';
+import GameEnv from '../GameEnv.js';
+import PlayerBase from '../PlayerBase.js';
+import GameControl from '../GameControl.js';
 /**
  * @class PlayerHills class
  * @description PlayerHills.js key objective is to eent the user-controlled character in the game.