Merge pull request 'New Russian Email Patch' (#236 ) from russianpatch into master

Reviewed-on: #236
New Russian Email Patch
2024-05-23 01:40:48 +00:00 · 2024-05-20 16:19:38 -05:00 · 2024-05-04 11:35:46 +00:00 · 2024-04-14 09:39:15 +00:00 · 2024-04-13 08:13:44 -03:00 · 2024-04-10 04:30:01 +00:00
1594 changed files with 288069 additions and 5630 deletions
@@ -0,0 +1 @@
+{"expansion": false, "heap_size": "3", "icon_name": "Snoot Game", "include_pil": false, "include_sqlite": false, "layout": null, "name": "Snoot Game", "numeric_version": 1, "orientation": "sensorLandscape", "package": "cavemanon.snootgame", "permissions": ["VIBRATE", "INTERNET"], "source": false, "store": "none", "update_always": true, "update_icons": true, "update_keystores": true, "version": "INTERNAL-BUILD"}
@@ -20,11 +20,15 @@ errors.txt
 traceback.txt


-#Vim swap files
+#Vim (best text editor) swap files
 .sw?
 *~
 *.bak

+#For vscode niggas since gitignore does this for us
+/.vscode/*
+/.vscode/
+
 #save files & cache files
 /game/saves/
 /game/saves/*
@@ -42,15 +46,9 @@ env
 *.pyc
 *.pyo

-#Vim (best text editor) swap files
-.sw?
-
 #binary files
 *.rpyc
 *.rpymc

 #backups
-*.bak
-
-#android
-.android.json
+*.bak
@@ -0,0 +1,81 @@
+steps:
+  changelog:
+      image: debian
+      commands:
+        - apt update
+        - apt install git -y
+        - mkdir dist
+        - git log --oneline --decorate --since="7.days" --pretty="## %s%n%an%n%aD%n%b" > dist/README.md || echo "Could not write changelog!" >> dist/README.md #Get that changelog
+
+  version-tag:
+    image: debian
+    commands:
+      - sed -i -e "s/INTERNAL-BUILD/${CI_COMMIT_TAG}/g" game/options.rpy #Change the internal build name to the tagged version
+      - sed -i -e "s/INTERNAL-BUILD/${CI_COMMIT_TAG}/g" .android.json         
+    when:
+      - event: tag
+  
+  version-cron:
+    image: debian
+    commands:
+      - sed -i -e "s/INTERNAL-BUILD/${CI_COMMIT_SHA}/g" game/options.rpy #if no tag, make it the commit num
+      - sed -i -e "s/INTERNAL-BUILD/${CI_COMMIT_TAG}/g" .android.json 
+
+    when:
+      - event: cron
+
+  build:
+    image: openjdk:8
+    commands:
+      - apt update
+      - apt install libgl1 -y
+      - sed -i -e "s/VERSION/${RenpyVersion}/g" game/options.rpy #Change the renpy version to the woodpecker reuqested one.
+        #Get Renkit
+      - wget -qO- "https://github.com/kobaltcore/renkit/releases/download/v${RenkitVersion}/renkit-linux-amd64.tar.gz" | tar xz --directory=/tmp/
+      - /tmp/renconstruct build -i "." -c "renconstruct.toml" -o dist/
+      - cd /tmp/
+
+  archival-sha:
+    image: debian
+    commands:
+      - apt update
+      - apt install curl bash -y
+      - curl https://git.cavemanon.xyz/Cavemanon/Woodpecker-Webdav/raw/branch/master/push.sh > /tmp/push.sh ## I'd use a proper docker container, but dockerhub is owned by the CIA and I refuse to deal with that (also I don't care to maintain it or set it up). #TODO: merge this script as apart of the file so we don't make unnecessary network requests every time we build.
+      - chmod +x /tmp/push.sh
+      - PLUGIN_USERNAME=$RELEASESMITHNEXTCLOUDUSERNAME PLUGIN_PASSWORD=$RELEASESMITHNEXTCLOUDPASSWORD PLUGIN_DESTINATION=https://cloud.dev.cavemanon.xyz/remote.php/dav/files/ReleaseSmith/Snoot%20Game/Internal%20Builds/nightly-${CI_COMMIT_SHA}/ PLUGIN_MAKE_FOLDER_AT=https://cloud.dev.cavemanon.xyz/remote.php/dav/files/ReleaseSmith/Snoot%20Game/Internal%20Builds/nightly-${CI_COMMIT_SHA}/ PLUGIN_FILE_GLOB=dist/* /tmp/push.sh #sovl
+      - rm -rf "dist"
+    secrets: [ releasesmithnextcloudusername, releasesmithnextcloudpassword ]
+    when:
+      - event: cron
+        cron: "nightly"
+  
+  archival-tag:
+    image: debian
+    commands:
+      - apt update
+      - apt install curl bash -y
+      - curl https://git.cavemanon.xyz/Cavemanon/Woodpecker-Webdav/raw/branch/master/push.sh > /tmp/push.sh ## I'd use a proper docker container, but dockerhub is owned by the CIA and I refuse to deal with that (also I don't care to maintain it or set it up). #TODO: merge this script as apart of the file so we don't make unnecessary network requests every time we build.
+      - chmod +x /tmp/push.sh
+      - PLUGIN_USERNAME=$RELEASESMITHNEXTCLOUDUSERNAME PLUGIN_PASSWORD=$RELEASESMITHNEXTCLOUDPASSWORD PLUGIN_DESTINATION=https://cloud.dev.cavemanon.xyz/remote.php/dav/files/ReleaseSmith/Snoot%20Game/Internal%20Builds/release-${CI_COMMIT_TAG}/ PLUGIN_MAKE_FOLDER_AT=https://cloud.dev.cavemanon.xyz/remote.php/dav/files/ReleaseSmith/Snoot%20Game/Internal%20Builds/release-${CI_COMMIT_TAG}/ PLUGIN_FILE_GLOB=dist/* /tmp/push.sh #sovl
+      - rm -rf "dist"
+    secrets: [ releasesmithnextcloudusername, releasesmithnextcloudpassword ]
+    when:
+      - event: tag
+
+  release:
+    image: woodpeckerci/plugin-gitea-release:latest
+    settings:
+      base_url: https://git.cavemanon.xyz
+      api_key:
+        from_secret: releasesmithapikey
+      files: "*-dists/*"
+      prerelease: true
+      title: "${CI_COMMIT_TAG}"
+    when:
+      - event: tag
+
+matrix:
+  RenpyVersion:
+    - "8.0.3"
+  RenkitVersion:
+    - "3.3.1"
@@ -1,15 +1,80 @@
-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
-====================================================
-WoodSnap.wav - "Snapping, Wooden Fence, N.wav" by InspectorJ (www.jshaw.co.uk) of Freesound.org
-firealarm.ogg - "School Fire Alarm" by Cullen Card
-shot.ogg - "38 Caliber Gun Shot 5x" by Mike Koenig
-wind.wav - "Wind" by Mark DiAngelo
-rumble.ogg - "CinematicBoomNorm" by Herbert Boland
-sizzle.ogg - "Hot Sizzling" by Mike Koenig
-drumroll.ogg, drumrollend.ogg - "Drum Roll with Cymbals Crash" by Iwan Gabovitch
-firework.ogg - "Fuse" by soundslikewillem of freesound.org, "fireworks 3burst sizzle" by atomwrath of freesound.org
-splash.ogg - "Splash, Jumping, D" by InspectorJ of freesound.org
-punch.ogg - "Strong Punch" by Mike Koenig
-menacing.ogg - "Scaryscape 01" by Suonho (soundcloud.com/suonho) of Freesound.org
+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.
+
+Non-Cavemanon sourced items with attribution clauses
+====================================================
+
+---Freesound.org---
+
+alarmAirraidSiren.ogg - "Alarm, Air Raid Siren, Test, Devonport, Sony PCM M-10" by audiojacked
+alarmClicheLoop.ogg - "Railroad Crossing with Bell and Train Passing" by soundslikewillem
+alarmClock.ogg - "Intermediate Sound SFX Library > Alarm Clock" by dcloh
+alarmKlaxonLoop.ogg - "Vintage Bells, Horns, Whistles (Red Lib) > R18-31-Old Car Ahooga Horn.wav" by craigsmith
+alarmPoliceSiren.ogg - "Siren" by doomyd
+alarmSirenLoop.ogg - "Kyoto > Sirens.wav" by Trinity101, "Siren" by doomyd
+anonDink.ogg - "hitting things with other things > plastic donk 1.wav" by Screamr, "Donk Metal & Glass" by EminYILDIRIM
+anonShooterFall.ogg - "Bone crush neck twist.wav" by carlito62
+anonTheaterFall.ogg - "granada > 20101024.door.slam.wav" by dobroide
+apartmentLoop.ogg - "Apartment, small quiet bathroom with fan.wav" by SpliceSound
+cameraMult.ogg - "DSLR Camera Click.ogg" by akonze
+camera.ogg - "DSLR Camera Click.ogg" by akonze
+cameraShutterClick - "Tech > Shutter" by Mafon2
+carAlarmLoop.ogg - "Car Alarm (RAW).wav" by hishiad
+carKick1.ogg - "Squeaky Car Door" by coltures
+carKick2.ogg - "Squeaky Car Door" by coltures
+carKick3.ogg - "Squeaky Car Door" by coltures
+carSuspension1.ogg - "Squeaky Car Door" by coltures
+cavemanMagic.ogg - "Waving Torch.wav" by spookymodem, "Lighter.mp3" by SomeoneCool15
+cellphone.ogg - "Ringtones- Classic phones > Ringtone: Startec flip-phone" by knufds
+concertFail.ogg - "Light - Heavy lights turned on" by PITCHEDsenses, "Speaker world > radio speaker noise 2.WAV" by martian
+classroomLoop.ogg "Strange/Love S2 E1 > FOLEY_Wooden chair adjustment_1.wav" by WilliamJMeyer, "Last Day of School > Low Room Tone.wav" by tvilgiat, "classroom ambience .wav" by MakedaMntuyedwa, "Paper_Shuffling_crinkling_Crisp.wav" by bewagne
+doorSlam.ogg - "Bexhill Recorded SFX > College door slam.wav" by Bexhillcollege, "Angry Door FS > Angry Door - Wooden Entrance Open Close Slam Hard A.wav" by hisoul
+crowdCheer.ogg - "Short Crowd Cheer.flac" by qubodup
+drizzleLoop.ogg - "Drizzle" by Soundatic
+drumroll.ogg - "Drum Roll with Cymbals Crash" by Iwan Gabovitch
+drumrollend.ogg - "Drum Roll with Cymbals Crash" by Iwan Gabovitch
+fireAlarmReverbLoop.ogg - "Car_Alarm_Sound01.aif" by kreactionz_100
+firework.ogg - "Fuse" by soundslikewillem, "fireworks > fireworks 3burst sizzle" by atomwrath, "Playing With Fire > Firework Single Rocket #1" by Kinoton
+hungryBeast - "Ambi - Stone valley quiet, bird, wind - near Sea - Sony pcm d50 stereo Recording - 2010 08 Exmoor Forrest England.wav" by jaap.sijben@gmail.com
+lockerSmash.ogg - "Disaster > Earthquake_Interior_MetalRattling_1.wav" by Cell31_Sound_Productions, "Metallic Door Shut" by NeoSpica, "metal shop > metal locker thuds rattle inside.flac" by kyles
+marketLoop.ogg - "public > terrace ambience 01.wav" by klankbeeld
+outdoorLoop.ogg - "City > danish surburb.wav" by inchadney
+outdoorNatureLoop.ogg - "Ambiences & Nature > Countryside Ambience Spring" by Kinoton
+policeSirenLoop.ogg - "AMB_SIiren_Police_Pass_002.wav" by conleec, "Chile, Valpariso > Fire truck siren passing by in Valparaiso (Chile)" by felix.blume, "Sirens, fire, police, close pass, distant, urban, CALGARY, 2011.wav" by TRP
+policeSirenReverbLoop.ogg - "AMB_SIiren_Police_Pass_002.wav" by conleec, "Chile, Valpariso > Fire truck siren passing by in Valparaiso (Chile)" by felix.blume, "Sirens, fire, police, close pass, distant, urban, CALGARY, 2011.wav" by TRP
+rooftopDoorSmash.ogg - "RBH_Chain Link Fence 01.wav" by RHumphries, "RBH_Chain Link Fence 03.wav" by RHumphries, "metal-pole-staircase" by newagesoup, "Machine and Percussive Noises > Hammer on Metal" by lonemonk
+schoolLoop.ogg - "random > crowd int small echo hallway like school echo1.flac" by kyles
+schoolSilentLoop.ogg - "2019 wind in- out-doors > Room-tone hallway apartment 191013_0076.wav" by klankbeeld
+shooterFangJumps - "Object Karma Sounds > Crowd Screaming" by DigestContent
+showerStart.ogg - "Bathroom > bathroom door.wav" by arnaump
+showerDoor.ogg - "Bathroom > bathroom door.wav" by arnaump
+sizzle.ogg - "Hot Sizzling" by Mike Koenig
+slapstickGlassBreak.ogg - "Glass > Glass Break - Medium Jar" by RoganMcDougald
+slapstickThunder.ogg - "Luonto Nature > Ukkonen, salama / Thunder, a few lightning strikes, rumble, boom, thunderstorm, edit" by YleArkisto, "Summer > Thunder (close up)" by Martineerok, "Thunderstorm July 19, 2012 > 20120719ThunderBig.wav" by daveincamas, "thunderstorm > very-close-impact-lightning.wav" by klankschap
+slapstickWipe.ogg - "Glass /window cleaning" by peqdavid5
+splash.ogg - "Jumping in a Pool > Splash, Jumping, D" by InspectorJ
+strike.ogg - "Bowditch Beats > B_2 Bowling ball striking pins.wav" by Yarmonics, "Bowling Strike" by SieuAmThanh
+stringSnap.ogg - "Guitar string snap or breaks - various sounds" by khenshom
+tableSlam.ogg - "Wood Table Hit - w and wo cup - BU on R.wav" by p1llowt4lk, "random > door wood hit +window rattle slam bang various.wav" by kyles, "bookcase rattling.wav" by kineticturtle
+tableSlamNoBox.ogg - "Wood Table Hit - w and wo cup - BU on R.wav" by p1llowt4lk, "random > door wood hit +window rattle slam bang various.wav" by kyles, "bookcase rattling.wav" by kineticturtle
+teenageCafeteriaLoop.ogg - "CafeteriaLight.wav" by ViaTorci
+teenageCrowdFarLoop.ogg - "Large_crowd_medium_distance_stereo.wav" by eguobyte
+teenageCrowdInteriorLoop.ogg - "House party, inside, voices, talking, 10.mp3" by TRP
+teenageCrowdJeerLoop.ogg - "Funny VOICES and LAUGHTERS by various people > 01095 massive laughter 10.wav" by Robinhood76, Audience/Crowd sounds in Quadraphonic > M Short Laughter - staggered.wav" by Processaurus, "Studio Audience - Small > Boo 6 Get Off the Stage.wav" by jayfrosting, "Crowd > Crowd Boo.wav" by deleted_user_2104797, "freesoundATcaixaforum > To_Be_Booed2_ses1.wav" by freesound
+teenageCrowdLoop.ogg - "Crowd > Crowd waiting to go in exterior 2" by deleted_user_2104797
+teenageCrowdMurmurLoop.ogg - "public > audience becomes still 01.wav" by klankbeeld
+teenageCrowdPanicLoop.ogg - "Crowd in panic" by IENBA
+radioChatterLoop.ogg - "Police scanner clips > do it now 2.wav" by ERH, "FX > Radio Garble" by Benboncan, "Analogue Radio Sounds > Full radio sweep.wav" by vedas, "FM POLICE RADIO > FM 006" by G_M_D_THREE
+rainStart.ogg - "Drizzle" by Soundatic, "Rain > storm_austin_11222014.flac" by wjoojoo, "random > water trickle drips drops small splash onto concrete floor low seiling unfinished basement.flac" by kyles
+rainLoop.ogg - "Rain > storm_austin_11222014.flac" by wjoojoo
+whoosh.ogg - "Whoosh" by qubodup
+windLightLoop - "windy city night ambience" by jgrzinich
+woodSnap.ogg - "Snapping, Wooden Fence, N.wav" by InspectorJ (www.jshaw.co.uk)
+
+
+---Miscellaneous Sources---
+
+Sonniss GDC Free Pack 2015 Version
+Sonniss GDC Free Pack 2016 Version
+Sonniss GDC Free Pack 2017 Version
+
+All stock images used from various stock image websites
@@ -3,54 +3,3 @@
 <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>
 <p>It should be noted that any non-contributor sourced assets for the game MUST be under some form of free licensing that is <a href=https://creativecommons.org/share-your-work/licensing-considerations/compatible-licenses/>compatable with the CC-BY-SA 4.0 (Listed in this link as BY-SA)</a> for it to be added to the game. This includes audio, images, other bits of code, and other copyrightable assets. Compatable licenses include, but aren't limited to, CC-BY, Public Domain, CC-BY-SA 4.0, CC-BY-SA 3.0, The Free Art license, or any other license that is permissive in how it is used.</p>
-
-<h1>Supported OSes</h1>
-<ol>
-<li>Gahnoo/Loonux</li>
-<li>Binbows</li>
-<li>(chad)mac</li>
-</ol>
-<small>The BSD family has yet to be tested, but likely works if py-game works</small>
-<br></br>
-<small>Commadore 64 port soon(tm)</small>
-
-<h1>System Requirements</h1>
-
-<h2>Minimum</h2>
-<li>Can it run python 2?</li>
-<li>Can it run OpenGL or equivalent (including WebGL)?</li>
-<li>Does your computer have a GUI of any kind?</li>
-<li>If yes to all three, you can play the game</li>
-
-<h2>Suggested</h2>
-<li>CPU: Wafer Scale Engine 2</li>
-<li>RAM: 32 Terrafarts of DDR 6 Ram</li>
-<li>GPU: 30 NVIDIA TITAN Vs (Studded with Diamonds)</li>
-<li>Additonal Note: This build is going to be outdated in like 3 months or something lol</li>
-
-<h1>Developers</h1>
-
-<h2>Writefags</h2>
-<li>Writefag 1</li>
-<li>Writefag A</li>
-<li>Writefag α</li>
-
-<h2>Artfags</h2>
-<li>Artfag 1</li>
-<li>Artfag A</li>
-<li>Artfag α</li>
-<li>Artfag I</li>
-
-<h2>Audiofags</h2>
-<li>Audiofag 1</li>
-<li>Audiofag A </li>
-
-<li><h2>Programfags</h2></li>
-<li>/dev/non</li>
-</ul>
-
-<h2>Special thanks to...</h2>
-<p>A random anon on /lit/ saved this project from poor writing after we submitted a beta version of our script. The post goes as follows <b>(minor spoilers ahead)</b>:</p>
-<p>"Aight you kind of get this is an attention seeking thing. But this is as much of a symptom as the gender thing, not the root cause. Bio says she's neglected by her parents because her brother is perfect and gets everything right. He's a goody two shoes with grades and parents, popular, I'm guessing that other girl is his gf too. Fang's response is to adopt an "I need nobody" attitude, and has basically bought an off the shelf personality and identity to compensate. People like this do not feel like they have agency. They lack self actualization. These "store-bought" identities from ideologies like the LGBTQIAAOMGWTFBBQ people and racebaiters offer only the feeling of validation without the essential step of self. This behavior you can find in (You) baiting on 4channel, which is an attempt to find some semblance of "I exist!" instead of realizing you can't get that affirmation from outside. Fang adopting Tradwife, sticking with high school attitudes, or shooting up the school isn't fixing the problem of her gaining agency. You can fix this by having Anon be there as an example of being a self-actualized person, he shouldn't be there to fuck her or save her. Every choice that's not purely cosmetic should be set up with the intent to help her gain agency. She feels like she's always compared to her brother, never judged on her own merits or personhood, so she substitutes this with an identity that comes with excess baggage. It shouldn't matter if she's goth or bisexual, as long as this comes from within, and not because this will make up for her lack of personhood. This is why tradwife is missing the point a bit, it's substituting colored hair and pronouns for Jesus and prayer. She still does it because its an identity without any real substance of the self behind it. Or maybe I am talking out my ass and all she really did need was a man to fuck the degeneracy out of her. You guys do you</p>
-<p>Whoever you are, you changed the writing direction from shitposty, pandering garbage to a genuine story that out preforms what our competators could do. Whoever you are, be proud of your critique and continue to critique. Story makers need vigilant anons like you.</p>
-<b>(Of note, we didn't take /lit/anon's word one-to-one about every detail we said. Nuance exists!)</b>
@@ -0,0 +1 @@
+If you want assets that aren't in a OGG format and are truly uncompressed, visit snootgame.xyz for a pack that contains all that stuff for you. 
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`{"expansion": false, "heap_size": "3", "icon_name": "Snoot Game", "include_pil": false, "include_sqlite": false, "layout": null, "name": "Snoot Game", "numeric_version": 1, "orientation": "sensorLandscape", "package": "cavemanon.snootgame", "permissions": ["VIBRATE", "INTERNET"], "source": false, "store": "none", "update_always": true, "update_icons": true, "update_keystores": true, "version": "INTERNAL-BUILD"}`
				`@@ -0,0 +1 @@`
				`If you want assets that aren't in a OGG format and are truly uncompressed, visit snootgame.xyz for a pack that contains all that stuff for you.`