Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion umalauncher/carrotjuicer.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def __init__(self, threader):
self.start_time = 0

self.skill_id_dict = mdb.get_skill_id_dict()
self.status_name_dict = mdb.get_status_name_dict()

self.screen_state_handler = threader.screenstate
self.restart_time()
Expand Down Expand Up @@ -497,6 +498,17 @@ def handle_response(self, message, is_json=False):
event_element
)

# Check to see if you already have the status.
status_ids = data['chara_info']['chara_effect_id_array']
if status_ids:
self.browser.execute_script("""
arguments[0].parentElement.querySelectorAll('div[data-tippy-root] span[class^="utils_linkcolor"]')
.forEach(el => {
if (arguments[1].includes(el.textContent.trim())) {
el.style.color = 'gray';
}
});
""", event_element, [self.status_name_dict[i] for i in status_ids if i in self.status_name_dict])

if 'reserved_race_array' in data and 'chara_info' not in data and self.last_helper_data:
# User changed reserved races
Expand Down Expand Up @@ -997,7 +1009,6 @@ def setup_helper_page(browser: horsium.BrowserWindow):
window.UL_DATA.expanded = true;

var height = window.UL_OVERLAY.offsetHeight;
console.log(height)
window.OVERLAY_HEIGHT = height + "px";

document.getElementById("ul-dropdown").textContent = "⯅";
Expand Down