the bladed flatcap (#25780)

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 528e46dd97ccf5e132aa7682ec3541e9e4c5392b..367a7bb636cc605e0adb951c3133c9b25d0e96f4 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -927,6 +927,9 @@
   name: grey flatcap
   description: Fashionable for both the working class and old man Jenkins.
   components:
+  - type: Tag
+    tags:
+    - BrimFlatcapGrey
   - type: Sprite
     sprite: Clothing/Head/Hats/greyflatcap.rsi
   - type: Clothing
@@ -938,6 +941,9 @@
   name: brown flatcap
   description: Stupid clown! You made me look bad!
   components:
+  - type: Tag
+    tags:
+    - BrimFlatcapBrown
   - type: Sprite
     sprite: Clothing/Head/Hats/brownflatcap.rsi
   - type: Clothing

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 106e8bf4400e241ead2f4c6918eb4e3f9fc14e07..810412be907af315e4aa2d16fe44add9e566c846 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -130,6 +130,44 @@
   - type: Item
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
 
+- type: entity
+  parent: ClothingHeadHatGreyFlatcap
+  id: BladedFlatcapGrey
+  name: grey flatcap
+  description: Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim.
+  suffix: Bladed
+  components:
+  - type: Construction
+    graph: BladedFlatcapGrey
+    node: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 90
+    attackRate: 1.2
+    damage:
+      types:
+        Slash: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 10
+  - type: Sprite
+    sprite: Clothing/Head/Hats/greyflatcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/greyflatcap.rsi
+
+- type: entity
+  parent: BladedFlatcapGrey
+  id: BladedFlatcapBrown
+  name: brown flatcap
+  description: Stupid clown! You made me look bad! It has glass shards hidden in the brim.
+  components:
+  - type: Construction
+    graph: BladedFlatcapBrown
+  - type: Sprite
+    sprite: Clothing/Head/Hats/brownflatcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/brownflatcap.rsi
+
 - type: entity
   name: shiv
   parent: BaseKnife

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
new file mode 100644 (file)
index 0000000..e582c3e
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
@@ -0,0 +1,43 @@
+- type: constructionGraph
+  id: BladedFlatcapGrey
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: GlassShard
+        name: a glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - tag: BrimFlatcapGrey
+        name: a grey flatcap
+        icon:
+          sprite: Clothing/Head/Hats/greyflatcap.rsi
+          state: icon
+  - node: icon
+    entity: BladedFlatcapGrey
+
+- type: constructionGraph
+  id: BladedFlatcapBrown
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: GlassShard
+        name: a glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - tag: BrimFlatcapBrown
+        name: a brown flatcap
+        icon:
+          sprite: Clothing/Head/Hats/brownflatcap.rsi
+          state: icon
+  - node: icon
+    entity: BladedFlatcapBrown

diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index 2efc3f01a41b91f1556588d078d49f1e5a955efa..040d4c8963d13899bfd53c3cecaf40f40d4290b5 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -1,3 +1,25 @@
+- type: construction
+  name: grey bladed flatcap
+  id: BladedFlatcapGrey
+  graph: BladedFlatcapGrey
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: An inconspicuous hat with glass shards sewn into the brim.
+  icon: { sprite: Clothing/Head/Hats/greyflatcap.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: brown bladed flatcap
+  id: BladedFlatcapBrown
+  graph: BladedFlatcapBrown
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: An inconspicuous hat with glass shards sewn into the brim.
+  icon: { sprite: Clothing/Head/Hats/brownflatcap.rsi, state: icon }
+  objectType: Item
+
 - type: construction
   name: glass shiv
   id: Shiv

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 5527ddb273bf3c9e28b730684dcb3f2430744a1a..400f6191eae5fc45f6310411497b92ae4125e1eb 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -217,6 +217,12 @@
 - type: Tag
   id: Briefcase
 
+- type: Tag
+  id: BrimFlatcapBrown
+
+- type: Tag
+  id: BrimFlatcapGrey
+
 - type: Tag
   id: Brutepack