Cleaning up bugs in GameEditor and updating default template.

Disks/PixelVision8System/code.lua

@@ -1,6 +1,6 @@
 --[[
   Pixel Vision 8 - New Template Script
-  Copyright (C) 2017, Pixel Vision 8 (http://pixelvision8.com)
+  Copyright (C) 2017, Pixel Vision 8 (@pixelvision8)
   Created by Jesse Freeman (@jessefreeman)
 
   This project was designed to display some basic instructions when you create
@@ -11,50 +11,62 @@
   https://www.pixelvision8.com/getting-started
 ]]--
 
--- 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.
+--[[
+  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 = "EMPTY GAME\n\n\nThis is an empty game template.\n\n\nVisit 'pixelvision8.com' to learn more about creating games from scratch."
 
--- The Init() method is part of the game's lifecycle and called a game starts. We are going to
--- use this method to configure background color, ScreenBufferChip and draw a text box.
+--[[
+  The Init() method is part of the game's lifecycle and called a game starts.
+  We are going to use this method to configure background color,
+  ScreenBufferChip and draw a text box.
+]]--
 function Init()
 
-  -- Here we are manually changing the background color
-  BackgroundColor(0)
+    -- Here we are manually changing the background color
+    BackgroundColor(0)
 
-  local display = Display()
+    local display = Display()
 
-  -- We are going to render the message in a box as tiles. To do this, we need to wrap the
-  -- text, then split it into lines and draw each line.
-  local wrap = WordWrap(message, (display.x / 8) - 2)
-  local lines = SplitLines(wrap)
-  local total = #lines
-  local startY = ((display.y / 8) - 1) - total
+    -- We are going to render the message in a box as tiles. To do this, we
+    -- need to wrap the text, then split it into lines and draw each line.
+    local wrap = WordWrap(message, (display.x / 8) - 2)
+    local lines = SplitLines(wrap)
+    local total = #lines
+    local startY = ((display.y / 8) - 1) - total
 
-  -- We want to render the text from the bottom of the screen so we offset it and loop backwards.
-  for i = total, 1, - 1 do
-    DrawText(lines[i], 1, startY + (i - 1), DrawMode.Tile, "large", 15)
-  end
+    -- We want to render the text from the bottom of the screen so we offset
+    -- it and loop backwards.
+    for i = total, 1, - 1 do
+        DrawText(lines[i], 1, startY + (i - 1), DrawMode.Tile, "large", 15)
+    end
 
 end
 
--- The Update() method is part of the game's life cycle. The engine calls Update() on every frame
--- before the Draw() method. It accepts one argument, timeDelta, which is the difference in
--- milliseconds since the last frame.
+--[[
+  The Update() method is part of the game's life cycle. The engine calls
+  Update() on every frame before the Draw() method. It accepts one argument,
+  timeDelta, which is the difference in milliseconds since the last frame.
+]]--
 function Update(timeDelta)
 
-  -- TODO add your own update logic here
+    -- TODO add your own update logic here
 
 end
 
--- The Draw() method is part of the game's life cycle. It is called after Update() and is where
--- all of our draw calls should go. We'll be using this to render sprites to the display.
+--[[
+  The Draw() method is part of the game's life cycle. It is called after
+  Update() and is where all of our draw calls should go. We'll be using this
+  to render sprites to the display.
+]]--
 function Draw()
 
-  -- We can use the RedrawDisplay() method to clear the screen and redraw the tilemap in a
-  -- single call.
-  RedrawDisplay()
+    -- We can use the RedrawDisplay() method to clear the screen and redraw
+    -- the tilemap in a single call.
+    RedrawDisplay()
 
-  -- TODO add your own draw logic here.
+    -- TODO add your own draw logic here.
 
 end

Disks/PixelVision8System/data.json

@@ -6,8 +6,7 @@
 		"backgroundColor": 0,
 		"maskColor": "#FF00FF",
 		"unique": false,
-		"debug": false,
-
+		"debug": false
 	},
 	"DisplayChip":
 	{
@@ -16,14 +15,13 @@
 		"overscanX": 1,
 		"overscanY": 1,
 		"layers": 6
-
 	},
 	"FontChip":
 	{
 	},
 	"GameChip":
 	{
-		"lockSpecs": false,
+		"lockSpecs": true,
 		"maxSize": 512,
 		"saveSlots": 8
 	},
@@ -40,7 +38,6 @@
 		"totalSounds": 32,
 		"channelTypes": [-1, -1, -1, -1, -1]
 	},
-
 	"SpriteChip": {
 		"maxSpriteCount": 0,
 		"unique": false,
@@ -54,7 +51,6 @@
 		"columns": 256,
 		"rows": 256,
 		"totalFlags": 16,
-		"autoImport": false,
-
+		"autoImport": false
 	}
 }

Runners/GameRunner/GameRunner.Desktop.csproj

@@ -67,8 +67,12 @@
     <EmbeddedResource Include="Icon.icns">
       <LogicalName>Icon.icns</LogicalName>
     </EmbeddedResource>
+    <Content Include="Icon.icns" />
   </ItemGroup>
   <ItemGroup>
+      <Content Include="Content\bios.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
     <!-- Shader Effects -->
     <Content Include="..\..\Effects\*.*">
       <Link>Content\Effects\%(FileName)%(Extension)</Link>
@@ -87,25 +91,11 @@
       <Link>Content\LoadTool\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Content\bios.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Icon.icns" />
-  </ItemGroup>
-  <ItemGroup>
     <Content Include="..\..\Disks\PixelVision8System\*.*">
       <Link>Content\DefaultGame\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\Effects\*.*">
-      <Link>Content\Effects\%(FileName)%(Extension)</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>

Runners/PixelVision8/Runner/Editors/GameEditor.cs

@@ -744,7 +744,7 @@ public int[] FlipPixelData(int[] data, bool flipH = false, bool flipV = false, i
 //            return gameChip.Sprites(ids, width);
 //        }
 
-        public int TotalSprites(bool ignoreEmpty = true)
+        public int TotalSprites(bool ignoreEmpty = false)
         {
             return gameChip.TotalSprites(ignoreEmpty);
         }

SDK/Engine/Chips/Game/GameChip.cs

@@ -301,7 +301,6 @@ public string Color(int id, string value = null)
         /// </returns>
         public int TotalColors(bool ignoreEmpty = false)
         {
-            // TODO this shouldn't use the supported colors
             return ignoreEmpty ? colorChip.totalUsedColors : colorChip.total;
         }