Merge branch 'indentation-stuff' into indentation-continued

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:
Map 2024-06-10 22:53:09 -05:00
commit 79a73ccc64
18 changed files with 780 additions and 827 deletions

View file

@ -313,18 +313,17 @@ screen textscroll():
# Naser's position when helping Anon get up
transform nmidright:
xalign 1.5 yalign 0.08
xalign 1.5 yalign 0.08
# Naomi's position when handing the brochure to Anon
transform scloserleft:
xalign 0.1 yalign 0.0
xalign 0.1 yalign 0.0
label start:
$ fangscore = 0
$ anonscore = 0
$ tradwife = False
$ wingStory = False
pause 1.0
call storyline from _call_storyline

View file

@ -157,7 +157,7 @@ label chapter_1:
scene stairs at Pan((553,169), (553, 169), 0) with None # snap here if the player is advancing the dialogue quickly
window hide
show iris:
xalign 0.99 yalign 0.75
xalign 0.99 yalign 0.75
stop ambient fadeout 4
stop ambient1 fadeout 4
with Dissolve(3)
@ -1289,9 +1289,9 @@ label chapter_1:
show naomi neutral flip with dissolve
show naser:
easein_cubic 0.5 xalign 0.62
pause 0.75
ease 0.75 xalign 0.4
easein_cubic 0.5 xalign 0.62
pause 0.75
ease 0.75 xalign 0.4
pause 2
"He tears the sandwich in two and hands me the larger half."
@ -1846,9 +1846,9 @@ label chapter_1:
window hide
$ i = 0
while i < 20:
$ showCG()
pause 1
$ i = i + 1
$ showCG()
pause 1
$ i = i + 1
$ renpy.music.set_volume(0.4, 2, 'ambient')
@ -3479,7 +3479,7 @@ label chapter_1:
show anon neutral at aleft
show naomi neutral flip at sright
show naser sad flip behind naomi:
xalign 0.7 yalign -0.1
xalign 0.7 yalign -0.1
with Dissolve(1)
pause 0.5

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 Trishs 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."
"Were making surprisingly good time."
"Were 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 "Cant imagine when Id be using this crap in real life."
show fang unimpressed with Dissolve(.25)
F "Cant imagine when Id 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 youre livestreaming on Yousnoot."
pause .5
show fang happy with Dissolve(.25)
F "Yeah, and you might stop pretending youre 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, Im real proud of you two."
pause .5
Drf "You know, Im 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 wont keep you any longer then."
Drf "I wont 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

View file

@ -56,7 +56,7 @@ label chapter_13A:
show naomi prom neutral:
yalign 0.0 xalign -0.4
show naomi prom neutral:
easein_cubic 1 xalign -0.125
easein_cubic 1 xalign -0.125
with dissolve
pause .5
@ -690,13 +690,11 @@ label chapter_13A:
pause .5
menu:
"Could be worse":
"Could be worse":
A "Could be worse."
A "Could be worse."
"Going great, actually":
A "Going great, actually."
"Going great, actually":
A "Going great, actually."
pause .5
Sp "Wheres your date, I thought I saw the two of you enter."

View file

@ -3114,17 +3114,13 @@ label chapter_13D:
pause .5
menu:
"Go to college":
A "Well... {w=0.3}Spears convinced me to send out a couple application letters for college."
"Go to college":
A "Well... {w=0.3}Spears convinced me to send out a couple application letters for college."
A "Im thinking of doing something with music{cps=*.1}...{/cps} maybe becoming a sound engineer?"
"Not certain just yet":
A "Im not sure yet."
A "Im thinking of doing something with music{cps=*.1}...{/cps} maybe becoming a sound engineer?"
"Not certain just yet":
A "Im not sure yet."
A "Im thinking of doing something with music{cps=*.1}...{/cps} maybe becoming a sound engineer?"
Re "Oh nice, dude! You can be the bands sound technician when youre done!"

View file

@ -441,7 +441,7 @@ label chapter_14C:
pause .5
show fang:
easeout_cubic 1 xalign 1.4
easeout_cubic 1 xalign 1.4
show fang c happy with dissolve
hide fang with dissolve
pause 0.5

