Update README.md

README.md

@@ -3,7 +3,12 @@ moonlight-skulk
 
 moonlight-skulk is the working title for a stealth game wherein you have 8 game hours to steal as much loot as you can before being detected, or before the sun rises.
 
+Development Discontinued
+========
+
+My employer has requested that I stop all work on this project. Sorry folks.
+
 Development notes
 ======
 
-Development status is tracked on Waffle : https://waffle.io/akesterson/moonlight-skulk
+Development status is tracked on Waffle : https://waffle.io/akesterson/moonlight-skulk

moonlight/index.html

@@ -24,19 +24,27 @@
       </div>
       <table>
 	<tr>
-	  <td>
-	    <br/>Audio Volume
+	 <td rowspan=2>
+            <ul>
+              <li>Click New Game to start</li>
+              <li>Arrow keys to walk</li>
+              <li>Hold down SHIFT to run</li>
+              <li>Face someone and press<br/>SPACE to steal</li>
+            </ul>
+          </td>
+          <td>
+	    Audio Volume
 	  </td>
 	  <td>
-	    <br/><input type="range" id="uiMusicVolume" min="1" max="100" value="75"/>
+	    <input type="range" id="uiMusicVolume" min="1" max="100" value="75"/>
 	  </td>
 	</tr>
 	<tr>
 	  <td>
-	    <br/>Brightness
+	    Brightness
 	  </td>
 	  <td>
-	    <br/><input type="range" id="uiGamma" min="1" max="30" value="0"/>
+	    <input type="range" id="uiGamma" min="1" max="30" value="0"/>
 	  </td>
 	</tr>
       </table>

moonlight/src/GameStates.js

