Compare commits

..

11 Commits

Author SHA1 Message Date
9f2bd4ed5f fixes translation menus
deletes the old lines
2023-05-07 00:21:57 -06:00
0c648922aa common code 2023-05-06 22:50:23 -06:00
378cb12bf4 Late Game (Chapters 13, 14) and Bonus Chapters
* Reduces copypasta in the "what plans do you have" scene at the beach.
2023-05-06 22:48:11 -06:00
c890f2094c 2, 5, 8, 11
threes threes threes
2023-05-06 22:45:57 -06:00
dbffdf5c36 chapters 1 and 4 2023-05-06 22:43:35 -06:00
c274f8726a reduce copypasta in chapter7 2023-05-06 22:42:36 -06:00
9021619bf0 chapter 7 alignment issues 2023-05-06 22:42:27 -06:00
1046f65408 Merge pull request 'chore: Removes tradwife flag' (#220) from san7890/SnootGame:flag-cleanup into NewPatch
Reviewed-on: Cavemanon/SnootGame#220
2023-05-07 02:13:46 +00:00
404d3f91bd removes the trad arg to initstats() as well 2023-05-06 20:11:35 -06:00
340528ee02 removes the ending flag 2023-05-06 20:06:38 -06:00
ef4764b322 get_ending to not be numerically based, but instead enum-based. (#219)
Co-authored-by: san7890 <the@san7890.com>
Reviewed-on: Cavemanon/SnootGame#219
Co-authored-by: san7890 <san7890@noreply.git.cavemanon.xyz>
Co-committed-by: san7890 <san7890@noreply.git.cavemanon.xyz>
2023-05-07 00:44:59 +00:00
18 changed files with 797 additions and 836 deletions

View File

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

View File

@ -449,7 +449,7 @@ label chapter_11:
# Doomer ending skips this segment
call get_ending from _call_get_ending
if _return == 2:
if _return == Endings.Doomer:
stop music fadeout 3
pause 2
jump lPromAnnouncement
@ -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 == Endings.Golden:
jump lSortingThings
elif _return == Endings.Tradwife:
jump lMendingThings
else:
jump lBreakingThings # Shooter
jump lBreakingThings # All else fails, go to shooter.
label lSortingThings:
@ -5212,7 +5212,7 @@ label chapter_11:
pause .5
call get_ending from _call_get_ending_2
if _return == 3: #tradwife
if _return == Endings.Tradwife:
"Things are going pretty well. When we discount Trishs weekly attempt to talk with Fang."
@ -5467,8 +5467,10 @@ label chapter_11:
"{cps=*.1}...{/cps}"
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 == Endings.Shooter:
return
# the following segment makes sense in the context of 11B+11C+11D
window hide
window auto
pause .5

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

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 "Im thinking of doing something with music{cps=*.1}...{/cps} maybe becoming a sound engineer?"
"Not certain just yet":
A "Im not sure yet."

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."

View File

@ -218,7 +218,8 @@ image d_credits_text = Composite(
label lending:
call get_ending from _call_get_ending_4
if _return == 4:
$ cached_ending = _return # un-necessary to call this so many times
if cached_ending == Endings.Golden:
pause 0.5
show snootgame_big with dissolve: # Renpy not allowing you to grab images from the gui folder is serious bullshit
subpixel True
@ -248,7 +249,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 == Endings.Tradwife:
play music "audio/OST/Dino Destiny Reader.ogg"
pause 0.5
show c_credits_text:
@ -280,12 +281,12 @@ label lending:
stop music fadeout 5
scene black with Dissolve(3)
pause 2
if tradwife:
if cached_ending == Endings.Tradwife:
scene c10 with Dissolve(1.5)
pause 20
scene black with Dissolve(2)
pause 1
elif anonscore >= 4 and fangscore >= 4:
elif cached_ending == Endings.Golden:
scene golden ending with Dissolve(1.5)
pause 20
scene black with Dissolve(2)

View File

@ -23,26 +23,25 @@ label storyline:
call chapter_10 from _call_chapter_10
call chapter_11 from _call_chapter_11
call get_ending from _call_get_ending_5
if _return == 4:
if _return == Endings.Golden:
call chapter_11D from _call_chapter_11D
call chapter_12D from _call_chapter_12D
call chapter_12_5D from _call_chapter_12_5D
call chapter_13D from _call_chapter_13D
call chapter_14D from _call_chapter_14D
elif _return == 3:
$ tradwife = True
elif _return == Endings.Tradwife:
call chapter_11C from _call_chapter_11C
call chapter_12C from _call_chapter_12C
call chapter_12_5C from _call_chapter_12_5C
call chapter_13C from _call_chapter_13C
call chapter_14C from _call_chapter_14C
elif _return == 2:
elif _return == Endings.Doomer:
call chapter_11B from _call_chapter_11B
call chapter_12B from _call_chapter_12B
# 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 "Estoy pensando en hacer algo con música{cps=*.1}...{/cps} ¿quizás convertirme en ingeniero de sonido?"

View File

@ -1,23 +1,31 @@
## Utility functions for game setup, debugging etc.
label initstats(anon=0, fang=0, trad=False):
init python:
from enum import Enum
# Create compile-time macros to more easily track what ending goes to what without the need for magic numbers or strings that can be mistyped
class Endings(Enum):
Shooter = 0
Doomer = 1
Tradwife = 2
Golden = 3
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:
# To check what ending we're getting, call this label and then check the value of _return
# Sensible to have this logic defined in only one place for consistency
if anonscore >= 4 and fangscore >= 4 and wingStory:
return(4) # Golden
return(Endings.Golden)
elif anonscore >= 3 and fangscore <=4:
return(3) # Tradwife
return(Endings.Tradwife)
elif anonscore <= 3 and fangscore >=3:
return(2) # Doomer
return(Endings.Doomer)
else:
return(1) # Shooter
return(Endings.Shooter)