feat: flora 3 - add n14 flora & cacti

Resources/Audio/_starcup/Effects/attributions.yml

@@ -19,3 +19,16 @@
   license: "CC0-1.0"
   copyright: '"Tree falls in a forest." by felix.blume of Freesound.org. Cropped and mixed from stereo to mono.'
   source: "https://freesound.org/people/felix.blume/"
+
+- files: ["hit_needle.ogg"]
+  license: "CC0-1.0"
+  copyright: 'Made by Psymbiote for starcup.'
+  source: "https://github.com/teamstarcup/starcup/"
+
+- files:
+  - plant_rustle1.ogg
+  - plant_rustle2.ogg
+  - plant_rustle3.ogg
+  license: "CC0-1.0"
+  copyright: 'Cropped from "20 Rustles of dry leaves" by qubodup.'
+  source: "https://opengameart.org/content/20-rustles-dry-leaves"

Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

@@ -216,6 +216,7 @@
       flatReductions:
         Heat: 10
         Caustic: 5
+        Piercing: 2 # starcup: added cacti that deal 1 and 1.5 piercing damage.
 
 - type: entity
   parent: ClothingHandsBase

Resources/Prototypes/Entities/Objects/Decoration/flora.yml

@@ -206,7 +206,7 @@
         offset: 0
   - type: SolutionContainerManager
     solutions:
-      pool:
+      vasculature:
         maxVol: 50
         reagents:
         - ReagentId: Resin

Resources/Prototypes/_starcup/Entities/Effects/puddle.yml

@@ -1,3 +1,4 @@
+# Footprints
 - type: entity
   name: footprint
   id: Footprint
@@ -111,3 +112,107 @@
       offset: *left
     - state: footprint-right-bare-human
       offset: *right
