123

2025-09-04 01:10:03 +10:00
parent 80e429c8fa
commit 8623324fab
44 changed files with 49 additions and 358 deletions
--- a/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/grips.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/grips.yml
@@ -1,96 +0,0 @@
- type: entity
-  parent: BaseItem
-  id: CP14ModularFishingRodGripBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    shape:
-    - 0,0,0,0
-  - type: Sprite
-    state: icon
-  - type: ExaminableDamage
-    messages: CP14WeaponMessages
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:CP14ModularDisassembleBehavior
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: CP14ModularCraftStartPoint
-    startSlots:
-    - FishingRodShaft
-  - type: CP14MeleeSelfDamage
-    damageToSelf:
-      types:
-        Blunt: 0.5
-  - type: MeleeWeapon
-    angle: 45
-    attackRate: 1
-    wideAnimationRotation: 135
-    wideAnimation: CP14WeaponArcSlash
-    damage:
-      types:
-        Blunt: 0
-    soundHit:
-      collection: MetalThud
-    cPAnimationLength: 0.25
-  - type: Clothing
-    equipDelay: 0.25
-    unequipDelay: 0.25
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-
- type: entity
-  parent: CP14ModularFishingRodGripBase
-  id: CP14ModularFishingRodGripWooden
-  name: wooden fishing rod grip
-  description: A simple wooden grip for a modular fishing rod. Lightweight and easy to handle, perfect for beginners or casual fishing.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Fishing/Grips/wooden.rsi
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularFishingRodGripWooden
-
- type: entity
-  parent: CP14ModularFishingRodGripBase
-  id: CP14ModularFishingRodGripCopper
-  name: copper fishing rod grip
-  description: A sturdy copper grip for a modular fishing rod. Durable and resistant to wear, ideal for intermediate anglers.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Fishing/Grips/copper.rsi
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularFishingRodGripCopper
-
- type: entity
-  parent: CP14ModularFishingRodGripBase
-  id: CP14ModularFishingRodGripIron
-  name: iron fishing rod grip
-  description: A heavy-duty iron grip for a modular fishing rod. Provides excellent stability and control for tough fishing conditions.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Fishing/Grips/iron.rsi
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularFishingRodGripIron
-
- type: entity
-  parent: CP14ModularFishingRodGripBase
-  id: CP14ModularFishingRodGripGold
-  name: gold fishing rod grip
-  description: A luxurious gold grip for a modular fishing rod. Beautifully crafted and highly durable, favored by elite anglers.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Fishing/Grips/gold.rsi
-  - type: CP14ModularCraftStartPoint
-    startProtoPart: CP14ModularFishingRodGripGold
--- a/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/shafts.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Fishing/FishingRods/shafts.yml
@@ -1,58 +0,0 @@
- type: entity
-  parent: BaseItem
-  id: CP14FishingRodShaftBase
-  abstract: true
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-  - type: Sprite
-    state: icon
-  - type: CP14ModularCraftPart
-
- type: entity
-  parent: CP14FishingRodShaftBase
-  id: CP14FishingRodShaftWooden
-  name: wooden fishing rod shaft
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Fishing/Shafts/wooden.rsi
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - FishingRodShaftWooden
-
- type: entity
-  parent: CP14FishingRodShaftBase
-  id: CP14FishingRodShaftCopper
-  name: copper fishing rod shaft
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Fishing/Shafts/copper.rsi
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - FishingRodShaftCopper
-
- type: entity
-  parent: CP14FishingRodShaftBase
-  id: CP14FishingRodShaftIron
-  name: iron fishing rod shaft
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Fishing/Shafts/iron.rsi
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - FishingRodShaftIron
-
- type: entity
-  parent: CP14FishingRodShaftBase
-  id: CP14FishingRodShaftGold
-  name: gold fishing rod shaft
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Fishing/Shafts/gold.rsi
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - FishingRodShaftGold
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/fishing_rods.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/fishing_rods.yml
@@ -0,0 +1,49 @@
+- type: entity
+  parent: BaseItem
+  id: CP14FishingRod
+  name: fishing rod
+  description: Wooden stick with string attached.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    shape:
+    - 0,0,0,1
+  - type: Sprite
+    sprite: _CP14\Objects\Fishing\fishing_rod.rsi
+    state: icon
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:CP14ModularDisassembleBehavior
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: CP14ModularCraftStartPoint
+    startSlots:
+    - FishingRodShaft
+  - type: MeleeWeapon
+    angle: 45
+    attackRate: 1
+    wideAnimationRotation: 135
+    wideAnimation: CP14WeaponArcSlash
+    damage:
+      types:
+        Blunt: 0.1
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.25
+  - type: Clothing
+    equipDelay: 0.25
+    unequipDelay: 0.25
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - neck
+  - type: CP14FishingRod
--- a/Resources/Prototypes/_CP14/ModularCraft/FishingRods/shafts.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/FishingRods/shafts.yml
@@ -1,45 +0,0 @@
- type: modularPart
-  id: FishingRodShaftWooden
-  targetSlot: FishingRodShaft
-  sourcePart: CP14FishingRodShaftWooden
-  rsiPath: _CP14/Objects/Fishing/Shafts/wooden.rsi
-  modifiers:
-  - !type:AddComponents
-    components:
-    # I like the idea of parrying with a fishing rod,
-    # it's too cool to take away
-    - type: CP14MeleeParriable
-    - type: CP14FishingRod
-
- type: modularPart
-  id: FishingRodShaftCopper
-  targetSlot: FishingRodShaft
-  sourcePart: CP14FishingRodShaftCopper
-  rsiPath: _CP14/Objects/Fishing/Shafts/copper.rsi
-  modifiers:
-  - !type:AddComponents
-    components:
-    - type: CP14MeleeParriable
-    - type: CP14FishingRod
-
- type: modularPart
-  id: FishingRodShaftIron
-  targetSlot: FishingRodShaft
-  sourcePart: CP14FishingRodShaftIron
-  rsiPath: _CP14/Objects/Fishing/Shafts/iron.rsi
-  modifiers:
-  - !type:AddComponents
-    components:
-    - type: CP14MeleeParriable
-    - type: CP14FishingRod
-
- type: modularPart
-  id: FishingRodShaftGold
-  targetSlot: FishingRodShaft
-  sourcePart: CP14FishingRodShaftGold
-  rsiPath: _CP14/Objects/Fishing/Shafts/gold.rsi
-  modifiers:
-  - !type:AddComponents
-    components:
-    - type: CP14MeleeParriable
-    - type: CP14FishingRod
--- a/Resources/Prototypes/_CP14/ModularCraft/FishingRods/slots.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/FishingRods/slots.yml
@@ -1,5 +0,0 @@
- type: modularSlot
-  # It's fucked up,
-  # but what the fuck else could it be?
-  id: FishingRodShaft
-  name: cp14-modular-slot-fishing-rod-rod