From 2d9f67c354395b284232a95ce360283f7563b686 Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 16 Feb 2025 23:54:55 +0300 Subject: [PATCH] DoNotMap category --- Content.Client/_CP14/Roof/CP14RoofSystem.cs | 28 +++++++++---------- .../Tests/PostMapInitTest.cs | 9 ++++-- .../_CP14/Entities/Clothing/Rings/ring.yml | 3 +- .../_CP14/Entities/Clothing/Shoes/shoes.yml | 6 ++-- .../Spawners/Random/Loot/demiplane.yml | 2 +- .../Entities/Markers/Spawners/unique_loot.yml | 3 +- .../Entities/Objects/Bureaucracy/stamps.yml | 6 ++-- .../_CP14/Entities/Objects/Misc/crayons.yml | 3 +- .../Objects/Weapons/Magic/twoHandedStaffs.yml | 3 +- .../_CP14/Entities/Structures/test.yml | 3 +- 10 files changed, 37 insertions(+), 29 deletions(-) diff --git a/Content.Client/_CP14/Roof/CP14RoofSystem.cs b/Content.Client/_CP14/Roof/CP14RoofSystem.cs index d0f91dd614..c2330608c2 100644 --- a/Content.Client/_CP14/Roof/CP14RoofSystem.cs +++ b/Content.Client/_CP14/Roof/CP14RoofSystem.cs @@ -100,24 +100,24 @@ public sealed class CP14RoofSystem : EntitySystem UpdateVisibility(ent, sprite); - var xform = Transform(ent); - - if (_gridQuery.TryComp(xform.GridUid, out var grid)) - { - var index = _map.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates); - _roof.SetRoof((xform.GridUid.Value, grid, null), index, true); - } + //var xform = Transform(ent); +// + //if (_gridQuery.TryComp(xform.GridUid, out var grid)) + //{ + // var index = _map.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates); + // _roof.SetRoof((xform.GridUid.Value, grid, null), index, true); + //} } private void RoofRemove(Entity ent, ref ComponentRemove args) { - var xform = Transform(ent); - - if (_gridQuery.TryComp(xform.GridUid, out var grid)) - { - var index = _map.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates); - _roof.SetRoof((xform.GridUid.Value, grid, null), index, false); - } + //var xform = Transform(ent); +// + //if (_gridQuery.TryComp(xform.GridUid, out var grid)) + //{ + // var index = _map.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates); + // _roof.SetRoof((xform.GridUid.Value, grid, null), index, false); + //} } private void UpdateVisibility(Entity ent, SpriteComponent sprite) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 395ab8dba1..50cf4e948b 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -38,7 +38,11 @@ namespace Content.IntegrationTests.Tests private static readonly string[] Grids = { - "/Maps/centcomm.yml" + "/Maps/centcomm.yml", + + //CrystallEdge z-levels + "/Maps/_CP14/comoss_d.yml" + //CrystallEdge z-levels end }; private static readonly string[] DoNotMapWhitelist = @@ -50,7 +54,8 @@ namespace Content.IntegrationTests.Tests }; private static readonly string[] GameMaps = - {//CrystallEdge Map replacement + { + //CrystallEdge Map replacement "Dev", "CentComm", "MeteorArena", diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml index b14926007f..8d3cadc6cb 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Rings/ring.yml @@ -33,7 +33,8 @@ parent: CP14ClothingRingBase name: fireball conductive ring description: A standard mana-conductive ring that allows the user to summon fireballs. - suffix: Fireball, Artifact, DO NOT MAP + categories: [ DoNotMap ] + suffix: Fireball, Artifact components: - type: Sprite layers: diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index 770a36caa0..54d5a8ea00 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -52,7 +52,8 @@ parent: CP14ClothingShoesBase id: CP14ClothingShoesArtifactFlightboots name: flight boots - suffix: Artifact, DO NOT MAP + categories: [ DoNotMap ] + suffix: Artifact description: Enchanted boots that allow their wearer to walk through the air a short distance from the ground. It looks extremely spectacular! components: - type: Sprite @@ -68,7 +69,8 @@ parent: CP14ClothingShoesBase id: CP14ClothingShoesArtifactSpeedboots name: hermes boots - suffix: Artifact, DO NOT MAP + categories: [ DoNotMap ] + suffix: Artifact description: Enchanted boots that allow their wearer to walk through the air a short distance from the ground. It looks extremely spectacular! components: - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml index 287da11f60..305c3d112a 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml @@ -68,7 +68,7 @@ parent: MarkerBase id: CP14SpawnerDemiplaneLootT2 name: Demiplane T2 Loot - categories: [ ForkFiltered ] + categories: [ ForkFiltered, DoNotMap ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/unique_loot.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/unique_loot.yml index caa3cf8b99..f4e3572ac2 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/unique_loot.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/unique_loot.yml @@ -2,8 +2,7 @@ name: random artifact spawner id: CP14SpawnUniqueArtifact parent: MarkerBase - suffix: Unique, DO NOT MAP - categories: [ ForkFiltered ] + categories: [ ForkFiltered, DoNotMap ] components: - type: CP14UniqueLootSpawner - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml index fa3062c94b..525164dbb6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/stamps.yml @@ -49,7 +49,7 @@ id: CP14StampCommandant parent: CP14StampBase name: commandant stamp - suffix: DO NOT MAP + categories: [ DoNotMap ] components: - type: Stamp stampedName: cp14-stamp-bank @@ -62,7 +62,7 @@ id: CP14StampGuardCommander parent: CP14StampBase name: guard commander stamp - suffix: DO NOT MAP + categories: [ DoNotMap ] components: - type: Stamp stampedName: cp14-stamp-guard-commander @@ -75,7 +75,7 @@ id: CP14StampGuildmaster parent: CP14StampBase name: guildmaster stamp - suffix: DO NOT MAP + categories: [ DoNotMap ] components: - type: Stamp stampedName: cp14-stamp-guildmaster diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml index 997a86f666..023d7b7e19 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml @@ -52,7 +52,8 @@ parent: CP14Crayon id: CP14CrayonRainbow name: magic rainbow crayon - suffix: Artifact, DO NOT MAP + categories: [ DoNotMap ] + suffix: Artifact components: - type: Sprite layers: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml index 70265dd5cb..4851ac6eed 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml @@ -77,7 +77,8 @@ parent: CP14MagicHealingStaff name: magic shadow staff description: A long, half-tech, half-magic stick designed to convert magical energy into shadow spells. - suffix: Artifact, DO NOT MAP + categories: [ DoNotMap ] + suffix: Artifact components: - type: CP14MagicManacostModify modifiers: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/test.yml b/Resources/Prototypes/_CP14/Entities/Structures/test.yml index 6fefa90674..d338f6615c 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/test.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/test.yml @@ -25,10 +25,9 @@ - type: entity id: CP14DPSMeter parent: BaseStructureDynamic - categories: [ ForkFiltered ] + categories: [ ForkFiltered, DoNotMap ] name: DPS Meter description: Counts the average damage per second. If you stop hitting it, it shows the result. - suffix: Debug, DO NOT MAP components: - type: Sprite sprite: Objects/Specific/Security/target.rsi