convert it to entity category

This commit is contained in:
Killerqu00
2025-01-29 12:22:38 +01:00
parent 02f7dad6f3
commit d15a770078
24 changed files with 64 additions and 46 deletions

View File

@@ -161,15 +161,17 @@ namespace Content.IntegrationTests.Tests
// testing that maps have nothing with the "DO NOT MAP" suffix
// I do it here because it's basically copy-paste code for the most part
var yamlEntities = root["entities"];
if (!protoManager.TryIndex<EntityCategoryPrototype>("DoNotMap", out var dnmCategory))
return;
foreach (var yamlEntity in (YamlSequenceNode)yamlEntities)
{
var protoId = yamlEntity["proto"].AsString();
protoManager.TryIndex(protoId, out var proto, false);
if (proto is null || proto.EditorSuffix is null)
continue;
if (proto.EditorSuffix.ToUpper().Contains("DO NOT MAP") && !DoNotMapWhitelist.Contains(map.ToString()))
if (proto.Categories.Contains(dnmCategory) && !DoNotMapWhitelist.Contains(map.ToString()))
{
Assert.Fail($"\nMap {map} has the DO NOT MAP prototype {proto}");
Assert.Fail($"\nMap {map} has the DO NOT MAP prototype {proto.Name}");
}
}
}

View File

@@ -3,3 +3,6 @@ entity-category-name-game-rules = Game Rules
entity-category-name-objectives = Objectives
entity-category-name-roles = Mind Roles
entity-category-name-mapping = Mapping
entity-category-name-donotmap = Do not map
entity-category-suffix-donotmap = DO NOT MAP

View File

@@ -133,6 +133,7 @@
id: ClosetJanitorBombFilled
parent: ClosetJanitorBomb
suffix: DO NOT MAP, Filled
categories: [ DoNotMap ]
components:
- type: StorageFill
contents:

View File

@@ -330,6 +330,7 @@
id: ClothingHeadHelmetHardsuitLuxury #DO NOT MAP - https://github.com/space-wizards/space-station-14/pull/19738#issuecomment-1703486738
name: luxury mining hardsuit helmet
description: A refurbished mining hardsuit helmet, fitted with satin cushioning and an extra (non-functioning) antenna, because you're that extra.
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/luxury.rsi

View File

@@ -137,7 +137,7 @@
id: ClothingHeadHelmetJanitorBombSuit
name: janitorial bombsuit helmet
description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Clothing/Head/Helmets/janitor_bombsuit.rsi

View File

@@ -176,7 +176,7 @@
id: ClothingHeadHatCatEars
name: cat ears
description: "NYAH!"
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
@@ -191,6 +191,7 @@
parent: [ClothingHeadHatCatEars, BaseToggleClothing]
id: ClothingHeadHatCatEarsValid
suffix: Valid, DO NOT MAP
categories: [ DoNotMap ]
components:
- type: ToggleClothing
action: ActionBecomeValid
@@ -222,7 +223,7 @@
id: ClothingHeadHatDogEars
name: doggy ears
description: Only for good boys.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Clothing/Head/Hats/dogears.rsi

View File

@@ -447,6 +447,7 @@
id: ClothingOuterHardsuitLuxury #DO NOT MAP - https://github.com/space-wizards/space-station-14/pull/19738#issuecomment-1703486738
name: luxury mining hardsuit
description: A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move.
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi

View File

@@ -33,7 +33,7 @@
id: ClothingOuterSuitJanitorBomb
name: janitorial bomb suit
description: A heavy helmet designed to withstand explosions formed from reactions between chemicals.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Clothing/OuterClothing/Suits/janitor_bombsuit.rsi
@@ -289,6 +289,7 @@
parent: ClothingOuterSuitCarp
id: ClothingOuterHardsuitCarp
suffix: Hardsuit, DO NOT MAP
categories: [ DoNotMap ]
components:
- type: PressureProtection
highPressureMultiplier: 0.6

View File

@@ -406,8 +406,7 @@
- type: entity
id: StationAiBrain
parent: PositronicBrain
categories: [ HideSpawnMenu ]
suffix: DO NOT MAP
categories: [ HideSpawnMenu, DoNotMap ]
components:
- type: Sprite
# Once it's in a core it's pretty much an abstract entity at that point.
@@ -454,8 +453,7 @@
id: StationAiHolo
name: AI eye
description: The AI's viewer.
categories: [ HideSpawnMenu ]
suffix: DO NOT MAP
categories: [ HideSpawnMenu, DoNotMap ]
components:
- type: NoFTL
- type: WarpPoint
@@ -476,8 +474,7 @@
id: StationAiHoloLocal
name: AI hologram
description: A holographic representation of an AI.
categories: [ HideSpawnMenu ]
suffix: DO NOT MAP
categories: [ HideSpawnMenu, DoNotMap ]
components:
- type: Transform
anchored: true