+
+# Puddles
+- type: entity
+  id: PuddleWater
+  parent: PuddleTemporary
+  suffix: Water (30u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Water
+          Quantity: 30
+
+- type: entity
+  id: PuddleWaterLarge
+  parent: PuddleTemporary
+  suffix: Water (100u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Water
+          Quantity: 100
+
+- type: entity
+  id: PuddleWaterVeryLarge
+  parent: PuddleTemporary
+  suffix: Water (200u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Water
+          Quantity: 200
+
+- type: entity
+  id: PuddleCactusSmall
+  parent: PuddleTemporary
+  suffix: Cactus water (50u)
+  description: Contains sugar and water.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 30
+        - ReagentId: Water
+          Quantity: 20
+
+- type: entity
+  id: PuddleCactusMedium
+  parent: PuddleCactusSmall
+  suffix: Cactus water (100u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 60
+        - ReagentId: Water
+          Quantity: 40
+
+- type: entity
+  id: PuddleCactusLarge
+  parent: PuddleCactusMedium
+  suffix: Cactus water (200u)
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 120
+        - ReagentId: Water
+          Quantity: 80
+
+- type: entity
+  id: PuddleCactusBlood
+  parent: PuddleCactusLarge
+  suffix: Bloodthorne cactus water (200u)
+  description: Contains sugar, water, and blood.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 120
+        - ReagentId: Water
+          Quantity: 40
+        - ReagentId: Blood
+          Quantity: 40

Resources/Prototypes/_starcup/Entities/Markers/Spawners/Random/flora.yml

@@ -20,6 +20,7 @@
       - FloraTreeAspbirch
       - FloraTreeDeadBrown
       - FloraTreeDeadPurple
+      - FloraTreeDeadThick
       - FloraTreeTeal
       - FloraTreeLargeTeal
       - FloraTreePink
@@ -48,6 +49,7 @@
     - FloraTreeGulmorePine
     - FloraTreeTamarack
     - FloraTreeConiferDead
+    - FloraTreeConiferMS
 
 - type: entity
   id: RandomFloraTreePalm
@@ -58,13 +60,111 @@
     layers:
     - state: shadowpink
     - state: pink
-    - sprite: _starcup/Structures/Nature/Flora/Trees/flora_palms.rsi
+    - sprite: _starcup/Structures/Nature/Flora/Trees/PalmTrees/flora_palms.rsi
       state: palm1
   - type: RandomSpawner
     prototypes:
     - FloraTreePalm
     - FloraTreeLargePalm
 
+- type: entity
+  id: RandomFloraCactus
+  name: random cactus spawner
+  parent: MarkerBaseStarcup
+  components:
+  - type: Sprite
+    layers:
+    - state: shadowpink
+    - state: pink
+    - sprite: _starcup/Structures/Nature/Flora/Cacti/flora_cactus.rsi
+      state: cactus01
+  - type: RandomSpawner
+    prototypes:
+    - FloraCactus
+    - FloraCactusBarrel
+    - FloraCactusBarrelGiant
+
+- type: entity
+  id: RandomFloraCactusBloodthorn
+  name: bloodthorn cactus spawner
+  parent: MarkerBaseStarcup
+  components:
+  - type: Sprite
+    layers:
+    - state: shadowpink
+    - state: pink
+    - sprite: _starcup/Structures/Nature/Flora/Cacti/flora_giant_cactus_gr.rsi
+      state: cactus01
+  - type: RandomSpawner
+    prototypes:
+    - FloraCactusBloodthorn
+    - FloraCactusBloodthornGiant
+    chance: 0.9
+    rarePrototypes:
+    - FloraCactusChaosthorn
+    - FloraCactusChaosthornGiant
+    rareChance: 0.1
+
+- type: entity
+  id: RandomFloraTreeAlien
+  name: random alien tree spawner
+  parent: MarkerBaseStarcup
+  components:
+  - type: Sprite
+    layers:
+    - state: shadowpink
+    - state: pink
+    - sprite: _starcup/Structures/Nature/Flora/Trees/AlienTrees/flora_sporal_trees.rsi
+      state: tree01
+  - type: RandomSpawner
+    prototypes:
+    - FloraTreeAlienReed
+    - FloraTreeSporal
+    - FloraTreeBruiseBonnet
+    chance: 0.75
+    rarePrototypes:
+    - FloraTreeSporalRobust
+    - FloraTreeBruiseBonnetRobust
+    rareChance: 0.05
+
+- type: entity
+  id: RandomFloraTreeSporal
+  name: sporal tree spawner
+  parent: MarkerBaseStarcup
+  components:
+  - type: Sprite
+    layers:
+    - state: shadowpink
+    - state: pink
+    - sprite: _starcup/Structures/Nature/Flora/Trees/AlienTrees/flora_sporal_trees.rsi
+      state: tree01
+  - type: RandomSpawner
+    prototypes:
+    - FloraTreeSporal
+    chance: 0.95
+    rarePrototypes:
+    - FloraTreeSporalRobust
+    rareChance: 0.05
+
+- type: entity
+  id: RandomFloraTreeBruiseBonnet
+  name: sporal tree spawner
+  parent: MarkerBaseStarcup
+  components:
+  - type: Sprite
+    layers:
+    - state: shadowpink
+    - state: pink
+    - sprite: _starcup/Structures/Nature/Flora/Trees/AlienTrees/flora_sporal_trees.rsi
+      state: tree01
+  - type: RandomSpawner
+    prototypes:
+    - FloraTreeBruiseBonnet
+    chance: 0.95
+    rarePrototypes:
+    - FloraTreeBruiseBonnetRobust
+    rareChance: 0.05
+
 # Spawners by climate/biome
 - type: entity
   id: RandomFloraTreeJungle
@@ -105,6 +205,7 @@
     - FloraTreeConifer
     - FloraTreeSnow
     - FloraTreeConiferDead
+    - FloraTreeConiferMSSnow
     chance: 0.9
     rarePrototypes:
     - FloraTreeConiferNoSnow
@@ -134,6 +235,8 @@
     - FloraTreeAutumn
     - FloraTreePink
     - FloraTreeJuniper
+    - FloraTreeConiferMS
+    - FloraTreeDeadThick
     chance: 0.9
     rarePrototypes:
     - FloraTreeVerdant
@@ -160,6 +263,7 @@
     - FloraTreeAutumn
     - FloraTreeVerdant
     - FloraTreeJuniper
+    - FloraTreeDeadThick
     chance: 0.9
     rarePrototypes:
     - FloraTreeConiferDead
@@ -210,3 +314,6 @@
     - FloraTreeLargeDark
     - LightTree
     rareChance: 0.25
+
+
+# Spawners by climate/biome

Resources/Prototypes/_starcup/Entities/Mobs/base.yml

@@ -13,14 +13,14 @@
         - ReagentId: Resin
           Quantity: 30
   - type: SolutionRegeneration
-    solution: pool
+    solution: vasculature
     generated:
       reagents:
       - ReagentId: Resin
         Quantity: 0.1
   #- type: DrainableSolution # Left here in case we want to add taps to them later.
-    #solution: pool
+    #solution: vasculature
   - type: DrawableSolution
-    solution: pool
+    solution: vasculature
   - type: InjectableSolution
-    solution: pool
+    solution: vasculature

Resources/Prototypes/_starcup/Entities/Structures/Nature/Flora/alien_plants.yml

@@ -36,14 +36,14 @@
     color: "#ecca87"
   - type: SolutionContainerManager
     solutions:
-      pool:
+      vasculature:
         maxVol: 30
         reagents:
         - ReagentId: Honey
           Quantity: 30
   - type: SolutionRegeneration
-    solution: pool
+    solution: vasculature
     generated:
       reagents:
       - ReagentId: Honey
-        Quantity: 0.1
+        Quantity: 0.02