diff --git a/game/01creator-defined.rpyc b/game/01creator-defined.rpyc index f9dc67e..8a94486 100644 Binary files a/game/01creator-defined.rpyc and b/game/01creator-defined.rpyc differ diff --git a/game/camera.rpyc b/game/camera.rpyc index a65e484..3a23eff 100644 Binary files a/game/camera.rpyc and b/game/camera.rpyc differ diff --git a/game/community.rpy b/game/community.rpy index 511da14..8167b7f 100644 --- a/game/community.rpy +++ b/game/community.rpy @@ -7426,6 +7426,7 @@ label call_to_squid: jump boat_capsized label boat_capsized: + play sound "sfx/splash.ogg" "The creature capsized my boat, and I fell into the water." "We grabbed onto the boat and tried to turn it over." if (ate_jellyfish) and (touched_jellystar_25): @@ -7434,6 +7435,7 @@ label boat_capsized: "[kid_name] slapped the jellysquid off with an oar." kid yell "Come on Dad! Flip the boat with me!" "After flinging away a few jellystars, we flipped the boat." + play sound "sfx/splash.ogg" "I helped [kid_name] in." kid angry "Just hang on the side while I try to get us away!" him blush "I'm hanging on! Go for it!" @@ -9053,6 +9055,8 @@ label community30: "Explore other options.": # else: #in this branch, you don't talk to pete or kid, so you don't know that Noel was receiving shipments of firegrass. you have talked to Oleg though, which so far isn't dependent on another variable. # "I didn't think Pete would want to talk to me, and I didn't really have any way to contact him either." + scene farm_interior with fade + show him determined at center with dissolve "Oleg said that he thought Brennan was the only one who could make deposits and withdrawals without the recipient's permission." "But maybe [her_name] would also have this right?" "I asked [her_name] if she could make deposits and withdrawals automatically." diff --git a/game/community.rpyc b/game/community.rpyc index 6d1c09d..8993bc8 100644 Binary files a/game/community.rpyc and b/game/community.rpyc differ diff --git a/game/credits.rpyc b/game/credits.rpyc index 689b1ff..5b728fc 100644 Binary files a/game/credits.rpyc and b/game/credits.rpyc differ diff --git a/game/crop-events.rpy b/game/crop-events.rpy index 80f3190..f11dc51 100644 --- a/game/crop-events.rpy +++ b/game/crop-events.rpy @@ -275,7 +275,7 @@ label garlic1: bro surprised "Can I have some more?" him happy "You like them? Sure! I made lots!" kid surprised "Why would someone eat something that smells like that?" - her concerned "Garlic actually tastes really good, and it's has a lot of health benefits." + her concerned "Garlic actually tastes really good, and it has a lot of health benefits." him normal "And it keeps vampires away." kid annoyed "Vampires?" him happy "That's what legends say, anyway!" diff --git a/game/crop-events.rpyc b/game/crop-events.rpyc index b389390..641ab7c 100644 Binary files a/game/crop-events.rpyc and b/game/crop-events.rpyc differ diff --git a/game/defines.rpy b/game/defines.rpy index 0a42f6a..76fe3b1 100644 --- a/game/defines.rpy +++ b/game/defines.rpy @@ -163,7 +163,7 @@ init -100: define chaco = Character("Chaco", who_color=blue_dusty_ice, image="chaco", ctc="ctc_blink", ctc_position="nestled-close") define kevin = Character("Kevin", who_color=yellow, image="kevin", ctc="ctc_blink", ctc_position="nestled-close") define zaina = Character("Zaina", who_color=yellow_gold, image="zaina", ctc="ctc_blink", ctc_position="nestled-close") #golden yellow - define jellysquid = Character("Jellysquid", kind=nvl, who_color="#614bb5", ctc="ctc_blink", ctc_position="nestled-close", what_font="fonts/KidZone.ttf") #purple + define jellysquid = Character("Jellysquid", kind=nvl, who_color="#614bb5", ctc="ctc_blink", ctc_position="nestled-close", what_font="fonts/KidZone.ttf", what_alt="Jellysquid: [text]") #purple define tutorial = Character("Tutorial", who_color="#ededed", ctc="ctc_blink", ctc_position="nestled-close") #light gray define note = Character("note", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") diff --git a/game/defines.rpyc b/game/defines.rpyc index 2545b9d..14b4242 100644 Binary files a/game/defines.rpyc and b/game/defines.rpyc differ diff --git a/game/endings.rpy b/game/endings.rpy index 4821941..29399fb 100644 --- a/game/endings.rpy +++ b/game/endings.rpy @@ -265,6 +265,7 @@ label ending_ac: "Ending 1/4: Bring Back My Baby." window auto hide show ending1_cg + alt "Image: [kid_name] sits on the shuttle, pouting, while [her_name] cries and [his_name] look on in dismay back on the planet." $ renpy.pause(6.0) $ renpy.pause() @@ -369,6 +370,7 @@ label ending_aC: "Ending 2/4: Proving Herself." window auto hide show ending2_cg + alt "Image: [kid_name] is in the clinic treating a patient, while [his_name] looks on with fondness." $ renpy.pause(6.0) $ renpy.pause() return @@ -450,6 +452,7 @@ label ending_Ac: "Ending 3/4: Forever My Little Girl" window auto hide show ending3_cg + alt "Image: [kid_name] speeds down the hill on her bicycle with the delivery trailer attached, a carefree smile on her face." $ renpy.pause(6.0) $ renpy.pause() return @@ -599,6 +602,7 @@ label ending_AC: else: $ achievement_dict["The Stars are Bright"]["file"] = "ending4.png" show ending4o_cg + alt "Image: [bro_name], [kid_name], [boyfriend_name] and [her_name] are all sitting at the kitchen table, chatting, while [his_name] brings out more food." $ renpy.pause(6.0) $ renpy.pause() diff --git a/game/endings.rpyc b/game/endings.rpyc index fdbfbe0..7718375 100644 Binary files a/game/endings.rpyc and b/game/endings.rpyc differ diff --git a/game/family.rpy b/game/family.rpy index 66c16e1..e362fb2 100644 --- a/game/family.rpy +++ b/game/family.rpy @@ -7343,11 +7343,12 @@ label family25: him normal "I'll go get that squash." if (is_independent()): - kid normal "I can handle it by myself dad." + kid normal "I can handle it by myself, dad." him surprised "Are you sure?" kid shifty "Yes! I know you're trying to finish harvesting, so come back in an hour and I'll have it all ready for you." him happy "Thanks, [kid_name], that'd be great." hide him with moveoutleft + show kid normal with dissolve if (is_competent()): show him normal at midleft with moveinleft diff --git a/game/family.rpyc b/game/family.rpyc index 02f701d..af0184b 100644 Binary files a/game/family.rpyc and b/game/family.rpyc differ diff --git a/game/farm.rpyc b/game/farm.rpyc index cfe3122..5d58c46 100644 Binary files a/game/farm.rpyc and b/game/farm.rpyc differ diff --git a/game/functions.rpyc b/game/functions.rpyc index 9ddcc16..887131c 100644 Binary files a/game/functions.rpyc and b/game/functions.rpyc differ diff --git a/game/gui.rpyc b/game/gui.rpyc index bcf6a2c..2f73cb3 100644 Binary files a/game/gui.rpyc and b/game/gui.rpyc differ diff --git a/game/images.rpy b/game/images.rpy index 5cdd8b7..d4142ad 100644 --- a/game/images.rpy +++ b/game/images.rpy @@ -14,13 +14,13 @@ init -10: # CGs image baby_cg: - "images/cgs/chapter-baby.png" + "images/cgs/chapter-baby.png" xalign 0.0 yalign 0.5 linear 3.0 xalign 0.8 yalign 0.5 linear 3.0 zoom 0.5 image toddler_cg: - "images/cgs/chapter-toddler.png" + "images/cgs/chapter-toddler.png" xalign 0.0 yalign 0.5 linear 3.0 xalign 0.6 yalign 0.2 linear 3.0 zoom 0.5 @@ -32,13 +32,13 @@ init -10: linear 3.0 zoom 0.5 image tween_cg: - "images/cgs/chapter-tween.png" + "images/cgs/chapter-tween.png" xalign 0.0 yalign 0.5 linear 3.0 xalign 0.5 yalign 0.3 linear 3.0 zoom 0.5 image yteen_cg: - "images/cgs/chapter-teen.png" + "images/cgs/chapter-teen.png" xalign 0.0 yalign 0.6 linear 3.0 xalign 0.8 yalign 0.3 linear 3.0 zoom 0.5 diff --git a/game/images.rpyc b/game/images.rpyc index 6384c03..f37402d 100644 Binary files a/game/images.rpyc and b/game/images.rpyc differ diff --git a/game/message-board.rpy b/game/message-board.rpy index 4855621..f895014 100644 --- a/game/message-board.rpy +++ b/game/message-board.rpy @@ -809,64 +809,64 @@ label message30: # NVL mode characters for chat rooms, etc define her_c = Character("her_name", dynamic=True, who_suffix = " {image=images/icons/her-icon.png} ", - color=rose, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=rose, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="[her_name]: [text]") define him_c = Character("his_name", dynamic=True, who_suffix = " {image=images/icons/him-icon.png} ", - color=red_med, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=red_med, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="[his_name]: [text]") define kid_c = Character("kid_name", dynamic=True, who_suffix = " {image=images/icons/kid-icon.png} ", - color=magenta, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=magenta, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="[kid_name]: [text]") define naomi_c = Character("Naomi", who_suffix = " {image=images/icons/naomi-icon.png} ", - color=lavendar_gray, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=lavendar_gray, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Naomi: [text]") define pavel_c = Character("Pavel", who_suffix = " {image=images/icons/pavel-icon.png} ", - color=tan_dark, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=tan_dark, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Pavel: [text]") define lily_c = Character("Dr. Lily", who_suffix = " {image=images/icons/lily-icon.png} ", - color=lavendar, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=lavendar, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Dr. Lily: [text]") define sara_c = Character("Sara", who_suffix = " {image=images/icons/sara-icon.png} ", - color=rose_dark, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=rose_dark, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Sara: [text]") define thuc_c = Character("Thuc", who_suffix = " {image=images/icons/thuc-icon.png} ", - color=green_sage, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=green_sage, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Thuc: [text]") define ilian_c = Character("Ilian", who_suffix = " {image=images/icons/ilian-icon.png} ", - color=yellow_light, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=yellow_light, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Ilian: [text]") define brennan_c = Character("Brennan", who_suffix = " {image=images/icons/brennan-icon.png} ", - color=green_med, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=green_med, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Brennan: [text]") define pete_c = Character("Pete", who_suffix = " {image=images/icons/pete-icon.png} ", - color=brown_light, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=brown_light, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Pete: [text]") define natalia_c = Character("Natalia", who_suffix = " {image=images/icons/natalia-icon.png} ", - color=orange_you_glad, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=orange_you_glad, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Natalia: [text]") define helen_c = Character("Helen", who_suffix = " {image=images/icons/helen-icon.png} ", - color=gray_med, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=gray_med, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Helen: [text]") define julia_c = Character("Julia", who_suffix = " {image=images/icons/julia-icon.png} ", - color=blue_ice, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=blue_ice, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Julia: [text]") define martin_c = Character("Martín", who_suffix = " {image=images/icons/martin-icon.png} ", - color=dust_of_the_earth, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=dust_of_the_earth, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="XXX: [text]") define anya_c = Character("Anya", - color="#53b5ab", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") #cyan + color="#53b5ab", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Anya: [text]") #cyan define lewis_c = Character("Mr. Lewis", - color="#be4a25", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") #red-orange + color="#be4a25", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Mr. Lewis: [text]") #red-orange define zaina_c = Character ("Zaina", who_suffix = " {image=images/icons/zaina-icon.png} ", - color=yellow_gold, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=yellow_gold, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Zaina: [text]") define kevin_c = Character ("Kevin", who_suffix = " {image=images/icons/kevin-icon.png} ", - color=yellow, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=yellow, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Kevin: [text]") define oleg_c = Character("Oleg", who_suffix = " {image=images/icons/oleg-icon.png} ", - color=blue_mako, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=blue_mako, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Oleg: [text]") define travis_c = Character("Travis", who_suffix = " {image=images/icons/travis-icon.png} ", - color=red_light, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=red_light, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Travis: [text]") define bro_c = Character("[bro_name]", who_suffix = " {image=images/icons/bro-icon.png} ", - color=blue_med, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color=blue_med, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="[bro_name]: [text]") define van_c = Character("Van", - color="#1c30a1", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") #dark blue -define chaco_c = Character("Chaco", color=blue_dusty_ice, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") + color="#1c30a1", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Van: [text]") #dark blue +define chaco_c = Character("Chaco", color=blue_dusty_ice, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Chaco: [text]") define ret_c = Character("RET", #who_suffix = " {image=images/icons/ret-icon.png} ", - color="555555", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") #gray + color="555555", kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="RET: [text]") #gray define computer = Character(None, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_font="fonts/FreeMono.ttf") define legalese = Character(None, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") -define bandile_c = Character("Bandile", color=tan_dark, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") +define bandile_c = Character("Bandile", color=tan_dark, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close", what_alt="Bandile: [text]") define note_c = Character(None, kind=nvl, ctc="ctc_blink", ctc_position="nestled-close") diff --git a/game/message-board.rpyc b/game/message-board.rpyc index fc37e8d..7cc9526 100644 Binary files a/game/message-board.rpyc and b/game/message-board.rpyc differ diff --git a/game/nutrition.rpyc b/game/nutrition.rpyc index 51baf9e..d948e59 100644 Binary files a/game/nutrition.rpyc and b/game/nutrition.rpyc differ diff --git a/game/omake.rpyc b/game/omake.rpyc index 1e16c0b..ce4dce8 100644 Binary files a/game/omake.rpyc and b/game/omake.rpyc differ diff --git a/game/options.rpy b/game/options.rpy index 7490f2e..015d757 100644 --- a/game/options.rpy +++ b/game/options.rpy @@ -15,7 +15,7 @@ define config.name = _("Space to Grow") ## The version of the game. -define config.version = "1.2" +define config.version = "1.3" # Uncomment if you want the cheat/developer console enabled. #define config.console = True diff --git a/game/options.rpyc b/game/options.rpyc index 77e3a13..2a4282f 100644 Binary files a/game/options.rpyc and b/game/options.rpyc differ diff --git a/game/other-events.rpyc b/game/other-events.rpyc index 20a6b03..d3ede98 100644 Binary files a/game/other-events.rpyc and b/game/other-events.rpyc differ diff --git a/game/plugin-poetry.rpyc b/game/plugin-poetry.rpyc index 50e9bfc..1c0fbbe 100644 Binary files a/game/plugin-poetry.rpyc and b/game/plugin-poetry.rpyc differ diff --git a/game/poetry-display.rpy b/game/poetry-display.rpy index e33db75..edf0ce9 100644 --- a/game/poetry-display.rpy +++ b/game/poetry-display.rpy @@ -54,6 +54,7 @@ screen poetry_display(board, call_return=False): style_prefix "pp" xfill True yfill True + modal True background "#000" use p_display(board, call_return) @@ -63,10 +64,12 @@ screen poetry_display(board, call_return=False): style_prefix "pps" xfill True yfill True + modal True background "#000" use p_display(board, call_return) screen p_display(board, call_return=False): + key "x" action Hide("poetry_display") frame: #background None left_padding 100 @@ -91,7 +94,7 @@ screen p_display(board, call_return=False): spacing 5 imagebutton auto "gui/twitter_%s.png" action TweetPoem(board.poems[count]) tooltip "Share this poem on Twitter" alt "Tweet Poem" - textbutton " × " action Confirm("Delete this poem?", DeletePoem(board, count)) tooltip "Delete this poem" xalign 0.5 + textbutton " × " action Confirm("Delete this poem?", DeletePoem(board, count)) tooltip "Delete this poem" alt "Delete Poem" xalign 0.5 vbox: spacing 5 for i in range(0, board.MAX_LINES): diff --git a/game/poetry-display.rpyc b/game/poetry-display.rpyc index 9bb55ec..84fc707 100644 Binary files a/game/poetry-display.rpyc and b/game/poetry-display.rpyc differ diff --git a/game/poetry-styles.rpyc b/game/poetry-styles.rpyc index 964ec2e..ea70dfd 100644 Binary files a/game/poetry-styles.rpyc and b/game/poetry-styles.rpyc differ diff --git a/game/poetry-wordboard.rpyc b/game/poetry-wordboard.rpyc index 630a656..ad5277e 100644 Binary files a/game/poetry-wordboard.rpyc and b/game/poetry-wordboard.rpyc differ diff --git a/game/poetry-wordpack.rpyc b/game/poetry-wordpack.rpyc index 4d5f692..1ca4db5 100644 Binary files a/game/poetry-wordpack.rpyc and b/game/poetry-wordpack.rpyc differ diff --git a/game/screen-bios.rpy b/game/screen-bios.rpy index b37c98d..0cf795e 100644 --- a/game/screen-bios.rpy +++ b/game/screen-bios.rpy @@ -6,6 +6,7 @@ screen biographies(name): modal True zorder 1 style_prefix "bio" + key "x" action Hide("biographies") frame: xalign 0.5 @@ -33,9 +34,9 @@ screen biographies(name): if (active): hbox: showif (not read): - text " {b}!{/b} " xalign 1.0 yalign 0.0 style "alert_text" at tiny_bounce + text " {b}!{/b} " xalign 1.0 yalign 0.0 alt "" style "alert_text" at tiny_bounce else: - text "" xalign 0.0 + text "" xalign 0.0 alt "" textbutton fname action SetVariable("show_person", name) null width 10 diff --git a/game/screen-bios.rpyc b/game/screen-bios.rpyc index d53dc00..6084fd8 100644 Binary files a/game/screen-bios.rpyc and b/game/screen-bios.rpyc differ diff --git a/game/screen-farm.rpy b/game/screen-farm.rpy index 270da13..12bb9af 100644 --- a/game/screen-farm.rpy +++ b/game/screen-farm.rpy @@ -6,9 +6,18 @@ screen plan_farm(): tag plan_farm style_prefix "plan_farm" $ valid_layout = farm.is_valid_layout() + if (not valid_layout): + if (farm.crops.count("goats") != crop_info[get_crop_index("goats")][MAXIMUM_INDEX]): + $ info_msg = "Need to allocate all goats!" + elif (crop_enabled("honey") and (farm.crops.count("honey") != crop_info[get_crop_index("honey")][MAXIMUM_INDEX])): + $ info_msg = "Need to allocate all bees!" + else: + $ info_msg = "Need to fix crops needing more nitrogen!" + else: + $ info_msg = "OK!" frame: background "computer_pad_with_screen" - text "User {color=#888}[his_name]{/color} has logged on." size 12 xalign 0.1 ypos 30 color "#fff" + text "User {color=#888}[his_name]{/color} has logged on." size 12 xalign 0.1 ypos 30 color "#fff" alt "Farm status: " + info_msg # read the info_msg first if in self-voicing mode imagebutton auto "gui/computerpadbutton_%s.png" action ShowMenu("save") alt "Game Menu" xpos 1233 yalign 0.5 vbox: area (60, 50, 1150, 620) @@ -35,14 +44,9 @@ screen plan_farm(): if (not valid_layout): # if (farm.get_total_calories() < get_calories_required(year)): # text "Need more energy!" style "alert_text" - if (farm.crops.count("goats") != crop_info[get_crop_index("goats")][MAXIMUM_INDEX]): - text "Need to allocate all goats!" style "alert_text" - elif (crop_enabled("honey") and (farm.crops.count("honey") != crop_info[get_crop_index("honey")][MAXIMUM_INDEX])): - text "Need to allocate all bees!" style "alert_text" - else: - text "Need to fix crops needing more nitrogen!" style "alert_text" + text info_msg style "alert_text" else: - text "OK!" style "plan_farm_status_text" color green_dark + text info_msg style "plan_farm_status_text" color green_dark hbox: xsize RIGHT_COLUMN_WIDTH textbutton "Clear": @@ -72,6 +76,7 @@ label yearly_messages: # Subscreen letting the user see information on crops and choose which to plant this year ## screen farm_details_screen(): + key 'p' action [auto_place_crops, renpy.restart_interaction] hbox: xalign 0.5 xfill True @@ -116,27 +121,27 @@ screen farm_details_screen(): imagebutton auto "gui/messages_%s.png" action Jump("yearly_messages") alt "Messages" text "Messages" style "tiny_text" - showif (not read_messages): - text " {b}!{/b} " ypos -40 style "alert_text" at tiny_bounce + if (not read_messages): + text " {b}!{/b} " ypos -40 style "alert_text" alt "New" at tiny_bounce else: text " " ypos -40 style "alert_text" xalign 0.0 # We have to have this here or it messes up all the positions vbox: imagebutton auto "gui/parenting_%s.png" action Show("parenting_handbook", transition=irisout) alt "Parenting" text "Parenting" style "tiny_text" - showif ((year in TRANSITION_YEARS) and (not read_handbook)): - text " {b}!{/b} " ypos -40 style "alert_text" at tiny_bounce + if ((year in TRANSITION_YEARS) and (not read_handbook)): + text " {b}!{/b} " ypos -40 style "alert_text" alt "New" at tiny_bounce else: - text " " ypos -40 style "alert_text" # We have to have this here or it messes up all the positions + text " " ypos -40 alt "" style "alert_text" # We have to have this here or it messes up all the positions vbox: imagebutton auto "gui/bios_%s.png" action Show("biographies", irisout, bios.getFirstUnreadPersonName()) alt "Bios" text "Bios" style "tiny_text" - showif (bios.hasUnread()): - text " {b}!{/b} " ypos -40 style "alert_text" at tiny_bounce + if (bios.hasUnread()): + text " {b}!{/b} " ypos -40 style "alert_text" alt "New" at tiny_bounce else: text " " ypos -40 style "alert_text" vbox: - showif(len(word_board.poems) > 0): + if(len(word_board.poems) > 0): imagebutton auto "gui/poetry_%s.png" action Show("poetry_display", irisout, word_board) alt "Poetry" text "Poetry" style "tiny_text" else: @@ -167,6 +172,7 @@ screen choose_crop(crop_index=0): modal True default show_sort = False add "gui/overlay/confirm.png" + key "x" action Hide("choose_crop") frame: style_prefix "crop_details" yalign 0.5 @@ -355,6 +361,7 @@ screen crops_layout(): cols 5#round(farm_size**0.5) side_xalign 0.5 for i in range(0, farm_size): + $ alt_add = "" vbox: xalign 0.5 hbox: @@ -372,6 +379,7 @@ screen crops_layout(): frame: if (nitrogen_usage > current_nitrogen_level): background red_dark + $ alt_add = " low nitrogen" else: # make poor soils lighter, # (optionally) put the pests on top @@ -387,7 +395,7 @@ screen crops_layout(): $ imagefile = get_crop_filename(current_crop_name) imagebutton: # image file, then boosting, then any selection box - alt current_crop_name + alt current_crop_name + alt_add idle Composite((CROP_ICON_SIZE,CROP_ICON_SIZE), (0,0), imagefile, (CROP_ICON_SIZE/2,0), get_boost_image(i), @@ -458,8 +466,8 @@ screen crops_totals(): #grid 2 4 hbox: text "Energy "# + str(total_calories) + " / " + str(calories_needed) - showif (total_calories < calories_needed): - text "{b}!{/b}" style "alert_text" at tiny_bounce + if (total_calories < calories_needed): + text "{b}!{/b}" style "alert_text" alt "low" at tiny_bounce hbox: use stat_icons(2, CALORIES_INDEX) text " " @@ -467,8 +475,8 @@ screen crops_totals(): if ((year > NUTRITION_YEAR) and (bad_nutrition_count > 0)): hbox: text "Nutrition "# + str(vitA) + " | " + str(vitC) + " | " + str(vitM) + "/" + str(vitamins_needed) - showif ((vitA < vitamins_needed) or (vitC < vitamins_needed) or (vitM < vitamins_needed)): - text "{b}!{/b}" style "alert_text" at tiny_bounce + if ((vitA < vitamins_needed) or (vitC < vitamins_needed) or (vitM < vitamins_needed)): + text "{b}!{/b}" style "alert_text" alt "low" at tiny_bounce hbox: yalign 0.5 add "gui/emoji/vitA.png" @@ -481,7 +489,7 @@ screen crops_totals(): hbox: text "Work "# + str(total_work) + " / " + str(get_work_available()) showif (total_work > get_work_available()): - text "{b}!{/b}" style "alert_text" at tiny_bounce + text "{b}!{/b}" style "alert_text" alt "high" at tiny_bounce hbox: use stat_icons(2, WORK_INDEX) text " " diff --git a/game/screen-farm.rpyc b/game/screen-farm.rpyc index d6cf7fa..5fe8bd8 100644 Binary files a/game/screen-farm.rpyc and b/game/screen-farm.rpyc differ diff --git a/game/screen-handbook.rpy b/game/screen-handbook.rpy index 4776954..b282247 100644 --- a/game/screen-handbook.rpy +++ b/game/screen-handbook.rpy @@ -8,6 +8,7 @@ screen parenting_handbook(): zorder 1 style_prefix "parenting" on "show" action [SetVariable("show_year", year), SetVariable("read_handbook", True)] + key "x" action Hide("parenting_handbook") frame: xalign 0.5 diff --git a/game/screen-handbook.rpyc b/game/screen-handbook.rpyc index ea084e3..7f8e991 100644 Binary files a/game/screen-handbook.rpyc and b/game/screen-handbook.rpyc differ diff --git a/game/screen-transient.rpy b/game/screen-transient.rpy index 0eabd79..85a646b 100644 --- a/game/screen-transient.rpy +++ b/game/screen-transient.rpy @@ -163,12 +163,12 @@ screen yearly_summary(endgame=False): text "Jellypeople's Friend" xpos 30 # Info about Kelly if (strong_marriage): - label "[her_name] {emoji=heart}" + label "[her_name] {emoji=heart} {alt}loved{/alt}" else: label "[her_name] {emoji=nutrition-half}" # Info about Terra if (total_attachment >= ATTACHMENT_HIGH): - label "[kid_name] {emoji=heart}" + label "[kid_name] {emoji=heart} {alt}loved{/alt}" else: label "[kid_name] {emoji=nutrition-half}" text "Attachment: [att_percent]%" xpos 30 @@ -189,7 +189,7 @@ screen yearly_summary(endgame=False): if (total_attachment < ATTACHMENT_HIGH): label "[bro_name] {emoji=nutrition-half}" else: - label "[bro_name] {emoji=heart}" + label "[bro_name] {emoji=heart} {alt}loved{/alt}" else: label "Quote" hbox: diff --git a/game/screen-transient.rpyc b/game/screen-transient.rpyc index d32c436..67254f5 100644 Binary files a/game/screen-transient.rpyc and b/game/screen-transient.rpyc differ diff --git a/game/screens.rpy b/game/screens.rpy index 15b7321..dae47f1 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -108,7 +108,7 @@ screen say(who, what): $ nickname = get_nickname(who) showif show_menutab: - imagebutton xpos 1245 ypos 555 auto "gui/menutab_%s.png" action ToggleScreenVariable("show_menutab") alt "Hide Menu Tab" + imagebutton xpos 1245 ypos 555 auto "gui/menutab_%s.png" action ToggleScreenVariable("show_menutab") frame: background "gui/menutabbg.png" xpos 1130 @@ -127,11 +127,13 @@ screen say(who, what): imagebutton auto "gui/skip_%s.png" action Skip() tooltip "Skip Already-Seen Content" alt "Skip" else: - imagebutton xpos 1132 ypos 555 auto "gui/menutab_%s.png" action ToggleScreenVariable("show_menutab") alt "Show Menu Tab" + imagebutton xpos 1132 ypos 555 auto "gui/menutab_%s.png" action ToggleScreenVariable("show_menutab") keyboard_focus False window: id "window" + if who is not None: + text "{alt}[who]{/alt}" text what id "what" if who is not None: @@ -1154,6 +1156,14 @@ screen keyboard_help(): label "V" text _("Toggles assistive {a=https://www.renpy.org/l/voicing}self-voicing{/a}.") + hbox: + label "P" + text _("Automatically place crops on the farming screen.") + + hbox: + label "X" + text _("Close sub screens.") + screen mouse_help(): @@ -1505,7 +1515,7 @@ screen nvl_dialogue(dialogue): xfill True yfit gui.nvl_height is None if d.who is not None: - $ nickname = get_nickname(d.who) + $ nickname = get_nickname(d.who) $ is_jack = d.who.startswith(his_name) $ who_color = d.who_args["color"] if (who_color is None): diff --git a/game/screens.rpyc b/game/screens.rpyc index 0c84a33..daa972c 100644 Binary files a/game/screens.rpyc and b/game/screens.rpyc differ diff --git a/game/script.rpy b/game/script.rpy index e0dc1a9..4343763 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -9,6 +9,7 @@ label splashscreen: with Pause(0.5) show metasepia-logo with dissolve + alt "Metasepia Games presents Our Personal Space 2: Space to Grow" with Pause(1) scene black @@ -304,6 +305,7 @@ label start: "Parts of this game deal with pregnancy loss, euthanasia, mental and physical disabilities, sexual education, and drug policies. We have tried to depict these situations sensitively." if (not mp.jack_name): "If you haven't played {a=https://www.metasepiagames.com/OurPersonalSpace/index.html}Our Personal Space 1{/a}, it's available for free and takes place right before this game. You don't have to have played it to enjoy Space to Grow." + alt "Press the ESC key at any time to access the game menu to save your game or change options." scene stars with fade show familyphoto0 at center, baby_pos with dissolve @@ -499,6 +501,7 @@ label life_loop: show text "End Baby Years" $ renpy.pause(1.5) show baby_cg + alt "image: [his_name] drives the tractor with happy baby [kid_name] on his lap." $ renpy.pause(6.0) $ renpy.pause() @@ -508,6 +511,7 @@ label life_loop: show text "End Toddler Years" $ renpy.pause(1.5) show toddler_cg + alt "image: [his_name] picks tomatoes while [kid_name] stuffs her face with them, seeds dripping down her chin." $ renpy.pause(6.0) $ renpy.pause() @@ -517,6 +521,7 @@ label life_loop: show text "End Childhood Years" $ renpy.pause(1.5) show child_cg + alt "image: [his_name] crawls on the ground with [kid_name] riding on his back. His horse watches with a bemused expression." $ renpy.pause(6.0) $ renpy.pause() @@ -526,6 +531,7 @@ label life_loop: show text "End Tween Years" $ renpy.pause(1.5) show tween_cg + alt "image: [kid_name], wearing a farm apron, ruffles a nanny goat's fur while looking into her eyes." $ renpy.pause(6.0) $ renpy.pause() @@ -535,6 +541,7 @@ label life_loop: show text "End Young Teen Years" $ renpy.pause(1.5) show yteen_cg + alt "[his_name] looks on with nervous laughter while [kid_name] drives the tractor." $ renpy.pause(6.0) $ renpy.pause() diff --git a/game/script.rpyc b/game/script.rpyc index da80980..2b2abcd 100644 Binary files a/game/script.rpyc and b/game/script.rpyc differ diff --git a/game/test.rpyc b/game/test.rpyc index d8acf04..c04f553 100644 Binary files a/game/test.rpyc and b/game/test.rpyc differ diff --git a/game/wordpacks.rpyc b/game/wordpacks.rpyc index 3595619..b3def50 100644 Binary files a/game/wordpacks.rpyc and b/game/wordpacks.rpyc differ diff --git a/game/work.rpy b/game/work.rpy index 6ccb57a..f45c121 100644 --- a/game/work.rpy +++ b/game/work.rpy @@ -349,7 +349,7 @@ label farm_tutorial: "The middle of the screen shows the current year and the farm layout. I have a lot of land but it's not all cleared for farming yet." scene tutorial-right with dissolve "On the right is how much energy the current farm will provide, and how much work it will take." - "I can also clear the whole farm if I want to start from scratch." + "I can also clear the whole farm if I want to start from scratch.{alt} If you want to automatically place crops, you can press the 'p' key on the keyboard.{/alt}" scene tutorial-crop-select with dissolve "When I select a farm space, I can choose what crop should go there and see information about each crop." "I always have to allocate space for my goats, but which other crops I plant is up to me." diff --git a/game/work.rpyc b/game/work.rpyc index ea36472..ea6b583 100644 Binary files a/game/work.rpyc and b/game/work.rpyc differ diff --git a/old-game/community.rpyc b/old-game/community.rpyc index 282acd8..6d1c09d 100644 Binary files a/old-game/community.rpyc and b/old-game/community.rpyc differ diff --git a/old-game/crop-events.rpyc b/old-game/crop-events.rpyc index 8483f6f..b389390 100644 Binary files a/old-game/crop-events.rpyc and b/old-game/crop-events.rpyc differ diff --git a/old-game/endings.rpyc b/old-game/endings.rpyc index 189a7d2..fdbfbe0 100644 Binary files a/old-game/endings.rpyc and b/old-game/endings.rpyc differ diff --git a/old-game/family.rpyc b/old-game/family.rpyc index 2408f0c..02f701d 100644 Binary files a/old-game/family.rpyc and b/old-game/family.rpyc differ diff --git a/old-game/functions.rpyc b/old-game/functions.rpyc index 659a7eb..9ddcc16 100644 Binary files a/old-game/functions.rpyc and b/old-game/functions.rpyc differ diff --git a/old-game/message-board.rpyc b/old-game/message-board.rpyc index ba85ecd..fc37e8d 100644 Binary files a/old-game/message-board.rpyc and b/old-game/message-board.rpyc differ diff --git a/old-game/options.rpyc b/old-game/options.rpyc index bb7b0ba..77e3a13 100644 Binary files a/old-game/options.rpyc and b/old-game/options.rpyc differ diff --git a/old-game/poetry-display.rpyc b/old-game/poetry-display.rpyc index 692e9b4..9bb55ec 100644 Binary files a/old-game/poetry-display.rpyc and b/old-game/poetry-display.rpyc differ diff --git a/old-game/screen-farm.rpyc b/old-game/screen-farm.rpyc index 0c6a20e..d6cf7fa 100644 Binary files a/old-game/screen-farm.rpyc and b/old-game/screen-farm.rpyc differ diff --git a/old-game/screen-transient.rpyc b/old-game/screen-transient.rpyc index 3e81144..d32c436 100644 Binary files a/old-game/screen-transient.rpyc and b/old-game/screen-transient.rpyc differ diff --git a/old-game/screens.rpyc b/old-game/screens.rpyc index 7d7c19d..0c84a33 100644 Binary files a/old-game/screens.rpyc and b/old-game/screens.rpyc differ diff --git a/old-game/script.rpyc b/old-game/script.rpyc index 8ec47b4..da80980 100644 Binary files a/old-game/script.rpyc and b/old-game/script.rpyc differ diff --git a/old-game/work.rpyc b/old-game/work.rpyc index 73ec271..ea36472 100644 Binary files a/old-game/work.rpyc and b/old-game/work.rpyc differ