View file

@ -603,7 +603,7 @@ label chapter_2:
window auto
show fang neutral with Dissolve(1):
xalign -0.6 yalign 0.0
xalign -0.6 yalign 0.0
pause .75
show white:
@ -903,7 +903,7 @@ label chapter_2:
pause .5
show fang sad flip:
ease_cubic 1.5 xalign -0.6
ease_cubic 1.5 xalign -0.6
pause 1.15
show fang sad with dissolve
pause 1.2
@ -1919,7 +1919,7 @@ label chapter_2:
show fang sad:
yalign 0 xalign -1
show fang sad:
easein 1 xalign -0.6
easein 1 xalign -0.6
with Dissolve(1)
pause 1
@ -2191,13 +2191,13 @@ label chapter_2:
scene cafeteria
show anon neutral:
xalign -0.2 yalign 0.1
xalign -0.2 yalign 0.1
show reed neutral flip:
xalign 0.5 yalign 0.1
xalign 0.5 yalign 0.1
show fang considering flip:
xalign 0.95 yalign 0.0
xalign 0.95 yalign 0.0
show trish neutral flip:
xalign 1.125 yalign 0.0
xalign 1.125 yalign 0.0
with Dissolve(1)
pause .5
@ -2274,11 +2274,11 @@ label chapter_2:
stop music fadeout 0.02
show reed shocked flip:
easein_quart 1 xalign 0.54
easein_quart 1 xalign 0.54
show fang surprised flip:
easein_quart 1 xalign 0.99
easein_quart 1 xalign 0.99
show trish surprised flip:
easein_quart 1 xalign 1.155
easein_quart 1 xalign 1.155
pause .5
"The three stop in their tracks and look back at me."
pause .5
@ -2331,11 +2331,11 @@ label chapter_2:
pause .5
show reed shocked flip:
easein_quart 1 xalign 0.65#0.54
easein_quart 1 xalign 0.65#0.54
show fang surprised flip:
easein_quart 1 xalign 1.15#0.99
easein_quart 1 xalign 1.15#0.99
show trish neutral flip:
easein_quart 1 xalign 1.25#1.155
easein_quart 1 xalign 1.25#1.155
FRT "Ohfuck.{w=.4} Sorry Anon, we gotta bail."
window hide

View file

@ -732,7 +732,7 @@ label chapter_4:
show reed king rex behind anon:
yalign 0.1 xalign -1.9
show reed:
easein 1 xalign -1.2
easein 1 xalign -1.2
with Dissolve(1)
pause 1
Re "Itll be fine."

View file

@ -573,9 +573,9 @@ label chapter_5:
menu:
"Tug Her Tail":
pass
pass
"Tug Her Ankle":
pass
pass
pause .5

File diff suppressed because it is too large Load diff

View file

@ -80,9 +80,9 @@ label chapter_8:
"Knowing better than to look through the ocean of students, I follow my nose to Reed."
pause 0.5
show reed sunglasses:
xalign 0.4 yalign 0.1
xalign 0.4 yalign 0.1
show trish neutral behind reed:
xalign 0.9
xalign 0.9
with dissolve
"The fetid raptor was sitting in the very last row with Trish."

View file

@ -397,7 +397,7 @@ label chapter_x7:
pause .5
show trish happy with dissolve
#show trish happy behind dimmer_darker at tleft with easeinleft
#show trish happy behind dimmer_darker at tleft with easeinleft
T "Fang! It took a while but Reeds distracted!"

View file

