From 7f652cf338d0e355985566769b56f1eb6dbf6178 Mon Sep 17 00:00:00 2001 From: Keate Senior Date: Thu, 23 Jul 2020 06:38:47 -0400 Subject: [PATCH] updates the UI so it works with TGUI3 --- .../clockcult/clock_items/clockwork_slab.dm | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index 9e35a42a4e..42a75af9d6 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -243,7 +243,7 @@ var/datum/clockwork_scripture/S = GLOB.all_scripture[s] if(S.tier == SCRIPTURE_PERIPHERAL) //yes, tiers are the tabs. continue - + var/list/data = list() data["name"] = S.name data["descname"] = S.descname @@ -254,13 +254,13 @@ data["quickbind"] = S.quickbind //this is if it cant quickbind data["fontcolor"] = get_component_color_bright(S.primary_component) data["important"] = S.important //italic! - + var/found = quickbound.Find(S.type) if(found) data["bound"] = found //number (pos) on where is it on the list if(S.invokers_required > 1) data["invokers"] = "Invokers: [S.invokers_required]" - + .["rec_binds"] = list() for(var/i in 1 to maximum_quickbound) if(GLOB.ratvar_awakens) @@ -269,35 +269,34 @@ .["rec_binds"] += list(list()) else var/datum/clockwork_scripture/quickbind_slot = quickbound[i] - dat += "A Quickbind slot, currently set to [initial(quickbind_slot.name)].
" - .["power"] = "[DisplayPower(get_clockwork_power())] power is available for scripture and other consumers." + .["rec_binds"] += list(list( + "name" = initial(quickbind_slot.name), + "color" = get_component_color_bright(initial(quickbind_slot.primary_component)) + )) - switch(selected_scripture) //display info based on selected scripture tier - if(SCRIPTURE_DRIVER) - .["tier_info"] = "These scriptures are permanently unlocked." - if(SCRIPTURE_SCRIPT) - if(SSticker.scripture_states[SCRIPTURE_SCRIPT]) - .["tier_info"] = "These scriptures are permanently unlocked." - else - .["tier_info"] = "These scriptures will automatically unlock when the Ark is halfway ready or if [DisplayPower(SCRIPT_UNLOCK_THRESHOLD)] of power is reached." - if(SCRIPTURE_APPLICATION) - if(SSticker.scripture_states[SCRIPTURE_APPLICATION]) - .["tier_info"] = "These scriptures are permanently unlocked." - else - .["tier_info"] = "Unlock these optional scriptures by converting another servant or if [DisplayPower(APPLICATION_UNLOCK_THRESHOLD)] of power is reached.." - if(SCRIPTURE_JUDGEMENT) - if(SSticker.scripture_states[SCRIPTURE_JUDGEMENT]) - .["tier_info"] = "These scriptures are permanently unlocked." - else - .["tier_info"] = "Unlock creation of powerful equipment and structures by gaining five members of the cult.." + .["scripture"][S.tier] += list(data) +/obj/item/clockwork/slab/ui_static_data(mob/user) + . = list() + .["tier_infos"] = list() + .["tier_infos"][SCRIPTURE_DRIVER] = list( + "requirement" = "None, this is already unlocked", + "ready" = TRUE //to bold it on JS side, and to say "These scriptures are permanently unlocked." + ) + .["tier_infos"][SCRIPTURE_SCRIPT] = list( + "requirement" = "These scriptures will automatically unlock when the Ark is halfway ready or if [DisplayPower(SCRIPT_UNLOCK_THRESHOLD)] of power is reached.", + "ready" = SSticker.scripture_states[SCRIPTURE_SCRIPT] //huh, on the gamemode ticker? okay... + ) + .["tier_infos"][SCRIPTURE_APPLICATION] = list( + "requirement" = "Unlock these optional scriptures by converting another servant or if [DisplayPower(APPLICATION_UNLOCK_THRESHOLD)] of power is reached..", + "ready" = SSticker.scripture_states[SCRIPTURE_APPLICATION] + ) + .["tier_infos"][SCRIPTURE_JUDGEMENT] = list( + "requirement" = "Unlock powerful equipment and structures by converting five servants or if [DisplayPower(JUDGEMENT_UNLOCK_THRESHOLD)] of power is reached..", + "ready" = SSticker.scripture_states[SCRIPTURE_JUDGEMENT] + ) - .["selected"] = selected_scripture - .["scripturecolors"] = "Scriptures in yellow are related to construction and building.
\ - Scriptures in red are related to attacking and offense.
\ - Scriptures in blue are related to healing and defense.
\ - Scriptures in purple are niche but still important!
\ - Scriptures with italicized names are important to success." + // .["selected"] = selected_scripture generate_all_scripture() .["recollection_categories"] = GLOB.ratvar_awakens ? list() : list( list("name" = "Getting Started", "desc" = "First-time servant? Read this first."), @@ -368,4 +367,4 @@ Q.button_icon_state = quickbind_slot.name Q.UpdateButtonIcon() if(isliving(loc)) - Q.Grant(loc) + Q.Grant(loc) \ No newline at end of file