Table and chairs

Fix editor flood fill overflow at map edge
This commit is contained in:
Cong
2021-03-23 21:34:53 +11:00
parent 069afb0335
commit 57d04420d4
13 changed files with 424 additions and 451 deletions

View File

@@ -424,6 +424,16 @@
"DrawBelow": true,
"Flags": ["Inside", "NoWalls"]
},
{
"Name": "table_and_chairs",
"Pic": {
"Type": "Normal",
"Pic": "table_and_chairs"
},
"Wreck": "table_wood_round_wreck",
"Health": 30,
"Flags": ["Inside", "NoWalls"]
},
{
"Name": "table_steel",
"Pic": {
@@ -475,6 +485,42 @@
"DrawBelow": true,
"Flags": ["Inside", "NoWalls"]
},
{
"Name": "chair_dining_left",
"Pic": {
"Type": "Normal",
"Pic": "chair_dining_left"
},
"Wreck": "table_wood_round_wreck",
"Size": [8, 6],
"Offset": [-4, -10],
"Health": 20,
"Flags": ["Inside", "NoWalls"]
},
{
"Name": "chair_dining_right",
"Pic": {
"Type": "Normal",
"Pic": "chair_dining_right"
},
"Wreck": "table_wood_round_wreck",
"Size": [8, 6],
"Offset": [-4, -10],
"Health": 20,
"Flags": ["Inside", "NoWalls"]
},
{
"Name": "chair_dining_top",
"Pic": {
"Type": "Normal",
"Pic": "chair_dining_top"
},
"Wreck": "table_wood_round_wreck",
"Size": [8, 6],
"Offset": [-4, -10],
"Health": 20,
"Flags": ["Inside", "NoWalls"]
},
{
"Name": "chair_task",
"Pic": {

View File

@@ -0,0 +1,4 @@
Roguelike Dungeon/World Tiles
by Joe Williamson (@JoeCreates)
https://opengameart.org/content/roguelike-dungeonworld-tiles
http://creativecommons.org/licenses/by-sa/3.0/

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -0,0 +1,11 @@
Adapted from
Tables and Stools
By Jordan Irwin
http://opengameart.org/content/tables-and-stools
http://creativecommons.org/licenses/by/3.0/
Roguelike Dungeon/World Tiles
by Joe Williamson (@JoeCreates)
https://opengameart.org/content/roguelike-dungeonworld-tiles
http://creativecommons.org/licenses/by-sa/3.0/

View File

@@ -1,15 +1,6 @@
{
"Version": 3,
"MapObjects": [
{
"Name": "oil_drum",
"Pic": {
"Type": "Normal",
"Pic": "barrel_green"
},
"Health": 9999,
"Flags": ["Outside", "OneWall"]
},
{
"Name": "heer_flag",
"Pic": {

View File

@@ -3,7 +3,7 @@
"Title": "",
"Description": "",
"Type": "Static",
"Width": 16,
"Width": 32,
"Height": 17,
"ExitStyle": "hazard",
"KeyStyle": "plain2",
@@ -749,40 +749,40 @@
"IsRoom": false
}
},
"Tiles": ["0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,2,1,3,1,4,1,5,0,6,0,7,0,8,0,9",
"0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,10,0,11,0,12,0,13,0,14,0,15,0,16,0,17",
"0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,18,0,19,0,20,0,21,0,22,0,23,0,24,0,25",
"0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,26,0,27,0,28,0,29,0,30,0,31,0,32,0,33",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,34,0,35,0,36,0,37,0,38,0,39,0,40,0,41",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,50,0,51,0,52,0,53,0,54,0,55,0,56,0,57",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,58,0,59,0,59,0,61,0,62,0,63,0,0,0,0",
"0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0"],
"Access": ["0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,0,0,0,256,0,1024,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,0",
"0,256,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,1024,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,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0"],
"Tiles": ["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,2,1,3,1,4,1,5,0,6,0,7,0,8,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,1,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,10,0,11,0,12,0,13,0,14,0,15,0,16,0,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,1,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,18,0,19,0,20,0,21,0,22,0,23,0,24,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,1,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,26,0,27,0,28,0,29,0,30,0,31,0,32,0,33,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,0,0,0,0,0,0,0,0",
"0,34,0,35,0,36,0,37,0,38,0,39,0,40,0,41,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,0,0,0,0,0,0,0,0",
"0,42,0,43,0,44,0,45,0,46,0,47,0,48,0,49,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,0,0,0,0,0,0,0,0",
"0,50,0,51,0,52,0,53,0,54,0,55,0,56,0,57,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,0,0,0,0,0,0,0,0",
"0,58,0,59,0,59,0,61,0,62,0,63,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,0,0,0,0,0,0,0,0,0,0,0,0"],
"Access": ["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,256,0,1024,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,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,0,0,0,0,0,0,0,0,0",
"0,256,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
"0,1024,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,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,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,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,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,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,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,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,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"],
"StaticItems": [{
"MapObject": "jail_cell",
"Positions": [[9, 2]]
@@ -895,6 +895,18 @@
{
"MapObject": "panel",
"Positions": [[15, 12]]
},
{
"MapObject": "pool_water",
"Positions": [[17, 1]]
},
{
"MapObject": "barrel_green",
"Positions": [[19, 1]]
},
{
"MapObject": "table_and_chairs",
"Positions": [[21, 1]]
}],
"StaticCharacters": [],
"StaticObjectives": [],
@@ -922,6 +934,6 @@
"Mission": 1,
"Hidden": false
}],
"AltFloorsEnabled": true
"AltFloorsEnabled": false
}]
}

View File

@@ -1,7 +1,11 @@
{
"Version": 12,
"Version": 16,
"Title": "Sprite test",
"Author": "",
"Description": "Missions that have various map objects to test their appearance in-game.",
"Ammo": false,
"WeaponPersist": false,
"SkipWeaponMenu": false,
"RandomPickups": true,
"Missions": 1
}

View File

@@ -1,4 +1,4 @@
{
"Version": 12,
"Version": 13,
"Characters": []
}

View File

@@ -5,12 +5,8 @@
"Type": "Static",
"Width": 34,
"Height": 27,
"WallStyle": "stone",
"FloorStyle": "tile",
"RoomStyle": "striped",
"ExitStyle": "hazard",
"KeyStyle": "office",
"DoorStyle": "office",
"Objectives": [],
"Enemies": [],
"SpecialChars": [],
@@ -38,531 +34,436 @@
"Launcher",
"Pistol"],
"Song": "",
"WallMask": "848484",
"FloorMask": "484848",
"RoomMask": "707070",
"AltMask": "482400",
"Tiles": "1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,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,1,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,1,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,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,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,1,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,1,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,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,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,1,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,1,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,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,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,1,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,1,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,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,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,1,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,1,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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,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,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,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,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,1,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,0,0,0,0,0,0",
"TileClasses": {
"0": {
"Name": "tile",
"Type": "Floor",
"Style": "tile",
"Mask": "484848ff",
"MaskAlt": "482400ff",
"CanWalk": true,
"IsOpaque": false,
"Shootable": false,
"IsRoom": false
},
"1": {
"Name": "wall",
"Type": "Wall",
"Style": "stone",
"Mask": "848484ff",
"MaskAlt": "482400ff",
"CanWalk": false,
"IsOpaque": true,
"Shootable": true,
"IsRoom": false
}
},
"Tiles": ["1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1",
"1,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",
"1,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",
"1,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",
"1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"1,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",
"1,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",
"1,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",
"1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"1,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",
"1,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",
"1,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",
"1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"1,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",
"1,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",
"1,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",
"1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0",
"1,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",
"1,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",
"1,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,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,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,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,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,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,1,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,0,0,0,0,0,0"],
"Access": ["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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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",
"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,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,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,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,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,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"],
"StaticItems": [{
"MapObject": "barrel_blue",
"Positions": [[2,
1],
[2,
2],
[2,
3],
[3,
1],
[4,
1]]
"Positions": [[2, 1],
[2, 2],
[2, 3],
[3, 1],
[4, 1]]
},
{
"MapObject": "box",
"Positions": [[6,
3],
[6,
2],
[6,
1],
[7,
1],
[8,
1]]
"Positions": [[6, 3],
[6, 2],
[6, 1],
[7, 1],
[8, 1]]
},
{
"MapObject": "box2",
"Positions": [[10,
3],
[10,
2],
[10,
1],
[11,
1],
[12,
1]]
"Positions": [[10, 3],
[10, 2],
[10, 1],
[11, 1],
[12, 1]]
},
{
"MapObject": "cabinet",
"Positions": [[14,
3],
[14,
2],
[14,
1],
[15,
1],
[16,
1]]
"Positions": [[14, 3],
[14, 2],
[14, 1],
[15, 1],
[16, 1]]
},
{
"MapObject": "plant",
"Positions": [[18,
3],
[18,
2],
[18,
1],
[19,
1],
[20,
1]]
"Positions": [[18, 3],
[18, 2],
[18, 1],
[19, 1],
[20, 1]]
},
{
"MapObject": "bench",
"Positions": [[22,
3],
[22,
2],
[22,
1],
[23,
1],
[24,
1]]
"Positions": [[22, 3],
[22, 2],
[22, 1],
[23, 1],
[24, 1]]
},
{
"MapObject": "chair",
"Positions": [[26,
3],
[26,
2],
[26,
1],
[28,
1],
[27,
1]]
"Positions": [[26, 3],
[26, 2],
[26, 1],
[28, 1],
[27, 1]]
},
{
"MapObject": "column",
"Positions": [[30,
3],
[30,
2],
[30,
1],
[31,
1],
[32,
1]]
"Positions": [[30, 3],
[30, 2],
[30, 1],
[31, 1],
[32, 1]]
},
{
"MapObject": "barrel_skull",
"Positions": [[2,
7],
[2,
6],
[2,
5],
[3,
5],
[4,
5]]
"Positions": [[2, 7],
[2, 6],
[2, 5],
[3, 5],
[4, 5]]
},
{
"MapObject": "barrel_wood",
"Positions": [[6,
7],
[6,
6],
[6,
5],
[7,
5],
[8,
5]]
"Positions": [[6, 7],
[6, 6],
[6, 5],
[7, 5],
[8, 5]]
},
{
"MapObject": "box_gray",
"Positions": [[10,
7],
[10,
6],
[10,
5],
[11,
5],
[12,
5]]
"Positions": [[10, 7],
[10, 6],
[10, 5],
[11, 5],
[12, 5]]
},
{
"MapObject": "box_green",
"Positions": [[14,
7],
[14,
6],
[14,
5],
[15,
5],
[16,
5]]
"Positions": [[14, 7],
[14, 6],
[14, 5],
[15, 5],
[16, 5]]
},
{
"MapObject": "statue_ogre",
"Positions": [[18,
7],
[18,
6],
[18,
5],
[19,
5],
[20,
5]]
"Positions": [[18, 7],
[18, 6],
[18, 5],
[19, 5],
[20, 5]]
},
{
"MapObject": "table_wood_candle",
"Positions": [[22,
7],
[22,
6],
[22,
5],
[23,
5],
[24,
5]]
"Positions": [[22, 7],
[22, 6],
[22, 5],
[23, 5],
[24, 5]]
},
{
"MapObject": "table_wood",
"Positions": [[26,
7],
[26,
6],
[26,
5],
[27,
5],
[28,
5]]
"Positions": [[26, 7],
[26, 6],
[26, 5],
[27, 5],
[28, 5]]
},
{
"MapObject": "tree_dead",
"Positions": [[30,
7],
[30,
6],
[30,
5],
[31,
5],
[32,
5]]
"Positions": [[30, 7],
[30, 6],
[30, 5],
[31, 5],
[32, 5]]
},
{
"MapObject": "bookshelf",
"Positions": [[2,
11],
[2,
10],
[2,
9],
[3,
9],
[4,
9]]
"Positions": [[2, 11],
[2, 10],
[2, 9],
[3, 9],
[4, 9]]
},
{
"MapObject": "box_wood",
"Positions": [[6,
11],
[6,
10],
[6,
9],
[7,
9],
[8,
9]]
"Positions": [[6, 11],
[6, 10],
[6, 9],
[7, 9],
[8, 9]]
},
{
"MapObject": "table_clothed",
"Positions": [[10,
11],
[10,
10],
[10,
9],
[11,
9],
[12,
9]]
"Positions": [[10, 11],
[10, 10],
[10, 9],
[11, 9],
[12, 9]]
},
{
"MapObject": "table_steel",
"Positions": [[14,
11],
[14,
10],
[14,
9],
[15,
9],
[16,
9]]
"Positions": [[14, 11],
[14, 10],
[14, 9],
[15, 9],
[16, 9]]
},
{
"MapObject": "tree_autumn",
"Positions": [[18,
11],
[18,
10],
[18,
9],
[19,
9],
[20,
9]]
"Positions": [[18, 11],
[18, 10],
[18, 9],
[19, 9],
[20, 9]]
},
{
"MapObject": "tree",
"Positions": [[22,
11],
[22,
10],
[22,
9],
[23,
9],
[24,
9]]
"Positions": [[22, 11],
[22, 10],
[22, 9],
[23, 9],
[24, 9]]
},
{
"MapObject": "box_metal_green",
"Positions": [[26,
11],
[26,
10],
[26,
9],
[27,
9],
[28,
9]]
"Positions": [[26, 11],
[26, 10],
[26, 9],
[27, 9],
[28, 9]]
},
{
"MapObject": "safe",
"Positions": [[30,
11],
[30,
10],
[30,
9],
[31,
9],
[32,
9]]
"Positions": [[30, 11],
[30, 10],
[30, 9],
[31, 9],
[32, 9]]
},
{
"MapObject": "box_red",
"Positions": [[2,
15],
[2,
14],
[2,
13],
[3,
13],
[4,
13]]
"Positions": [[2, 15],
[2, 14],
[2, 13],
[3, 13],
[4, 13]]
},
{
"MapObject": "table_lab",
"Positions": [[6,
15],
[6,
14],
[6,
13],
[7,
13],
[8,
13]]
"Positions": [[6, 15],
[6, 14],
[6, 13],
[7, 13],
[8, 13]]
},
{
"MapObject": "terminal",
"Positions": [[10,
15],
[10,
14],
[10,
13],
[11,
13],
[12,
13]]
"Positions": [[10, 15],
[10, 14],
[10, 13],
[11, 13],
[12, 13]]
},
{
"MapObject": "barrel",
"Positions": [[14,
15],
[14,
14],
[14,
13],
[15,
13],
[16,
13]]
"Positions": [[14, 15],
[14, 14],
[14, 13],
[15, 13],
[16, 13]]
},
{
"MapObject": "rocket",
"Positions": [[18,
15],
[18,
14],
[18,
13],
[19,
13],
[20,
13]]
"Positions": [[18, 15],
[18, 14],
[18, 13],
[19, 13],
[20, 13]]
},
{
"MapObject": "egg",
"Positions": [[22,
15],
[22,
14],
[22,
13],
[23,
13],
[24,
13]]
"Positions": [[22, 15],
[22, 14],
[22, 13],
[23, 13],
[24, 13]]
},
{
"MapObject": "bloodstain",
"Positions": [[26,
13],
[27,
13],
[28,
13]]
"Positions": [[26, 13],
[27, 13],
[28, 13]]
},
{
"MapObject": "wall_skull",
"Positions": [[30,
13],
[31,
13],
[32,
13]]
"Positions": [[30, 13],
[31, 13],
[32, 13]]
},
{
"MapObject": "bone_blood",
"Positions": [[2,
19],
[2,
18],
[2,
17],
[3,
17],
[4,
17]]
"Positions": [[2, 19],
[2, 18],
[2, 17],
[3, 17],
[4, 17]]
},
{
"MapObject": "bulletmarks",
"Positions": [[6,
17],
[7,
17],
[8,
17]]
"Positions": [[6, 17],
[7, 17],
[8, 17]]
},
{
"MapObject": "skull",
"Positions": [[10,
17],
[10,
18],
[10,
19],
[11,
17],
[12,
17]]
"Positions": [[10, 17],
[10, 18],
[10, 19],
[11, 17],
[12, 17]]
},
{
"MapObject": "blood0",
"Positions": [[14,
19],
[14,
18],
[14,
17],
[15,
17],
[16,
17]]
"Positions": [[14, 19],
[14, 18],
[14, 17],
[15, 17],
[16, 17]]
},
{
"MapObject": "scratch",
"Positions": [[18,
17],
[19,
17],
[20,
17]]
"Positions": [[18, 17],
[19, 17],
[20, 17]]
},
{
"MapObject": "wall_stuff",
"Positions": [[22,
17],
[23,
17],
[24,
17]]
"Positions": [[22, 17],
[23, 17],
[24, 17]]
},
{
"MapObject": "wall_goo",
"Positions": [[26,
17],
[27,
17],
[28,
17]]
"Positions": [[26, 17],
[27, 17],
[28, 17]]
},
{
"MapObject": "goo",
"Positions": [[30,
19],
[30,
18],
[30,
17],
[31,
17],
[32,
17]]
"Positions": [[30, 19],
[30, 18],
[30, 17],
[31, 17],
[32, 17]]
},
{
"MapObject": "fan",
"Positions": [[2,
21],
[3,
21],
[4,
21],
[2,
22],
[2,
23]]
"Positions": [[2, 21],
[3, 21],
[4, 21],
[2, 22],
[2, 23]]
},
{
"MapObject": "table_and_chairs",
"Positions": [[6, 21],
[7, 21],
[8, 21],
[6, 22],
[6, 23]]
},
{
"MapObject": "chair_dining_left",
"Positions": [[10, 22],
[10, 23]]
},
{
"MapObject": "chair_dining_top",
"Positions": [[11, 21],
[10, 21]]
},
{
"MapObject": "chair_dining_right",
"Positions": [[12, 21],
[12, 22]]
}],
"StaticWrecks": [],
"StaticCharacters": [],
"StaticObjectives": [],
"StaticKeys": [],
"Start": [0,
0],
"Exit": {
"Start": [0,
19],
"End": [33,
21]
}
"StaticPickups": [],
"Start": [0, 0],
"Exits": [{
"Rect": [0,
19,
33,
2],
"Mission": 1,
"Hidden": false
}],
"AltFloorsEnabled": true
}]
}

View File

@@ -1251,6 +1251,10 @@ static void FloodFillSetAccess(void *data, const struct vec2i v)
static bool FloodFillIsAccessSame(void *data, const struct vec2i v)
{
MissionFloodFillData *mData = data;
if (!Rect2iIsInside(Rect2iNew(svec2i_zero(), mData->size), v))
{
return false;
}
const uint16_t tileAccess =
*(uint16_t *)CArrayGet(&mData->m->Access, mData->size.x * v.y + v.x);
return tileAccess != mData->tileAccess;