From 8db15e5a18b0c6fa679a96f54d7a76853ca544dc Mon Sep 17 00:00:00 2001
From: Rueshelle Ferguson <fergusonr@coventry.ac.uk>
Date: Fri, 2 Oct 2020 11:07:42 +0100
Subject: [PATCH 1/4] dont need

---
 StoryD7.py | 6 ------
 story.py   | 9 ++-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/StoryD7.py b/StoryD7.py
index eb877a4..8d532c9 100644
--- a/StoryD7.py
+++ b/StoryD7.py
@@ -1,11 +1,6 @@
 import story
 import os
 import msvcrt as m
-# the logic for the sotry... 
-
-# help function to display more informating about links in the story
-
-# get user input
 
 # clear the screen
 def clear():
@@ -13,7 +8,6 @@ def clear():
     m.getch()
     os.system('cls')
 
-
 # main 
 def main():
     print(story.chairStory)
diff --git a/story.py b/story.py
index fa7995f..35f0cd0 100644
--- a/story.py
+++ b/story.py
@@ -33,7 +33,7 @@ chairStory = '''
 '''
 
 #links to other pages
-# black holographic screen      - screen
+        # black holographic screen      - screen
 screen =''' 
                 A holographic screen is a two dimensional display technology that uses coated 
                 glass media for the projection surface of a video projector.
@@ -96,7 +96,6 @@ leave = '''
                 Enjoy a luxurious life years to come. Evolve and live better and advanced life without family.
                 Always having the guilt of leaving the family in other era.'''
 
-
 # conclusion
 
 con = '''
@@ -115,13 +114,9 @@ con = '''
                 He then travells again...
         '''
 
-
-
 context =  '''
                 would you like to find out anymore information about any of the following?
         
                 A)  The Screen          B)  Time Travel
                 c)  19th Of September   D)  Continue With The Choice
-          '''
-
-
+          '''
\ No newline at end of file

From b6d0ef343531c7501250de60fd7bee46511788c1 Mon Sep 17 00:00:00 2001
From: giggzze <giggzze@live.co.uk>
Date: Fri, 9 Oct 2020 09:34:45 +0100
Subject: [PATCH 2/4] pulled master

---
 StoryD7.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/StoryD7.py b/StoryD7.py
index 9382312..078c3f4 100644
--- a/StoryD7.py
+++ b/StoryD7.py
@@ -1,6 +1,3 @@
-
-=======
-
 def dansStory():
     listOfYes =["Yes", "yes", "Yes please", "yes please", "Yeah", "yeah"]
     playerName = input("Hello, what is your name? ")

From bfc88d27ba78a47cdc905cfa21c29dacd5417c77 Mon Sep 17 00:00:00 2001
From: giggzze <giggzze@live.co.uk>
Date: Fri, 9 Oct 2020 09:56:32 +0100
Subject: [PATCH 3/4] giggs choice fixed

---
 StoryD7.py                       |  22 ++++++++++++++--------
 __pycache__/story.cpython-38.pyc | Bin 6057 -> 6301 bytes
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/StoryD7.py b/StoryD7.py
index 078c3f4..4a2e018 100644
--- a/StoryD7.py
+++ b/StoryD7.py
@@ -78,7 +78,7 @@ def dansStory():
     Ans6 = input("Are you going to 'risk your life to save your brother', or 'stay where you are and keep holding onto safety'")
     print("")
     print("After the decision...")
-dansStory()
+#dansStory()
 
 # gigs starts
 
@@ -105,13 +105,19 @@ def main():
         print(story.sept)
     else:
         pass
-    clear()
-    print(story.decision)
-    a = int(input('Please select 1 or 2...'))
-    if a == 1:
-        print(story.leave)
-    elif a == 2:
-        print(story.back)
+    isNumber = False
+    while isNumber == False:
+        try:
+            clear()
+            print(story.decision)
+            a = int(input('Please select 1 or 2...'))
+            if a == 1:
+                print(story.leave)
+            elif a == 2:
+                print(story.back)
+            isNumber = True
+        except ValueError:
+            pass
     print(story.decision2)
     print(story.con)
 main()
diff --git a/__pycache__/story.cpython-38.pyc b/__pycache__/story.cpython-38.pyc
index e42dddf904b11bc32df8715c0ea811bd3b49d588..7bff86dfeccbc10cd8336366e405dd197a697e7f 100644
GIT binary patch
delta 407
zcmZWl!Ab)$5Z%(X+LVH*AbOgclnPRBp0uraRAgI(g6K9o>xS+olFeG{rQaa+;=vE-
zQT>}-z4{3~IMpr`e2`@3y~(^urU!40dbe6-4&mc$eAC=@oUeJZi~=Pmw9@_O`W_3)
zy>h@jr&f8tooy6eKd(1miXklU^v&`xKZh!d0~o0cVlhB43PK?RP?-T=juNF2gbbBV
zd?S<uzrRpGg<v9tP{pwt3VC<TCbO-bakB={A>QK}QRXfHtvN3egpT$fF#b0OC%tiG
zBDe^_!+V2CA2nS+CBChs5i&!#5>znn-j0;uxYXpl#w_EJ-xJz1N{?(Q{T;wEL#BV8
y)=jCgT?>$llpbTtd30#qzRw4CB}N*~7CDKlv>ALfQ%6_mdv#@Ux!o<6-1Q&#J9Z=h

delta 188
zcmbPhxKdv`l$V!_0SI#B%Hr)L85kaeILLqr$Z-JTVuOj=>U^o3scg-Rj0`E9!3>&Q
z8)N<mu}oxUV3;H-vbjLGmN~&slj{~&az<iiQE*9qQDqccadJ^=YF-pqNoH<pNKs;0
zYEBeOacV(H6h}&Ga%OR6eqIzOjAazXl9ZU79mSfH3RD=yoSdI`i?yIAGp}SNLlMvx
OATilhB9xh(MGye2%`qha


From b3a73392f77b521e4b90942a1241228aeff15f7c Mon Sep 17 00:00:00 2001
From: giggzze <giggzze@live.co.uk>
Date: Fri, 9 Oct 2020 10:21:55 +0100
Subject: [PATCH 4/4] finished

---
 StoryD7.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/StoryD7.py b/StoryD7.py
index 4a2e018..173ff13 100644
--- a/StoryD7.py
+++ b/StoryD7.py
@@ -120,7 +120,7 @@ def main():
             pass
     print(story.decision2)
     print(story.con)
-main()
+#main()
 
 # joel 
 next=False
@@ -147,8 +147,6 @@ while next==False:
         print("\nPlease ensure the exact word is used(including case)")
         #makes sure choice is valid
         
-
-        
         #mateuszs code
   # Put story into here
 #Mateusz code
@@ -181,7 +179,7 @@ def views():
         elif go_to == '5' and 'park[5]' in places:
             print('\nHe travelled to Ueno Park and zoo. The greenery was astoundingly serene, covering the whole park. The zoo was filled with animals from all around the globe including polar bears, African elephants and camels.')
             places.remove('park[5]')    
-views()
+#views()
 
 
 ###----ENDING----joel###