Merge remote-tracking branch 'staging/master' into feature/ISSUE-3_CG_Gallery

.gitignore

@@ -1,112 +1,33 @@
-# macOS-related files
+# IToddler files
 .DS_Store
 .AppleDouble
 .LSOverride
 
-# Windows-related files
+# Windows cancer
 Thumbs.db
 Thumbs.db:encryptable
 ehthumbs.db
 ehthumbs_vista.db
 [Dd]esktop.ini
 
+#Textfile cruft
+/project.json
+/traceback.txt
+/errors.txt
+/log.txt
+
+#Vim (best text editor) swap files
+.sw?
+
+#cache files
+/game/cache/*
+
+#save files
+/game/saves/*
+
+#binary files
 *.rpyc
-*.rpyb
 *.rpymc
-*.pyc
-*.pyo
 
-*~
+#backups
 *.bak
-
-saves
-tmp
-cache
-env
-
-log.txt
-errors.txt
-traceback.txt
-
-styles.txt
-
-/gui/game/gui
-/game/saves
-
-/android
-/build
-/dist
-/dists
-/renpy.app
-/jedit
-/lint.txt
-/renpy.code
-/*testing*
-/screenshot*
-/renpy.exe
-/renpy-32.exe
-/renpy.sh
-/lib
-/lib.old
-/lib2
-/lib3
-/doc
-/.pydevproject
-/.pydevproject.bak
-/.project
-/.cproject
-/.settings
-/LICENSE.txt
-/templates/english/README.html
-/the_question/README.html
-/tutorial/README.html
-/renpy/angle/*.pyx
-/renpy/angle/*.pxd
-/renpy-ppc.zip
-/module/build
-/module/gen*
-/editra
-/atom
-/launcher/game/theme
-/launcher/game/script_version.rpy
-
-/dl
-renpy/vc_version.py
-.externalToolBuilders
-/rapt
-/evil
-/iaptest
-/pygame_sdl2
-/renios
-/steam_appid.txt
-/.coverage
-/id
-/ai
-/interface_7
-/htmlcov
-/the_question*/.android.json
-/WINDOWS.rst
-/old
-
-/*-all/
-/*-win/
-/*-mac/
-/*-linux*/
-/*-dists/
-doc-web
-
-sphinx/source/inc
-sphinx/source/thequestion.rst
-tutorial/game/tutorial_director.rpy
-launcher/theme
-module/emscripten-static/
-web/
-
-cubism
-glexperiment
-live2d
-rapt2
-rapt3
-renios2
-renios3
-notarized

GPL-Exception

@@ -0,0 +1,39 @@
+Cavemanon Affero GPL v3.0 Video Game Store Front Exception v1.0 - CAGPL-/VG/SFE v1.0
+Copyright (C) 2021 Cavemanon
+Everyone is permitted to copy and distribute verbatim copies of this license exception document. Remixing is allowed so long as the name and copyright information has been changed.
+
+
+The purpose of this exception is to offer a nullification of some parts of the GNU Affero GPL and CC-BY-SA 4.0 as to allow our software to be distributable by common digital store fronts that users may use. The point of this is to allow users of these digital store fronts to gain access to our software and for us to profit off the software. No terms in this agreement should violate the end user's freedom to share, distribute, use, etc. any part of the Cavemanon sourced parts of the software. We are also commited to not pushing users towards using these platforms by feature hogging, thus clauses on disallowing Cavemanon from adding additional content to digital storefronts as to incentivise these platform's use has been added. Independently sourced versions of software will not have these requirement though as end users can easily set up repositories of their own to host the software in a freedom respecting way. 
+
+
+===BEGIN TERMS OF EXCEPTION===
+Feature Parity - is defined as equivalence in features in purpose, but not necessarily code or function. I.e If the independent version of the software has an updater built into it and the digital store front version of the software uses the digital store front's software for updates, then both are in feature parity due to both having an updater.
+
+contributors - Those who have, with Cavemanon's approval, added content (rather it be assets, writing, code, etc.) to the game.
+
+digital store fronts - Those stores that distribute software to consumers by any methodology.
+
+independently sourced versions - Versions of the software that have been sourced in such a way that the exception for digital store fronts does not apply. 
+
+This exemption only tackles licensing exemptions. Non-Cavemanon approved digital store fronts may, so long as they do not violate the GNU Affero GPL v3.0 or CC-BY-SA 4.0, distribute our software as those licenses dictate without any hinderance.
+These terms only apply to software Cavemanon has copyrights over. Any remixes or additions to our software need not follow this exemption policy.
+
+Cavemanon and its contributors to Snoot Game agree to give Cavemanon exclusive choice over what digital store fronts get an exclusive, non-transferable right to host Snoot Game and its assets without triggering any of the copyleft or sharealike properties of the GNU Affero GPL v3.0 or the CC-BY-SA 4.0 in their distribution. Any distribution of Cavemanon intellectual properties by these digital store fronts will retain the GNU Affero GPL v3.0 and CC-BY-SA 4.0 licensing scheme but with an exception to any storefront added software. This practically means that, so long as Cavemanon is the one listing the software on a digital store front that would in some way violate the GNU Affero GPL or CC-BY-SA 4.0, that violation would be made null and void. However, the GNU Affero GPL v3.0 and CC-BY-SA 4.0 would still apply to any downstream users who obtained the intellectual properties from said digital store front. Users who receive the product must be able to distribute all source code, assets, and object code of the software in accordance with the GNU Affero GPL v3.0 and CC-BY-SA 4.0 regardless of how they obtain it. However, there is an exception for digital storefront added software. These intellectual properties will be exempt from the source code, object code, and asset distribution clauses in the GNU Affero GPL v3.0 and CC-BY-SA 4.0 and thus should not be distributed with the software if one wishes to share. This right given to digital storefronts can be revoked at any time by Cavemanon.
+
+This agreement is true so long as Cavemanon and its contributors offers one-way feature parity to the best of their ability between digital storefront sourced software and independently sourced versions of the software. 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) or in scenarios where an infringement of a patent, copyright, or trademark would occur. However, the independently sourced versions of the software does not need to follow this rule and can have any amount of exclusive features or content.
+
+This clause also does not apply if Cavemanon has not been given significant time to implement the features to offer feature parity. This time period must be reasonable to the amount of work that would be required to offer feature parity plus one month. 
+
+Any oversight by Cavemanon in where issues with the software, accidental forgotten features, or other mishaps with the software would not constitute a violation so long as the reasonable amount of time clause is being followed.
+
+For a violation of this principal to be valid, said violation must have the intent to violate behind it with provable conspiracy to violate. Any mistake that is purposefully not corrected in a reasonable amount of time would constitute a violation of this agreement.
+
+Cavemanon may change the terms of this agreement at any time, for any reason, and without the consent of those contributing so long as said changes stay in line with the intent of allowing distribution of Cavemanon sourced software on digital store fronts without creating a situation in where usage of the digital store front is at a feature advantage to the independently sourced software besides in scenarios in where the digital store front offers features or interactions that are integrated with use of said digital store front.
+
+Cavemanon may change the terms of this agreement in ways that don't fit into the original intent of this exception so long as contributor approval is given.
+
+In such a case where Cavemanon has overtly violated this principle, contributors can revoke Cavemanon's right to use the code in future iterations of the software until the problem has been remedied. In such cases, Cavemanon cannot distribute any versions of the software with said code after the violation has been stated until the problem has been sufficiently remedied.
+
+However, if there was a transfer of copyright to Cavemanon, this revoking of right to use code is now in Cavemanon's hands and thus the contributor loses all privilege to enforce this.
+
+===END TERMS OF EXCEPTION===

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>

errors.txt

@@ -1,26 +0,0 @@
-I'm sorry, but errors were detected in your script. Please correct the
-errors listed below, and try again.
-
-
-File "game/script.rpy", line 17746: if statement expects a non-empty block.
-    if anonscore >= 4 and fangscore >= 4:
-                                         ^
-
-File "game/script.rpy", line 21504: expected statement.
-    elif anonscore >= 3 and fangscore <=4:
-                   ^
-
-File "game/script.rpy", line 24439: expected statement.
-    elif anonscore <= 3 and fangscore >=3:
-                   ^
-
-File "game/script.rpy", line 25850: expected statement.
-    elif anonscore <= 2 and fangscore <= 2:
-                   ^
-
-File "game/script.rpy", line 28678: expected statement.
-    else:
-        ^
-
-Ren'Py Version: Ren'Py 7.4.4.1439
-Sat Jun  5 11:37:48 2021

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

log.txt

@@ -1,32 +0,0 @@
-Mon Jun  7 21:08:17 2021
-Linux-5.10.0-7-amd64-x86_64-with-debian-11.0
-Ren'Py 7.4.4.1439
- 
-
-Bootstrap to the start of init.init took 0.10s
-Early init took 0.00s
-Loader init took 0.01s
-Loading error handling took 0.04s
-Loading script took 0.56s
-Loading save slot metadata. took 0.42s
-Loading persistent took 0.02s
-Importing _renpysteam: ImportError('No module named _renpysteam',)
-Running init code took 0.05s
-Loading analysis data took 0.06s
-Analyze and compile ATL took 0.02s
-Index archives took 0.00s
-Dump and make backups. took 0.10s
-Cleaning cache took 0.00s
-Making clean stores took 0.00s
-Initial gc. took 0.07s
-DPI scale factor: 1.000000
-Creating interface object took 0.00s
-Cleaning stores took 0.00s
-Init translation took 0.08s
-Build styles took 0.00s
-Load screen analysis took 0.02s
-Analyze screens took 0.00s
-Save screen analysis took 0.00s
-Prepare screens took 0.07s
-Save pyanalysis. took 0.00s
-Save bytecode. took 0.00s

project.json

@@ -1 +0,0 @@
-{"android_build": "Release", "renamed_all": true, "renamed_steam": true, "force_recompile": false, "build_update": false, "packages": ["mac", "linux", "win"], "add_from": true}

traceback.txt

@@ -1,26 +0,0 @@
-I'm sorry, but an uncaught exception occurred.
-
-While running game code:
-  File "game/script.rpy", line 347, in script
-    $ tradwife = false
-  File "game/script.rpy", line 347, in <module>
-    $ tradwife = false
-NameError: name 'false' is not defined
-
--- Full Traceback ------------------------------------------------------------
-
-Full traceback:
-  File "game/script.rpy", line 347, in script
-    $ tradwife = false
-  File "/home/joybuke/Documents/ComputerScience/Projects/Snoot/renpy-7.4.2-sdk/renpy/ast.py", line 922, in execute
-    renpy.python.py_exec_bytecode(self.code.bytecode, self.hide, store=self.store)
-  File "/home/joybuke/Documents/ComputerScience/Projects/Snoot/renpy-7.4.2-sdk/renpy/python.py", line 2218, in py_exec_bytecode
-    exec(bytecode, globals, locals)
-  File "game/script.rpy", line 347, in <module>
-    $ tradwife = false
-NameError: name 'false' is not defined
-
-Linux-5.10.0-7-amd64-x86_64-with-debian-11.0
-Ren'Py 7.4.4.1439
-SnootGame vee3-Valiant-Velociraptor-Victory-patch1
-Sat Jun  5 11:40:57 2021