diff --git a/Resources/Locale/en-US/_starcup/reagents/meta/biological.ftl b/Resources/Locale/en-US/_starcup/reagents/meta/biological.ftl index 8a205bcd1a6..fa0b465833f 100644 --- a/Resources/Locale/en-US/_starcup/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/_starcup/reagents/meta/biological.ftl @@ -1 +1,4 @@ reagent-desc-blood-starcup = This probably shouldn't be outside of somebody. + +reagent-name-resin = Resin +reagent-desc-resin = Bitter, woody, dense lifeblood of the soil. diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index beedcfbe3e3..237c00a4b83 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -42,6 +42,7 @@ acts: [ "Destruction" ] - type: entity + parent: MobBloodstream # starcup: add bloodstream to trees id: BaseTree description: Yep, it's a tree. abstract: true @@ -106,6 +107,13 @@ # end starcup - type: TypingIndicator # Add diona typing indicator here so that diona players keep the same typing bubble when polymorphed into a tree. proto: diona + # begin starcup: add bloodstream to trees + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Resin + Quantity: 250 + # end starcup - type: entity parent: BaseTree @@ -173,7 +181,7 @@ density: 2000 layer: - WallLayer - # begin starcup: add stumps + # begin starcup: add stumps and bloodstream to trees - type: Destructible thresholds: - trigger: @@ -203,7 +211,12 @@ min: 1 max: 1 offset: 0 - # end starcup + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Resin + Quantity: 350 + # end starcup - type: entity parent: BaseTree diff --git a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_plants.yml b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_plants.yml index 8964015485e..f923bf1e795 100644 --- a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_plants.yml +++ b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_plants.yml @@ -1,6 +1,8 @@ # Re-parented, modified RMC prototype - type: entity - parent: FloraPlantBaseStarcup + parent: + - FloraPlantBaseStarcup + - MobBloodstream id: FloraAlienPlant description: Pox Polyps, commonly known as honeybulb and lamptrap, is a predatory plant whose glowing, sweet nectar is deadly to the insects it lures. name: lamptrap @@ -32,3 +34,8 @@ radius: 2.0 energy: 1.5 color: "#ecca87" + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Honey + Quantity: 60 diff --git a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_trees.yml b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_trees.yml index c169cc54778..0b3dd9cf912 100644 --- a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_trees.yml +++ b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_trees.yml @@ -156,6 +156,11 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Sap + Quantity: 100 - type: entity parent: BaseStumpStarcup @@ -258,6 +263,11 @@ offset: 0 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Resin + Quantity: 100 - type: entity parent: BaseTreeLarge @@ -311,12 +321,17 @@ Log: min: 1 max: 2 - AjoraxStump: + AjoraxStumpLarge: min: 1 max: 1 offset: 0 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Resin + Quantity: 100 - type: entity parent: BaseStumpStarcup @@ -324,7 +339,7 @@ components: - type: Sprite sprite: _starcup/Structures/Nature/Flora/Trees/AlienTrees/flora_ajorax_trees.rsi - offset: 0,0.7 + offset: 0,0 layers: - state: treestump1 map: ["random"] @@ -354,7 +369,7 @@ components: - type: Sprite sprite: _starcup/Structures/Nature/Flora/Trees/AlienTrees/flora_ajorax_trees_large.rsi - offset: 0,0.7 + offset: 0,1.5 layers: - state: treestump1 map: ["random"] diff --git a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/conifer_trees.yml b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/conifer_trees.yml index 18c12ebdc1f..3e33edc7637 100644 --- a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/conifer_trees.yml +++ b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/conifer_trees.yml @@ -186,6 +186,11 @@ min: 1 max: 1 offset: 0 + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Sap + Quantity: 500 - type: entity parent: BaseStumpStarcup diff --git a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/deciduous_trees.yml b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/deciduous_trees.yml index 2c5700fc762..66c5798ec91 100644 --- a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/deciduous_trees.yml +++ b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/deciduous_trees.yml @@ -324,6 +324,11 @@ min: 1 max: 1 offset: 0 + - type: Bloodstream + bloodReferenceSolution: + reagents: + - ReagentId: Sap + Quantity: 250 - type: entity parent: BaseStumpStarcup @@ -331,6 +336,7 @@ suffix: aspen components: - type: Sprite + offset: 0,1 sprite: _starcup/Structures/Nature/Flora/Trees/DeciduousTrees/flora_aspen_birches.rsi layers: - state: treestump1 @@ -411,18 +417,27 @@ treestump2: "" - type: entity - parent: BaseTreeLarge + parent: BaseTree id: FloraTreeLargeTeal name: large tree suffix: teal description: A large, curiously shaped tree. Could it hear the thoughts of those pondering in its shade? components: - type: Sprite - offset: 0,0 + offset: 0,1.5 sprite: _starcup/Structures/Nature/Flora/Trees/DeciduousTrees/flora_treeslarge_teal.rsi layers: - state: treelarge01 map: ["random"] + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.4,0.3,0.4" + density: 1000 + layer: + - WallLayer - type: RandomSprite available: - random: @@ -470,6 +485,15 @@ layers: - state: treestump1 map: ["random"] + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.03,-0.05,0.03,0.05" + density: 1000 + layer: + - WallLayer - type: RandomSprite available: - random: @@ -529,6 +553,7 @@ suffix: cherry components: - type: Sprite + offset: 0,0.95 sprite: _starcup/Structures/Nature/Flora/Trees/DeciduousTrees/flora_cherry_trees.rsi layers: - state: treestump1 @@ -592,6 +617,7 @@ suffix: juniper components: - type: Sprite + offset: 0,1 sprite: _starcup/Structures/Nature/Flora/Trees/DeciduousTrees/flora_juniper_trees.rsi state: treestump layers: diff --git a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/stump.yml b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/stump.yml index 1476e086271..c0e4cf62c3e 100644 --- a/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/stump.yml +++ b/Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/stump.yml @@ -56,6 +56,7 @@ suffix: deciduous components: - type: Sprite + offset: 0,0.9 sprite: _starcup/Structures/Nature/Flora/Trees/DeciduousTrees/flora_autumn_trees.rsi layers: - state: treestump1 diff --git a/Resources/Prototypes/_starcup/Reagents/resin.yml b/Resources/Prototypes/_starcup/Reagents/resin.yml new file mode 100644 index 00000000000..6dfd9d5968d --- /dev/null +++ b/Resources/Prototypes/_starcup/Reagents/resin.yml @@ -0,0 +1,24 @@ +- type: reagent + id: Resin + name: reagent-name-resin + group: Biological + desc: reagent-desc-resin + flavor: bitter + color: "#cd7314" + recognizable: true + physicalDesc: reagent-physical-desc-sticky + viscosity: 0.30 + tileReactions: + - !type:SpillTileReaction + metabolisms: + Digestion: + # Sweet! + effects: + - !type:SatiateHunger + factor: 1 + - !type:SatiateThirst + factor: 1 + footstepSound: + collection: FootstepSlime + params: + volume: 6 diff --git a/Resources/Prototypes/_starcup/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/_starcup/Recipes/Reactions/chemicals.yml new file mode 100644 index 00000000000..75615ab44d6 --- /dev/null +++ b/Resources/Prototypes/_starcup/Recipes/Reactions/chemicals.yml @@ -0,0 +1,10 @@ +- type: reaction + id: ResinGlue + minTemp: 370 + reactants: + Resin: + amount: 1 + Charcoal: + amount: 1 + products: + SpaceGlue: 1