Merge remote-tracking branch 'origin/master'

# Conflicts:
#	game/scene.lua

editor/scene.lua

@@ -77,6 +77,7 @@ function scene.getTransform()
   return transform
 end
 
+last_hovered_tile = {0,0}
 function scene.draw(dt)
   love.graphics.setBackgroundColor(0.10, 0.1, 0.11)
 
@@ -150,6 +151,12 @@ function scene.draw(dt)
 
     love.graphics.setColor(1, 1, 0)
     love.graphics.rectangle("line", hx * TILE_SIZE, hy * TILE_SIZE, TILE_SIZE, TILE_SIZE)
+
+    last_hovered_tile = {hx, hy}
+  end
+
+  if selector_open then
+    love.graphics.print(last_hovered_tile[1] .. ', ' .. last_hovered_tile[2], 0, roomheight)
   end
 
   love.graphics.pop()

game/scene.lua

@@ -3,13 +3,16 @@ local scene = {}
 function scene.load()
   repeat_timers = {}
   selector_open = false
+  game_started = false
 
   clear()
   love.mouse.setCursor(empty_cursor)
   resetMusic("bab_be_u_them", 0.5)
   loadMap()
   parseRules()
   updateUnits(true)
+
+  game_started = true
 end
 
 function scene.update(dt)
@@ -23,7 +26,7 @@ function scene.update(dt)
   	cursors[i].y = cursors[i].y + mouse_Y - mouse_oldY
   end
 
-  if cursor_convert_to ~= nil then
+  if game_started and cursor_convert_to ~= nil then
     for i,mous in ipairs(cursors) do
       local hx,hy = screenToGameTile(cursors[i].x, cursors[i].y)
       if hx ~= nil and hy ~= nil then
@@ -99,6 +102,15 @@ function scene.draw(dt)
         if unit.type == "text" and not unit.active then
           brightness = 0.33
         end
+
+        if unit.fullname == "text_gay" then
+          if unit.active then
+            unit.sprite = "text_gay-colored"
+          else
+            unit.sprite = "text_gay"
+          end
+        end
+
         local drawx = lerp(unit.oldx, unit.x, unit.move_timer/MAX_MOVE_TIMER)
         local drawy = lerp(unit.oldy, unit.y, unit.move_timer/MAX_MOVE_TIMER)
 

game/undo.lua

@@ -3,7 +3,9 @@ function newUndo()
 end
 
 function addUndo(data)
-  table.insert(undo_buffer[1], 1, data)
+  if #undo_buffer > 0 then
+    table.insert(undo_buffer[1], 1, data)
+  end
 end
 
 function undo()

game/unit.lua

@@ -122,9 +122,9 @@ function updateUnits(undoing)
     local istext = false
     if rule[3] == "text" then
       istext = true
-      obj_name = "text_" .. unit.name
+      obj_name = "text_" .. rule[1]
     end
-    local obj_id = tiles_by_name[rule[3]]
+    local obj_id = tiles_by_name[obj_name]
     local obj_tile = tiles_list[obj_id]
 
     if units_by_name[rule[1]] then

values.lua

@@ -437,5 +437,14 @@ tiles_list = {
     grid = {5, 7},
     color = {115,115,115},
     layer = 20
-  }
+  },
+  --41
+  {
+    name = "text_text",
+    sprite = "text_txt",
+    type = "text",
+    grid = {6, 2},
+    color = {217,57,106},
+    layer = 20,
+  },
 }