GPL Exception added lol

GPL-Exception

@@ -0,0 +1,3 @@
+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). 

LICENSE

@@ -1,4 +1,4 @@
-This program's engine contains free software under a number of licenses, including the MIT License and GNU Lesser General Public License. A complete list of software, including links to full source code, can be found {a=https://www.renpy.org/l/license}here{/a}. The game itself is free software and it may be distributed in accordance with the {a=https://www.gnu.org/licenses/agpl-3.0.txt}GNU Affero General Public License Version Three{/a}. All on screen assets, such as writing, images, videos, and other Cavemanon sourced items that are not in the Public Domain or are held by another entity in copyright are subject to the {a=https://creativecommons.org/licenses/by-sa/4.0/}CC-BY-SA 4.0{/a}. Those copyrights we don't hold and have attribution clauses have been enumerated in the "LICENSE" file that came with this work. These licenses guarantee the freedom to share as much as one wishes so long as you allow others to share accordingly and pay respects to where you have obtained the work. We encourage, and expect, spin-offs, shitposts, memes, and edits to come from this work and cannot wait to see them.
+This program's engine contains free software under a number of licenses, including the MIT License and GNU Lesser General Public License. A complete list of software, including links to full source code, can be found {a=https://www.renpy.org/l/license}here{/a}. The game itself is free software and it may be distributed in accordance with the {a=https://www.gnu.org/licenses/agpl-3.0.txt}GNU Affero General Public License Version Three{/a}. All on screen assets, such as writing, images, videos, and other Cavemanon sourced items that are not in the Public Domain or are held by another entity in copyright are subject to the {a=https://creativecommons.org/licenses/by-sa/4.0/}CC-BY-SA 4.0{/a}. The Copyleft and Sharealike aspects of those licenses do not apply to those who's situation is enumurated in the GPL-Exception file. Those copyrights we don't hold and have attribution clauses have been enumerated in the "LICENSE" file that came with this work. These licenses guarantee the freedom to share as much as one wishes so long as you allow others to share accordingly and pay respects to where you have obtained the work. We encourage, and expect, spin-offs, shitposts, memes, and edits to come from this work and cannot wait to see them.
 
 Non-Cavemanon sourced items with attribution clauses
 ====================================================

README.md

@@ -1,8 +1,7 @@
 # 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>
-
+<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 and are adherent to the GPL-Exception in the root of the project file.</p>
 
 <h1>Supported OSes</h1>
 <ol>

game/options.rpy

@@ -23,7 +23,7 @@ define gui.show_name = True
 
 ## The version of the game.
 
-define config.version = "Patchy-patch5"
+define config.version = "vee3-Valiant-Velociraptor-Victory-patch3"
 
 ## 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,6 +208,3 @@ 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

@@ -1,16 +1,4 @@
-#extra phython stuff for updating
-init python:
- def Update():
-  pendingVersion = updater.UpdateVersion("snootgame.xyz")
-  if pendingVersion == None:
-    status = "No New Version is Available"
-    renpy.notify(status)
-  else:
-    status = pendingVersion + "can be downloaded"
-    renpy.notify(status)
-    #TODO add code that shows an option that allows a user to download the new version if it is available
-
-################################################################################
+################################################################################
 ## Initialization
 ################################################################################
 
@@ -328,7 +316,7 @@ screen navigation():
         textbutton _("Save") action ShowMenu("save")
         textbutton _("Load") action ShowMenu("load")
         textbutton _("Options") action ShowMenu("preferences")
-        textbutton _("Extras") action ShowMenu("extras")
+        textbutton _("Help And About") action ShowMenu("helpandabout")
 
 
         if _in_replay:
@@ -394,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("extras")
+     imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("helpandabout")
      imagebutton auto "gui/button/menubuttons/quitbutton_%s.png" action Quit(confirm=not main_menu)
 
     
@@ -590,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 = ""
@@ -603,84 +591,6 @@ 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:
-            $ status = "tmp"
-            label "[config.name!t]"
-            text _("Your Version is [config.version!t]\n")
-            textbutton "Check For Update" action Update
-            textbutton "Back to Extras" action ShowMenu("extras")
-            text "Update Status : [status]"
-            #TODO
-            #add something where it will, after the button is pressed, show text with the result of the update. 
-        
-## 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 #######################################################
 ##
@@ -1075,16 +985,13 @@ style history_label:
 style history_label_text:
     xalign 0.5
 
-## Extras screen########################################################
-## A screen that combines help, about, updates, gallery,
-screen extras():
+## Help and About screen########################################################
+## A screen that combines help and about
+screen helpandabout():
     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")
 
 
 
@@ -1111,7 +1018,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,14 +19394,10 @@ 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?"
@@ -19411,7 +19407,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
@@ -19420,13 +19416,6 @@ 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?"
@@ -19438,10 +19427,6 @@ 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
@@ -24053,7 +24038,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 just deployed and coming home soon…"
+  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…"
 
   "She begins stroking my hand on the table."
 
@@ -24383,9 +24368,9 @@ elif anonscore <= 3 and fangscore >=3:
 
    A "Hm?"
 
-   "Fang's eyebrow rise and fall faster and faster."
+   "Fang’s wrist hovers before my face."
 
-   "as if she's trying to send a message in morse code."
+   "With the weird non-binary bracelet."
 
    "Wait wha-"
 
@@ -24393,6 +24378,7 @@ elif anonscore <= 3 and fangscore >=3:
 
    "Oh."
 
+
    "OH!"
 
    "Oh god she’s still on about that?!"
@@ -27465,7 +27451,7 @@ elif anonscore <= 2 and fangscore <= 2:
 
  "Bulk buying seemed like a good idea at the time."
 
- "I take the spare dress shirt dad sent me. It’s super baggy even on me."
+ "I take an older black hoodie I have. It’s super baggy even on me."
 
  "I think this was from that time I tried to cosplay."
 

game/tl/None/common.rpym

@@ -467,7 +467,7 @@ translate None strings:
 
     # renpy/common/00library.rpy:281
     old "This program contains free software under a number of licenses, including the MIT License and GNU Lesser General Public License. A complete list of software, including links to full source code, can be found {a=https://www.renpy.org/l/license}here{/a}."
-    new "This program's engine contains free software under a number of licenses, including the MIT License and GNU Lesser General Public License. A complete list of software, including links to full source code, can be found {a=https://www.renpy.org/l/license}here{/a}. The game itself is free software and it may be distributed in accordance with the {a=https://www.gnu.org/licenses/agpl-3.0.txt}GNU Affero General Public License{/a}. All on screen assets, such as writing, images, videos, and other Cavemanon sourced items that are not in the Public Domain or are held by another entity in copyright are subject to the {a=https://creativecommons.org/licenses/by-sa/4.0/}CC-BY-SA 4.0{/a}. Those copyrights we don't hold and have attribution clauses have been enumerated in the 'LICENSE' file that came with this work. These licenses guarantee the freedom to share as much as one wishes so long as you allow others to share accordingly and pay respects to where you have obtained the work. We encourage, and expect, spin-offs, shitposts, memes, and edits to come from this work and cannot wait to see them."
+    new "This program's engine contains free software under a number of licenses, including the MIT License and GNU Lesser General Public License. A complete list of software, including links to full source code, can be found {a=https://www.renpy.org/l/license}here{/a}. The game itself is free software and it may be distributed in accordance with the {a=https://www.gnu.org/licenses/agpl-3.0.txt}GNU Affero General Public License{/a}. All on screen assets, such as writing, images, videos, and other Cavemanon sourced items that are not in the Public Domain or are held by another entity in copyright are subject to the {a=https://creativecommons.org/licenses/by-sa/4.0/}CC-BY-SA 4.0{/a}. The Copyleft and Sharealike aspects of those licenses do not apply to those who's situation is enumurated in the GPL-Exception file. Those copyrights we don't hold and have attribution clauses have been enumerated in the 'LICENSE' file that came with this work. These licenses guarantee the freedom to share as much as one wishes so long as you allow others to share accordingly and pay respects to where you have obtained the work. We encourage, and expect, spin-offs, shitposts, memes, and edits to come from this work and cannot wait to see them."
 
 
     # renpy/common/00preferences.rpy:233