Unhardcode some logic related to objects with battery slots. Minor fix to fire helmets. (#11734)

2022-10-15 13:15:39 -07:00
parent 581a805063
commit c11c11bace
13 changed files with 86 additions and 101 deletions
--- a/Resources/Locale/en-US/power-cell/components/power-cell-slot-component.ftl
+++ b/Resources/Locale/en-US/power-cell/components/power-cell-slot-component.ftl
@@ -1,8 +1,2 @@
-# Default examine descriptions
-power-cell-slot-component-description-default = It uses {$size} power cells.
-power-cell-slot-component-description-size-small = small
-power-cell-slot-component-description-size-medium = medium-sized
-power-cell-slot-component-description-size-large = large
-
 # Verbs
 power-cell-slot-component-slot-name-default = Power cell
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -58,12 +58,16 @@
    - type: FlashLightVisualizer
  - type: HandheldLight
    addPrefix: true
-  - type: Battery
-    maxCharge: 600 #lights drain 3/s but recharge of 2 makes this 1/s. Therefore 600 is 10 minutes of light.
-    startingCharge: 600
-  - type: BatterySelfRecharger
-    autoRecharge: true
-    autoRechargeRate: 2 #recharge of 2 makes total drain 1w / s so max charge is 1:1 with time. Time to fully charge should be 5 minutes. Having recharge gives light an extended flicker period which gives you some warning to return to light area.
+  - type: PowerCellSlot
+    cellSlotId: cell_slot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot {}

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -35,14 +35,17 @@
      head:
      - state: on-equipped-HELMET
  - type: PowerCellSlot
-    cellSlot:
-      startingItem: PowerCellMedium
+    cellSlotId: cell_slot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
  - type: Item
    heldPrefix: off
  - type: ContainerContainer
    containers:
      cell_slot: !type:ContainerSlot
-  - type: ItemSlots

 - type: entity
  parent: ClothingHeadHatHardhatBase
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -207,9 +207,6 @@
    sprite: Clothing/Head/Helmets/firehelmet.rsi
    quickEquip: true
  - type: IngestionBlocker
-  - type: PowerCellSlot
-    cellSlot:
-      startingItem: PowerCellMedium
  - type: TemperatureProtection
    coefficient: 0.01
  - type: Armor
@@ -221,10 +218,10 @@
        Heat: 0.65
        Radiation: 1
  - type: IdentityBlocker
-  - type: ItemSlots
-  - type: ContainerContainer
-    containers:
-      cell_slot: !type:ContainerSlot {}
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon

 - type: entity
  parent: ClothingHeadLightBase
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -8,13 +8,16 @@
  - type: ItemCooldown
  - type: UseDelay
    delay: 1.0
-  - type: ItemSlots
  - type: ContainerContainer
    containers:
      cell_slot: !type:ContainerSlot {}
  - type: PowerCellSlot
-    cellSlot:
-      startingItem: PowerCellMedium
+    cellSlotId: cell_slot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
  - type: Sprite
    sprite: Objects/Devices/Holoprojectors/custodial.rsi
    state: icon
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -7,7 +7,11 @@
  - type: HandheldLight
    addPrefix: true
  - type: PowerCellSlot
+    cellSlotId: cell_slot
  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
  - type: ContainerContainer
    containers:
      cell_slot: !type:ContainerSlot
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -26,12 +26,15 @@
      - state: inhand-right-light
        shader: unshaded
  - type: PowerCellSlot
-    cellSlot:
-      startingItem: PowerCellMedium
+    cellSlotId: cell_slot
  - type: ContainerContainer
    containers:
      cell_slot: !type:ContainerSlot
  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
  - type: Sprite
    sprite: Objects/Tools/flashlight.rsi
    netsync: false
@@ -64,9 +67,11 @@
  - type: Tag
    tags:
      - SecBeltEquip
-  - type: PowerCellSlot
-    cellSlot:
-      startingItem: PowerCellHigh
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
  - type: HandheldLight
    addPrefix: false
  - type: ToggleableLightVisuals
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -28,9 +28,12 @@
        - type: LanternVisualizer
    - type: ToggleableLightVisuals
    - type: PowerCellSlot
-      cellSlot:
-        startingItem: PowerCellMedium
+      cellSlotId: cell_slot
    - type: ItemSlots
+      slots:
+        cell_slot:
+          name: power-cell-slot-component-slot-name-default
+          startingItem: PowerCellMedium
    - type: ContainerContainer
      containers:
        cell_slot: !type:ContainerSlot {}