Switching text over to palettes and created a new custom font.

Author: jessefreeman

Game/Src/code-display-text.lua

@@ -27,7 +27,7 @@ function CreateTextDisplay(rect)
   data.textTime = 0
   data.currentChar = 0
   data.totalChars = 0
-  data.nextY = rect.y
+  data.nextY = rect.y/8
   data.drawText = false
   data.paused = false
 
@@ -90,13 +90,18 @@ function DrawTextDisplay(data)
 end
 
 function DrawNextLine(data)
+  
+  -- We need a reference ot the current line we are on
   local line = data.lines[data.currentLine]
-  local colorOffset = data.colorOffsets[data.currentLine]
-  -- print("offsets", dump(data.colorOffsets))
 
+  -- Ge the current character to draw
   local char = line:sub(data.currentChar, data.currentChar)
 
-  DrawText(char, data.currentChar * 8, data.nextY, DrawMode.TilemapCache, "large", colorOffset[data.currentChar])
+  -- Get the color offset for the current character and default it to 0 if the value is nil which happens when there is a space
+  local colorOffset = data.colorOffsets[data.currentLine][data.currentChar] or 0
+
+  -- Draw the character to the tilemap
+  DrawText(char, data.currentChar, data.nextY, DrawMode.Tile, "terminal", colorOffset)
 
   data.currentChar = data.currentChar + 1
 
@@ -108,15 +113,15 @@ function DrawNextLine(data)
       data.drawText = false
     end
 
-    data.nextY = data.nextY + 8
+    data.nextY = data.nextY + 1
 
     if(data.drawText == true and data.nextY > (data.rect.y + (data.rect.h - 16))) then
 
       if(data.paused == false) then
 
         data.paused = true
 
-        DrawText("...", data.rect.x, data.nextY, DrawMode.TilemapCache, "large", 15)
+        DrawText("...", data.rect.x, data.nextY, DrawMode.TilemapCache, "terminal", 15)
 
         -- reset some of the text display's values
         data.nextY = data.rect.y
@@ -159,7 +164,7 @@ function DisplayText(data, text, clear)
   -- Get the lines
   local newLines = SplitLines(wrap)
 
-  print("lines", dump(newLines))
+  -- print("lines", dump(newLines))
 
   local offset = 0
 

Game/Src/code-map-generator.lua

@@ -56,6 +56,26 @@ function ClearMap(data)
   end
 end
 
+local bitFlagTable =
+{
+  "0000",
+  "0001",
+  "0010",
+  "0011",
+  "0100",
+  "0101",
+  "0110",
+  "0111",
+  "1000",
+  "1001",
+  "1010",
+  "1011",
+  "1100",
+  "1101",
+  "1110",
+  "1111"
+}
+
 function GenerateMap(data)
   -- ClearMap(data)
 
@@ -80,10 +100,12 @@ function GenerateMap(data)
       local c = i-1
       local r = j-1
 
-      print("tile", c, r, calId(c, r, data.width), dump(data.maze[i][j]))
+      local tile = data.maze[i][j]
+      local sides = tostring(tile.down) .. tostring(tile.right) .. tostring(tile.left) .. tostring(tile.up)
 
-    end
+      print("tile", c, r, calId(c, r, data.width), sides, table.indexOf(bitFlagTable, sides), dump(tile))
 
+    end
 
   end
 

Game/Src/code-simple-input-field.lua

@@ -69,7 +69,7 @@ function DrawInputField(data)
     local tmpX = data.rect.x + (#data.text * data.spriteSize.x)
 
     if(tmpX < data.rect.w) then
-      DrawText(data.blinkChar, tmpX, data.rect.y, DrawMode.Sprite, "large", 15)
+      DrawText(data.blinkChar, tmpX, data.rect.y, DrawMode.Sprite, "terminal", 46)
     end
 
   end
@@ -110,7 +110,7 @@ function DrawInputField(data)
     local text, colorOffsets = colorizeText(data.suggestedTest, 6)
 
     -- Draw the text to the display
-    DrawColoredText(text, data.rect.x, data.rect.y, DrawMode.TilemapCache, "large", colorOffsets)
+    DrawColoredText(text, data.rect.x, data.rect.y, DrawMode.TilemapCache, "terminal", colorOffsets)
 
   end
 

Game/Src/code-utils.lua

@@ -72,6 +72,8 @@ function string.replaceTokens(text, data)
 
 end
 
+TOTAL_COLORS = 15
+
 function colorizeText(text, defaultColor, tokens)
 
   -- local tokens = {}
@@ -84,8 +86,10 @@ function colorizeText(text, defaultColor, tokens)
 
   local colorString = ""
 
-  for i = 1, #text do
+  local defaultColor = ((defaultColor or 15) * 2) + TOTAL_COLORS + 1
 
+  for i = 1, #text do
+    
     local char = string.sub(text, i, i)
 
     -- Look to see if we are at the start of a token
@@ -103,13 +107,13 @@ function colorizeText(text, defaultColor, tokens)
       elseif(colorString == "") then
 
         -- This is a special case to take into account for a token in the text or just come characters wrapped in open and closed brakes
-        colorString = tostring(defaultColor)
+        colorString = tostring(15)
         token = "{" .. token .. "}"
 
       end
 
       -- Time to apply the color so convert the color string into a number  
-      local color = tonumber(colorString)
+      local color = ((tonumber(colorString) or 0) * 2) + TOTAL_COLORS + 1
 
       -- Add the token to the text
       newText = newText .. token

Game/code.lua

@@ -20,7 +20,6 @@ LoadScript("code-message-bar")
 LoadScript("code-inventory")
 LoadScript("code-combat")
 
-
 -- This this is an empty game, we will the following text. We combined two sets of fonts into
 -- the default.font.png. Use uppercase for larger characters and lowercase for a smaller one.
 local message = textTemplates.intro
@@ -41,8 +40,6 @@ function Init()
   -- Here we are manually changing the background color
   BackgroundColor(0)
 
-  
-
   inputField = CreateInputField({x = 8, y = 224, w = 240})
 
   textDisplay = CreateTextDisplay({x = 8, y = 8, w = 240, h = 200})

Game/colors.png

@@ -0,0 +1,11 @@
+{
+  "ColorChip":
+  {
+    "total": 32,
+    "maxColors": 128,
+    "backgroundColor": 0,
+    "maskColor": "#FF00FF",
+    "unique": false,
+    "debug": false
+  }
+}