@ -242,7 +242,8 @@ image d_credits_text = Composite(
label lending:
call get_ending from _call_get_ending_4
if _return == 4:
$ cached_ending = _return
if cached_ending == 4:
pause 0.5
show snootgame_big with dissolve: # Renpy not allowing you to grab images from the gui folder is serious bullshit
subpixel True
@ -272,7 +273,7 @@ label lending:
pause 50
queue music 'audio/OST/amberlight brillance live end.ogg'
queue music "<silence 1.0>" loop
elif _return == 3:
elif cached_ending == 3:
play music "audio/OST/Dino Destiny Reader.ogg"
pause 0.5
show c_credits_text:
@ -304,12 +305,12 @@ label lending:
stop music fadeout 5
scene black with Dissolve(3)
pause 2
if tradwife:
if cached_ending == 3:
scene c10 with Dissolve(1.5)
pause 20
scene black with Dissolve(2)
pause 1
elif anonscore >= 4 and fangscore >= 4:
elif cached_ending == 4:
scene golden ending with Dissolve(1.5)
pause 20
scene black with Dissolve(2)

View file

@ -1548,28 +1548,28 @@ image fang very sad blur flip = im.Flip("highres/bluralt/fang very sad blur.webp
image naomi neutral blur flip = im.Flip("highres/bluralt/naomi neutral blur.webp", horizontal=True)
image fang pneutral blur = Composite(
(1412, 1500),
#(2683, 2850),
(0, 0), "highres/bluralt/fang neutral blur.webp",
(0, 0), "highres/bluralt/amberpendant1 blur.webp"
(1412, 1500),
#(2683, 2850),
(0, 0), "highres/bluralt/fang neutral blur.webp",
(0, 0), "highres/bluralt/amberpendant1 blur.webp"
)
image fang pbird happy blur = Composite(
(1412, 1500),
#(2683, 2850),
(0, 0), "highres/bluralt/fang flip off happy blur.webp",
(0, 0), "highres/bluralt/amberpendant1 blur.webp"
(1412, 1500),
#(2683, 2850),
(0, 0), "highres/bluralt/fang flip off happy blur.webp",
(0, 0), "highres/bluralt/amberpendant1 blur.webp"
)
image fang pneutral blur flip = Composite(
(1412, 1500),
#(2683, 2850),
(0, 0), im.Flip("highres/bluralt/fang neutral blur.webp", horizontal=True),
(0, 0), im.Flip("highres/bluralt/amberpendant1 blur.webp", horizontal=True)
(1412, 1500),
#(2683, 2850),
(0, 0), im.Flip("highres/bluralt/fang neutral blur.webp", horizontal=True),
(0, 0), im.Flip("highres/bluralt/amberpendant1 blur.webp", horizontal=True)
)
image fang pbird happy blur flip = Composite(
(1412, 1500),
#(2683, 2850),
(0, 0), im.Flip("highres/bluralt/fang flip off happy blur.webp", horizontal=True),
(0, 0), im.Flip("highres/bluralt/amberpendant1 blur.webp", horizontal=True)
(1412, 1500),
#(2683, 2850),
(0, 0), im.Flip("highres/bluralt/fang flip off happy blur.webp", horizontal=True),
(0, 0), im.Flip("highres/bluralt/amberpendant1 blur.webp", horizontal=True)
)
image raymba2 flip = im.Flip("raymba/raymba2.webp", horizontal=True)

View file

@ -30,7 +30,6 @@ label storyline:
call chapter_13D from _call_chapter_13D
call chapter_14D from _call_chapter_14D
elif _return == 3:
$ tradwife = True
call chapter_11C from _call_chapter_11C
call chapter_12C from _call_chapter_12C
call chapter_12_5C from _call_chapter_12_5C
@ -42,7 +41,7 @@ label storyline:
# no chapter_13 here since the scene is different enough to the other routes for everything to go into 13C
call chapter_13B from _call_chapter_13B
call chapter_14B from _call_chapter_14B
else:
else: # if all else fails, we just assume that we got Endings.Shooter
call chapter_11A from _call_chapter_11A
call chapter_12A from _call_chapter_12A
call chapter_12_5D from _call_chapter_12_5D_1

View file

@ -4099,24 +4099,12 @@ translate es FastTimesAtVolcanoHigh_94e85886:
# A "Well... {w=0.3}Spears convinced me to send out a couple application letters for college."
A "Bueno... {w=0.3}Spears me convenció de enviar un par de letras de aplicación para la universidad."
# game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy:3121
translate es FastTimesAtVolcanoHigh_4e617de4:
# A "Im thinking of doing something with music{cps=*.1}...{/cps} maybe becoming a sound engineer?"
A "Estoy pensando en hacer algo con música{cps=*.1}...{/cps} ¿quizás convertirme en ingeniero de sonido?"
# game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy:3124
translate es FastTimesAtVolcanoHigh_a2735d38:
# A "Im not sure yet."
A "Todavía no estoy seguro."
# game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy:3126
translate es FastTimesAtVolcanoHigh_4e617de4_1:
# A "Im thinking of doing something with music{cps=*.1}...{/cps} maybe becoming a sound engineer?"
A "Estoy pensando en hacer algo con música{cps=*.1}...{/cps} ¿quizás convertirme en ingeniero de sonido?"
# game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy:3128
translate es FastTimesAtVolcanoHigh_5ce0f5f5:
@ -6127,3 +6115,11 @@ translate es strings:
old "Not certain just yet"
new "Todavía no estoy seguro"
# TODO: Translation updated at 2023-05-07 00:20
# game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy:3123
translate es FastTimesAtVolcanoHigh_4e617de4:
# A "Im thinking of doing something with music{cps=*.1}...{/cps} maybe becoming a sound engineer?"
A "Estoy pensando en hacer algo con música{cps=*.1}...{/cps} ¿quizás convertirme en ingeniero de sonido?"

View file

@ -2226,48 +2226,6 @@ translate es PostCableConundrum_797b4809:
# "Right into Trishs trap, {w=0.3}hook, {w=0.3}line, {w=0.3}sinker and rod."
"Justo en la trampa, {w=0.3}el anzuelo, {w=0.3}la línea, {w=0.3}la plomada y en la caña de Trish."
# game/script/7.concert-day.rpy:1539
translate es PostCableConundrum_afcbc2bb:
# A "I do NOT have a thing for Incontineisha."
A "La incontinencia NO es mi fetiche."
# game/script/7.concert-day.rpy:1542
translate es PostCableConundrum_afcbc2bb_1:
# A "I do NOT have a thing for Incontineisha."
A "La incontinencia NO es mi fetiche."
# game/script/7.concert-day.rpy:1545
translate es PostCableConundrum_afcbc2bb_2:
# A "I do NOT have a thing for Incontineisha."
A "La incontinencia NO es mi fetiche."
# game/script/7.concert-day.rpy:1548
translate es PostCableConundrum_afcbc2bb_3:
# A "I do NOT have a thing for Incontineisha."
A "La incontinencia NO es mi fetiche."
# game/script/7.concert-day.rpy:1551
translate es PostCableConundrum_afcbc2bb_4:
# A "I do NOT have a thing for Incontineisha."
A "La incontinencia NO es mi fetiche."
# game/script/7.concert-day.rpy:1554
translate es PostCableConundrum_afcbc2bb_5:
# A "I do NOT have a thing for Incontineisha."
A "La incontinencia NO es mi fetiche."
# game/script/7.concert-day.rpy:1557
translate es PostCableConundrum_afcbc2bb_6:
# A "I do NOT have a thing for Incontineisha."
A "La incontinencia NO es mi fetiche."
# game/script/7.concert-day.rpy:1560
translate es PostCableConundrum_afcbc2bb_7:
@ -2630,3 +2588,11 @@ translate es strings:
old "No."
new "No."
# TODO: Translation updated at 2023-05-07 00:20
# game/script/7.concert-day.rpy:1556
translate es PostCableConundrum_afcbc2bb:
# A "I do NOT have a thing for Incontineisha."
A "La incontinencia NO es mi fetiche."

View file

@ -1,13 +1,12 @@
## Utility functions for game setup, debugging etc.
label initstats(anon=0, fang=0, trad=False):
label initstats(anon=0, fang=0):
# Sets various game-related global variables
# :param int anon: Anon's score
# :param int fang: Fang's score
# :param bool trad: Tradwife ending flag
$ anonscore = anon
$ fangscore = fang
$ tradwife = trad
return
label get_ending: