Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thunraz
Thunraz committed Nov 5, 2022
2 parents 894a2b6 + 84a8cf4 commit d2ef225
Show file tree
Hide file tree
Showing 3 changed files with 1,114 additions and 6 deletions.
304 changes: 299 additions & 5 deletions assets/level/level_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
77, 78, 78, 78, 78, 78, 78, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 1, 2, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
77, 78, 78, 78, 78, 78, 78, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 26, 27, 27, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
77, 78, 78, 78, 78, 78, 78, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 53, 51, 52, 52, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
77, 28, 28, 28, 28, 28, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
77, 28, 28, 28, 28, 28, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
77, 28, 28, 28, 28, 28, 28, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
77, 28, 28, 28, 28, 28, 28, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
77, 28, 28, 28, 28, 28, 28, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, 104],
77, 78, 78, 78, 78, 78, 78, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285,
77, 78, 78, 78, 78, 78, 78, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285,
77, 78, 78, 78, 78, 78, 78, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285,
77, 78, 78, 78, 78, 78, 78, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285,
77, 78, 78, 78, 78, 78, 78, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285, 1285],
"height":50,
"id":1,
"name":"ground",
Expand Down Expand Up @@ -483,6 +483,300 @@
}]
}],
"tilewidth":8
},
{
"columns":25,
"firstgid":1251,
"image":"tileset_wasteland.png",
"imageheight":400,
"imagewidth":200,
"margin":0,
"name":"wasteland",
"spacing":0,
"tilecount":1250,
"tileheight":8,
"tiles":[
{
"id":0,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":1,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":2,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":3,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":4,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":5,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":6,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":7,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":8,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":9,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":10,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":11,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":12,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":25,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":26,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":27,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":28,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":29,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":30,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":31,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":32,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":33,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":50,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":51,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":52,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":53,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":54,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":55,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":56,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":57,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
},
{
"id":58,
"properties":[
{
"name":"blocked",
"type":"bool",
"value":true
}]
}],
"tilewidth":8,
"transparentcolor":"#ffffff"
}],
"tilewidth":8,
"type":"map",
Expand Down
Loading

0 comments on commit d2ef225

Please sign in to comment.