Wieldable/two-handed weapons (#4554)

* wielding kinda works

* rough out all the edges, wielding works nicely

* popups + loc

* increase damage & extra damage against whitelist

* small fixes

* forgot to actually do that

* reviews

* reviews + thing

* use resistances and not extradamageagainstwhitelist

* slashy

* make increasedamageonwield and melee hit events work with modifiersets

* Silly individual

Resources/Locale/en-US/wieldable/wieldable-component.ftl

@@ -0,0 +1,8 @@
+### Locale for wielding items; i.e. two-handing them
+
+wieldable-component-successful-wield = You wield { THE($item) }.
+wieldable-component-failed-wield = You unwield { THE($item) }.
+wieldable-component-no-hands = You don't have enough hands!
+wieldable-component-not-enough-free-hands = You need { $number } free hands to wield { THE($item) }.
+wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hands!
+

Resources/Prototypes/Damage/modifier_sets.yml

@@ -23,8 +23,18 @@
   coefficients:
     Blunt: 0.5
     Slash: 0.5
-    Piercing: 0.5
+    Piercing: 1.5
     Heat: 0
     Shock: 0
   flatReductions:
     Blunt: 5
+
+- type: damageModifierSet
+  id: Wood
+  coefficients:
+    Blunt: 0.5
+    Slash: 2.0
+    Piercing: 1.0
+    Heat: 2.0
+  flatReductions:
+    Blunt: 5

Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml

@@ -2,7 +2,7 @@
   name: fireaxe
   parent: BaseItem
   id: FireAxe
-  description: A large, robust axe. Can pry open doors and skulls alike.
+  description: Truly, the weapon of a madman. Who would think to fight fire with an axe?
   components:
   - type: Tag
     tags:
@@ -12,10 +12,19 @@
     state: icon
   - type: MeleeWeapon
     damage:
-      groups:
-        Brute: 25
+      types:
+        # axes are kinda like sharp hammers, you know?
+        Blunt: 7
+        Slash: 7
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    modifiers:
+      flatReductions:
+        Blunt: -5 # negative reductions = increases
+        Slash: -5
   - type: Clothing
     size: 20
     sprite: Objects/Weapons/Melee/fireaxe.rsi
+    QuickEquip: false
     Slots:
     - back

Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml

@@ -227,6 +227,8 @@
     sprite: Structures/Furniture/Tables/wood.rsi
   - type: Icon
     sprite: Structures/Furniture/Tables/wood.rsi
+  - type: Damageable
+    damageModifierSet: Wood
   - type: Destructible
     thresholds:
     - trigger:
@@ -246,6 +248,9 @@
   - type: Construction
     graph: table
     node: TableWood
+  - type: Tag
+    tags:
+    - Wooden
 
 - type: entity
   id: TableCarpet
@@ -257,6 +262,8 @@
     sprite: Structures/Furniture/Tables/carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Tables/carpet.rsi
+  - type: Damageable
+    damageModifierSet: Wood
   - type: Destructible
     thresholds:
     - trigger:
@@ -279,6 +286,9 @@
   - type: Construction
     graph: table
     node: TableCarpet
+  - type: Tag
+    tags:
+    - Wooden
 
 - type: entity
   id: TableStone

Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml

@@ -19,6 +19,7 @@
       - book-4
       - book-5
   - type: Damageable
+    damageModifierSet: Wood
     damageContainer: Inorganic
   - type: Destructible
     thresholds:
@@ -36,3 +37,6 @@
             max: 1
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Wooden

Resources/Prototypes/Entities/Structures/Furniture/seats.yml

@@ -186,6 +186,8 @@
   - type: Construction
     graph: seat
     node: chairWood
+  - type: Damageable
+    damageModifierSet: Wood
   - type: Destructible
     thresholds:
     - trigger:
@@ -202,6 +204,9 @@
           MaterialWoodPlank:
             min: 1
             max: 1
+  - type: Tag
+    tags:
+    - Wooden
 
 - type: entity
   name: pilot seat

Resources/Prototypes/Entities/Structures/Walls/barricades.yml

@@ -23,9 +23,10 @@
   - type: Tag
     tags:
     - ExplosivePassable
+    - Wooden
   - type: Damageable
+    damageModifierSet: Wood
     damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Virtual/virtual_item.yml

@@ -0,0 +1,8 @@
+# This item is stored in the hand slot while it is blocked, to represent what is blocking that hand.
+- type: entity
+  id: HandVirtualItem
+  name: VIRTUAL ITEM YOU SHOULD NOT SEE THIS
+  abstract: true
+  components:
+  - type: Item
+  - type: HandVirtualItem

Resources/Prototypes/Entities/Virtual/virtual_pull_item.yml

@@ -1,8 +0,0 @@
-# This item is stored in the hand slot while you are pulling something, to represent that and what you are pulling.
-- type: entity
-  id: HandVirtualPull
-  name: VIRTUAL PULL YOU SHOULD NOT SEE THIS
-  abstract: true
-  components:
-  - type: Item
-  - type: HandVirtualPull

Resources/Prototypes/tags.yml

@@ -205,5 +205,8 @@
 - type: Tag
   id: Write
 
+- type: Tag
+  id: Wooden # just like our atmos
+
 - type: Tag
   id: EmitterBolt

Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/meta.json

@@ -17,6 +17,14 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+	{
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+	{
+      "name": "wielded-inhand-right",
+      "directions": 4
     },
     {
       "name": "equipped-BACKPACK",