From 3a25659629273d5a155151885d87924eee07eaba Mon Sep 17 00:00:00 2001
From: naarcini <nick7650@hotmail.com>
Date: Tue, 14 May 2013 00:19:28 -0400
Subject: [PATCH 1/4] Walk speed fix and start to speech

---
 static/scripts/animations.js | 22 ++++++++++----
 static/scripts/speech.js     | 56 ++++++++++++++++++++++++++++++++++++
 templates/index.html         | 10 ++++++-
 3 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 static/scripts/speech.js

diff --git a/static/scripts/animations.js b/static/scripts/animations.js
index f4eeb7b..c6c9de9 100644
--- a/static/scripts/animations.js
+++ b/static/scripts/animations.js
@@ -407,25 +407,37 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
             // Down
             this.dy = this.move_speed;
         }
+
+        if( this.dx != 0 && this.dy != 0 ) {
+            this.dx = this.dx > 0 ? this.move_speed / 2 : -this.move_speed / 2;
+            this.dy = this.dy > 0 ? this.move_speed / 2 : -this.move_speed / 2;
+        }
     }
 
     this.move_stop = function( keyCode ) {
-        if( keyCode == 37 && this.dx == -this.move_speed ) {
+        if( keyCode == 37 && this.dx < 0 ) {
             // Left
             this.dx = 0;
         }
-        else if( keyCode == 38 && this.dy == -this.move_speed ) {
+        else if( keyCode == 38 && this.dy < 0 ) {
             // Up
             this.dy = 0;
         }
-        else if( keyCode == 39 && this.dx == this.move_speed ) {
+        else if( keyCode == 39 && this.dx > 0 ) {
             // Right
             this.dx = 0;
         }
-        else if( keyCode == 40 && this.dy == this.move_speed ) {
+        else if( keyCode == 40 && this.dy > 0 ) {
             // Down
             this.dy = 0;
         }
+
+        if( this.dx != 0 ) {
+            this.dx = this.dx > 0 ? this.move_speed : -this.move_speed ;
+        }
+        if( this.dy != 0 ) {
+            this.dy = this.dy > 0 ? this.move_speed : -this.move_speed ;
+        }
     }
 
     this.change_speed = function( speed ) {
@@ -763,4 +775,4 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
         this.state = 'stopped';
         cancelAnimFrame(this.anim_frame);
     }
-}
+}
\ No newline at end of file
diff --git a/static/scripts/speech.js b/static/scripts/speech.js
new file mode 100644
index 0000000..3ffd9c1
--- /dev/null
+++ b/static/scripts/speech.js
@@ -0,0 +1,56 @@
+(function( $ ) {
+    // Constants
+    var PROMPT_NAME = "speechJS_prompt";
+
+    // Private variables
+    var message = "";
+    var listening = false;
+    var character_limit = 140;
+
+    // plugin definition
+    $.fn.speech = function( action, arg ) {
+        if( action == "probe" ) {
+            return [message, listening];
+        }
+        else if( action == "set_limit" ) {
+            character_limit = arg;
+            return true;
+        }
+        else if( action == "get_limit" ) {
+            return character_limit;
+        }
+        else if( action == "trigger" ) {
+            console.log(this);
+            return trigger();
+        }
+        else if ( action == "add_char" ) {
+        }
+    };
+
+    // Private methods
+    function trigger() {
+        // Toggle listening
+        listening = !listening;
+
+        // Start listening to keyboard input
+        if( listening ) {
+            message = "";
+            display_prompt();
+        }
+        else {
+            remove_prompt();
+        }
+
+        return message;
+    };
+
+    function display_prompt() {
+        var prompt = '' +
+            '' +
+            '';
+    };
+
+    function remove_prompt() {
+    };
+
+})( jQuery );
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 8fddaf3..e22efe1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -14,6 +14,7 @@
         <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}scripts/animations.js"></script>
         <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}scripts/sockjs.min.js"></script>
         <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}scripts/network.js"></script>
+        <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}scripts/speech.js"></script>
         <script type="text/javascript">
             var canvas, networking;
 
@@ -40,6 +41,13 @@
                     $('body').on('keyup', function(e) {
                         var code = e.keyCode || e.which;
                         canvas.move_stop(code);
+
+                        if( code == 13 ) {
+                            var message = $('body').speech('trigger');
+                            if( message ) {
+                                console.log("make bubble: " + message.toString());
+                            }
+                        }
                     });
                 });
                 