View File

@@ -6,6 +6,7 @@
name: LSE-400c "Svalinn machine gun" machine board
description: A machine printed circuit board for an LSE-400c "Svalinn machine gun".
suffix: DO NOT MAP, Machine Board
categories: [ DoNotMap ]
components:
- type: Sprite
state: security
@@ -23,6 +24,7 @@
name: LSE-1200c "Perforator" machine board
description: A machine printed circuit board for an LSE-1200c "Perforator".
suffix: DO NOT MAP, Machine Board
categories: [ DoNotMap ]
components:
- type: Sprite
state: security
@@ -40,6 +42,7 @@
name: EXP-320g "Friendship" machine board
description: A machine printed circuit board for an EXP-320g "Friendship".
suffix: DO NOT MAP, Machine Board
categories: [ DoNotMap ]
components:
- type: Sprite
state: security
@@ -57,6 +60,7 @@
name: EXP-2100g "Duster" machine board
description: A machine printed circuit board for an EXP-2100g "Duster".
suffix: DO NOT MAP, Machine Board
categories: [ DoNotMap ]
components:
- type: Sprite
state: security
@@ -75,6 +79,7 @@
name: PTK-800 "Matter Dematerializer" machine board
description: A machine printed circuit board for an PTK-800 "Matter Dematerializer".
suffix: DO NOT MAP, Machine Board
categories: [ DoNotMap ]
components:
- type: Sprite
state: security

View File

@@ -91,7 +91,7 @@
parent: BikeHorn
id: GoldenBikeHorn
name: golden honker
suffix: No mapping
categories: [ DoNotMap ]
description: A happy honk prize, pray to the gods for your reward.
components:
- type: Sprite

View File

@@ -131,7 +131,7 @@
parent: PlushieGhost
id: PlushieGhostRevenant
name: revenant soft toy
suffix: DO NOT MAP
categories: [ DoNotMap ]
description: So soft it almost makes you want to take a nap...
components:
- type: Item

View File

@@ -447,7 +447,7 @@
id: BoxFolderCentCom
name: CentComm folder
parent: BoxFolderBase
suffix: DO NOT MAP
categories: [ DoNotMap ]
description: CentComm's miserable little pile of secrets!
components:
- type: Sprite
@@ -609,7 +609,7 @@
id: TraitorCodePaper
name: syndicate codeword
description: A leaked codeword to possibly get in touch with the Syndicate.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: TraitorCodePaper

View File

@@ -41,7 +41,7 @@
name: captain's rubber stamp
parent: [RubberStampBase, BaseCommandContraband]
id: RubberStampCaptain
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-captain
@@ -54,7 +54,7 @@
name: CentComm rubber stamp
parent: RubberStampBase
id: RubberStampCentcom
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-centcom
@@ -67,7 +67,7 @@
name: chaplain's rubber stamp
parent: RubberStampBase
id: RubberStampChaplain
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-chaplain
@@ -80,7 +80,7 @@
name: lawyer's rubber stamp
parent: RubberStampBase
id: RubberStampLawyer
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-lawyer
@@ -93,7 +93,7 @@
name: clown's rubber stamp
parent: RubberStampBase
id: RubberStampClown
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-clown
@@ -109,7 +109,7 @@
name: chief engineer's rubber stamp
parent: [RubberStampBase, BaseCommandContraband]
id: RubberStampCE
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-ce
@@ -122,7 +122,7 @@
name: chief medical officer's rubber stamp
parent: [RubberStampBase, BaseCommandContraband]
id: RubberStampCMO
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-cmo
@@ -135,7 +135,7 @@
name: head of personnel's rubber stamp
parent: [RubberStampBase, BaseCommandContraband]
id: RubberStampHop
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-hop
@@ -148,7 +148,7 @@
name: head of security's rubber stamp
parent: [RubberStampBase, BaseCommandContraband]
id: RubberStampHos
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-hos
@@ -161,7 +161,7 @@
name: mime's rubber stamp
parent: RubberStampBase
id: RubberStampMime
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-mime
@@ -175,7 +175,7 @@
name: quartermaster's rubber stamp
parent: [RubberStampBase, BaseCommandContraband]
id: RubberStampQm
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-qm
@@ -188,7 +188,7 @@
name: research director's rubber stamp
parent: [RubberStampBase, BaseCommandContraband]
id: RubberStampRd
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-rd
@@ -213,7 +213,7 @@
name: syndicate rubber stamp
parent: [RubberStampBase, BaseSyndicateContraband]
id: RubberStampSyndicate
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-syndicate
@@ -226,7 +226,7 @@
name: warden's rubber stamp
parent: [RubberStampBase, BaseRestrictedContraband]
id: RubberStampWarden
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-warden
@@ -263,7 +263,7 @@
name: detective's rubber stamp
parent: [RubberStampBase, BaseRestrictedContraband]
id: RubberStampDetective
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Stamp
stampedName: stamp-component-stamped-name-detective
@@ -289,7 +289,7 @@
name: psychologist's rubber stamp
parent: RubberStampBase
id: RubberStampPsychologist
suffix: DO NOT MAP
categories: [ DoNotMap ]
description: A rubber stamp for stamping important documents. Prescribe those treatments!
components:
- type: Stamp

