rename the bases, more destruction

2025-07-27 14:14:47 -05:00
parent 5a65aea664
commit 4d3e3c7a4f
12 changed files with 77 additions and 44 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -1,6 +1,6 @@
 - type: entity
  abstract: true
-  parent: [ DrinkBase, DrinkCardboardBase, DrinkOpenableBase ]
+  parent: [ DrinkBase, DrinkBaseCardboard, DrinkBaseOpenable ]
  id: DrinkCartonBaseLargeFull
  suffix: Full
  components:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
@@ -42,7 +42,7 @@
 # This drink is empty trash
 - type: entity
  abstract: true
-  id: DrinkEmptyTrashBase
+  id: DrinkBaseEmptyTrash
  suffix: Empty
  components:
  - type: SpaceGarbage
@@ -57,7 +57,7 @@
 # Un-opened
 - type: entity
  abstract: true
-  id: DrinkOpenableBase
+  id: DrinkBaseOpenable
  components:
  - type: Openable
  - type: PressurizedSolution
@@ -69,7 +69,7 @@
 - type: entity
  abstract: true
  parent: DrinkOpenableBase
-  id: DrinkOpenableOpenBase
+  id: DrinkBaseOpenableOpen
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
@@ -4,7 +4,7 @@
 # Fragile glass
 - type: entity
  abstract: true
-  id: DrinkGlassBase
+  id: DrinkBaseGlass
  components:
  - type: Damageable
    damageContainer: Inorganic
@@ -47,10 +47,49 @@
    materialComposition:
      Glass: 25

+# Porcelain (like glass but no shard)
+- type: entity
+  abstract: true
+  id: DrinkBasePorcelain
+  components:
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: FlimsyGlass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger # Overkill threshold
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassCrack
+      - !type:SpillBehavior { }
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  # so fragile it smashes when thrown
+  - type: DamageOnLand
+    ignoreResistances: true
+    damage:
+      types:
+        Blunt: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 5
+  - type: PhysicalComposition
+    materialComposition: [] # To override previous compositions and get recycled
+
 # Fragile plastic
 - type: entity
  abstract: true
-  id: DrinkPlasticBase
+  id: DrinkBasePlastic
  components:
  - type: Damageable
    damageContainer: Inorganic
@@ -80,7 +119,7 @@
 # Fragile cardboard
 - type: entity
  abstract: true
-  id: DrinkCardboardBase
+  id: DrinkBaseCardboard
  components:
  - type: Damageable
    damageContainer: Inorganic
@@ -110,7 +149,7 @@
 # Weak metal
 - type: entity
  abstract: true
-  id: DrinkMetalBase
+  id: DrinkBaseMetal
  components:
  - type: Damageable
    damageContainer: Inorganic
@@ -140,7 +179,7 @@
 # strong metal
 - type: entity
  abstract: true
-  id: DrinkStrongMetalBase
+  id: DrinkBaseStrongMetal
  components:
  - type: Damageable
    damageContainer: Inorganic
@@ -170,7 +209,7 @@
 # Weak gold
 - type: entity
  abstract: true
-  id: DrinkGoldBase
+  id: DrinkBaseGold
  components:
  - type: Damageable
    damageContainer: Inorganic
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
@@ -2,7 +2,7 @@

 - type: entity
  abstract: true
-  parent: [ DrinkBase, DrinkGlassBase, DrinkOpenableBase ]
+  parent: [ DrinkBase, DrinkBaseGlass, DrinkBaseOpenable ]
  id: DrinkBottleGlassBaseFull
  suffix: Full
  components:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml
@@ -1,6 +1,6 @@
 - type: entity
  abstract: true
-  parent: [ DrinkBase, DrinkPlasticBase, DrinkOpenableBase ]
+  parent: [ DrinkBase, DrinkBasePlastic, DrinkBaseOpenable ]
  id: DrinkBottlePlasticBaseFull
  suffix: Full
  components:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -1,7 +1,7 @@
 # When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_soda.yml
 - type: entity
  abstract: true
-  parent: [ DrinkBase, DrinkMetalBase, DrinkOpenableBase, DrinkVisualsOpenable ]
+  parent: [ DrinkBase, DrinkBaseMetal, DrinkBaseOpenable, DrinkVisualsOpenable ]
  id: DrinkCanBaseFull
  suffix: Full
  components:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -3,7 +3,6 @@
  abstract: true
  parent: DrinkBase
  id: DrinkBaseCup
-  name: base cup
  components:
  - type: SolutionContainerManager
    solutions:
@@ -25,7 +24,7 @@
 # A mug is a type of cup.[2]
 - type: entity
  abstract: true
-  parent: DrinkBaseCup # add DrinkGlassBase after fixing the material arbitrage
+  parent: [DrinkBaseCup, DrinkBasePorcelain]
  id: DrinkBaseMug
  name: mug
  description: A mug.
@@ -47,7 +46,7 @@
 ## Misc Cups

 - type: entity
-  parent: [DrinkBaseCup, DrinkGoldBase]
+  parent: [DrinkBaseCup, DrinkBaseGold]
  id: DrinkGoldenCup
  name: golden cup
  description: A golden cup.
@@ -58,7 +57,7 @@
    price: 125

 - type: entity
-  parent: [DrinkBaseCup, DrinkGlassBase]
+  parent: [DrinkBaseCup, DrinkBasePorcelain]
  id: DrinkTeacupEmpty
  name: teacup
  description: A plain white porcelain teacup.
@@ -78,7 +77,7 @@
    fillBaseName: icon-

 - type: entity
-  parent: [ DrinkBase, DrinkGlassBase ]
+  parent: [ DrinkBase, DrinkBaseGlass ]
  id: DrinkGlassCoupeShaped
  name: coupe glass
  description: A classic thin neck coupe glass, the icon of fragile labels on crates around the galaxy.
@@ -112,7 +111,7 @@
    - DrinkGlass

 - type: entity
-  parent: [DrinkBase, DrinkCardboardBase]
+  parent: [DrinkBase, DrinkBaseCardboard]
  id: DrinkWaterCup
  name: water cup
  description: A paper water cup.
@@ -201,16 +200,13 @@
    sprite: Objects/Consumable/Drinks/mug_heart.rsi

 - type: entity
-  parent: DrinkBaseMug
+  parent: [DrinkBaseMetal, DrinkBaseMug]
  id: DrinkMugMetal
  name: metal mug
  description: A metal mug. You're not sure which metal.
  components:
  - type: Sprite
    sprite: Objects/Consumable/Drinks/mug_metal.rsi
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 25

 - type: entity
  parent: DrinkBaseMug
@@ -252,7 +248,7 @@
 # TODO these need a material for destruction, maybe a better parent

 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
  id: DrinkHotCoco
  name: hot chocolate
  description: A heated drink consisting melted chocolate and heated milk.
@@ -272,7 +268,6 @@
      - state: icon-0
      - map: ["enum.SolutionContainerLayers.Fill"]
        state: icon-4
-  - type: Appearance
  - type: SolutionContainerVisuals
    maxFillLevels: 4
    fillBaseName: icon-
@@ -280,7 +275,7 @@
    solution: drink

 - type: entity
-  parent: DrinkBaseCup
+  parent: DrinkBaseMug
  id: DrinkHotCoffee
  name: coffee
  description: Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant.
@@ -300,7 +295,6 @@
      - state: icon-0
      - map: ["enum.SolutionContainerLayers.Fill"]
        state: icon-4
-  - type: Appearance
  - type: SolutionContainerVisuals
    maxFillLevels: 4
    fillBaseName: icon-
@@ -308,7 +302,7 @@
    solution: drink

 - type: entity
-  parent: DrinkBaseCup
+  parent: [DrinkBaseCup, DrinkBaseCardboard]
  id: DrinkCafeLatte
  name: cafe latte
  description: A nice, strong and tasty beverage while you are reading.
@@ -365,7 +359,7 @@
    solution: drink

 - type: entity
-  parent: DrinkBaseCup
+  parent: [DrinkBaseCup, DrinkBasePlastic]
  id: DrinkLean
  name: grape juice
  description: Damn, no fun allowed.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -1,6 +1,6 @@
 - type: entity
  abstract: true
-  parent: [DrinkBase, DrinkOpenableBase, DrinkStrongMetalBase]
+  parent: [DrinkBase, DrinkBaseStrongMetal, DrinkBaseOpenable]
  id: FlaskBase
  components:
  - type: SolutionContainerManager
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [DrinkBase, DrinkPlasticBase, DrinkVisualsOpenable ]
+  parent: [DrinkBase, DrinkBasePlastic, DrinkBaseOpenable, DrinkVisualsOpenable ]
  id: DrinkSpaceGlue
  name: space glue tube
  description: High performance glue intended for maintenance of extremely complex mechanical equipment. DON'T DRINK!
@@ -35,7 +35,7 @@
    solution: drink

 - type: entity
-  parent: [DrinkBase, DrinkPlasticBase, DrinkVisualsOpenable ]
+  parent: [DrinkBase, DrinkBasePlastic, DrinkBaseOpenable, DrinkVisualsOpenable ]
  id: DrinkSpaceLube
  name: space lube tube
  description: High performance lubricant intended for maintenance of extremely complex mechanical equipment.
@@ -90,7 +90,7 @@
        Quantity: 200

 - type: entity
-  parent: [DrinkBase, DrinkGlassBase]
+  parent: [DrinkBase, DrinkBaseGlass]
  id: DrinkJarWhat
  name: jar of something
  description: You can't really tell what this is.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
@@ -4,7 +4,7 @@

 # Transformable container - normal glass
 - type: entity
-  parent: [DrinkBase, DrinkGlassBase]
+  parent: [DrinkBase, DrinkBaseGlass]
  id: DrinkGlass
  name: metamorphic glass
  description: A metamorphic glass that automagically turns into a glass appropriate for the drink within. There's a sanded off patent number on the bottom.
@@ -41,7 +41,7 @@
  - type: TransformableContainer

 - type: entity
-  parent: [DrinkBase, DrinkGlassBase]
+  parent: [DrinkBase, DrinkBaseGlass]
  id: DrinkJar
  name: jar
  description: The hipster's cup.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [DrinkBase, DrinkGlassBase]
+  parent: [DrinkBase, DrinkBaseGlass]
  id: DrinkShotGlass
  name: shot glass
  description: Perfect for slamming down onto the table angrily.
@@ -52,7 +52,7 @@
      Steel: 75

 - type: entity
-  parent: [DrinkBase, DrinkGlassBase]
+  parent: [DrinkBase, DrinkBasePorcelain]
  id: DrinkTeapot
  name: teapot  # short and stout
  description: An elegant teapot. It simply oozes class.
@@ -73,8 +73,8 @@
    - DrinkGlass

 - type: entity
-  id: DrinkCanPack
  parent: BaseStorageItem
+  id: DrinkCanPack
  name: 6pack
  components:
  - type: Sprite
@@ -210,7 +210,7 @@

 - type: entity
  abstract: true
-  parent: [DrinkBase, DrinkGlassBase]
+  parent: [DrinkBase, DrinkBaseGlass]
  id: DrinkShakeBase
  description: ''
  components:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -1,9 +1,9 @@
 # File for containers like bottles or milk jugs that are empty

-# When used as the first parent, this empties a bottle's reagent and spawns it opened
+# When used as the first parent, this empties a bottle's reagent and spawns it already opened
 - type: entity
  abstract: true
-  parent: [ DrinkOpenableOpenBase, DrinkEmptyTrashBase ]
+  parent: [ DrinkBaseOpenableOpen, DrinkBaseEmptyTrash ]
  id: DrinkBottleBaseEmpty
  components:
  - type: SolutionContainerManager
@@ -17,7 +17,7 @@

 - type: entity
  abstract: true
-  parent: [ DrinkOpenableOpenBase, DrinkEmptyTrashBase ]
+  parent: [ DrinkBaseOpenableOpen, DrinkBaseEmptyTrash ]
  id: DrinkBottleBaseSmallEmpty
  components:
  - type: SolutionContainerManager
@@ -31,7 +31,7 @@

 - type: entity
  abstract: true
-  parent: [ DrinkOpenableOpenBase, DrinkEmptyTrashBase ]
+  parent: [ DrinkBaseOpenableOpen, DrinkBaseEmptyTrash ]
  id: DrinkCartonBaseEmpty
  components:
  - type: SolutionContainerManager
@@ -41,7 +41,7 @@

 - type: entity
  abstract: true
-  parent: [ DrinkOpenableOpenBase, DrinkEmptyTrashBase ]
+  parent: [ DrinkBaseOpenableOpen, DrinkBaseEmptyTrash ]
  id: DrinkCartonBaseLargeEmpty
  components:
  - type: SolutionContainerManager