@@ -116,4 +124,4 @@
         <div id="hat-game">
         </div>
     </body>
-</html>
+</html>
\ No newline at end of file

From 5066e9b23608f2905f76e8e34831282c7ce98837 Mon Sep 17 00:00:00 2001
From: naarcini <nick7650@hotmail.com>
Date: Tue, 27 Aug 2013 01:08:47 -0700
Subject: [PATCH 2/4] Added speech bubbles v1

---
 game.py                      |   3 +-
 messenger.py                 |   2 +
 static/scripts/animations.js | 146 +++++++++++++++++++++++++++++++++--
 static/scripts/network.js    |   6 +-
 static/scripts/speech.js     |  56 --------------
 templates/index.html         |  18 ++---
 6 files changed, 158 insertions(+), 73 deletions(-)
 delete mode 100644 static/scripts/speech.js

diff --git a/game.py b/game.py
index b9fa7c9..ecf21e5 100644
--- a/game.py
+++ b/game.py
@@ -41,13 +41,14 @@ def __init__(self, session_id):
         self.position = Position(0, 0)
         self.movement = Movement(0, 0)
         self.character = choice(self.guy_types)
+        self.speech = None;
 
     def move(self, x, y, dx, dy):
         self.position.update(x, y)
         self.movement.update(dx, dy)
 
     def dictify(self):
-        return {'id': self.id, 'position': {'x': self.position.x, 'y': self.position.y}, 'character': self.character, 'movement': {'dx': self.movement.dx, 'dy': self.movement.dy}}
+        return {'id': self.id, 'position': {'x': self.position.x, 'y': self.position.y}, 'character': self.character, 'movement': {'dx': self.movement.dx, 'dy': self.movement.dy}, 'speech': self.speech}
 
 class Hat(object):
     def __init__(self):
diff --git a/messenger.py b/messenger.py
index a3c44f2..15f73d5 100644
--- a/messenger.py
+++ b/messenger.py
@@ -31,11 +31,13 @@ def on_message(self, text):
             dx = message['body']['dx']
             dy = message['body']['dy']
             hat_owner = 0
+            speech = message['body']['speech']
             if message['body'].has_key('hat_owner'):
                 hat_owner = int(message['body']['hat_owner'])
 
             self.game_state.players[player].position.update(x, y)
             self.game_state.players[player].movement.update(dx, dy)
+            self.game_state.players[player].speech = speech;
             if hat_owner:
                 try:
                     self.game_state.assign_hat(player);
diff --git a/static/scripts/animations.js b/static/scripts/animations.js
index c6c9de9..53fc237 100644
--- a/static/scripts/animations.js
+++ b/static/scripts/animations.js
@@ -48,6 +48,7 @@ function Hat(owner, xpos, ypos) {
     this.owner = owner;
     this.xpos = xpos;
     this.ypos = ypos;
+    this.message = null;
 
     this.get_image = function( tile_num ) {
         return $('#Hat_pic');
@@ -74,6 +75,10 @@ function Hat(owner, xpos, ypos) {
             this.owner = owner;
         }
     }
+
+    this.get_message = function() {
+        return this.message;
+    }
 }
 
 function dude(player_id, xpos, ypos, dx, dy, move_speed, has_hat, guy) {
@@ -86,6 +91,7 @@ function dude(player_id, xpos, ypos, dx, dy, move_speed, has_hat, guy) {
     this.move_speed = move_speed;
     this.has_hat = has_hat;
     this.guy = guy;
+    this.message = null;
 
     // Methods
     this.get_image = function( tile_num ) {
@@ -156,6 +162,14 @@ function dude(player_id, xpos, ypos, dx, dy, move_speed, has_hat, guy) {
         return this.guy;
     }
 
+    this.get_message = function() {
+        return this.message;
+    }
+
+    this.set_message = function(message) {
+        this.message = message;
+    }
+
 /*
     talk = function( ctx, width, height, text ) {
         var x = xpos + dude_size + 5;
@@ -207,6 +221,8 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
     this.dy = 0;
     this.move_speed = move_speed;
     this.other_dudes = {};
+    this.messageTimeout = 500;
+    this.messageCounter = 0;
 
     var that = this;
     this.network = null
@@ -267,12 +283,20 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
         this.update_hat();
 
         // Send information
-        var json_message = JSON.stringify({'action': 'move', 'body': {'session': window.session_id, 'x': this.xpos, 'y': this.ypos, 'dx': this.dx, 'dy': this.dy, 'hat_owner': this.your_dude.get_hat_status()}});
+        var json_message = JSON.stringify({'action': 'move', 'body': {'session': window.session_id, 'x': this.xpos, 'y': this.ypos, 'dx': this.dx, 'dy': this.dy, 'hat_owner': this.your_dude.get_hat_status(), 'speech': this.your_dude.get_message()}});
         if(this.network !== null) {
             //console.log(json_message);
             this.network.send(json_message);
         }
 
+        if( this.your_dude.get_message() != null && this.messageCounter < this.messageTimeout) {
+            this.messageCounter++;
+        }
+        else if( this.messageCounter >= this.messageTimeout ) {
+            this.messageCounter = 0;
+            this.your_dude.set_message(null);
+        }
+
         // Draw player
         this.draw_object(this.your_dude);
 
@@ -328,11 +352,17 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
         return dude;
     }
 
+    this.add_message = function(message) {
+        this.messageCounter = 0;
+        this.your_dude.set_message(message);
+    };
+
     this.draw_object = function(object) {
-        var image_jq, img, img_height, img_width, obj_x, obj_y, x_off, x_off_other, y_off, y_off_other;
+        var image_jq, img, img_height, img_width, obj_x, obj_y, x_off, x_off_other, y_off, y_off_other, message;
         var draw_locations = new Array();
         obj_x = object.get_position()[0];
         obj_y = object.get_position()[1];
+        message = object.get_message();
 
         if( false ) {
             console.log([object.get_position()[0], object.get_position()[1], this.xpos, this.ypos]);
@@ -387,6 +417,59 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
 
         for( var i=0; i<draw_locations.length; i++ ) {
             this.context.drawImage(img, draw_locations[i][0], draw_locations[i][1], img_width, img_height);
+            if( message != null && message != '' ) {
+                // Speech bubble
+                var x = draw_locations[i][0] + img_width;
+                var y = draw_locations[i][1] + 20;
+
+                var curvy_width = 20;
+                var curvy_height = 20;
+                var curviness = 10;
+                var width = 150;
+                var height = 90;
+                var radius = 10;
+
+                var rect_x = x + curvy_width/2 - width/2;
+                var rect_y = y - curvy_height - height;
+
+                // Draw curvy part
+                this.context.beginPath();
+                this.context.moveTo(x, y-curvy_height);
+                this.context.quadraticCurveTo(x+curvy_width/2+curviness, y-curvy_height/2, x, y);
+                this.context.quadraticCurveTo(x+curvy_width/2+curviness, y-curvy_height/2, x+curvy_height, y-curvy_height);
+
+                // Draw Rectangular part
+                this.context.lineTo(rect_x+width-radius, rect_y+height);
+                this.context.quadraticCurveTo(rect_x+width, rect_y+height, rect_x+width, rect_y+height-radius);
+                this.context.lineTo(rect_x+width, rect_y+radius);
+                this.context.quadraticCurveTo(rect_x+width, rect_y, rect_x+width-radius, rect_y);
+                this.context.lineTo(rect_x+radius, rect_y);
+                this.context.quadraticCurveTo(rect_x, rect_y, rect_x, rect_y+radius);
+                this.context.lineTo(rect_x, rect_y+height-radius);
+                this.context.quadraticCurveTo(rect_x, rect_y+height, rect_x+radius, rect_y+height);
+                this.context.lineTo(rect_x+width/2-curvy_width/2, rect_y+height);
+                
+                this.context.closePath();
+                this.context.fillStyle = "#FFF";
+                this.context.fill();
+                this.context.stroke();
+
+                this.context.fillStyle = "#000";
+                this.context.font = "normal 10pt Calibri";
+
+                var letters = message.split('');
+                var fragment = letters[0];
+                var line = 0;
+                for(var i=1; i<letters.length; i++) {
+                    fragment = fragment+letters[i];
+                    if( i % 20 == 0 ) {
+                        this.context.fillText(fragment, rect_x+10, rect_y+15+line*12);
+                        fragment = "";
+                        line++;
+                    }
+                }
+                this.context.fillText(fragment, rect_x+10, rect_y+15+line*12);
+            }
         }
     }
 
@@ -432,10 +515,10 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
             this.dy = 0;
         }
 
-        if( this.dx != 0 ) {
+        if( this.dx != 0 && this.dy == 0 ) {
             this.dx = this.dx > 0 ? this.move_speed : -this.move_speed ;
         }
-        if( this.dy != 0 ) {
+        if( this.dy != 0 && this.dx == 0 ) {
             this.dy = this.dy > 0 ? this.move_speed : -this.move_speed ;
         }
     }
@@ -775,4 +858,57 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
         this.state = 'stopped';
         cancelAnimFrame(this.anim_frame);
     }
-}
\ No newline at end of file
+}
+
+function speech(character_limit) {
+    this.listening = false;
+    this.character_limit = character_limit;
+
+    this.handle = function(code) {
+        if( code == 13 ) {
+            this.trigger();
+            return true;
+        }
+
+        // Some character
+        if( code == 32 || (code >= 32 ) ) {
+            //console.log(code, String.fromCharCode(code));
+        }
+        // Backspace
+        else if ( code == 8 ) {
+            //console.log("Backspace");
+        }
+    }
+
+    this.trigger = function() {
+        // Toggle listening
+        this.listening = !this.listening;
+        //console.log(this.listening);
+
+        // Start listening to keyboard input
+        if( this.listening ) {
+            this.display_prompt();
+            $('#speech_prompt_form').find('input[type="text"]').focus();
+        }
+        else {
+            this.remove_prompt();
+        }
+        return true;
+    }
+
+    this.display_prompt = function() {
+        var prompt = '' +
+            '<div id="speech_prompt" style="background-color: #000; opacity: 0.6; z-index: 1000; top: 70%; width: 100%; height: 50px; position: absolute;">' +
+            '<form action="." id="speech_prompt_form" style="opacity: 1; z-index: 2000; position: relative; top: 20%;">' +
+            '<input type="text" maxlength="'+this.character_limit.toString()+'" style="position: relative; left: 2%; width: 90%;"></input>' +
+            '<input type="submit" style="display: none;"></submit>' +
+            '</form></div>';
+
+        $('body').append(prompt);
+    }
+
+    this.remove_prompt = function() {
+        $('#speech_prompt').remove();
+        return true;
+    }
+}
diff --git a/static/scripts/network.js b/static/scripts/network.js
index 694af0a..152a875 100644
--- a/static/scripts/network.js
+++ b/static/scripts/network.js
@@ -27,16 +27,18 @@ function Networking(game) {
             // update positions of existing players
             $.each(state.players, function(session, player) {
                 if(session != window.session_id) {
-                    var has_hat = 0 | (hat_owner == session);
+                    var has_hat = (hat_owner == session);
                     if(session in that.game.other_dudes && that.game.other_dudes[session]) {
                         that.game.update_dude(that.game.other_dudes[session], player.position.x, player.position.y, player.movement.dx, player.movement.dy, has_hat, player.character);
+                        that.game.other_dudes[session].set_message(player.speech);
                     } else {
                         that.game.other_dudes[session] = new dude(session, 0, 0, 0, 0, that.game.move_speed, 0, player.character);
                         console.log('Added player ' + session);
                     }
                 }
                 else {
-                    that.game.update_dude(that.game.your_dude, player.position.x, player.position.y, player.movement.dx, player.movement.dy, that.game.your_dude.get_hat_status(), player.character);
+                    //that.game.update_dude(that.game.your_dude, player.position.x, player.position.y, player.movement.dx, player.movement.dy, that.game.your_dude.get_hat_status(), player.character);
+                   //that.game.your_dude.set_message(player.speech);
                 }
             });
 
diff --git a/static/scripts/speech.js b/static/scripts/speech.js
deleted file mode 100644
index 3ffd9c1..0000000
--- a/static/scripts/speech.js
+++ /dev/null
@@ -1,56 +0,0 @@
-(function( $ ) {
-    // Constants
-    var PROMPT_NAME = "speechJS_prompt";
-
-    // Private variables
-    var message = "";
-    var listening = false;
-    var character_limit = 140;
-
-    // plugin definition
-    $.fn.speech = function( action, arg ) {
-        if( action == "probe" ) {
-            return [message, listening];
-        }
-        else if( action == "set_limit" ) {
-            character_limit = arg;
-            return true;
-        }
-        else if( action == "get_limit" ) {
-            return character_limit;
-        }
-        else if( action == "trigger" ) {
-            console.log(this);
-            return trigger();
-        }
-        else if ( action == "add_char" ) {
-        }
-    };
-
-    // Private methods
-    function trigger() {
-        // Toggle listening
-        listening = !listening;
-
-        // Start listening to keyboard input
-        if( listening ) {
-            message = "";
-            display_prompt();
-        }
-        else {
-            remove_prompt();
-        }
-
-        return message;
-    };
-
-    function display_prompt() {
-        var prompt = '' +
-            '' +
-            '';
-    };
-
-    function remove_prompt() {
-    };
-
-})( jQuery );
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index e22efe1..02d7364 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -14,9 +14,8 @@
         <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}scripts/animations.js"></script>
         <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}scripts/sockjs.min.js"></script>
         <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}scripts/network.js"></script>
-        <script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}scripts/speech.js"></script>
         <script type="text/javascript">
-            var canvas, networking;
+            var canvas, networking, speech;
 
             $(document).ready( function () {
                 var intro = $('<div>').attr('id', 'intro').append($('<img>').attr('src', '{{ STATIC_URL }}images/WAH_TITLE_MOCKUP.jpg'));
@@ -28,6 +27,7 @@
                     $('#hat-game').css('min-width', Math.min($(window).outerWidth()-1, 1750));
                     
                     canvas = new gameCanvas($('#hat-game'), 0, 0, 10, 1000, 1000);
+                    speech = new speech(140);
                     networking = new Networking(canvas);
 
                     canvas.init();
@@ -42,15 +42,15 @@
                         var code = e.keyCode || e.which;
                         canvas.move_stop(code);
 
-                        if( code == 13 ) {
-                            var message = $('body').speech('trigger');
-                            if( message ) {
-                                console.log("make bubble: " + message.toString());
-                            }
-                        }
+                        speech.handle(code);
                     });
                 });
-                
+
+
+                $('body').on('submit', '#speech_prompt_form', function(e) {
+                    e.preventDefault();
+                    canvas.add_message($('#speech_prompt_form').find('input[type="text"]').val());
+                });
                 
             });
         </script>

From 9b46e39551a127d8a4039fe650331e1595c646a0 Mon Sep 17 00:00:00 2001
From: naarcini <nick7650@hotmail.com>
Date: Fri, 30 Aug 2013 00:29:24 -0700
Subject: [PATCH 3/4] Boot players when idle

---
 messenger.py                 |  8 +++-
 static/scripts/animations.js | 71 ++++++++----------------------------
 static/scripts/network.js    |  1 +
 3 files changed, 24 insertions(+), 56 deletions(-)

diff --git a/messenger.py b/messenger.py
index 15f73d5..c642ed1 100644
--- a/messenger.py
+++ b/messenger.py
@@ -25,7 +25,13 @@ def on_open(self, info):
     def on_message(self, text):
         message = json.loads(text)
         if message['action'] == 'move':
-            player = message['body']['session']
+            try:
+                player = message['body']['session']
+            except KeyError:
+                self.debug()
+                self.send_obj('ack', {})
+                return
+
             x = message['body']['x']
             y = message['body']['y']
             dx = message['body']['dx']
diff --git a/static/scripts/animations.js b/static/scripts/animations.js
index 53fc237..c621bd5 100644
--- a/static/scripts/animations.js
+++ b/static/scripts/animations.js
@@ -169,41 +169,6 @@ function dude(player_id, xpos, ypos, dx, dy, move_speed, has_hat, guy) {
     this.set_message = function(message) {
         this.message = message;
     }
-
-/*
-    talk = function( ctx, width, height, text ) {
-        var x = xpos + dude_size + 5;
-        var y = ypos - 5;
-
-        var curvy_width = 20;
-        var curvy_height = 20;
-        var curviness = 10;
-
-        // Draw curvy part
-        ctx.beginPath();
-        ctx.moveTo(x, y);
-        ctx.quadraticCurveTo(x+curvy_width/2+curviness, y-curvy_height/2, x, y-curvy_height);
-        ctx.moveTo(x, y);
-        ctx.quadraticCurveTo(x+curvy_width/2+curviness, y-curvy_height/2, x+curvy_height, y-curvy_height);
-        
-        //Draw Rectangular part
-        var rect_x = x + curvy_width/2 - width/2;
-        var rect_y = y - curvy_height - height;
-
-        ctx.moveTo(rect_x, rect_y+radius);
-        ctx.lineTo(rect_x, rect_y+height-radius);
-        ctx.quadraticCurveTo(rect_x, rect_y+height, rect_x+radius, rect_y+height);
-        ctx.lineTo(rect_x+width/2-curvy_width/2, rect_y+height);
-        ctx.moveTo(rect_x+width/2+curvy_width/2, rect_y+height);
-        ctx.lineTo(rect_x+width-radius, rect_y+height);
-        ctx.quadraticCurveTo(rect_x+width, rect_y+height, rect_x+width, rect_y+height-radius);
-        ctx.lineTo(rect_x+width, rect_y+radius);
-        ctx.quadraticCurveTo(rect_x+width, rect_y, rect_x+width-radius, rect_y);
-        ctx.lineTo(rect_x+radius, rect_y);
-        ctx.quadraticCurveTo(rect_x, rect_y, rect_x, rect_y+radius);
-        ctx.stroke();
-    }
-    */
     
 
 }
@@ -223,6 +188,8 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
     this.other_dudes = {};
     this.messageTimeout = 500;
     this.messageCounter = 0;
+    this.idleTimeout = 1000;
+    this.idleTimer = 0;
 
     var that = this;
     this.network = null
@@ -296,6 +263,11 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
             this.messageCounter = 0;
             this.your_dude.set_message(null);
         }
+        
+        this.idleTimer++;
+        if ( this.idleTimer >= this.idleTimeout ) {
+            location.reload(true);
+        }
 
         // Draw player
         this.draw_object(this.your_dude);
@@ -329,18 +301,10 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
                 this.hat.set_owner(window.session_id);
                 this.your_dude.set_hat_status(1);
             }
