Re-add action prototypes (#7508)

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-04-14 16:17:34 +12:00
parent c30b38a476
commit ba75934512
34 changed files with 291 additions and 189 deletions
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -0,0 +1,42 @@
+- type: instantAction
+  id: Scream
+  useDelay: 10
+  icon: Interface/Actions/scream.png
+  name: action-name-scream
+  description: AAAAAAAAAAAAAAAAAAAAAAAAA
+  serverEvent: !type:ScreamActionEvent
+  checkCanInteract: false
+
+- type: instantAction
+  id: ToggleLight
+  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: entityTargetAction
+  id: Disarm
+  name: action-name-disarm
+  description: action-description-disarm
+  icon: Interface/Actions/disarmOff.png
+  iconOn: Interface/Actions/disarm.png
+  repeat: true
+  useDelay: 1.5
+  interactOnMiss: true
+  event: !type:DisarmActionEvent
+  canTargetSelf: false
+  whitelist:
+    components:
+    - Hands
+    - StatusEffects
+
+- type: instantAction
+  id: CombatModeToggle
+  name: action-name-combat
+  description: action-description-combat
+  icon: Interface/Actions/harmOff.png
+  iconOn: Interface/Actions/harm.png
+  userPopup: action-popup-combat
+  popupToggleSuffix: -disabling
+  event: !type:ToggleCombatActionEvent
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -98,12 +98,6 @@
    - type: FlashLightVisualizer
  - type: HandheldLight
    addPrefix: true
-    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
@@ -21,12 +21,6 @@
      - type: FlashLightVisualizer
  - type: HandheldLight
    addPrefix: true
-    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/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -705,6 +705,7 @@
    # mice are gender neutral who cares
    maleScream: /Audio/Animals/mouse_squeak.ogg
    femaleScream: /Audio/Animals/mouse_squeak.ogg
+    wilhelmProbability: 0.001
  # TODO: Remove CombatMode when Prototype Composition is added
  - type: CombatMode
    combatToggleAction:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -95,20 +95,6 @@
      100: !type:DeadMobState {}
  - type: HeatResistance
  - type: CombatMode
-    disarmAction:
-      name: action-name-disarm
-      description: action-description-disarm
-      icon: Interface/Actions/disarmOff.png
-      iconOn: Interface/Actions/disarm.png
-      repeat: true
-      useDelay: 1.5
-      interactOnMiss: true
-      event: !type:DisarmActionEvent
-      canTargetSelf: false
-      whitelist:
-        components:
-        - Hands
-        - StatusEffects
  - type: Internals
  - type: StatusEffects
    allowed:
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -12,20 +12,6 @@
  - type: Hands
  - type: DoAfter
  - type: CombatMode
-    disarmAction:
-      name: action-name-disarm
-      description: action-description-disarm
-      icon: Interface/Actions/disarmOff.png
-      iconOn: Interface/Actions/disarm.png
-      repeat: true
-      useDelay: 1.5
-      interactOnMiss: true
-      event: !type:DisarmActionEvent
-      canTargetSelf: false
-      whitelist:
-        components:
-        - Hands
-        - StatusEffects
  - type: Actions
  - type: PlayerInputMover
  - type: MovementSpeedModifier
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -53,20 +53,6 @@
      0: !type:NormalMobState {}
  - type: HeatResistance
  - type: CombatMode
-    disarmAction:
-      name: action-name-disarm
-      description: action-description-disarm
-      icon: Interface/Actions/disarmOff.png
-      iconOn: Interface/Actions/disarm.png
-      repeat: true
-      useDelay: 1.5
-      interactOnMiss: true
-      event: !type:DisarmActionEvent
-      canTargetSelf: false
-      whitelist:
-        components:
-        - Hands
-        - StatusEffects
  - type: Internals
  - type: Examiner
  - type: Speech
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -228,17 +228,3 @@
      normal: onestar_boss
      dead: onestar_boss_wrecked
  - type: CombatMode
-    disarmAction:
-      name: action-name-disarm
-      description: action-description-disarm
-      icon: Interface/Actions/disarmOff.png
-      iconOn: Interface/Actions/disarm.png
-      repeat: true
-      useDelay: 1.5
-      interactOnMiss: true
-      event: !type:DisarmActionEvent
-      canTargetSelf: false
-      whitelist:
-        components:
-        - Hands
-        - StatusEffects
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -258,20 +258,6 @@
        Burn:
          sprite: Mobs/Effects/burn_damage.rsi
  - type: CombatMode
-    disarmAction:
-      name: action-name-disarm
-      description: action-description-disarm
-      icon: Interface/Actions/disarmOff.png
-      iconOn: Interface/Actions/disarm.png
-      repeat: true
-      useDelay: 1.5
-      interactOnMiss: true
-      event: !type:DisarmActionEvent
-      canTargetSelf: false
-      whitelist:
-        components:
-        - Hands
-        - StatusEffects
  - type: Climbing
  - type: Cuffable
  - type: CharacterInfo
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -6,12 +6,6 @@
  components:
  - type: HandheldLight
    addPrefix: true
-    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: Sprite
    sprite: Objects/Misc/Lights/lights.rsi
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -17,12 +17,6 @@
      right:
      - state: inhand-right-light
        shader: unshaded
-    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/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -6,12 +6,6 @@
  components:
    - type: HandheldLight
      addPrefix: true
-      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: