From f361b0ef2ec6a1bda97525730fc17c00cc2a1241 Mon Sep 17 00:00:00 2001
From: Andrew Kesterson <andrew@aklabs.net>
Date: Sat, 14 Jun 2014 10:35:18 -0700
Subject: [PATCH] Go back to text wordbubbles

---
 moonlight/gfx/bigmap.json       | 19 ++-----------------
 moonlight/js/moonlight-skulk.js |  4 +++-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/moonlight/gfx/bigmap.json b/moonlight/gfx/bigmap.json
index 53c99e5..e50041f 100644
--- a/moonlight/gfx/bigmap.json
+++ b/moonlight/gfx/bigmap.json
@@ -158,21 +158,6 @@
          "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,
@@ -189,7 +174,7 @@
                 }],
          "opacity":1,
          "type":"objectgroup",
-         "visible":false,
+         "visible":true,
          "width":100,
          "x":0,
          "y":0
@@ -515,4 +500,4 @@
  "tilewidth":32,
  "version":1,
  "width":100
-}
+}
\ No newline at end of file
diff --git a/moonlight/js/moonlight-skulk.js b/moonlight/js/moonlight-skulk.js
index a599068..9a01d4e 100644
--- a/moonlight/js/moonlight-skulk.js
+++ b/moonlight/js/moonlight-skulk.js
@@ -781,7 +781,7 @@ var AISprite = function(game, x, y, key, frame) {
     this.enableWordBubble = function() {
 	this.enable_word_bubble = true;
 	this.timer = game.time.create(false);
-	var timerdelta = 20000 + (game.rnd.integerInRange(0, 30) * 1000);
+	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()
@@ -840,6 +840,7 @@ 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()
@@ -848,6 +849,7 @@ 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;