View File

@@ -1,6 +1,6 @@
- type: entity
name: handheld crew monitor
suffix: DO NOT MAP
categories: [ DoNotMap ]
parent: [ BaseHandheldComputer, BaseGrandTheftContraband ]
# CMO-only bud, don't add more.
id: HandheldCrewMonitor

View File

@@ -324,7 +324,7 @@
id: HealingToolbox
name: healing toolbox
description: A powerful toolbox imbued with robust energy. It can heal your wounds and fill you with murderous intent.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Objects/Specific/Medical/healing_toolbox.rsi

View File

@@ -35,6 +35,7 @@
id: ResearchDiskDebug
name: research point disk
suffix: DEBUG, DO NOT MAP
categories: [ DoNotMap ]
description: A disk for the R&D server containing all the points you could ever need.
components:
- type: ResearchDisk

View File

@@ -63,7 +63,7 @@
parent: BaseBallBat
id: WeaponMeleeKnockbackStick
description: And then he spleefed all over.
suffix: Do not map
categories: [ DoNotMap ]
components:
- type: MeleeThrowOnHit
- type: MeleeWeapon

View File

@@ -3,7 +3,7 @@
id: WeaponMeleeToolboxRobust
name: robust toolbox
description: A tider's weapon.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Objects/Tools/Toolboxes/toolbox_red.rsi

View File

@@ -1192,6 +1192,7 @@
# Putting this as "DO NOT MAP" until the performance issues are fixed.
# And it's more fleshed out.
suffix: TESTING, DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
layers:

View File

@@ -150,8 +150,7 @@
- type: entity
id: HolopadHologram
name: hologram
categories: [ HideSpawnMenu ]
suffix: DO NOT MAP
categories: [ HideSpawnMenu, DoNotMap ]
components:
- type: Transform
anchored: true

View File

@@ -61,7 +61,7 @@
parent: [ ShuttleGunBase, ConstructibleMachine]
name: LSE-400c "Svalinn machine gun"
description: Basic stationary laser unit. Effective against live targets and electronics. Uses regular power cells to fire, and has an extremely high rate of fire.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shuttles/laser.rsi
@@ -115,7 +115,7 @@
parent: [ ShuttleGunBase, ConstructibleMachine]
name: LSE-1200c "Perforator"
description: Advanced stationary laser unit. Annihilates electronics and is extremely dangerous to health! Uses the power cage to fire.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shuttles/laser.rsi
@@ -171,7 +171,7 @@
parent: [ShuttleGunBase, ConstructibleMachine]
name: EXP-320g "Friendship"
description: A small stationary grenade launcher that holds 2 grenades.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shuttles/launcher.rsi
@@ -225,7 +225,7 @@
parent: [ShuttleGunBase, ConstructibleMachine]
name: EXP-2100g "Duster"
description: A powerful stationary grenade launcher. A cartridge is required for use.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shuttles/launcher.rsi
@@ -323,7 +323,7 @@
parent: [ ShuttleGunBase, ConstructibleMachine]
name: PTK-800 "Matter Dematerializer"
description: Salvage stationary mining turret. Gradually accumulates charges on its own, extremely effective for asteroid excavation.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Shuttles/kinetic.rsi

View File

@@ -82,7 +82,7 @@
name: janitorial bomb suit closet
parent: ClosetSteelBase
description: It's a storage unit for janitorial explosion-protective suits.
suffix: DO NOT MAP
categories: [ DoNotMap ]
components:
- type: Appearance
- type: EntityStorageVisuals

View File

@@ -22,3 +22,8 @@
- type: entityCategory
id: Mapping
name: entity-category-name-mapping
- type: entityCategory
id: DoNotMap
name: entity-category-name-donotmap
suffix: entity-category-suffix-donotmap