Permalink
Browse files

Fix up mapgen and tiles with the new furniture brazier.

  • Loading branch information...
kevingranade committed Oct 19, 2017
1 parent c35a577 commit cf1bb9ffae8c0b4d7445e4f09e79451ebc05233c
@@ -37,7 +37,7 @@
],
"mapping": {
"b": {
"traps": "tr_brazier"
"furniture": "f_brazier"
}
},
"terrain": {
@@ -37,7 +37,7 @@
],
"mapping": {
"b": {
"traps": "tr_brazier"
"furniture": "f_brazier"
}
},
"items": {
@@ -111,7 +111,7 @@
},
"mapping": {
"X": {
"traps": "tr_brazier",
"furniture": "f_brazier",
"item": { "item": "2x4", "count": 5 },
"fields": { "field": "fd_fire" }
}
@@ -110,7 +110,7 @@
},
"mapping": {
"X": {
"traps": "tr_brazier",
"furniture": "f_brazier",
"item": { "item": "2x4" },
"fields": { "field": "fd_fire" }
}
@@ -108,7 +108,7 @@
},
"mapping": {
"X": {
"traps": "tr_brazier",
"furniture": "f_brazier",
"item": { "item": "2x4", "count": 5 },
"fields": { "field": "fd_fire" }
}
@@ -116,7 +116,7 @@
"fields": { "field": "fd_blood" }
},
"X": {
"traps": "tr_brazier",
"furniture": "f_brazier",
"item": { "item": "2x4" },
"fields": { "field": "fd_fire" }
}
@@ -114,7 +114,7 @@
},
"mapping": {
"X": {
"traps": "tr_brazier",
"furniture": "f_brazier",
"item": { "item": "2x4", "count": 5 },
"fields": { "field": "fd_fire" }
}
@@ -114,7 +114,7 @@
},
"mapping": {
"X": {
"traps": "tr_brazier",
"furniture": "f_brazier",
"item": { "item": "2x4", "count": 5 },
"fields": { "field": "fd_fire" }
}
@@ -115,7 +115,7 @@
],
"mapping": {
"X": {
"traps": "tr_brazier",
"furniture": "f_brazier",
"item": { "item": "2x4", "count": 5 },
"fields": { "field": "fd_fire" }
}
@@ -1393,7 +1393,7 @@
"rotates":false
},
{
"id":"tr_brazier",
"id":"f_brazier",
"rotates":false
},
{
@@ -50324,7 +50324,7 @@
"rotates": false
},
{
"id": "tr_brazier",
"id": "f_brazier",
"fg": 2590,
"rotates": false
},
@@ -50346,7 +50346,7 @@
"rotates": false
},
{
"id": "tr_brazier",
"id": "f_brazier",
"fg": 2590,
"rotates": false
},
@@ -12604,7 +12604,7 @@
},
{
"fg": 2590,
"id": "tr_brazier",
"id": "f_brazier",
"rotates": false
},
{
@@ -50307,7 +50307,7 @@
"rotates": false
},
{
"id": "tr_brazier",
"id": "f_brazier",
"fg": 2590,
"rotates": false
},
@@ -961,7 +961,7 @@
"rotates":false
},
{
"id":"tr_brazier",
"id":"f_brazier",
"rotates":false
},
{
@@ -7500,7 +7500,7 @@
"fg": 2205
},
{
"id": ["brazier", "tr_brazier" ],
"id": ["brazier", "f_brazier" ],
"fg": 2206
},
{
@@ -8556,4 +8556,4 @@
}
]
}
}
}
@@ -1619,7 +1619,7 @@
"rotates":false
},
{
"id":"tr_brazier",
"id":"f_brazier",
"fg":1609,
"rotates":false
},
@@ -21953,7 +21953,7 @@
"rotates": false
},
{
"id": "tr_brazier",
"id": "f_brazier",
"fg": 2486
},
{
@@ -24356,4 +24356,4 @@
]
}
]
}
}
@@ -21953,7 +21953,7 @@
"rotates": false
},
{
"id": "tr_brazier",
"id": "f_brazier",
"fg": 2486
},
{
@@ -24356,4 +24356,4 @@
]
}
]
}
}
@@ -31666,11 +31666,11 @@
"rotates" : false,
"multitile" : false
},
{
"id":"tr_brazier",
"fg" : 1371,
"rotates":false
},
{
"id":"f_brazier",
"fg" : 1371,
"rotates":false
},
{
"id" : "funnel",
"fg" : 1610,
@@ -31666,12 +31666,12 @@
"bg" : -1,
"rotates" : false,
"multitile" : false
},
{
"id":"tr_brazier",
"fg" : 1371,
"rotates":false
},
},
{
"id":"f_brazier",
"fg" : 1371,
"rotates":false
},
{
"id" : "funnel",
"fg" : 1610,
@@ -34737,7 +34737,7 @@
"fg": [
1371
],
"id": "tr_brazier",
"id": "f_brazier",
"rotates": false
},
{
@@ -3084,7 +3084,7 @@
"rotates":false
},
{
"id":"tr_brazier",
"id":"f_brazier",
"fg":449,
"rotates":false
},
@@ -1541,7 +1541,7 @@
"rotates":false
},
{
"id":"tr_brazier",
"id":"f_brazier",
"fg":1609,
"rotates":false
},
View
@@ -945,7 +945,7 @@
"rotates":false
},
{
"id":"tr_brazier",
"id":"f_brazier",
"rotates":false
},
{
@@ -1430,7 +1430,7 @@
"multitile":false
},
{
"id": "tr_brazier",
"id": "f_brazier",
"fg":-1,
"bg":-1,
"rotates":false,

0 comments on commit cf1bb9f

Please sign in to comment.