Merge branch 'master' into ed-16-02-2025-planet-light-upstream

Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: CP14ActionSpellCounterSpell
-  name: counter spell
+  name: Counter spell
   description: By affecting the magical energy itself, you can interrupt the cast of someone else's spell.
   components:
   - type: Sprite

Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml

@@ -34,6 +34,9 @@
     count: 4
     sliceTime: 1.5
     slice: CP14FoodCabbageSlice
+  - type: Tag
+    tags:
+    - CP14FarmFood
 
 - type: entity
   id: CP14FoodCabbageSlice
@@ -106,6 +109,9 @@
     count: 5
     sliceTime: 2
     slice: CP14FoodPumpkinSlice
+  - type: Tag
+    tags:
+    - CP14FarmFood
 
 - type: entity
   id: CP14FoodPumpkinSlice
@@ -176,6 +182,9 @@
           Quantity: 2
   - type: CP14Seed
     plantProto: CP14PlantPotato #TODO sliceable potato
+  - type: Tag
+    tags:
+    - CP14FarmFood
 
 - type: entity
   id: CP14FoodCucumber
@@ -212,6 +221,9 @@
           Quantity: 2
         - ReagentId: Water
           Quantity: 3
+  - type: Tag
+    tags:
+    - CP14FarmFood
 
 - type: entity
   id: CP14FoodTomatoes
@@ -277,6 +289,9 @@
     damage:
       types:
         Blunt: 1
+  - type: Tag
+    tags:
+    - CP14FarmFood
 
 - type: entity
   id: CP14FoodTomatoesSlice
@@ -343,6 +358,9 @@
     count: 4
     sliceTime: 1.5
     slice: CP14FoodAppleSlice
+  - type: Tag
+    tags:
+    - CP14FarmFood
 
 - type: entity
   id: CP14FoodAppleSlice

Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml

@@ -20,4 +20,5 @@
         base2: ""
   - type: Tag
     tags:
-    - CP14Wheat
+    - CP14Wheat
+    - CP14FarmFood

Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/sack.yml

@@ -0,0 +1,78 @@
+- type: entity
+  name: sack
+  id: CP14SackFarming
+  parent: BaseStorageItem
+  description: A bag for various fruits, vegetables, plants and anything else that grows in the bed.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Storage/sack.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,6,3
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      tags:
+        - CP14FarmFood
+        - CP14FitInMortar
+  - type: Dumpable
+
+- type: entity
+  id: CP14SackFarmingVegetables
+  parent: CP14SackFarming
+  categories: [ ForkFiltered ]
+  suffix: Vegetables
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14Wheat
+        amount: 4
+      - id: CP14FoodCabbage
+        orGroup: LargeVegetables
+        amount: 3
+      - id: CP14FoodPumpkin
+        orGroup: LargeVegetables
+        amount: 3
+      - id: CP14FoodPotato
+        amount: 3
+      - id: CP14FoodCucumber
+        amount: 3
+      - id: CP14FoodTomatoes
+        amount: 3
+
+- type: entity
+  id: CP14SackFarmingApple
+  parent: CP14SackFarming
+  suffix: Apple
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14FoodApple
+        amount: 6
+      - id: CP14FoodApple
+        amount: 5
+        prob: 0.6
+      - id: CP14FoodApple
+        amount: 5
+        prob: 0.4
+
+- type: entity
+  id: CP14SackFarmingWheat
+  parent: CP14SackFarming
+  suffix: Wheat
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14Wheat
+        amount: 8
+      - id: CP14Wheat
+        amount: 5
+        prob: 0.6
+      - id: CP14Wheat
+        amount: 5
+        prob: 0.4

Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml

@@ -8,6 +8,7 @@
     snapCardinals: true
     drawdepth: FloorTiles
   - type: Transform
+  - type: InteractionOutline
   - type: Physics
     canCollide: false
     bodyType: Static
@@ -69,7 +70,6 @@
   parent: CP14GatherableBase
   abstract: true
   components:
-  - type: InteractionOutline
   - type: Appearance
   - type: CP14PlantVisuals
     growthSteps: 5

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml

@@ -7,7 +7,7 @@
     - 2
   name: cp14-modifier-dayflin
   categories:
-    Reward: 0.2
+    Reward: 0.1
   requiredTags:
   - CP14DemiplaneHerbals
   - CP14DemiplaneOpenSky
@@ -29,7 +29,7 @@
     - 2
   name: cp14-modifier-fly-agaric
   categories:
-    Reward: 0.2
+    Reward: 0.1
   requiredTags:
   - CP14DemiplaneHerbals
   layers:
@@ -51,7 +51,7 @@
     - 2
   name: cp14-modifier-blue-amanita
   categories:
-    Reward: 0.2
+    Reward: 0.1
   requiredTags:
   - CP14DemiplaneHerbals
   layers:
@@ -72,7 +72,7 @@
     - 2
   name: cp14-modifier-blood-flower
   categories:
-    Reward: 0.2
+    Reward: 0.1
   requiredTags:
   - CP14DemiplaneHerbals
   layers:
@@ -93,7 +93,7 @@
     - 2
   name: cp14-modifier-wild-sage
   categories:
-    Reward: 0.2
+    Reward: 0.1
   requiredTags:
   - CP14DemiplaneHerbals
   - CP14DemiplaneOpenSky
@@ -115,7 +115,7 @@
     - 2
   name: cp14-modifier-air-lily
   categories:
-    Reward: 0.2
+    Reward: 0.1
   requiredTags:
   - CP14DemiplaneHerbals
   - CP14DemiplaneWater
@@ -137,7 +137,7 @@
     - 2
   name: cp14-modifier-lumisroom
   categories:
-    Reward: 0.2
+    Reward: 0.1
   requiredTags:
   - CP14DemiplaneUnderground
   layers:

Resources/Prototypes/_CP14/tags.yml

@@ -106,5 +106,8 @@
 - type: Tag
   id: CP14PlatePie
 
+- type: Tag
+  id: CP14FarmFood
+
 - type: Tag
   id: CP14AlchemicalHerbals

Resources/Textures/_CP14/Objects/Storage/sack.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "All right reserved",
+  "copyright": "Created by Artista", 
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}