#34: Made magic duration time a global constant

wpernath · Sep 10, 2022 · 3aecd01 · 3aecd01
1 parent 1555e1a
commit 3aecd01
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/melonjs-client/src/main/client/js/renderables/magic-firespin.js b/melonjs-client/src/main/client/js/renderables/magic-firespin.js
@@ -42,7 +42,7 @@ export default class MagicFirespin extends BaseWeapon {
 				game.world.removeChild(this);
 				this.owner.spell = null;
 			},
-			10000,
+			GlobalGameState.magicDurationTime,
 			true
 		);
 

diff --git a/melonjs-client/src/main/client/js/renderables/magic-nebula.js b/melonjs-client/src/main/client/js/renderables/magic-nebula.js
@@ -51,7 +51,7 @@ export default class MagicNebula extends BaseWeapon {
 				this.owner.spell = null;
 				this.owner.hasPlacedNebula = false;
 			},
-			15000,
+			GlobalGameState.magicDurationTime,
 			true
 		);
 	}

diff --git a/melonjs-client/src/main/client/js/renderables/magic-protection.js b/melonjs-client/src/main/client/js/renderables/magic-protection.js
@@ -45,7 +45,7 @@ export default class MagicProtectionCircle extends BaseWeapon {
 				this.owner.spell = null;
 				GlobalGameState.invincible = false;
 			},
-			15000,
+			GlobalGameState.magicDurationTime,
 			true
 		);
 

diff --git a/melonjs-client/src/main/client/js/util/global-game-state.js b/melonjs-client/src/main/client/js/util/global-game-state.js
@@ -18,7 +18,8 @@ const GlobalGameState = {
 	// some configs
 	enemyStunnedTime: 5000, // ms
 	playerInvincibleTime: 3000, // ms
-
+	magicDurationTime: 15000,
+
 	// adding score for different elements
 	scoreForPills: 10,
 	scoreForBombs: 50,
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ export default class MagicFirespin extends BaseWeapon { @@
     				game.world.removeChild(this);
     				this.owner.spell = null;
     			},
-,
+    			GlobalGameState.magicDurationTime,
     			true
     		);
@@ Expand Down @@