Pomi108/SnootGame
1
Fork 0
forked from Cavemanon/SnootGame
Code Pull Requests 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

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)

32
game/src/definitions.rpy
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)