From 8b2fc4e7d691390929d95c579a8060876dabb93f Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Mon, 2 Feb 2015 11:34:20 -0600
Subject: [PATCH 1/3] Squashed 'APIHeartBeat/' changes from 43ec732..16c23d2

16c23d2 APIHeartBeat: Removed pacakge.json
a0a0322 prod-APIHeartBeat: Updated prod version of APIHeartBeat at version 0.2.

git-subtree-dir: APIHeartBeat
git-subtree-split: 16c23d2476b2faa3647292f59cf70a2de3c7875c
---
 APIHeartBeat.js              | 25 +++++++++----------------
 pacakge.json => package.json |  4 +++-
 2 files changed, 12 insertions(+), 17 deletions(-)
 rename pacakge.json => package.json (79%)

diff --git a/APIHeartBeat.js b/APIHeartBeat.js
index 7f91e985e8..6236647bd0 100644
--- a/APIHeartBeat.js
+++ b/APIHeartBeat.js
@@ -5,22 +5,22 @@
 var APIHeartBeat = APIHeartBeat || (function() {
     'use strict';
 
-    var version = 0.1,
+    var version = 0.2,
         schemaVersion = 0.1,
         beatInterval = false,
-        beatPeriod = 400,
-        beatCycle = (beatPeriod * 8),
+        beatPeriod = 200,
+        beatCycle = 3000,
 
     animateHeartBeat = function() {
-        var x = (Date.now()%beatCycle)*12.5,
-            scale = Math.max(0, ( Math.sin( (x-1)/2) - Math.sin(x-(1+(Math.PI/2))))),
-	        beatColor = Math.round(0xff*scale).toString(16)+'0000';
+        var x = ((Date.now()%beatCycle)/beatCycle)*Math.PI*2,
+            scale = (Math.sin(x)+1)/2,
+            beatColor = '#'+Math.round(0xff*scale).toString(16)+'0000';
 
         _.chain(state.APIHeartBeat.heartBeaters)
             .map(function(pid){
                 return getObj('player',pid);
             })
-            .filter(_.isUndefined)
+            .reject(_.isUndefined)
             .each(function(p){
                 p.set({
                     color: beatColor
@@ -84,13 +84,6 @@ var APIHeartBeat = APIHeartBeat || (function() {
 on('ready',function() {
     'use strict';
 
-    if("undefined" !== typeof isGM && _.isFunction(isGM)) {
-		APIHeartBeat.CheckInstall();
-		APIHeartBeat.RegisterEventHandlers();
-    } else {
-        log('--------------------------------------------------------------');
-        log('APIHeartBeat requires the isGM module to work.');
-        log('isGM GIST: https://gist.github.com/shdwjk/8d5bb062abab18463625');
-        log('--------------------------------------------------------------');
-    }
+    APIHeartBeat.CheckInstall();
+    APIHeartBeat.RegisterEventHandlers();
 });
diff --git a/pacakge.json b/package.json
similarity index 79%
rename from pacakge.json
rename to package.json
index 209e7e4fb7..96b6c52f3c 100644
--- a/pacakge.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "APIHeartBeat",
-  "version": "0.1",
+  "version": "0.2",
   "description": "Provides an API Heartbeat by setting the requesting player's color continuously.",
   "authors": "The Aaron",
   "roll20userid": "104025",
@@ -8,6 +8,8 @@
   },
   "modifies": {
 	"state.APIHeartBeat": "read,write",
+    "player.color": "write",
+    "player.id": "read"
   },
   "conflicts": [
   ]

From c68de1e5de6d57ea07ea068e9d5546b242246e47 Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Mon, 2 Feb 2015 12:02:37 -0600
Subject: [PATCH 2/3] Squashed 'ManualAttribute/' changes from d1d0693..3a819ac

3a819ac ManualAttribute: Removed misnamed file.

git-subtree-dir: ManualAttribute
git-subtree-split: 3a819aceb2e9f431d1e64072703b3e82554fdb83
---
 pacakge.json | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 pacakge.json

diff --git a/pacakge.json b/pacakge.json
deleted file mode 100644
index 2d7340f355..0000000000
--- a/pacakge.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "ManualAttribute",
-  "version": "0.1",
-  "description": "Creates a manual copy of an autocalculated field, and assigns it to the bar of a token.",
-  "authors": "The Aaron",
-  "roll20userid": "104025",
-  "dependencies": {
-  },
-  "modifies": {
-  },
-  "conflicts": [
-  ]
-}

From c36d359278cd3f7583ae80ad93ffe65a18828dae Mon Sep 17 00:00:00 2001
From: "Aaron C. Meadows" <shdwjk@gmail.com>
Date: Mon, 2 Feb 2015 12:02:51 -0600
Subject: [PATCH 3/3] Squashed 'SpellLevel5e/' changes from c0c723a..1a8e648

1a8e648 SpellLevel5e: Removed misnamed file.

git-subtree-dir: SpellLevel5e
git-subtree-split: 1a8e648a9c4b8ae4346cb285bf677ac797bbc9d6
---
 pacakge.json | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 pacakge.json

diff --git a/pacakge.json b/pacakge.json
deleted file mode 100644
index 4e49072915..0000000000
--- a/pacakge.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "SpellLevel5e",
-  "version": "0.1",
-  "description": "",
-  "authors": "The Aaron",
-  "roll20userid": "104025",
-  "dependencies": {
-	"isGMModule": "0.x"
-  },
-  "modifies": {
-	"state.SpellLevel5e": "read,write",
-  },
-  "conflicts": [
-  ]
-}