From 9214940b1b5c8b35c5c0d815de5d2a78437b442f Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Fri, 16 Aug 2024 09:47:37 -0500 Subject: [PATCH] Update some food spawners w/ entity tables (#30957) Co-authored-by: Velcroboy --- .../Random/Food_Drinks/food_ingredients.yml | 91 +++++++++++ .../Spawners/Random/Food_Drinks/food_meat.yml | 147 ++++++++++++++++++ .../Random/Food_Drinks/food_produce.yml | 7 + 3 files changed, 245 insertions(+) create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meat.yml diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml new file mode 100644 index 00000000000..846e058c9e8 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_ingredients.yml @@ -0,0 +1,91 @@ +#Spawners +- type: entity + id: RandomIngredient + name: random ingredient spawner + suffix: Non-Plant + parent: MarkerBase + placement: + mode: PlaceFree + components: + - type: Transform + anchored: false + - type: Sprite + layers: + - state: green + - sprite: Objects/Consumable/Food/ingredients.rsi + state: cheesewheel + - type: EntityTableSpawner + table: !type:NestedSelector + tableId: IngredientTable + prob: 0.80 + +#Tables +- type: entityTable + id: IngredientTable + table: !type:GroupSelector + children: + #Common + - !type:GroupSelector + weight: 10 + children: + - id: ReagentContainerOliveoil + - id: ReagentContainerMayo + - id: FoodButter + amount: !type:RangeNumberSelector + range: 1, 2 + - id: FoodContainerEgg + - id: FoodCondimentBottleEnzyme + - id: DrinkSodaWaterBottleFull + - id: FoodShakerSalt + - id: FoodShakerPepper + - !type:GroupSelector + children: + - id: ReagentContainerFlour + - id: ReagentContainerCornmeal + - id: ReagentContainerRice + - id: ReagentContainerSugar + - !type:GroupSelector + children: + - id: ReagentContainerFlourSmall + - id: ReagentContainerCornmealSmall + - id: ReagentContainerRiceSmall + - id: ReagentContainerSugarSmall + - !type:GroupSelector + children: + - id: DrinkMilkCarton + - id: DrinkSoyMilkCarton + - id: DrinkOatMilkCarton + - id: DrinkMilkCarton + - !type:GroupSelector + children: + - id: FoodCheese + - id: FoodChevre + - id: FoodTofu + - !type:GroupSelector + children: + - id: FoodCheeseSlice + amount: !type:RangeNumberSelector + range: 1, 5 + - id: FoodChevreSlice + amount: !type:RangeNumberSelector + range: 1, 5 + - id: FoodTofuSlice + amount: !type:RangeNumberSelector + range: 1, 5 + - !type:GroupSelector + children: + - id: FoodCondimentBottleColdsauce + - id: FoodCondimentBottleVinegar + - id: FoodCondimentBottleHotsauce + - id: FoodCondimentBottleKetchup + - id: FoodCondimentBottleBBQ + - id: FoodCondimentBottleKetchup + - id: FoodCondimentBottleKetchup + #Rare + - !type:GroupSelector + weight: 0.5 + children: + - id: FoodCannabisButter + amount: !type:RangeNumberSelector + range: 1, 2 + - id: EggBoxBroken diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meat.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meat.yml new file mode 100644 index 00000000000..1fb6dfa2d57 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meat.yml @@ -0,0 +1,147 @@ +#Spawners +- type: entity + id: RandomMeat + name: random meat spawner + parent: MarkerBase + placement: + mode: PlaceFree + components: + - type: Transform + anchored: false + - type: Sprite + layers: + - state: green + - sprite: Objects/Consumable/Food/meat.rsi + state: plain + - type: EntityTableSpawner + table: !type:NestedSelector + tableId: MeatTable + prob: 0.85 + +#Tables +- type: entityTable + id: MeatTable + table: !type:GroupSelector + children: + #Meat + - !type:GroupSelector + weight: 10 + children: + - id: FoodMeat + #Medium-Rare + - !type:GroupSelector + weight: 7.5 + children: + - id: FoodMeatFish + amount: !type:RangeNumberSelector + range: 1, 5 + - id: FoodMeatBacon + amount: !type:RangeNumberSelector + range: 1, 5 + - id: FoodMeatChicken + amount: !type:RangeNumberSelector + range: 1, 5 + - id: FoodMeatDuck + amount: !type:RangeNumberSelector + range: 1, 5 + - id: FoodMeatCrab + amount: !type:RangeNumberSelector + range: 1, 5 + - id: FoodMeatWheat + amount: !type:RangeNumberSelector + range: 1, 5 + - id: FoodMeatSalami + amount: !type:RangeNumberSelector + range: 1, 2 + - id: FoodMeatMeatball + amount: !type:RangeNumberSelector + range: 1, 8 + - !type:GroupSelector + children: + - id: FoodMeatCutlet + amount: !type:RangeNumberSelector + range: 1, 4 + - id: FoodMeatChickenCutlet + amount: !type:RangeNumberSelector + range: 1, 4 + - id: FoodMeatDuckCutlet + amount: !type:RangeNumberSelector + range: 1, 4 + - id: FoodMeatSalamiSlice + amount: !type:RangeNumberSelector + range: 1, 4 + #Rotten + - !type:GroupSelector + weight: 2 + children: + - id: FoodMeatRotten + weight: 2 + amount: !type:RangeNumberSelector + range: 1, 6 + - id: FoodMeatRat + amount: !type:RangeNumberSelector + range: 1, 6 + - id: FoodMeatSnake + amount: !type:RangeNumberSelector + range: 1, 6 + #Rare + - !type:GroupSelector + children: + - !type:GroupSelector + weight: 0.5 + children: + - id: FoodMeatHuman + amount: !type:RangeNumberSelector + range: 1, 3 + - id: FoodMeatLizard + amount: !type:RangeNumberSelector + range: 1, 3 + - id: FoodMeatPlant + amount: !type:RangeNumberSelector + range: 1, 3 + - id: FoodMeatSpider + amount: !type:RangeNumberSelector + range: 1, 3 + - id: FoodMeatSlime + amount: !type:RangeNumberSelector + range: 1, 3 + - !type:GroupSelector + children: + - id: FoodMeatLizardCutlet + amount: !type:RangeNumberSelector + range: 1, 2 + - id: FoodMeatSpiderCutlet + amount: !type:RangeNumberSelector + range: 1, 2 + - id: FoodMeatXenoCutlet + amount: !type:RangeNumberSelector + range: 1, 2 + - id: FoodMeatSpider + amount: !type:RangeNumberSelector + range: 1, 2 + - id: FoodMeatSlime + amount: !type:RangeNumberSelector + range: 1, 2 + - id: FoodMeatBear + amount: !type:RangeNumberSelector + range: 1, 4 + - id: FoodMeatPenguin + amount: !type:RangeNumberSelector + range: 1, 4 + - id: FoodMeatSpiderLeg + amount: !type:RangeNumberSelector + range: 1, 4 + - id: FoodMeatXeno + amount: !type:RangeNumberSelector + range: 1, 4 + - !type:GroupSelector + children: + - id: FoodMeatBearCutlet + amount: !type:RangeNumberSelector + range: 1, 4 + - id: FoodMeatPenguinCutlet + amount: !type:RangeNumberSelector + range: 1, 4 + - id: FoodMeatXenoCutlet + amount: !type:RangeNumberSelector + range: 1, 4 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml index b371d0023ca..51ac4621aaa 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -1,3 +1,4 @@ +#Spawners - type: entity id: RandomProduce name: random produce spawner @@ -138,9 +139,12 @@ - id: FoodCocoaBeans amount: !type:RangeNumberSelector range: 1, 5 +<<<<<<< HEAD - id: FoodCherry amount: !type:RangeNumberSelector range: 1, 5 +======= +>>>>>>> cc445e07b8 (Update some food spawners w/ entity tables (#30957)) #rare - !type:GroupSelector children: @@ -162,6 +166,7 @@ - id: DeathNettle amount: !type:RangeNumberSelector range: 1, 5 +<<<<<<< HEAD # Begin DeltaV additions - id: FoodCrystalThistle amount: !type:RangeNumberSelector @@ -173,3 +178,5 @@ amount: !type:RangeNumberSelector range: 1, 5 # End DeltaV additions +======= +>>>>>>> cc445e07b8 (Update some food spawners w/ entity tables (#30957))