Merge branch 'updates' into Patchy-Patch5

Reviewed-on: https://git.snootgame.xyz/PrincipalSpears/SnootGame/pulls/20

game/options.rpy

@@ -23,7 +23,7 @@ define gui.show_name = True
 
 ## The version of the game.
 
-define config.version = "vee3-Valiant-Velociraptor-Victory-patch3"
+define config.version = "Patchy-patch5"
 
 ## Text that is placed on the game's about screen. Place the text between the
 ## triple-quotes, and leave a blank line between paragraphs.
@@ -208,3 +208,6 @@ init python:
 ## by a slash.
 
 # define build.itch_project = "renpytom/test-project"
+
+#RenPy updating from snootgame.xyz
+define build.include_update = True

game/screens.rpy

@@ -316,7 +316,7 @@ screen navigation():
         textbutton _("Save") action ShowMenu("save")
         textbutton _("Load") action ShowMenu("load")
         textbutton _("Options") action ShowMenu("preferences")
-        textbutton _("Help And About") action ShowMenu("helpandabout")
+        textbutton _("Extras") action ShowMenu("extras")
 
 
         if _in_replay:
@@ -382,7 +382,7 @@ screen main_menu():
      imagebutton auto "gui/button/menubuttons/startbutton_%s.png" action Start()
      imagebutton auto "gui/button/menubuttons/loadbutton_%s.png" action ShowMenu("load")
      imagebutton auto "gui/button/menubuttons/optionsbutton_%s.png" action ShowMenu("preferences")
-     imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("helpandabout")
+     imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("extras")
      imagebutton auto "gui/button/menubuttons/quitbutton_%s.png" action Quit(confirm=not main_menu)
 
     
@@ -578,7 +578,7 @@ screen about():
                 text "[gui.about!t]\n"
 
             text _("Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]\nTo find more information about the game (and its source code) please visit {a=https://www.snootgame.xyz/}our website{/a}.")
-
+            textbutton "Back to Extras" action ShowMenu("extras")
 
 ## This is redefined in options.rpy to add text to the about screen.
 define gui.about = ""
@@ -591,6 +591,83 @@ style about_text is gui_text
 style about_label_text:
     size gui.label_text_size
 
+## Gallery screen ################################################################
+##
+## This screen holds the Gallery.
+##
+
+screen gallery():
+
+    tag menu
+
+    ## This use statement includes the game_menu screen inside this one. The
+    ## vbox child is then included inside the viewport inside the game_menu
+    ## screen.
+    use game_menu(_("Gallery"), scroll="viewport"):
+
+        style_prefix "gallery"
+
+        vbox:
+
+            label "[config.name!t]"
+            text _("Version [config.version!t]\n")
+
+            text _("Placeholder for gallery.")
+            textbutton "Back to Extras" action ShowMenu("extras")
+
+
+style gallery_label is gui_label
+style gallery_label_text is gui_label_text
+style gallery_text is gui_text
+
+style gallery_label_text:
+    size gui.label_text_size
+
+
+## Updates screen ################################################################
+##
+## This screen houses the updates option using the built-in updates capabilities of Ren'Py.
+##
+
+screen updates():
+
+    tag menu
+
+    ## This use statement includes the game_menu screen inside this one. The
+    ## vbox child is then included inside the viewport inside the game_menu
+    ## screen.
+    use game_menu(_("Updates"), scroll="viewport"):
+
+        style_prefix "updates"
+
+        vbox:
+
+            label "[config.name!t]"
+            text _("Your Version is [config.version!t]\n")
+            textbutton "[update]" ##action Update()
+            textbutton "Back to Extras" action ShowMenu("extras")
+
+
+
+## This is redefined in options.rpy to add text to the about screen.
+define gui.update = ""
+
+
+style update_label is gui_label
+style update_label_text is gui_label_text
+style update_text is gui_text
+style page_button is gui_button
+style page_button_text is gui_button_text
+
+
+style update_label_text:
+    size gui.label_text_size
+
+style update_button:
+    properties gui.button_properties("page_button")
+
+style update_button_text:
+    properties gui.button_text_properties("page_button")
 
 ## Load and Save screens #######################################################
 ##
@@ -985,13 +1062,16 @@ style history_label:
 style history_label_text:
     xalign 0.5
 
-## Help and About screen########################################################
-## A screen that combines help and about
-screen helpandabout():
+## Extras screen########################################################
+## A screen that combines help, about, updates, gallery,
+screen extras():
     tag menu
     vbox:
             textbutton _("Help") action ShowMenu("help")
             textbutton _("About") action ShowMenu("about")
+            textbutton _("Updates") action ShowMenu("updates")
+            textbutton _("Gallery") action ShowMenu("gallery")
+            textbutton _("Return") action ShowMenu("main_menu")
 
 
 
@@ -1018,7 +1098,7 @@ screen help():
 
                 textbutton _("Keyboard") action SetScreenVariable("device", "keyboard")
                 textbutton _("Mouse") action SetScreenVariable("device", "mouse")
-
+                textbutton "Back to Extras" action ShowMenu("extras")
                 if GamepadExists():
                     textbutton _("Gamepad") action SetScreenVariable("device", "gamepad")
 

game/script.rpy

@@ -19394,10 +19394,14 @@ if anonscore >= 4 and fangscore >= 4:
 
      "Principal Spears leans over and places one of his gargantuan hands on my shoulder."
 
+     show spears happy flip with dissolve
+
      Sp "I’m real proud of you."
 
      "He pats my shoulder out of its socket and gets up."
 
+     show spears neutral flip with dissolve
+
      Sp "I won’t keep you any longer, I have my own business to attend to in a moment."
 
      A "Giving Naomi and Naser their crowns?"
@@ -19407,7 +19411,7 @@ if anonscore >= 4 and fangscore >= 4:
      Sp "Alright, be seeing you."
 
      A "Later, Principal Spears."
-
+     label chadshark:
      "He marches away to get ready for the announcement."
      scene prom with fade
      show anonphone with moveinbottom
@@ -19416,6 +19420,13 @@ if anonscore >= 4 and fangscore >= 4:
      "hey fagets guess whos at prom? later virgins"
      "pic rel is my date :^)"
 
+     scene black with fade
+     scene prom
+     show chadshark:
+        xalign 0.4
+     show stella prom neutral flip:
+        xalign 0.65
+     with fade
      "I attach a picture I took of Stella earlier when her date was in the restroom."
 
      "How did she end up with the football captain, anyway?"
@@ -19427,6 +19438,10 @@ if anonscore >= 4 and fangscore >= 4:
      "Refreshing…"
 
      "Forty replies AND revenge for that soda can."
+     scene prom
+     show anonphone
+     with fade
+
      hide anonphone with moveoutbottom
      show anon prom neutral at aleft with dissolve
      show trish prom neutral flip at tcenter with moveinright
@@ -24038,7 +24053,7 @@ elif anonscore >= 3 and fangscore <=4:
 
   "She just smiles and gives a small laugh."
 
-  F "The amount of guys I had to tell that my boyfriend was -- a Navy SEAL who knew over 300 ways to kill them with his bare hands just deployed and coming home soon…"
+  F "The amount of guys I had to tell that my boyfriend was just deployed and coming home soon…"
 
   "She begins stroking my hand on the table."
 
@@ -24368,9 +24383,9 @@ elif anonscore <= 3 and fangscore >=3:
 
    A "Hm?"
 
-   "Fang’s wrist hovers before my face."
+   "Fang's eyebrow rise and fall faster and faster."
 
-   "With the weird non-binary bracelet."
+   "as if she's trying to send a message in morse code."
 
    "Wait wha-"
 
@@ -24378,7 +24393,6 @@ elif anonscore <= 3 and fangscore >=3:
 
    "Oh."
 
-
    "OH!"
 
    "Oh god she’s still on about that?!"
@@ -27451,7 +27465,7 @@ elif anonscore <= 2 and fangscore <= 2:
 
  "Bulk buying seemed like a good idea at the time."
 
- "I take an older black hoodie I have. It’s super baggy even on me."
+ "I take the spare dress shirt dad sent me. It’s super baggy even on me."
 
  "I think this was from that time I tried to cosplay."