Text() away (#19850)

Refactored all the builtin text procs to use string interpolation
instead.
Added a linting for the above.

This is based on, and should only be merged after, #19847
This commit is contained in:
Fluffy
2024-09-21 14:46:31 +02:00
committed by GitHub
parent 1aeeb6827d
commit 8f9de7c3e2
76 changed files with 351 additions and 264 deletions
+31 -31
View File
@@ -60,53 +60,53 @@
var/dat = "<b>Coin Press</b><br>"
if(!input)
dat += text("input connection status: ")
dat += text("<b><span class='warning'>NOT CONNECTED</span></b><br>")
dat += "input connection status: "
dat += "<b><span class='warning'>NOT CONNECTED</span></b><br>"
if(!output)
dat += text("<br>output connection status: ")
dat += text("<b><span class='warning'>NOT CONNECTED</span></b><br>")
dat += "<br>output connection status: "
dat += "<b><span class='warning'>NOT CONNECTED</span></b><br>"
dat += text("<br><font color='#ffcc00'><b>Gold inserted: </b>[amt_gold]</font> ")
dat += "<br><font color='#ffcc00'><b>Gold inserted: </b>[amt_gold]</font> "
if(chosen == "gold")
dat += text("chosen")
dat += "chosen"
else
dat += text("<A href='?src=[REF(src)];choose=gold'>Choose</A>")
dat += text("<br><font color='#888888'><b>Silver inserted: </b>[amt_silver]</font> ")
dat += "<A href='?src=[REF(src)];choose=gold'>Choose</A>"
dat += "<br><font color='#888888'><b>Silver inserted: </b>[amt_silver]</font> "
if(chosen == "silver")
dat += text("chosen")
dat += "chosen"
else
dat += text("<A href='?src=[REF(src)];choose=silver'>Choose</A>")
dat += text("<br><font color='#555555'><b>Iron inserted: </b>[amt_iron]</font> ")
dat += "<A href='?src=[REF(src)];choose=silver'>Choose</A>"
dat += "<br><font color='#555555'><b>Iron inserted: </b>[amt_iron]</font> "
if(chosen == DEFAULT_WALL_MATERIAL)
dat += text("chosen")
dat += "chosen"
else
dat += text("<A href='?src=[REF(src)];choose=metal'>Choose</A>")
dat += text("<br><font color='#8888FF'><b>Diamond inserted: </b>[amt_diamond]</font> ")
dat += "<A href='?src=[REF(src)];choose=metal'>Choose</A>"
dat += "<br><font color='#8888FF'><b>Diamond inserted: </b>[amt_diamond]</font> "
if(chosen == "diamond")
dat += text("chosen")
dat += "chosen"
else
dat += text("<A href='?src=[REF(src)];choose=diamond'>Choose</A>")
dat += text("<br><font color='#FF8800'><b>Phoron inserted: </b>[amt_phoron]</font> ")
dat += "<A href='?src=[REF(src)];choose=diamond'>Choose</A>"
dat += "<br><font color='#FF8800'><b>Phoron inserted: </b>[amt_phoron]</font> "
if(chosen == "phoron")
dat += text("chosen")
dat += "chosen"
else
dat += text("<A href='?src=[REF(src)];choose=phoron'>Choose</A>")
dat += text("<br><font color='#008800'><b>Uranium inserted: </b>[amt_uranium]</font> ")
dat += "<A href='?src=[REF(src)];choose=phoron'>Choose</A>"
dat += "<br><font color='#008800'><b>Uranium inserted: </b>[amt_uranium]</font> "
if(chosen == "uranium")
dat += text("chosen")
dat += "chosen"
else
dat += text("<A href='?src=[REF(src)];choose=uranium'>Choose</A>")
dat += "<A href='?src=[REF(src)];choose=uranium'>Choose</A>"
dat += text("<br><br>Will produce [coinsToProduce] [chosen] coins if enough materials are available.<br>")
dat += text("<A href='?src=[REF(src)];chooseAmt=-10'>-10</A> ")
dat += text("<A href='?src=[REF(src)];chooseAmt=-5'>-5</A> ")
dat += text("<A href='?src=[REF(src)];chooseAmt=-1'>-1</A> ")
dat += text("<A href='?src=[REF(src)];chooseAmt=1'>+1</A> ")
dat += text("<A href='?src=[REF(src)];chooseAmt=5'>+5</A> ")
dat += text("<A href='?src=[REF(src)];chooseAmt=10'>+10</A> ")
dat += "<br><br>Will produce [coinsToProduce] [chosen] coins if enough materials are available.<br>"
dat += "<A href='?src=[REF(src)];chooseAmt=-10'>-10</A> "
dat += "<A href='?src=[REF(src)];chooseAmt=-5'>-5</A> "
dat += "<A href='?src=[REF(src)];chooseAmt=-1'>-1</A> "
dat += "<A href='?src=[REF(src)];chooseAmt=1'>+1</A> "
dat += "<A href='?src=[REF(src)];chooseAmt=5'>+5</A> "
dat += "<A href='?src=[REF(src)];chooseAmt=10'>+10</A> "
dat += text("<br><br>In total this machine produced <font color='green'><b>[newCoins]</b></font> coins.")
dat += text("<br><A href='?src=[REF(src)];makeCoins=[1]'>Make coins</A>")
dat += "<br><br>In total this machine produced <font color='green'><b>[newCoins]</b></font> coins."
dat += "<br><A href='?src=[REF(src)];makeCoins=[1]'>Make coins</A>"
user << browse("[dat]", "window=mint")
/obj/machinery/mineral/mint/Topic(href, href_list)