From d98c4e2bb9219a31908c921906a1d01e647ae593 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Fri, 15 Jul 2022 17:40:05 +0100 Subject: [PATCH] Cleanup * Removed redundant image files and scripts --- game/interface/panels/gold/bottom_panel.webp | 3 - .../panels/gold/bottom_panel_hover.webp | 3 - .../panels/gold/clothing_panel_full.webp | 3 - .../gold/clothing_panel_full_hover.webp | 3 - .../panels/gold/clothing_panel_main.webp | 3 - .../gold/clothing_panel_main_hover.webp | 3 - game/interface/panels/gold/icon_panel3.webp | 3 - game/interface/panels/gold/info_panel.webp | 3 - game/interface/panels/gold/items_panel.webp | 3 - .../panels/gold/items_panel_hover.webp | 3 - game/interface/panels/gray/bottom_panel.webp | 3 - .../panels/gray/bottom_panel_hover.webp | 3 - .../panels/gray/clothing_panel_full.webp | 3 - .../gray/clothing_panel_full_hover.webp | 3 - .../panels/gray/clothing_panel_main.webp | 3 - .../gray/clothing_panel_main_hover.webp | 3 - game/interface/panels/gray/icon_panel3.webp | 3 - game/interface/panels/gray/info_panel.webp | 3 - game/interface/panels/gray/items_panel.webp | 3 - .../panels/gray/items_panel_hover.webp | 3 - game/scripts/interface/menus.rpy | 242 ------------------ 21 files changed, 302 deletions(-) delete mode 100644 game/interface/panels/gold/bottom_panel.webp delete mode 100644 game/interface/panels/gold/bottom_panel_hover.webp delete mode 100644 game/interface/panels/gold/clothing_panel_full.webp delete mode 100644 game/interface/panels/gold/clothing_panel_full_hover.webp delete mode 100644 game/interface/panels/gold/clothing_panel_main.webp delete mode 100644 game/interface/panels/gold/clothing_panel_main_hover.webp delete mode 100644 game/interface/panels/gold/icon_panel3.webp delete mode 100644 game/interface/panels/gold/info_panel.webp delete mode 100644 game/interface/panels/gold/items_panel.webp delete mode 100644 game/interface/panels/gold/items_panel_hover.webp delete mode 100644 game/interface/panels/gray/bottom_panel.webp delete mode 100644 game/interface/panels/gray/bottom_panel_hover.webp delete mode 100644 game/interface/panels/gray/clothing_panel_full.webp delete mode 100644 game/interface/panels/gray/clothing_panel_full_hover.webp delete mode 100644 game/interface/panels/gray/clothing_panel_main.webp delete mode 100644 game/interface/panels/gray/clothing_panel_main_hover.webp delete mode 100644 game/interface/panels/gray/icon_panel3.webp delete mode 100644 game/interface/panels/gray/info_panel.webp delete mode 100644 game/interface/panels/gray/items_panel.webp delete mode 100644 game/interface/panels/gray/items_panel_hover.webp delete mode 100644 game/scripts/interface/menus.rpy diff --git a/game/interface/panels/gold/bottom_panel.webp b/game/interface/panels/gold/bottom_panel.webp deleted file mode 100644 index 686918a1..00000000 --- a/game/interface/panels/gold/bottom_panel.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8418d24359aafbf4faf695483aca016dc47a03d2ba03ad37b70ac5654def0e47 -size 23836 diff --git a/game/interface/panels/gold/bottom_panel_hover.webp b/game/interface/panels/gold/bottom_panel_hover.webp deleted file mode 100644 index 7a01de71..00000000 --- a/game/interface/panels/gold/bottom_panel_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea46e278f410c44a0a97f123be054c97bd07c8890ce89ccfb31e3b3805b41ba2 -size 23798 diff --git a/game/interface/panels/gold/clothing_panel_full.webp b/game/interface/panels/gold/clothing_panel_full.webp deleted file mode 100644 index bcecc02d..00000000 --- a/game/interface/panels/gold/clothing_panel_full.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2feeb11aa5be54ddf95a8071d8ea17b2f9ec8c74d828d259488f35a0d7d0363 -size 48992 diff --git a/game/interface/panels/gold/clothing_panel_full_hover.webp b/game/interface/panels/gold/clothing_panel_full_hover.webp deleted file mode 100644 index 69d02ac2..00000000 --- a/game/interface/panels/gold/clothing_panel_full_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de67bf415dea604bef8c225d3c8e5e22aa26bb66ed6ce4dd32cf2932e90bdc8c -size 48056 diff --git a/game/interface/panels/gold/clothing_panel_main.webp b/game/interface/panels/gold/clothing_panel_main.webp deleted file mode 100644 index dd9745f1..00000000 --- a/game/interface/panels/gold/clothing_panel_main.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a9cf820259d7523aec9432686f3f352e8c3e2b82de96085215d15e6f371bb83 -size 39190 diff --git a/game/interface/panels/gold/clothing_panel_main_hover.webp b/game/interface/panels/gold/clothing_panel_main_hover.webp deleted file mode 100644 index 5b130f2f..00000000 --- a/game/interface/panels/gold/clothing_panel_main_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06c8942abad6b5a002ae2afadd997ab755e1aae45ddad5e48b66268ebd50fade -size 39018 diff --git a/game/interface/panels/gold/icon_panel3.webp b/game/interface/panels/gold/icon_panel3.webp deleted file mode 100644 index 70f7d21d..00000000 --- a/game/interface/panels/gold/icon_panel3.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddce8af627ce72c0373aad7691c5ac0d15574f2fc019e3e365b2b94d84327d68 -size 38994 diff --git a/game/interface/panels/gold/info_panel.webp b/game/interface/panels/gold/info_panel.webp deleted file mode 100644 index 2a83e0f7..00000000 --- a/game/interface/panels/gold/info_panel.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3609434474b2b55cb7a29b622643053a712528782c05e8367d2e9130886a24f3 -size 7976 diff --git a/game/interface/panels/gold/items_panel.webp b/game/interface/panels/gold/items_panel.webp deleted file mode 100644 index c056b716..00000000 --- a/game/interface/panels/gold/items_panel.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ebb63b54b07fc8e718ac16ca24acab7cb06e7552c09386dc5aadb31bbf31efd -size 39558 diff --git a/game/interface/panels/gold/items_panel_hover.webp b/game/interface/panels/gold/items_panel_hover.webp deleted file mode 100644 index 2f6c3e53..00000000 --- a/game/interface/panels/gold/items_panel_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94daeeb77a0a7b861113a5a2a98b0f5532fe0e3e37534a37b07ae7d9b6ad40ae -size 39256 diff --git a/game/interface/panels/gray/bottom_panel.webp b/game/interface/panels/gray/bottom_panel.webp deleted file mode 100644 index 6ff9677c..00000000 --- a/game/interface/panels/gray/bottom_panel.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edc7ac30db803204e5cd01f5520921c5080ce68ef1122ebd68aa75b43ed17ec8 -size 24504 diff --git a/game/interface/panels/gray/bottom_panel_hover.webp b/game/interface/panels/gray/bottom_panel_hover.webp deleted file mode 100644 index 278271ef..00000000 --- a/game/interface/panels/gray/bottom_panel_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2232ffe6a53095872f4f7afa6ffac8e4c483e7169aab23cccce9cf33bc1eefa -size 24514 diff --git a/game/interface/panels/gray/clothing_panel_full.webp b/game/interface/panels/gray/clothing_panel_full.webp deleted file mode 100644 index 69bca747..00000000 --- a/game/interface/panels/gray/clothing_panel_full.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f4ae1806e986e065ade83be2b10d9f4e827ccf06836aff6b59ac863ef92fe9d -size 33842 diff --git a/game/interface/panels/gray/clothing_panel_full_hover.webp b/game/interface/panels/gray/clothing_panel_full_hover.webp deleted file mode 100644 index b50a98cb..00000000 --- a/game/interface/panels/gray/clothing_panel_full_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d156be1c16a39eb2b4a0b396b0835339e2b9c80c0dbd469ab4a5843728af4b7c -size 33900 diff --git a/game/interface/panels/gray/clothing_panel_main.webp b/game/interface/panels/gray/clothing_panel_main.webp deleted file mode 100644 index 9998e329..00000000 --- a/game/interface/panels/gray/clothing_panel_main.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06900773fc243afa1e9cc3f76d589f3fd455ab6b4d6a85863e54dd572885059c -size 30040 diff --git a/game/interface/panels/gray/clothing_panel_main_hover.webp b/game/interface/panels/gray/clothing_panel_main_hover.webp deleted file mode 100644 index a4fc1003..00000000 --- a/game/interface/panels/gray/clothing_panel_main_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:762c814e238ad8e5b7fe6f131a7e8f65ae1de705d06d5e61f0f4744fe7b71007 -size 29724 diff --git a/game/interface/panels/gray/icon_panel3.webp b/game/interface/panels/gray/icon_panel3.webp deleted file mode 100644 index 5d19df60..00000000 --- a/game/interface/panels/gray/icon_panel3.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5b9fecebdb1be3975a8a05ddd85459d381ad723223886b3c277d659a9ef55df -size 31842 diff --git a/game/interface/panels/gray/info_panel.webp b/game/interface/panels/gray/info_panel.webp deleted file mode 100644 index 0e6bd6e7..00000000 --- a/game/interface/panels/gray/info_panel.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b57ff0262fd2f4f08e3ac22bab0a103321ece6c5bdea98d437c34f6a7635851b -size 5828 diff --git a/game/interface/panels/gray/items_panel.webp b/game/interface/panels/gray/items_panel.webp deleted file mode 100644 index 0b5a4be4..00000000 --- a/game/interface/panels/gray/items_panel.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e57f2be93d13f4874d0dc3dd5d633fe703aa4dc9bb1722c6802f3cabf70be698 -size 29598 diff --git a/game/interface/panels/gray/items_panel_hover.webp b/game/interface/panels/gray/items_panel_hover.webp deleted file mode 100644 index 34870501..00000000 --- a/game/interface/panels/gray/items_panel_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45870c439c64d29754acff6ac55a5e251d3edddae24b1c0e2567a9c5b2e7320a -size 29594 diff --git a/game/scripts/interface/menus.rpy b/game/scripts/interface/menus.rpy deleted file mode 100644 index 8997682f..00000000 --- a/game/scripts/interface/menus.rpy +++ /dev/null @@ -1,242 +0,0 @@ - -# Maps title + toggle names to menu state (current page and toggles) -default menu_states = {} - -init python: - def store_menu_states(menu_id, scope): - menu_states[menu_id] = scope - -#List Menu #Customizable -screen list_menu(menu_id, title, toggle_names=tuple(), menu_groups=[]): - zorder 5 - - use close_button_background - use close_button - - # Store screen variables while hidden - default old_scope = menu_states.get(menu_id, None) - on ("hide","replaced") action Function(store_menu_states, menu_id, _scope) - - default current_page = 0 if old_scope is None else old_scope["current_page"] - default toggles = set([i for i in xrange(0,max(len(toggle_names), len(menu_groups)))]) if old_scope is None else old_scope["toggles"] - - # Menu items from enabled groups - default menu_items = [] - $ menu_items = list(itertools.chain.from_iterable([menu_groups[i] for i in sorted(toggles) if i < len(menu_groups)])) - - default items_shown = 4 - default max_page = 0 - $ max_page = max(0, (len(menu_items)-1)/items_shown) - $ current_page = min(current_page, max_page) - - # Page up - imagebutton: - xpos 825 - ypos 240 - idle gui.format("interface/general/{}/button_arrow_up.webp") - hover gui.format("interface/general/{}/button_arrow_up_hover.webp") - action SetScreenVariable("current_page", max(0, current_page-1)) - - # Page down - imagebutton: - xpos 825 - ypos 292 - idle gui.format("interface/general/{}/button_arrow_down.webp") - hover gui.format("interface/general/{}/button_arrow_down_hover.webp") - action SetScreenVariable("current_page", min(max_page, current_page+1)) - - # Main window - imagemap: - xsize 638 - ysize 544 - xalign 0.5 - yalign 0.5 - - use invisible_button() - - ground gui.format("interface/panels/{}/items_panel.webp") - hover gui.format("interface/panels/{}/items_panel_hover.webp") - - # Header - hbox: - pos (11,30) - xysize (265,45) - text title align (0.5,0.5) size 16 bold 0.2 - - # Toggles - grid 2 2: - pos (319,31) - for i in xrange(0,4): - if i < len(toggle_names): - $ toggle_names[i] - if i in toggles: - $ toggle_image = gui.theme("check_true") - else: - $ toggle_image = gui.theme("check_false") - button: - style "empty" - xysize (110,22) - left_margin 5 - clicked [ToggleSetMembership(toggles, i),SetScreenVariable("current_page", 0),Return(("toggle"+str(i), i in toggles))] - add toggle_image zoom 0.8 - text "{size=10}" + toggle_names[i] + "{/size}" xpos 22 yalign 0.5 - else: - null - - # Items - $ page_offset = current_page*items_shown - for i in xrange(page_offset, page_offset+items_shown): - if i < len(menu_items): - $ item_ypos = 85+90*(i-page_offset) - if not menu_items[i].unlockable: # Unlockables are shown but aren't clickable - hotspot (16, item_ypos, 528, 87) clicked Return(menu_items[i]) - use list_menu_item(menu_items[i], item_ypos) - -screen list_menu_item(menu_item, ypos=0): - frame: - style "empty" - xpos 16 - ypos ypos - xsize 528 - ysize 87 - - $ item_image = menu_item.get_image() - if isinstance(item_image, im.ImageBase): - $ item_image = crop_image_zoom(item_image, 83, 83) - $ image_zoom = 1.0 - else: - $ image_zoom = get_zoom(item_image, (83, 83)) - - fixed: - pos (6,2) - xysize (83, 83) - add item_image align (0.5, 0.5) zoom image_zoom - - fixed: - pos (100, 0) - xysize (420, 24) - text menu_item.get_name() size 16 yalign 1.0 - - if store_menu: # Displays item's gold value - text menu_item.get_cost() size 16 text_align 1.0 align (1.0,1.0) - - fixed: - pos (100, 32) - xysize (420, 50) - text menu_item.get_description() size 12 - - text menu_item.get_annotation() align (1.0,1.0) offset (-2,-2) - -screen bottom_menu(menu_id, group_names, menu_groups, func_btn=None): - zorder 30 - - use close_button_background - use close_button - - # Store screen variables while hidden - default old_scope = menu_states.get(menu_id, None) - on ("hide","replaced") action Function(store_menu_states, menu_id, _scope) - - default current_page = 0 if old_scope is None else old_scope["current_page"] - default current_group = 0 if old_scope is None else old_scope["current_group"] - $ current_group = min(len(menu_groups)-1, current_group) - - # Menu items from enabled groups - default menu_items = [] - $ menu_items = menu_groups[current_group] - - default items_shown = 9 - default max_page = 0 - $ max_page = max(0, (len(menu_items)-1)/items_shown) - $ current_page = min(current_page, max_page) - - # Main window - imagemap: - xpos 0 - ypos 475 - xysize (1080, 548) - - use invisible_button() - - ground gui.format("interface/panels/{}/bottom_panel.webp") - hover gui.format("interface/panels/{}/bottom_panel_hover.webp") - - # Menu name - $ title = group_names[current_group][0] - add gui.format("interface/general/{}/button_wide.webp") xpos 130 ypos 0 - text title xalign 0.5 yalign 0.5 xpos 130+70 ypos 0+18 size 12 - - # Categories - for i in xrange(0,len(menu_groups)): - $ group_icon = group_names[i][1] - imagebutton: - xpos 300+(33*i) - ypos 0 - idle gui.format("interface/topbar/buttons/{}/")+group_icon+".webp" - hover image_hover(gui.format("interface/topbar/buttons/{}/")+group_icon+".webp") - sensitive current_group != i - action [SetScreenVariable("current_group", i), SetScreenVariable("current_page", 0)] - - if func_btn: - imagebutton: - xpos 300+(33*(len(menu_groups)+1)) - ypos 0 - idle gui.format("interface/topbar/buttons/{}/")+func_btn+".webp" - hover image_hover(gui.format("interface/topbar/buttons/{}/")+func_btn+".webp") - action Return("func") - - # Items - $ page_offset = current_page*items_shown - for i in xrange(page_offset, page_offset+items_shown): - if i < len(menu_items): - $ col = i % 5 - $ row = i % 1 - hotspot ( 140+(90*(i-page_offset)), 34, 90, 90) clicked Return((current_group, menu_items[i])) - use icon_menu_item(menu_items[i], 140+(90*(i-page_offset)), 34 ) - - # Page left - imagebutton: - xpos 80 - ypos 475+50 - idle gui.format("interface/general/{}/button_arrow_left.webp") - hover gui.format("interface/general/{}/button_arrow_left_hover.webp") - sensitive current_page > 0 - action SetScreenVariable("current_page", max(0, current_page-1)) - - # Page right - imagebutton: - xpos 880+80 - ypos 475+50 - idle gui.format("interface/general/{}/button_arrow_right.webp") - hover gui.format("interface/general/{}/button_arrow_right_hover.webp") - sensitive current_page <= max_page - action SetScreenVariable("current_page", min(max_page, current_page+1)) - -screen icon_menu_item(menu_item, xpos=0, ypos=0): - frame: - background None - xpos xpos - ypos ypos - xsize 90 - ysize 90 - - $ item_image = menu_item.get_image() - if isinstance(item_image, im.ImageBase): - $ item_image = crop_image_zoom(item_image, 80, 80) - $ image_zoom = 1.0 - else: - $ image_zoom = get_zoom(item_image, (80, 80)) - - fixed: - xsize 80 - ysize 80 - if menu_item.owned > 0 or menu_item.unlocked == True: - add item_image xalign 0.5 yalign 0.5 zoom image_zoom - else: - add gray_tint(item_image) xalign 0.5 yalign 0.5 zoom image_zoom - - if menu_item.owned > 0: - text "{color=#ffffff}" +str(menu_item.owned)+ "{/color}" - - if menu_item.active: - add "interface/topbar/icon_check.webp" align (1.0, 1.0) zoom 0.5