Merge pull request 'Merge MU6_Hotfix -> Master' (#124) from MU6_Hotfix into master

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/124

game/options.rpy

@@ -23,7 +23,7 @@ define gui.show_name = True
 
 ## The version of the game.
 
-define config.version = "Monster-Update-6"
+define config.version = "Monster-Update-6-Tradcath-Edition"
 
 ## Text that is placed on the game's about screen. Place the text between the
 ## triple-quotes, and leave a blank line between paragraphs.

game/screens.rpy

@@ -434,6 +434,29 @@ screen main_menu_button(filename, label, function):
             add filename xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5
             text label xalign 0.5 yalign 0.5 xanchor 0.5
 
+image bonus_flash:
+
+    "gui/button/menubuttons/template_idle.png"
+    matrixcolor TintMatrix(Color((5*255, 5*255, 5*255)))
+    easeout_cubic 0.30 matrixcolor TintMatrix(Color((255, 255, 255)))
+    pause 0.133
+    repeat 4
+
+screen bonus_chapter_button():
+#("gui/button/menubuttons/template_idle.png", "Bonus Chapters", ShowMenu("ex_ch_menu"))
+    button:
+        xmaximum 500
+        ymaximum 129
+        action ShowMenu("ex_ch_menu")
+        activate_sound "audio/ui/uiClick.wav"
+        fixed:
+            if persistent.old_endings != persistent.endings:
+                add "bonus_flash" xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5
+                $ persistent.old_endings = persistent.endings
+            else:
+                add "gui/button/menubuttons/template_idle.png" xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5
+            text "Bonus Chapters" xalign 0.5 yalign 0.5 xanchor 0.5
+
 # label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ]
 # Reuse the same image string and keep things 'neat'.
 screen main_menu_buttons(filename, label_functions):
@@ -467,10 +490,10 @@ screen main_menu():
         spacing 10
         xpos 1885
         ypos 1130
+        use main_menu_button("gui/button/menubuttons/template_idle.png", "Start", Start())
+        use bonus_chapter_button()
         use main_menu_buttons("gui/button/menubuttons/template_idle.png",
             [
-                [ "Start", Start() ],
-                [ "Bonus Chapters", ShowMenu("ex_ch_menu") ],
                 [ "Load", ShowMenu("load") ],
                 [ "Options", ShowMenu("preferences") ],
                 [ "Extras", ShowMenu("extras") ], \

game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy

@@ -2090,7 +2090,7 @@ label chapter_13C:
 
     Lucy "{i}*sigh*{/i}"
 
-    Lucy "I didn't work out as a tough person, I didn't work out as a big musician, and I sure as hell didn't work out as a lover, given how many exes I have..."
+    Lucy "I didn't work out as a tough person, I didn't work out as a big musician, and I sure as hell didn't work out as a good girlfriend, look at us..."
 
     Lucy "This whole thing with making everyone's lives around me hell, testing the waters with identifying my gender… {w=0.5}it was a complete disaster..."
     show fang angry flip with dissolve
@@ -2301,50 +2301,23 @@ label chapter_13C:
     show fang sad with dissolve
     "Lucy stirs like she just got stabbed in the heart."
 
-    Lucy "Fuck... that hurts like hell."
+    #I hate google docs, this is “” a mistake
+    Lucy "Fuck... that hurts like hell..."
 
-    Lucy "I’m the one who’s supposed to barge in and break us up!"
+    Lucy "It's... I...."
-    show anon neutral flip
-    show fang very sad
-    with dissolve
-    Lucy "...I've done it so many times..."
 
-    Lucy "But..."
+    Lucy  "Damn it, Anon..."
 
-    Lucy "The fucking allosaurus dickwad I had my first time with wasn't half as special as you."
+    Lucy "..."
-
-    Lucy "And I didn't just date boys, you know."
-
-    Lucy "I didn't limit my options, and I still think there was more to you!"
-
-    show anon neutral flip with dissolve
-    A "As in...?"
-
-    show fang unimpressed with dissolve
-    Lucy "You know I'm bi, right?"
-
-    A "..."
-
-    A "Like...?"
-
-    Lucy "Well, not really."
-
-    Lucy "Or rather, I don't know why I did it anymore..."
-
-    A "Lucy..."
 
     show fang angry with dissolve
     "Lucy grits her teeth in anger."
 
-    Lucy "It wasn't serious, okay!"
+    Lucy "I'm sorry, about all my bullshit!"
 
-    Lucy "Those people had problems that needed addressing."
+    Lucy "Please! T-that’s… that’s not me anymore…"
 
-    Lucy "That's not me!"
+    Lucy "I can't go back to being that thing!"
-
-    Lucy "Anon, please, don't ever think my parents ever--"
-
-    A "Lucy!"
 
     show fang surprised with dissolve
     "My voice causes my girlfriend to flinch."
@@ -2353,44 +2326,30 @@ label chapter_13C:
         ease_cubic 0.5 xalign 0.4
     "I move to place a hand on her shoulder."
     show fang sad with dissolve
-    A "Lucy… {w=0.5}It's okay..."
+    A "Lucy…"
-
-    A "Your parents are cool."
-
-    A "I would never believe they’d hurt you."
 
     "Lucy lets out a sigh."
 
-    Lucy "Anon… {w=0.5}I don't wanna dump all my baggage on you."
+    Lucy "Anon… {w=0.5}I wouldn't feel right going back to how I used to be."
 
     show fang anguish
     show anon concerned flip
     with dissolve
     Lucy "It's not right."
 
-    Lucy "And It was just a phase."
+    Lucy "It was just a phase! I swear!"
 
-    Lucy "I'll never do it again."
+    Lucy "I thought what I was donig was completely normal."
 
     Lucy "It was so humiliating..."
 
     Lucy "Naser might have known... {w=0.5}and he suffered so much because of it..."
 
-    Lucy "I can't imagine just how much more my parents would've hated me if they’d known the real truth."
+    Lucy "I can't imagine just how much more my parents would've hated if I stuck to being... being..."
 
-    Lucy "So just forget it."
+    Lucy "I don't even know who I used to be now."
 
-    Lucy "It was an obsession."
+    Lucy "I… {w=0.5}I was just an ungrateful bitch..."
-
-    Lucy "One I was convinced would make me happy."
-
-    Lucy "But it was never meant to be."
-
-    Lucy "All those relationships were just about who had the most baggage they could dump on each other and gain the most pity points."
-
-    Lucy "And I always lost because I never had it that bad."
-
-    Lucy "I… {w=0.5}I was just an ungrateful slut."
 
     show fang hiding with dissolve
     "Lucy lets out a groan and facepalms."

game/script/2.fourth-day-of-school.rpy

@@ -971,7 +971,7 @@ label chapter_2:
 
     "Doesn’t seem like it’s something she wants to hear right now."
 
-    A "So um, your Naser’s sister, right?"
+    A "So um, you're Naser’s sister, right?"
 
     show fang angry with Dissolve(.25)
     F "SIB-ling."
@@ -2097,7 +2097,7 @@ label chapter_2:
     window hide
     window auto
     pause .5
-    
+
     menu:
 
         "Look the link up":

game/storyline.rpy

@@ -7,6 +7,7 @@ init -1 python:
             fn = "e"+str(i)+"of4"
             endings |= (_e * renpy.seen_image(fn))
             _e = _e << 0b1
+        persistent.old_endings = persistent.endings
         persistent.endings = endings
 
 label storyline: