All pens embed (#39104)

* Embed for all

* Unify all thrown pen damage

Removes PenEmbeddable Abstract Entity as it is redundant. Those that parented to it now just parent to Pen.

* Fancy Pens deserve that damage bonus

Keeps an abstract entity for fancier pens to parent off of. Someone might do different fonts in the future, and them doing more damage is funny.
This commit is contained in:
Mehnix 2025-10-18 22:27:45 +01:00 committed by Vanessa
parent 09c4546fa9
commit 3456705e86
2 changed files with 17 additions and 13 deletions

View File

@ -26,12 +26,6 @@
maxDistance: 2 maxDistance: 2
- type: UseDelay - type: UseDelay
delay: 1.5 delay: 1.5
- type: entity
parent: Pen
id: PenEmbeddable
abstract: true
components:
- type: EmbeddableProjectile - type: EmbeddableProjectile
offset: 0.3,0.0 offset: 0.3,0.0
removalTime: 0.0 removalTime: 0.0
@ -41,7 +35,7 @@
- type: DamageOtherOnHit - type: DamageOtherOnHit
damage: damage:
types: types:
Piercing: 3 Piercing: 1
- type: Tending # Shitmed - type: Tending # Shitmed
speed: 0.55 speed: 0.55
- type: SurgeryTool # Shitmed - type: SurgeryTool # Shitmed
@ -64,11 +58,21 @@
restitution: 0.3 restitution: 0.3
friction: 0.2 friction: 0.2
- type: entity
parent: Pen
id: BasePenFancy
abstract: true
components:
- type: DamageOtherOnHit
damage:
types:
Piercing: 3 #nothing shows luxury like inflicting injury
#TODO: I want the luxury pen to write a cool font like Merriweather in the future. #TODO: I want the luxury pen to write a cool font like Merriweather in the future.
- type: entity - type: entity
name: luxury pen name: luxury pen
parent: Pen parent: BasePenFancy
id: LuxuryPen id: LuxuryPen
description: A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork. description: A fancy and expensive pen that you only deserve to own if you're qualified to handle vast amounts of paperwork.
components: components:
@ -79,7 +83,7 @@
- type: entity - type: entity
id: BaseAdvancedPen id: BaseAdvancedPen
parent: PenEmbeddable parent: BasePenFancy
abstract: true abstract: true
components: components:
- type: Tag - type: Tag
@ -127,7 +131,7 @@
- type: entity - type: entity
name: captain's fountain pen name: captain's fountain pen
parent: PenEmbeddable parent: BasePenFancy
id: PenCap id: PenCap
description: A luxurious fountain pen for the captain of the station. description: A luxurious fountain pen for the captain of the station.
components: components:
@ -136,7 +140,7 @@
- type: entity - type: entity
name: hop's fountain pen name: hop's fountain pen
parent: PenEmbeddable parent: BasePenFancy
id: PenHop id: PenHop
description: A luxurious fountain pen for the hop of the station. description: A luxurious fountain pen for the hop of the station.
components: components:
@ -145,7 +149,7 @@
- type: entity - type: entity
name: wizard's magical pen name: wizard's magical pen
parent: [ PenEmbeddable, BaseMagicalContraband ] parent: [ BasePenFancy, BaseMagicalContraband ]
id: PenWiz id: PenWiz
description: A luxurious fountain pen. Seems to have a magical crystal eraser. description: A luxurious fountain pen. Seems to have a magical crystal eraser.
components: components:

View File

@ -1,7 +1,7 @@
- type: entity - type: entity
name: pen name: pen
suffix: Exploding suffix: Exploding
parent: PenEmbeddable parent: Pen
description: A dark ink pen. description: A dark ink pen.
id: PenExploding id: PenExploding
components: components: