From 5a1f7baaa4a0d7a9744e7e89346b244219a9f896 Mon Sep 17 00:00:00 2001 From: PuroSlavKing <103608145+PuroSlavKing@users.noreply.github.com> Date: Tue, 23 Jul 2024 20:36:35 +0300 Subject: [PATCH] [Tweak] Something about metabolism (#485) * [Tweak] Something About Metabolism * up1 --- .../white/body/organs/anthro_animal.ftl | 6 +++++ .../white/entities/markers/spawners/mobs.ftl | 2 ++ .../white/entities/mobs/npcs/animals.ftl | 2 ++ .../entities/objects/consumable/food/meat.ftl | 10 ++++---- .../prototypes/white/metabolizer-types.ftl | 1 + .../Prototypes/Body/Prototypes/reptilian.yml | 6 ++--- Resources/Prototypes/Reagents/gases.yml | 9 ++++++++ Resources/Prototypes/Reagents/toxins.yml | 20 ++++++++++++++++ .../_White/Body/Organs/anthro_animal.yml | 23 +++++++++++++++++++ .../_White/Body/Prototypes/felinid.yml | 6 ++--- .../_White/Body/Prototypes/harpy.yml | 6 ++--- .../_White/Chemistry/metabolizer_types.yml | 3 +++ .../_White/Entities/Markers/Spawners/mobs.yml | 2 +- .../_White/Entities/Mobs/NPCs/gondola.yml | 8 +++---- .../_White/Polymorphs/polymorph.yml | 1 + 15 files changed, 86 insertions(+), 19 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/white/body/organs/anthro_animal.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/markers/spawners/mobs.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/mobs/npcs/animals.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/white/metabolizer-types.ftl create mode 100644 Resources/Prototypes/_White/Body/Organs/anthro_animal.yml create mode 100644 Resources/Prototypes/_White/Chemistry/metabolizer_types.yml diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/body/organs/anthro_animal.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/body/organs/anthro_animal.ftl new file mode 100644 index 0000000000..b18426bf03 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/body/organs/anthro_animal.ftl @@ -0,0 +1,6 @@ +ent-OrganAnthroAnimalStomach = { ent-OrganHumanStomach } + .desc = { ent-OrganHumanStomach.desc } +ent-OrganAnthroAnimalLiver = { ent-OrganHumanLiver } + .desc = { ent-OrganHumanLiver.desc } +ent-OrganAnthroAnimalHeart = { ent-OrganHumanHeart } + .desc = { ent-OrganHumanHeart.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/markers/spawners/mobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/markers/spawners/mobs.ftl new file mode 100644 index 0000000000..b6ad12ffd8 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/markers/spawners/mobs.ftl @@ -0,0 +1,2 @@ +ent-SpawnMobGondola = спавнер Гондола + .desc = { ent-MarkerBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/mobs/npcs/animals.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/mobs/npcs/animals.ftl new file mode 100644 index 0000000000..615205903e --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/mobs/npcs/animals.ftl @@ -0,0 +1,2 @@ +ent-MobGondola = Гондола + .desc = Не имея рук, он воплощает даосский принцип у-вэй (бездействия), а выражение его улыбающегося лица показывает его полное принятие мира таким, какой он есть. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/consumable/food/meat.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/consumable/food/meat.ftl index 55a6d6c194..069926678a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/consumable/food/meat.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/consumable/food/meat.ftl @@ -1,5 +1,7 @@ -ent-FoodMeatGondola = сырое мясо Гондолы - .desc = Ты монстр. +ent-FoodMeatGondola = { ent-FoodMeat } + .desc = { ent-FoodMeat.desc } + .suffix = Гондола -ent-FoodMeatGondolaCooked = стейк из Гондолы - .desc = Приготовленное мясо Гондолы... +ent-FoodMeatGondolaCooked = { ent-FoodMeatCooked } + .desc = { ent-FoodMeatCooked.desc } + .suffix = Гондола diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/metabolizer-types.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/metabolizer-types.ftl new file mode 100644 index 0000000000..eafbb8fc09 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/metabolizer-types.ftl @@ -0,0 +1 @@ +metabolizer-type-anthropomorph-animal = Гуманоидное животное diff --git a/Resources/Prototypes/Body/Prototypes/reptilian.yml b/Resources/Prototypes/Body/Prototypes/reptilian.yml index 1e9ebd54a4..4c486b3838 100644 --- a/Resources/Prototypes/Body/Prototypes/reptilian.yml +++ b/Resources/Prototypes/Body/Prototypes/reptilian.yml @@ -13,10 +13,10 @@ torso: part: TorsoReptilian organs: - heart: OrganAnimalHeart + heart: OrganAnthroAnimalHeart # WD lungs: OrganHumanLungs - stomach: OrganReptilianStomach - liver: OrganAnimalLiver + stomach: OrganAnthroAnimalStomach # WD + liver: OrganAnthroAnimalLiver # WD kidneys: OrganHumanKidneys connections: - right arm diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 5105369761..01e6ec06e6 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -14,6 +14,10 @@ conditions: - !type:OrganType type: Human + - !type:Oxygenate # WD + conditions: + - !type:OrganType + type: AnthroAnimal - !type:Oxygenate conditions: - !type:OrganType @@ -450,6 +454,11 @@ conditions: - !type:OrganType type: Human + - !type:Oxygenate # WD + factor: 8 + conditions: + - !type:OrganType + type: AnthroAnimal - !type:Oxygenate factor: 8 conditions: diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 00e02e3697..6bc70ebed3 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -406,6 +406,8 @@ min: 1 - !type:OrganType type: Animal # Applying damage to the mobs with lower metabolism capabilities + - !type:OrganType # WD + type: AnthroAnimal damage: types: Poison: 0.4 @@ -416,6 +418,8 @@ min: 3 - !type:OrganType type: Animal + - !type:OrganType # WD + type: AnthroAnimal - type: reagent id: Amatoxin @@ -482,6 +486,9 @@ - !type:OrganType type: Animal shouldHave: false + - !type:OrganType # WD + type: AnthroAnimal + shouldHave: false reagent: Protein type: Local visualType: MediumCaution @@ -493,11 +500,17 @@ - !type:OrganType type: Animal shouldHave: false + - !type:OrganType # WD + type: AnthroAnimal + shouldHave: false - !type:HealthChange conditions: - !type:OrganType type: Animal shouldHave: false + - !type:OrganType # WD + type: AnthroAnimal + shouldHave: false damage: types: Poison: 1 @@ -506,6 +519,9 @@ - !type:OrganType type: Animal shouldHave: true + - !type:OrganType # WD + type: AnthroAnimal + shouldHave: true reagent: Protein amount: 0.5 @@ -527,6 +543,8 @@ min: 1 - !type:OrganType type: Animal + - !type:OrganType # WD + type: AnthroAnimal damage: types: Poison: 0.06 @@ -569,6 +587,8 @@ min: 1 - !type:OrganType type: Animal + - !type:OrganType # WD + type: AnthroAnimal damage: types: Poison: 0.06 diff --git a/Resources/Prototypes/_White/Body/Organs/anthro_animal.yml b/Resources/Prototypes/_White/Body/Organs/anthro_animal.yml new file mode 100644 index 0000000000..12bf4a59ef --- /dev/null +++ b/Resources/Prototypes/_White/Body/Organs/anthro_animal.yml @@ -0,0 +1,23 @@ +- type: entity + parent: OrganHumanStomach + id: OrganAnthroAnimalStomach + noSpawn: true + components: + - type: Metabolizer + metabolizerTypes: [ AnthroAnimal ] + +- type: entity + parent: OrganHumanLiver + id: OrganAnthroAnimalLiver + noSpawn: true + components: + - type: Metabolizer + metabolizerTypes: [ AnthroAnimal ] + +- type: entity + parent: OrganHumanHeart + id: OrganAnthroAnimalHeart + noSpawn: true + components: + - type: Metabolizer + metabolizerTypes: [ AnthroAnimal ] diff --git a/Resources/Prototypes/_White/Body/Prototypes/felinid.yml b/Resources/Prototypes/_White/Body/Prototypes/felinid.yml index f0c98ff83e..4817e301c3 100644 --- a/Resources/Prototypes/_White/Body/Prototypes/felinid.yml +++ b/Resources/Prototypes/_White/Body/Prototypes/felinid.yml @@ -18,10 +18,10 @@ - left leg - right leg organs: - heart: OrganAnimalHeart + heart: OrganAnthroAnimalHeart lungs: OrganHumanLungs - stomach: OrganReptilianStomach - liver: OrganAnimalLiver + stomach: OrganAnthroAnimalStomach + liver: OrganAnthroAnimalLiver kidneys: OrganHumanKidneys right arm: part: RightArmHuman diff --git a/Resources/Prototypes/_White/Body/Prototypes/harpy.yml b/Resources/Prototypes/_White/Body/Prototypes/harpy.yml index 9c832d9af3..8882a5ed30 100644 --- a/Resources/Prototypes/_White/Body/Prototypes/harpy.yml +++ b/Resources/Prototypes/_White/Body/Prototypes/harpy.yml @@ -18,10 +18,10 @@ - left leg - right leg organs: - heart: OrganHumanHeart + heart: OrganAnthroAnimalHeart lungs: OrganHumanLungs - stomach: OrganHumanStomach - liver: OrganHumanLiver + stomach: OrganAnthroAnimalStomach + liver: OrganAnthroAnimalLiver kidneys: OrganHumanKidneys right arm: part: RightArmHuman diff --git a/Resources/Prototypes/_White/Chemistry/metabolizer_types.yml b/Resources/Prototypes/_White/Chemistry/metabolizer_types.yml new file mode 100644 index 0000000000..1c0b304475 --- /dev/null +++ b/Resources/Prototypes/_White/Chemistry/metabolizer_types.yml @@ -0,0 +1,3 @@ +- type: metabolizerType + id: AnthroAnimal + name: metabolizer-type-anthropomorph-animal diff --git a/Resources/Prototypes/_White/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_White/Entities/Markers/Spawners/mobs.yml index cb2386e49c..9c7ed7a39b 100644 --- a/Resources/Prototypes/_White/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_White/Entities/Markers/Spawners/mobs.yml @@ -1,7 +1,7 @@ - type: entity parent: MarkerBase id: SpawnMobGondola - name: спавнер Гондола + name: Gondola spawner components: - type: Sprite layers: diff --git a/Resources/Prototypes/_White/Entities/Mobs/NPCs/gondola.yml b/Resources/Prototypes/_White/Entities/Mobs/NPCs/gondola.yml index c5727ccdb1..583ca4ab3d 100644 --- a/Resources/Prototypes/_White/Entities/Mobs/NPCs/gondola.yml +++ b/Resources/Prototypes/_White/Entities/Mobs/NPCs/gondola.yml @@ -6,8 +6,8 @@ - MobBloodstream - MobFlammable id: MobGondola - name: Гондола - description: Не имея рук, он воплощает даосский принцип у-вэй (бездействия), а выражение его улыбающегося лица показывает его полное принятие мира таким, какой он есть. + name: Gondola + description: Something about Jesus. components: - type: FloatingVisuals - type: RotationVisuals @@ -19,10 +19,8 @@ - state: gondola_body_medium map: [ "enum.DamageStateVisualLayers.Base" ] color: "#6e4e40" - shader: unshaded - state: gondola_moustache_large_short - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] - shader: unshaded + map: [ "enum.DamageStateVisualLayers.Base" ] - type: RandomSprite available: - enum.DamageStateVisualLayers.Base: diff --git a/Resources/Prototypes/_White/Polymorphs/polymorph.yml b/Resources/Prototypes/_White/Polymorphs/polymorph.yml index 1fab49fc98..619f2cad00 100644 --- a/Resources/Prototypes/_White/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/_White/Polymorphs/polymorph.yml @@ -8,3 +8,4 @@ inventory: Drop revertOnDeath: true revertOnCrit: false + duration: 900