Merge pull request 'issue34-bugfixes' (#7) from issue34-bugfixes into master

Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/7

game/script.rpy

@@ -348,4 +348,9 @@ transform rleft:
 transform rright:
    xalign 1.7 yalign 0.1
 
-call start
+label start:
+    $ fangscore = 0
+    $ anonscore = 0
+    $ tradwife = False
+    pause 1.0
+    call storyline

game/script/8.anon-and-fang-study-together.rpy

@@ -461,49 +461,35 @@ label chapter_8:
                 jump musicalchoices
             "Try Something Cool":
                 play sound "audio/effects/goodA.mp3"
-
                 F "Wow that was really pretty."
-
                 A "Really?"
-
                 F "Pretty shit."
                 jump musicalchoices
-
             "Keep it simple":
                 play sound "audio/effects/correctA.mp3"
                 F "Hmm. Interesting, keep going."
-
         menu:
-
             "Jam out hard":
                 play sound "audio/effects/badB.mp3"
                 F "You {i}really{/i} suck at this."
                 jump musicalchoices
-
             "Strum with confidence":
                 play sound "audio/effects/correctB.mp3"
-
                 F "That’s pretty good."
-
                 F "Don’t stop you idiot, keep going."
-
             "Keep a soft tone":
                 play sound "audio/effects/goodB.mp3"
                 F "C’mon Anon, you can do better."
                 jump musicalchoices
-
         menu:
-
             "Press this button or else your mother dies in her sleep":
                 play sound "audio/effects/badC.mp3"
                 F "Oh come on now, impress me."
                 jump musicalchoices
-
             "Try to impress":
                 play sound "audio/effects/goodC.mp3"
                 F "Nah… That’s not it, but you’re getting there."
                 jump musicalchoices
-
             "Play something random":
                 play sound "audio/effects/correctC.mp3"
                 F "I like this."
@@ -924,13 +910,9 @@ label chapter_8:
             "{i}Never make anything again. Ever.{/i}"
 
             "Ah, just a day in the life of an underappreciated artist."
-
-
-    #jump ChVVURMDRAMA - commented out 6/14/21 - redundant with new "system" and needs to point to chapter_9 instead
-    jump chapter_9
+        return
 
     label GetStartedOnStudy:
-
         play music 'audio/OST/Dragging on and on....ogg' fadein 1.0
         "No, I should focus more on my midterms."
 

game/storyline.rpy

@@ -1,8 +1,4 @@
-label start:
-    $ fangscore = 0
-    $ anonscore = 0
-    $ tradwife = False
-    pause 1.0
+label storyline:
     call chapter_1
     call chapter_2
     call chapter_3
@@ -50,6 +46,7 @@ label start:
         "/dev/non" "well shit. Please do report this bug and all the choices you made that lead to this point. Something fucked up real bad"
         #just liek maek gaem
     call ending
+    return
 
 label ending:
     play music "audio/OST/Dino Destiny Reader.ogg"