From 98aa48b4f1d50f2573a78b30f472683268d690e4 Mon Sep 17 00:00:00 2001 From: Andrew Kesterson Date: Sat, 14 Jun 2014 10:40:01 -0700 Subject: [PATCH] Go back to text wordbubbles --- moonlight/gfx/bigmap.json | 15 +++++++++++++++ moonlight/js/moonlight-skulk.js | 5 ----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/moonlight/gfx/bigmap.json b/moonlight/gfx/bigmap.json index e50041f..aed92a9 100644 --- a/moonlight/gfx/bigmap.json +++ b/moonlight/gfx/bigmap.json @@ -158,6 +158,21 @@ "height":100, "name":"AI", "objects":[ + { + "gid":3544, + "height":0, + "name":"FountainGuard", + "properties": + { + "sprite_group":"townsfolk-female", + "sprite_name":"townsfolk-female-3" + }, + "type":"AISprites", + "visible":true, + "width":0, + "x":824, + "y":953 + }, { "gid":3544, "height":0, diff --git a/moonlight/js/moonlight-skulk.js b/moonlight/js/moonlight-skulk.js index da279a4..081a9a1 100644 --- a/moonlight/js/moonlight-skulk.js +++ b/moonlight/js/moonlight-skulk.js @@ -782,7 +782,6 @@ var AISprite = function(game, x, y, key, frame) { this.enable_word_bubble = true; this.timer = game.time.create(false); var timerdelta = 10000 + (game.rnd.integerInRange(0, 20) * 1000); - console.log("In " + timerdelta + " ms, " + this + " will say something"); timerev = this.timer.add(timerdelta, this.setWordBubble, this); this.timer.start() } @@ -792,7 +791,6 @@ var AISprite = function(game, x, y, key, frame) { this.clear_bubble = true; this.enable_word_bubble = false; this.timer = game.time.create(false); - console.log("In 1000 ms, " + this + " will enable speech"); timerev = this.timer.add(1000, this.enableWordBubble, this); this.timer.start() } @@ -826,7 +824,6 @@ var AISprite = function(game, x, y, key, frame) { var mylines = moonlightDialog['status'][this.sprite_group][aistate]; text = mylines[game.rnd.integerInRange(0, mylines.length)]; style = {font: '14px Arial Bold', fill: '#ffffff', align: 'center'} - console.log(this + " said " + text); this.text_size = stringSize(text, style['font']); this.bubble = game.add.text(this.x, this.y, text, style); this.bubble_offsets = [ (this.body.width/2) + -(this.text_size[0] / 2), -( this.text_size[1]/2) ]; @@ -841,7 +838,6 @@ var AISprite = function(game, x, y, key, frame) { { this.bubble.position.x = this.x + this.bubble_offsets[0]; this.bubble.position.y = this.y + this.bubble_offsets[1]; - console.log(this); } this.update = function() @@ -850,7 +846,6 @@ var AISprite = function(game, x, y, key, frame) { if ( this.bubble !== null ) { if ( this.clear_bubble == true ) { - console.log(this + " cleared word bubble"); this.bubble.destroy(); this.bubble = null; this.clear_bubble = false;