Welding tweaks (#27959)

2024-06-02 22:28:53 -05:00
parent 509e3aedf7
commit 31eb3ed62c
33 changed files with 139 additions and 141 deletions
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2255,7 +2255,7 @@
    - DoorBumpOpener
    - FootstepSound
  - type: Tool # Open door from xeno.yml.
-    speed: 1.5
+    speedModifier: 1.5
    qualities:
      - Prying
    useSound:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -22,7 +22,7 @@
      NavSmash: !type:Bool
        true
  - type: Tool
-    speed: 1.5
+    speedModifier: 1.5
    qualities:
      - Prying
  - type: Prying
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -80,7 +80,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.75 # not as good as a rolling pin but does the job
+    speedModifier: 0.75 # not as good as a rolling pin but does the job
  - type: PhysicalComposition
    materialComposition:
      Glass: 100
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -56,7 +56,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.25 # its small so takes longer to roll the entire dough flat
+    speedModifier: 0.25 # its small so takes longer to roll the entire dough flat
  - type: SpaceGarbage
  - type: TrashOnSolutionEmpty
    solution: drink
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -85,7 +85,7 @@
  components:
  - type: Sprite
    color: "#bbeeff"
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
  - type: DamageUserOnTrigger
@@ -120,7 +120,7 @@
    damage:
      types:
        Slash: 4.5
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: PartRodMetal1
@@ -156,7 +156,7 @@
    damage:
      types:
        Slash: 5.5
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: SheetPlasma1
@@ -195,7 +195,7 @@
      types:
        Slash: 4.5
        Radiation: 2
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: SheetUranium1
@@ -230,7 +230,7 @@
  components:
  - type: Sprite
    color: "#e0aa36"
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: SheetBrass1
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -26,6 +26,6 @@
    materialComposition:
      Glass: 50
  - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -46,7 +46,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.5 # its very big, akward to use
+    speedModifier: 0.5 # its very big, akward to use
  - type: Appearance
  - type: GenericVisualizer
    visuals:
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -66,7 +66,7 @@
    materialComposition:
      Glass: 25
  - type: SpaceGarbage
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1

@@ -273,7 +273,7 @@
  - type: Construction
    graph: CyanLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalCyan
@@ -293,7 +293,7 @@
  - type: Construction
    graph: BlueLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalBlue
@@ -313,7 +313,7 @@
  - type: Construction
    graph: PinkLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalPink
@@ -333,7 +333,7 @@
  - type: Construction
    graph: OrangeLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalOrange
@@ -353,7 +353,7 @@
  - type: Construction
    graph: RedLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalRed
@@ -373,7 +373,7 @@
  - type: Construction
    graph: GreenLight
    node: icon
-  - type: WelderRefinable
+  - type: ToolRefinable
    refineResult:
    - id: SheetGlass1
    - id: ShardCrystalGreen
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -178,7 +178,7 @@
  - type: Tool
    qualities:
      - Sawing
-    speed: 1.0
+    speedModifier: 1.0
 # No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb.

 - type: entity
@@ -200,7 +200,7 @@
  - type: Tool
    qualities:
      - Sawing
-    speed: 0.5
+    speedModifier: 0.5

 - type: entity
  name: circular saw
@@ -222,7 +222,7 @@
  - type: Tool
    qualities:
      - Sawing
-    speed: 1.5
+    speedModifier: 1.5

 - type: entity
  name: advanced circular saw
@@ -245,4 +245,4 @@
  - type: Tool
    qualities:
      - Sawing
-    speed: 2.0
+    speedModifier: 2.0
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -21,7 +21,7 @@
    - Cutting
    useSound:
      path: /Audio/Items/wirecutter.ogg
-    speed: 0.05
+    speedModifier: 0.05
  - type: Item
    sprite: Objects/Tools/Cowtools/haycutters.rsi

@@ -46,7 +46,7 @@
    - Screwing
    useSound:
      collection: Screwdriver
-    speed: 0.05
+    speedModifier: 0.05

 - type: entity
  name: wronch
@@ -69,7 +69,7 @@
    - Anchoring
    useSound:
      path: /Audio/Items/ratchet.ogg
-    speed: 0.05
+    speedModifier: 0.05

 - type: entity
  name: cowbar
@@ -93,7 +93,7 @@
    - Prying
    useSound:
      path: /Audio/Items/crowbar.ogg
-    speed: 0.05
+    speedModifier: 0.05
  - type: ToolTileCompatible
  - type: Prying

@@ -127,7 +127,7 @@
    size: Small
    sprite: Objects/Tools/Cowtools/cowelder.rsi
  - type: Tool
-    speed: 0.05
+    speedModifier: 0.05

 - type: entity
  name: milkalyzer
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -51,7 +51,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.6 # fairly unwieldly but nice round surface
+    speedModifier: 0.6 # fairly unwieldly but nice round surface

 - type: entity
  parent: GasTankRoundBase
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -21,7 +21,7 @@
  - type: Tool
    qualities:
      - Prying
-    speed: 1.5
+    speedModifier: 1.5
    useSound: /Audio/Items/jaws_pry.ogg
  - type: Prying
    pryPowered: true
@@ -69,7 +69,7 @@
  - type: Tool
    qualities:
      - Prying
-    speed: 3.0
+    speedModifier: 3.0
  - type: MultipleTool
    entries:
      - behavior: Prying
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -304,7 +304,7 @@
  - type: Tool
    qualities:
      - Screwing
-    speed: 1.5
+    speedModifier: 1.5
    useSound: /Audio/Items/drill_use.ogg
  - type: MultipleTool
    statusShowBehavior: true
@@ -479,7 +479,7 @@
  - type: Tool
    qualities:
      - Screwing
-    speed: 1.2 # Kept for future adjustments. Currently 1.2x for balance
+    speedModifier: 1.2 # Kept for future adjustments. Currently 1.2x for balance
    useSound: /Audio/Items/drill_use.ogg
  - type: ToolTileCompatible
  - type: MultipleTool
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -139,7 +139,7 @@
          Quantity: 250
        maxVol: 250
  - type: Tool
-    speed: 1.3
+    speedModifier: 1.3

 - type: entity
  name: experimental welding tool
@@ -190,7 +190,7 @@
          Quantity: 50
        maxVol: 50
  - type: Tool
-    speed: 0.7
+    speedModifier: 0.7
  - type: PointLight
    enabled: false
    radius: 1.0
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -26,7 +26,7 @@
  - type: Tool
    qualities:
    - Rolling
-    speed: 0.75 # a bit unwieldly but does the job
+    speedModifier: 0.75 # a bit unwieldly but does the job
  - type: Clothing
    quickEquip: false
    slots:
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -25,8 +25,7 @@
  - type: ReagentTank
    tankType: Fuel
  - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
    weldingDamage:
      types:
        Heat: 10
@@ -217,4 +216,3 @@
      fillBaseName: watertank-2-
    - type: ExaminableSolution
      solution: tank
-
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
@@ -82,8 +82,7 @@
  - type: ReagentTank
    tankType: Fuel
  - type: DamageOnToolInteract
-    tools:
-    - Welding
+    tools: Welding
    weldingDamage:
      types:
        Heat: 20
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -220,7 +220,7 @@
  - type: Tool
    qualities:
    - Screwing
-    speed: 2 # Very powerful multitool to balance out the desire to sell or scrap for points
+    speedModifier: 2 # Very powerful multitool to balance out the desire to sell or scrap for points
    useSound: /Audio/Items/drill_use.ogg
  - type: Tag
    tags: