Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Makes paper use the language system #7268

Merged
Amelia0010 merged 8 commits into from
Dec 14, 2019
Merged

Makes paper use the language system #7268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c56acde
Makes paper use the language system somewhat. Removes info_links.
Altoids1 Dec 7, 2019
b0be6c8
Makes written initialize in Initialize() in paper.dm
Altoids1 Dec 10, 2019
b2a97bb
Moves some code around and creates /proc/scramble_HTML for languages
Altoids1 Dec 10, 2019
6d1324a
Allows the prewritten text on paper to also have a language
Altoids1 Dec 10, 2019
1882f71
Forgot to push a line fuck
Altoids1 Dec 10, 2019
ac9af70
Fixes missing variable compiletime in paper.dm
Altoids1 Dec 10, 2019
f2519e2
Makes several premade papers have a language they're written in
Altoids1 Dec 10, 2019
2a3e81e
Adds language to prewritten papers defined in /yogstation/code/
Altoids1 Dec 11, 2019
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
1 change: 0 additions & 1 deletion code/game/machinery/telecomms/computers/message.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@

/obj/item/paper/monitorkey/proc/print(obj/machinery/telecomms/message_server/server)
info = "<center><h2>Daily Key Reset</h2></center><br>The new message monitor key is '[server.decryptkey]'.<br>Please keep this a secret and away from the clown.<br>If necessary, change the password to a more secure one."
info_links = info
add_overlay("paper_words")

/obj/item/paper/monitorkey/LateInitialize()
Expand Down
2 changes: 0 additions & 2 deletions code/modules/detectivework/scanner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@
P.info = text("<center><B>Forensic Record - (FR-[])</B></center><HR><BR>", frNum)
P.info += jointext(log, "<BR>")
P.info += "<HR><B>Notes:</B><BR>"
P.info_links = P.info
P.updateinfolinks()
P.update_icon()

if(ismob(loc))
Expand Down
16 changes: 16 additions & 0 deletions code/modules/language/language.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,22 @@

return scrambled_text

/datum/language/proc/scramble_HTML(intext) // Calls scramble() on HTML text, making sure to not disturb the HTML.
var/text = ""
var/regex/plaintext = regex(@"(?:<\/?[\w\s\d=\x22]+>|^)((?:[\w\s\d!@#$%^&*\(\)\-+?:\x22'}{\[\]~`|;,.\\])+)") // Finds plaintext within the HTML.
var/newtext = intext
var/startpos = 1
while(startpos < 8192 && startpos > -1)
var/f = plaintext.Find(newtext,startpos)
if(!f)
break
var/sentence = plaintext.group[1]
var/scramb = scramble(sentence) // The scrambled version of the sentence.
newtext = replacetext(newtext, sentence, scramb, f, length(sentence)+1)
startpos = plaintext.next + (length(scramb) - length(sentence))
text += newtext
return text

/datum/language/proc/get_spoken_verb(msg_end)
switch(msg_end)
if("!")
Expand Down
132 changes: 58 additions & 74 deletions code/modules/paperwork/paper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
* lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
*/

#define PAPER_FIELD "<span class=\"paper_field\"></span>"
Copy link
Member

@alexkar598 alexkar598 Dec 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this define is only used in this file, undef it at the end of the file

Copy link
Contributor Author

@Altoids1 Altoids1 Dec 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BITCH I DID

Copy link
Contributor

@ThatLing ThatLing Dec 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undef it harder


/datum/langtext // A datum to describe a piece of writing that stores a language value with it.
var/text = "" // The text that is written.
var/datum/language/lang // the language it's written in.
/datum/langtext/New(t,datum/language/l)
text = t
lang = l

/obj/item/paper
name = "paper"
gender = NEUTER
Expand All @@ -22,8 +31,9 @@
max_integrity = 50
dog_fashion = /datum/dog_fashion/head

var/info //What's actually written on the paper.
var/info_links //A different version of the paper which includes html links at fields and EOF
var/info = "" // What's prewritten on the paper. Appears first and is a special snowflake callback to how paper used to work.
var/datum/language/infolang // The language info is written in. If left NULL, info will default to being omnilingual and readable by all.
var/list/written//What's written on the paper by people. Stores /datum/langtext values, plus plaintext values that mark where fields are.
var/stamps //The (text for the) stamps on the paper.
var/fields = 0 //Amount of user created fields
var/list/stamped
Expand All @@ -47,8 +57,8 @@
. = ..()
pixel_y = rand(-8, 8)
pixel_x = rand(-9, 9)
written = list()
update_icon()
updateinfolinks()


/obj/item/paper/update_icon()
Expand All @@ -69,10 +79,10 @@

if(in_range(user, src) || isobserver(user))
if(user.is_literate())
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info]<HR>[stamps]</BODY></HTML>", "window=[name]")
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[render_body(user)]<HR>[stamps]</BODY></HTML>", "window=[name]")
onclose(user, "[name]")
else
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>", "window=[name]")
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(render_body(user))]<HR>[stamps]</BODY></HTML>", "window=[name]")
onclose(user, "[name]")
else
. += "<span class='warning'>You're too far away to read it!</span>"
Expand Down Expand Up @@ -121,64 +131,37 @@
else //cyborg or AI not seeing through a camera
dist = get_dist(src, user)
if(dist < 2)
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info]<HR>[stamps]</BODY></HTML>", "window=[name]")
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[render_body(user)]<HR>[stamps]</BODY></HTML>", "window=[name]")
onclose(usr, "[name]")
else
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(info)]<HR>[stamps]</BODY></HTML>", "window=[name]")
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[stars(render_body(user))]<HR>[stamps]</BODY></HTML>", "window=[name]")
onclose(usr, "[name]")


/obj/item/paper/proc/addtofield(id, text, links = 0)
var/locid = 0
var/laststart = 1
var/textindex = 1
while(locid < 15) //hey whoever decided a while(1) was a good idea here, i hate you
var/istart = 0
if(links)
istart = findtext(info_links, "<span class=\"paper_field\">", laststart)
else
istart = findtext(info, "<span class=\"paper_field\">", laststart)

if(istart == 0)
return //No field found with matching id

laststart = istart+1
locid++
if(locid == id)
var/iend = 1
if(links)
iend = findtext(info_links, "</span>", istart)
/obj/item/paper/proc/render_body(mob/user,links = FALSE)
var/text = info // The actual text displayed. Starts with & defaults to $info.
if(istype(infolang) && !user.has_language(infolang))
var/datum/language/paperlang = GLOB.language_datum_instances[infolang]
text = paperlang.scramble_HTML(text)

for(var/i=1,i<=written.len;++i) // Needs to be a normal for-loop because I need the indices.
var/x = written[i]
if(istype(x,/datum/langtext))
var/datum/langtext/X = x
if(user.has_language(X.lang))
text += X.text
else
iend = findtext(info, "</span>", istart)

//textindex = istart+26
textindex = iend
break

var/datum/language/paperlang = GLOB.language_datum_instances[X.lang]
text += paperlang.scramble_HTML(X.text)
else if(links)
text += "<span class=\"paper_field\">" + "<font face=\"[PEN_FONT]\"><A href='?src=[REF(src)];write=[i]'>write</A></font>" + "</span>"
if(links)
var/before = copytext(info_links, 1, textindex)
var/after = copytext(info_links, textindex)
info_links = before + text + after
else
var/before = copytext(info, 1, textindex)
var/after = copytext(info, textindex)
info = before + text + after
updateinfolinks()


/obj/item/paper/proc/updateinfolinks()
info_links = info
for(var/i in 1 to min(fields, 15))
addtofield(i, "<font face=\"[PEN_FONT]\"><A href='?src=[REF(src)];write=[i]'>write</A></font>", 1)
info_links = info_links + "<font face=\"[PEN_FONT]\"><A href='?src=[REF(src)];write=end'>write</A></font>"

text += "<span class=\"paper_field\">" + "<font face=\"[PEN_FONT]\"><A href='?src=[REF(src)];write=end'>write</A></font>" + "</span>"
return text

/obj/item/paper/proc/clearpaper()
info = null
stamps = null
LAZYCLEARLIST(stamped)
cut_overlays()
updateinfolinks()
update_icon()


Expand All @@ -194,16 +177,9 @@
var/obj/item/toy/crayon/C = P
t = "<font face=\"[CRAYON_FONT]\" color=[C.paint_color]><b>[t]</b></font>"

// Count the fields
var/laststart = 1
while(fields < 15)
var/i = findtext(t, "<span class=\"paper_field\">", laststart)
if(i == 0)
break
laststart = i+1
fields++

return t
var/list/T = splittext(t,PAPER_FIELD,1,0,TRUE) // The list of subsections.. Splits the text on where paper fields have been created.
//The TRUE marks that we're keeping these "seperator" paper fields; they're included in this list.
return T // :)

/obj/item/paper/proc/reload_fields() // Useful if you made the paper programicly and want to include fields. Also runs updateinfolinks() for you.
fields = 0
Expand All @@ -214,7 +190,6 @@
break
laststart = i+1
fields++
updateinfolinks()


/obj/item/paper/proc/openhelp(mob/user)
Expand Down Expand Up @@ -250,7 +225,7 @@
openhelp(usr)
return
if(href_list["write"])
var/id = href_list["write"]

var/t = stripped_multiline_input("Enter what you want to write:", "Write", no_trim=TRUE)
if(!t || !usr.canUseTopic(src, BE_CLOSE, literate))
return
Expand All @@ -263,17 +238,23 @@

if(!in_range(src, usr) && loc != usr && !istype(loc, /obj/item/clipboard) && loc.loc != usr && usr.get_active_held_item() != i) //Some check to see if he's allowed to write
return

log_paper("[key_name(usr)] writing to paper [t]")
t = parsepencode(t, i, usr, iscrayon) // Encode everything from pencode to html

if(t != null) //No input from the user means nothing needs to be added
if(id!="end")
addtofield(text2num(id), t) // He wants to edit a field, let him.
var/list/T = parsepencode(t, i, usr, iscrayon) // Encode everything from pencode to html nibblets

if(T.len) //No input from the user means nothing needs to be added
var/list/templist = list() // All the stuff we're adding to $written
for(var/text in T)
if(text == PAPER_FIELD)
templist += text
else
var/datum/langtext/L = new(text,usr.get_default_language())
templist += L
var/id = href_list["write"]
if(id == "end")
written += templist
else
info += t // Oh, he wants to edit to the end of the file, let him.
updateinfolinks()
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>", "window=[name]") // Update the window
written.Insert(id,templist)
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[render_body(usr,TRUE)]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>", "window=[name]") // Update the window
update_icon()


Expand All @@ -288,7 +269,7 @@

if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
if(user.is_literate())
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>", "window=[name]")
user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[render_body(user,TRUE)]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=[REF(src)];help=1'>\[?\]</A></div></HTML>", "window=[name]")
return
else
to_chat(user, "<span class='notice'>You don't know how to read or write.</span>")
Expand Down Expand Up @@ -370,3 +351,6 @@

/obj/item/paper/crumpled/bloody
icon_state = "scrap_bloodied"


#undef PAPER_FIELD
Loading