nutbuster/SnootGame
3
Fork 0
forked from Cavemanon/SnootGame
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'indentation-stuff' into indentation-continued

Browse Source 
This also removes the enum shit that was introduced but never merged to master, because we don't need it.
This commit is contained in:
Mappening
2024-06-10 22:53:09 -05:00
parent 0e7708f920 9f2bd4ed5f
commit 79a73ccc64
18 changed files with 780 additions and 827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
game/script/11.school-assignment-and-route-lock.rpy
View File

@@ -586,12 +586,12 @@ label chapter_11:
pause .5
call get_ending from _call_get_ending_1
if _return == 4:
jump lSortingThings # Golden
elif _return == 3:
jump lMendingThings # Tradwife
if _return == 4: # Golden
jump lSortingThings
elif _return == 3: # tradwife
jump lMendingThings
else:
jump lBreakingThings # Shooter
jump lBreakingThings # All else fails, go to shooter.
label lSortingThings:
@@ -3847,7 +3847,7 @@ label chapter_11:
pause .5
show rosa neutral behind moe:
yalign 0.2 xalign 0.0
yalign 0.2 xalign 0.0
show rosa:
easein_back 2 yalign 0.2 xalign 0.9
with dissolve
@@ -5212,7 +5212,7 @@ label chapter_11:
pause .5
call get_ending from _call_get_ending_2
if _return == 3: #tradwife
if _return == 3: # tradwife
"Things are going pretty well. When we discount Trish’s weekly attempt to talk with Fang."
@@ -5245,9 +5245,9 @@ label chapter_11:
scene classroom
show anon neutral:
yalign 0.1 xalign 0.2
yalign 0.1 xalign 0.2
show fang neutral behind anon:
yalign 0.0 xalign 0.8
yalign 0.0 xalign 0.8
with Dissolve(1)
pause .5
@@ -5466,100 +5466,103 @@ label chapter_11:
"{cps=*.1}...{/cps}"
# skip this segment if we're doing ending 1
call get_ending from _call_get_ending_3
if _return != 1: # any route except Shooter
# duplicated segment from 11B, 11C and 11D transplanted here
window hide
window auto
pause .5
if _return == 1: #shooter
return
# the following segment makes sense in the context of 11B+11C+11D
window hide
window auto
pause .5
play music "audio/OST/Appreciating her Company.ogg" fadein 1.0
pause .5
play music "audio/OST/Appreciating her Company.ogg" fadein 1.0
pause .5
"About fifteen minutes into the assignment, the two of us are just about done."
"About fifteen minutes into the assignment, the two of us are just about done."
"We’re making surprisingly good time."
"We’re making surprisingly good time."
show fang considering with Dissolve(.25)
F "Uhm{cps=*.1}...{/cps} and you said that the electrons hold the negative charge, right?"
show fang considering with Dissolve(.25)
F "Uhm{cps=*.1}...{/cps} and you said that the electrons hold the negative charge, right?"
A "Yeah, yeah."
A "Yeah, yeah."
show fang unimpressed with Dissolve(.25)
F "Can’t imagine when I’d be using this crap in real life."
show fang unimpressed with Dissolve(.25)
F "Can’t imagine when I’d be using this crap in real life."
A "You never know, you might shrink one day."
A "You never know, you might shrink one day."
show fang happy with Dissolve(.25)
F "Yeah, and you might stop pretending you’re livestreaming on Yousnoot."
pause .5
show fang happy with Dissolve(.25)
F "Yeah, and you might stop pretending you’re livestreaming on Yousnoot."
pause .5
A "As far as you know I might be giving you incorrect answers, you know."
A "As far as you know I might be giving you incorrect answers, you know."
F "Mhm, sure."
pause .5
F "Mhm, sure."
pause .5
"The teacher is making his rounds checking on the students and gets to our desks."
window hide
window auto
"The teacher is making his rounds checking on the students and gets to our desks."
window hide
window auto
show farnsworth:
yalign 0.1 xalign 1.6
show farnsworth:
easein_cubic 1 xalign 1.2
with dissolve
pause .5
show farnsworth:
yalign 0.1 xalign 1.6
show farnsworth:
easein_cubic 1 xalign 1.2
with dissolve
pause .5
Drf "Hello, Anon. Fang."
Drf "Hello, Anon. Fang."
Drf "Are you two getting along well?"
Drf "Are you two getting along well?"
AnonAndFang "Yes, Doctor Fernsworth."
AnonAndFang "Yes, Doctor Fernsworth."
Drf "Great to hear."
pause .5
Drf "Great to hear."
pause .5
Drf "You know, I’m real proud of you two."
pause .5
Drf "You know, I’m real proud of you two."
pause .5
Drf "I remember at the start of the year you were at each other's throats."
Drf "I remember at the start of the year you were at each other's throats."
Drf "And now look at you!"
pause .5
Drf "And now look at you!"
pause .5
show anon concerned
show fang sad
with dissolve
"The two of us cringe."
pause .5
show anon concerned
show fang sad
with dissolve
"The two of us cringe."
pause .5
A "Uhh{cps=*.1}...{/cps} Yeah, thanks."
A "Uhh{cps=*.1}...{/cps} Yeah, thanks."
Drf "At any rate, you two understand the material, right?"
Drf "At any rate, you two understand the material, right?"
show anon happy
show fang neutral
with dissolve
A "Oh yeah, Fang and I are fine."
show anon happy
show fang neutral
with dissolve
A "Oh yeah, Fang and I are fine."
show anon neutral with Dissolve(.25)
A "I was just helping them with a few problems."
pause .5
show anon neutral with Dissolve(.25)
A "I was just helping them with a few problems."
pause .5
"Phew, remembered it this time."
"Phew, remembered it this time."
Drf "Good, good."
Drf "Good, good."
Drf "I won’t keep you any longer then."
Drf "I won’t keep you any longer then."
show farnsworth:
easeout_cubic 1 xalign 1.6
pause .5
hide farnsworth with dissolve
show farnsworth:
easeout_cubic 1 xalign 1.6
pause .5
hide farnsworth with dissolve
"Fernsworth meanders to pester the next few students."
pause .5
"Fernsworth meanders to pester the next few students."
pause .5
A "Anyways, where were we?"
A "Anyways, where were we?"
return