Patched Actions Rework (#6899)

* Rejig Actions * fix merge errors * lambda-b-gon * fix PAI, add innate actions * Revert "fix PAI, add innate actions" This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b. * Just fix by making nullable. if only require: true actually did something somehow. * Make AddActions() ensure an actions component and misc comments * misc cleanup * Limit range even when not checking for obstructions * remove old guardian code * rename function and make EntityUid nullable * fix magboot bug * fix action search menu * make targeting toggle all equivalent actions * fix combat popups (enabling <-> disabling) * fix networking * Allow action locking * prevent telepathy
2022-02-26 18:24:08 +13:00
parent d32f884157
commit ff7d4ed9f6
135 changed files with 3156 additions and 5166 deletions
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -63,12 +63,13 @@
  - type: Appearance
    visuals:
    - type: FlashLightVisualizer
-  - type: ItemActions
-    actions:
-    - actionType: ToggleLight
-    # right now there is no power system for hardsuits
-    # so hardsuit helmet just have small battery inside
  - type: HandheldLight
+    toggleAction:
+      name: action-name-toggle-light
+      description: action-description-toggle-light
+      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+      event: !type:ToggleActionEvent
  - type: PowerCellSlot
    cellSlot:
      startingItem: PowerCellHardsuitHelmet # self recharging
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -19,9 +19,12 @@
    visuals:
      - type: FlashLightVisualizer
  - type: HandheldLight
-  - type: ItemActions
-    actions:
-      - actionType: ToggleLight
+    toggleAction:
+      name: action-name-toggle-light
+      description: action-description-toggle-light
+      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+      event: !type:ToggleActionEvent
  - type: PowerCellSlot
    cellSlot:
      startingItem: PowerCellSmallHigh
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -10,9 +10,13 @@
    - type: Clothing
      sprite: Clothing/Shoes/Boots/magboots.rsi
    - type: Magboots
-    - type: ItemActions
-      actions:
-        - actionType: ToggleMagboots
+      toggleAction:
+        icon: Clothing/Shoes/Boots/magboots.rsi/icon.png
+        iconOn: Clothing/Shoes/Boots/magboots.rsi/icon-on.png
+        name: action-name-magboot-toggle
+        description: action-decription-magboot-toggle
+        itemIconStyle: NoItem
+        event: !type:ToggleActionEvent

 - type: entity
  parent: ClothingShoesBootsMag
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -643,8 +643,15 @@
    tags:
    - Trash
  - type: Recyclable
-  - type: Actions # TODO: Remove CombatMode when Prototype Composition is added
-    innateActions: []
+  - type: Actions 
+  # TODO: Remove CombatMode when Prototype Composition is added
+  - type: CombatMode
+    combatToggleAction:
+      enabled: false
+      autoPopulate: false
+    disarmAction:
+      enabled: false
+      autoPopulate: false


 - type: entity
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -121,8 +121,6 @@
      sprite: Mobs/Effects/onfire.rsi
      normalState: Generic_mob_burning
  - type: Actions
-    innateActions:
-      - CombatMode
  - type: DoAfter
  - type: Climbing
  - type: Flashable
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -13,9 +13,6 @@
  - type: DoAfter
  - type: CombatMode
  - type: Actions
-    innateActions:
-    - CombatMode
-    - GhostBoo
  - type: PlayerInputMover
  - type: Physics
    bodyType: Kinematic
--- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -13,10 +13,6 @@
    - type: PlayerInputMover
    - type: Alerts
    - type: Actions
-      innateActions:
-        - CombatMode
-        - Disarm
-        - HumanScream
    - type: Eye
    - type: CameraRecoil
    - type: Examiner
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -68,8 +68,6 @@
      types:
        Blunt: 22
  - type: Actions
-    innateActions:
-      - CombatMode
  - type: Guardian
  - type: NameIdentifier
    group: Holoparasite
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -20,10 +20,6 @@
        Asphyxiation: -1.5
  - type: Alerts
  - type: Actions
-    innateActions:
-      - CombatMode
-      - Disarm
-      - HumanScream
  - type: Eye
  - type: CameraRecoil
  - type: Examiner
--- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml
@@ -45,6 +45,3 @@
    baseSprintSpeed: 14
    baseWalkSpeed: 7
  - type: MovementIgnoreGravity
-  - type: Actions
-    innateActions:
-      - GhostBoo
--- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -11,10 +11,6 @@
    - type: PlayerInputMover
    - type: Alerts
    - type: Actions
-      innateActions:
-        - CombatMode
-        - Disarm
-        - HumanScream
    - type: Eye
    - type: CameraRecoil
    - type: Examiner
--- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -10,12 +10,12 @@
      context: "human"
    - type: Alerts
    - type: Actions
-      innateActions:
-        - VoxScream
-        - Disarm
    - type: Eye
    - type: CameraRecoil
    - type: Examiner
+    - type: Vocal
+      maleScream: /Audio/Voice/Vox/shriek1.ogg
+      femaleScream: /Audio/Voice/Vox/shriek1.ogg
    - type: AiFactionTag
      factions:
        - NanoTrasen
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -288,6 +288,7 @@
 #  - type: Recyclable Turns out turning off recycler safeties without considering the instagib is a bad idea
 #    safe: false
  - type: Speech
+  - type: Vocal
  - type: Emoting
  - type: Grammar
    attributes:
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -22,6 +22,12 @@
    - idcard
    - Belt
  - type: UnpoweredFlashlight
+    toggleAction:
+      name: action-name-toggle-light
+      description: action-description-toggle-light
+      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+      event: !type:ToggleActionEvent
  - type: PointLight
    enabled: false
    radius: 2.5
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -25,12 +25,17 @@
  - type: Input
    context: "human"
  - type: PAI
+    midiAction:
+      name: action-name-pai-play-midi
+      checkCanInteract: false
+      icon: Interface/Actions/pai-midi.png
+      description: action-description-pai-play-midi
+      event: !type:OpenUiActionEvent
+        key: enum.InstrumentUiKey.Key
  - type: Examiner
  - type: GhostRadio
  - type: DoAfter
  - type: Actions
-    innateActions:
-      - PAIMidi
    # This has to be installed because otherwise they're not "alive",
    #  so they can ghost and come back.
    # Note that the personal AI never "dies".
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -5,10 +5,13 @@
  abstract: true
  components:
  - type: HandheldLight
+    toggleAction:
+      name: action-name-toggle-light
+      description: action-description-toggle-light
+      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+      event: !type:ToggleActionEvent
  - type: PowerCellSlot
-  - type: ItemActions
-    actions:
-        - actionType: ToggleLight
  - type: Sprite
    sprite: Objects/Misc/Lights/lights.rsi
    netsync: false
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -8,9 +8,12 @@
    tags:
    - Flashlight
  - type: HandheldLight
-  - type: ItemActions
-    actions:
-      - actionType: ToggleLight
+    toggleAction:
+      name: action-name-toggle-light
+      description: action-description-toggle-light
+      icon: Objects/Tools/flashlight.rsi/flashlight.png
+      iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+      event: !type:ToggleActionEvent
  - type: PowerCellSlot
    cellSlot:
      startingItem: PowerCellSmallHigh
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -15,9 +15,12 @@
    sprite: Objects/Tanks/generic.rsi
    QuickEquip: false
  - type: GasTank
-  - type: ItemActions
-    actions:
-    - actionType: ToggleInternals
+    toggleAction:
+      name: action-name-internals-toggle
+      description: action-description-internals-toggle
+      icon: Interface/Actions/internal0.png
+      iconOn: Interface/Actions/internal1.png
+      event: !type:ToggleActionEvent

 - type: entity
  parent: GasTankBase
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -5,9 +5,12 @@
  description: The holy light guides the way.
  components:
    - type: HandheldLight
-    - type: ItemActions
-      actions:
-        - actionType: ToggleLight
+      toggleAction:
+        name: action-name-toggle-light
+        description: action-description-toggle-light
+        icon: Objects/Tools/flashlight.rsi/flashlight.png
+        iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+        event: !type:ToggleActionEvent
    - type: Sprite
      sprite: Objects/Tools/lantern.rsi
      layers: