Merge branch 'master' into upstream-merge-30763
This commit is contained in:
LetterJay
@@ -474,7 +474,7 @@
|
||||
#error Remie said that lummox was adding a way to get a lists
|
||||
#error contents via list.values, if that is true remove this
|
||||
#error otherwise, update the version and bug lummox
|
||||
#elseif
|
||||
#endif
|
||||
//Flattens a keyed list into a list of it's contents
|
||||
/proc/flatten_list(list/key_list)
|
||||
if(!islist(key_list))
|
||||
|
||||
+150
-25
@@ -414,34 +414,159 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
|
||||
end = temp
|
||||
return end
|
||||
|
||||
|
||||
/proc/parsepencode(t, mob/user=null, signfont=SIGNFONT)
|
||||
if(length(t) < 1) //No input means nothing needs to be parsed
|
||||
/proc/parsemarkdown_basic_step1(t, limited=FALSE)
|
||||
if(length(t) <= 0)
|
||||
return
|
||||
|
||||
t = replacetext(t, "\[center\]", "<center>")
|
||||
t = replacetext(t, "\[/center\]", "</center>")
|
||||
t = replacetext(t, "\[br\]", "<BR>")
|
||||
t = replacetext(t, "\[b\]", "<B>")
|
||||
t = replacetext(t, "\[/b\]", "</B>")
|
||||
t = replacetext(t, "\[i\]", "<I>")
|
||||
t = replacetext(t, "\[/i\]", "</I>")
|
||||
t = replacetext(t, "\[u\]", "<U>")
|
||||
t = replacetext(t, "\[/u\]", "</U>")
|
||||
t = replacetext(t, "\[large\]", "<font size=\"4\">")
|
||||
t = replacetext(t, "\[/large\]", "</font>")
|
||||
if(user)
|
||||
t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[user.real_name]</i></font>")
|
||||
else
|
||||
t = replacetext(t, "\[sign\]", "")
|
||||
t = replacetext(t, "\[field\]", "<span class=\"paper_field\"></span>")
|
||||
// This parses markdown with no custom rules
|
||||
|
||||
t = replacetext(t, "\[*\]", "<li>")
|
||||
t = replacetext(t, "\[hr\]", "<HR>")
|
||||
t = replacetext(t, "\[small\]", "<font size = \"1\">")
|
||||
t = replacetext(t, "\[/small\]", "</font>")
|
||||
t = replacetext(t, "\[list\]", "<ul>")
|
||||
t = replacetext(t, "\[/list\]", "</ul>")
|
||||
// Escape backslashed
|
||||
|
||||
t = replacetext(t, "$", "$-")
|
||||
t = replacetext(t, "\\\\", "$1")
|
||||
t = replacetext(t, "\\**", "$2")
|
||||
t = replacetext(t, "\\*", "$3")
|
||||
t = replacetext(t, "\\__", "$4")
|
||||
t = replacetext(t, "\\_", "$5")
|
||||
t = replacetext(t, "\\^", "$6")
|
||||
t = replacetext(t, "\\((", "$7")
|
||||
t = replacetext(t, "\\))", "$8")
|
||||
t = replacetext(t, "\\|", "$9")
|
||||
t = replacetext(t, "\\%", "$0")
|
||||
|
||||
// Escape single characters that will be used
|
||||
|
||||
t = replacetext(t, "!", "$a")
|
||||
|
||||
// Parse hr and small
|
||||
|
||||
if(!limited)
|
||||
t = replacetext(t, "((", "<font size=\"1\">")
|
||||
t = replacetext(t, "))", "</font>")
|
||||
t = replacetext(t, regex("^-{3,}$", "gm"), "<hr>")
|
||||
t = replacetext(t, regex("^\\(-{3,})$", "gm"), "$1")
|
||||
|
||||
// Parse lists
|
||||
|
||||
var/list/tlist = splittext(t, "\n")
|
||||
var/tlistlen = tlist.len
|
||||
var/listlevel = -1
|
||||
var/singlespace = -1 // if 0, double spaces are used before asterisks, if 1, single are
|
||||
for(var/i = 1, i <= tlistlen, i++)
|
||||
var/line = tlist[i]
|
||||
var/count_asterisk = length(replacetext(line, regex("\[^\\*\]+", "g"), ""))
|
||||
if(count_asterisk % 2 == 1 && findtext(line, regex("^\\s*\\*", "g"))) // there is an extra asterisk in the beggining
|
||||
|
||||
var/count_w = length(replacetext(line, regex("^( *)\\*.*$", "g"), "$1")) // whitespace before asterisk
|
||||
line = replacetext(line, regex("^ *(\\*.*)$", "g"), "$1")
|
||||
|
||||
if(singlespace == -1 && count_w == 2)
|
||||
if(listlevel == 0)
|
||||
singlespace = 0
|
||||
else
|
||||
singlespace = 1
|
||||
|
||||
if(singlespace == 0)
|
||||
count_w = count_w % 2 ? round(count_w / 2 + 0.25) : count_w / 2
|
||||
|
||||
line = replacetext(line, regex("\\*", ""), "<li>")
|
||||
while(listlevel < count_w)
|
||||
line = "<ul>" + line
|
||||
listlevel++
|
||||
while(listlevel > count_w)
|
||||
line = "</ul>" + line
|
||||
listlevel--
|
||||
|
||||
else while(listlevel >= 0)
|
||||
line = "</ul>" + line
|
||||
listlevel--
|
||||
|
||||
tlist[i] = line
|
||||
// end for
|
||||
|
||||
t = tlist[1]
|
||||
for(var/i = 2, i <= tlistlen, i++)
|
||||
t += "\n" + tlist[i]
|
||||
|
||||
while(listlevel >= 0)
|
||||
t += "</ul>"
|
||||
listlevel--
|
||||
|
||||
else
|
||||
t = replacetext(t, "((", "")
|
||||
t = replacetext(t, "))", "")
|
||||
|
||||
// Parse headers
|
||||
|
||||
t = replacetext(t, regex("^#(?!#) ?(.+)$", "gm"), "<h2>$1</h2>")
|
||||
t = replacetext(t, regex("^##(?!#) ?(.+)$", "gm"), "<h3>$1</h3>")
|
||||
t = replacetext(t, regex("^###(?!#) ?(.+)$", "gm"), "<h4>$1</h4>")
|
||||
t = replacetext(t, regex("^#### ?(.+)$", "gm"), "<h5>$1</h5>")
|
||||
|
||||
// Parse most rules
|
||||
|
||||
t = replacetext(t, regex("\\*(\[^\\*\]*)\\*", "g"), "<i>$1</i>")
|
||||
t = replacetext(t, regex("_(\[^_\]*)_", "g"), "<i>$1</i>")
|
||||
t = replacetext(t, "<i></i>", "!")
|
||||
t = replacetext(t, "</i><i>", "!")
|
||||
t = replacetext(t, regex("\\!(\[^\\!\]+)\\!", "g"), "<b>$1</b>")
|
||||
t = replacetext(t, regex("\\^(\[^\\^\]+)\\^", "g"), "<font size=\"4\">$1</font>")
|
||||
t = replacetext(t, regex("\\|(\[^\\|\]+)\\|", "g"), "<center>$1</center>")
|
||||
t = replacetext(t, "!", "</i><i>")
|
||||
|
||||
return t
|
||||
|
||||
/proc/parsemarkdown_basic_step2(t)
|
||||
if(length(t) <= 0)
|
||||
return
|
||||
|
||||
// Restore the single characters used
|
||||
|
||||
t = replacetext(t, "$a", "!")
|
||||
|
||||
// Redo the escaping
|
||||
|
||||
t = replacetext(t, "$1", "\\")
|
||||
t = replacetext(t, "$2", "**")
|
||||
t = replacetext(t, "$3", "*")
|
||||
t = replacetext(t, "$4", "__")
|
||||
t = replacetext(t, "$5", "_")
|
||||
t = replacetext(t, "$6", "^")
|
||||
t = replacetext(t, "$7", "((")
|
||||
t = replacetext(t, "$8", "))")
|
||||
t = replacetext(t, "$9", "|")
|
||||
t = replacetext(t, "$0", "%")
|
||||
t = replacetext(t, "$-", "$")
|
||||
|
||||
return t
|
||||
|
||||
/proc/parsemarkdown_basic(t, limited=FALSE)
|
||||
t = parsemarkdown_basic_step1(t, limited)
|
||||
t = parsemarkdown_basic_step2(t)
|
||||
return t
|
||||
|
||||
/proc/parsemarkdown(t, mob/user=null, limited=FALSE)
|
||||
if(length(t) <= 0)
|
||||
return
|
||||
|
||||
// Premanage whitespace
|
||||
|
||||
t = replacetext(t, regex("\[^\\S\\r\\n \]", "g"), " ")
|
||||
|
||||
t = parsemarkdown_basic_step1(t)
|
||||
|
||||
t = replacetext(t, regex("%s(?:ign)?(?=\\s|$)", "igm"), user ? "<font face=\"[SIGNFONT]\"><i>[user.real_name]</i></font>" : "<span class=\"paper_field\"></span>")
|
||||
t = replacetext(t, regex("%f(?:ield)?(?=\\s|$)", "igm"), "<span class=\"paper_field\"></span>")
|
||||
|
||||
t = parsemarkdown_basic_step2(t)
|
||||
|
||||
// Manage whitespace
|
||||
|
||||
t = replacetext(t, regex("(?:\\r\\n?|\\n)", "g"), "<br>")
|
||||
|
||||
t = replacetext(t, " ", " ")
|
||||
|
||||
// Done
|
||||
|
||||
return t
|
||||
|
||||
|
||||
@@ -502,28 +502,12 @@ Turf and target are separate in case you want to teleport some distance from a t
|
||||
var/y=arcsin(x/sqrt(1+x*x))
|
||||
return y
|
||||
|
||||
/atom/proc/GetAllContents(list/ignore_typecache)
|
||||
var/list/processing_list = list(src)
|
||||
var/list/assembled = list()
|
||||
if(ignore_typecache) //If there's a typecache, use it.
|
||||
while(processing_list.len)
|
||||
var/atom/A = processing_list[1]
|
||||
processing_list -= A
|
||||
if(ignore_typecache[A.type])
|
||||
continue
|
||||
processing_list |= (A.contents - assembled)
|
||||
assembled |= A
|
||||
|
||||
else //If there's none, only make this check once for performance.
|
||||
while(processing_list.len)
|
||||
var/atom/A = processing_list[1]
|
||||
processing_list -= A
|
||||
|
||||
processing_list |= (A.contents - assembled)
|
||||
|
||||
assembled |= A
|
||||
|
||||
return assembled
|
||||
/atom/proc/GetAllContents(list/output=list())
|
||||
. = output
|
||||
output += src
|
||||
for(var/i in 1 to contents.len)
|
||||
var/atom/thing = contents[i]
|
||||
thing.GetAllContents(output)
|
||||
|
||||
//Step-towards method of determining whether one atom can see another. Similar to viewers()
|
||||
/proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate.
|
||||
|
||||
Reference in New Issue
Block a user