From 980a1f56a164f8868ec13f1866fe8106f8b692fa Mon Sep 17 00:00:00 2001 From: quartug Date: Wed, 9 Aug 2023 19:13:44 +0300 Subject: [PATCH] Gondola update! --- .../catalog/fills/crates/livestock-crates.ftl | 3 + .../prototypes/entities/mobs/npcs/animals.ftl | 3 + .../entities/objects/consumable/food/meat.ftl | 4 + .../catalog/fills/crates/livestock-crates.ftl | 2 + .../prototypes/entities/mobs/npcs/animals.ftl | 3 + .../entities/objects/consumable/food/meat.ftl | 4 + .../Catalog/Cargo/cargo_livestock.yml | 10 ++ .../Prototypes/Catalog/Fills/Crates/npc.yml | 9 ++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 47 +++++++++ .../Objects/Consumable/Food/ingredients.yml | 3 + .../Entities/Objects/Consumable/Food/meat.yml | 25 +++++ .../Recipes/Cooking/meal_recipes.yml | 92 +++++++++++++++++- .../Mobs/Animals/gondola.rsi/gondola.png | Bin 0 -> 684 bytes .../Mobs/Animals/gondola.rsi/gondola_dead.png | Bin 0 -> 409 bytes .../Mobs/Animals/gondola.rsi/meta.json | 18 ++++ .../Consumable/Food/meat.rsi/gondola.png | Bin 0 -> 553 bytes .../Consumable/Food/meat.rsi/meta.json | 3 + 17 files changed, 222 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Mobs/Animals/gondola.rsi/gondola.png create mode 100644 Resources/Textures/Mobs/Animals/gondola.rsi/gondola_dead.png create mode 100644 Resources/Textures/Mobs/Animals/gondola.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/gondola.png diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl index 9742b83b34011e..3871c305ed9309 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl @@ -13,6 +13,9 @@ ent-CrateNPCChicken = Chicken crate ent-CrateNPCCrab = Crab crate .desc = A crate containing three huge crabs. +ent-CrateNPCGondola = Gondola crate + .desc = A crate containing a single gondola. + ent-CrateNPCDuck = Duck crate .desc = A crate containing six fully grown ducks. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl index 5e8167dd9ef813..23f9485b1810f8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl @@ -145,3 +145,6 @@ ent-MobHamster = hamster ent-MobPig = pig .desc = Oink. .suffix = { "" } +ent-MobGondola = gondola + .desc = Gondola. + .suffix = { "" } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl index e251c2372108a4..ee75a707371709 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl @@ -169,3 +169,7 @@ ent-FoodMeatSpiderCutletCooked = spider cutlet ent-FoodMeatXenoCutletCooked = xeno cutlet .desc = A cutlet of cooked xeno, dripping with... tastiness? .suffix = { "" } +ent-FoodMeatGondola = raw gondola meat + .desc = A raw piece of gondola. Stinky. + .suffix = { "" } + \ No newline at end of file diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl index 7546ed27e59e9e..cde47e40063200 100644 --- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl +++ b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/livestock-crates.ftl @@ -8,6 +8,8 @@ ent-CrateNPCChicken = ящик кур .desc = Ящик, содержащий четыре взрослые курицы. ent-CrateNPCCrab = ящик крабов .desc = Ящик, содержащий три огромных краба. +ent-CrateNPCGondola = ящик с гондолой + .desc = Ящик, содержащий гондолу. ent-CrateNPCDuck = ящик уток .desc = Ящик, содержащий шесть взрослых уток. ent-CrateNPCCorgi = ящик корги diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl index 9186b06962e0cf..83b1591db289fd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl @@ -145,3 +145,6 @@ ent-MobHamster = хомяк ent-MobPig = свинья .desc = Хрю. .suffix = { "" } +ent-MobGondola = гондола + .desc = Гондола. + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl index 2c7fb184704cdb..64488c9974e93c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/meat.ftl @@ -169,3 +169,7 @@ ent-FoodMeatSpiderCutletCooked = паучья котлета ent-FoodMeatXenoCutletCooked = ксено котлета .desc = Котлета из ксеноса, сочащаяся... вкусом? .suffix = { "" } +ent-FoodMeatGondola = сырое мясо гондолы + .desc = Сырой кусок гондолы. Липкое. + .suffix = { "" } + \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index 7698265fbd82e9..916ba94b5c31f3 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -48,6 +48,16 @@ category: Livestock group: market +- type: cargoProduct + id: LivestockGondola + icon: + sprite: Mobs/Animals/gondola.rsi + state: gondola + product: CrateNPCGondola + cost: 2000 + category: Livestock + group: market + - type: cargoProduct id: LivestockDuck icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 6d8927cd4c5d93..607d5aefcb88c9 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -53,6 +53,15 @@ - id: MobCrab amount: 3 +- type: entity + id: CrateNPCGondola + parent: CrateLivestock + components: + - type: StorageFill + contents: + - id: MobGondola + amount: 1 + - type: entity id: CrateNPCDuck parent: CrateLivestock diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 0f88bacda94303..5709bc2e7a2fe5 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2461,3 +2461,50 @@ - type: NpcFactionMember factions: - Passive + +- type: entity + name: gondola + parent: SimpleMobBase + id: MobGondola + description: Gondola. + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: gondola + sprite: Mobs/Animals/gondola.rsi + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.25 + density: 100 + mask: + - MobMask + layer: + - MobLayer + - type: DamageStateVisuals + states: + Alive: + Base: gondola + Critical: + Base: gondola_dead + Dead: + Base: gondola_dead + - type: Butcherable + spawned: + - id: FoodMeatGondola + amount: 1 + - type: InteractionPopup + successChance: 0.8 + interactSuccessString: petting-success-bear + interactFailureString: petting-failure-generic + interactSuccessSound: + path: /Audio/Animals/sloth_squeak.ogg + - type: NpcFactionMember + factions: + - Passive + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index b307510a4ed7fb..e0d3e7dbe3af27 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -431,6 +431,9 @@ components: - type: Sprite state: dough-pie + - type: SliceableFood + count: 3 + slice: FoodDoughPastryBaseRaw - type: entity name: flat dough diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index c56816dbdd723a..8da926a305c820 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -71,6 +71,31 @@ node: start defaultTarget: meat steak +- type: entity + name: raw gondola meat + parent: FoodMeatBase + id: FoodMeatGondola + description: A raw piece of gondola. Stinky. + components: + - type: Tag + tags: + - Raw + - type: Sprite + state: gondola + - type: FlavorProfile + flavors: + - shocking + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 10 + - ReagentId: Fat + Quantity: 5 + - ReagentId: Toxin + Quantity: 5 + - type: entity name: raw human meat parent: FoodMeatBase diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index bcd817709f41de..3e3cbda8ad99a4 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1235,6 +1235,89 @@ FoodDoughSlice: 3 #Donks i guess + +- type: microwaveMealRecipe + id: RecipeDonkpocket + name: donk pocket recipe + result: FoodDonkpocket + time: 5 + solids: + FoodDoughPastryBaseRaw: 1 + FoodMeatMeatball: 1 + +- type: microwaveMealRecipe + id: RecipeGondolapocket + name: gondola pocket recipe + result: FoodDonkpocketGondola + time: 5 + solids: + FoodMeatGondola: 1 + FoodDoughPastryBaseRaw: 1 + FoodMeatMeatball: 1 + +- type: microwaveMealRecipe + id: RecipeDonkpocketHonk + name: donk pocket recipe + result: FoodDonkpocketHonk + time: 5 + reagents: + Sugar: 5 + solids: + FoodDoughPastryBaseRaw: 1 + FoodMeatMeatball: 1 + FoodBanana: 1 + +- type: microwaveMealRecipe + id: RecipeDonkpocketBerry + name: berry-pocket recipe + result: FoodDonkpocketBerry + time: 5 + solids: + FoodDoughPastryBaseRaw: 1 + FoodGrape: 1 + +- type: microwaveMealRecipe + id: RecipeDankpocket + name: dank pocket recipe + result: FoodDonkpocketDank + time: 5 + solids: + FoodDoughPastryBaseRaw: 1 + FoodAmbrosiaVulgaris: 1 + +- type: microwaveMealRecipe + id: RecipeDonkpocketPizzaPocket + name: pizza-pocket recipe + result: FoodDonkpocketPizza + time: 5 + solids: + FoodDoughPastryBaseRaw: 1 + FoodMeatMeatball: 1 + FoodTomato: 1 + +- type: microwaveMealRecipe + id: RecipeDonkpocketSpicy + name: spicy donk-pocket recipe + result: FoodDonkpocketSpicy + time: 5 + solids: + FoodDoughPastryBaseRaw: 1 + FoodMeatMeatball: 1 + FoodChili: 1 + +- type: microwaveMealRecipe + id: RecipeDonkpocketTeriyaki + name: teriyaki-pocket recipe + result: FoodDonkpocketTeriyaki + time: 5 + reagents: + Soysauce: 5 + solids: + FoodDoughPastryBaseRaw: 1 + FoodMeatMeatball: 1 + +#Warm pockets + - type: microwaveMealRecipe id: RecipeWarmDonkpocket name: warm donk pocket recipe @@ -1242,7 +1325,8 @@ time: 5 solids: FoodDonkpocket: 1 - + + - type: microwaveMealRecipe id: RecipeWarmDankpocket name: warm dank pocket recipe @@ -1276,7 +1360,7 @@ FoodDonkpocketPizza: 1 - type: microwaveMealRecipe - id: RecipeDonkpocketHonk + id: RecipeWarmDonkpocketHonk name: warm honk-pocket recipe result: FoodDonkpocketHonkWarm time: 5 @@ -1284,7 +1368,7 @@ FoodDonkpocketHonk: 1 - type: microwaveMealRecipe - id: RecipeDonkpocketBerry + id: RecipeWarmDonkpocketBerry name: warm berry-pocket recipe result: FoodDonkpocketBerryWarm time: 5 @@ -1292,7 +1376,7 @@ FoodDonkpocketBerry: 1 - type: microwaveMealRecipe - id: RecipeDonkpocketGondola + id: RecipeWarmDonkpocketGondola name: warm gondola-pocket recipe result: FoodDonkpocketGondolaWarm time: 5 diff --git a/Resources/Textures/Mobs/Animals/gondola.rsi/gondola.png b/Resources/Textures/Mobs/Animals/gondola.rsi/gondola.png new file mode 100644 index 0000000000000000000000000000000000000000..e098fa976bbd851e6faeb64676fda263b992bb60 GIT binary patch literal 684 zcmV;d0#p5oP)Px%W=TXrRCt{2S}{w*Kp6chf`eE(NTupjw1af&;4i4)(#5fZo2#y3!A)l!oZLEy zAh@^)`U^TZ6+tadwxz`(rgU(MiwS8-<9A=~^4a!#(_M18_wI2acew{35D2Cj3Ccso zeAXGh_E>)>^~KFUOCc^5azVG9C_=dS(T$7wtTTdm0C!KXMocipk7|e|r;6a@pCPN7 z5d7(qs{1Z<%>vW>Q$GWg4LGRYD_#HZKpD`n`(F8ccRR3+|GK}u4yg90(jL7Ia64T} z&TAo7g(-feg%AM1{$bfGCpLD$d9Hf(%F(5=09EKVS=oSA*MfG}g7x}0d>vQ7zJ7tX z{2XM`DXqfdg0cY@XEy)#iSN7 z9Q>q(ke@uLZW=oI$upp3^}O* z22jX#?$@LCg?T>IfLf!8CR1r^qE8e20)b%iA^89bvE&0nAo&1-2u}W~-wa7UfTU`I zKr(dj(ALOFn=inmF=;W1rKveRex@ky0KqJ581GK3cQ-}fF0=OXta0}qZ)Ej{Q3}Vjy zP2~gp7~b+yj`96K&j8HXzlnT6SpQK651_aZ!gL;YJ|HR|$^gvSJ6Ap+D(?>#X5D8| Sj_6we00005@(+4ozgB18mp{zP%s{|x*X^6qvLf$eyZnC1cYA*F zJWsZ80IAW{ImQ|wvp`+*L%eIt^oNK0?}u#nXlNE)Z6U1K`&!T5ZK1lqUg`{+ol~;- zn%f!9e1DQ z%^kZr#av!6q*YE@DYU0%f{5^eECV}-5X*v>KiS<Px$<4Ht8R9J=Wlrd-%Q5?p9(ej{PP9h@55tItX=n|}>fesO+*fp!k>QF3na0(sD z4dNhV6X_Df7VFf`#UZ1E2RB(V7(_TCEut&0q zDae|F6ds0|B!x%4Y|(KV_eQ zX3uMKIwAS^_8oa=OP$>qB_8+Ga$MIt&AqWtGW1`}H*xjmrLdo