From 9f100bb45a6a061e4580c329d130314bc290e0ac Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Tue, 8 Feb 2022 22:02:15 -0500 Subject: [PATCH] Replace the cursed locker in salvage (#6576) --- Resources/Maps/Salvage/small-3.yml | 426 ++++++++--------------------- 1 file changed, 114 insertions(+), 312 deletions(-) diff --git a/Resources/Maps/Salvage/small-3.yml b/Resources/Maps/Salvage/small-3.yml index a78ab576e2..88a73a2c6f 100644 --- a/Resources/Maps/Salvage/small-3.yml +++ b/Resources/Maps/Salvage/small-3.yml @@ -57,6 +57,30 @@ grids: tiles: FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== entities: - uid: 0 + type: SalvageMaterialCrateSpawner + components: + - pos: -0.5,1.5 + parent: 4 + type: Transform +- uid: 1 + type: WallSolid + components: + - pos: -1.5,-2.5 + parent: 4 + type: Transform +- uid: 2 + type: SalvageMaterialCrateSpawner + components: + - pos: -1.5,-0.5 + parent: 4 + type: Transform +- uid: 3 + type: SalvageCanisterSpawner + components: + - pos: -1.5,-1.5 + parent: 4 + type: Transform +- uid: 4 components: - pos: 0.5,0.5 parent: null @@ -68,32 +92,6 @@ entities: bodyType: Dynamic type: Physics - fixtures: - - shape: !type:PolygonShape - vertices: - - -3.01,2.01 - - -3.01,2.99 - - -3.99,2.99 - - -3.99,2.01 - id: grid_chunk--3.99-2.01 - mask: - - MapGrid - layer: - - MapGrid - mass: 3.8416002 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - -0.01,-1.99 - - -0.01,-0.01 - - -3.99,-0.01 - - -3.99,-1.99 - id: grid_chunk--3.99--1.99 - mask: - - MapGrid - layer: - - MapGrid - mass: 31.5216 - restitution: 0.1 - shape: !type:PolygonShape vertices: - -0.01,-3.99 @@ -120,6 +118,19 @@ entities: - MapGrid mass: 7.7616 restitution: 0.1 + - shape: !type:PolygonShape + vertices: + - -0.01,-1.99 + - -0.01,-0.01 + - -3.99,-0.01 + - -3.99,-1.99 + id: grid_chunk--3.99--1.99 + mask: + - MapGrid + layer: + - MapGrid + mass: 31.5216 + restitution: 0.1 - shape: !type:PolygonShape vertices: - 0.99,-3.99 @@ -146,19 +157,6 @@ entities: - MapGrid mass: 7.7616 restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - -1.01,2.01 - - -1.01,2.99 - - -1.99,2.99 - - -1.99,2.01 - id: grid_chunk--1.99-2.01 - mask: - - MapGrid - layer: - - MapGrid - mass: 3.8416002 - restitution: 0.1 - shape: !type:PolygonShape vertices: - -0.01,0.01 @@ -172,6 +170,32 @@ entities: - MapGrid mass: 31.5216 restitution: 0.1 + - shape: !type:PolygonShape + vertices: + - -3.01,2.01 + - -3.01,2.99 + - -3.99,2.99 + - -3.99,2.01 + id: grid_chunk--3.99-2.01 + mask: + - MapGrid + layer: + - MapGrid + mass: 3.8416002 + restitution: 0.1 + - shape: !type:PolygonShape + vertices: + - -1.01,2.01 + - -1.01,2.99 + - -1.99,2.99 + - -1.99,2.01 + id: grid_chunk--1.99-2.01 + mask: + - MapGrid + layer: + - MapGrid + mass: 3.8416002 + restitution: 0.1 - shape: !type:PolygonShape vertices: - 0.99,0.01 @@ -185,267 +209,17 @@ entities: - MapGrid mass: 7.7616 restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - -3,-3 - - -3,-1 - - -4,-1 - - -4,-3 - id: grid_chunk--4--3 - mask: - - MapGrid - layer: - - MapGrid - mass: 8 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 1,-2 - - 1,-1 - - 0,-1 - - 0,-2 - id: grid_chunk-0--2 - mask: - - MapGrid - layer: - - MapGrid - mass: 4 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 0,-3 - - 0,-2 - - -1,-2 - - -1,-3 - id: grid_chunk--1--3 - mask: - - MapGrid - layer: - - MapGrid - mass: 4 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - -3,0 - - -3,2 - - -4,2 - - -4,0 - id: grid_chunk--4-0 - mask: - - MapGrid - layer: - - MapGrid - mass: 8 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 3,0 - - 3,2 - - 2,2 - - 2,0 - id: grid_chunk-2-0 - mask: - - MapGrid - layer: - - MapGrid - mass: 8 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 0,-2 - - 0,-1 - - -2,-1 - - -2,-2 - id: grid_chunk--2--2 - mask: - - MapGrid - layer: - - MapGrid - mass: 8 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 0,-4 - - 0,-3 - - -4,-3 - - -4,-4 - id: grid_chunk--4--4 - mask: - - MapGrid - layer: - - MapGrid - mass: 16 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 0,-1 - - 0,0 - - -4,0 - - -4,-1 - id: grid_chunk--4--1 - mask: - - MapGrid - layer: - - MapGrid - mass: 16 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 0,1 - - 0,2 - - -1,2 - - -1,1 - id: grid_chunk--1-1 - mask: - - MapGrid - layer: - - MapGrid - mass: 4 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 3,2 - - 3,3 - - 0,3 - - 0,2 - id: grid_chunk-0-2 - mask: - - MapGrid - layer: - - MapGrid - mass: 12 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 1,0 - - 1,1 - - 0,1 - - 0,0 - id: grid_chunk-0-0 - mask: - - MapGrid - layer: - - MapGrid - mass: 4 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 3,-3 - - 3,-1 - - 2,-1 - - 2,-3 - id: grid_chunk-2--3 - mask: - - MapGrid - layer: - - MapGrid - mass: 8 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 3,-1 - - 3,0 - - 0,0 - - 0,-1 - id: grid_chunk-0--1 - mask: - - MapGrid - layer: - - MapGrid - mass: 12 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 3,-4 - - 3,-3 - - 0,-3 - - 0,-4 - id: grid_chunk-0--4 - mask: - - MapGrid - layer: - - MapGrid - mass: 12 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 0,2 - - 0,3 - - -4,3 - - -4,2 - id: grid_chunk--4-2 - mask: - - MapGrid - layer: - - MapGrid - mass: 16 - restitution: 0.1 - - shape: !type:PolygonShape - vertices: - - 0,0 - - 0,1 - - -2,1 - - -2,0 - id: grid_chunk--2-0 - mask: - - MapGrid - layer: - - MapGrid - mass: 8 - restitution: 0.1 type: Fixtures - gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg type: Gravity - chunkCollection: {} type: DecalGrid -- uid: 1 - type: WallSolid - components: - - pos: 0.5,-2.5 - parent: 0 - type: Transform -- uid: 2 +- uid: 5 type: ClosetLegal components: - pos: -2.7649975,1.5 - parent: 0 - type: Transform - - isPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer -- uid: 3 - type: ClosetFireFilled - components: - - pos: -2.249998,1.5 - parent: 0 - type: Transform - - isPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer -- uid: 4 - type: ClosetCursed - components: - - pos: -1.7349985,1.5 - parent: 0 - type: Transform - - isPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer -- uid: 5 - type: ClosetEmergencyFilledRandom - components: - - pos: -1.2199987,1.5 - parent: 0 + parent: 4 type: Transform - isPlaceable: False type: PlaceableSurface @@ -456,37 +230,65 @@ entities: - uid: 6 type: WallSolid components: - - pos: -0.5,-2.5 - parent: 0 + - pos: 0.5,-2.5 + parent: 4 type: Transform - uid: 7 - type: WallSolid - components: - - pos: -1.5,-2.5 - parent: 0 - type: Transform -- uid: 8 - type: SalvageMaterialCrateSpawner - components: - - pos: -1.5,-0.5 - parent: 0 - type: Transform -- uid: 9 type: SalvageCanisterSpawner components: - pos: -0.5,-0.5 - parent: 0 + parent: 4 type: Transform +- uid: 8 + type: GatfruitSeeds + components: + - parent: 12 + type: Transform + - canCollide: False + type: Physics +- uid: 9 + type: ClosetEmergencyFilledRandom + components: + - pos: -1.2175364,1.5 + parent: 4 + type: Transform + - isPlaceable: False + type: PlaceableSurface + - containers: + EntityStorageComponent: !type:Container + ents: [] + type: ContainerContainer - uid: 10 - type: SalvageCanisterSpawner + type: ClosetFireFilled components: - - pos: -1.5,-1.5 - parent: 0 + - pos: -2.249998,1.5 + parent: 4 type: Transform + - isPlaceable: False + type: PlaceableSurface + - containers: + EntityStorageComponent: !type:Container + ents: [] + type: ContainerContainer - uid: 11 - type: SalvageMaterialCrateSpawner + type: WallSolid components: - - pos: -0.5,1.5 - parent: 0 + - pos: -0.5,-2.5 + parent: 4 type: Transform +- uid: 12 + type: LockerBotanist + components: + - pos: -1.7325362,1.5 + parent: 4 + type: Transform + - locked: False + type: Lock + - isPlaceable: False + type: PlaceableSurface + - containers: + EntityStorageComponent: !type:Container + ents: + - 8 + type: ContainerContainer ...