font update

Former-commit-id: 8574f23ab44050f471da479a4b1e4cc8a6b8601f
Former-commit-id: 91b9efc88373741c1875a59d62b8339f8d128047

src/net/torvald/terrarum/StateVTTest.kt

@@ -21,7 +21,7 @@ class StateVTTest : BasicGameState() {
 
     // HiRes: 100x64, LoRes: 80x25
     val computerInside = BaseTerrarumComputer()
-    val vt = SimpleTextTerminal(SimpleTextTerminal.GREEN, 80, 25, computerInside, colour = false, hires = false)
+    val vt = SimpleTextTerminal(SimpleTextTerminal.BLUE_NOVELTY, 80, 25, computerInside, colour = false, hires = false)
 
 
     val vtUI = Image(vt.displayW, vt.displayH)

src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt

@@ -60,6 +60,9 @@ open class SimpleTextTerminal(
                 Color(0xaa, 0xaa, 0xaa)  // light grey
         )                                // THESE ARE THE STANDARD
 
+    val phosphor = if (colour) WHITE7500 else phosphorColour
+    open protected val colourScreen = if (colour) Color(8, 8, 8) else Color(19, 19, 19)
+
     override val coloursCount: Int
         get() = colours.size
 
@@ -79,7 +82,12 @@ open class SimpleTextTerminal(
 
     val screenBuffer = AAFrame(width, height)
 
-    open protected val fontRef = "./assets/graphics/fonts/${if (hires) "milky.png" else "MDA.png"}"
+    open protected val fontRef =
+            "./assets/graphics/fonts/${
+                if (hires) "milky.png"
+                else if (phosphor == GREEN || phosphor == AMBER) "MDA.png"
+                else "milkymda.png"
+            }"
     open protected val fontImg = Image(fontRef)
     open protected val fontW = fontImg.width / 16
     open protected val fontH = fontImg.height / 16
@@ -96,9 +104,6 @@ open class SimpleTextTerminal(
     private val cursorBlinkLen = 250
     private var cursorBlinkOn = true
 
-    val phosphor = if (colour) WHITE7500 else phosphorColour
-    open protected val colourScreen = if (colour) Color(8, 8, 8) else Color(19, 19, 19)
-
 
 
     override fun getColor(index: Int): Color = colours[index]
@@ -399,8 +404,8 @@ open class SimpleTextTerminal(
         val AMBER = Color(255, 183, 0) // P3, 602 nm
         val GREEN = Color(74, 255, 0) // P39, 525 nm
         val WHITE = Color(204, 223, 255) // approximation of white CRT I own
-        val WHITE7500 = Color(0xe4eaff)
+        private val WHITE7500 = Color(0xe4eaff)
-        val ELECTRIC_BLUE = Color(0, 226, 255) // imaginary, 483 nm
+        val BLUE_NOVELTY = Color(0, 226, 255) // imaginary, 483 nm
         val RED = Color(250, 51, 0) // 632 nm
 
         val ASCII_NUL = 0.toChar()