Merge branch 'updates' into Patchy-Patch5

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

GPL-Exception

@@ -1,3 +0,0 @@
-Cavemanon and its contributors to Snoot Game agree to give Cavemanon initated and approved digital store fronts an exclusive, non-transferable right to host Snoot Game and its assets without triggering any of the copyleft or sharealike parts of the GNU Affero GPL v3.0 or the CC-BY-SA 4.0. This practically means that, so long as Cavemanon is the one listing the game on a storefront that would in some way violate the GNU Affero GPL or CC-BY-SA 4.0, the parts of the GNU Affero GPL and CC-BY-SA 4.0 that would qualify the violation would not actually be violations. Thus, these licesnes become non-transferable, permissive licenses for storefronts that can be revoked at any time. 
-
-This agreement is true so long as Cavemanon offers feature parity to the best of its ability to these permissively licensed versions of the game. I.e The alternatively licensed digital store-front version cannot have any more features than the usual GNU Affero GPL + CC-BY-SA 4.0 version except in cases where being on said digital storefront gives extras features (such as integration into the digital store front's services). 

README.md

@@ -1,5 +1,9 @@
 # Snoot Game
 
+<h1>Contributing</h1>
+<p>Find an issue and start working. Creating issues is very helpful. Simply emailing patches/updated versions of the script works too. <b>All PRs/Contributions to the main code should go to the patch branch and NOT master as to leave master a stable branch</b>. All contributions belong to you, but are licensed under the GNU AGPL v3.</p>
+
+
 <h1>Supported OSes</h1>
 <ol>
 <li>Gahnoo/Loonux</li>

game/options.rpy

@@ -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")