From 66b6c52627d0cb934245a02b3237ffa3c6444cb7 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 10 Aug 2021 00:15:44 +1000 Subject: [PATCH] Update maps for grid collisions (#4450) --- Resources/Maps/Test/empty.yml | 55 +++++++++------- Resources/Maps/saltern.yml | 120 ++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 23 deletions(-) diff --git a/Resources/Maps/Test/empty.yml b/Resources/Maps/Test/empty.yml index cf293569fb..534b2c9cc2 100644 --- a/Resources/Maps/Test/empty.yml +++ b/Resources/Maps/Test/empty.yml @@ -11,40 +11,49 @@ tilemap: 4: floor_asteroid_coarse_sand_dug 5: floor_asteroid_sand 6: floor_asteroid_tile - 7: floor_dark - 8: floor_elevator_shaft - 9: floor_freezer - 10: floor_gold - 11: floor_green_circuit - 12: floor_hydro - 13: floor_lino - 14: floor_mono - 15: floor_reinforced - 16: floor_rock_vault - 17: floor_showroom - 18: floor_snow - 19: floor_steel - 20: floor_steel_dirty - 21: floor_techmaint - 22: floor_white - 23: floor_wood - 24: lattice - 25: plating - 26: underplating + 7: floor_blue + 8: floor_dark + 9: floor_elevator_shaft + 10: floor_freezer + 11: floor_glass + 12: floor_gold + 13: floor_green_circuit + 14: floor_hydro + 15: floor_lino + 16: floor_mono + 17: floor_reinforced + 18: floor_rglass + 19: floor_rock_vault + 20: floor_showroom + 21: floor_snow + 22: floor_steel + 23: floor_steel_dirty + 24: floor_techmaint + 25: floor_warning1 + 26: floor_warning2 + 27: floor_white + 28: floor_white_warning1 + 29: floor_white_warning2 + 30: floor_wood + 31: lattice + 32: plating + 33: underplating grids: - settings: chunksize: 16 tilesize: 1 - snapsize: 1 chunks: - ind: "-1,-1" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEwAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAA== entities: - uid: 0 components: - parent: null - pos: 0,0 type: Transform - index: 0 type: MapGrid + - linearDamping: 0.05 + fixtures: [] + bodyType: Dynamic + type: Physics ... diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 74a436b43f..b2465bb421 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -1253,6 +1253,10 @@ entities: type: Transform - containers: CloningPod-bodyContainer: !type:ContainerSlot {} + machine_board: !type:Container + ents: [] + machine_parts: !type:Container + ents: [] type: ContainerContainer - uid: 152 type: CableHV @@ -12362,6 +12366,10 @@ entities: - -16,0 - -16,-16 id: grid_chunk--1--1 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12370,6 +12378,10 @@ entities: - -16,16 - -16,0 id: grid_chunk--1-0 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12378,6 +12390,10 @@ entities: - 0,0 - 0,-16 id: grid_chunk-0--1 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12386,6 +12402,10 @@ entities: - 0,16 - 0,0 id: grid_chunk-0-0 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12394,6 +12414,10 @@ entities: - 16,16 - 16,0 id: grid_chunk-1-0 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12402,6 +12426,10 @@ entities: - 0,32 - 0,16 id: grid_chunk-0-1 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12410,6 +12438,10 @@ entities: - -32,16 - -32,0 id: grid_chunk--2-0 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12418,6 +12450,10 @@ entities: - 16,0 - 16,-16 id: grid_chunk-1--1 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12426,6 +12462,10 @@ entities: - 0,-16 - 0,-32 id: grid_chunk-0--2 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12434,6 +12474,10 @@ entities: - 16,-16 - 16,-27 id: grid_chunk-1--2 + mask: + - MapGrid + layer: + - MapGrid mass: 143 - shape: !type:PolygonShape vertices: @@ -12442,6 +12486,10 @@ entities: - -16,32 - -16,16 id: grid_chunk--1-1 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12450,6 +12498,10 @@ entities: - -3,34 - -3,32 id: grid_chunk--1-2 + mask: + - MapGrid + layer: + - MapGrid mass: 6 - shape: !type:PolygonShape vertices: @@ -12458,6 +12510,10 @@ entities: - 16,17 - 16,16 id: grid_chunk-1-1 + mask: + - MapGrid + layer: + - MapGrid mass: 2 - shape: !type:PolygonShape vertices: @@ -12466,6 +12522,10 @@ entities: - 0,34 - 0,32 id: grid_chunk-0-2 + mask: + - MapGrid + layer: + - MapGrid mass: 20 - shape: !type:PolygonShape vertices: @@ -12474,6 +12534,10 @@ entities: - 32,16 - 32,0 id: grid_chunk-2-0 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12482,6 +12546,10 @@ entities: - 48,15 - 48,0 id: grid_chunk-3-0 + mask: + - MapGrid + layer: + - MapGrid mass: 60 - shape: !type:PolygonShape vertices: @@ -12490,6 +12558,10 @@ entities: - 32,0 - 32,-16 id: grid_chunk-2--1 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12498,6 +12570,10 @@ entities: - -16,-16 - -16,-31 id: grid_chunk--1--2 + mask: + - MapGrid + layer: + - MapGrid mass: 240 - shape: !type:PolygonShape vertices: @@ -12506,6 +12582,10 @@ entities: - -26,-16 - -26,-28 id: grid_chunk--2--2 + mask: + - MapGrid + layer: + - MapGrid mass: 120 - shape: !type:PolygonShape vertices: @@ -12514,6 +12594,10 @@ entities: - -32,0 - -32,-16 id: grid_chunk--2--1 + mask: + - MapGrid + layer: + - MapGrid mass: 256 - shape: !type:PolygonShape vertices: @@ -12522,6 +12606,10 @@ entities: - -42,16 - -42,0 id: grid_chunk--3-0 + mask: + - MapGrid + layer: + - MapGrid mass: 160 - shape: !type:PolygonShape vertices: @@ -12530,6 +12618,10 @@ entities: - -40,0 - -40,-13 id: grid_chunk--3--1 + mask: + - MapGrid + layer: + - MapGrid mass: 104 - shape: !type:PolygonShape vertices: @@ -12538,6 +12630,10 @@ entities: - 48,0 - 48,-16 id: grid_chunk-3--1 + mask: + - MapGrid + layer: + - MapGrid mass: 128 - shape: !type:PolygonShape vertices: @@ -12546,6 +12642,10 @@ entities: - 40,-16 - 40,-32 id: grid_chunk-2--2 + mask: + - MapGrid + layer: + - MapGrid mass: 128 - shape: !type:PolygonShape vertices: @@ -12554,6 +12654,10 @@ entities: - 48,-16 - 48,-32 id: grid_chunk-3--2 + mask: + - MapGrid + layer: + - MapGrid mass: 176 - shape: !type:PolygonShape vertices: @@ -12562,6 +12666,10 @@ entities: - 48,-32 - 48,-34 id: grid_chunk-3--3 + mask: + - MapGrid + layer: + - MapGrid mass: 22 - shape: !type:PolygonShape vertices: @@ -12570,6 +12678,10 @@ entities: - 40,-32 - 40,-34 id: grid_chunk-2--3 + mask: + - MapGrid + layer: + - MapGrid mass: 16 - shape: !type:PolygonShape vertices: @@ -12578,6 +12690,10 @@ entities: - -28,27 - -28,16 id: grid_chunk--2-1 + mask: + - MapGrid + layer: + - MapGrid mass: 132 bodyType: Dynamic type: Physics @@ -18437,6 +18553,10 @@ entities: type: Transform - containers: MedicalScanner-bodyContainer: !type:ContainerSlot {} + machine_board: !type:Container + ents: [] + machine_parts: !type:Container + ents: [] type: ContainerContainer - uid: 1545 type: CrateMaterialSteel