diff --git a/assets/graphics/fonts/milky.png b/assets/graphics/fonts/milky.png index 783a14f77..6f44cc859 100644 Binary files a/assets/graphics/fonts/milky.png and b/assets/graphics/fonts/milky.png differ diff --git a/assets/graphics/fonts/milky.png.0.png b/assets/graphics/fonts/milky.png.0.png index 383a2168a..e1c76e3a9 100644 Binary files a/assets/graphics/fonts/milky.png.0.png and b/assets/graphics/fonts/milky.png.0.png differ diff --git a/assets/graphics/fonts/milky.png.1.png b/assets/graphics/fonts/milky.png.1.png index 783a14f77..3a5120b1b 100644 Binary files a/assets/graphics/fonts/milky.png.1.png and b/assets/graphics/fonts/milky.png.1.png differ diff --git a/assets/graphics/fonts/milky.png.10.png b/assets/graphics/fonts/milky.png.10.png index f8e7daa95..270573d94 100644 Binary files a/assets/graphics/fonts/milky.png.10.png and b/assets/graphics/fonts/milky.png.10.png differ diff --git a/assets/graphics/fonts/milky.png.11.png b/assets/graphics/fonts/milky.png.11.png index aad7e0662..a816278cf 100644 Binary files a/assets/graphics/fonts/milky.png.11.png and b/assets/graphics/fonts/milky.png.11.png differ diff --git a/assets/graphics/fonts/milky.png.12.png b/assets/graphics/fonts/milky.png.12.png index ba4761dad..2463e5224 100644 Binary files a/assets/graphics/fonts/milky.png.12.png and b/assets/graphics/fonts/milky.png.12.png differ diff --git a/assets/graphics/fonts/milky.png.13.png b/assets/graphics/fonts/milky.png.13.png index 613ad5108..0d89c1f22 100644 Binary files a/assets/graphics/fonts/milky.png.13.png and b/assets/graphics/fonts/milky.png.13.png differ diff --git a/assets/graphics/fonts/milky.png.14.png b/assets/graphics/fonts/milky.png.14.png index 1d056acf2..80286b990 100644 Binary files a/assets/graphics/fonts/milky.png.14.png and b/assets/graphics/fonts/milky.png.14.png differ diff --git a/assets/graphics/fonts/milky.png.15.png b/assets/graphics/fonts/milky.png.15.png index 6f0b33ab1..09adb1ce4 100644 Binary files a/assets/graphics/fonts/milky.png.15.png and b/assets/graphics/fonts/milky.png.15.png differ diff --git a/assets/graphics/fonts/milky.png.2.png b/assets/graphics/fonts/milky.png.2.png index 193cc6b55..73f05eff2 100644 Binary files a/assets/graphics/fonts/milky.png.2.png and b/assets/graphics/fonts/milky.png.2.png differ diff --git a/assets/graphics/fonts/milky.png.3.png b/assets/graphics/fonts/milky.png.3.png index 34a2d8553..5386e20d6 100644 Binary files a/assets/graphics/fonts/milky.png.3.png and b/assets/graphics/fonts/milky.png.3.png differ diff --git a/assets/graphics/fonts/milky.png.4.png b/assets/graphics/fonts/milky.png.4.png index d00fdfbb9..ddfaf832a 100644 Binary files a/assets/graphics/fonts/milky.png.4.png and b/assets/graphics/fonts/milky.png.4.png differ diff --git a/assets/graphics/fonts/milky.png.5.png b/assets/graphics/fonts/milky.png.5.png index 96e271bec..f5571c265 100644 Binary files a/assets/graphics/fonts/milky.png.5.png and b/assets/graphics/fonts/milky.png.5.png differ diff --git a/assets/graphics/fonts/milky.png.6.png b/assets/graphics/fonts/milky.png.6.png index a7d385560..624b24aff 100644 Binary files a/assets/graphics/fonts/milky.png.6.png and b/assets/graphics/fonts/milky.png.6.png differ diff --git a/assets/graphics/fonts/milky.png.7.png b/assets/graphics/fonts/milky.png.7.png index 59ca7706e..0f8ff89c6 100644 Binary files a/assets/graphics/fonts/milky.png.7.png and b/assets/graphics/fonts/milky.png.7.png differ diff --git a/assets/graphics/fonts/milky.png.8.png b/assets/graphics/fonts/milky.png.8.png index cbe3e7e56..eaf683082 100644 Binary files a/assets/graphics/fonts/milky.png.8.png and b/assets/graphics/fonts/milky.png.8.png differ diff --git a/assets/graphics/fonts/milky.png.9.png b/assets/graphics/fonts/milky.png.9.png index 05cb7aab7..429044c67 100644 Binary files a/assets/graphics/fonts/milky.png.9.png and b/assets/graphics/fonts/milky.png.9.png differ diff --git a/assets/graphics/fonts/milkymda.png b/assets/graphics/fonts/milkymda.png new file mode 100644 index 000000000..6b692f62e Binary files /dev/null and b/assets/graphics/fonts/milkymda.png differ diff --git a/assets/graphics/fonts/milkymda.png.0.png b/assets/graphics/fonts/milkymda.png.0.png new file mode 100644 index 000000000..86a688917 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.0.png differ diff --git a/assets/graphics/fonts/milkymda.png.1.png b/assets/graphics/fonts/milkymda.png.1.png new file mode 100644 index 000000000..4ef77fea1 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.1.png differ diff --git a/assets/graphics/fonts/milkymda.png.10.png b/assets/graphics/fonts/milkymda.png.10.png new file mode 100644 index 000000000..b1c5fc154 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.10.png differ diff --git a/assets/graphics/fonts/milkymda.png.11.png b/assets/graphics/fonts/milkymda.png.11.png new file mode 100644 index 000000000..6f33c8889 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.11.png differ diff --git a/assets/graphics/fonts/milkymda.png.12.png b/assets/graphics/fonts/milkymda.png.12.png new file mode 100644 index 000000000..9f9ee1ada Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.12.png differ diff --git a/assets/graphics/fonts/milkymda.png.13.png b/assets/graphics/fonts/milkymda.png.13.png new file mode 100644 index 000000000..e178615d1 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.13.png differ diff --git a/assets/graphics/fonts/milkymda.png.14.png b/assets/graphics/fonts/milkymda.png.14.png new file mode 100644 index 000000000..921e88c0c Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.14.png differ diff --git a/assets/graphics/fonts/milkymda.png.15.png b/assets/graphics/fonts/milkymda.png.15.png new file mode 100644 index 000000000..9e7f3a244 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.15.png differ diff --git a/assets/graphics/fonts/milkymda.png.2.png b/assets/graphics/fonts/milkymda.png.2.png new file mode 100644 index 000000000..ba66cd388 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.2.png differ diff --git a/assets/graphics/fonts/milkymda.png.3.png b/assets/graphics/fonts/milkymda.png.3.png new file mode 100644 index 000000000..eb038730d Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.3.png differ diff --git a/assets/graphics/fonts/milkymda.png.4.png b/assets/graphics/fonts/milkymda.png.4.png new file mode 100644 index 000000000..1f6464aeb Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.4.png differ diff --git a/assets/graphics/fonts/milkymda.png.5.png b/assets/graphics/fonts/milkymda.png.5.png new file mode 100644 index 000000000..705bf9f67 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.5.png differ diff --git a/assets/graphics/fonts/milkymda.png.6.png b/assets/graphics/fonts/milkymda.png.6.png new file mode 100644 index 000000000..9d64c82fd Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.6.png differ diff --git a/assets/graphics/fonts/milkymda.png.7.png b/assets/graphics/fonts/milkymda.png.7.png new file mode 100644 index 000000000..486a204b3 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.7.png differ diff --git a/assets/graphics/fonts/milkymda.png.8.png b/assets/graphics/fonts/milkymda.png.8.png new file mode 100644 index 000000000..9492bc4e8 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.8.png differ diff --git a/assets/graphics/fonts/milkymda.png.9.png b/assets/graphics/fonts/milkymda.png.9.png new file mode 100644 index 000000000..93b940601 Binary files /dev/null and b/assets/graphics/fonts/milkymda.png.9.png differ diff --git a/src/net/torvald/terrarum/StateVTTest.kt b/src/net/torvald/terrarum/StateVTTest.kt index 5404fa38a..4a386417e 100644 --- a/src/net/torvald/terrarum/StateVTTest.kt +++ b/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) diff --git a/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt b/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt index 6db3c23a8..873f03322 100644 --- a/src/net/torvald/terrarum/virtualcomputer/terminal/SimpleTextTerminal.kt +++ b/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) - val ELECTRIC_BLUE = Color(0, 226, 255) // imaginary, 483 nm + private val WHITE7500 = Color(0xe4eaff) + val BLUE_NOVELTY = Color(0, 226, 255) // imaginary, 483 nm val RED = Color(250, 51, 0) // 632 nm val ASCII_NUL = 0.toChar()