Merge branch 'chapter-11-choreo' into choreo

game/script.rpy

@@ -144,7 +144,6 @@ define SV = Character ('Street Vendor', base, color="#F8E120", who_outlines=[(1,
 define carl = Character ('Mr. Carldewskii', base, color="#E19E40", who_outlines=[(1, '#03223B')])
 define Drf = Character ('Dr. Fernsworth', base, color="#253354", who_outlines=[(1, '#334573')])
 define FRT = Character ('Fang Reed & Trish', base, color="#4963A5",  who_outlines=[(1, '#FFFFFF')])
-define unknown = Character ('(???)', base, color="#000000", who_outlines=[(1, '#FFFFFF')]) # Black
 
 #Extra image translations
 #siloettes
@@ -203,6 +202,7 @@ image trish angry flip = im.Flip("trish/trish angry.png", horizontal=True)
 image trish prom angry flip = im.Flip("trish/trish prom angry.png", horizontal=True)
 image trish fury flip = im.Flip("trish/trish fury.png", horizontal=True)
 image reed angry flip = im.Flip("reed/reed angry.png", horizontal=True)
+image stella mad flip =  im.Flip("stella/stella mad.png", horizontal=True)
 
 #very angry flips
 image anon angry flip = im.Flip("anon/emotive set/anon angry.png", horizontal=True)
@@ -235,6 +235,7 @@ image reed shocked flip = im.Flip("reed/reed shocked.png", horizontal=True)
 image naser shocked flip = im.Flip("naser/naser shocked.png", horizontal=True)
 image naomi shocked flip = im.Flip("naomi/naomi shocked.png", horizontal=True)
 image stella shock alt flip = im.Flip("stella/stella shock alt.png", horizontal=True)
+image rosa shocked flip = im.Flip("rosa/rosa shocked.png", horizontal=True)
 
 #considering flips
 image fang considering flip = im.Flip("fang/basic set/fang considering.png", horizontal=True)
@@ -335,6 +336,9 @@ image naomi keikaku flip = im.Flip("naomi/naomi keikaku.png", horizontal=True)
 image anon shrug flip = im.Flip("anon/emotive set/anon shrug.png", horizontal=True)
 image fang hug flip = im.Flip("fang/emotive set/fang hug.png", horizontal=True)
 image naser brooding flip = im.Flip("naser/naser brooding.png", horizontal=True) 
+image anon concerned flip = im.Flip("anon/base set/anon concerned.png", horizontal=True)
+image rosa excited flip = im.Flip("rosa/rosa excited.png", horizontal=True)
+image fang anguish flip = im.Flip("fang/emotive set/fang anguish.png", horizontal=True)
 
 # scene flips
 image moes pizza mirrored = im.Flip("backgrounds/moes pizza.jpg", horizontal=True)

game/storyline.rpy

@@ -11,28 +11,30 @@ label storyline:
     call chapter_10
     call chapter_11
     #Ending Deciding
-    if anonscore >= 4 and fangscore >= 4:
+    call get_ending
+    if _return == 4:
         call chapter_11D
         call chapter_12D
         call chapter_13D
         call chapter_14D
-    elif anonscore >= 3 and fangscore <=4:
+    elif _return == 3:
+        $ tradwife = True
         call chapter_11C
         call chapter_12C
         call chapter_13C
         call chapter_14C
-    elif anonscore <= 3 and fangscore >=3:
+    elif _return == 2:
         call chapter_11B
         call chapter_12B
         call chapter_13B
         call chapter_14B
-    elif anonscore <= 2 and fangscore <= 2:
+    elif _return == 1:
         call chapter_11A
         call chapter_12A
         call chapter_13A
         call chapter_14A
         $ renpy.quit()
-    else:
+    else: # this block is redundant since we should never hit it
         #>>ERROR HANDLING OH SWEET BABY JESUS SHIT HIT THE FAN
         St "FUCK FUCK FUCK FUCK"
         A "What?"
@@ -45,10 +47,10 @@ label storyline:
         St "Yes, but you have to have something wrong with you to speedrun a visual novel beta"
         "/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
+    call .ending
     return
 
-label ending:
+label .ending:
     play music "audio/OST/Dino Destiny Reader.ogg"
     scene credits at Pan((0, 0),(0, 7400), 61) with fade
     pause 1200

game/utility.rpy

@@ -10,3 +10,16 @@ label initstats(anon=0, fang=0, trad=False):
     $ fangscore = fang
     $ tradwife = trad
     return
+
+
+label get_ending:
+    # To check what ending we're getting, call this label and then check the value of _return
+    # Sensible to have this logic defined in only one place for consistency
+    if anonscore >= 4 and fangscore >= 4:
+        return(4) # Golden
+    elif anonscore >= 3 and fangscore <=4:
+        return(3) # Tradwife
+    elif anonscore <= 3 and fangscore >=3:
+        return(2) # Doomer
+    else:
+        return(1) # Shooter