[MIRROR] Many bug fixes, QoL, and PDA notes port (now with sensible diffs) (#7588)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: Nadyr <forlirnglacignis@gmail.com>
This commit is contained in:
CHOMPStation2
2024-01-19 07:26:26 -07:00
committed by GitHub
parent 0143054b6e
commit a4280d14e1
24 changed files with 520 additions and 88 deletions

View File

@@ -4,9 +4,9 @@
var/atom/movable/holder = null
var/root_type = null
var/datum/lore/codex/home = null // Top-most page.
var/datum/lore/codex/current_page = null // Current page or category to display to the user.
var/list/current_page = list() // Current page or category to display to the user. // converted to list to track multiple players.
var/list/indexed_pages = list() // Assoc list with search terms pointing to a ref of the page. It's created on New().
var/list/history = list() // List of pages we previously visited.
var/list/history = list() // List of pages we previously visited. // now a 2D list
/datum/codex_tree/New(var/new_holder, var/new_root_type)
holder = new_holder
@@ -16,25 +16,31 @@
/datum/codex_tree/proc/generate_pages()
home = new root_type(src) // This will also generate the others.
current_page = home
indexed_pages = current_page.index_page()
//current_page = home
indexed_pages = home.index_page() // changed from current_page to home.
// Changes current_page to its parent, assuming one exists.
/datum/codex_tree/proc/go_to_parent()
if(current_page && current_page.parent)
current_page = current_page.parent
/datum/codex_tree/proc/go_to_parent(var/mob/user)
var/datum/lore/codex/D = current_page["[user]"]
if(istype(D) && D.parent)
current_page["[user]"] = D.parent
// Changes current_page to a specific page or category.
/datum/codex_tree/proc/go_to_page(var/datum/lore/codex/new_page, var/dont_record_history = FALSE)
if(new_page) // Make sure we're not going to a null page for whatever reason.
current_page = new_page
/datum/codex_tree/proc/go_to_page(var/datum/lore/codex/new_page, var/dont_record_history = FALSE, var/mob/user)
var/datum/lore/codex/D = current_page["[user]"]
if(new_page && istype(D)) // Make sure we're not going to a null page for whatever reason.
current_page["[user]"] = new_page
if(!dont_record_history)
history.Add(new_page)
var/list/H = history["[user]"]
if(!H)
H = list()
H.Add(new_page)
history["[user]"] = H
/datum/codex_tree/proc/quick_link(var/search_word)
/datum/codex_tree/proc/quick_link(var/search_word, var/mob/user)
for(var/word in indexed_pages)
if(lowertext(search_word) == lowertext(word)) // Exact matches unfortunately limit our ability to perform SEOs.
go_to_page(indexed_pages[word])
go_to_page(indexed_pages[word], FALSE, user)
return
/datum/codex_tree/proc/get_page_from_type(var/desired_type)
@@ -45,16 +51,26 @@
return null
// Returns to the last visited page, based on the history list.
/datum/codex_tree/proc/go_back()
if((history.len - 1) > 0)
if(history[history.len] == current_page)
history.len-- // This gets rid of the current page in the history.
go_to_page(pop(history), dont_record_history = TRUE) // Where as this will get us the previous page that we want to go to.
/datum/codex_tree/proc/go_back(var/mob/user)
var/list/H = history["[user]"]
var/datum/lore/codex/D = current_page["[user]"]
if(!LAZYLEN(H) || !istype(D))
return
if((H.len) > 1)
if(H[H.len] == D)
H.len-- // This gets rid of the current page in the history.
history["[user]"] = H
if(H.len == 1)
go_to_page(H[H.len], TRUE, user)
return
go_to_page(pop(history["[user]"]), TRUE, user) // Where as this will get us the previous page that we want to go to.
else
go_to_page(H[H.len], TRUE, user)
/datum/codex_tree/proc/get_tree_position()
if(current_page)
/datum/codex_tree/proc/get_tree_position(var/mob/user)
var/datum/lore/codex/checked = current_page["[user]"]
if(istype(checked))
var/output = ""
var/datum/lore/codex/checked = current_page
output = "<b>[checked.name]</b>"
while(checked.parent)
output = "<a href='?src=\ref[src];target=\ref[checked.parent]'>[checked.parent.name]</a> \> [output]"
@@ -75,38 +91,53 @@
/datum/codex_tree/proc/display(mob/user)
// icon_state = "[initial(icon_state)]-open"
if(!current_page)
if(!home)
generate_pages()
if(!user)
return
var/datum/lore/codex/D = current_page["[user]"]
if(!istype(D)) // Initialize current_page and history
current_page["[user]"] = home
D = current_page["[user]"]
if(!istype(D))
log_debug("Codex_tree failed to failed to load for [user].")
return
var/list/H_init = list()
H_init.Add(home)
history["[user]"] = H_init
//if(!current_page)
//generate_pages()
user << browse_rsc('html/browser/codex.css', "codex.css")
var/dat
dat = "<head>"
dat += "<title>[holder.name] ([current_page.name])</title>"
dat += "<title>[holder.name] ([D.name])</title>"
dat += "<link rel='stylesheet' href='codex.css' />"
dat += "</head>"
dat += "<body>"
dat += "[get_tree_position()]<br>"
dat += "[get_tree_position(user)]<br>"
dat += "[make_search_bar()]<br>"
dat += "<center>"
dat += "<h2>[current_page.name]</h2>"
dat += "<h2>[D.name]</h2>"
dat += "<br>"
if(current_page.data)
dat += "[current_page.data]<br>"
if(D.data)
dat += "[D.data]<br>"
dat += "<br>"
if(istype(current_page, /datum/lore/codex/category))
if(istype(D, /datum/lore/codex/category))
dat += "<div class='button-group'>"
var/datum/lore/codex/category/C = current_page
var/datum/lore/codex/category/C = D
for(var/datum/lore/codex/child in C.children)
dat += "<a href='?src=\ref[src];target=\ref[child]' class='button'>[child.name]</a>"
dat += "</div>"
dat += "<hr>"
if(history.len - 1)
var/list/H = history["[user]"]
if(LAZYLEN(H))
dat += "<br><a href='?src=\ref[src];go_back=1'>\[Go Back\]</a>"
if(current_page.parent)
if(D.parent)
dat += "<br><a href='?src=\ref[src];go_to_parent=1'>\[Go Up\]</a>"
if(current_page != home)
if(D != home)
dat += "<br><a href='?src=\ref[src];go_to_home=1'>\[Go To Home\]</a>"
dat += "</center></body>"
user << browse(dat, "window=the_empress_protects;size=600x550")
@@ -120,21 +151,21 @@
if(href_list["target"]) // Direct link, using a ref
var/datum/lore/codex/new_page = locate(href_list["target"])
go_to_page(new_page)
go_to_page(new_page, FALSE, usr)
else if(href_list["search_query"])
quick_link(href_list["search_query"])
quick_link(href_list["search_query"], usr)
else if(href_list["go_to_parent"])
go_to_parent()
go_to_parent(usr)
else if(href_list["go_back"])
go_back()
go_back(usr)
else if(href_list["go_to_home"])
go_to_page(home)
go_to_page(home, FALSE, usr)
else if(href_list["quick_link"]) // Indirect link, using a (hopefully) indexed word.
quick_link(href_list["quick_link"])
quick_link(href_list["quick_link"], usr)
else if(href_list["close"])
// Close the book, if our holder is actually a book.
if(istype(holder, /obj/item/weapon/book/codex))
holder.icon_state = initial(holder.icon_state)
//if(istype(holder, /obj/item/weapon/book/codex))
//holder.icon_state = initial(holder.icon_state)
usr << browse(null, "window=the_empress_protects")
return
display(usr)
display(usr)