@@ -4,8 +4,6 @@ var GameState = function(game) {
 GameState.prototype.updateClock = function()
 {
     this.clock.setSeconds(this.clock.getSeconds() + 1);
-    if ( this.clock.getSeconds() == 59)
-	player.score += SCORE_PERSECOND;
     this.clock.setMilliseconds(0);
 }
 
@@ -22,7 +20,7 @@ GameState.prototype.create = function()
     for (var ln in moonlightSettings['map']['layers']) {
 	lp = moonlightSettings['map']['layers'][ln];
 	if ( lp['type'] == "tiles" ) {
-	    layer = this.map.createLayer(ln);	    
+	    layer = this.map.createLayer(ln);
 	    this.map.setCollisionBetween(
 		lp['collisionBetween'][0],
 		lp['collisionBetween'][1],
@@ -31,7 +29,10 @@ GameState.prototype.create = function()
 	    );
 	    if ( lp['inject_sprites'] == true ) {
 		this.aiSprites = game.add.group();
-		this.aiSprites.debug = true;
+		this.aiSprites.debug = false;
+		this.aiSpriteEffects = game.add.group();
+		this.staticSounds = game.add.group();
+		this.bubble_group = game.add.group();
 		this.map.createFromObjects('AI', 3544, 'player', 0, true, false, this.aiSprites, AISprite);
 		this.aiSprites.forEach(function(spr) {
 		    spr.update_new_values();
@@ -73,7 +74,7 @@ GameState.prototype.create = function()
 				  this.map.height,
 				  pfgrid);
     pathfinder = new PF.AStarFinder({allowDiagonal: false});
-    
+
     this.physics.arcade.enable(player);
     player.body.setSize(16, 16, 8, 16);
     player.body.center = new Phaser.Point(player.body.width / 2, player.body.height + player.body.halfHeight);
@@ -91,6 +92,7 @@ GameState.prototype.create = function()
 
     this.camera.follow(player, Phaser.Camera.FOLLOW_TOPDOWN);
     controls = game.input.keyboard.createCursorKeys();
+    controls.run = game.input.keyboard.addKey(Phaser.Keyboard.SHIFT);
     controls.steal = game.input.keyboard.addKey(Phaser.Keyboard.SPACEBAR);
 
     this.effectSprites = game.add.group();
@@ -112,16 +114,12 @@ GameState.prototype.create = function()
 	light.update_new_values();
     }, this)
 
-    this.aiSpriteEffects = game.add.group();
-			     
-    this.staticSounds = game.add.group();
+
     this.map.createFromObjects('Sounds', 11, 'player', 0, true, false, this.staticSounds, SoundSprite);
     this.staticSounds.forEach(function(snd) {
 	snd.update_new_values();
     }, this)
 
-    this.bubble_group = game.add.group();
-
     this.uigroup = game.add.group();
     this.recentlyStolenGroup = game.add.group();
     this.game.time.advancedTiming = true;
@@ -129,7 +127,7 @@ GameState.prototype.create = function()
     this.clock = new Date();
     this.clock.setHours(20, 00, 0, 0);
     this.clockTimer = game.time.create(true);
-    this.clockTimer.repeat(DAYLIGHT_TIMER_REPEAT, 
+    this.clockTimer.repeat(DAYLIGHT_TIMER_REPEAT,
 			   DAYLIGHT_TIMER_REPEATCOUNT,
 			   this.updateClock,
 			   this);
@@ -139,33 +137,35 @@ GameState.prototype.create = function()
 
     var hudoffset = game.camera.height - 68;
     this.hud = this.game.add.image(0, hudoffset, 'hud', 0, this.uigroup);
-    this.hud_hourhand = this.game.add.sprite(39, 
-					     hudoffset + 36, 
-					     'clock_hourhand', 
-					     0, 
+    this.hud_hourhand = this.game.add.sprite(39,
+					     hudoffset + 36,
+					     'clock_hourhand',
+					     0,
 					     this.uigroup);
     this.hud_hourhand.anchor.setTo(0.5, 0.5);
-    this.hud_minutehand = this.game.add.sprite(39, 
-					       hudoffset + 36, 
-					       'clock_minutehand', 
-					       0, 
+    this.hud_minutehand = this.game.add.sprite(39,
+					       hudoffset + 36,
+					       'clock_minutehand',
+					       0,
 					       this.uigroup);
     this.hud_minutehand.anchor.setTo(0.5, 0.5);
-    this.hud_clockoverlay = this.game.add.image(39, 
-						hudoffset + 36, 
-						'clock_overlay', 
-						0, 
+    this.hud_clockoverlay = this.game.add.image(39,
+						hudoffset + 36,
+						'clock_overlay',
+						0,
 						this.uigroup);
     this.hud_clockoverlay.anchor.setTo(0.5, 0.5);
-    
+
     // this.clockText = this.game.add.text(
     // 	20, SCREEN_HEIGHT - 40, '', { font : '16px Arial', fill: '#ffffff' }, this.uigroup
     // );
 
-    this.scoreText = this.game.add.text(
-        SCREEN_WIDTH - 80, SCREEN_HEIGHT - 30, '', 
-	{ font: '16px Arial', fill: '#ffffff' }, this.uigroup
-    );
+    this.scoreTextBitmap = bitmapText('', FONTSIZE_MEDIUM);
+    this.scoreText = this.game.add.image(484,
+					 480 - 68 + 31,
+					 this.scoreTextBitmap,
+					 0,
+					 this.uigroup);
 
     this.lightbar = this.game.add.sprite(256,
     					hudoffset + 7 + 6,
@@ -173,7 +173,7 @@ GameState.prototype.create = function()
     					0,
     					this.uigroup);
     this.lightbar.anchor.setTo(0, 0.5)
-    this.uigroup.setAll('fixedToCamera', true);	
+    this.uigroup.setAll('fixedToCamera', true);
 }
 
 GameState.prototype.getClockGamma = function() {
@@ -191,8 +191,8 @@ GameState.prototype.updateShadowTexture = function() {
     var cv = this.shadowTextureColor;
     var uigamma = parseInt(getDOMValue("uiGamma"));
     var clockgamma = this.getClockGamma();
-    this.shadowTexture.context.fillStyle = ("rgb(" + (cv[0] + clockgamma + uigamma) + 
-					    "," + (cv[1] + clockgamma + uigamma) + 
+    this.shadowTexture.context.fillStyle = ("rgb(" + (cv[0] + clockgamma + uigamma) +
+					    "," + (cv[1] + clockgamma + uigamma) +
 					    "," + (cv[2] + clockgamma + uigamma) + ")"
 					   );
     this.shadowTexture.context.fillRect(0, 0, game.world.width, game.world.height);
@@ -245,25 +245,25 @@ GameState.prototype.check_input = function()
     }
 
     if ( controls.up.isDown) {
-	if ( controls.up.shiftKey ) {
+	if ( controls.run.isDown ) {
 	    newstate = (STATE_FACE_UP | STATE_MOVING | STATE_RUNNING);
 	} else {
 	    newstate = (STATE_FACE_UP | STATE_MOVING );
 	}
     } else if ( controls.down.isDown ) {
-	if ( controls.down.shiftKey ) {
+	if ( controls.run.isDown ) {
 	    newstate = (STATE_FACE_DOWN | STATE_MOVING | STATE_RUNNING);
 	} else {
 	    newstate = (STATE_FACE_DOWN | STATE_MOVING );
 	}
     } else if ( controls.left.isDown ) {
-	if ( controls.left.shiftKey ) {
+	if ( controls.run.isDown ) {
 	    newstate = (STATE_FACE_LEFT | STATE_MOVING | STATE_RUNNING);
 	} else {
 	    newstate = (STATE_FACE_LEFT | STATE_MOVING );
 	}
     } else if ( controls.right.isDown ) {
-	if ( controls.right.shiftKey ) {
+	if ( controls.run.isDown ) {
 	    newstate = (STATE_FACE_RIGHT | STATE_MOVING | STATE_RUNNING);
 	} else {
 	    newstate = (STATE_FACE_RIGHT | STATE_MOVING );
@@ -300,7 +300,7 @@ GameState.prototype.update_player_lightmeter = function() {
     }, this)
     player.lightmeter += lightValue;
     player.lightmeter = Math.min(player.lightmeter, 1.0);
-    this.lightbar.scale.y = player.lightmeter;
+    this.lightbar.scale.x = player.lightmeter;
     this.lightbar.alpha = 0.5 + (player.lightmeter / 2);
     //this.lightbar_crop.width = ((this.lightbar_image.width) * player.lightmeter);
     //this.lightbar.crop(this.lightbar_crop);
@@ -315,7 +315,7 @@ GameState.prototype.update = function()
 	layer = this.map_collision_layers[ln];
 	this.physics.arcade.collide(player, layer);
     }
-    
+
     function _fix_audio_relative(x) {
 	x.adjust_relative_to(player);
     }
@@ -351,7 +351,7 @@ GameState.prototype.update = function()
 	    x.sawPlayer(game, player);
 	    x.setAwarenessEffect(STATE_ALERTED);
 	}
-	if ( hasState(player, STATE_STEALING) == true && 
+	if ( hasState(player, STATE_STEALING) == true &&
 	     x.sprite_has_treasure == true ) {
 	    var prevpos = player.body.position;
 	    var prevwidth = player.body.width;
@@ -431,14 +431,14 @@ GameState.prototype.update = function()
 				_AI_collide);
     this.updateShadowTexture();
 
-    if ( this.aiSprites.debug == false ) {
+    if ( this.aiSprites.debug == true ) {
     	function _draw_viewrect(x) {
     	    var r = x.viewRectangle();
-    	    if ( isSet(r) == false ) 
+    	    if ( isSet(r) == false )
     		return;
     	    this.shadowTexture.context.fillStyle = 'rgb(128, 128, 255)';
-    	    this.shadowTexture.context.fillRect(r.left, 
-    						r.top, 
+    	    this.shadowTexture.context.fillRect(r.left,
+    						r.top,
     						r.width,
     						r.height);
     	}
@@ -449,8 +449,8 @@ GameState.prototype.update = function()
     		return;
     	    this.shadowTexture.context.fillStyle = 'rgb(255, 128, 128)';
     	    p.forEach(function(r) {
-    		this.shadowTexture.context.fillRect(r.start.x, 
-    						    r.start.y, 
+    		this.shadowTexture.context.fillRect(r.start.x,
+    						    r.start.y,
     						    r.end.x - r.start.x,
     						    r.end.y - r.start.y);
     	    }, this);
@@ -458,12 +458,11 @@ GameState.prototype.update = function()
     	this.aiSprites.forEach(_draw_aipath, this);
     }
     var clockhour = this.clock.getHours();
-    if ( this.clock.getHours() > 12 ) 
+    if ( this.clock.getHours() > 12 )
 	clockhour -= 12;
     this.hud_hourhand.frame = parseInt((5 * clockhour) + (0.083 * this.clock.getMinutes()));
     this.hud_minutehand.frame = this.clock.getMinutes();
-    // this.clockText.setText("" + this.clock.getHours() + ":" + this.clock.getMinutes() + ":" + this.clock.getSeconds());
-    this.scoreText.setText("" + player.score);
+    this.scoreTextBitmap.setText("$ " + player.score);
 }
 
 GameState.prototype.shutdown = function()
@@ -483,6 +482,8 @@ GameState.prototype.shutdown = function()
     }, this);
     this.aiSprites.destroy();
     this.aiSprites = null;
+    this.aiSpriteEffects.destroy();
+    this.aiSpriteEffects = null;
     this.uigroup.destroy();
     this.uigroup = null;
     this.recentlyStolenGroup.destroy();
@@ -533,14 +534,14 @@ var Preloader = function(game) {
 Preloader.prototype.preload = function()
 {
     this.background = game.add.image(0, 0, 'background');
-    this.loadingText = textImage(game.world.centerX, 
-				 game.world.centerY, 
+    this.loadingText = textImage(game.world.centerX,
+				 game.world.centerY,
 				 "Loading...",
 				FONTSIZE_MEDIUM);
     this.loadingText.anchor.setTo(0.5, 0.5);
     this.creditText = textImage(game.world.centerX,
 				 480 - 16,
-				 "Featuring Art by Peter Hann (www.peter-hann.com)",
+				 "Featuring Art by Peter Hann (www.phann.de)",
 				 FONTSIZE_SMALL);
     this.creditText.anchor.setTo(0.5, 0.5);
     this.preloadTube = game.add.image(game.world.centerX, 280, 'loadingtube');
@@ -550,8 +551,8 @@ Preloader.prototype.preload = function()
 					'gears');
     addAnimation(this.loadingGears, 'spingears');
     this.loadingGears.animations.play('spingears');
-    this.lightbar = game.add.image(game.world.centerX - (193/2) + 32, 
-				   280 - 18, 
+    this.lightbar = game.add.image(game.world.centerX - (193/2) + 32,
+				   280 - 18,
 				   'lightbar');
     game.load.setPreloadSprite(this.lightbar, 0);
 

moonlight/src/Util.js

@@ -300,10 +300,12 @@ function gridWithAISprites()
 	// --- We have to normalize the (x,y) because this may be
 	// called before the sprites are rebounded back inside the map,
 	// and these references will go out of bounds
-	var normx = Math.max(parseInt(spr.x/32), 0);
-	var normy = Math.max(parseInt(spr.y/32), 0);
-	grid.nodes[normy][normx].walkable = false;
-	grid.nodes[normy][normx].isAISprite = true;
+	if ( getMoveState(spr) == false ) {
+	    var normx = Math.max(parseInt(spr.x/32), 0);
+	    var normy = Math.max(parseInt(spr.y/32), 0);
+	    grid.nodes[normy][normx].walkable = false;
+	    grid.nodes[normy][normx].isAISprite = true;
+	}
     }
     return grid;
 }