From 5dca2b6609ae2650fca098ea7fe5383fa17ecc06 Mon Sep 17 00:00:00 2001 From: Theodore Lukin <66275205+pheenty@users.noreply.github.com> Date: Sat, 5 Oct 2024 03:21:41 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81=D0=BA?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D1=81=D1=82=D0=B8=20=D1=81=D0=B5=D1=82=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=B6=D0=B5=D0=B4=D0=B0=D1=8F=20(#113)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit надеюсь, без конфликта с предыдущими изменениями --- Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml | 3 --- .../Stories/Entities/Clothing/OuterClothing/coats.yml | 2 +- Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml | 3 --- .../Stories/Entities/Clothing/Uniforms/jumpsuits.yml | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml index b3b33f0ced..084c027ffa 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml @@ -7,9 +7,6 @@ - type: Tag tags: - ForceRecallEquipment - - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1.02 - type: Sprite sprite: Stories/Clothing/Belt/jedi_belt.rsi state: icon diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml index 6d5e93b63e..94edf4fba6 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml @@ -13,7 +13,7 @@ coefficient: 0.001 - type: ClothingSpeedModifier walkModifier: 1 - sprintModifier: 1.04 + sprintModifier: 1.1 - type: Sprite sprite: Stories/Clothing/OuterClothing/Coats/jedi.rsi - type: Clothing diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml index caaebd9ef1..7e8d6165d0 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml @@ -22,9 +22,6 @@ - type: Tag tags: - ForceRecallEquipment - - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1.02 - type: NoSlip - type: Sprite sprite: Stories/Clothing/Shoes/Boots/jedi.rsi diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Stories/Entities/Clothing/Uniforms/jumpsuits.yml index 4a0afb39d1..df789718c8 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Uniforms/jumpsuits.yml @@ -7,9 +7,6 @@ - type: Tag tags: - ForceRecallEquipment - - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1.02 - type: Sprite sprite: Stories/Clothing/Uniforms/Jumpsuit/jedi.rsi - type: Clothing From df2e44c35effdc99c881b71d7604099eb423f00e Mon Sep 17 00:00:00 2001 From: Theodore Lukin <66275205+pheenty@users.noreply.github.com> Date: Sat, 5 Oct 2024 03:23:39 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B4=D0=B5=D0=B6=D0=B4=D1=8B=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=B6=D0=B0=20=D0=B8=20=D0=B8=D0=BD?= =?UTF-8?q?=D0=BA=D0=B2=D0=B8=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B0=20(#112)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * чуть-чуть поисправлял * две запятые, шесть кавычек * опечатка, из-за которой ничего не сработало * надо с маленькой буквы. теперь точно работает --- .../Stories/Entities/Clothing/Head/hoods.yml | 6 ++++-- .../Stories/Entities/Clothing/Neck/cloaks.yml | 12 +++++++----- .../Stories/Entities/Clothing/Neck/mantles.yml | 4 ++-- .../Entities/Clothing/OuterClothing/coats.yml | 5 +++-- .../Entities/Clothing/OuterClothing/vests.yml | 13 ++++++++++--- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml index 9def13a694..7a4836124c 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Head/hoods.yml @@ -33,7 +33,8 @@ - HeadTop - HeadSide - type: TemperatureProtection - coefficient: 0.005 + coolingCoefficient: 0.005 + heatingCoefficient: 0.005 - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 @@ -66,7 +67,8 @@ - HeadTop - HeadSide - type: TemperatureProtection - coefficient: 0.005 + coolingCoefficient: 0.005 + heatingCoefficient: 0.005 - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml index f392702d76..09cedbbb64 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Neck/cloaks.yml @@ -2,10 +2,11 @@ parent: ClothingNeckBase id: ClothingNeckCloakSith name: плащ инквизитора - description: Невероятное произведение искусства объединяющие в себе прочность и легкость. Заряжен неведомой энергией. + description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. Заряжен неведомой энергией. components: - type: TemperatureProtection - coefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: PressureProtection highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 @@ -43,10 +44,11 @@ parent: ClothingNeckBase id: ClothingNeckCloakKylo name: плащ кайло рена - description: Невероятное произведение искусства объединяющие в себе прочность и легкость. + description: Невероятное произведение искусства, объединяющее в себе прочность и легкость. components: - type: TemperatureProtection - coefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: PressureProtection highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 @@ -79,7 +81,7 @@ parent: ClothingNeckBase id: ClothingNeckCloakExe name: плащ хранителя - description: Похоже тут выгравировано R u s t e d T i m. Что же это может значить? + description: Похоже, тут выгравировано "R u s t e d T i m". Что же это может значить? components: - type: Tag tags: diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Stories/Entities/Clothing/Neck/mantles.yml index d1e0b255a3..05c905e2f2 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Neck/mantles.yml @@ -2,7 +2,7 @@ parent: ClothingNeckBase id: ClothingNeckMantleJediNomad name: мантия путника - description: Похоже тут выгравировано o k h r i m m. Что же это может значить? + description: Похоже, тут выгравировано "o k h r i m m". Что же это может значить? components: - type: Tag tags: @@ -16,7 +16,7 @@ parent: ClothingNeckBase id: ClothingNeckMantleJediNt name: мантия стража клинка - description: Похоже тут выгравировано W o o b y. Что же это может значить? + description: Похоже, тут выгравировано "W o o b y". Что же это может значить? components: - type: Tag tags: diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml index 94edf4fba6..b62b682451 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/coats.yml @@ -2,7 +2,7 @@ parent: ClothingOuterStorageBase id: ClothingOuterCoatJedi name: накидка джедая - description: Длинный вид одежды, который свободно лежит на плечах, охватывая шею, но не имеет капюшона. + description: Длинный вид одежды, который свободно лежит на плечах, охватывая шею. components: - type: Tag tags: @@ -10,7 +10,8 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodJedihood - type: TemperatureProtection - coefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1.1 diff --git a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml index e4dbecd1d1..116eced58c 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/OuterClothing/vests.yml @@ -2,13 +2,14 @@ parent: ClothingOuterArmorBasic id: ClothingOuterVestJediNt name: утепленный бронежилет стража клинка - description: Потому что, кто-то сказал, что бронежилеты могут быть утепленны. Ваш щит уже утеплен! + description: Потому что кто-то сказал, что бронежилеты могут быть утеплены. Ваш щит уже утеплен! components: - type: Tag tags: - ForceRecallEquipment - type: TemperatureProtection - coefficient: 0.001 + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: Sprite sprite: Stories/Clothing/OuterClothing/Vests/jedi_nt.rsi - type: Clothing @@ -29,8 +30,14 @@ parent: ClothingOuterArmorBasic id: ClothingOuterVestArmorExe name: бронежилет хранителя - description: Тонкий бронежилет типа I, обеспечивающий достойную защиту от большинства видов повреждений. + description: Элегантный бронежилет, оберегающий хранителя от большинства видов повреждений и перепадов температур. components: + - type: Tag + tags: + - ForceRecallEquipment + - type: TemperatureProtection + coolingCoefficient: 0.001 + heatingCoefficient: 0.001 - type: Sprite sprite: Stories/Clothing/OuterClothing/Vests/exe_armor.rsi - type: Clothing