Added camera modes shared, follow A, or follow B. Made fans last longer

HeartLine · Feb 10, 2013 · 7a0fc49 · 7a0fc49
1 parent 48c2259
commit 7a0fc49
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/js/fan.js b/js/fan.js
@@ -9,7 +9,7 @@ var FAN_W = 32;
 var FAN_H = 32;
 var FAN_SPAWN_TIMER = 1;
 var FAN_MAX_POWER = 200;
-var FAN_POWER_THRESHOLD = 100; //How much power needed to spin
+var FAN_POWER_THRESHOLD = 55; //How much power needed to spin
 var FAN_GOO_POWER = 50; //How much power one goo gives
 var FAN_POWER_UPKEEP = 1; //How much power lost per frame
 

diff --git a/js/game.js b/js/game.js
@@ -44,6 +44,7 @@ var CAMERA_SHAKE_FACTOR = 10;
 var camera = {
  x: 0,
  y: 0,
+ mode: 'shared',
  minZoom: 0.5,//calculate this at beginning of each room.
  zoom: 1,
  shake: 0, //0 is normal, > 0 is a timer for shaking,
@@ -430,10 +431,10 @@ var step = function() {
  doTransition();
  break;
  }
- if(playerA.dead) {
+ if(playerA.dead || camera.mode == 'B') {
  camera.moveTo(playerB.x, playerB.y);
  }
- else if(playerB.dead) {
+ else if(playerB.dead || camera.mode == 'A') {
  camera.moveTo(playerA.x, playerA.y);
  }
  else {