Tags everything that should be tagged (#3372)

* GlassBeaker and FirelockElectronics * Moves BaseItem * The rest * Indentations * Functional * for sloth * Applied zum reviews Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-02-23 07:48:57 +00:00
parent 898996abe9
commit e05698c027
28 changed files with 105 additions and 153 deletions
--- a/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Conveyor/conveyor.yml
@@ -46,11 +46,13 @@
  suffix: assembly
  description: A conveyor belt assembly. Used to construct a conveyor belt.
  components:
-    - type: Sprite
-      netsync: false
-      sprite: Constructible/Power/conveyor.rsi
-      state: conveyor_loose
-    - type: ConveyorAssembly
-    - type: Construction
-      graph: ConveyorGraph
-      node: item
+  - type: Tag
+    tags:
+    - ConveyorAssembly
+  - type: Sprite
+    netsync: false
+    sprite: Constructible/Power/conveyor.rsi
+    state: conveyor_loose
+  - type: Construction
+    graph: ConveyorGraph
+    node: item
--- a/Resources/Prototypes/Entities/Objects/Consumable/food.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/food.yml
@@ -4,6 +4,9 @@
  id: FoodBase
  abstract: true
  components:
+  - type: Tag
+    tags:
+    - Grindable
  - type: Food
  - type: LoopingSound
  - type: SolutionContainer
@@ -11,7 +14,6 @@
  - type: Sprite
    state: icon
    netsync: false
-  - type: Grindable

  # Only use visualizer if there's multiple steps available
 # - type: Appearance
--- a/Resources/Prototypes/Entities/Objects/Misc/firelock_electronics.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/firelock_electronics.yml
@@ -4,7 +4,9 @@
  name: Firelock Electronics
  description: Advanced circuit board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door.
  components:
+    - type: Tag
+      tags:
+      - FirelockElectronics
    - type: Sprite
      sprite: Constructible/Misc/module.rsi
      state: mainboard
-    - type: FirelockElectronics
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -9,7 +9,6 @@
    layers:
    - state: paper_words
    - state: paper
-
  - type: Paper
  - type: UserInterface
    interfaces:
@@ -22,8 +21,9 @@
  id: Pen
  description: 'A dark ink pen.'
  components:
+  - type: Tag
+    tags:
+    - Write
  - type: Sprite
    sprite: Objects/Misc/bureaucracy.rsi
    state: pen
-
-  - type: Write
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -12,9 +12,11 @@
  name: fork
  description: An eating utensil, perfect for stabbing.
  components:
+  - type: Tag
+    tags:
+    - Hoe
  - type: Sprite
    state: fork
-  - type: Hoe
  - type: Utensil
    types:
    - Fork
@@ -27,7 +29,6 @@
  components:
  - type: Sprite
    state: plastic_fork
-
  - type: Utensil
    types:
    - Fork
@@ -41,7 +42,6 @@
  components:
  - type: Sprite
    state: spoon
-
  - type: Utensil
    types:
    - Spoon
@@ -54,7 +54,6 @@
  components:
  - type: Sprite
    state: plastic_spoon
-
  - type: Utensil
    types:
    - Spoon
@@ -68,7 +67,6 @@
  components:
  - type: Sprite
    state: plastic_knife
-
  - type: Utensil
    types:
    - Knife
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -4,6 +4,9 @@
  id: HydroponicsToolMiniHoe
  description: It's used for removing weeds or scratching your back.
  components:
+  - type: Tag
+    tags:
+    - Hoe
  - type: Sprite
    sprite: Objects/Tools/Hydroponics/hoe.rsi
    state: icon
@@ -11,7 +14,6 @@
  - type: MeleeWeapon
  - type: Item
    sprite: Objects/Tools/Hydroponics/hoe.rsi
-  - type: Hoe

 - type: entity
  name: scythe
@@ -19,12 +21,14 @@
  id: HydroponicsToolScythe
  description: A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow.
  components:
+  - type: Tag
+    tags:
+    - BotanySharp
  - type: Sprite
    sprite: Objects/Tools/Hydroponics/scythe.rsi
    state: icon
  - type: ItemCooldown
  - type: MeleeWeapon
-  - type: BotanySharp
  - type: Item
    sprite: Objects/Tools/Hydroponics/scythe.rsi

@@ -34,12 +38,14 @@
  id: HydroponicsToolHatchet
  description: A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood.
  components:
+  - type: Tag
+    tags:
+    - BotanySharp
  - type: Sprite
    sprite: Objects/Tools/Hydroponics/hatchet.rsi
    state: icon
  - type: ItemCooldown
  - type: MeleeWeapon
-  - type: BotanySharp
  - type: Item
    sprite: Objects/Tools/Hydroponics/hatchet.rsi

@@ -49,11 +55,13 @@
  id: Spade
  description: A small tool for digging and moving dirt.
  components:
+  - type: Tag
+    tags:
+    - Shovel
  - type: Sprite
    sprite: Objects/Tools/Hydroponics/spade.rsi
    state: icon
  - type: ItemCooldown
  - type: MeleeWeapon
-  - type: Shovel
  - type: Item
    sprite: Objects/Tools/Hydroponics/spade.rsi
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -5,6 +5,9 @@
  description: Used to contain a moderate amount of chemicals and solutions.
  id: Beaker
  components:
+  - type: Tag
+    tags:
+    - GlassBeaker
  - type: Sprite
    sprite: Objects/Specific/Chemistry/beakers.rsi
    state: beaker
@@ -18,28 +21,22 @@
  - type: SolutionTransfer
    transferAmount: 5.0
  - type: Spillable
-  - type: GlassBeaker

 - type: entity
  name: large beaker
-  parent: BaseItem
+  parent: Beaker
  description: Used to contain a large amount of chemicals or solutions.
  id: LargeBeaker
  components:
  - type: Sprite
-    sprite: Objects/Specific/Chemistry/beakers.rsi
    state: beakerlarge
  - type: Item
-    sprite: Objects/Specific/Chemistry/beakers.rsi
    HeldPrefix: beaker
  - type: SolutionContainer
    fillingState: beakerlarge
    maxVol: 100
    caps: OpenContainer, FitsInDispenser
  - type: SolutionTransfer
-    transferAmount: 5.0
-  - type: Spillable
-  - type: GlassBeaker

 - type: entity
  name: dropper
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -4,6 +4,9 @@
  id: Haycutters
  description: This kills the wire. Moo!
  components:
+    - type: Tag
+      tags:
+      - PlantSampleTaker
    - type: Sprite
      sprite: Objects/Tools/Cowtools/haycutters.rsi
      state: haycutters
@@ -16,7 +19,6 @@
      speed: 0.05
    - type: Item
      sprite: Objects/Tools/Cowtools/haycutters.rsi
-    - type: PlantSampleTaker

 - type: entity
  name: moodriver
@@ -174,3 +176,5 @@
        - name: Mooltitool
        - name: Cowelder
        - name: Milkalyzer
+
+# I hate these fucking cowtools I hope the burn in hell -Swept
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -4,6 +4,9 @@
  id: Wirecutter
  description: This kills the wire.
  components:
+  - type: Tag
+    tags:
+    - PlantSampleTaker
  - type: Sprite
    sprite: Objects/Tools/wirecutters.rsi
    layers:
@@ -27,7 +30,6 @@
      yellow: "#d58c18"
  - type: Item
    sprite: Objects/Tools/wirecutters.rsi
-  - type: PlantSampleTaker

 - type: entity
  name: screwdriver
@@ -201,11 +203,13 @@
  id: Shovel
  description: A large tool for digging and moving dirt.
  components:
+    - type: Tag
+      tags:
+      - Shovel
    - type: Sprite
      sprite: Objects/Tools/Hydroponics/shovel.rsi
      state: icon
    - type: ItemCooldown
    - type: MeleeWeapon
-    - type: Shovel
    - type: Item
      sprite: Objects/Tools/Hydroponics/shovel.rsi
--- a/Resources/Prototypes/Entities/base_item.yml
+++ b/Resources/Prototypes/Entities/base_item.yml
--- a/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/conveyor.yml
@@ -6,7 +6,8 @@
      edges:
        - to: entity
          steps:
-            - component: ConveyorAssembly
+            # Replace with tag ASAP
+            - prototype: ConveyorAssembly
              icon:
                sprite: Constructible/Power/conveyor.rsi
                state: conveyor_loose
--- a/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/firelock.yml
@@ -50,8 +50,7 @@
            - !type:EntityAnchored
              anchored: true
          steps:
-            - component: FirelockElectronics
-              store: Firelock Electronics
+            - prototype: FirelockElectronics
              name: Firelock Electronics
              icon:
                sprite: "Constructible/Misc/module.rsi"
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1,11 +1,38 @@
+- type: Tag
+  id: BotanySharp
+
+- type: Tag
+  id: ConveyorAssembly
+
 - type: Tag
  id: ExplosivePassable

+- type: Tag
+  id: FirelockElectronics
+  
+- type: Tag
+  id: FootstepSound
+
+- type: Tag
+  id: GlassBeaker
+
+- type: Tag
+  id: Grindable
+
+- type: Tag
+  id: Hoe
+
+- type: Tag
+  id: PlantSampleTaker
+
+- type: Tag
+  id: Shovel
+  
+  - type: Tag
+  id: Teleportable
+
 - type: Tag
  id: Wall

 - type: Tag
-  id: Teleportable
-
- type: Tag
-  id: FootstepSound
+  id: Write