+            else {
+                this.draw_object(this.hat);
+            }
         }
-        else if ( this.hat.get_owner() != window.session_id ){
-            this.your_dude.set_hat_status(0);
-        }
-        else {
-            this.hat.set_position(this.your_dude.get_position()[0], this.your_dude.get_position()[1]);
-        }
-
-        if( !this.hat.get_owner() ) {
-            this.draw_object(this.hat);
-        }
-        
     }
 
     this.update_dude = function(dude, xpos, ypos, dx, dy, has_hat, guy) {
@@ -495,6 +459,9 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
             this.dx = this.dx > 0 ? this.move_speed / 2 : -this.move_speed / 2;
             this.dy = this.dy > 0 ? this.move_speed / 2 : -this.move_speed / 2;
         }
+
+        this.idleTimer = 0;
+
     }
 
     this.move_stop = function( keyCode ) {
@@ -521,6 +488,9 @@ function gameCanvas(jq_elem, xpos, ypos, move_speed, max_x, max_y) {
         if( this.dy != 0 && this.dx == 0 ) {
             this.dy = this.dy > 0 ? this.move_speed : -this.move_speed ;
         }
+
+        this.idleTimer = 0;
+
     }
 
     this.change_speed = function( speed ) {
@@ -870,20 +840,11 @@ function speech(character_limit) {
             return true;
         }
 
-        // Some character
-        if( code == 32 || (code >= 32 ) ) {
-            //console.log(code, String.fromCharCode(code));
-        }
-        // Backspace
-        else if ( code == 8 ) {
-            //console.log("Backspace");
-        }
     }
 
     this.trigger = function() {
         // Toggle listening
         this.listening = !this.listening;
-        //console.log(this.listening);
 
         // Start listening to keyboard input
         if( this.listening ) {
diff --git a/static/scripts/network.js b/static/scripts/network.js
index 152a875..e80be9c 100644
--- a/static/scripts/network.js
+++ b/static/scripts/network.js
@@ -46,6 +46,7 @@ function Networking(game) {
             $.each(that.game.other_dudes, function(session, player) {
                 if(!(session in state.players)) {
                     if( hat_owner == session ) {
+                        that.game.hat.set_position(that.game.other_dudes[session].get_position()[0], that.game.other_dudes[session].get_position()[1]);
                         that.game.hat.set_owner(0);
                     }
                     delete that.game.other_dudes[session];

From eadaecc7f36fe232837c92efd075c40e5134f451 Mon Sep 17 00:00:00 2001
From: naarcini <nick7650@hotmail.com>
Date: Fri, 30 Aug 2013 00:48:26 -0700
Subject: [PATCH 4/4] Create README.md

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e64ebba
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+hat
+===
+
+"Wear a Hat". Browser-based multiplayer game. Currently only tested and functioning on Google Chrome.
+
+
+Why
+==
+
+This is just for fun.  The point of the game is to find and hold on to the one hat that exists in the world.  The only way to lose the hat is to close the window or stay idle for some time. Press enter to open the chat prompt.
+
+Instructions
+==
+
+1. Get the files
+2. "python ./loop.py"
+3. Play with people on your local network (your_ip_address:8000)