Merge branch 'Monster-Update-6' into lets-fucking-go

game/options.rpy

@@ -150,7 +150,7 @@ define config.default_sfx_volume = 0.90
 ## This generally should not be changed, and if it is, should always be a
 ## literal string, not an expression.
 
-define config.save_directory = "DinoGirlGamu-1592542119"
+define config.save_directory = "CavemanonSnootGame"
 
 
 ## Icon ########################################################################

game/screens.rpy

@@ -1,4 +1,5 @@
 ###Updater Python stuff###
+
 init python:
     if renpy.variant("pc"): #Don't run this on mobile, not supported
         if persistent.updateresult is None:

game/script.rpy

@@ -954,7 +954,6 @@ transform wiggle:
       linear 10.0 yalign 1.0 clockwise circles 1
       repeat
 
-
 label start:
     $ fangscore = 0
     $ anonscore = 0

game/script/14A.KO_OP-ending.rpy

@@ -26,7 +26,7 @@ label chapter_14A:
     "I pull back the curtain to reveal that a thick Sunday fog had rolled in overnight."
 
     "What time is it?"
-    
+
     "Guess I’ll check my phone{cps=*.1}...{/cps}"
 
     window hide
@@ -258,7 +258,7 @@ label chapter_14A:
 
     show fang:
         ease_cubic 1 xalign 0.7
-    show fang considering flip with Dissolve(.25) 
+    show fang considering flip with Dissolve(.25)
     F "It isn’t, Anon."
 
     A "But-"
@@ -325,7 +325,7 @@ label chapter_14A:
 
     "Oh shit, Fang and I are beyond late."
     pause .5
-    
+
     "Wait, where is Fang?"
 
     "Her backpack is gone, too."
@@ -849,7 +849,7 @@ label chapter_14A:
         ypos  0
     with Dissolve(2)
 
-    F "A-Anon{cps=*.1}...{/cps} WHY ARE YOU-!"   
+    F "A-Anon{cps=*.1}...{/cps} WHY ARE YOU-!"
 
     A "Aaaah{cps=*.1}...{/cps}{w=.4} haaaah{cps=*.1}...{/cps} Fang{cps=*.1}...{/cps}{w=.4} why{cps=*.1}...{/cps}?"
 
@@ -876,17 +876,17 @@ label chapter_14A:
 
     scene shooterroof:
         size(1920, 1080)
-        xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5
         ease 1 zoom 1.04
     show fang shooter:
         ypos 0
-        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5
         ease 1 zoom 1.04
     pause 1
 
     show fang shooter:
         ypos 0
-        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5
         ease 1 zoom 1
     pause 1
 
@@ -908,17 +908,17 @@ label chapter_14A:
     scene shooterroof:
         size(1920, 1080)
         zoom 1.04
-        xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5
         ease 1 zoom 1.08
     show fang shooter:
         ypos 0
-        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5
         ease 1 zoom 1.04
     pause 1
 
     show fang shooter:
         ypos 0
-        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5
         ease 1 zoom 1
     pause 1
 
@@ -941,7 +941,7 @@ label chapter_14A:
     scene shooterroof:
         size(1920, 1080)
         zoom 1.08
-        xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5
         easeout_cubic 0.7 ypos 0.40 zoom 1.20
     show fang shooter:
         ypos 0
@@ -986,7 +986,7 @@ label chapter_14A:
     window auto
     pause .5
 
-    play sound 'audio/effects/shooterAnonStep.ogg' 
+    play sound 'audio/effects/shooterAnonStep.ogg'
     play ambient2 'audio/effects/hungrybeast.ogg' volume 0.1 fadein 1.5
     play ambient "audio/effects/heartbeat.ogg" loop fadein 3 volume 0.2
     show blurring_shooterroof:
@@ -1045,18 +1045,18 @@ label chapter_14A:
 
     show shooterroof blurred:
         size(1920, 1080)
-        xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5
         zoom 1.08
         ease 1 zoom 1.12
     show fang shooter blurred:
         ypos 0
-        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5
         ease 1 zoom 1.04
     pause 1
 
     show fang shooter blurred:
         ypos 0
-        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 
+        xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5
         ease 1 zoom 1
     pause 1
 
@@ -1408,7 +1408,7 @@ label chapter_14A:
     scene black with Dissolve(4)
     pause 2
 
-    scene 1of4 with Dissolve(2)
+    scene e1of4 with Dissolve(2)
     pause
 
     scene black with Dissolve(3)

game/script/14B.bad-ending.rpy

@@ -327,7 +327,7 @@ label chapter_14B:
     window hide
     pause 2
 
-    scene 2of4 with Dissolve(2)
+    scene e2of4 with Dissolve(2)
     pause
 
     scene black with Dissolve(3)

game/script/14C.good-ending.rpy

@@ -403,7 +403,7 @@ label chapter_14C:
     A "Oh. Well, we can still go check it out."
 
     stop ambient fadeout 2
-    
+
     play ambient1 "audio/effects/teenageCrowdFarLoop.ogg" fadein 1.0
 
     scene outside moes with dissolve
@@ -753,7 +753,7 @@ label chapter_14C:
 
     $ quick_menu = False
     window hide
-    scene 3of4 with fade
+    scene e3of4 with fade
     stop sound fadeout 15.0
     pause 16
     $ renpy.music.set_volume(0, 2, 'sound')

game/script/14D.gold-ending.rpy

@@ -670,7 +670,7 @@ label chapter_14D:
     "Our lips meld together as we embrace just like we were teens again."
     $ quick_menu = False
     window hide
-    scene 4of4 with fade
+    scene e4of4 with fade
     stop music fadeout 15.0
     pause 16
     scene black with fade

game/storyline.rpy

@@ -1,10 +1,10 @@
 init -1 python:
     def ending_image():
-        #0b0000, ABCD, flash the bits with |=, check with &
+        #0b0000, DCBA, flash the bits with |=, check with &
         endings = 0b0000
         _e = 0b1
         for i in range(1, 5):
-            fn = str(i)+"of4"
+            fn = "e"+str(i)+"of4"
             endings |= (_e * renpy.seen_image(fn))
             _e = _e << 0b1
         persistent.endings = endings
@@ -86,6 +86,6 @@ label .ending:
        pause 20
     elif anonscore >= 4 and fangscore >= 4:
        scene ending_d_cg with Dissolve(1.5)
-       pause 20 
+       pause 20
     scene black with Dissolve(2)
     return