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

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.

game/script.rpy

@@ -1,4 +1,5 @@
 #TODO
+#add chadshark
 #The game needs something like a CG gallery, if only to track your progress.
 #remove sex
 #troll /adgd/
@@ -160,7 +161,6 @@ image naser angry flip = im.Flip("naser/naser angry.png", horizontal=True)
 image trish angry flip = im.Flip("trish/trish angry.png", horizontal=True)
 image trish prom angry flip = im.Flip("trish/trish prom angry.png", horizontal=True)
 image trish fury flip = im.Flip("trish/trish fury.png", horizontal=True)
-image trish fury point flip = im.Flip("trish/trish fury point.png", horizontal=True)
 image reed angry flip = im.Flip("reed/reed angry.png", horizontal=True)
 
 #very angry flips
@@ -192,7 +192,7 @@ image fang c shocked flip = im.Flip("fang/future sets/fang c shocked.png", horiz
 image reed shocked flip = im.Flip("reed/reed shocked.png", horizontal=True)
 image naser shocked flip = im.Flip("naser/naser shocked.png", horizontal=True)
 image naomi shocked flip = im.Flip("naomi/naomi shocked.png", horizontal=True)
-image stella shocked alt flip = im.Flip("stella/stella shocked alt.png", horizontal=True)
+image stella shock alt flip = im.Flip("stella/stella shocked alt.png", horizontal=True)
 
 #considering flips
 image fang considering flip = im.Flip("fang/basic set/fang considering.png", horizontal=True)
@@ -10467,7 +10467,6 @@ scene moebackrooms with fade
 
 show anon neutral flip  at sleft with moveinleft
 
-label poopy:
 "Impressed, I let out a low whistle."
 play music 'audio/OST/Dino Destiny Reader.ogg' fadein 1.0
 show anon neutral at aleft
@@ -10505,8 +10504,7 @@ A "Uh.."
 
 A "Y-you {i}do{/i} know what your shirt says, right?"
 
-show stella shocked alt flip with dissolve:
-   yalign 0.5
+show stella shock alt flip with dissolve
 
 "Stella gives me a quizzical look and glances down at her shirt, her face turning bright red."
 
@@ -10516,7 +10514,7 @@ St "Oh my… th-this was the only clean shirt I had…"
 
 "Suddenly her face lights up and her eyes return to me."
 
-show stella happy alt flip at sright with dissolve
+show stella happy alt flip with dissolve
 
 St "Wait… You like anime too, don’t you?"
 
@@ -10695,7 +10693,7 @@ T "..."
 
 A "And you trust his word on something like this?"
 
-show trish neutral flip with dissolve
+show trish neutral with dissolve
 
 T "Sure."
 
@@ -10724,14 +10722,12 @@ $ anonscore += 1
 
 "Probably better to let sleeping fossils lie."
 
-$ LeftStage = 1
+define LeftStage = "1"
 
 jump PostCableConundrum
 
 label FixCables:
 
-$ LeftStage = 0
-
 "It could be a serious hazard if I leave them like this."
 
 "Like a fire hazard or something. I think."
@@ -10812,7 +10808,7 @@ show trish fury flip with dissolve:
 
 T "YOU CAN’T USE THAT WORD, THAT’S OUR WORD!"
 
-show trish angry flip at tcenter with dissolve
+show trish angry flip with dissolve
 
 A "Just did, wanna see me do it again?"
 
@@ -11047,6 +11043,9 @@ else:
   F "T-tuesday?"
 
   "Fang fell out of tempo with Reed’s drums, stumbling over the end of the song."
+  scene dimstage with fade
+  show anon neutral at aright with dissolve
+
   "It’s silent."
 
   "I began to clap, followed by several other patrons."
@@ -11056,9 +11055,6 @@ else:
   "Rosa is on the other side of the room, too entranced by the music to care."
 
   play music 'audio/OST/Summertime Synth.ogg' fadein 1.0
-  scene moebackrooms
-  show anon neutral flip at aright
-  with fade
   "My eyes scan the room before noticing Trish, the sheer vehement rage radiating from her visibly distorting the air around her."
 
   "Fuck."
@@ -11068,25 +11064,22 @@ else:
 
   "Before I have the chance to escape I hear my one saving grace."
 
-  show fang very happy with moveinleft:
-      xalign 0.6 yalign 0.1
+  show fang happy with moveinleft:
+      xalign 0.6 yalign 0.25
 
   F "ANON!"
 
   "Fang reaches me before Trish leaves the stage, extending her hand for a high-five."
-  show fang happy with dissolve
 
   F "We did it!"
-  show trish unimpressed at tleft with moveinleft
+  show trish unimpressed at tcenter with moveinleft
   T "No thanks to that asshole!"
 
   "Oh no."
 
-  show fang neutral flip behind anon with dissolve
-
   F "What’s wrong?"
 
-  show trish angry with dissolve
+  show trish indignant with dissolve
 
   T "Skinnie sabotaged the show!"
 
@@ -11094,7 +11087,7 @@ else:
 
   A "I was only trying to help."
 
-  show trish annoyed with dissolve
+  show trish annoyed  with dissolve
 
   "Trish holds up her hand to my face, waving the other around in grand gestures."
 
@@ -11110,27 +11103,22 @@ else:
 
   T "Do you not trust him and I?"
 
-  show fang sad flip
-  show trish fury point:
-    yalign 10.0
-  with dissolve
+  show trish sad with dissolve
 
   "Tears trickle down her sweat-glazed face."
 
   T "Is Fang really the only one here you care about?!"
 
   T "You are not the only person in the world!"
-  show trish sad at tleft with dissolve
-  show anon sad flip with dissolve
 
   "This hypocritical bitch!"
 
   "The sharp words cut right through me."
 
+  show fang sad with dissolve
+
   F "Jeez, Trish. The show went great! Our first good concert!"
-  
-  show fang neutral flip 
-  with dissolve
+
   F "The crowd actually clapped this time!"
 
   T "No thanks to him."
@@ -11141,10 +11129,9 @@ else:
 
   "Before she could interrogate me further, Fang grabbed Trish on the arm."
 
-  show fang happy flip with dissolve
+  show fang happy with dissolve
+
   F "Trish! Didn’t you say you wanted to set up our merch!"
-  show trish unimpressed with dissolve
-  show anon neutral flip with dissolve
 
   "Trish winces, then gives a begrudging sigh, lowering her accusatory finger."
 
@@ -11153,18 +11140,11 @@ else:
   T "Ugh, you aren’t worth it."
 
   hide trish with dissolve
-  show fang neutral flip with dissolve
+
   "Trish storms off leaving Fang and I alone."
 
   "And Reed who was listening the entire time."
 
-  show reed neutral at rleft with moveinleft
-  pause 1
-  show reed considering with dissolve
-  pause 1
-  show reed neutral with dissolve
-  pause 1
-  show reed explanatory with dissolve
   Re "Anon, dude… you really should trust others, y’know?"
 
   Re "It’s like they say… trust is the building block of our economy, or something."
@@ -11174,28 +11154,19 @@ else:
   Re "There are two kinds of people in this world, bro... people who believe and people who trust."
 
   Re "And you believed in something false, your impulsiveness."
-  show reed shocked 
-  show fang surprised
-  show anon neutral
-  with dissolve
+
   "Before I can begin to comprehend Reed’s capitalist sermon, my ears are assaulted by very Italian yelling."
 
   Moe "AY, KIDS!"
 
 #moe now has vvurm drama apron
-  show moealt with moveinright:
-     xalign 1.8 yalign 0.0
 
   Moe "LOOKIT DIS ‘ERE AH-PRON YA LIL TRIGGA FRIEN SOL’ ME!"
 
   "Reed looks almost jealous of Moe’s new garb."
-  
-  show reed neutral
 
   Re "Nice threads, compadre."
 
-  show fang happy with dissolve
-
   unknown "Hey! Someone took ma apron!"
 
   Moe "GIT BACK TA WORK JERRY YER ON DA CLOCK!"
@@ -11208,8 +11179,8 @@ else:
 
   "Fuck."
 
-scene black with fade
-scene moebackrooms with fade
+
+scene moebackrooms
 show anon neutral at acenter
 play music 'audio/OST/west_coast_kicking.ogg' fadein 1.0
 "An hour later and I’m stuck mopping up where the mosh pit once stood."
@@ -19423,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?"
@@ -19440,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
@@ -19449,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?"
@@ -19467,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
@@ -24082,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."
 
@@ -24412,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-"
 
@@ -24422,6 +24378,7 @@ elif anonscore <= 3 and fangscore >=3:
 
    "Oh."
 
+
    "OH!"
 
    "Oh god she’s still on about that?!"
@@ -27494,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