From cf267ef4bfeaa11d93c7b6d5ad23d2ce5a2d5988 Mon Sep 17 00:00:00 2001
From: Kyle <41976328+ImKyle4815@users.noreply.github.com>
Date: Wed, 11 Nov 2020 17:07:01 -0800
Subject: [PATCH] white flavor text bar

---
 data/images/cardImages/manaSymbols/whitebar.png | Bin 0 -> 805 bytes
 data/scripts/main.js                            |  14 ++++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 data/images/cardImages/manaSymbols/whitebar.png

diff --git a/data/images/cardImages/manaSymbols/whitebar.png b/data/images/cardImages/manaSymbols/whitebar.png
new file mode 100644
index 0000000000000000000000000000000000000000..777d1be952b9b2cf57c83d7bd2ca2bf26e2b8d0e
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq00Kw=0006A1^@s6qe3H$0002LdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+Eq~74Fn+w{I`lLftQNqxUb|oxbhDd%&wEj;Gi&?
z&foV+p8*0&lB<?h3K*nGqi%_Uqumif?s!8KDAYwyA%igj8?$d~cgAjdelE-zxUG89
zsE|gZD9naDCXZpq+ob8_I!ZKZrzfRpeOuk8(+PbR?$cJ#KA!dxq}neX*#<Gu$;e=l
zI2^FAZaR9jbI8T=%q<x)Yc#VDS)PZhsq_b=NK_>5PkLwo00D$)LqkwWLqi~Na&Km7
zY-Iodc$|HaJxIeq9K~N#rJ@xFJBSEos7@9{MFbbAVi7EqwnD28CYOFelZGV4#ZhoA
zIQX$xb#QUk)xlK|1V2EW9Gw(hq{ROvg%&X$9QWhhy~o`<K&Y3QYIckRs%9C<SX9hp
zSH-|9dJqIKi(!eGdOWq5hUfUYhmWs!5uW9J?$6Py<V*(mMB+K78y4{f@${ypbKWNo
zv7)39pA(N6bV1@ruFEdJaV|J4@XU~rPR<jDh{Zx1%WcexhDtm|99C3~@`a4c3g<1(
zYPrgq_v9}O=CqX**J%zRh9$(2fCw2?lu(9+2(20^CX%!t_3#fm{sg&Xa+Scyv49Fx
zNRA);4}N!R<|ilIq+k^2e6j715g@P&G-|f}eQeu}6TtrrTxl(Tr4Gz|l3r_R;Ul1L
z8@RY`Y4RR$xdRM5>5?HilAorK&jasg^i5fy{}$+8b9-y<<MaVYQ&-D3z`-FfTA=K8
zk9T*q_xA6ZW`94Vb8@>DHRFZ=000JJOGiWi000000Qp0^e*gdg32;bRa{vGe@Bjb`
z@Bu=sG?)MY00(qQO+^Rf3k(1|CX%=pSO5S3S4l)cR9M69)<Ft@Fc3pgbyU3nadosV
zY(a#O;`+Z$&`kCnODWs%m_<g-)%4&0i|EyNyPrDuA@*Ss008`VnmkOO;{Fo*?A)ih
jZ@HU3-;WUh002}s)HWaqKQQ&?00000NkvXXu0mjf{Hb2X

literal 0
HcmV?d00001

diff --git a/data/scripts/main.js b/data/scripts/main.js
index 87a3bda4..83e5887c 100644
--- a/data/scripts/main.js
+++ b/data/scripts/main.js
@@ -43,7 +43,7 @@ function addToManaSymbolList(folderPath, newManaSymbolList) {
 	}
 }
 
-addToManaSymbolList('/data/images/cardImages/manaSymbols/', ["0.svg", "1.svg", "2.svg", "3.svg", "4.svg", "5.svg", "6.svg", "7.svg", "8.svg", "9.svg", "10.svg", "11.svg", "12.svg", "13.svg", "14.svg", "15.svg", "16.svg", "17.svg", "18.svg", "19.svg", "20.svg", "w.svg", "u.svg", "b.svg", "r.svg", "g.svg", "2w.svg", "2u.svg", "2b.svg", "2r.svg", "2g.svg", "pw.svg", "pu.svg", "pb.svg", "pr.svg", "pg.svg", "wu.svg", "wb.svg", "ub.svg", "ur.svg", "br.svg", "bg.svg", "rg.svg", "rw.svg", "gw.svg", "gu.svg", "x.svg", "s.svg", "c.svg", "t.svg","untap.svg", "e.svg", "y.svg", "z.svg", "half.svg", "inf.svg", "chaos.svg", "l+", "l-", "l0", "oldtap.svg", "artistbrush.svg", "bar", "whiteBrush", "blackBrush", 'star.svg'])
+addToManaSymbolList('/data/images/cardImages/manaSymbols/', ["0.svg", "1.svg", "2.svg", "3.svg", "4.svg", "5.svg", "6.svg", "7.svg", "8.svg", "9.svg", "10.svg", "11.svg", "12.svg", "13.svg", "14.svg", "15.svg", "16.svg", "17.svg", "18.svg", "19.svg", "20.svg", "w.svg", "u.svg", "b.svg", "r.svg", "g.svg", "2w.svg", "2u.svg", "2b.svg", "2r.svg", "2g.svg", "pw.svg", "pu.svg", "pb.svg", "pr.svg", "pg.svg", "wu.svg", "wb.svg", "ub.svg", "ur.svg", "br.svg", "bg.svg", "rg.svg", "rw.svg", "gw.svg", "gu.svg", "x.svg", "s.svg", "c.svg", "t.svg","untap.svg", "e.svg", "y.svg", "z.svg", "half.svg", "inf.svg", "chaos.svg", "l+", "l-", "l0", "oldtap.svg", "artistbrush.svg", "bar", "whitebar", "whiteBrush", "blackBrush", 'star.svg'])
 
 function newCanvas(name) {
 	window[name + 'Canvas'] = document.createElement('canvas')
@@ -598,8 +598,12 @@ function writeText(textObjectList, targetContext) {
 						finishLine = true
 					} else if ((possibleCodeLower == 'bar' || possibleCodeLower == 'flavor') && !oneLine) {
 						var barWidth = scaleX(textObjectList[i].width) * 0.95
-						var barHeight = scaleY(0.001)
-						textLineContext.drawImage(manaSymbolImageList[manaSymbolCodeList.indexOf('bar')], textCanvasBuffer + (scaleX(textObjectList[i].width) - barWidth) / 2, textSize * 0.8 + textCanvasBuffer, barWidth, barHeight)
+						var barHeight = scaleY(0.002)
+						var barImageName = 'bar'
+						if (currentFontColor == 'white') {
+							barImageName = 'whitebar'
+						}
+						textLineContext.drawImage(manaSymbolImageList[manaSymbolCodeList.indexOf(barImageName)], textCanvasBuffer + (scaleX(textObjectList[i].width) - barWidth) / 2, textSize * 0.8 + textCanvasBuffer, barWidth, barHeight)
 						currentLineWidth = scaleX(textObjectList[i].width)
 					} else if (possibleCodeLower == 'i') {
 						if (textFont == 'mplantin' && !textFontExtension.includes('i')) {
@@ -865,8 +869,6 @@ function manaCostUpdated() {
 				manaCostContext.fill()
 			}
 			manaCostContext.drawImage(manaSymbolImageList[manaSymbolCodeList.indexOf(manaCostList[i].split('/').reverse().join(''))], x, y, diameter, diameter)
-		} else {
-			console.log(manaCostList[i])
 		}
 	}
 	drawCardObjects()
@@ -949,7 +951,7 @@ function inputCardNameNumberTextImport(index) {
     if (flavorText.length < 10 || URLParams.get('noflavor') != null) {
     	flavorText = ''
     }
-    importText((beforeAfter(importCardTextResponse, '"oracle_text":"', '",') + flavorText).replace(/\n\\"/g, '\n\u201C').replace(/{flavor}\\"/g, '{flavor}\u201C').replace(/\\n/g, '\n').replace(/ \\"/g, ' \u201C').replace(/\\"/g, '\u201D').replace(/\(/g, '{i}(').replace(/\)/g, '){/i}'), 'Rules Text')
+    importText((beforeAfter(importCardTextResponse, '"oracle_text":"', '",') + flavorText.replace(/\\n\u2014/g, '{lns}\u2014')).replace(/\n\\"/g, '\n\u201C').replace(/{flavor}\\"/g, '{flavor}\u201C').replace(/\\n/g, '\n').replace(/ \\"/g, ' \u201C').replace(/\\"/g, '\u201D').replace(/\(/g, '{i}(').replace(/\)/g, '){/i}'), 'Rules Text')
     if (importCardTextResponse.includes('"power":"')) {
         importText(beforeAfter(importCardTextResponse, '"power":"', '",') + '/' + beforeAfter(importCardTextResponse, '"toughness":"', '",'), 'Power/Toughness')
     } else {