From b5828b67f57bb650a7ae9f3a6bec6be581b57517 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sat, 13 May 2023 16:08:35 +0100 Subject: [PATCH] Pre-release * Version bump * Added pre-release notices and warnings * Disabled some of the new Cho content until it gets properly finished --- game/interface/warning.webp | 3 +++ game/scripts/characters/cho/summon.rpy | 6 +++--- .../hermione/events/shaming/panty_thief.rpy | 2 +- game/scripts/gui/main_menu.rpy | 19 ++++++++++++++----- game/scripts/options.rpy | 7 ++++--- game/scripts/script.rpy | 6 ++++++ game/scripts/utility/updater.rpy | 2 +- 7 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 game/interface/warning.webp diff --git a/game/interface/warning.webp b/game/interface/warning.webp new file mode 100644 index 00000000..042c4903 --- /dev/null +++ b/game/interface/warning.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3149df3304349b5bb88e548cac4f65eeee29ba5b2e8af6d53bc461fe5ef3c28 +size 6706 diff --git a/game/scripts/characters/cho/summon.rpy b/game/scripts/characters/cho/summon.rpy index 86d59f34..ec5082e2 100644 --- a/game/scripts/characters/cho/summon.rpy +++ b/game/scripts/characters/cho/summon.rpy @@ -23,9 +23,9 @@ label summon_cho: # Gryffindor Quidditch Intro. elif states.cho.tier == 3 and not states.cho.ev.quidditch.e10_complete: jump cho_quid_E10 - # Quidditch Outro - elif states.cho.tier == 4 and not states.cho.ev.quidditch.e14_complete: - jump cho_quid_E14 + # Quidditch Outro (Not yet finished, need a few more days) + # elif states.cho.tier == 4 and not states.cho.ev.quidditch.e14_complete: + # jump cho_quid_E14 # Clothes Events call cho_summon_setup diff --git a/game/scripts/characters/hermione/events/shaming/panty_thief.rpy b/game/scripts/characters/hermione/events/shaming/panty_thief.rpy index ecd1819c..ebc2f7db 100644 --- a/game/scripts/characters/hermione/events/shaming/panty_thief.rpy +++ b/game/scripts/characters/hermione/events/shaming/panty_thief.rpy @@ -463,7 +463,7 @@ label hg_ps_get_panties_complete: gen "Did it not feel strange, walking around without any panties all day?" ("base", xpos="far_left", ypos="head") her "*Hmm*... No, not really..." ("base", "closed", "base", "mid") gen "In that case, I assume you wouldn't mind if I kept them?" ("base", xpos="far_left", ypos="head") - her @ cheeks blush "I didn't say that..." ("base", "base", "base", "R" ) + her @ cheeks blush "I didn't say that..." ("base", "base", "base", "R") gen "Oh well..." ("base", xpos="far_left", ypos="head") if states.her.ev.panty_thief.soaked: jump hg_cum_on_panties_response diff --git a/game/scripts/gui/main_menu.rpy b/game/scripts/gui/main_menu.rpy index 2f1480cd..48459ef6 100644 --- a/game/scripts/gui/main_menu.rpy +++ b/game/scripts/gui/main_menu.rpy @@ -31,6 +31,10 @@ screen main_menu(): add "game_title" zoom 0.75 xalign 0.5 + if prerelease: + text "TEST-ONLY" at transform: + rotate 45 + vbox: spacing gui.navigation_spacing * 2 yoffset -gui.navigation_padding @@ -60,12 +64,17 @@ screen main_menu(): fixed: xysize (300, 30) - text "[config.version]": - style "main_menu_version" - xoffset -320 - gui.navigation_padding + vbox: + xoffset -100 - gui.navigation_padding yalign 0.5 at transform: alpha 0.6 + if prerelease: + text "Pre-release": + style "main_menu_version" + + text "[config.version]": + style "main_menu_version" imagebutton: idle Transform("silverstudiogames_idle", alpha=0.5, zoom=0.5) @@ -247,9 +256,9 @@ screen navigation(title=None): if not renpy.mobile: if UPDATE_VER: - textbutton "Install updates" action InstallUpdates() style_prefix "update_available" + textbutton "Install updates" action InstallUpdates() style_prefix "update_available" sensitive (not prerelease) else: - textbutton "Check for updates" action CheckUpdates(300) + textbutton "Check for updates" action CheckUpdates(300) sensitive (not prerelease) if show_quick_start: textbutton _("Quick Start") action Start("start_quick") sensitive is_sensitive diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy index ab8cdae8..134206c9 100644 --- a/game/scripts/options.rpy +++ b/game/scripts/options.rpy @@ -35,12 +35,13 @@ define config.developer = "auto" define config.console = True # Game version and naming -define config.version = "1.44.4" -define compatible_version = 1.43 +define config.version = "1.45.0" +define compatible_version = 1.45 define config.name = "Witch Trainer Silver" +define prerelease = True# if not config.developer else False # Application window settings -define config.window_title = f"{config.name} (v{config.version}) ({get_renderer()}) ({renpy.bits}-bit)" +define config.window_title = f"{config.name} (v{config.version}{' PRE-RELEASE' if prerelease else ''}) ({get_renderer()}) ({renpy.bits}-bit)" define config.window_icon = "gui/icon.webp" define config.screen_width = 1080 define config.screen_height = 600 diff --git a/game/scripts/script.rpy b/game/scripts/script.rpy index 0954b2ef..8957c0e7 100644 --- a/game/scripts/script.rpy +++ b/game/scripts/script.rpy @@ -4,6 +4,9 @@ label start: version = version_float() renpy.block_rollback() + if prerelease: + call modal_popup("Attention!", "This pre-release version of the game comes with some quirks and instability. Brace yourself for potential bugs, unexpected crashes, missing content, and oddities in gameplay. While we’ve done our best to iron out issues, be prepared for a less-than-smooth experience. \n\nHelp us improve by reporting any problems you encounter via Discord.\n\nProceed only if you acknowledge the above.", "interface/warning.webp") + jump start_wt label start_quick: @@ -17,6 +20,9 @@ label start_quick: renpy.block_rollback() + if prerelease: + call modal_popup("Attention!", "This pre-release version of the game comes with some quirks and instability. Brace yourself for potential bugs, unexpected crashes, missing content, and oddities in gameplay. While we’ve done our best to iron out issues, be prepared for a less-than-smooth experience. \n\nHelp us improve by reporting any problems you encounter via Discord.\n\nProceed only if you acknowledge the above.", "interface/warning.webp") + jump skip_to_hermione label start_dev: diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy index 5935f370..4948a6f1 100644 --- a/game/scripts/utility/updater.rpy +++ b/game/scripts/utility/updater.rpy @@ -291,6 +291,6 @@ style update_available_button_text: label before_main_menu(): python: - if settings.get("updates"): + if settings.get("updates") and not prerelease: CheckUpdates(onetime=True, autostart=False)() return