diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_empty_gryffindor.png b/game/gui/creamy_pumpkin_pie/banners/banners_empty_gryffindor.png new file mode 100644 index 00000000..bbebab0c --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_empty_gryffindor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29bcdeaaef95856ccf9c08d14b38f13b4478ea5151f22a54f505aedd49ce9e32 +size 201462 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_empty_hufflepuff.png b/game/gui/creamy_pumpkin_pie/banners/banners_empty_hufflepuff.png new file mode 100644 index 00000000..6acd032a --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_empty_hufflepuff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23574d3f601f4bc92569e85b8208a7fb06f110bb0176ce4ed6cd59c9b9adb773 +size 204691 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_empty_ravenclaw.png b/game/gui/creamy_pumpkin_pie/banners/banners_empty_ravenclaw.png new file mode 100644 index 00000000..ff34f37b --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_empty_ravenclaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9848bec7f8522f3215cc14bc0e51105c068710eff47320e4d095a07e0ff1727 +size 208075 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_empty_slytherin.png b/game/gui/creamy_pumpkin_pie/banners/banners_empty_slytherin.png new file mode 100644 index 00000000..d4318d87 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_empty_slytherin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5102d0c2d593f88808a3c5dc7e80d5b4a1f69e3044dfc4f7a6e28e2b6adf6afb +size 167927 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor.png b/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor.png new file mode 100644 index 00000000..50db8497 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e263d7812822a911269e9c3ab490378b3057cdfae7530d021d6bd592f0bede48 +size 358848 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor_emblem.png b/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor_emblem.png new file mode 100644 index 00000000..24756996 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_gryffindor_emblem.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d679af10ee7cea75c5ad439bd73cf9fe14ecc960c2b5b3ac75ea434b1ddba560 +size 188543 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff.png b/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff.png new file mode 100644 index 00000000..9265ce9a --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:173bee84cae4dc5ee4ea55e19e00eace06e3021eb1891ac42434b3b8ff96ba86 +size 317550 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff_emblem.png b/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff_emblem.png new file mode 100644 index 00000000..604c759f --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff_emblem.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:171214f8cc863bfc7e652a5b9c5ad811bdc0224109d9f22e85aa0d278894328f +size 143542 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_leading.png b/game/gui/creamy_pumpkin_pie/banners/banners_leading.png new file mode 100644 index 00000000..eaad7d0f --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_leading.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:034e33c6a95a99823b96a26b8a51782ce09b21fd2ee14968a9a5e87fe1bc7bf8 +size 59959 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw.png b/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw.png new file mode 100644 index 00000000..bedf5942 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f01466591b54ed094afd19f68c6afcaa9665f25929ede11d9c32c62c989edeb2 +size 387026 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw_emblem.png b/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw_emblem.png new file mode 100644 index 00000000..c93c8ab5 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw_emblem.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37cf4f8da0c699de6fbf9de5d59f982479cb366de97f74658e82e1f8545ae5f6 +size 194887 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_slytherin.png b/game/gui/creamy_pumpkin_pie/banners/banners_slytherin.png new file mode 100644 index 00000000..d660a25a --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_slytherin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:984e020f8c908fcfe46eb1ee5cb90df8b40d423a13e07753ddd4020aae299ea1 +size 256330 diff --git a/game/gui/creamy_pumpkin_pie/banners/banners_slytherin_emblem.png b/game/gui/creamy_pumpkin_pie/banners/banners_slytherin_emblem.png new file mode 100644 index 00000000..565d0a7d --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/banners/banners_slytherin_emblem.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c82212063e3b0e1a4c594e0c31b271fcafc79af65f34a53c0383c5350d4113a2 +size 109275 diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy index 92853e65..e7bae8bb 100644 --- a/game/scripts/characters/hermione/events/intro.rpy +++ b/game/scripts/characters/hermione/events/intro.rpy @@ -872,7 +872,6 @@ label hermione_intro_E4: # Gryffindor gets shafted by Snape and has 50% of Slytherin's points. $ states.env.gryffindor = int(states.env.gryffindor*0.5) - call update_ui_points # Wear default outfit. She's in shock so she didn't change. $ hermione.equip(her_outfit_default) diff --git a/game/scripts/events/DayNight.rpy b/game/scripts/events/DayNight.rpy index 18cad9f1..960eeba2 100644 --- a/game/scripts/events/DayNight.rpy +++ b/game/scripts/events/DayNight.rpy @@ -113,7 +113,6 @@ label day_start: call update_genie call room(states.room, stop_sound=False, hide_screens=False) - call update_ui_points # Equip scheduled outfits if states.lun.wardrobe_scheduling: diff --git a/game/scripts/interface/cheats.rpy b/game/scripts/interface/cheats.rpy index ff02ae13..10e1eb92 100644 --- a/game/scripts/interface/cheats.rpy +++ b/game/scripts/interface/cheats.rpy @@ -214,39 +214,22 @@ label cheats: menu .points: "-Add 200 Slytherin Points-" (icon="interface/icons/small/slyt.webp"): $ states.env.slytherin += 200 - call update_ui_points - nar "Added 200 points to Slytherin!" "-Remove 200 Slytherin Points-" (icon="interface/icons/small/slyt.webp"): $ states.env.slytherin -= 200 - call update_ui_points - nar "Removed 200 points from Slytherin!" "-Add 200 Gryffindor Points-" (icon="interface/icons/small/gryf.webp"): $ states.env.gryffindor += 200 - call update_ui_points - nar "Added 200 points to Gryffindor!" "-Remove 200 Gryffindor Points-" (icon="interface/icons/small/gryf.webp"): $ states.env.gryffindor -= 200 - call update_ui_points - nar "Removed 200 points from Gryffindor!" "-Add 200 Ravenclaw Points-" (icon="interface/icons/small/rave.webp"): $ states.env.ravenclaw += 200 - call update_ui_points - nar "Added 200 points to Ravenclaw!" "-Remove 200 Ravenclaw Points-" (icon="interface/icons/small/rave.webp"): $ states.env.ravenclaw -= 200 - call update_ui_points - nar "Removed 200 points from Ravenclaw!" "-Add 200 Hufflepuff Points-" (icon="interface/icons/small/huff.webp"): $ states.env.hufflepuff += 200 - call update_ui_points - nar "Added 200 points to Hufflepuff!" "-Remove 200 Hufflepuff Points-" (icon="interface/icons/small/huff.webp"): $ states.env.hufflepuff -= 200 - call update_ui_points - nar "Removed 200 points from Hufflepuff!" "-Reset all points-": $ states.env.slytherin = states.env.gryffindor = states.env.ravenclaw = states.env.hufflepuff = 0 - call update_ui_points nar "House points reset!" "-Back-": jump cheats diff --git a/game/scripts/interface/house_points.rpy b/game/scripts/interface/house_points.rpy index 1195419d..218791dc 100644 --- a/game/scripts/interface/house_points.rpy +++ b/game/scripts/interface/house_points.rpy @@ -1,19 +1,17 @@ -### House-Points ### - init python: def house_points_daily(): progress_factor = max(1, int(math.log(states.env.day) * 5)) # Bonuses based on Tonks and Snape friendship stat bonus_g = states.her.tier + bonus_r = states.cho.tier + states.lun.tier bonus_h = int((states.ton.level / 100.0) * (progress_factor * 0.7)) bonus_s = int((states.sna.level / 100.0) * (progress_factor * 0.7)) - bonus_r = states.cho.tier + states.lun.tier house_points = { "gryffindor": states.env.gryffindor, - "hufflepuff": states.env.hufflepuff, "ravenclaw": states.env.ravenclaw, + "hufflepuff": states.env.hufflepuff, "slytherin": states.env.slytherin } @@ -21,8 +19,8 @@ init python: factors = { "gryffindor": (bonus_g, max(house_points["hufflepuff"], house_points["ravenclaw"], house_points["slytherin"])), - "hufflepuff": (bonus_h, max(house_points["gryffindor"], house_points["ravenclaw"], house_points["slytherin"])), "ravenclaw": (bonus_r, max(house_points["gryffindor"], house_points["hufflepuff"], house_points["slytherin"])), + "hufflepuff": (bonus_h, max(house_points["gryffindor"], house_points["ravenclaw"], house_points["slytherin"])), "slytherin": (bonus_s, max(house_points["gryffindor"], house_points["hufflepuff"], house_points["ravenclaw"])) } @@ -35,3 +33,60 @@ init python: points[house] = renpy.random.randint(point // 2, point) + house_points[house] states.env.set_points(points) + + def house_points_anchors(): + yanchors = [0, 0.15, 0.3, 0.45] + + housepoints_sorted = sorted((states.env.slytherin, states.env.gryffindor, states.env.ravenclaw, states.env.hufflepuff), reverse=True) + g = housepoints_sorted.index(states.env.gryffindor) + r = housepoints_sorted.index(states.env.ravenclaw) + h = housepoints_sorted.index(states.env.hufflepuff) + s = housepoints_sorted.index(states.env.slytherin) + return [yanchors[g], yanchors[r], yanchors[h], yanchors[s]] + +screen house_points(): + layer "interface" + tag house_points + zorder 0 + + default start_yanchors = states.env.banners_yanchors # Updated externally through set_points function + default yanchors = house_points_anchors() + + hbox: + spacing 10 + xfill False + xalign 0.5 + + add "house_points_banner_small_gryffindor" at house_points_rollout(start_yanchors[0], yanchors[0]) + add "house_points_banner_small_ravenclaw" at house_points_rollout(start_yanchors[1], yanchors[1]) + add "house_points_banner_small_hufflepuff" at house_points_rollout(start_yanchors[2], yanchors[2]) + add "house_points_banner_small_slytherin" at house_points_rollout(start_yanchors[3], yanchors[3]) + + at house_points_show_hide + timer 6.4 action Hide("house_points") + +transform house_points_rollout(start_yanchor, yanchor): + subpixel True + yanchor start_yanchor + linear 1 yanchor yanchor + +transform house_points_show_hide: + on show: + alpha 0.0 + events False + easein 0.4 alpha 1.0 + + on hide: + alpha 1.0 + events False + easein 0.4 alpha 0.0 + +image house_points_banner_small_gryffindor = Image("/gui/creamy_pumpkin_pie/banners/banners_gryffindor.png", oversample=12) +image house_points_banner_small_ravenclaw = Image("/gui/creamy_pumpkin_pie/banners/banners_ravenclaw.png", oversample=12) +image house_points_banner_small_hufflepuff = Image("/gui/creamy_pumpkin_pie/banners/banners_hufflepuff.png", oversample=12) +image house_points_banner_small_slytherin = Image("/gui/creamy_pumpkin_pie/banners/banners_slytherin.png", oversample=12) + +image house_points_emblem_small_gryffindor = Image("/gui/creamy_pumpkin_pie/banners/banners_gryffindor_emblem.png", oversample=16) +image house_points_emblem_small_ravenclaw = Image("/gui/creamy_pumpkin_pie/banners/banners_ravenclaw_emblem.png", oversample=16) +image house_points_emblem_small_hufflepuff = Image("/gui/creamy_pumpkin_pie/banners/banners_hufflepuff_emblem.png", oversample=16) +image house_points_emblem_small_slytherin = Image("/gui/creamy_pumpkin_pie/banners/banners_slytherin_emblem.png", oversample=16) diff --git a/game/scripts/interface/topbar.rpy b/game/scripts/interface/topbar.rpy deleted file mode 100644 index 7cbfed8f..00000000 --- a/game/scripts/interface/topbar.rpy +++ /dev/null @@ -1,259 +0,0 @@ -init python: - def text_points(points): - if points < 1000: - return str(points) - else: - return str(round(points/1000.0, 1))+"{size=-2}k{/size}" - -label update_ui_points: - # Debug - - #If points variable value exceedes one thousand make it a decimal number instead and round to x.x - #Remember, "slytherin_points" is a string! If you need points integer use i.e. "slytherin" variable instead. - $ slytherin_points = text_points(states.env.slytherin) - $ gryffindor_points = text_points(states.env.gryffindor) - $ ravenclaw_points = text_points(states.env.ravenclaw) - $ hufflepuff_points = text_points(states.env.hufflepuff) - - #Check who's in the lead - $ housepoints_sorted = sorted((states.env.slytherin, states.env.gryffindor, states.env.ravenclaw, states.env.hufflepuff), reverse=True) - - $ slytherin_place = housepoints_sorted.index(states.env.slytherin)+1 - $ gryffindor_place = housepoints_sorted.index(states.env.gryffindor)+1 - $ ravenclaw_place = housepoints_sorted.index(states.env.ravenclaw)+1 - $ hufflepuff_place = housepoints_sorted.index(states.env.hufflepuff)+1 - - # Set banners yanchor depending on the placement (ascending) - $ housepoints_y = [None, 0.0, 0.25, 0.5, 0.75] - - return - -screen ui_top_bar(): - tag ui - zorder 2 - - default toggle_menu = False - - if toggle_menu: - use ui_menu - - add gui.format("interface/topbar/{}/bar.webp") zoom 0.5 - use ui_stats - use ui_points - - # Don't display buttons in certain rooms or on the first day - if states.room == "main_room" and states.env.day > 1: - # Menu button - imagebutton: - xpos 0 - idle gui.format("interface/topbar/buttons/{}/ui_menu.webp") - if room_menu_active: - hover image_hover(gui.format("interface/topbar/buttons/{}/ui_menu.webp")) - if toggle_menu: - tooltip _("Close menu") - else: - tooltip _("Open menu") - action ToggleScreenVariable("toggle_menu", True, False) - - # Sleep button - imagebutton: - xpos 1080 - xanchor 1.0 - idle gui.format("interface/topbar/buttons/{}/ui_sleep.webp") - if room_menu_active: - hover image_hover(gui.format("interface/topbar/buttons/{}/ui_sleep.webp")) - if states.env.daytime: - action Jump("night_start") - tooltip _("Doze Off (s)") - else: - action Jump("day_start") - tooltip _("Sleep (s)") - - hbox: - if renpy.android: - spacing 10 - xpos 800 - else: - xpos 900 - - # Achievements button - imagebutton: - idle gui.format("interface/topbar/buttons/{}/ui_achievements.webp") - if room_menu_active: - hover image_hover(gui.format("interface/topbar/buttons/{}/ui_achievements.webp")) - tooltip _("Achievements") - action Jump("achievement") - - # Stats button - imagebutton: - idle gui.format("interface/topbar/buttons/{}/ui_stats.webp") - if room_menu_active: - hover image_hover(gui.format("interface/topbar/buttons/{}/ui_stats.webp")) - tooltip _("Characters (c)") - action Jump("stats") - - # Inventory button - imagebutton: - idle gui.format("interface/topbar/buttons/{}/ui_inv.webp") - if room_menu_active: - hover image_hover(gui.format("interface/topbar/buttons/{}/ui_inv.webp")) - tooltip _("Inventory (i)") - action Jump("inventory") - - # Work button - if states.paperwork_unlocked: - imagebutton: - idle gui.format("interface/topbar/buttons/{}/ui_work.webp") - if room_menu_active: - hover image_hover(gui.format("interface/topbar/buttons/{}/ui_work.webp")) - tooltip _("Work (w)") - action Jump("paperwork") - -screen ui_points(): - tag ui - - default toggle_points = False - - fixed: - xalign 0.5 - xsize 162 - ysize 64 - - if not persistent.toggle_points and not toggle_points: - add "interface/topbar/slytherin.webp" yanchor housepoints_y[slytherin_place] - add "interface/topbar/gryffindor.webp" yanchor housepoints_y[gryffindor_place] - add "interface/topbar/ravenclaw.webp" yanchor housepoints_y[ravenclaw_place] - add "interface/topbar/hufflepuff.webp" yanchor housepoints_y[hufflepuff_place] - else: - # Add empty banners - add "interface/topbar/slytherin_empty.webp" yanchor 0 - add "interface/topbar/gryffindor_empty.webp" yanchor 0 - add "interface/topbar/ravenclaw_empty.webp" yanchor 0 - add "interface/topbar/hufflepuff_empty.webp" yanchor 0 - # Show points - text "{size=-5}[slytherin_points]{/size}" xpos 17 style "housepoints" - text "{size=-5}[gryffindor_points]{/size}" xpos 58 style "housepoints" - text "{size=-5}[ravenclaw_points]{/size}" xpos 98 style "housepoints" - text "{size=-5}[hufflepuff_points]{/size}" xpos 139 style "housepoints" - # Show placement number - text "[slytherin_place]" xpos 17 style "houseplaces" - text "[gryffindor_place]" xpos 58 style "houseplaces" - text "[ravenclaw_place]" xpos 98 style "houseplaces" - text "[hufflepuff_place]" xpos 139 style "houseplaces" - - if room_menu_active: - imagebutton: - idle "interface/topbar/hover_zone.webp" - tooltip _("House Points\n{size=-2}Click to toggle style display{/size}") - hovered SetLocalVariable("toggle_points", True) - unhovered SetLocalVariable("toggle_points", False) - action ToggleVariable("persistent.toggle_points", True, False) - -style housepoints: - outlines [(1, "#000", 0, 0)] - color "#FFF" - xanchor .5 - ypos 30 - -style houseplaces is housepoints: - size 16 - ypos 10 - -screen ui_stats(): - tag ui - fixed: - xpos 200 - frame: - style "empty" - style_prefix gui.theme("ui_stats") - xsize 217 - ysize 26 - - add gui.format("interface/topbar/{}/stats.webp") xalign 0.5 yalign 1.0 - - hbox: - xpos 40 ypos 11 - text "{size=-4}[states.env.day]{/size}" - hbox: - xpos 140 ypos 11 - # Display tokens in token shop - text "{size=-4}[states.env.gold]{/size}" - -style light_ui_stats_text: - color "#000" - outlines [(1, "#e4ba7080", 0, 0)] - -style dark_ui_stats_text: - color "#fff" - outlines [(1, "#00000080", 0, 0)] - -screen ui_menu(): - tag ui - - button style "empty" action SetScreenVariable("toggle_menu", False) keysym "game_menu" - - button: - ypos 34 - xsize 102 - ysize 204 - action NullAction() - style "empty" - frame: - style "empty" - style_prefix gui.theme() - ypos 34 - xsize 102 - ysize 204 - - add gui.format("interface/topbar/{}/menu.webp") - - vbox: - xalign 0.5 - 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 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 states.env.day > 1 and renpy.android: - textbutton _("Preferences") action ShowMenu("preferences") background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] - 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 states.env.day > 1 and config.developer: - # textbutton "{size=-11}Show Chars{/size}" action [SetScreenVariable("toggle_menu", False), Jump("summon_characters")] background "#000" - - hbox: - pos (50, 185) - anchor (0.5, 0.5) - spacing 10 - # Discord - imagebutton: - idle Transform("interface/topbar/icon_discord.webp", alpha=0.5) - hover "interface/topbar/icon_discord.webp" - tooltip "Visit {color=#c1c1c1}SilverStudioGames{/color}\ndiscord" - action OpenURL("https://discord.gg/UbQeTCJ5RW") - yanchor 0.5 - # Patreon - imagebutton: - idle Transform("interface/topbar/icon_patreon.webp", alpha=0.5) - hover "interface/topbar/icon_patreon.webp" - tooltip "Visit {color=#c1c1c1}SilverStudioGames{/color}\npatreon" - action OpenURL("https://www.patreon.com/SilverStudioGames") - yanchor 0.5 - # Bugfixes - imagebutton: - idle Transform("interface/topbar/icon_bug.webp", alpha=0.5) - hover "interface/topbar/icon_bug.webp" - tooltip "PLACEHOLDER" - action NullAction() - yanchor 0.5 - -label scene_gallery: - menu: - "-Watch Ball Ending 1-" if persistent.ending_01: - $ renpy.call_replay("ball_ending_E2", scope={ "states.her.ev.yule_ball.variant": "personal" }) - "-Watch Ball Ending 2-" if persistent.ending_02: - $ renpy.call_replay("ball_ending_E2", scope={ "states.her.ev.yule_ball.variant": "public" }) - "-Never mind-": - pass - jump main_room_menu \ No newline at end of file diff --git a/game/scripts/minigames/dueling/snape_duel.rpy b/game/scripts/minigames/dueling/snape_duel.rpy index e4fd7549..e77d4058 100644 --- a/game/scripts/minigames/dueling/snape_duel.rpy +++ b/game/scripts/minigames/dueling/snape_duel.rpy @@ -30,7 +30,6 @@ label duel: # Hide all the screens. hide screen notes #A bunch of notes poping out with a "win" sound effect. - hide screen ui_top_bar hide screen ctc hide screen snape_defends call gen_chibi("hide") @@ -511,7 +510,6 @@ label snape_lost: $ duel_OBJ.in_progress = False hide screen hp_bar hide screen duel_damage - show screen ui_top_bar with flashbulb pause 1 $ states.sna.ev.intro.duel_complete = True diff --git a/game/scripts/rooms/labels.rpy b/game/scripts/rooms/labels.rpy index 1852f722..c40f82d7 100644 --- a/game/scripts/rooms/labels.rpy +++ b/game/scripts/rooms/labels.rpy @@ -29,10 +29,6 @@ label room(room=None, hide_screens=True, stop_sound=True): if mailbox.get_parcels(): $ parcel_OBJ.hidden = False - # User interface - call update_ui_points - show screen ui_top_bar - elif room == "weasley_store": show screen weasley_store_room diff --git a/game/scripts/shops/item/room.rpy b/game/scripts/shops/item/room.rpy index 578dd1eb..395df8f9 100644 --- a/game/scripts/shops/item/room.rpy +++ b/game/scripts/shops/item/room.rpy @@ -6,8 +6,6 @@ screen weasley_store_room(): else: add "images/rooms/weasley_store/store_night.webp" - use ui_top_bar - zorder 0 label item_store: @@ -56,7 +54,7 @@ label item_store: $ shop_profit = renpy.random.randint(50+her_help, 300) ger "Here, your weekly cut." - + call give_reward(_("{#Part one of string}You've received ")+str(int(shop_profit*states.twi.ev.cardgame.profit))+_(" gold.{#Part two of string}"), "interface/icons/gold.webp") $ states.env.gold += int(shop_profit*states.twi.ev.cardgame.profit) diff --git a/game/scripts/variables.rpy b/game/scripts/variables.rpy index 99d306ce..4e41f8c3 100644 --- a/game/scripts/variables.rpy +++ b/game/scripts/variables.rpy @@ -37,9 +37,9 @@ init python: self._day = 0 self._points = { "gryffindor": 122, - "slytherin": 35, + "ravenclaw": 31, "hufflepuff": 25, - "ravenclaw": 31 + "slytherin": 35, } self._weather = "clear" @@ -54,11 +54,6 @@ init python: "color": "#A74D2A", } }, - "slytherin": { - "properties": { - "color": "#3A734B", - } - }, "ravenclaw": { "properties": { "color": "#5974C2", @@ -68,8 +63,14 @@ init python: "properties": { "color": "#FBC60A", } - } + }, + "slytherin": { + "properties": { + "color": "#3A734B", + } + }, } + self.banners_yanchors = [0, 0, 0, 0] # Currencies @property @@ -134,6 +135,7 @@ init python: properties = {"spacing": 15, "align": (0.5, 0.1)} displayables = [] difference = {} + self.banners_yanchors = house_points_anchors() for house, value in d.items(): old_value = self._points[house] if (adjusted := value - old_value) < 0: @@ -145,6 +147,9 @@ init python: self._points[house] = value difference[house] = adjusted + renpy.hide_screen("house_points") + renpy.show_screen("house_points") + if not renpy.in_rollback() and not _in_replay: renpy.hide_screen("currency_alt") renpy.show_screen("currency_alt", displayables, properties) diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index 2f195567..28de8d0d 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -210,7 +210,6 @@ label _wardrobe: call wardrobe_menu show screen main_room - show screen ui_top_bar $ _game_menu_screen = "navigation" $ _skipping = True $ renpy.stop_predict(__predicted)