From 333fdfed51e4e0ab7bd1b7b036d771469d179afb Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Thu, 25 Apr 2024 20:14:25 +0100 Subject: [PATCH] Refactoring day checks --- .../events/favors/inspect_her_body_tier2.rpy | 2 +- .../characters/cho/events/favors/suck_it.rpy | 2 +- .../cho/events/quidditch/gryffindor_match.rpy | 10 +++---- .../events/quidditch/gryffindor_practice.rpy | 2 +- .../cho/events/quidditch/intros.rpy | 2 +- .../hermione/events/odd_jobs/maid.rpy | 2 +- game/scripts/events/DayNight.rpy | 6 ++-- game/scripts/events/Start.rpy | 4 +-- game/scripts/events/potions/intro.rpy | 2 +- game/scripts/events/quests.rpy | 24 +++++++-------- game/scripts/interface/book.rpy | 2 +- game/scripts/interface/calendar.rpy | 12 ++++---- game/scripts/interface/cheats.rpy | 6 ++-- game/scripts/interface/house_points.rpy | 2 +- game/scripts/interface/letter.rpy | 2 +- game/scripts/interface/stats.rpy | 2 +- game/scripts/interface/topbar.rpy | 12 ++++---- game/scripts/interface/weather.rpy | 6 ++-- .../mirror/events/a_dark_room_NOT_IN_USE.txt | 30 +++++++++---------- .../mirror/events/an_odd_circumstance.rpy | 2 +- .../mirror/events/previously_at_hogwarts.rpy | 2 +- game/scripts/rooms/main_room/init.rpy | 2 +- .../rooms/main_room/objects/cupboard.rpy | 18 +++++------ game/scripts/rooms/main_room/objects/desk.rpy | 6 ++-- .../rooms/main_room/objects/fireplace.rpy | 2 +- .../rooms/main_room/objects/phoenix.rpy | 2 +- game/scripts/utility/periodic_functions.rpy | 2 +- game/scripts/utility/saves.rpy | 2 +- 28 files changed, 84 insertions(+), 84 deletions(-) diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy index 07968512..04c63da9 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy @@ -81,7 +81,7 @@ label cc_pf_strip_T2_intro_E1: $ cho.set_pose("default") $ cho.animation = None $ states.env.gold = 1984 - $ game.day = 123 + $ states.env.day = 123 call room("main_room") call cho_chibi("stand", "desk", "base", flip=False) diff --git a/game/scripts/characters/cho/events/favors/suck_it.rpy b/game/scripts/characters/cho/events/favors/suck_it.rpy index fcae40b3..73303f78 100644 --- a/game/scripts/characters/cho/events/favors/suck_it.rpy +++ b/game/scripts/characters/cho/events/favors/suck_it.rpy @@ -58,7 +58,7 @@ label cc_pf_blowjob_T3_intro_E1: $ cho.set_pose("default") $ cho.animation = None $ states.env.gold = 1984 - $ game.day = 124 + $ states.env.day = 124 call room("main_room") call cho_chibi("stand", "desk", "base", flip=False) diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index f42838e5..0b293901 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -125,7 +125,7 @@ label gryffindor_match: with d5 $ states.env.gold = 1984 - $ game.day = 665 + $ states.env.day = 665 $ states.env.daytime = True $ game.weather = "clear" call room("main_room") @@ -587,7 +587,7 @@ label gryffindor_match: $ cho.equip(cho_outfit_quidditch_gryffindor) $ states.env.gold = 1984 - $ game.day = 667 + $ states.env.day = 667 $ states.env.daytime = True $ game.weather = "clear" $ snape_chibi.zorder = 3 @@ -729,7 +729,7 @@ label gryffindor_match: $ cho.equip(cho_outfit_quidditch_gryffindor) $ states.env.gold = 1984 - $ game.day = 667 + $ states.env.day = 667 $ states.env.daytime = True $ game.weather = "clear" $ snape_chibi.zorder = 3 @@ -935,7 +935,7 @@ label gryffindor_match: $ cho.set_pose("broom") $ cho.animation = sprite_fly_idle $ states.env.gold = 1984 - $ game.day = 667 + $ states.env.day = 667 call room("quidditch_stands2") call quidditch_stands2(weather="sun_low", crowd=crowd_full) call lun_chibi(xpos=620, ypos=400) @@ -959,7 +959,7 @@ label gryffindor_match: $ cho.set_pose("broom") $ cho.animation = sprite_fly_idle $ states.env.gold = 1984 - $ game.day = 667 + $ states.env.day = 667 call room("quidditch_stands2") call quidditch_stands2(weather="sun_low", crowd=crowd_full) call lun_chibi(xpos=620, ypos=400) diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy index 15c3c27b..a5eadf00 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy @@ -103,7 +103,7 @@ label cc_gt_return: $ cho.equip(cho_outfit_quidditch_gryffindor) $ states.env.gold = 1984 - $ game.day = 665 + $ states.env.day = 665 $ states.env.daytime = False $ game.weather = "clear" call room("main_room") diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 31188a3d..420b748e 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -1507,7 +1507,7 @@ label cho_quid_E12: $ hooch.equip(hoo_accessory_broom_dildo) $ cho.equip(cho_outfit_quidditch_gryffindor) $ states.env.gold = 1984 - $ game.day = 666 + $ states.env.day = 666 $ states.env.daytime = True $ game.weather = "clear" $ hooch_chibi.zoom = 0.38 diff --git a/game/scripts/characters/hermione/events/odd_jobs/maid.rpy b/game/scripts/characters/hermione/events/odd_jobs/maid.rpy index 09477832..cea9929c 100644 --- a/game/scripts/characters/hermione/events/odd_jobs/maid.rpy +++ b/game/scripts/characters/hermione/events/odd_jobs/maid.rpy @@ -178,7 +178,7 @@ label her_maid_job: label her_maid_job_return: python: - progress_factor = math.log(states.her.tier + states.cho.tier + states.ton.tier + states.lun.tier + game.day) + progress_factor = math.log(states.her.tier + states.cho.tier + states.ton.tier + states.lun.tier + states.env.day) payment = int(progress_factor * random_gold) $ hermione.equip(her_outfit_maid) diff --git a/game/scripts/events/DayNight.rpy b/game/scripts/events/DayNight.rpy index 20473741..99e08c5c 100644 --- a/game/scripts/events/DayNight.rpy +++ b/game/scripts/events/DayNight.rpy @@ -80,11 +80,11 @@ label day_start: states.sus.mood = max(states.sus.mood-val, 0) # Game flags - game.day += 1 + states.env.day += 1 game.weather = "random" states.env.daytime = True - cupboard_OBJ.foreground = Transform(Text(str((game.day % 30) + 1), color="#fff", outlines=[(1, "#000", 0, 0)]), pos=(40, 100)) + cupboard_OBJ.foreground = Transform(Text(str((states.env.day % 30) + 1), color="#fff", outlines=[(1, "#000", 0, 0)]), pos=(40, 100)) # Randomisers random_gold = renpy.random.randint(8, 40) @@ -92,7 +92,7 @@ label day_start: door_randomobj.seed() # Send salary every 7th day - if game.day % 7 == 0: + if states.env.day % 7 == 0: if states.paperwork_reports >= 1: letter_work_report.send() if not states.twi.ev.cardgame.first_random: diff --git a/game/scripts/events/Start.rpy b/game/scripts/events/Start.rpy index bb6ef6a6..025f2df3 100644 --- a/game/scripts/events/Start.rpy +++ b/game/scripts/events/Start.rpy @@ -49,7 +49,7 @@ label start_wt: label genie_intro_E1: $ game.weather = "clear" $ states.env.daytime = False - $ game.day = 0 + $ states.env.day = 0 call send_letters stop background @@ -88,7 +88,7 @@ label genie_intro_E1: # Swap to day seamlessly $ states.env.daytime = True - $ game.day = 1 + $ states.env.day = 1 $ mailbox.tick() with d9 diff --git a/game/scripts/events/potions/intro.rpy b/game/scripts/events/potions/intro.rpy index 7c9d095a..5a4529be 100644 --- a/game/scripts/events/potions/intro.rpy +++ b/game/scripts/events/potions/intro.rpy @@ -119,7 +119,7 @@ label potions_intro_E0: "\"What's the Wi-Fi password?\"": sna "Sorry?" ("snape_05") #check day counter - if game.day > 35: + if states.env.day > 35: gen "I've been here for ages and I still don't know the password..." ("base", xpos="far_left", ypos="head") else: gen "I know I've only been here for a little bit. But it's boring up there." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/events/quests.rpy b/game/scripts/events/quests.rpy index 4eb9d2fa..76517230 100644 --- a/game/scripts/events/quests.rpy +++ b/game/scripts/events/quests.rpy @@ -14,7 +14,7 @@ label quests: # DAY-BASED EVENTS # - if game.day >= 1: + if states.env.day >= 1: if states.env.daytime: if not states.gen.ev.intro.e2_complete and states.gen.ev.intro.bird_examined and states.gen.ev.intro.desk_examined and states.gen.ev.intro.cupboard_examined and states.gen.ev.intro.door_examined and states.gen.ev.intro.fireplace_examined: jump genie_intro_E2 @@ -22,7 +22,7 @@ label quests: if not states.sna.ev.intro.e1_complete: jump snape_intro_E1 - if game.day >= 2: + if states.env.day >= 2: if states.env.daytime: if not states.gen.ev.intro.e3_complete: jump genie_intro_E3 @@ -31,7 +31,7 @@ label quests: # Snape's second visit. jump snape_intro_E2 - if game.day >= 3: + if states.env.day >= 3: if states.env.daytime: if not states.gen.ev.intro.e4_complete: jump genie_intro_E4 @@ -41,7 +41,7 @@ label quests: jump snape_intro_E3 - if game.day >= 4: + if states.env.day >= 4: if states.env.daytime: pass else: @@ -49,13 +49,13 @@ label quests: # You bother decide to just "roll with it"... Snape summon unlocked. jump snape_intro_E5 - if game.day >= 5: + if states.env.day >= 5: if states.env.daytime: if hg_event_pause == 0 and not states.her.ev.intro.e1_complete: # Hermione shows up for the first time. jump hermione_intro_E1 - if game.day >= 6: + if states.env.day >= 6: if states.env.daytime: if hg_event_pause == 0 and states.sna.ev.hangouts.hermione_e1 and not states.her.ev.intro.e2_complete: # Second visit from Hermione. Says she sent a letter to the Ministry. @@ -63,7 +63,7 @@ label quests: else: pass - if game.day >= 7: + if states.env.day >= 7: if states.env.daytime: pass else: @@ -72,7 +72,7 @@ label quests: # Hermione might have failed a test... jump hermione_intro_E3 - if game.day >= 8: + if states.env.day >= 8: if states.env.daytime: pass else: @@ -80,13 +80,13 @@ label quests: # She failed a test and cries. jump hermione_intro_E4 - if game.day >= 9: + if states.env.day >= 9: if states.env.daytime: if hg_event_pause == 0 and states.her.ev.intro.e4_complete and not states.her.ev.intro.e5_complete: # Hermione asks to be tutored. Summon unlocked! jump hermione_intro_E5 - if game.day >= 10: + if states.env.day >= 10: if states.env.daytime: if nt_event_pause == 0 and states.her.ev.intro.e5_complete and not states.ton.ev.intro.e1_complete: # Tonks visits for the first time. @@ -96,7 +96,7 @@ label quests: # Tonks has found no evidence so far. jump tonks_intro_E2 - if game.day >= 11: + if states.env.day >= 11: if states.env.daytime: pass else: @@ -104,7 +104,7 @@ label quests: # Tonks becomes a teacher. Summon unlocked! jump tonks_intro_E3 - if game.day >= 13: + if states.env.day >= 13: if states.env.daytime: if hg_event_pause == 0 and states.her.ev.intro.e5_complete and states.sna.ev.hangouts.tonks_e1 and states.her.ev.intro.convinced and not states.her.ev.intro.e6_complete: # Hermione wants to buy favours. Favours unlocked! diff --git a/game/scripts/interface/book.rpy b/game/scripts/interface/book.rpy index 12f69908..ba655b3a 100644 --- a/game/scripts/interface/book.rpy +++ b/game/scripts/interface/book.rpy @@ -69,7 +69,7 @@ init python: branches = tuple(self.dictionary[str(x)] for x in branches) entry = [entry[0], entry[1].format(*branches)] - self.contents.append(["Day {}\n{}".format(game.day, entry[0]), str(entry[1]), id]) + self.contents.append(["Day {}\n{}".format(states.env.day, entry[0]), str(entry[1]), id]) self.pages = len(self.contents)-1 return diff --git a/game/scripts/interface/calendar.rpy b/game/scripts/interface/calendar.rpy index 48337496..0f039d53 100644 --- a/game/scripts/interface/calendar.rpy +++ b/game/scripts/interface/calendar.rpy @@ -14,7 +14,7 @@ init python: contents[i] += "🌕" elif (i % 7 == 3): contents[i] += "🌓" - # elif (game.day % 60 == 30) # Blood moon + # elif (states.env.day % 60 == 30) # Blood moon forecast = Weather.forecast(span) for i, v in forecast.items(): @@ -34,13 +34,13 @@ init python: # Add letters letters = mailbox.get_letters(True) for i in letters: - if (day := game.day+i.wait) < span+1: + if (day := states.env.day+i.wait) < span+1: contents[day] += "✉️" # Add parcels parcels = mailbox.get_parcels(True) for i in parcels: - if (day := game.day+i.wait) < span+1: + if (day := states.env.day+i.wait) < span+1: contents[day] += "📦" return contents @@ -48,7 +48,7 @@ init python: @staticmethod def get_weekday(n=None): if n is None: - n = game.day + n = states.env.day return Calendar.weekdays[n % 7] @@ -56,7 +56,7 @@ init python: def get_period(n=None): if n is None: - n = game.day + n = states.env.day return Calendar.periods[(n // 30) % 4] @@ -85,7 +85,7 @@ screen calendar: xysize (64, 64) if i > 29: add "#888888" - elif i == (game.day % 30): + elif i == (states.env.day % 30): add "#ff0000ff" else: add "#fff" diff --git a/game/scripts/interface/cheats.rpy b/game/scripts/interface/cheats.rpy index 7fbe9d8a..01856a23 100644 --- a/game/scripts/interface/cheats.rpy +++ b/game/scripts/interface/cheats.rpy @@ -411,7 +411,7 @@ label .hermione_skip_intro: $ firewhisky_ITEM.owned = 5 $ states.cupboard_rummaged_times = 6 - $ game.day = 13 + $ states.env.day = 13 $ achievements.unlock("start", True) @@ -505,8 +505,8 @@ label .hermione_skip_intro: # ### Cho ### # label .cho_skip_intro: -# if game.day < 16: -# $ game.day = 16 +# if states.env.day < 16: +# $ states.env.day = 16 # $ states.cho.ev.intro.e1_complete = True # $ states.cho.ev.intro.e2_complete = True # $ states.sna.ev.hangouts.cho_e1 = True diff --git a/game/scripts/interface/house_points.rpy b/game/scripts/interface/house_points.rpy index 2b31d114..66b26ae2 100644 --- a/game/scripts/interface/house_points.rpy +++ b/game/scripts/interface/house_points.rpy @@ -3,7 +3,7 @@ label points_changes: # Gets called every day/night. python hide: - progress_factor = max(1, int(math.log(game.day) * 5)) + progress_factor = max(1, int(math.log(states.env.day) * 5)) # Bonuses based on Tonks and Snape friendship stat # Tonks' is lower since you can do events with her directly to increase points. diff --git a/game/scripts/interface/letter.rpy b/game/scripts/interface/letter.rpy index a27db783..219049eb 100644 --- a/game/scripts/interface/letter.rpy +++ b/game/scripts/interface/letter.rpy @@ -41,7 +41,7 @@ init python: def calc_reports_gold(): global reports_gold - progress_factor = math.log(game.day) + progress_factor = math.log(states.env.day) progress_flat = (states.her.tier + states.cho.tier + states.ton.tier + states.lun.tier) * 16 # Note: random_gold global var is set at the start of the day and evening diff --git a/game/scripts/interface/stats.rpy b/game/scripts/interface/stats.rpy index 9e4a494a..decdf56f 100644 --- a/game/scripts/interface/stats.rpy +++ b/game/scripts/interface/stats.rpy @@ -365,7 +365,7 @@ screen stats_menuitem(current_category, current_item, stats_flags): use text_stat("Bird petted:") use text_stat("- ", " times -", states.bird_petted_times) use text_stat("You missed feeding your bird for:") - use text_stat("- ", " days...", (game.day - states.bird_fed_times) ) + use text_stat("- ", " days...", (states.env.day - states.bird_fed_times) ) use text_stat("If you were a Quidditch player, you'd be a:") use text_stat("- \"", "\" -", states.gen.stats.quidditch_position) diff --git a/game/scripts/interface/topbar.rpy b/game/scripts/interface/topbar.rpy index 6a8b1ded..f58463e9 100644 --- a/game/scripts/interface/topbar.rpy +++ b/game/scripts/interface/topbar.rpy @@ -42,7 +42,7 @@ screen ui_top_bar(): use ui_points # Don't display buttons in certain rooms or on the first day - if states.room == "main_room" and game.day > 1: + if states.room == "main_room" and states.env.day > 1: # Menu button imagebutton: xpos 0 @@ -173,7 +173,7 @@ screen ui_stats(): hbox: xpos 40 ypos 11 - text "{size=-4}[game.day]{/size}" + text "{size=-4}[states.env.day]{/size}" hbox: xpos 140 ypos 11 # Display tokens in token shop @@ -212,14 +212,14 @@ screen ui_menu(): ypos 15 textbutton "Save" action ShowMenu("save") background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] textbutton "Load" action ShowMenu("load") background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] - if states.env.cheats and states.env.difficulty <= 2 and game.day > 1: + if states.env.cheats and states.env.difficulty <= 2 and states.env.day > 1: textbutton "Cheats" action [SetScreenVariable("toggle_menu", False), Jump("cheats")] background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] - if game.day > 1 and renpy.android: + if states.env.day > 1 and renpy.android: textbutton "Preferences" action ShowMenu("preferences") background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] - if game.day > 1 and persistent.game_complete: + if states.env.day > 1 and persistent.game_complete: textbutton "Gallery" action [SetScreenVariable("toggle_menu", False), Jump("scene_gallery")] background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] - #if game.day > 1 and config.developer: + #if states.env.day > 1 and config.developer: # textbutton "{size=-11}Show Chars{/size}" action [SetScreenVariable("toggle_menu", False), Jump("summon_characters")] background "#000" hbox: diff --git a/game/scripts/interface/weather.rpy b/game/scripts/interface/weather.rpy index dec95ca2..8a491b0c 100644 --- a/game/scripts/interface/weather.rpy +++ b/game/scripts/interface/weather.rpy @@ -35,8 +35,8 @@ init python: def set_weather(value=None): if value is None or value == "random": period = Calendar.get_period() - weights = Weather._interpolate_weights(game.day, period) - rand = renpy.random.Random(seed=game.day) + weights = Weather._interpolate_weights(states.env.day, period) + rand = renpy.random.Random(seed=states.env.day) value = rand.choices(Weather.weather_types, weights=weights)[0] elif value not in Weather.weather_types: @@ -50,7 +50,7 @@ init python: @staticmethod def forecast(span=35): forecast = {} - start_day = game.day - (game.day % 30) + start_day = states.env.day - (states.env.day % 30) period = Calendar.get_period() for i in range(span): diff --git a/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt b/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt index 3d7e8254..4c0efdab 100644 --- a/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt +++ b/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt @@ -41,14 +41,14 @@ label start_dark_room_game: "-Start a new Game-": call reset_dark_room_init jump dark_room_main - "-Continue-" if DRgame.day > 1 and not DRgame.game_over: + "-Continue-" if DRstates.env.day > 1 and not DRgame.game_over: jump dark_room_load_save - "-Get coin rewards-" if DRgame.day > 1 and not DRgame.game_over: + "-Get coin rewards-" if DRstates.env.day > 1 and not DRgame.game_over: ">You'll get gold for each day you have survived in the game.\n>This will delete your current Save!" menu: "Would you like to delete your save and get gold coins for it?" "-Yes-": - $ current_payout = DRgame.day*2 + $ current_payout = DRstates.env.day*2 $ states.env.gold += current_payout ">You have received {number=current_payout} gold.\n>Thank you for playing \"A Dark Room\"." call reset_dark_room_init @@ -79,16 +79,16 @@ label dark_room_main: stop bg_sounds #Stops playing the fire SFX. stop weather #Stops playing the rain SFX. - if DRgame.day in [1,2,3,6,7]: + if DRstates.env.day in [1,2,3,6,7]: $ game.weather = "storm" - elif DRgame.day in [4,5]: + elif DRstates.env.day in [4,5]: $ game.weather = "clear" else: $ game.weather = "random" call weather_sound pause 2 - centered "{size=+7}{color=#cbcbcb}Day [DRgame.day]{/color}{/size}" + centered "{size=+7}{color=#cbcbcb}Day [DRstates.env.day]{/color}{/size}" pause 1 label DRgame_resume: @@ -98,7 +98,7 @@ label dark_room_main: pause 1 centered "{size=+7}{color=#cbcbcb}Game Over...{/color}{/size}" pause 1 - centered "{size=+7}{color=#cbcbcb}You made it to day [DRgame.day]!{/color}{/size}" + centered "{size=+7}{color=#cbcbcb}You made it to day [DRstates.env.day]!{/color}{/size}" pause 1 jump dark_room_game_start_menu @@ -140,13 +140,13 @@ label dark_room_main: pause 1 centered "{size=+7}{color=#cbcbcb}Game Over...{/color}{/size}" pause 1 - centered "{size=+7}{color=#cbcbcb}You made it to day [DRgame.day]!{/color}{/size}" + centered "{size=+7}{color=#cbcbcb}You made it to day [DRstates.env.day]!{/color}{/size}" pause 1 jump dark_room_game_start_menu #Jump next day call nar(">Night gathers...\nAnd a new day begins.") - $ DRgame.day += 1 + $ DRstates.env.day += 1 jump dark_room_main @@ -368,7 +368,7 @@ label DRgame_return_from_task: #renpy.say(None,"[i.name] has gotten ill.") return label DRgame_random_event: - if DRgame.day == 1: + if DRstates.env.day == 1: if DRgame.time in ["morning"]: if "intro" not in DRgame.events: $ DRgame.events.append("intro") @@ -393,10 +393,10 @@ label DRgame_random_event: "You need to take action... Fast..." $ DRgame.characters.append(DRplayer) - if DRgame.day in [3,5]: + if DRstates.env.day in [3,5]: if DRgame.time in ["noon"]: if "stranger_intro" not in DRgame.events: - if DRgame.day == 3: + if DRstates.env.day == 3: call play_sound("knocking") pause.2 call gen_chibi("hide") @@ -426,7 +426,7 @@ label DRgame_random_event: "The stranger reluctantly leaves." $ DRgame.time = "afternoon" return - elif DRgame.day == 5: + elif DRstates.env.day == 5: call play_sound("knocking") pause.2 call gen_chibi("hide") @@ -477,7 +477,7 @@ label DRgame_random_event: #Night if DRgame.time in ["night"]: - if DRgame.day == 6 and "stranger_intro" not in DRgame.events: + if DRstates.env.day == 6 and "stranger_intro" not in DRgame.events: call play_music("night_outside") show screen blkfade with d5 @@ -902,7 +902,7 @@ label dark_room_stranger: label dark_room_desk: menu: "Resources" - "Day [DRgame.day]": + "Day [DRstates.env.day]": pass "-[DRgame.wood] pieces of firewood-": "Gather some more when the weather allows it." diff --git a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy index f1878308..517277df 100644 --- a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy +++ b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy @@ -13,7 +13,7 @@ label an_odd_circumstance: stop weather $ states.env.daytime = False $ game.weather = "clear" - $ game.day = 69 + $ states.env.day = 69 $ states.env.gold = 420 $ hermione.equip(her_outfit_default) call room("main_room") diff --git a/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy b/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy index bb10865c..802d809d 100644 --- a/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy +++ b/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy @@ -5,7 +5,7 @@ label prev_at_hogwarts: $ hermione.equip(her_outfit_default) $ states.env.daytime = True $ game.weather = "clear" - $ game.day = 1 + $ states.env.day = 1 $ states.env.gold = 0 $ desk_OBJ.idle = "desk_dumbledore" stop weather diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy index 604efc0a..075c4ed7 100644 --- a/game/scripts/rooms/main_room/init.rpy +++ b/game/scripts/rooms/main_room/init.rpy @@ -89,7 +89,7 @@ screen main_room(): default objects = sorted(main_room.objects, key=lambda x: x.zorder) # Hotkeys - if room_menu_active and game.day > 1 and not renpy.android: + if room_menu_active and states.env.day > 1 and not renpy.android: use hotkeys_main add "weather [game.weather]" xycenter (430, 218) diff --git a/game/scripts/rooms/main_room/objects/cupboard.rpy b/game/scripts/rooms/main_room/objects/cupboard.rpy index 282fccf0..dc62f5c1 100644 --- a/game/scripts/rooms/main_room/objects/cupboard.rpy +++ b/game/scripts/rooms/main_room/objects/cupboard.rpy @@ -21,7 +21,7 @@ label cupboard: $ random_percent = renpy.random.randint(1, 100) # Dueling potion - if game.day <= 3 and states.cupboard_rummaged_times in [1,2]: + if states.env.day <= 3 and states.cupboard_rummaged_times in [1,2]: $ states.healing_potions += 1 call give_reward("You found some sort of healing potion...","interface/icons/item_potion.webp") $ cupboard_OBJ.idle = "cupboard_idle" @@ -29,7 +29,7 @@ label cupboard: jump main_room_menu # Dumbledore card - if game.day >= 26 and states.cardgame.unlocked and random_percent <= 40 and not card_exist(unlocked_cards,card_dumbledore) : + if states.env.day >= 26 and states.cardgame.unlocked and random_percent <= 40 and not card_exist(unlocked_cards,card_dumbledore) : call give_reward("You have found a special card!", "images/cardgame/t1/special/dumbledore_v1.webp") $ unlocked_cards += [card_dumbledore] $ cupboard_OBJ.idle = "cupboard_idle" @@ -104,8 +104,8 @@ init python: def drop_item_from_cupboard(random_percent): drop_list = [item for item in inventory.get_instances_of_type("gift") if item.unlocked] - dr = max(states.cupboard_rummaged_times - game.day, 0) * 2 # Frequent rummaging penalty - progress_factor = math.log(states.her.tier + states.cho.tier + states.ton.tier + states.lun.tier + game.day) + dr = max(states.cupboard_rummaged_times - states.env.day, 0) * 2 # Frequent rummaging penalty + progress_factor = math.log(states.her.tier + states.cho.tier + states.ton.tier + states.lun.tier + states.env.day) if firewhisky_ITEM.unlocked and firewhisky_ITEM.owned < 1: return firewhisky_ITEM @@ -115,7 +115,7 @@ init python: if states.env.difficulty == 1: # Easy # Soft diminishing returns, more rubber banding. Guaranteed item drop. - if states.env.gold < int(170 * math.log(game.day)) and random_percent <= 56 - dr: + if states.env.gold < int(170 * math.log(states.env.day)) and random_percent <= 56 - dr: return int(progress_factor * random_gold) else: filtered_list = [x for x in drop_list if x.owned <= 5] @@ -125,13 +125,13 @@ init python: elif states.env.difficulty == 2: # Normal # Fair diminishing returns, soft rubber banding. High chance for item drop. (Recommended) - if states.env.gold < int(120 * math.log(game.day)) and random_percent <= 38 - dr: + if states.env.gold < int(120 * math.log(states.env.day)) and random_percent <= 38 - dr: return int(progress_factor * random_gold) else: filtered_list = [x for x in drop_list if x.owned <= 3] random_item = renpy.random.choice(filtered_list or drop_list) - if int(120 * math.log(game.day)) / 3 < random_item.price: + if int(120 * math.log(states.env.day)) / 3 < random_item.price: chance = max(6 - (random_item.owned * 5), 1) elif states.env.gold > random_item.price: chance = max(65 - (random_item.owned * 15), 5) @@ -146,12 +146,12 @@ init python: elif states.env.difficulty == 3: # Hard # Harsh diminishing returns, no rubber banding. Chance for item drop. - if states.env.gold < int(90 * math.log(game.day)) and random_percent <= 33 - dr: + if states.env.gold < int(90 * math.log(states.env.day)) and random_percent <= 33 - dr: return int(progress_factor * random_gold) else: random_item = renpy.random.choice(drop_list) - if int(90 * math.log(game.day)) / 3 < random_item.price: + if int(90 * math.log(states.env.day)) / 3 < random_item.price: chance = max(3 - (random_item.owned * 5), 1) elif states.env.gold > random_item.price: chance = max(40 - (random_item.owned * 15), 0) diff --git a/game/scripts/rooms/main_room/objects/desk.rpy b/game/scripts/rooms/main_room/objects/desk.rpy index 49f7ffaf..b159a1a8 100644 --- a/game/scripts/rooms/main_room/objects/desk.rpy +++ b/game/scripts/rooms/main_room/objects/desk.rpy @@ -1,6 +1,6 @@ label desk: - if game.day == 1: + if states.env.day == 1: if not states.gen.ev.intro.desk_examined: $ states.gen.ev.intro.desk_examined = True $ desk_OBJ.idle = "ch_gen sit_behind_desk" @@ -315,10 +315,10 @@ label paperwork: call paperwork_progress_chapter - if not states.env.daytime and (game.day % 7 == 0): + if not states.env.daytime and (states.env.day % 7 == 0): call paperwork_progress_chapter("The Full moon makes you feel vastly more productive.\n", bonus=2) - if not states.env.daytime and (game.day % 7 == 3): + if not states.env.daytime and (states.env.day % 7 == 3): call paperwork_progress_chapter("The half moon makes you feel more productive.\n") call gen_chibi("sit_behind_desk") diff --git a/game/scripts/rooms/main_room/objects/fireplace.rpy b/game/scripts/rooms/main_room/objects/fireplace.rpy index d2bf594c..c37f6bbf 100644 --- a/game/scripts/rooms/main_room/objects/fireplace.rpy +++ b/game/scripts/rooms/main_room/objects/fireplace.rpy @@ -55,4 +55,4 @@ label examine_fireplace: init python: def is_puzzle_box_in_fireplace(): - return game.day >= 25 and not states.env.daytime and game.moon and not puzzle_box_ITEM.unlocked and not states.map.seventh_floor.unlocked + return states.env.day >= 25 and not states.env.daytime and game.moon and not puzzle_box_ITEM.unlocked and not states.map.seventh_floor.unlocked diff --git a/game/scripts/rooms/main_room/objects/phoenix.rpy b/game/scripts/rooms/main_room/objects/phoenix.rpy index 25b0dece..c37a04da 100644 --- a/game/scripts/rooms/main_room/objects/phoenix.rpy +++ b/game/scripts/rooms/main_room/objects/phoenix.rpy @@ -103,7 +103,7 @@ label phoenix_pet: gen "I can't believe I'm still doing this." ("base", xpos="far_left", ypos="head") faw "AHHHH AFTER TEN THOUSAND YEARS I'M FREE!" gen "BY THE GREAT DESERT SANDS, IT FINALLY WORKED!" ("grin", xpos="far_left", ypos="head") - gen "But wait, I've only been doing this for {number=game.day}..." ("base", xpos="far_left", ypos="head") + gen "But wait, I've only been doing this for {number=states.env.day}..." ("base", xpos="far_left", ypos="head") faw "Oh, really? Well, I still have time for a nap then." gen "WAIT A FUCKING—" ("angry", xpos="far_left", ypos="head") diff --git a/game/scripts/utility/periodic_functions.rpy b/game/scripts/utility/periodic_functions.rpy index bb12f08d..f155c559 100644 --- a/game/scripts/utility/periodic_functions.rpy +++ b/game/scripts/utility/periodic_functions.rpy @@ -9,7 +9,7 @@ init python: if not achievements.status('drunkard') and wine_ITEM.owned >= 25: achievements.unlock("drunkard") - if not achievements.status('peta') and (game.day-states.bird_fed_times) >= 50: + if not achievements.status('peta') and (states.env.day-states.bird_fed_times) >= 50: achievements.unlock("peta") if not achievements.status('petpal') and states.bird_petted_times >= 25: diff --git a/game/scripts/utility/saves.rpy b/game/scripts/utility/saves.rpy index 3ef1919a..f35996e8 100644 --- a/game/scripts/utility/saves.rpy +++ b/game/scripts/utility/saves.rpy @@ -1,6 +1,6 @@ init python: def FileJsonSave(d): - d["day"] = game.day + d["day"] = states.env.day d["playtime"] = renpy.get_game_runtime() d["version"] = version_float()