Skip to content

Commit

Permalink
change level.json
Browse files Browse the repository at this point in the history
  • Loading branch information
FRANCIS LOPEZ authored and FRANCIS LOPEZ committed Oct 24, 2015
1 parent a4a656c commit 1bf1d61
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions assets/data/levels.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"title": "Cave",
"tileset": "tilemap_cave",
"rockId": 1214,
<<<<<<< HEAD
"data":[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
Expand All @@ -14,15 +13,11 @@
[0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]

=======
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
>>>>>>> a85871d8422cc93d715a1de95d9ae54cc9bd37a9
},
{
"title": "Ice Cave",
"tileset": "tilemap_cave",
"rockId": 974,
<<<<<<< HEAD
"data":[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 974, 974, 974, 974, 974, 974, 0, 974, 0, 0, 0, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 974, 974, 974, 0, 974, 974, 974, 974, 0],
Expand All @@ -32,14 +27,19 @@
[0, 0, 0, 0, 974, 0, 974, 974, 974, 974, 974, 974, 0, 0, 0],
[0, 0, 974, 974, 974, 0, 974, 0, 0, 974, 0, 0, 0, 974, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 974, 0, 0, 0, 974, 0]]
=======
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 974, 974, 974, 974, 974, 974, 0, 974, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 974, 974, 974, 0, 974, 974, 974, 974, 0, 0, 0, 974, 974, 974, 0, 974, 0, 974, 0, 0, 0, 0, 974, 0, 0, 0, 0, 0, 974, 0, 974, 0, 974, 0, 0, 0, 0, 0, 0, 0, 974, 974, 0, 974, 0, 0, 0, 0, 0, 974, 0, 0, 974, 0, 0, 0, 0, 0, 974, 0, 974, 974, 974, 974, 974, 974, 0, 0, 0, 0, 0, 974, 974, 974, 0, 974, 0, 0, 974, 0, 0, 0, 974, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 974, 0, 0, 0, 974, 0]
>>>>>>> a85871d8422cc93d715a1de95d9ae54cc9bd37a9
},
{
"title": "Grass",
"tileset": "tilemap_grass",
"rockId": 23,
"data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 23, 0, 23, 0, 23, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, 23, 0, 23, 0, 0, 0, 23, 0, 0, 23, 23, 23, 0, 0, 0, 0, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 23, 0, 0, 23, 23, 0, 23, 0, 23, 23, 23, 23, 23, 23, 0, 23, 0, 0, 0, 23, 0, 0, 0, 0, 23, 0, 23, 0, 23, 0, 23, 0, 0, 0, 23, 0, 23, 23, 23, 23, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
"data":[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 0, 23, 0, 23, 0, 23, 0, 23, 0, 23, 0, 23, 0, 0],
[0, 0, 0, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0],
[0, 23, 23, 0, 23, 0, 0, 0, 23, 0, 0, 23, 23, 23, 0],
[0, 0, 0, 0, 23, 0, 23, 0, 0, 0, 0, 0, 0, 23, 0],
[0, 23, 23, 0, 23, 0, 23, 23, 23, 23, 23, 23, 0, 23, 0],
[0, 0, 23, 0, 0, 0, 0, 23, 0, 23, 0, 23, 0, 23, 0],
[0, 0, 23, 0, 23, 23, 23, 23, 0, 0, 0, 23, 0, 0, 0],
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]
}
]

0 comments on commit 1bf1d61

Please sign in to comment.