From 1a0136c21fbe58114666c6068aba645fd5e757e0 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Thu, 17 Apr 2025 16:12:04 +0300 Subject: [PATCH] a variety of fixes (#1191) --- .../meta/consumable/food/ingredients.ftl | 2 + .../meta/consumable/food/ingredients.ftl | 2 + .../Cargo/Store/SpiceStream/sell_special.yml | 4 +- .../Entities/Objects/Consumable/Food/pie.yml | 36 ++++++++++++++++-- .../_CP14/Entities/Objects/Keys/base.yml | 5 ++- .../_CP14/Entities/Objects/Keys/keyrings.yml | 1 + .../Entities/Structures/Furniture/bench.yml | 22 +++++++++++ .../Reagents/Consumable/Food/ingredients.yml | 22 +++++++++++ Resources/Prototypes/_CP14/tags.yml | 3 ++ .../Consumable/Food/pie.rsi/burnt_pie.png | Bin 0 -> 536 bytes .../Objects/Consumable/Food/pie.rsi/meta.json | 5 ++- 11 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 Resources/Locale/en-US/_CP14/reagents/meta/consumable/food/ingredients.ftl create mode 100644 Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/food/ingredients.ftl create mode 100644 Resources/Prototypes/_CP14/Reagents/Consumable/Food/ingredients.yml create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/burnt_pie.png diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/consumable/food/ingredients.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/consumable/food/ingredients.ftl new file mode 100644 index 0000000000..4c281be33b --- /dev/null +++ b/Resources/Locale/en-US/_CP14/reagents/meta/consumable/food/ingredients.ftl @@ -0,0 +1,2 @@ +cp14-reagent-name-burnt-food = burnt food +cp14-reagent-desc-burnt-food = A burnt and smoke-smelling black substance. diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/food/ingredients.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/food/ingredients.ftl new file mode 100644 index 0000000000..563d14b900 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/consumable/food/ingredients.ftl @@ -0,0 +1,2 @@ +cp14-reagent-name-burnt-food = сгоревшая еда +cp14-reagent-desc-burnt-food = Обгоревшая и пахнущая дымом черная субстанция. diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell_special.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell_special.yml index 53a4171c79..1f0414be52 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell_special.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell_special.yml @@ -31,7 +31,7 @@ - type: storePositionSell id: CP14FoodPieMeat special: true - price: 60 + price: 100 factions: - SpiceStream service: !type:CP14SellPrototypeService @@ -41,7 +41,7 @@ - type: storePositionSell id: CP14FoodPiePumpkin special: true - price: 60 + price: 100 factions: - SpiceStream service: !type:CP14SellPrototypeService diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml index 668808026f..c97e47d433 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml @@ -126,7 +126,7 @@ - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 - transformTo: CP14Ash1 + transformTo: CP14FoodPieBurnt - type: entity name: raw meat pie @@ -170,7 +170,7 @@ - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 - transformTo: CP14Ash1 + transformTo: CP14FoodPieBurnt - type: entity name: raw fish pie @@ -214,7 +214,7 @@ - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 - transformTo: CP14Ash1 + transformTo: CP14FoodPieBurnt - type: entity name: raw pumpkin pie @@ -284,4 +284,32 @@ - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 - transformTo: CP14Ash1 + transformTo: CP14FoodPieBurnt + +- type: entity + name: burnt pie + parent: CP14FoodPieBaseRaw + id: CP14FoodPieBurnt + description: The pie is burnt and is a burnt and inedible mass. + components: + - type: FlavorProfile + flavors: + - terrible + - type: Sprite + layers: + - state: tin + - state: burnt_pie + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: CP14BurntFood + Quantity: 8 + - type: Butcherable + butcheringType: Knife + spawned: + - id: CP14PlatePie + amount: 1 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml index f6508692c3..554779cee4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/base.yml @@ -56,4 +56,7 @@ - type: Sprite sprite: _CP14/Objects/keys.rsi state: lockpick - - type: CP14Lockpick \ No newline at end of file + - type: CP14Lockpick + - type: Tag + tags: + - CP14Lockpick diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml index e41d4a1765..450f182c92 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml @@ -24,6 +24,7 @@ whitelist: tags: - CP14Key + - CP14Lockpick - type: UserInterface interfaces: enum.StorageUiKey.Key: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml index f6c3c63f5f..ca100c098b 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bench.yml @@ -16,6 +16,28 @@ - state: wooden - type: Physics bodyType: Static + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 1 + max: 2 - type: Construction graph: CP14BenchWood node: CP14BenchWood diff --git a/Resources/Prototypes/_CP14/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/_CP14/Reagents/Consumable/Food/ingredients.yml new file mode 100644 index 0000000000..86908812eb --- /dev/null +++ b/Resources/Prototypes/_CP14/Reagents/Consumable/Food/ingredients.yml @@ -0,0 +1,22 @@ +- type: reagent + id: CP14BurntFood + name: cp14-reagent-name-burnt-food + group: Foods + desc: cp14-reagent-desc-burnt-food + physicalDesc: reagent-physical-desc-powdery + flavor: terrible + color: black + recognizable: true + metabolisms: + Food: + effects: + - !type:SatiateThirst + factor: -0.2 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.1 + - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 3 + probability: 0.3 diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 28c16b49a4..468c052e91 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -135,3 +135,6 @@ - type: Tag id: CP14Sheep + +- type: Tag + id: CP14Lockpick diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/burnt_pie.png b/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/burnt_pie.png new file mode 100644 index 0000000000000000000000000000000000000000..fd3ee6a5d7aad78151b66eda51c9123e99bd1db7 GIT binary patch literal 536 zcmV+z0_XjSP)Px$(n&-?R9J=Wl(A~tP#8v!u4=nhomx?%gb*Q$z~IG0plikqeTyzdQ1BC!EG>P4 zf}pREE`f^!?|4NP?W4oSgq1 zW!VQ_T6F<%?4L!88JKqhAIG#f_Rp5e6zR9z)AC%=@?0TD;arZwd40`}7qc9N0LW2D zea((ro|`#0lWog$MRWgX4p1p;0CWN$LpSL4do-#xcf}}?0QmIbmAd!#bCi~yYTEK# z(R}|cSuST|`qPj`)ds-OjYLS!#))8a|7f12iELF(BPwN$PT;c{Y3K!wyJAGI-vi)> z2!9jl%3dPzXn_|EJDCmL;PmzafM7Df&<*s0M)&5L?YKha$x|HD!Z9rX4!^qUqXhsc z2;^+cc3fd&bsd1=V31sPOp8lJ^6aOe6Zim>i=|A_nO?%3ty(;ar*vH4(* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json index 95235ef825..da05f93bb6 100644 --- a/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/pie.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-4.0", - "copyright": "Created by Artista, pumpkin by aeoli (discord)", + "copyright": "Created by Artista, pumpkin by aeoli (discord), burnt_pie by nimfar11", "states": [ { "name": "apple" @@ -31,6 +31,9 @@ { "name": "pumpkin_raw" }, + { + "name": "burnt_pie" + }, { "name": "tin" }