shield values examine (#17245)

Resources/Locale/en-US/blocking/blocking-examine.ftl

@@ -0,0 +1,6 @@
+# Blocking examines
+blocking-examinable-verb-text = Protection
+blocking-examinable-verb-message = Examine the protection values.
+blocking-fraction = It blocks [color=lightblue]{$value}%[/color] of incoming damage and:
+blocking-coefficient-value = - It takes [color=lightblue]{$value}%[/color] of [color=yellow]{$type}[/color] damage.
+blocking-reduction-value = - It takes [color=lightblue]{$value}[/color] less [color=yellow]{$type}[/color] damage.

Resources/Prototypes/Damage/modifier_sets.yml

@@ -184,139 +184,3 @@
     Cellular: 0.0
     Radiation: 0.2
     Caustic: 0.0
-
-# Represents what a riot shield should block passively
-# Each shield will probably have their own passive and active modifier sets
-# Honestly it should not be too high
-- type: damageModifierSet
-  id: PassiveRiotShieldBlock
-  coefficients:
-    Blunt: 0.9
-    Slash: 0.9
-    Piercing: 0.9
-    Heat: 0.9
-
-# Represents what a riot shield should block while active
-# Should be a higher reduction because you're anchored
-- type: damageModifierSet
-  id: ActiveRiotShieldBlock
-  coefficients:
-    Blunt: 0.8
-    Slash: 0.8
-    Piercing: 0.8
-    Heat: 0.8
-  flatReductions:
-    Blunt: 1
-    Slash: 1
-    Piercing: 1
-    Heat: 1
-
-- type: damageModifierSet
-  id: PassiveRiotLaserShieldBlock
-  coefficients:
-    Heat: 0.8
-
-- type: damageModifierSet
-  id: ActiveRiotLaserShieldBlock
-  coefficients:
-    Heat: 0.7
-  flatReductions:
-    Heat: 2
-
-- type: damageModifierSet
-  id: PassiveRiotBulletShieldBlock
-  coefficients:
-    Blunt: 0.8
-    Piercing: 0.8
-
-- type: damageModifierSet
-  id: ActiveRiotBulletShieldBlock
-  coefficients:
-    Blunt: 0.7
-    Piercing: 0.7
-  flatReductions:
-    Blunt: 1.5
-    Piercing: 1.5
-
-#It's made from wood, so it should probably take more heat/laser damage
-- type: damageModifierSet
-  id: PassiveBucklerBlock
-  coefficients:
-    Blunt: 0.95
-    Slash: 0.95
-    Piercing: 0.95
-    Heat: 2
-
-- type: damageModifierSet
-  id: ActiveBucklerBlock
-  coefficients:
-    Blunt: 0.85
-    Slash: 0.85
-    Piercing: 0.85
-    Heat: 2
-  flatReductions:
-    Blunt: 1
-    Slash: 1
-    Piercing: 1
-
-#It's a really crummy shield
-- type: damageModifierSet
-  id: PassiveMakeshiftBlock
-  coefficients:
-    Blunt: 0.95
-    Slash: 0.95
-    Piercing: 0.95
-    Heat: 0.9
-
-- type: damageModifierSet
-  id: ActiveMakeshiftBlock
-  coefficients:
-    Blunt: 0.85
-    Slash: 0.85
-    Piercing: 0.85
-    Heat: 0.8
-  flatReductions:
-    Blunt: 0.5
-    Slash: 0.5
-    Piercing: 0.5
-    Heat: 1
-
-#Clockwork generally takes more laser/heat damage
-- type: damageModifierSet
-  id: PassiveClockworkShieldBlock
-  coefficients:
-    Blunt: 0.8
-    Slash: 0.8
-    Piercing: 0.8
-    Heat: 1.5
-
-- type: damageModifierSet
-  id: ActiveClockworkShieldBlock
-  coefficients:
-    Blunt: 0.7
-    Slash: 0.7
-    Piercing: 0.7
-    Heat: 1.5
-  flatReductions:
-    Blunt: 1
-    Slash: 1
-    Piercing: 1
-
-#Mirror shield should reflect heat/laser eventually, but be relatively weak to everything else.
-- type: damageModifierSet
-  id: PassiveMirrorShieldBlock
-  coefficients:
-    Blunt: 1.2
-    Slash: 1.2
-    Piercing: 1.2
-    Heat: .7
-
-- type: damageModifierSet
-  id: ActiveMirrorShieldBlock
-  coefficients:
-    Blunt: 1.2
-    Slash: 1.2
-    Piercing: 1.2
-    Heat: .6
-  flatReductions:
-    Heat: 1

Resources/Prototypes/Entities/Objects/Shields/shields.yml

@@ -13,8 +13,23 @@
       size: 100
       heldPrefix: riot
     - type: Blocking
-      passiveBlockModifier: PassiveRiotShieldBlock
-      activeBlockModifier: ActiveRiotShieldBlock
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 0.9
+          Slash: 0.9
+          Piercing: 0.9
+          Heat: 0.9
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.8
+          Slash: 0.8
+          Piercing: 0.8
+          Heat: 0.8
+        flatReductions:
+          Blunt: 1
+          Slash: 1
+          Piercing: 1
+          Heat: 1
       blockingToggleAction:
         name: action-name-blocking
         description: action-description-blocking
@@ -72,8 +87,14 @@
     - type: Item
       heldPrefix: riot_laser
     - type: Blocking
-      passiveBlockModifier: PassiveRiotLaserShieldBlock
-      activeBlockModifier: ActiveRiotLaserShieldBlock
+      passiveBlockModifier:
+        coefficients:
+          Heat: 0.8
+      activeBlockModifier:
+        coefficients:
+          Heat: 0.7
+        flatReductions:
+          Heat: 2
 
 - type: entity
   name: riot bullet shield
@@ -86,8 +107,17 @@
     - type: Item
       heldPrefix: riot_bullet
     - type: Blocking
-      passiveBlockModifier: PassiveRiotBulletShieldBlock
-      activeBlockModifier: ActiveRiotBulletShieldBlock
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 0.8
+          Piercing: 0.8
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.7
+          Piercing: 0.7
+        flatReductions:
+          Blunt: 1.5
+          Piercing: 1.5
 
 #Craftable shields
 
@@ -102,8 +132,22 @@
     - type: Item
       heldPrefix: buckler
     - type: Blocking
-      passiveBlockModifier: PassiveBucklerBlock
-      activeBlockModifier: ActiveBucklerBlock
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 0.95
+          Slash: 0.95
+          Piercing: 0.95
+          Heat: 2
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.85
+          Slash: 0.85
+          Piercing: 0.85
+          Heat: 2
+        flatReductions:
+          Blunt: 1
+          Slash: 1
+          Piercing: 1
     - type: Construction
       graph: WoodenBuckler
       node: woodenBuckler
@@ -142,8 +186,23 @@
     - type: Item
       heldPrefix: metal
     - type: Blocking
-      passiveBlockModifier: PassiveMakeshiftBlock
-      activeBlockModifier: ActiveMakeshiftBlock
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 0.95
+          Slash: 0.95
+          Piercing: 0.95
+          Heat: 0.9
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.85
+          Slash: 0.85
+          Piercing: 0.85
+          Heat: 0.8
+        flatReductions:
+          Blunt: 0.5
+          Slash: 0.5
+          Piercing: 0.5
+          Heat: 1
     - type: Construction
       graph: MakeshiftShield
       node: makeshiftShield
@@ -182,8 +241,22 @@
     - type: Item
       heldPrefix: ratvarian
     - type: Blocking
-      passiveBlockModifier: PassiveClockworkShieldBlock
-      activeBlockModifier: ActiveClockworkShieldBlock
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 0.8
+          Slash: 0.8
+          Piercing: 0.8
+          Heat: 1.5
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.7
+          Slash: 0.7
+          Piercing: 0.7
+          Heat: 1.5
+        flatReductions:
+          Blunt: 1
+          Slash: 1
+          Piercing: 1
       #Have it break into brass when clock cult is in
 
 - type: entity
@@ -196,9 +269,21 @@
       state: mirror-icon
     - type: Item
       heldPrefix: mirror
-    - type: Blocking
-      passiveBlockModifier: PassiveMirrorShieldBlock
-      activeBlockModifier: ActiveMirrorShieldBlock
+    - type: Blocking #Mirror shield should reflect heat/laser eventually, but be relatively weak to everything else.
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 1.2
+          Slash: 1.2
+          Piercing: 1.2
+          Heat: .7
+      activeBlockModifier:
+        coefficients:
+          Blunt: 1.2
+          Slash: 1.2
+          Piercing: 1.2
+          Heat: .6
+        flatReductions:
+          Heat: 1
       blockSound: !type:SoundPathSpecifier
         path: /Audio/Effects/glass_step.ogg
     - type: Destructible