Blocking and Shields (#8584)

* Blocking * Fixes Bodytype bug * Blocking Damage Modifier * Storing bodytype * Consolidates Stop Blocking code * Consolidates more methods * Some cleanup, hitbox fix * Shield Textures * Passive blocking modifier check * Localization, popups, and more cleanup * Small cleanup * Relay event * Fixes a shutdown bug, adds specific containers and sets * Popups and sounds * Fixes typo * Removes whitespace, adds comment * Some requested changes * Remove Shared * Audio fix * More changes * More requested changes * Properly remove on shutdown * Adds riot shields to seclathes * SecTech Riot shield * Constant variable * Relay transfer to user blocking system * More destruction behavior * Adds a shape field * Riot shield cleanup * More requested changes. * Prevents blocking attempt where a user cannot be anchored * Listen for anchor change * Unused using cleanup * More shields. * Buckler * Construction * Linter fix
2022-07-04 02:31:12 -04:00
parent 22d228fd11
commit d65601f024
53 changed files with 981 additions and 1 deletions
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -0,0 +1,194 @@
+- type: entity
+  name: base shield
+  parent: BaseItem
+  id: BaseShield
+  description: A shield!
+  abstract: true
+  components:
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/shields.rsi
+      state: riot-icon
+      netsync: false
+    - type: Item
+      sprite: Objects/Weapons/Melee/shields.rsi
+      size: 100
+      HeldPrefix: riot
+    - type: Blocking
+      passiveBlockModifier: PassiveRiotShieldBlock
+      activeBlockModifier: ActiveRiotShieldBlock
+      blockingToggleAction:
+        name: action-name-blocking
+        description: action-description-blocking
+        icon: Objects/Weapons/Melee/shields.rsi/teleriot-icon.png
+        iconOn: Objects/Weapons/Melee/shields.rsi/teleriot-on.png
+        event: !type:ToggleActionEvent
+    - type: Damageable
+      damageContainer: Shield
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 40 #This is probably enough damage before it breaks
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound: /Audio/Effects/metalbreak.ogg
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                SheetSteel:
+                  min: 5
+                  max: 5
+                SheetGlass:
+                  min: 5
+                  max: 5
+
+#Security Shields
+
+- type: entity
+  name: riot shield
+  parent: BaseShield
+  id: RiotShield
+  description: A large tower shield. Good for controlling crowds.
+
+- type: entity
+  name: riot laser shield
+  parent: BaseShield
+  id: RiotLaserShield
+  description: A riot shield built for withstanding lasers, but not much else.
+  components:
+    - type: Sprite
+      state: riot_laser-icon
+    - type: Item
+      HeldPrefix: riot_laser
+    - type: Blocking
+      passiveBlockModifier: PassiveRiotLaserShieldBlock
+      activeBlockModifier: ActiveRiotLaserShieldBlock
+
+- type: entity
+  name: riot bullet shield
+  parent: BaseShield
+  id: RiotBulletShield
+  description: A ballistic riot shield built for withstanding bullets, but not much else.
+  components:
+    - type: Sprite
+      state: riot_bullet-icon
+    - type: Item
+      HeldPrefix: riot_bullet
+    - type: Blocking
+      passiveBlockModifier: PassiveRiotBulletShieldBlock
+      activeBlockModifier: ActiveRiotBulletShieldBlock
+
+#Craftable shields
+
+- type: entity
+  name: wooden buckler
+  parent: BaseShield
+  id: WoodenBuckler
+  description: A small round wooden makeshift shield.
+  components:
+    - type: Sprite
+      state: buckler-icon
+    - type: Item
+      HeldPrefix: buckler
+    - type: Blocking
+      passiveBlockModifier: PassiveBucklerBlock
+      activeBlockModifier: ActiveBucklerBlock
+    - type: Construction
+      graph: WoodenBuckler
+      node: woodenBuckler
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 30 #Weaker shield
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound: /Audio/Effects/metalbreak.ogg
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                MaterialWoodPlank:
+                  min: 5
+                  max: 5
+
+- type: entity
+  name: makeshift shield
+  parent: BaseShield
+  id: MakeshiftShield
+  description: A rundown looking shield, not good for much.
+  components:
+    - type: Sprite
+      state: makeshift-icon
+    - type: Item
+      HeldPrefix: metal
+    - type: Blocking
+      passiveBlockModifier: PassiveMakeshiftBlock
+      activeBlockModifier: ActiveMakeshiftBlock
+    - type: Construction
+      graph: MakeshiftShield
+      node: makeshiftShield
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 20 #Very weak shield
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound: /Audio/Effects/metalbreak.ogg
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                SheetSteel:
+                  min: 1
+                  max: 2
+
+#Magic/Cult Shields (give these to wizard for now)
+
+- type: entity
+  name: Clockwork Shield
+  parent: BaseShield
+  id: ClockworkShield
+  description: Ratvar oyrffrf lbh jvgu uvf cebgrpgvba.
+  components:
+    - type: Sprite
+      state: ratvarian-icon
+    - type: Item
+      HeldPrefix: ratvarian
+    - type: Blocking
+      passiveBlockModifier: PassiveClockworkShieldBlock
+      activeBlockModifier: ActiveClockworkShieldBlock
+      #Have it break into brass when clock cult is in
+
+- type: entity
+  name: Mirror Shield
+  parent: BaseShield
+  id: MirrorShield
+  description: Eerily glows red... you hear the geometer whispering
+  components:
+    - type: Sprite
+      state: mirror-icon
+    - type: Item
+      HeldPrefix: mirror
+    - type: Blocking
+      passiveBlockModifier: PassiveMirrorShieldBlock
+      activeBlockModifier: ActiveMirrorShieldBlock
+      blockSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/glass_step.ogg
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 40
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound: /Audio/Effects/glass_break1.ogg
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                SheetGlass:
+                  min: 5
+                  max: 5
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -305,6 +305,7 @@
      - Flash
      - Handcuffs
      - Stunbaton
+      - RiotShield
      - CartridgePistol
      - ShellShotgun
      - CartridgeLightRifle