Merge pull request #1212 from hawkthorne/moar_json

Convert character maps to JSON
hawkthorne · Apr 6, 2013 · 9d1ec96 · 9d1ec96
2 parents 6960be9 + d1f79a1
commit 9d1ec96
Show file tree

Hide file tree

Showing 43 changed files with 2,480 additions and 742 deletions.
diff --git a/src/character.lua b/src/character.lua
@@ -1,13 +1,18 @@
+local json = require 'src/hawk/json'
 local anim8 = require 'vendor/anim8'
 local Timer = require 'vendor/timer'
 local sound = require 'vendor/TEsound'
-local sprite_map = require 'character_map'
+
+local contents, _ = love.filesystem.read('character_map.json')
+local sprite_map = json.decode(contents)
 
 local characters = {}
 
 for i,p in pairs( love.filesystem.enumerate( 'characters' ) ) do
+
     -- bring in the data from the character file
-    local character = require( 'characters/' .. p:gsub('.lua', '') )
+    local contents, _ = love.filesystem.read('characters/' .. p)
+    local character = json.decode(contents)
 
     if character.animations then --merge
         local base = deepcopy(character.animations)