Wrote out directive msgs and addressed a few formatting issues

ohjay · Oct 15, 2015 · d121b3f · d121b3f
1 parent 1e7f5da
commit d121b3f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/css/style.css b/css/style.css
@@ -17,12 +17,13 @@ h1 {
     font-weight: normal;
 }
 
-p, #log, #final-word {
+p, #final-word {
     font-family: 'Roboto Condensed';
     color: #ead06c;
-    font-size: 18px;
+    font-size: 21px;
     text-align: center;
     z-index: 1;
+    margin-left: 7.5px;
 }
 
 span {
@@ -34,6 +35,7 @@ span {
     font-family: 'Roboto Condensed';
     color: #ead06c;
     font-size: 70px;
+    margin-left: 10px; /* otherwise the cursor makes it look a little off-center */
 }
 
 #drake {

diff --git a/index.html b/index.html
@@ -5,7 +5,7 @@
     <title>The Rap App</title>
 
     <link rel="stylesheet" href="css/style.css" />
-    <link href=' http://fonts.googleapis.com/css?family=Roboto+Condensed' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Roboto+Condensed' rel='stylesheet' type='text/css'>
 </head>
 
 <body style="background-color: #000000">
@@ -32,8 +32,7 @@
     </div>
 
     <p>
-        Hey, welcome to the Rap App! I'm just testing out some speech recognition stuff right now.
-        <div id="log"></div>
+        <span id="directive">Hey, welcome to the Rap App! To play some sick beats, click START.</span>
         <div id="final-word"></div>
         <div style="text-align: center">
             <span id="typed"></span>
@@ -68,15 +67,23 @@
         // Initialize the MP3 player after the page loads all of the HTML
         window.addEventListener("load", initMP3Player, false);
 
+        var timesStarted = 0;
         function initMP3Player() {
             startButton = document.getElementById("start");
             startButton.addEventListener("click", start);
 
             function start() {
                 if (audio.paused) {
+                    if (++timesStarted > 2) {
+                        $('#directive').text("You know what to do, bro. Show 'em what you've got.");
+                    } else {
+                        $('#directive').text("You best be spitting some savage lines right now.");
+                    }
+
                     audio.play();
                     startButton.innerHTML = '<button type="button">Stop</button>';
                 } else {
+                    $('#directive').text("What!? Don't be quitting on me, man.");
                     audio.pause();
                     startButton.innerHTML = '<button type="button">Start</button>';
                 }
@@ -176,20 +183,20 @@
             var r = new webkitSpeechRecognition();
 
             r.onresult = function(event) {
-                /* Only the final word */
+                // Only the final word
                 if (event.results[event.results.length - 1].isFinal) {
                     var finalPhrase = event.results[event.results.length - 1][0].transcript;
                     var finalWord = finalPhrase.substring(finalPhrase.lastIndexOf(' ') + 1);
 
                     document.getElementById("final-word").innerHTML = "You said: " + finalPhrase;
-                    rhymes = ["Rhymes: " + lookup(finalWord).toString() + "^2000"];
+                    rhymes = ["Rhymes: " + lookup(finalWord).toString() + "^3000"];
                     updated = true;
                     r.stop();
                 }
             };
 
             r.onerror = function(event) {
-                $('#log').text('[ERROR]: ' + event.error);
+                $('#directive').text('[SPEECH RECOGNITION ERROR] : ' + event.error);
             };
 
             r.onend = function() {

diff --git a/js/mobypron.js b/js/mobypron.js
@@ -35463,7 +35463,6 @@ var mobypron = {
 	mantle: "'m/&/nt/-/l",
 	mantlet: "'m/&/ntl/I/t",
 	mantling: "'m/&/ntl/I//N/",
-	Manto: "'m/&/nt/oU/",
 	mantra: "'m/&/ntr/@/",
 	mantram: "'m/&/ntr/@/m",
 	mantrap: "'m/&/ntr/&/p",

diff --git a/mobypron/read_and_filter.py b/mobypron/read_and_filter.py
@@ -5,12 +5,12 @@
     data = myfile.read().replace('\n', '')
 
 with open("mobypron_new.txt") as myfile2:
-	content = myfile2.readlines()
+    content = myfile2.readlines()
 
 for line in content:
-	if (line.split(":")[0][2:]).upper() in data:
-		target.write(str(line) + '\n')
-		print(line)
+    if (line.split(":")[0][2:]).upper() in data:
+        target.write(str(line) + '\n')
+        print(line)
 
 rap_list.close()
 target.close()