From 26d02357e9d2087c3e4a9b3ab0a8ede120dabf9b Mon Sep 17 00:00:00 2001
From: Nick <nickwalton00@gmail.com>
Date: Sun, 7 Apr 2019 12:23:20 -0600
Subject: [PATCH] new branch

---
 __pycache__/generator.cpython-36.pyc | Bin 2599 -> 2599 bytes
 generator.py                         |   2 +-
 main.py                              |   9 ++--
 static/script.js                     |  60 +++++++++++++++------------
 4 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/__pycache__/generator.cpython-36.pyc b/__pycache__/generator.cpython-36.pyc
index 4d391c2ba816993e71f0a2b24483a700a4d11a31..36112a43a4bb934a0d6637b558fc7db94b7edd93 100644
GIT binary patch
delta 23
fcmZ23vRs7Sn3tDpp53aA>?(|m-kWt8e{%o;OIZeI

delta 23
ecmZ23vRs7Sn3tE!+<WClb`?g(fXzCLzc~O#at09q

diff --git a/generator.py b/generator.py
index a2cade4..0e6d80d 100644
--- a/generator.py
+++ b/generator.py
@@ -13,7 +13,7 @@ pos_action_starts = ["You attack", "You tell", "You use", "You go"]
 
 class StoryGenerator():
 
-    def __init__(self, sess, length=80, temperature=0.9, top_k=40):
+    def __init__(self, sess, length=75, temperature=0.9, top_k=40):
     
         seed = None
         batch_size=1
diff --git a/main.py b/main.py
index b2497a0..92be1e8 100644
--- a/main.py
+++ b/main.py
@@ -24,6 +24,8 @@ from flask import Flask, render_template, request
 
 app = Flask(__name__)
 
+phrases = [" You attack", " You use", " You tell", " You use"]
+
 session = None
 generator = None
 
@@ -38,16 +40,15 @@ def root():
 def story_request():
     print("****Generating Story****")
     prompt = request.form["prompt"] # given prompt
-    phrase = request.form["phrase"]
     gen_actions = request.form["actions"] # given prompt
     
-    print("\n Given prompt is: \n",prompt," ", phrase,"\n")
+    print("\n Given prompt is: \n",prompt," ","\n")
     
     generator = get_generator()
     
     if gen_actions == "true":
-        action, result = generator.generate_action_result(prompt, phrase)
-        response = json.dumps([action, result])
+        action_results = [generator.generate_action_result(prompt, phrase) for phrase in phrases]
+        response = json.dumps(action_results)
     else:
         response = generator.generate_story_block(prompt)
         
diff --git a/static/script.js b/static/script.js
index 182da21..356af10 100644
--- a/static/script.js
+++ b/static/script.js
@@ -20,7 +20,7 @@ var StoryTracker = {
     getFirstStory:function(){
         console.log("Requesting first story")
         Typer.appendToText(initial_prompt)
-        StoryTracker.requestStory(initial_prompt, "None")
+        StoryTracker.requestStory(initial_prompt)
     
     },
     
@@ -36,26 +36,33 @@ var StoryTracker = {
     },
     
     addNextAction:function(action_result){
-        var action_result = JSON.parse(action_result)
-        action = action_result[0]
-        result = action_result[1]
-        
-        
-        StoryTracker.actions.push(action)
-        StoryTracker.results.push(result)
-        var print_action = "\n" + String(StoryTracker.action_int) + ") " + action
-        StoryTracker.action_int += 1
-        Typer.appendToText(print_action)
+    
+        var action_results = JSON.parse(action_result)
+    
+        for (i = 0; i < 4; i++){
+            
+            action_result = action_results[i]
 
-        if (StoryTracker.action_int > 3){
-            Typer.appendToText("\nWhich action do you choose? ")
-            StoryTracker.action_int = 0
-            acceptInput = true
+            action = action_result[0]
+            result = action_result[1]
             
-            if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) {
-                setTimeout(StoryTracker.mobileButton, 1000);
+            
+            StoryTracker.actions.push(action)
+            StoryTracker.results.push(result)
+            var print_action = "\n" + String(StoryTracker.action_int) + ") " + action
+            StoryTracker.action_int += 1
+            Typer.appendToText(print_action)
+
+            if (StoryTracker.action_int > 3){
+                Typer.appendToText("\nWhich action do you choose? ")
+                StoryTracker.action_int = 0
+                acceptInput = true
+                
+                if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) {
+                    setTimeout(StoryTracker.mobileButton, 1000);
+                }
+                
             }
-            
         }
         
     },
@@ -76,19 +83,18 @@ var StoryTracker = {
         StoryTracker.actions = []
         StoryTracker.results = []
         
-        for (i = 0; i < 4; i++){
-            StoryTracker.requestAction(prompt, action_list[i])
-        }
+        StoryTracker.requestAction(prompt)
+        
 
     },
     
-    requestStory:function(prompt, phrase){
-	    $.post("/generate", {actions: false, prompt, phrase},
+    requestStory:function(prompt){
+	    $.post("/generate", {actions: false, prompt},
 	      StoryTracker.addNextStory)
     },
     
-    requestAction:function(prompt, phrase){
-	    $.post("/generate", {actions: true, prompt, phrase},
+    requestAction:function(prompt){
+	    $.post("/generate", {actions: true, prompt},
 	      StoryTracker.addNextAction)
     },
 
@@ -101,7 +107,7 @@ var StoryTracker = {
             StoryTracker.lastAction = StoryTracker.actions[choice_int]
             StoryTracker.lastStory = StoryTracker.results[choice_int]
             StoryTracker.makeActionRequests(StoryTracker.firstStory + StoryTracker.lastStory)
-            Typer.appendToText("\n\n")
+            Typer.appendToText("\n")
             Typer.appendToText(StoryTracker.lastStory)
             Typer.appendToText("\n\nOptions:")
         }
@@ -187,7 +193,7 @@ function writeAppend(str){
 
 
 function startTyping(){
-    addTextTimer = setInterval("typeWords()", 40)
+    addTextTimer = setInterval("typeWords()", 50)
  
 }