diff --git a/Resources/Maps/_CP14/battle_royale.yml b/Resources/Maps/_CP14/battle_royale.yml index e7b2920e59..d164f5e4e6 100644 --- a/Resources/Maps/_CP14/battle_royale.yml +++ b/Resources/Maps/_CP14/battle_royale.yml @@ -140,7 +140,7 @@ entities: version: 6 0,-2: ind: 0,-2 - tiles: HAAAAAAFHAAAAAADHAAAAAABHAAAAAABHAAAAAAACQAAAAAGCQAAAAAFCQAAAAAACQAAAAADCQAAAAALCQAAAAAJCQAAAAAKCQAAAAACCQAAAAAGCQAAAAAMCQAAAAAIHAAAAAADHAAAAAAEHAAAAAABHAAAAAADHAAAAAAECQAAAAANCQAAAAACCQAAAAANCQAAAAAICQAAAAAMCQAAAAAICQAAAAACCQAAAAAFCQAAAAADCQAAAAAFCQAAAAANHAAAAAAFHAAAAAACHAAAAAACHAAAAAAEHAAAAAABCQAAAAANCQAAAAAHCQAAAAAHCQAAAAAECQAAAAAECQAAAAALCQAAAAABCQAAAAAACQAAAAAGCQAAAAAFCQAAAAALHAAAAAAECQAAAAAJCQAAAAAKCQAAAAAJCQAAAAAJCQAAAAAFCQAAAAAACQAAAAAHCQAAAAAFCQAAAAAECQAAAAAFCQAAAAABCQAAAAAMCQAAAAANCQAAAAAFCQAAAAAICQAAAAAMCQAAAAAJCQAAAAAECQAAAAAFCQAAAAANCQAAAAABCQAAAAAGCQAAAAAJCQAAAAANCQAAAAABCQAAAAACCQAAAAAHCQAAAAAFCQAAAAAICQAAAAANCQAAAAAGCQAAAAACCQAAAAAACQAAAAAGCQAAAAAIHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAAMCQAAAAAICQAAAAAHCQAAAAABCQAAAAAGCQAAAAAECQAAAAAFCQAAAAADCQAAAAACCQAAAAAICQAAAAANCQAAAAANHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAAACQAAAAAFCQAAAAAKCQAAAAAACQAAAAAECQAAAAAHCQAAAAAICQAAAAAGCQAAAAABCQAAAAAGCQAAAAADCQAAAAACHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAABCQAAAAAHCQAAAAALCQAAAAAECQAAAAAGCQAAAAADCQAAAAAMCQAAAAAECQAAAAAJCQAAAAADCQAAAAADCQAAAAALCQAAAAAFCQAAAAAICQAAAAAICQAAAAAMCQAAAAAMCQAAAAAGCQAAAAAGCQAAAAAFCQAAAAAJCQAAAAAHCQAAAAAECQAAAAACCQAAAAAECQAAAAAKCQAAAAABCQAAAAADCQAAAAABCQAAAAACCQAAAAAECQAAAAAICQAAAAALCQAAAAAKCQAAAAAMCQAAAAANCQAAAAABCQAAAAALCQAAAAAFCQAAAAAJCQAAAAAGCQAAAAACCQAAAAAICQAAAAAMCQAAAAACCQAAAAADCQAAAAAMCQAAAAAMCQAAAAAKCQAAAAANCQAAAAAICQAAAAAGCQAAAAAHCQAAAAABCQAAAAAECQAAAAALCQAAAAAEHAAAAAAAHAAAAAAAHAAAAAAACQAAAAAMCQAAAAACCQAAAAAMCQAAAAAICQAAAAAECQAAAAAHCQAAAAALCQAAAAAECQAAAAANCQAAAAAKCQAAAAAACQAAAAAICQAAAAAJHAAAAAAAHAAAAAAAHAAAAAAACQAAAAAJCQAAAAABCQAAAAAACQAAAAAICQAAAAANCQAAAAAJCQAAAAAMCQAAAAACCQAAAAAFCQAAAAABCQAAAAAGCQAAAAACCQAAAAAIHAAAAAAAHAAAAAAAHAAAAAAACQAAAAALCQAAAAAACQAAAAAICQAAAAAGCQAAAAAGCQAAAAADCQAAAAAICQAAAAAACQAAAAAJCQAAAAAKCQAAAAAECQAAAAABCQAAAAANCQAAAAALCQAAAAAKCQAAAAAECQAAAAANCQAAAAAHCQAAAAAKCQAAAAADCQAAAAAJCQAAAAAJCQAAAAAECQAAAAAHCQAAAAACCQAAAAAHCQAAAAAJCQAAAAALCQAAAAAECQAAAAAFCQAAAAAFCQAAAAAICQAAAAAKCQAAAAAMCQAAAAACCQAAAAACCQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAAHQAAAAAA + tiles: HAAAAAAFHAAAAAADHAAAAAABHAAAAAABHAAAAAAACQAAAAAGCQAAAAAFCQAAAAAACQAAAAADCQAAAAALCQAAAAAJCQAAAAAKCQAAAAACCQAAAAAGCQAAAAAMCQAAAAAIHAAAAAADHAAAAAAEHAAAAAABHAAAAAADHAAAAAAECQAAAAANCQAAAAACCQAAAAANCQAAAAAICQAAAAAMCQAAAAAICQAAAAACCQAAAAAFCQAAAAADCQAAAAAFCQAAAAANHAAAAAAFHAAAAAACHAAAAAACHAAAAAAEHAAAAAABCQAAAAANCQAAAAAHCQAAAAAHCQAAAAAECQAAAAAECQAAAAALCQAAAAABCQAAAAAACQAAAAAGCQAAAAAFCQAAAAALHAAAAAAECQAAAAAJCQAAAAAKCQAAAAAJCQAAAAAJCQAAAAAFCQAAAAAACQAAAAAHCQAAAAAFCQAAAAAECQAAAAAFCQAAAAABCQAAAAAMCQAAAAANCQAAAAAFCQAAAAAICQAAAAAMCQAAAAAJCQAAAAAECQAAAAAFCQAAAAANCQAAAAABCQAAAAAGCQAAAAAJCQAAAAANCQAAAAABCQAAAAACCQAAAAAHCQAAAAAFCQAAAAAICQAAAAANCQAAAAAGCQAAAAACCQAAAAAACQAAAAAGCQAAAAAIHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAAMCQAAAAAICQAAAAAHCQAAAAABCQAAAAAGCQAAAAAECQAAAAAFCQAAAAADCQAAAAACCQAAAAAICQAAAAANCQAAAAANHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAAACQAAAAAFCQAAAAAKCQAAAAAACQAAAAAECQAAAAAHCQAAAAAICQAAAAAGCQAAAAABCQAAAAAGCQAAAAADCQAAAAACHAAAAAAAHAAAAAAAHAAAAAAACQAAAAACCQAAAAABCQAAAAAHCQAAAAALCQAAAAAECQAAAAAGCQAAAAADCQAAAAAMCQAAAAAECQAAAAAJCQAAAAADCQAAAAADCQAAAAALCQAAAAAFCQAAAAAICQAAAAAICQAAAAAMCQAAAAAMCQAAAAAGCQAAAAAGCQAAAAAFCQAAAAAJCQAAAAAHCQAAAAAECQAAAAACCQAAAAAECQAAAAAKCQAAAAABCQAAAAADCQAAAAABCQAAAAACCQAAAAAECQAAAAAICQAAAAALCQAAAAAKCQAAAAAMCQAAAAANCQAAAAABCQAAAAALCQAAAAAFCQAAAAAJCQAAAAAGCQAAAAACCQAAAAAICQAAAAAMCQAAAAACCQAAAAADCQAAAAAMCQAAAAAMCQAAAAAKCQAAAAANCQAAAAAICQAAAAAGCQAAAAAHCQAAAAABCQAAAAAECQAAAAALCQAAAAAEHAAAAAAAHAAAAAAAHAAAAAAACQAAAAAMCQAAAAACCQAAAAAMCQAAAAAICQAAAAAECQAAAAAHCQAAAAALCQAAAAAECQAAAAANCQAAAAAKCQAAAAAACQAAAAAICQAAAAAJHAAAAAAAHAAAAAAAHAAAAAAACQAAAAAJCQAAAAABCQAAAAAACQAAAAAICQAAAAANCQAAAAAJCQAAAAAMCQAAAAACCQAAAAAFCQAAAAABCQAAAAAGCQAAAAACCQAAAAAIHAAAAAAAHAAAAAAAHAAAAAAACQAAAAALCQAAAAAACQAAAAAICQAAAAAGCQAAAAAGCQAAAAADCQAAAAAICQAAAAAACQAAAAAJCQAAAAAKCQAAAAAECQAAAAABCQAAAAANCQAAAAALCQAAAAAKCQAAAAAECQAAAAANCQAAAAAHCQAAAAAKCQAAAAADCQAAAAAJHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAACQAAAAALCQAAAAAECQAAAAAFCQAAAAAFCQAAAAAICQAAAAAKCQAAAAAMCQAAAAACCQAAAAACCQAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHQAAAAAAHQAAAAAA version: 6 0,-3: ind: 0,-3 @@ -34502,11 +34502,6 @@ entities: - type: Transform pos: 14.5,-6.5 parent: 2 - - uid: 5616 - components: - - type: Transform - pos: 14.5,-17.5 - parent: 2 - uid: 5617 components: - type: Transform @@ -34617,11 +34612,6 @@ entities: - type: Transform pos: 13.5,-6.5 parent: 2 - - uid: 5652 - components: - - type: Transform - pos: 13.5,-17.5 - parent: 2 - uid: 5655 components: - type: Transform @@ -34722,11 +34712,6 @@ entities: - type: Transform pos: 12.5,-6.5 parent: 2 - - uid: 5688 - components: - - type: Transform - pos: 12.5,-17.5 - parent: 2 - uid: 5692 components: - type: Transform @@ -34837,11 +34822,6 @@ entities: - type: Transform pos: 11.5,-6.5 parent: 2 - - uid: 5724 - components: - - type: Transform - pos: 11.5,-17.5 - parent: 2 - uid: 5728 components: - type: Transform @@ -34957,11 +34937,6 @@ entities: - type: Transform pos: 22.5,-7.5 parent: 2 - - uid: 5760 - components: - - type: Transform - pos: 10.5,-17.5 - parent: 2 - uid: 5764 components: - type: Transform @@ -35062,11 +35037,6 @@ entities: - type: Transform pos: 22.5,-8.5 parent: 2 - - uid: 5796 - components: - - type: Transform - pos: 9.5,-17.5 - parent: 2 - uid: 5799 components: - type: Transform @@ -44196,11 +44166,6 @@ entities: - type: InsideEntityStorage - proto: CP14CrateCoffin entities: - - uid: 788 - components: - - type: Transform - pos: -37.5,-13.5 - parent: 2 - uid: 797 components: - type: Transform @@ -45365,6 +45330,83 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-54.5 parent: 2 +- proto: CP14LargeWoodenCrateFilled + entities: + - uid: 762 + components: + - type: Transform + pos: 9.5,-17.5 + parent: 2 + - uid: 763 + components: + - type: Transform + pos: 11.5,-17.5 + parent: 2 + - uid: 5644 + components: + - type: Transform + pos: -37.5,-13.5 + parent: 2 + - uid: 5645 + components: + - type: Transform + pos: 33.5,7.5 + parent: 2 + - uid: 5646 + components: + - type: Transform + pos: 31.5,14.5 + parent: 2 + - uid: 5647 + components: + - type: Transform + pos: -31.5,-17.5 + parent: 2 + - uid: 5678 + components: + - type: Transform + pos: 1.5,-51.5 + parent: 2 + - uid: 5688 + components: + - type: Transform + pos: -1.5,-58.5 + parent: 2 + - uid: 6031 + components: + - type: Transform + pos: -16.5,29.5 + parent: 2 + - uid: 6060 + components: + - type: Transform + pos: -25.5,43.5 + parent: 2 + - uid: 6061 + components: + - type: Transform + pos: -21.5,43.5 + parent: 2 + - uid: 6066 + components: + - type: Transform + pos: -3.5,31.5 + parent: 2 + - uid: 6067 + components: + - type: Transform + pos: -1.5,22.5 + parent: 2 + - uid: 6097 + components: + - type: Transform + pos: 22.5,31.5 + parent: 2 + - uid: 6154 + components: + - type: Transform + pos: 29.5,-27.5 + parent: 2 - proto: CP14Nail1 entities: - uid: 6837 @@ -45982,16 +46024,16 @@ entities: - type: Transform pos: -26.5,4.5 parent: 2 + - uid: 5651 + components: + - type: Transform + pos: -37.5,-11.5 + parent: 2 - uid: 5654 components: - type: Transform pos: 34.5,9.5 parent: 2 - - uid: 5714 - components: - - type: Transform - pos: 33.5,7.5 - parent: 2 - uid: 5719 components: - type: Transform @@ -46012,6 +46054,11 @@ entities: - type: Transform pos: 16.5,26.5 parent: 2 + - uid: 5724 + components: + - type: Transform + pos: -35.5,-10.5 + parent: 2 - uid: 5850 components: - type: Transform @@ -46694,6 +46741,218 @@ entities: - type: Transform pos: -10.5,42.5 parent: 2 +- proto: CP14SmallWoodenCrateFilled + entities: + - uid: 774 + components: + - type: Transform + pos: 10.5,-17.5 + parent: 2 + - uid: 775 + components: + - type: Transform + pos: 12.5,-17.5 + parent: 2 + - uid: 788 + components: + - type: Transform + pos: 13.5,-17.5 + parent: 2 + - uid: 5616 + components: + - type: Transform + pos: 3.5,-31.5 + parent: 2 + - uid: 5650 + components: + - type: Transform + pos: -37.5,-21.5 + parent: 2 + - uid: 5652 + components: + - type: Transform + pos: -37.5,-16.5 + parent: 2 + - uid: 5653 + components: + - type: Transform + pos: -37.5,-14.5 + parent: 2 + - uid: 5679 + components: + - type: Transform + pos: 2.5,-51.5 + parent: 2 + - uid: 5680 + components: + - type: Transform + pos: 6.5,-53.5 + parent: 2 + - uid: 5681 + components: + - type: Transform + pos: 5.5,-49.5 + parent: 2 + - uid: 5687 + components: + - type: Transform + pos: -1.5,-55.5 + parent: 2 + - uid: 5689 + components: + - type: Transform + pos: -8.5,-43.5 + parent: 2 + - uid: 5714 + components: + - type: Transform + pos: -8.5,-40.5 + parent: 2 + - uid: 5717 + components: + - type: Transform + pos: -13.5,-32.5 + parent: 2 + - uid: 5718 + components: + - type: Transform + pos: 0.5,-30.5 + parent: 2 + - uid: 5760 + components: + - type: Transform + pos: -40.5,-13.5 + parent: 2 + - uid: 5796 + components: + - type: Transform + pos: -23.5,-11.5 + parent: 2 + - uid: 6030 + components: + - type: Transform + pos: -15.5,-6.5 + parent: 2 + - uid: 6032 + components: + - type: Transform + pos: -16.5,30.5 + parent: 2 + - uid: 6033 + components: + - type: Transform + pos: -19.5,29.5 + parent: 2 + - uid: 6034 + components: + - type: Transform + pos: -19.5,34.5 + parent: 2 + - uid: 6035 + components: + - type: Transform + pos: -31.5,43.5 + parent: 2 + - uid: 6036 + components: + - type: Transform + pos: -27.5,43.5 + parent: 2 + - uid: 6062 + components: + - type: Transform + pos: -17.5,44.5 + parent: 2 + - uid: 6064 + components: + - type: Transform + pos: -17.5,52.5 + parent: 2 + - uid: 6065 + components: + - type: Transform + pos: -10.5,52.5 + parent: 2 + - uid: 6068 + components: + - type: Transform + pos: -1.5,19.5 + parent: 2 + - uid: 6069 + components: + - type: Transform + pos: -3.5,30.5 + parent: 2 + - uid: 6096 + components: + - type: Transform + pos: -1.5,34.5 + parent: 2 + - uid: 6119 + components: + - type: Transform + pos: 21.5,31.5 + parent: 2 + - uid: 6133 + components: + - type: Transform + pos: 22.5,32.5 + parent: 2 + - uid: 6134 + components: + - type: Transform + pos: 18.5,29.5 + parent: 2 + - uid: 6135 + components: + - type: Transform + pos: 30.5,14.5 + parent: 2 + - uid: 6136 + components: + - type: Transform + pos: 36.5,14.5 + parent: 2 + - uid: 6137 + components: + - type: Transform + pos: 32.5,7.5 + parent: 2 + - uid: 6138 + components: + - type: Transform + pos: 46.5,-10.5 + parent: 2 + - uid: 6150 + components: + - type: Transform + pos: 49.5,-7.5 + parent: 2 + - uid: 6151 + components: + - type: Transform + pos: 50.5,-4.5 + parent: 2 + - uid: 6152 + components: + - type: Transform + pos: 48.5,2.5 + parent: 2 + - uid: 6153 + components: + - type: Transform + pos: 5.5,-46.5 + parent: 2 + - uid: 6155 + components: + - type: Transform + pos: 28.5,-32.5 + parent: 2 + - uid: 6156 + components: + - type: Transform + pos: 25.5,-31.5 + parent: 2 - proto: CP14SpawnPointAdventurer entities: - uid: 796 @@ -46876,12 +47135,6 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,14.5 parent: 2 - - uid: 5678 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 31.5,14.5 - parent: 2 - uid: 5685 components: - type: Transform @@ -46958,11 +47211,6 @@ entities: - type: Transform pos: 20.5,34.5 parent: 2 - - uid: 8092 - components: - - type: Transform - pos: -31.5,-17.5 - parent: 2 - uid: 8095 components: - type: Transform @@ -52045,30 +52293,6 @@ entities: showEnts: False occludes: True ent: null -- proto: CP14WoodenPlanks1 - entities: - - uid: 6298 - components: - - type: Transform - pos: -37.58222,-16.442198 - parent: 2 - - uid: 6299 - components: - - type: Transform - pos: -37.012318,-16.644596 - parent: 2 - - uid: 6300 - components: - - type: Transform - pos: -36.967327,-16.142347 - parent: 2 -- proto: CP14WoodenPlanks10 - entities: - - uid: 6297 - components: - - type: Transform - pos: -37.357258,-14.47818 - parent: 2 - proto: CrateWoodenGrave entities: - uid: 2082 diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml index 8a40b01a08..4c531e4a27 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml @@ -36,14 +36,6 @@ - CP14SilverCoin1 - CP14SilverCoin1 - CP14SilverCoin1 - - CP14SmallWoodenCrateFilled - - CP14LargeWoodenCrateFilled - - CP14SmallWoodenCrateFilled - - CP14LargeWoodenCrateFilled - - CP14SmallWoodenCrateFilled - - CP14LargeWoodenCrateFilled - - CP14SmallWoodenCrateFilled - - CP14LargeWoodenCrateFilled - CP14AuraNodeBase - CP14AuraNodeBase - CP14AuraNodeBase @@ -84,14 +76,6 @@ - CP14SilverCoin1 - CP14SilverCoin1 - CP14SilverCoin1 - - CP14SmallWoodenCrateFilled - - CP14LargeWoodenCrateFilled - - CP14SmallWoodenCrateFilled - - CP14LargeWoodenCrateFilled - - CP14SmallWoodenCrateFilled - - CP14LargeWoodenCrateFilled - - CP14SmallWoodenCrateFilled - - CP14LargeWoodenCrateFilled - CP14AuraNodeBase - CP14AuraNodeBase - CP14AuraNodeBase