From fa5b93871f7e6605c583336e4fa89a35ed32a314 Mon Sep 17 00:00:00 2001 From: Gyrandola Date: Sat, 20 Apr 2024 04:06:48 +0200 Subject: [PATCH] chili/chilly peppers sprite alignment fix & minor refactorization (#25971) * png alignment and minor refactorization * Update migration.yml --------- Co-authored-by: metalgearsloth --- Resources/Locale/en-US/seeds/seeds.ftl | 2 +- .../Random/Food_Drinks/food_produce.yml | 4 +-- .../Objects/Consumable/Food/produce.yml | 6 ++--- Resources/Prototypes/Hydroponics/seeds.yml | 4 +-- .../Recipes/Cooking/meal_recipes.yml | 24 +++++++++--------- .../Hydroponics/chili.rsi/produce.png | Bin 300 -> 279 bytes .../Hydroponics/chilly.rsi/produce.png | Bin 172 -> 200 bytes Resources/migration.yml | 2 ++ 8 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 10eb533770..bff317a7e6 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -66,7 +66,7 @@ seeds-nettle-display-name = nettles seeds-deathnettle-name = death nettle seeds-deathnettle-display-name = death nettles seeds-chili-name = chili -seeds-chili-display-name = chilis +seeds-chili-display-name = chili peppers seeds-chilly-name = chilly seeds-chilly-display-name = chilly peppers seeds-poppy-name = poppy 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 6edf341e10..a889b939bd 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 @@ -33,8 +33,8 @@ - FoodOnion - FoodOnionRed - FoodMushroom - - FoodChili - - FoodChilly + - FoodChiliPepper + - FoodChillyPepper - FoodAloe - FoodPoppy - FoodLingzhi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 3f0277e1bc..302c0d98b6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1133,9 +1133,9 @@ Quantity: 1 - type: entity - name: chili + name: chili pepper parent: FoodProduceBase - id: FoodChili + id: FoodChiliPepper description: Spicy, best not touch your eyes. components: - type: FlavorProfile @@ -1163,7 +1163,7 @@ - type: entity name: chilly pepper parent: FoodProduceBase - id: FoodChilly + id: FoodChillyPepper description: Icy hot. components: - type: FlavorProfile diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 472242a5c3..053300b986 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -898,7 +898,7 @@ plantRsi: Objects/Specific/Hydroponics/chili.rsi packetPrototype: ChiliSeeds productPrototypes: - - FoodChili + - FoodChiliPepper mutationPrototypes: - chilly harvestRepeat: Repeat @@ -931,7 +931,7 @@ plantRsi: Objects/Specific/Hydroponics/chilly.rsi packetPrototype: ChillySeeds productPrototypes: - - FoodChilly + - FoodChillyPepper harvestRepeat: Repeat lifespan: 25 maturation: 6 diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index a5620fd8ef..47a2841b6d 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -135,7 +135,7 @@ FoodBreadBun: 1 FoodMeat: 2 FoodCheeseSlice: 2 - FoodChili: 1 + FoodChiliPepper: 1 FoodCabbage: 1 CrayonGreen: 1 Flare: 1 @@ -177,7 +177,7 @@ solids: FoodBreadBun: 1 FoodMeat: 1 - FoodChili: 3 + FoodChiliPepper: 3 - type: microwaveMealRecipe id: RecipeGhostBurger @@ -675,7 +675,7 @@ solids: FoodRiceBoiled: 1 FoodMeatCutlet: 3 - FoodChili: 2 + FoodChiliPepper: 2 - type: microwaveMealRecipe id: RecipeEggRice @@ -894,7 +894,7 @@ solids: FoodBowlBig: 1 FoodBungo: 2 - FoodChili: 1 + FoodChiliPepper: 1 #Pies @@ -965,7 +965,7 @@ time: 15 solids: FoodDoughPie: 1 - FoodChilly: 3 + FoodChillyPepper: 3 FoodPlateTin: 1 - type: microwaveMealRecipe @@ -1063,7 +1063,7 @@ solids: FoodDough: 1 FoodCheeseSlice: 2 - FoodChili: 1 + FoodChiliPepper: 1 FoodMeatFish: 2 - type: microwaveMealRecipe @@ -1504,7 +1504,7 @@ time: 20 solids: FoodBowlBig: 1 - FoodChili: 1 + FoodChiliPepper: 1 FoodMeatCutlet: 1 FoodOnionSlice: 1 FoodTomato: 1 @@ -1537,7 +1537,7 @@ time: 30 solids: FoodBowlBig: 1 - FoodChili: 1 + FoodChiliPepper: 1 FoodMeatCutlet: 1 FoodOnionSlice: 1 FoodTomato: 1 @@ -1552,7 +1552,7 @@ #reagents: #blackpepper: 5 solids: - FoodChili: 1 + FoodChiliPepper: 1 FoodCheeseSlice: 2 - type: microwaveMealRecipe @@ -1572,7 +1572,7 @@ result: FoodMealEnchiladas time: 20 solids: - FoodChili: 2 + FoodChiliPepper: 2 FoodMeatCutlet: 1 FoodCorn: 1 @@ -1740,7 +1740,7 @@ result: FoodMeatHawaiianKebab time: 5 solids: - FoodChili: 1 + FoodChiliPepper: 1 FoodMeatCutlet: 1 FoodPineappleSlice: 1 FoodKebabSkewer: 1 @@ -1751,7 +1751,7 @@ result: FoodMeatFiestaKebab time: 5 solids: - FoodChili: 1 + FoodChiliPepper: 1 FoodCorn: 1 FoodMeatCutlet: 1 FoodTomato: 1 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png index 5033cdecc75b07b2cd08809e8d6f04397a9b17d9..873f89e18111ad6a6f6c5534cc6be7a52b532ec1 100644 GIT binary patch delta 251 zcmVqE(6x25W8)OO!gAWBEL~)KUiUdhxSmIekyM5geRd3t;f26PB_3*M{$KLBs_YOJ^g z8qPS9LYRlIM1L{BTH!?ib2yOKPXBMf**N|A0yVYZTjic`lYw0M6yxg|sXMR7viF~F z(8UH6K*MvWH@K(;HD1t*4b%uX%|Hj}2D*V-2JS_9R3XePmz)3q002ovPDHLkV1oC0 BXvF{k delta 273 zcmV+s0q*{n0;~d%B!3BTNLh0L01m_e01m_fl`9S#0002qNkluK}LX X%ToUj@7#z0015yANkvXXu0mjfzu0xK diff --git a/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png index 45ea8a32f5b0d9f1332f4fc9db5bdbd965bb1514..b2c59dc31a1f3a571457c3883a67e879e586f74c 100644 GIT binary patch delta 172 zcmZ3(c!F_)N(0r%1ad?Jd_r8^3w#(DW-=K6 zXJ9a9aA06K^PeG$VR^Xvb&%?kAirP+hi5m^fE*W37sn8d^T`PkDGI8Lu}64g8(JqY zOjer3uzC^Ws)k7lvl@Wx$%_nDF@>5iE>kd(^~z9nV-V$7d{eV$mGi|L4T&3=8RlGM V&6eyIO9vXr;OXk;vd$@?2>?>oHE{p{ delta 144 zcmX@XxQ20pO1)@+Pl)TIIZqg}7#JKF7>xfjFwA5)10;rc$HvQ=;?g*VcV(YEDQ|t-5eRJ=dNA`8pz4u>FVdQ&MBb@0LafWt^fc4 diff --git a/Resources/migration.yml b/Resources/migration.yml index 5396baa96d..8a1eaca84e 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -254,6 +254,8 @@ AirlockShuttleEasyPryLocked: AirlockExternalShuttleLocked ClothingBackpackFilledDetective: ClothingBackpackSecurityFilledDetective ClothingBackpackDuffelFilledDetective: ClothingBackpackDuffelSecurityFilledDetective ClothingBackpackSatchelFilledDetective: ClothingBackpackSatchelSecurityFilledDetective +FoodChili: FoodChiliPepper +FoodChilly: FoodChillyPepper # 2024-03-11 ImprovisedExplosive: FireBomb -- 2.52.0