Compare commits

...

5 Commits

Author SHA1 Message Date
Map
ff359efd1b fix language selector being able to scroll horizontally
Some checks are pending
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/tag/woodpecker Pipeline was successful
ci/woodpecker/release/woodpecker Pipeline was successful
2024-10-12 07:40:54 -05:00
Map
3f2fc63950 document ending_image() 2024-10-11 19:13:41 -05:00
Map
ccadc0c179 increase credits time slightly 2024-10-11 18:57:07 -05:00
Map
420ed93ee2 Fix conditional dialogue to play properly while using the chapter select. Fix chapter 7's conditional dialogue to only play while on an ending 4 run
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-10-11 18:48:01 -05:00
Map
83d3c129fa fix debug scores not returning after the menu updates
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-10-11 18:25:54 -05:00
5 changed files with 10 additions and 9 deletions

View File

@ -905,7 +905,7 @@ screen preferences():
textbutton _("Enable Chapter Select") action ToggleVariable("persistent.enable_chapter_select", True, False) textbutton _("Enable Chapter Select") action ToggleVariable("persistent.enable_chapter_select", True, False)
if not main_menu: if not main_menu:
if config.developer and persistent.enable_debug_scores: if persistent.enable_debug_scores:
$ debug_story_variables(False) $ debug_story_variables(False)
$ debug_story_variables(True) $ debug_story_variables(True)
else: else:
@ -945,7 +945,6 @@ screen preferences():
scrollbars "vertical" scrollbars "vertical"
for lang in languages: for lang in languages:
fixed: fixed:
xsize 656
ysize 60 ysize 60
use lang_button(lang) use lang_button(lang)

View File

@ -265,19 +265,19 @@ label chapter_7:
#Decided to take the unholy if/else approach to this, if there is a better, cleaner, or faster way to do it then do point me to it. #Decided to take the unholy if/else approach to this, if there is a better, cleaner, or faster way to do it then do point me to it.
#Values here were decided by writers, not me #Values here were decided by writers, not me
if anonscore >= 3 and fangscore >= 4: if (anonscore >= 3 and fangscore >= 4) or ending_route_number == 4:
#>>golden #>>golden
St "Upright Strength." St "Upright Strength."
St "OH! {w=.3} I dont think you need to worry about whats to come, Anon." St "OH! {w=.3} I dont think you need to worry about whats to come, Anon."
elif anonscore >= 3 and fangscore <= 3: elif (anonscore >= 3 and fangscore <= 3) or ending_route_number == 3:
#>>tradwife #>>tradwife
St "Inverted Hierophant." St "Inverted Hierophant."
St "You need to be wary of your words and actions, Anon." St "You need to be wary of your words and actions, Anon."
elif anonscore <= 3 and fangscore >= 3: elif (anonscore <= 3 and fangscore >= 3) or ending_route_number == 2:
#>>doomer #>>doomer
St "Inverted Hermit." St "Inverted Hermit."
St "Anon, if you ever feel lonely you can come to me." St "Anon, if you ever feel lonely you can come to me."
elif anonscore <= 2 and fangscore <= 2: elif (anonscore <= 2 and fangscore <= 2) or ending_route_number == 1:
#>>shooter #>>shooter
St "Oh my, {w=.3} inverted Empress." St "Oh my, {w=.3} inverted Empress."
St "You need to be wary about future negligence, Anon." St "You need to be wary about future negligence, Anon."

View File

@ -1525,7 +1525,7 @@ label chapter_8:
"{cps=*.1}...{/cps}" "{cps=*.1}...{/cps}"
if anonscore >= 3 or fangscore >= 3: if (anonscore >= 4 and fangscore >= 4) or ending_route_number == 4:
pause 0.5 pause 0.5
play music 'audio/OST/its_footloose_now.ogg' fadein 1.0 play music 'audio/OST/its_footloose_now.ogg' fadein 1.0

View File

@ -238,7 +238,7 @@ init python:
# Note: Measuring in pixels # Note: Measuring in pixels
panning_stop = 13290 # How far the panning will go down panning_stop = 13290 # How far the panning will go down
panning_stop_bg = 8100 # How far the background images will pan, to create the parallax effect (I can't believe cuckedmanon didn't like this!) panning_stop_bg = 8100 # How far the background images will pan, to create the parallax effect (I can't believe cuckedmanon didn't like this!)
panning_duration = 65 # How long in seconds panning_duration = 67 # How long in seconds
credits_img_offset = panning_stop + 550 # Distance away from panning_stop where the image will render credits_img_offset = panning_stop + 550 # Distance away from panning_stop where the image will render
credits_img_boundary = credits_img_offset + 590 # The offset + the height of the credits image file credits_img_boundary = credits_img_offset + 590 # The offset + the height of the credits image file

View File

@ -1,4 +1,6 @@
init -1 python: init -1 python:
# This function name is a misnomer, this actually counts endings as seen when the player reaches the ending cards when this is called
# And it's done in the most retarded way possible because someone thought it'd be funny.
def ending_image(): def ending_image():
#0b0000, DCBA, flash the bits with |=, check with & #0b0000, DCBA, flash the bits with |=, check with &
endings = 0b0000 endings = 0b0000
@ -26,7 +28,7 @@ init python:
# We're at an ending # We're at an ending
else: else:
ending_image() ending_image() # Count endings that have seen the ending cards as seen
if ending_route_number == 1: if ending_route_number == 1:
renpy.quit() renpy.quit()