Merge remote-tracking branch 'origin/issue2-linting' into issue2-linting

This commit is contained in:
tick bumley 2021-06-16 11:54:22 -05:00
commit b6b7f73cfb
6 changed files with 207 additions and 94 deletions

View File

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

BIN
game/gui/icon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

View File

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

View File

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

View File

@ -3,7 +3,9 @@ label chapter_7:
#Concert Day
"-One Week Later-"
scene moes pizza with fade
scene moes pizza
show anon neutral at aright
with fade
play music 'audio/OST/Fuck You I Like To Shitpost.ogg' fadein 1.0
@ -38,9 +40,8 @@ unknown "AHEM"
unknown "AH-HEM!"
A "Hm?"
show trish neutral at sleft
show anon neutral at aright
show anon neutral flip with dissolve
show trish unimpressed at sleft with dissolve
T "Arent you supposed to be helping?"
@ -48,8 +49,7 @@ T "Arent you supposed to be helping?"
A "Y-yeah, right! Just moving this table ahahaha."
show trish:
linear .5 xzoom -1.0
show trish unimpressed flip with dissolve
hide trish with moveoutleft
scene moebackrooms with fade
@ -62,7 +62,7 @@ scene moebackrooms with fade
"The area is a good one-hundred and fifty by two-hundred feet, so without the tables theres enough space for at least a few hundred people."
show anon neutral flip at sleft with moveinleft
show anon neutral at aleft with moveinleft
"Impressed, I let out a low whistle."
play music 'audio/OST/Dino Destiny Reader.ogg' fadein 1.0
@ -101,7 +101,8 @@ A "Uh.."
A "Y-you {i}do{/i} know what your shirt says, right?"
show stella shock alt flip with dissolve
show stella shock alt flip with dissolve:
yalign 0.5
"Stella gives me a quizzical look and glances down at her shirt, her face turning bright red."
@ -111,7 +112,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 with dissolve
show stella happy alt flip at sright with dissolve
St "Wait… You like anime too, dont you?"
@ -290,7 +291,7 @@ T "..."
A "And you trust his word on something like this?"
show trish neutral with dissolve
show trish neutral flip with dissolve
T "Sure."
@ -406,7 +407,7 @@ show trish fury flip with dissolve:
T "YOU CANT USE THAT WORD, THATS OUR WORD!"
show trish angry flip with dissolve
show trish angry flip at tcenter with dissolve
A "Just did, wanna see me do it again?"
@ -641,144 +642,169 @@ else:
F "T-tuesday?"
"Fang fell out of tempo with Reeds drums, stumbling over the end of the song."
scene dimstage with fade
show anon neutral at aright with dissolve
"Its silent."
"Its silent."
"I began to clap, followed by several other patrons."
"I began to clap, followed by several other patrons."
"Including Stella who looked seconds away from being curb-stomped."
"Including Stella who looked seconds away from being curb-stomped."
"Rosa is on the other side of the room, too entranced by the music to care."
"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."
play music 'audio/OST/Summertime Synth.ogg' fadein 1.0
"My eyes scan the room before noticing Trish, the sheer vehement rage radiating from her visibly distorting the air around her."
"Fuck."
stop music fadeout 1.0
"Fuck."
stop music fadeout 1.0
"My jaw aches as I picture myself in Stellas place, courtesy of one pissed of womanlet."
"My jaw aches as I picture myself in Stellas place, courtesy of one pissed of womanlet."
"Before I have the chance to escape I hear my one saving grace."
"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!"
F "ANON!"
"Fang reaches me before Trish leaves the stage, extending her hand for a high-five."
show fang happy with dissolve
"Fang reaches me before Trish leaves the stage, extending her hand for a high-five."
F "We did it!"
show trish unimpressed at tleft with moveinleft
T "No thanks to that asshole!"
F "We did it!"
show trish unimpressed at tcenter with moveinleft
T "No thanks to that asshole!"
"Oh no."
"Oh no."
show fang neutral flip behind anon with dissolve
F "Whats wrong?"
F "Whats wrong?"
show trish indignant with dissolve
show trish angry with dissolve
T "Skinnie sabotaged the show!"
T "Skinnie sabotaged the show!"
T "I told him not to touch the wires and look what happened!"
T "I told him not to touch the wires and look what happened!"
A "I was only trying to help."
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."
"Trish holds up her hand to my face, waving the other around in grand gestures."
show trish indignant with dissolve
show trish indignant with dissolve
T "You ruined the big finale! We missed our chance to make it big!"
T "You ruined the big finale! We missed our chance to make it big!"
T "Why is it that only my bass cut out anyways?!"
T "Why is it that only my bass cut out anyways?!"
T "Are you actively trying to ruin us?!"
T "Are you actively trying to ruin us?!"
T "I told you Reed knew what he was doing!"
T "I told you Reed knew what he was doing!"
T "Do you not trust him and I?"
T "Do you not trust him and I?"
show trish sad with dissolve
show fang sad flip
show trish fury point:
yalign 10.0
with dissolve
"Tears trickle down her sweat-glazed face."
"Tears trickle down her sweat-glazed face."
T "Is Fang really the only one here you care about?!"
T "Is Fang really the only one here you care about?!"
T "You are not the only person in the world!"
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!"
"This hypocritical bitch!"
"The sharp words cut right through me."
"The sharp words cut right through me."
show fang sad with dissolve
F "Jeez, Trish. The show went great! Our first good concert!"
F "Jeez, Trish. The show went great! Our first good concert!"
show fang neutral flip
with dissolve
F "The crowd actually clapped this time!"
F "The crowd actually clapped this time!"
T "No thanks to him."
T "No thanks to him."
A "I didnt do it on purpose."
A "I didnt do it on purpose."
"Even though you deserved it."
"Even though you deserved it."
"Before she could interrogate me further, Fang grabbed Trish on the arm."
"Before she could interrogate me further, Fang grabbed Trish on the arm."
show fang happy flip with dissolve
F "Trish! Didnt you say you wanted to set up our merch!"
show trish unimpressed with dissolve
show anon neutral flip with dissolve
show fang happy with dissolve
"Trish winces, then gives a begrudging sigh, lowering her accusatory finger."
F "Trish! Didnt you say you wanted to set up our merch!"
show trish unimpressed with dissolve
"Trish winces, then gives a begrudging sigh, lowering her accusatory finger."
T "Ugh, you arent worth it."
show trish unimpressed with dissolve
hide trish with dissolve
show fang neutral flip with dissolve
"Trish storms off leaving Fang and I alone."
T "Ugh, you arent worth it."
"And Reed who was listening the entire time."
hide trish with dissolve
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, yknow?"
"Trish storms off leaving Fang and I alone."
Re "Its like they say… trust is the building block of our economy, or something."
"And Reed who was listening the entire time."
"What."
Re "Anon, dude… you really should trust others, yknow?"
Re "There are two kinds of people in this world, bro... people who believe and people who trust."
Re "Its like they say… trust is the building block of our economy, or something."
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 Reeds capitalist sermon, my ears are assaulted by very Italian yelling."
"What."
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."
"Before I can begin to comprehend Reeds capitalist sermon, my ears are assaulted by very Italian yelling."
Moe "AY, KIDS!"
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!"
Moe "LOOKIT DIS ERE AH-PRON YA LIL TRIGGA FRIEN SOL ME!"
"Reed looks almost jealous of Moes new garb."
"Reed looks almost jealous of Moes new garb."
Re "Nice threads, compadre."
show reed neutral
unknown "Hey! Someone took ma apron!"
Re "Nice threads, compadre."
Moe "GIT BACK TA WORK JERRY YER ON DA CLOCK!"
show fang happy with dissolve
F "It uh… looks nice, Uncle Moe."
unknown "Hey! Someone took ma apron!"
Moe "Anyways, youse all gonna be helpin wit da clean up, right?"
Moe "GIT BACK TA WORK JERRY YER ON DA CLOCK!"
"I look at the absolute mess around us."
F "It uh… looks nice, Uncle Moe."
"Fuck."
Moe "Anyways, youse all gonna be helpin wit da clean up, right?"
"I look at the absolute mess around us."
scene moebackrooms
"Fuck."
scene black with fade
scene moebackrooms with fade
show anon neutral at acenter
play music 'audio/OST/west_coast_kicking.ogg' fadein 1.0
"An hour later and Im stuck mopping up where the mosh pit once stood."
@ -1042,4 +1068,4 @@ scene black with fade
"..."
jump chapter_8
jump chapter_8

BIN
icon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB