Merge pull request #160 from left23/master

intro text, hobbits plate continued, emcradio module and styles

Author: left23

components/com_battle/views/phaser/tmpl/highhero_diagonal.json

@@ -677,7 +677,7 @@
   "meta": {
     "app": "http://www.codeandweb.com/texturepacker",
     "version": "1.0",
-    "image": "hero_diagonal.png",
+    "image": "highhero_diagonal.png",
     "format": "RGBA8888",
     "size": {
       "w": 793,

components/com_battle/views/phaser/tmpl/playstate00.js

@@ -28,30 +28,45 @@ var d = new Date(),
     m = (d.getMinutes()<10?'0':'') + d.getMinutes();
 var printedTime = h + ':' + m;
 
+introDateTime = [
+    " ",
+    printedTime + ", July 23rd, 2053",
+    "Somewhere outside of Pyramid City, Europa"
+];
+
 content = [
     " ",
     "In the beginning, there were no beginnings.",
     "There were no need for them.",
     "But somewhere between then and now,",
     "people started wondering...",
+    " ",
     "Who am I?",
     "Where do I come from?",
-    "Where am I going? ",
-    "",
-    printedTime + ", July 23rd, 2053",
-    "Somewhere outside of Pyramid City, Europa",
+    "Where am I going? "
 ];
+
+
 getConspiracy();
+
 function getConspiracy() {
     jQuery.getJSON("http://emcradio.com/api/paragraph/conspiracy?_format=api_json", function (conspiracyObj) {
-        //conspiracyToPrint = conspiracyObj.data[0].attributes.field_conspiracy[0].value;
+        conspiracyToPrint = conspiracyObj.data[0].attributes.field_conspiracy[0].value;
     });
 }
 
-var text2;
+var dateTime;
 var index = 0;
 var line = '';
+
+var introText;
+var line2 = [];
+var wordIndex = 0;
+var lineIndex = 0;
+var wordDelay = 140;
+var lineDelay = 1400;
 var grd;
+var timeoutID;
 
 //  The Google WebFont Loader will look for this object, so create it before loading the script.
 WebFontConfig = {
@@ -72,7 +87,9 @@ WebFontConfig = {
 playState[0] = {
 
     preload: function() {
-        game.load.image('arrow', '/images/thisway.png');//  Load the Google WebFont Loader script
+        game.load.image('arrow', '/images/thisway.png');
+
+        //  Load the Google WebFont Loader script
         game.load.script('webfont', '//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js');
     },
     create: function() {
@@ -89,28 +106,37 @@ playState[0] = {
         cursors = game.input.keyboard.createCursorKeys();
 
 
-        text2 = game.add.text();
+        dateTime = game.add.text();
+        dateTime.backgroundColor = 'black';
+        dateTime.font = 'Roboto';
+        dateTime.fontSize = 14;
+        dateTime.fontWeight = 400;
+        dateTime.fill = '#FFDD07';
+        dateTime.align = 'left';
+
 
-        text2.font = 'Roboto';
-        text2.fontSize = 32;
-        text2.fontWeight = 700;
+        nextLine();
+        introText = game.add.text();
+        introText.font = 'Roboto';
+        introText.fontSize = 32;
+        introText.fontWeight = 700;
 
         //  x0, y0 - x1, y1
-        grd = text2.context.createLinearGradient(0, 0, 0, 100);
+        grd = introText.context.createLinearGradient(0, 0, 0, 500);
         grd.addColorStop(0, '#099');
-        grd.addColorStop(1, '#000');
-        text2.fill = grd;
+        grd.addColorStop(1, '#fff');
+        introText.fill = grd;
 
-        text2.align = 'center';
-        text2.stroke = '#111';
-        text2.strokeThickness = 1;
-        text2.setShadow(2, 2, 'rgba(0,0,0,0.3)', 2);
+        introText.align = 'left';
+        introText.stroke = '#111';
+        introText.strokeThickness = 1;
+        introText.setShadow(2, 2, 'rgba(0,0,0,0.3)', 2);
 
 
-        nextLine();
+        timeoutID = window.setTimeout(slowIntroText, 10000);
 
-    }
 
+    }
 };
 
 

components/com_battle/views/phaser/tmpl/playstate03.js

@@ -445,8 +445,6 @@ function place_portals(){
     //   portal[3] = game.add.sprite(x3[grid], y3[grid], 'portal00003');
     //   game.physics.enable(portal[3], Phaser.Physics.ARCADE);
     portal[3]['grid']=portal_dest_3[grid];
-
-
 }
 
 function place_player() {

components/com_battle/views/phaser/tmpl/script.js

@@ -521,11 +521,17 @@ else {
         }
     }
 
+
+
+
+
+
     function updateLine() {
-        if (line.length < content[index].length) {
-            line = content[index].substr(0, line.length + 1);
+        console.log(introDateTime);
+        if (line.length < introDateTime[index].length) {
+            line = introDateTime[index].substr(0, line.length + 1);
             // text.text = line;
-            text2.setText(line);
+            dateTime.setText(line);
         }
         else {
             //  Wait 2 seconds then start a new line
@@ -535,9 +541,70 @@ else {
 
     function nextLine() {
         index++;
-        if (index < content.length) {
+        if (index < introDateTime.length) {
             line = '';
-            game.time.events.repeat(80, content[index].length + 1, updateLine, this);
+            game.time.events.repeat(80, introDateTime[index].length + 1, updateLine, this);
+        }
+    }
+
+
+
+
+
+    function nextLine2() {
+        if (lineIndex === content.length) {
+            //  We're finished
+            return;
+        }
+        //  Split the current line on spaces, so one word per array element
+        line2 = content[lineIndex].split(' ');
+        //  Reset the word index to zero (the first word in the line)
+        wordIndex = 0;
+        //  Call the 'nextWord' function once for each word in the line (line.length)
+        game.time.events.repeat(wordDelay, line2.length, nextWord, this);
+        //  Advance to the next line
+        lineIndex++;
+    }
+
+    function nextWord() {
+        //  Add the next word onto the text string, followed by a space
+        introText.text = introText.text.concat(line2[wordIndex] + " ");
+        //  Advance the word index to the next word in the line
+        wordIndex++;
+        //  Last word?
+        if (wordIndex === line2.length) {
+            //  Add a carriage return
+            introText.text = introText.text.concat("\n");
+            //  Get the next line after the lineDelay amount of ms has elapsed
+            game.time.events.add(lineDelay, nextLine2, this);
         }
+
+    }
+
+
+
+    function slowIntroText() {
+        nextLine2();
     }
+
+    function clearAlert() {
+        window.clearTimeout(timeoutID);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

components/com_battle/views/plate/tmpl/027_hobbits/cabinet-front.png

@@ -1,17 +1,19 @@
-<<html>
-<head>
-    <!-- Phaser -->
-    <script src="/components/com_battle/includes/phaser.js"></script>
-    <style>
-        body {
-            margin: 0;
-        }
-    </style>
-</head>
-<body>
-<div id="world">
-</div>
-<script src='state001.js'></script>
-<script src='script.js'></script>
-</body>
+<html>
+    <head>
+        <!-- Phaser -->
+        <script src="/components/com_battle/includes/phaser.js"></script>
+        <style>
+            body {
+                margin: 0;
+            }
+        </style>
+    </head>
+    <body>
+
+    <div id="world">
+    </div>
+
+    <script src='script.js'></script>
+    <script src='state001.js'></script>
+    </body>
 </html>