demo v1.1 Latin ExtB

Slick2d/GameFontBase.kt

@@ -56,7 +56,9 @@ open class GameFontBase : Font {
 
     private fun isHangul(c: Char) = c.toInt() >= 0xAC00 && c.toInt() < 0xD7A4
     private fun isAscii(c: Char) = c.toInt() >= 0x20 && c.toInt() <= 0xFF
+    private fun isRunic(c: Char) = runicList.contains(c)
     private fun isExtA(c: Char) = c.toInt() >= 0x100 && c.toInt() < 0x180
+    private fun isExtB(c: Char) = c.toInt() >= 0x180 && c.toInt() < 0x250
     private fun isKana(c: Char) = c.toInt() >= 0x3040 && c.toInt() < 0x3100
     private fun isCJKPunct(c: Char) = c.toInt() >= 0x3000 && c.toInt() < 0x3040
     private fun isUniHan(c: Char) = c.toInt() >= 0x3400 && c.toInt() < 0xA000
@@ -66,14 +68,18 @@ open class GameFontBase : Font {
     private fun isWenQuanYi1(c: Char) = c.toInt() >= 0x33F3 && c.toInt() <= 0x69FC
     private fun isWenQuanYi2(c: Char) = c.toInt() >= 0x69FD && c.toInt() <= 0x9FDC
     private fun isGreek(c: Char) = c.toInt() >= 0x370 && c.toInt() <= 0x3CE
-    private fun isRomanian(c: Char) = c.toInt() >= 0x218 && c.toInt() <= 0x21A
-    private fun isRomanianNarrow(c: Char) = c.toInt() == 0x21B
 
 
 
     private fun extAindexX(c: Char) = (c.toInt() - 0x100) % 16
     private fun extAindexY(c: Char) = (c.toInt() - 0x100) / 16
 
+    private fun extBindexX(c: Char) = (c.toInt() - 0x180) % 16
+    private fun extBindexY(c: Char) = (c.toInt() - 0x180) / 16
+
+    private fun runicIndexX(c: Char) = runicList.indexOf(c) % 16
+    private fun runicIndexY(c: Char) = runicList.indexOf(c) / 16
+
     private fun kanaIndexX(c: Char) = (c.toInt() - 0x3040) % 16
     private fun kanaIndexY(c: Char) = (c.toInt() - 0x3040) / 16
 
@@ -100,19 +106,6 @@ open class GameFontBase : Font {
     private fun greekIndexX(c: Char) = (c.toInt() - 0x370) % 16
     private fun greekIndexY(c: Char) = (c.toInt() - 0x370) / 16
 
-    private fun romanianIndexX(c: Char) = c.toInt() - 0x218
-    private fun romanianIndexY(c: Char) = 0
-
-    private fun thaiIndexX(c: Char) = (c.toInt() - 0xE00) % 16
-    private fun thaiIndexY(c: Char) = (c.toInt() - 0xE00) / 16
-
-    private fun thaiNarrowIndexX(c: Char) = 3
-    private fun thaiNarrowIndexY(c: Char) = 0
-
-
-    private val narrowWidthSheets = arrayOf(
-            SHEET_EXTB_ROMANIAN_NARROW
-    )
     private val unihanWidthSheets = arrayOf(
             SHEET_UNIHAN,
             SHEET_FW_UNI,
@@ -126,7 +119,8 @@ open class GameFontBase : Font {
             SHEET_ASCII_VARW,
             SHEET_CYRILIC_VARW,
             SHEET_EXTA_VARW,
-            SHEET_GREEK_VARW
+            SHEET_GREEK_VARW,
+            SHEET_EXTB_VARW
     )
 
 
@@ -151,8 +145,6 @@ open class GameFontBase : Font {
             }
             else if (zeroWidthSheets.contains(ctype))
                 len += 0
-            else if (narrowWidthSheets.contains(ctype))
-                len += W_LATIN_NARROW
             else if (ctype == SHEET_CJK_PUNCT)
                 len += W_ASIAN_PUNCT
             else if (ctype == SHEET_HANGUL)
@@ -188,6 +180,11 @@ open class GameFontBase : Font {
         for (i in 0..s.length - 1) {
             val ch = s[i]
 
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
+
             if (isHangul(ch)) {
                 val hIndex = ch.toInt() - 0xAC00
 
@@ -246,6 +243,11 @@ open class GameFontBase : Font {
         for (i in 0..s.length - 1) {
             val ch = s[i]
 
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
+
             if (isWenQuanYi1(ch)) {
                 val glyphW = getWidth("" + ch)
                 wenQuanYi_1.getSubImage(wenQuanYiIndexX(ch), wenQuanYi1IndexY(ch)).drawWithShadow(
@@ -263,6 +265,11 @@ open class GameFontBase : Font {
         for (i in 0..s.length - 1) {
             val ch = s[i]
 
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
+
             if (isWenQuanYi2(ch)) {
                 val glyphW = getWidth("" + ch)
                 wenQuanYi_2.getSubImage(wenQuanYiIndexX(ch), wenQuanYi2IndexY(ch)).drawWithShadow(
@@ -280,6 +287,11 @@ open class GameFontBase : Font {
         for (i in 0..s.length - 1) {
             val ch = s[i]
 
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
+
             if (!isHangul(ch) && !isUniHan(ch)) {
 
                 // if not init, endUse first
@@ -296,6 +308,10 @@ open class GameFontBase : Font {
                         sheetX = extAindexX(ch)
                         sheetY = extAindexY(ch)
                     }
+                    SHEET_EXTB_VARW    -> {
+                        sheetX = extBindexX(ch)
+                        sheetY = extBindexY(ch)
+                    }
                     SHEET_KANA       -> {
                         sheetX = kanaIndexX(ch)
                         sheetY = kanaIndexY(ch)
@@ -320,14 +336,6 @@ open class GameFontBase : Font {
                         sheetX = greekIndexX(ch)
                         sheetY = greekIndexY(ch)
                     }
-                    SHEET_EXTB_ROMANIAN_WIDE   -> {
-                        sheetX = romanianIndexX(ch)
-                        sheetY = romanianIndexY(ch)
-                    }
-                    SHEET_EXTB_ROMANIAN_NARROW -> {
-                        sheetX = 0
-                        sheetY = 0
-                    }
                     else                       -> {
                         sheetX = ch.toInt() % 16
                         sheetY = ch.toInt() / 16
@@ -365,10 +373,7 @@ open class GameFontBase : Font {
     }
 
     private fun getSheetType(c: Char): Int {
-        // EFs
-        if (isRomanianNarrow(c))
-            return SHEET_EXTB_ROMANIAN_NARROW
-        else if (isHangul(c))
+        if (isHangul(c))
             return SHEET_HANGUL
         else if (isKana(c))
             return SHEET_KANA
@@ -378,6 +383,8 @@ open class GameFontBase : Font {
             return SHEET_ASCII_VARW
         else if (isExtA(c))
             return SHEET_EXTA_VARW
+        else if (isExtB(c))
+            return SHEET_EXTB_VARW
         else if (isCyrilic(c))
             return SHEET_CYRILIC_VARW
         else if (isUniPunct(c))
@@ -388,8 +395,8 @@ open class GameFontBase : Font {
             return SHEET_FW_UNI
         else if (isGreek(c))
             return SHEET_GREEK_VARW
-        else if (isRomanian(c))
-            return SHEET_EXTB_ROMANIAN_WIDE
+        else if (c.isColourCode())
+            return SHEET_COLOURCODE
         else
             return SHEET_UNKNOWN// fixed width punctuations
         // fixed width
@@ -418,6 +425,8 @@ open class GameFontBase : Font {
         drawString(x + xoff, y, printedBody, color)
     }
 
+    fun Char.isColourCode() = colourKey.containsKey(this)
+
     fun buildWidthTable(sheet: SpriteSheet, codeOffset: Int, codeRange: IntRange, rows: Int = 16) {
         fun Byte.toUint() = java.lang.Byte.toUnsignedInt(this)
 
@@ -483,6 +492,7 @@ open class GameFontBase : Font {
         internal val asciiWidths: HashMap<Int, Int> = HashMap()
 
         lateinit internal var extASheet: SpriteSheet
+        lateinit internal var extBSheet: SpriteSheet
         lateinit internal var kanaSheet: SpriteSheet
         lateinit internal var cjkPunct: SpriteSheet
         // static SpriteSheet uniHan;
@@ -492,8 +502,6 @@ open class GameFontBase : Font {
         lateinit internal var wenQuanYi_1: SpriteSheet
         lateinit internal var wenQuanYi_2: SpriteSheet
         lateinit internal var greekSheet: SpriteSheet
-        lateinit internal var romanianSheet: SpriteSheet
-        lateinit internal var romanianSheetNarrow: SpriteSheet
 
         internal val JUNG_COUNT = 21
         internal val JONG_COUNT = 28
@@ -502,8 +510,7 @@ open class GameFontBase : Font {
         internal val W_HANGUL = 11
         internal val W_KANA = 12
         internal val W_UNIHAN = 16
-        internal val W_LATIN_WIDE = 9 // width of regular letters, including m
-        internal val W_LATIN_NARROW = 5 // width of letter f, t, i, l
+        internal val W_LATIN_WIDE = 9 // width of regular letters
 
         internal val H = 20
         internal val H_HANGUL = 16
@@ -512,24 +519,42 @@ open class GameFontBase : Font {
 
         internal val SHEET_ASCII_VARW = 0
         internal val SHEET_HANGUL = 1
-        internal val SHEET_EXTA_VARW = 2
-        internal val SHEET_KANA = 3
-        internal val SHEET_CJK_PUNCT = 4
-        internal val SHEET_UNIHAN = 5
-        internal val SHEET_CYRILIC_VARW = 6
-        internal val SHEET_FW_UNI = 7
-        internal val SHEET_UNI_PUNCT = 8
-        internal val SHEET_WENQUANYI_1 = 9
-        internal val SHEET_WENQUANYI_2 = 10
-        internal val SHEET_GREEK_VARW = 11
-        internal val SHEET_EXTB_ROMANIAN_WIDE = 12
-        internal val SHEET_EXTB_ROMANIAN_NARROW = 13
+        internal val SHEET_EXTA_VARW = 3
+        internal val SHEET_EXTB_VARW = 4
+        internal val SHEET_KANA = 5
+        internal val SHEET_CJK_PUNCT = 6
+        internal val SHEET_UNIHAN = 7
+        internal val SHEET_CYRILIC_VARW = 8
+        internal val SHEET_FW_UNI = 9
+        internal val SHEET_UNI_PUNCT = 10
+        internal val SHEET_WENQUANYI_1 = 11
+        internal val SHEET_WENQUANYI_2 = 12
+        internal val SHEET_GREEK_VARW = 13
+
 
         internal val SHEET_UNKNOWN = 254
         internal val SHEET_COLOURCODE = 255
 
         lateinit internal var sheetKey: Array<SpriteSheet?>
 
+        /**
+         * Runic letters list used for game. The set is
+         * Younger Futhark + Medieval rune 'e' + Punct + Runic Almanac
+
+         * BEWARE OF SIMILAR-LOOKING RUNES, especially:
+
+         * * Algiz ᛉ instead of Maðr ᛘ
+
+         * * Short-Twig Hagall ᚽ instead of Runic Letter E ᛂ
+
+         * * Runic Letter OE ᚯ instead of Óss ᚬ
+
+         * Examples:
+         * ᛭ᛋᛁᚴᚱᛁᚦᛦ᛭
+         * ᛭ᛂᛚᛋᛅ᛭ᛏᚱᚢᛏᚾᛁᚾᚴᚢᚾᛅ᛬ᛅᚱᚾᛅᛏᛅᛚᛋ
+         */
+        internal val runicList = arrayOf('ᚠ', 'ᚢ', 'ᚦ', 'ᚬ', 'ᚱ', 'ᚴ', 'ᚼ', 'ᚾ', 'ᛁ', 'ᛅ', 'ᛋ', 'ᛏ', 'ᛒ', 'ᛘ', 'ᛚ', 'ᛦ', 'ᛂ', '᛬', '᛫', '᛭', 'ᛮ', 'ᛯ', 'ᛰ')
+
         internal var interchar = 0
         internal var scale = 1
             set(value) {
@@ -537,6 +562,49 @@ open class GameFontBase : Font {
                 else throw IllegalArgumentException("Font scale cannot be zero or negative (input: $value)")
             }
 
+        val colourKey = hashMapOf(
+                Pair(0x10.toChar(), Color(0xFFFFFF)), //*w hite
+                Pair(0x11.toChar(), Color(0xFFE080)), //*y ellow
+                Pair(0x12.toChar(), Color(0xFFB020)), //o range
+                Pair(0x13.toChar(), Color(0xFF8080)), //*r ed
+                Pair(0x14.toChar(), Color(0xFFA0E0)), //f uchsia
+                Pair(0x15.toChar(), Color(0xE0A0FF)), //*m agenta (purple)
+                Pair(0x16.toChar(), Color(0x8080FF)), //*b lue
+                Pair(0x17.toChar(), Color(0x80FFFF)), //c yan
+                Pair(0x18.toChar(), Color(0x80FF80)), //*g reen
+                Pair(0x19.toChar(), Color(0x008000)), //v iridian
+                Pair(0x1A.toChar(), Color(0x805030)), //x (khaki)
+                Pair(0x1B.toChar(), Color(0x808080))  //*k
+                //* marked: commonly used
+        )
+        val colToCode = hashMapOf(
+                Pair("w", 0x10.toChar()),
+                Pair("y", 0x11.toChar()),
+                Pair("o", 0x12.toChar()),
+                Pair("r", 0x13.toChar()),
+                Pair("f", 0x14.toChar()),
+                Pair("m", 0x15.toChar()),
+                Pair("b", 0x16.toChar()),
+                Pair("c", 0x17.toChar()),
+                Pair("g", 0x18.toChar()),
+                Pair("v", 0x19.toChar()),
+                Pair("x", 0x1A.toChar()),
+                Pair("k", 0x1B.toChar())
+        )
+        val codeToCol = hashMapOf(
+                Pair("w", colourKey[0x10.toChar()]),
+                Pair("y", colourKey[0x11.toChar()]),
+                Pair("o", colourKey[0x12.toChar()]),
+                Pair("r", colourKey[0x13.toChar()]),
+                Pair("f", colourKey[0x14.toChar()]),
+                Pair("m", colourKey[0x15.toChar()]),
+                Pair("b", colourKey[0x16.toChar()]),
+                Pair("c", colourKey[0x17.toChar()]),
+                Pair("g", colourKey[0x18.toChar()]),
+                Pair("v", colourKey[0x19.toChar()]),
+                Pair("x", colourKey[0x1A.toChar()]),
+                Pair("k", colourKey[0x1B.toChar()])
+        )
     }// end of companion object
 }
 

Slick2d/GameFontImpl.kt

@@ -16,6 +16,8 @@ class GameFontImpl : GameFontBase() {
                 "./assets/graphics/fonts/ascii_variable.tga", 15, 19, 1)
         GameFontBase.extASheet = SpriteSheet(
                 "./assets/graphics/fonts/LatinExtA_variable.tga", 15, 19, 1)
+        GameFontBase.extBSheet = SpriteSheet(
+                "./assets/graphics/fonts/LatinExtB_variable.tga", 15, 19, 1)
         GameFontBase.kanaSheet = SpriteSheet(
                 "./assets/graphics/fonts/kana.tga", GameFontBase.W_KANA, GameFontBase.H_KANA)
         GameFontBase.cjkPunct = SpriteSheet(
@@ -43,15 +45,13 @@ class GameFontImpl : GameFontBase() {
                 "./assets/graphics/fonts/wenquanyi_11pt_part2.tga", 16, 18, 2)
         GameFontBase.greekSheet = SpriteSheet(
                 "./assets/graphics/fonts/greek_variable.tga", 15, 19, 1)
-        GameFontBase.romanianSheet = SpriteSheet(
-                "./assets/graphics/fonts/romana_wide.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
-        GameFontBase.romanianSheetNarrow = SpriteSheet(
-                "./assets/graphics/fonts/romana_narrow.tga", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
 
         val shk = arrayOf(
                 GameFontBase.asciiSheet,
                 GameFontBase.hangulSheet,
+                null, // here was customised runic sheet
                 GameFontBase.extASheet,
+                GameFontBase.extBSheet,
                 GameFontBase.kanaSheet,
                 GameFontBase.cjkPunct,
                 null, // Full unihan, filler because we're using WenQuanYi
@@ -60,16 +60,24 @@ class GameFontImpl : GameFontBase() {
                 GameFontBase.uniPunct,
                 GameFontBase.wenQuanYi_1,
                 GameFontBase.wenQuanYi_2,
-                GameFontBase.greekSheet,
-                GameFontBase.romanianSheet,
-                GameFontBase.romanianSheetNarrow
+                GameFontBase.greekSheet
         )
         GameFontBase.sheetKey = shk
 
 
-        buildWidthTable(asciiSheet, 0, 0..0xFF)
-        buildWidthTable(extASheet, 0x100, 0..0x7F)
-        buildWidthTable(cyrilic, 0x400, 0..0x5F)
+        buildWidthTable(asciiSheet, 0,     0..0xFF)
+        buildWidthTable(extASheet,  0x100, 0..0x7F)
+        buildWidthTable(extBSheet,  0x180, 0..0xCF)
+        buildWidthTable(cyrilic,    0x400, 0..0x5F)
         buildWidthTable(greekSheet, 0x370, 0..0x5F)
     }
+
+    fun reload() {
+        GameFontBase.cyrilic = SpriteSheet(
+                when (GameFontDemo.gameLocale.substring(0..1)) {
+                    "bg" -> "./assets/graphics/fonts/cyrilic_bulgarian_variable.tga"
+                    "sr" -> "./assets/graphics/fonts/cyrilic_serbian_variable.tga"
+                    else -> "./assets/graphics/fonts/cyrilic_variable.tga"
+                }, 15, 19, 1)
+    }
 }

demo/.idea/workspace.xml

@@ -23,8 +23,8 @@
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="GameFontDemo.kt" pinned="false" current-in-tab="true">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="GameFontDemo.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="610">
@@ -39,8 +39,8 @@
       <file leaf-file-name="GameFontBase.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="400">
-              <caret line="516" column="36" lean-forward="false" selection-start-line="516" selection-start-column="36" selection-end-line="516" selection-end-column="36" />
+            <state relative-caret-position="202">
+              <caret line="493" column="0" lean-forward="false" selection-start-line="493" selection-start-column="0" selection-end-line="493" selection-end-column="0" />
               <folding>
                 <element signature="e#31#171#0" expanded="true" />
               </folding>
@@ -48,31 +48,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="config.properties" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="10" lean-forward="true" selection-start-line="0" selection-start-column="10" selection-end-line="0" selection-end-column="10" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="text.txt" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/text.txt">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="95" lean-forward="false" selection-start-line="0" selection-start-column="95" selection-end-line="0" selection-end-column="95" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GameFontImpl.kt" pinned="false" current-in-tab="false">
+      <file leaf-file-name="GameFontImpl.kt" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="190">
-              <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+            <state relative-caret-position="356">
+              <caret line="48" column="26" lean-forward="false" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
               <folding>
                 <element signature="e#31#108#0" expanded="true" />
               </folding>
@@ -112,21 +92,21 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt" />
         <option value="$PROJECT_DIR$/text.properties" />
-        <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt" />
-        <option value="$PROJECT_DIR$/text.txt" />
         <option value="$PROJECT_DIR$/config.properties" />
         <option value="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
         <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt" />
+        <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt" />
+        <option value="$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt" />
+        <option value="$PROJECT_DIR$/text.txt" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
+    <option name="x" value="-1688" />
     <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1176" />
+    <option name="width" value="1696" />
+    <option name="height" value="1026" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -404,7 +384,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
+    <frame x="-1688" y="-8" width="1696" height="1026" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -417,14 +397,13 @@
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17948718" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20833333" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="LuaJ" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960597" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3054371" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26007676" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25896862" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -434,6 +413,7 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1544196" sideWeight="0.4651163" order="10" side_tool="false" content_ui="tabs" x="1380" y="-157" width="1720" height="857" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -449,35 +429,19 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/text.txt">
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
-          <caret line="0" column="95" lean-forward="false" selection-start-line="0" selection-start-column="95" selection-end-line="0" selection-end-column="95" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#31#108#0" expanded="true" />
+            <element signature="e#40#238#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/META-INF/MANIFEST.MF">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="28">
-          <caret line="2" column="57" lean-forward="true" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
+        <state relative-caret-position="7168">
           <caret line="516" column="36" lean-forward="false" selection-start-line="516" selection-start-column="36" selection-end-line="516" selection-end-column="36" />
           <folding>
             <element signature="e#31#171#0" expanded="true" />
@@ -485,14 +449,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../Ba-AA/src/net/torvald/aa/demoplayer/BaAA.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="428" column="8" lean-forward="false" selection-start-line="428" selection-start-column="8" selection-end-line="429" selection-end-column="87" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/config.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -501,6 +457,38 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/text.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="95" lean-forward="false" selection-start-line="0" selection-start-column="95" selection-end-line="0" selection-end-column="95" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="392">
+          <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+          <folding>
+            <element signature="e#31#108#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/META-INF/MANIFEST.MF">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="28">
+          <caret line="2" column="57" lean-forward="true" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Ba-AA/src/net/torvald/aa/demoplayer/BaAA.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="428" column="8" lean-forward="false" selection-start-line="428" selection-start-column="8" selection-end-line="429" selection-end-column="87" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontDemo.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="610">
@@ -511,6 +499,42 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/config.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="10" lean-forward="false" selection-start-line="0" selection-start-column="10" selection-end-line="0" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontBase.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="493" column="0" lean-forward="false" selection-start-line="493" selection-start-column="0" selection-end-line="493" selection-end-column="0" />
+          <folding>
+            <element signature="e#31#171#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/text.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/torvald/terrarum/imagefont/GameFontImpl.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="48" column="26" lean-forward="false" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
+          <folding>
+            <element signature="e#31#108#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

demo/src/net/torvald/terrarum/imagefont/GameFontBase.kt

@@ -56,7 +56,9 @@ open class GameFontBase : Font {
 
     private fun isHangul(c: Char) = c.toInt() >= 0xAC00 && c.toInt() < 0xD7A4
     private fun isAscii(c: Char) = c.toInt() >= 0x20 && c.toInt() <= 0xFF
+    private fun isRunic(c: Char) = runicList.contains(c)
     private fun isExtA(c: Char) = c.toInt() >= 0x100 && c.toInt() < 0x180
+    private fun isExtB(c: Char) = c.toInt() >= 0x180 && c.toInt() < 0x250
     private fun isKana(c: Char) = c.toInt() >= 0x3040 && c.toInt() < 0x3100
     private fun isCJKPunct(c: Char) = c.toInt() >= 0x3000 && c.toInt() < 0x3040
     private fun isUniHan(c: Char) = c.toInt() >= 0x3400 && c.toInt() < 0xA000
@@ -66,14 +68,18 @@ open class GameFontBase : Font {
     private fun isWenQuanYi1(c: Char) = c.toInt() >= 0x33F3 && c.toInt() <= 0x69FC
     private fun isWenQuanYi2(c: Char) = c.toInt() >= 0x69FD && c.toInt() <= 0x9FDC
     private fun isGreek(c: Char) = c.toInt() >= 0x370 && c.toInt() <= 0x3CE
-    private fun isRomanian(c: Char) = c.toInt() >= 0x218 && c.toInt() <= 0x21A
-    private fun isRomanianNarrow(c: Char) = c.toInt() == 0x21B
 
 
 
     private fun extAindexX(c: Char) = (c.toInt() - 0x100) % 16
     private fun extAindexY(c: Char) = (c.toInt() - 0x100) / 16
 
+    private fun extBindexX(c: Char) = (c.toInt() - 0x180) % 16
+    private fun extBindexY(c: Char) = (c.toInt() - 0x180) / 16
+
+    private fun runicIndexX(c: Char) = runicList.indexOf(c) % 16
+    private fun runicIndexY(c: Char) = runicList.indexOf(c) / 16
+
     private fun kanaIndexX(c: Char) = (c.toInt() - 0x3040) % 16
     private fun kanaIndexY(c: Char) = (c.toInt() - 0x3040) / 16
 
@@ -100,19 +106,6 @@ open class GameFontBase : Font {
     private fun greekIndexX(c: Char) = (c.toInt() - 0x370) % 16
     private fun greekIndexY(c: Char) = (c.toInt() - 0x370) / 16
 
-    private fun romanianIndexX(c: Char) = c.toInt() - 0x218
-    private fun romanianIndexY(c: Char) = 0
-
-    private fun thaiIndexX(c: Char) = (c.toInt() - 0xE00) % 16
-    private fun thaiIndexY(c: Char) = (c.toInt() - 0xE00) / 16
-
-    private fun thaiNarrowIndexX(c: Char) = 3
-    private fun thaiNarrowIndexY(c: Char) = 0
-
-
-    private val narrowWidthSheets = arrayOf(
-            SHEET_EXTB_ROMANIAN_NARROW
-    )
     private val unihanWidthSheets = arrayOf(
             SHEET_UNIHAN,
             SHEET_FW_UNI,
@@ -126,7 +119,8 @@ open class GameFontBase : Font {
             SHEET_ASCII_VARW,
             SHEET_CYRILIC_VARW,
             SHEET_EXTA_VARW,
-            SHEET_GREEK_VARW
+            SHEET_GREEK_VARW,
+            SHEET_EXTB_VARW
     )
 
 
@@ -151,8 +145,6 @@ open class GameFontBase : Font {
             }
             else if (zeroWidthSheets.contains(ctype))
                 len += 0
-            else if (narrowWidthSheets.contains(ctype))
-                len += W_LATIN_NARROW
             else if (ctype == SHEET_CJK_PUNCT)
                 len += W_ASIAN_PUNCT
             else if (ctype == SHEET_HANGUL)
@@ -188,6 +180,11 @@ open class GameFontBase : Font {
         for (i in 0..s.length - 1) {
             val ch = s[i]
 
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
+
             if (isHangul(ch)) {
                 val hIndex = ch.toInt() - 0xAC00
 
@@ -246,6 +243,11 @@ open class GameFontBase : Font {
         for (i in 0..s.length - 1) {
             val ch = s[i]
 
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
+
             if (isWenQuanYi1(ch)) {
                 val glyphW = getWidth("" + ch)
                 wenQuanYi_1.getSubImage(wenQuanYiIndexX(ch), wenQuanYi1IndexY(ch)).drawWithShadow(
@@ -263,6 +265,11 @@ open class GameFontBase : Font {
         for (i in 0..s.length - 1) {
             val ch = s[i]
 
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
+
             if (isWenQuanYi2(ch)) {
                 val glyphW = getWidth("" + ch)
                 wenQuanYi_2.getSubImage(wenQuanYiIndexX(ch), wenQuanYi2IndexY(ch)).drawWithShadow(
@@ -280,6 +287,11 @@ open class GameFontBase : Font {
         for (i in 0..s.length - 1) {
             val ch = s[i]
 
+            if (ch.isColourCode()) {
+                thisCol = colourKey[ch]!!
+                continue
+            }
+
             if (!isHangul(ch) && !isUniHan(ch)) {
 
                 // if not init, endUse first
@@ -296,6 +308,10 @@ open class GameFontBase : Font {
                         sheetX = extAindexX(ch)
                         sheetY = extAindexY(ch)
                     }
+                    SHEET_EXTB_VARW    -> {
+                        sheetX = extBindexX(ch)
+                        sheetY = extBindexY(ch)
+                    }
                     SHEET_KANA       -> {
                         sheetX = kanaIndexX(ch)
                         sheetY = kanaIndexY(ch)
@@ -320,14 +336,6 @@ open class GameFontBase : Font {
                         sheetX = greekIndexX(ch)
                         sheetY = greekIndexY(ch)
                     }
-                    SHEET_EXTB_ROMANIAN_WIDE   -> {
-                        sheetX = romanianIndexX(ch)
-                        sheetY = romanianIndexY(ch)
-                    }
-                    SHEET_EXTB_ROMANIAN_NARROW -> {
-                        sheetX = 0
-                        sheetY = 0
-                    }
                     else                       -> {
                         sheetX = ch.toInt() % 16
                         sheetY = ch.toInt() / 16
@@ -365,10 +373,7 @@ open class GameFontBase : Font {
     }
 
     private fun getSheetType(c: Char): Int {
-        // EFs
-        if (isRomanianNarrow(c))
-            return SHEET_EXTB_ROMANIAN_NARROW
-        else if (isHangul(c))
+        if (isHangul(c))
             return SHEET_HANGUL
         else if (isKana(c))
             return SHEET_KANA
@@ -378,6 +383,8 @@ open class GameFontBase : Font {
             return SHEET_ASCII_VARW
         else if (isExtA(c))
             return SHEET_EXTA_VARW
+        else if (isExtB(c))
+            return SHEET_EXTB_VARW
         else if (isCyrilic(c))
             return SHEET_CYRILIC_VARW
         else if (isUniPunct(c))
@@ -388,8 +395,8 @@ open class GameFontBase : Font {
             return SHEET_FW_UNI
         else if (isGreek(c))
             return SHEET_GREEK_VARW
-        else if (isRomanian(c))
-            return SHEET_EXTB_ROMANIAN_WIDE
+        else if (c.isColourCode())
+            return SHEET_COLOURCODE
         else
             return SHEET_UNKNOWN// fixed width punctuations
         // fixed width
@@ -418,6 +425,8 @@ open class GameFontBase : Font {
         drawString(x + xoff, y, printedBody, color)
     }
 
+    fun Char.isColourCode() = colourKey.containsKey(this)
+
     fun buildWidthTable(sheet: SpriteSheet, codeOffset: Int, codeRange: IntRange, rows: Int = 16) {
         fun Byte.toUint() = java.lang.Byte.toUnsignedInt(this)
 
@@ -483,6 +492,7 @@ open class GameFontBase : Font {
         internal val asciiWidths: HashMap<Int, Int> = HashMap()
 
         lateinit internal var extASheet: SpriteSheet
+        lateinit internal var extBSheet: SpriteSheet
         lateinit internal var kanaSheet: SpriteSheet
         lateinit internal var cjkPunct: SpriteSheet
         // static SpriteSheet uniHan;
@@ -492,8 +502,6 @@ open class GameFontBase : Font {
         lateinit internal var wenQuanYi_1: SpriteSheet
         lateinit internal var wenQuanYi_2: SpriteSheet
         lateinit internal var greekSheet: SpriteSheet
-        lateinit internal var romanianSheet: SpriteSheet
-        lateinit internal var romanianSheetNarrow: SpriteSheet
 
         internal val JUNG_COUNT = 21
         internal val JONG_COUNT = 28
@@ -502,8 +510,7 @@ open class GameFontBase : Font {
         internal val W_HANGUL = 11
         internal val W_KANA = 12
         internal val W_UNIHAN = 16
-        internal val W_LATIN_WIDE = 9 // width of regular letters, including m
-        internal val W_LATIN_NARROW = 5 // width of letter f, t, i, l
+        internal val W_LATIN_WIDE = 9 // width of regular letters
 
         internal val H = 20
         internal val H_HANGUL = 16
@@ -512,24 +519,42 @@ open class GameFontBase : Font {
 
         internal val SHEET_ASCII_VARW = 0
         internal val SHEET_HANGUL = 1
-        internal val SHEET_EXTA_VARW = 2
-        internal val SHEET_KANA = 3
-        internal val SHEET_CJK_PUNCT = 4
-        internal val SHEET_UNIHAN = 5
-        internal val SHEET_CYRILIC_VARW = 6
-        internal val SHEET_FW_UNI = 7
-        internal val SHEET_UNI_PUNCT = 8
-        internal val SHEET_WENQUANYI_1 = 9
-        internal val SHEET_WENQUANYI_2 = 10
-        internal val SHEET_GREEK_VARW = 11
-        internal val SHEET_EXTB_ROMANIAN_WIDE = 12
-        internal val SHEET_EXTB_ROMANIAN_NARROW = 13
+        internal val SHEET_EXTA_VARW = 3
+        internal val SHEET_EXTB_VARW = 4
+        internal val SHEET_KANA = 5
+        internal val SHEET_CJK_PUNCT = 6
+        internal val SHEET_UNIHAN = 7
+        internal val SHEET_CYRILIC_VARW = 8
+        internal val SHEET_FW_UNI = 9
+        internal val SHEET_UNI_PUNCT = 10
+        internal val SHEET_WENQUANYI_1 = 11
+        internal val SHEET_WENQUANYI_2 = 12
+        internal val SHEET_GREEK_VARW = 13
+
 
         internal val SHEET_UNKNOWN = 254
         internal val SHEET_COLOURCODE = 255
 
         lateinit internal var sheetKey: Array<SpriteSheet?>
 
+        /**
+         * Runic letters list used for game. The set is
+         * Younger Futhark + Medieval rune 'e' + Punct + Runic Almanac
+
+         * BEWARE OF SIMILAR-LOOKING RUNES, especially:
+
+         * * Algiz ᛉ instead of Maðr ᛘ
+
+         * * Short-Twig Hagall ᚽ instead of Runic Letter E ᛂ
+
+         * * Runic Letter OE ᚯ instead of Óss ᚬ
+
+         * Examples:
+         * ᛭ᛋᛁᚴᚱᛁᚦᛦ᛭
+         * ᛭ᛂᛚᛋᛅ᛭ᛏᚱᚢᛏᚾᛁᚾᚴᚢᚾᛅ᛬ᛅᚱᚾᛅᛏᛅᛚᛋ
+         */
+        internal val runicList = arrayOf('ᚠ', 'ᚢ', 'ᚦ', 'ᚬ', 'ᚱ', 'ᚴ', 'ᚼ', 'ᚾ', 'ᛁ', 'ᛅ', 'ᛋ', 'ᛏ', 'ᛒ', 'ᛘ', 'ᛚ', 'ᛦ', 'ᛂ', '᛬', '᛫', '᛭', 'ᛮ', 'ᛯ', 'ᛰ')
+
         internal var interchar = 0
         internal var scale = 1
             set(value) {
@@ -537,6 +562,49 @@ open class GameFontBase : Font {
                 else throw IllegalArgumentException("Font scale cannot be zero or negative (input: $value)")
             }
 
+        val colourKey = hashMapOf(
+                Pair(0x10.toChar(), Color(0xFFFFFF)), //*w hite
+                Pair(0x11.toChar(), Color(0xFFE080)), //*y ellow
+                Pair(0x12.toChar(), Color(0xFFB020)), //o range
+                Pair(0x13.toChar(), Color(0xFF8080)), //*r ed
+                Pair(0x14.toChar(), Color(0xFFA0E0)), //f uchsia
+                Pair(0x15.toChar(), Color(0xE0A0FF)), //*m agenta (purple)
+                Pair(0x16.toChar(), Color(0x8080FF)), //*b lue
+                Pair(0x17.toChar(), Color(0x80FFFF)), //c yan
+                Pair(0x18.toChar(), Color(0x80FF80)), //*g reen
+                Pair(0x19.toChar(), Color(0x008000)), //v iridian
+                Pair(0x1A.toChar(), Color(0x805030)), //x (khaki)
+                Pair(0x1B.toChar(), Color(0x808080))  //*k
+                //* marked: commonly used
+        )
+        val colToCode = hashMapOf(
+                Pair("w", 0x10.toChar()),
+                Pair("y", 0x11.toChar()),
+                Pair("o", 0x12.toChar()),
+                Pair("r", 0x13.toChar()),
+                Pair("f", 0x14.toChar()),
+                Pair("m", 0x15.toChar()),
+                Pair("b", 0x16.toChar()),
+                Pair("c", 0x17.toChar()),
+                Pair("g", 0x18.toChar()),
+                Pair("v", 0x19.toChar()),
+                Pair("x", 0x1A.toChar()),
+                Pair("k", 0x1B.toChar())
+        )
+        val codeToCol = hashMapOf(
+                Pair("w", colourKey[0x10.toChar()]),
+                Pair("y", colourKey[0x11.toChar()]),
+                Pair("o", colourKey[0x12.toChar()]),
+                Pair("r", colourKey[0x13.toChar()]),
+                Pair("f", colourKey[0x14.toChar()]),
+                Pair("m", colourKey[0x15.toChar()]),
+                Pair("b", colourKey[0x16.toChar()]),
+                Pair("c", colourKey[0x17.toChar()]),
+                Pair("g", colourKey[0x18.toChar()]),
+                Pair("v", colourKey[0x19.toChar()]),
+                Pair("x", colourKey[0x1A.toChar()]),
+                Pair("k", colourKey[0x1B.toChar()])
+        )
     }// end of companion object
 }
 

demo/src/net/torvald/terrarum/imagefont/GameFontImpl.kt

@@ -16,6 +16,8 @@ class GameFontImpl : GameFontBase() {
                 "./assets/graphics/fonts/ascii_variable.tga", 15, 19, 1)
         GameFontBase.extASheet = SpriteSheet(
                 "./assets/graphics/fonts/LatinExtA_variable.tga", 15, 19, 1)
+        GameFontBase.extBSheet = SpriteSheet(
+                "./assets/graphics/fonts/LatinExtB_variable.tga", 15, 19, 1)
         GameFontBase.kanaSheet = SpriteSheet(
                 "./assets/graphics/fonts/kana.tga", GameFontBase.W_KANA, GameFontBase.H_KANA)
         GameFontBase.cjkPunct = SpriteSheet(
@@ -43,15 +45,13 @@ class GameFontImpl : GameFontBase() {
                 "./assets/graphics/fonts/wenquanyi_11pt_part2.tga", 16, 18, 2)
         GameFontBase.greekSheet = SpriteSheet(
                 "./assets/graphics/fonts/greek_variable.tga", 15, 19, 1)
-        GameFontBase.romanianSheet = SpriteSheet(
-                "./assets/graphics/fonts/romana_wide.tga", GameFontBase.W_LATIN_WIDE, GameFontBase.H)
-        GameFontBase.romanianSheetNarrow = SpriteSheet(
-                "./assets/graphics/fonts/romana_narrow.tga", GameFontBase.W_LATIN_NARROW, GameFontBase.H)
 
         val shk = arrayOf(
                 GameFontBase.asciiSheet,
                 GameFontBase.hangulSheet,
+                null, // here was customised runic sheet
                 GameFontBase.extASheet,
+                GameFontBase.extBSheet,
                 GameFontBase.kanaSheet,
                 GameFontBase.cjkPunct,
                 null, // Full unihan, filler because we're using WenQuanYi
@@ -60,16 +60,24 @@ class GameFontImpl : GameFontBase() {
                 GameFontBase.uniPunct,
                 GameFontBase.wenQuanYi_1,
                 GameFontBase.wenQuanYi_2,
-                GameFontBase.greekSheet,
-                GameFontBase.romanianSheet,
-                GameFontBase.romanianSheetNarrow
+                GameFontBase.greekSheet
         )
         GameFontBase.sheetKey = shk
 
 
-        buildWidthTable(asciiSheet, 0, 0..0xFF)
-        buildWidthTable(extASheet, 0x100, 0..0x7F)
-        buildWidthTable(cyrilic, 0x400, 0..0x5F)
+        buildWidthTable(asciiSheet, 0,     0..0xFF)
+        buildWidthTable(extASheet,  0x100, 0..0x7F)
+        buildWidthTable(extBSheet,  0x180, 0..0xCF)
+        buildWidthTable(cyrilic,    0x400, 0..0x5F)
         buildWidthTable(greekSheet, 0x370, 0..0x5F)
     }
+
+    fun reload() {
+        GameFontBase.cyrilic = SpriteSheet(
+                when (GameFontDemo.gameLocale.substring(0..1)) {
+                    "bg" -> "./assets/graphics/fonts/cyrilic_bulgarian_variable.tga"
+                    "sr" -> "./assets/graphics/fonts/cyrilic_serbian_variable.tga"
+                    else -> "./assets/graphics/fonts/cyrilic_variable.tga"
+                }, 15, 19, 1)
+    }
 }