Mirrors/SnootGame
1
0
Fork 0
mirror of https://git.cavemanon.xyz/Cavemanon/SnootGame.git synced 2025-02-24 02:28:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:
Map 2024-06-10 22:53:09 -05:00
commit 79a73ccc64
18 changed files with 780 additions and 827 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
game/script.rpy
View file

@ -324,7 +324,6 @@ transform scloserleft:
label start:
$ fangscore = 0
$ anonscore = 0
$ tradwife = False
$ wingStory = False
pause 1.0
call storyline from _call_storyline

17
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:
@ -5466,9 +5466,12 @@ 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
if _return == 1: #shooter
return
# the following segment makes sense in the context of 11B+11C+11D
window hide
window auto
pause .5

2
game/script/13A.fang-loses-it-after-losing-prom-queen.rpy
View file

@ -691,11 +691,9 @@ label chapter_13A:
menu:
"Could be worse":
A "Could be worse."
"Going great, actually":
A "Going great, actually."
pause .5

4
game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy
View file

@ -3114,13 +3114,9 @@ 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."
A "I’m thinking of doing something with music{cps=*.1}...{/cps} maybe becoming a sound engineer?"
"Not certain just yet":
A "I’m not sure yet."

24
game/script/7.concert-day.rpy
View file

@ -650,6 +650,7 @@ label chapter_7:
show dimmer_darker
show trish smile:
xalign 0.0
show fang happy at scenter
show reed neutral flip at rright:
xalign 1.3
@ -1535,27 +1536,22 @@ label chapter_7:
menu:
"Nyet.":
pause 0.5
A "I do NOT have a thing for Incontineisha."
pass
"Nein.":
pause 0.5
A "I do NOT have a thing for Incontineisha."
pass
"Non.":
pause 0.5
A "I do NOT have a thing for Incontineisha."
pass
"Nope.":
pause 0.5
A "I do NOT have a thing for Incontineisha."
pass
"Inai.":
pause 0.5
A "I do NOT have a thing for Incontineisha."
pass
"Mei yo.":
pause 0.5
A "I do NOT have a thing for Incontineisha."
pass
"None of that.":
pause 0.5
A "I do NOT have a thing for Incontineisha."
pass
"No.":
pass
pause 0.5
A "I do NOT have a thing for Incontineisha."

9
game/src/credits.rpy
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)

3
game/storyline.rpy
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

20
game/tl/es/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy
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 "I’m 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 "I’m 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 "I’m 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 "I’m 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?"

50
game/tl/es/script/7.concert-day.rpy
View file

@ -2226,48 +2226,6 @@ translate es PostCableConundrum_797b4809:
# "Right into Trish’s 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."

3
game/utility.rpy
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: