game/gui.rpy

@@ -294,7 +294,7 @@ define gui.page_spacing = 0
 define gui.slot_spacing = 15
 
 ## The position of the main menu text.
-define gui.main_menu_text_xalign = 1.0
+define gui.main_menu_text_xalign = 0.5
 
 
 ## Frames ######################################################################

game/screens.rpy

@@ -29,7 +29,7 @@ init python:
 
     def ToggleAutoUpdate():
         onclick_audio(persistent.autoup)
-        preferences.autoup = not preferences.autoup
+        persistent.autoup = not persistent.autoup
 
     def ToggleAutoForwardMove():
         onclick_audio(persistent.afm_enable)
@@ -463,6 +463,11 @@ screen main_menu_buttons(filename, label_functions):
     for l_f in label_functions:
         use main_menu_button(filename, l_f[0], l_f[1])
 
+transform bonus_notif:
+#text_align 0.5
+    pause 6.00
+    easeout_cubic 0.65 alpha 0
+
 screen main_menu():
 
     ## This ensures that any other menu screen is replaced.
@@ -475,7 +480,20 @@ screen main_menu():
 
     ## This empty frame darkens the main menu.
     frame:
+                #text "You have unlocked all bonus chapters!"
         pass
+    if persistent.old_endings != persistent.endings:
+        fixed:
+            xalign 0.125
+            yalign 0.5
+            xsize 1920/2
+            ysize 1080/4
+            add Solid(gui.accent_color)
+            at bonus_notif
+            if persistent.endings == 0b1111:
+                text "You have unlocked all bonus chapters!" style "main_menu_text" yalign 0.5
+            else:
+                text "You have unlocked new bonus chapters, complete unseen endings to see more!" style "main_menu_text" yalign 0.5
 
     ## The use statement includes another screen inside this one. The actual
     ## contents of the main menu are in the navigation screen.
@@ -860,7 +878,7 @@ screen file_slots(title, flag=False):
                 for page in range(1, 10):
                     textbutton "[page]" activate_sound "audio/ui/uiClick.wav" action FilePage(page)
 
-                textbutton _(">") activate_sound "audio/ui/uiRollover.wav" action FilePageNext()
+                textbutton _(">") activate_sound "audio/ui/uiRollover.wav" action FilePageNext(max=9)
 
 
 style page_label is gui_label

game/script.rpy

@@ -45,6 +45,9 @@ init python:
     if persistent.lewd == None:
         persistent.lewd = False
 
+    if persistent.autoup == None:
+        persistent.autoup = False
+
 transform randPosition:
   alpha 0.0
   xalign random.uniform(0.2,0.8)
@@ -398,7 +401,7 @@ image trevor neutral flip = im.Flip("trishfam/trevor neutral.png", horizontal=Tr
 image trevor awe flip = im.Flip("trishfam/trevor awe.png", horizontal=True)
 
 # scene flips
-image moes pizza mirrored = im.Flip("backgrounds/moes pizza.jpg", horizontal=True)
+image moes pizza mirrored = im.Flip("images/backgrounds/moes pizza.jpg", horizontal=True)
 
 # vfx
 image black = "#000"
@@ -706,14 +709,14 @@ image home fang night lessblurred = im.Blur('images/backgrounds/home fang night.
 image home fang night barelyblurred = im.Blur('images/backgrounds/home fang night.jpg', 0.5)
 image d01_blur = im.Blur('images/cgs/d01.jpg', 1.5)
 
-image fangroomfuture = "images/backgrounds/fangroomfuture.png"
-image livingroomdayalt = "images/backgrounds/livingroomdayalt.png"
-image emptyroomnight = "images/backgrounds/emptyroomnight.png"
+#image fangroomfuture = "images/backgrounds/fangroomfuture.png"
+#image livingroomdayalt = "images/backgrounds/livingroomdayalt.png"
+#image emptyroomnight = "images/backgrounds/emptyroomnight.png"
 
-image naomifangcg = "images/cgs/naomifangcg.png"
-image naomifangcg blur = im.Blur("images/cgs/naomifangcg.png", 1.5)
-image naomiletter = 'images/cgs/naomiletter.png'
-image ending_d_cg = 'images/cgs/golden ending.png'
+#image naomifangcg = "images/cgs/naomifangcg.png"
+image naomifangcg blur = im.Blur("images/cgs/naomifangcg.jpg", 1.5)
+image naomiletter = 'images/cgs/naomiletter.jpg'
+image ending_d_cg = 'images/cgs/golden ending.jpg'
 
 image photoviewfinder = 'images/other/photoviewfinder.png'
 
@@ -757,7 +760,7 @@ image blurring_shooter:
 #caller bgs
 image anonday_videocall_bg = im.Crop(im.FactorScale("images/backgrounds/foodcourt.jpg", 0.9),(0,40,576,920))
 image anonnight_videocall_bg = im.Crop(im.FactorScale("images/backgrounds/room anon dark.jpg", 0.9),(100,40,576,920))
-image fangphonebg = im.Crop(im.FactorScale("images/backgrounds/anonroomday2.png", 0.9),(400,40,576,920))
+image fangphonebg = im.Crop(im.FactorScale("images/backgrounds/anonroomday2.jpg", 0.9),(400,40,576,920))
 image fpvcblack = im.Scale("images/other/black.png", 565, 1100)
 image call_ended = im.Scale("images/other/black.png", 656, 700)
 image caller_black = im.Scale("images/other/blackwtransp.png", 656, 700)
@@ -854,10 +857,10 @@ image fanganonhug = "images/fang/fullbody/fanganonhug.png"
 image anon smiley = "images/anon/base set/anon face happy.png"
 
 #additional CGs
-image gold_fang_home_prom_stars = "images/cgs/stair3.png"
-image good_fang_home_prom_stars = "images/cgs/stair2.png"
-image other_fang_home_prom_stars = "images/cgs/stair1.png"
-image anonfang_xmasmorningbed = "images/cgs/anonchristmasmorning.png"
+image gold_fang_home_prom_stars = "images/cgs/stair3.jpg"
+image good_fang_home_prom_stars = "images/cgs/stair2.jpg"
+image other_fang_home_prom_stars = "images/cgs/stair1.jpg"
+image anonfang_xmasmorningbed = "images/cgs/anonchristmasmorning.jpg"
 
 #sepia effect for flashbacks
 image grainf0 = "images/other/grain/frame_00.png"

game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy

@@ -8,7 +8,7 @@ label chapter_13D:
 
     F "Nice suit! Did ya get it from the suit store?"
 
-    scene gold_fang_home_prom_stars with Dissolve(2) 
+    scene gold_fang_home_prom_stars with Dissolve(2)
     pause 1
 
     "Holy shit, she can really rock that dress."
@@ -17,9 +17,9 @@ label chapter_13D:
     pause 2.0
 
     FD "Ahem."
-    
+
     "Ah. {w=0.2}Shit."
-    
+
     scene home fang night
     show fang d prom happy flip at sright
     with fade
@@ -1162,7 +1162,7 @@ label chapter_13D:
     show naser prom happy at sleft with easeinleft
     show naomi prom happy with easeinleft:
         xalign 0.9 yalign 0.0
-    show naomi prom happy flip with dissolve     
+    show naomi prom happy flip with dissolve
     "Spears backs out of the spotlight, giving a polite applause to the pair as they rush onstage to accept."
 
     "The rest of the class is in a celebratory uproar."
@@ -1242,7 +1242,7 @@ label chapter_13D:
 
     "It took half a year but she finally completed the song from the roof."
 
-    play music 'audio/OST/Amberlight Brilliance - Live.ogg' fadein 1.0
+    play music 'audio/OST/Amberlight Brilliance D ending.ogg' fadein 1.0
     window hide
     window auto
     pause .5
@@ -1349,7 +1349,7 @@ label chapter_13D:
     "The cool night air feels absolutely amazing after we spent so long in the sweatbox of a gym."
 
     show anon prom neutral at acenter with dissolve:
-        xalign 0.8 #yalign -0.1 zoom 1.35 
+        xalign 0.8 #yalign -0.1 zoom 1.35
     show fang d prom happy with dissolve:
         xpos 0 #yalign -0.1 #zoom 1.35
 
@@ -1611,7 +1611,7 @@ label chapter_13D:
     window auto
 
     show lighter at scenter with easeinbottom:
-        yalign 0.5 zoom 2.0 
+        yalign 0.5 zoom 2.0
     pause 1
     "Catching it out of the air, I only briefly catch the words ‘FUCK COMMUNISM’ engraved in its side when I hear yet another car approaching."
     window hide
@@ -2063,8 +2063,8 @@ label chapter_13D:
     "I’ll never be able to look at marinara the same way."
     pause 0.5
     "But pasta-based trauma aside, it’s now the day after Christmas."
-    scene blue 
-    show anonfang_xmasmorningbed 
+    scene blue
+    show anonfang_xmasmorningbed
     with fade
     "I’m sitting in my bed, looking through one of my favorite presents."
 

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

@@ -802,7 +802,7 @@ label chapter_14A:
     show fang silo3
     with Dissolve(.25)
 
-    play sound "audio/effects/shottinnitus.ogg"
+    play sound "audio/effects/shotTinnitus.ogg"
     scene fang shoot
     pause 0.02
 

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

@@ -156,7 +156,7 @@ label chapter_14D:
 
     "I go over to write in my John Hancock and the person behind the counter stands up."
 
-    "Seeing her in person now is like witnessing a possessed barbie doll."
+    "My nose is assaulted by the pheronomes of perfumes that probably cost more than a years' salary."
 
     show naomi future at sright with dissolve
     N "Oh!"
@@ -634,7 +634,7 @@ label chapter_14D:
     stop music fadeout 1.0
     A "I know."
     #play music
-    play music 'audio/OST/ending_14D.ogg' fadein 1.0
+    play music 'audio/OST/Amberlight Brilliance - Live.ogg' fadein 1.0
     scene d04b with fade
 
     "That didn’t stop Lucy from shuffling closer until our legs were pressed together."

game/script/4.anon-needs-help-during-music-period.rpy

@@ -1209,11 +1209,10 @@ label chapter_4:
     "Ah, the messenger app."
 
     transform cursortransform:
-        xalign 0.55
         block:
-            yalign 0.2
+            yalign 0.2 xalign 0.60
             pause .25
-            easein_cubic 1 yalign 0.75
+            easein_cubic 1 yalign 0.75 xalign 0.54
             pause .5
             repeat
 
@@ -1223,6 +1222,15 @@ label chapter_4:
         fixed:
             add "cursor"
 
+    image fangbuttonidle:
+
+        "other/fangbuttonidle.png"
+        matrixcolor TintMatrix(Color((1.1*255, 1.1*255, 1.1*255)))
+        easeout_cubic 0.50 matrixcolor TintMatrix(Color((255, 255, 255)))
+        pause 0.633
+        repeat
+
+
     screen mousedetect():
         transform: # thanks based nutbuster
             zoom 0.8
@@ -1234,12 +1242,14 @@ label chapter_4:
                 hovered Hide("prompt")
                 unhovered Show("prompt")
 
-    screen textscroll():
+
         # kick the player back out in X seconds in case they can't find the 'close' button
         # timer 10.0 action Return()
         add "white"
         timer 2 action(Show("mousedetect"), Show("prompt"))
 
+    screen textscroll():
+        add Solid("FFF")
         transform: # thanks based nutbuster
             zoom 0.8
             rotate 12.5
@@ -1253,13 +1263,11 @@ label chapter_4:
                 add "texts"
                 yinitial 1.0
 
-                frame:
-                    xalign 0.53 ypos 100
-                    button:
-                        text "CLOSE" style "button_text":
-                            xalign 0.5
-                        xsize 500
-                        action (Hide("mousedetect"), Hide("prompt"), Hide("textscroll", transition=Dissolve(1.0)), Return())
+                imagebutton auto "fangbutton%s" xalign 0.53 yalign 0.5:
+                    ypos 65+(107/2)
+                    xsize 284
+                    ysize 107
+                    action (Hide("mousedetect"), Hide("prompt"), Hide("textscroll", transition=Dissolve(1.0)), Return())
         add "fang phone"
 
     call screen textscroll with dissolve

game/utility.rpy

@@ -13,7 +13,7 @@ label initstats(anon=0, fang=0, trad=False):
 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:
+    if anonscore >= 4 and fangscore >= 4 and wingStory:
         return(4) # Golden
     elif anonscore >= 3 and fangscore <=4:
         return(3) # Tradwife