From 6d6f8d6bbe59471a479e2ddd5586cffaff20e6f4 Mon Sep 17 00:00:00 2001 From: M1and1B <153716654+M1and1B@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:06:21 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A3=D1=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Stories/Loadouts/IAA_loadouts.yml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml diff --git a/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml new file mode 100644 index 0000000000..8974fc058b --- /dev/null +++ b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml @@ -0,0 +1,30 @@ +## Вставка группы в лодаут роли +- type: roleLoadout + id: JobIAA + groups: + - GroupTankHarness + - AIIJumpsuit + - CommonBackpack + - Glasses + - Survival + - Trinkets + - GroupSpeciesBreathTool + +## Группы для вещей +- type: loadoutGroup + id: AIIJumpsuit + name: Агент Внутренних Дел, комбинезон + loadouts: + - AIIJumpsuit + - AIIJumpskirt + +## Сюда прописывать вещь +- type: loadout + id: AIIJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitLawyerBlack + +- type: loadout + id: AIIJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtLawyerBlack \ No newline at end of file From b0a98eba2459c8be8e2d5de7e8a052d1521e0759 Mon Sep 17 00:00:00 2001 From: M1and1B <153716654+M1and1B@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:07:35 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml index 8974fc058b..0149bc178d 100644 --- a/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml +++ b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml @@ -4,7 +4,7 @@ groups: - GroupTankHarness - AIIJumpsuit - - CommonBackpack + - CommonBackpac - Glasses - Survival - Trinkets From 130f17b6295ba75138fe28058f62f4ad6568ee2c Mon Sep 17 00:00:00 2001 From: M1and1B <153716654+M1and1B@users.noreply.github.com> Date: Tue, 24 Sep 2024 19:07:47 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=B1=D0=B0=D0=BB?= =?UTF-8?q?=D1=81=D1=8F,=20=D0=BD=D0=BE=20=D0=B3=D0=B4=D0=B5=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml index 0149bc178d..8974fc058b 100644 --- a/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml +++ b/Resources/Prototypes/Stories/Loadouts/IAA_loadouts.yml @@ -4,7 +4,7 @@ groups: - GroupTankHarness - AIIJumpsuit - - CommonBackpac + - CommonBackpack - Glasses - Survival - Trinkets From 3a4e03b4dc7421e231e12b2226629be9f5ee2d06 Mon Sep 17 00:00:00 2001 From: M1and1B <153716654+M1and1B@users.noreply.github.com> Date: Tue, 24 Sep 2024 21:01:30 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9E=D0=BF=D0=9E=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_stories/loadouts/loadout-groups.ftl | 44 +++++++++++++++++++ .../Stories/Loadouts/detective_loadouts.yml | 2 +- .../Stories/Loadouts/jedint_loadouts.yml | 14 +++--- .../Stories/Loadouts/partners_backpacks.yml | 2 +- .../Stories/Loadouts/prison_loadouts.yml | 14 +++--- 5 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl diff --git a/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl b/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl new file mode 100644 index 0000000000..a9c8e32645 --- /dev/null +++ b/Resources/Locale/ru-RU/_stories/loadouts/loadout-groups.ftl @@ -0,0 +1,44 @@ +# АВД + +loadout-group-AII-jumpsuit = Агент Внутренних Дел, комбинезон + +# Тюрьма + +loadout-group-HeadOfPrison-head = Начальник тюрьмы, голова + +loadout-group-PRISON-Gloves = Тюрьма, перчатки + +loadout-group-PRISON-OuterClothing = Тюрьма, верхняя одежда + +loadout-group-PRISON-Backpack = Тюрьма, рюкзак + +loadout-group-PRISON-Shoes = Тюрьма, обувь + +loadout-group-PRISON-Belt = Тюрьма, пояс + +loadout-group-PRISON-head = Тюрьма, голова + +# Спонсор Рюказки + +loadout-group-sponsor-Backpack = Спонсор, рюкзаки + +# Страж + +loadout-group-Jedi-head = Страж, голова + +loadout-group-Jedi-mask = Страж, маска + +loadout-group-Jedi-shoes = Страж, обувь + +loadout-group-Jedi-belt = Страж, пояс + +loadout-group-Jedi-neck = Страж, шея + +loadout-group-Jedi-jumpsuits = Страж, комбинезон + +loadout-group-Jedi-backpack = Страж, рюкзак + +# Детектив + +loadout-group-detective-belt = Детектив, пояс + diff --git a/Resources/Prototypes/Stories/Loadouts/detective_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/detective_loadouts.yml index 2b18faa15f..7148898a51 100644 --- a/Resources/Prototypes/Stories/Loadouts/detective_loadouts.yml +++ b/Resources/Prototypes/Stories/Loadouts/detective_loadouts.yml @@ -1,6 +1,6 @@ - type: loadoutGroup id: DetectiveBelt - name: Детектив, пояс + name: loadout-group-detective-belt loadouts: - ClothingBeltHolsterFilled - StoriesClothingBeltHolsterFilled diff --git a/Resources/Prototypes/Stories/Loadouts/jedint_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/jedint_loadouts.yml index 7c5aafdca2..7352937410 100644 --- a/Resources/Prototypes/Stories/Loadouts/jedint_loadouts.yml +++ b/Resources/Prototypes/Stories/Loadouts/jedint_loadouts.yml @@ -16,21 +16,21 @@ - type: loadoutGroup id: JediNtHead - name: Страж Клинка, голова + name: loadout-group-Jedi-head minLimit: 0 loadouts: - ClothingHeadHatExe - type: loadoutGroup id: JediNtMask - name: Страж Клинка, маска + name: loadout-group-Jedi-mask minLimit: 0 loadouts: - ClothingMaskGasExe - type: loadoutGroup id: JediNtShoes - name: Страж Клинка, обувь + name: loadout-group-Jedi-shoes loadouts: - ClothingShoesBootsExe - ClothingShoesBootsJackJediNomad @@ -39,7 +39,7 @@ - type: loadoutGroup id: JediNtBelt - name: Страж Клинка, пояс + name: loadout-group-Jedi-belt loadouts: - SecurityBelt - ClothingBeltJedi @@ -47,7 +47,7 @@ - type: loadoutGroup id: JediNtNeck - name: Страж Клинка, шея + name: loadout-group-Jedi-neck minLimit: 0 loadouts: - ClothingNeckCloakExe @@ -56,7 +56,7 @@ - type: loadoutGroup id: JediNtJumpsuit - name: Страж Клинка, комбинезон + name: loadout-group-Jedi-jumpsuits minLimit: 1 loadouts: - ClothingUniformJumpsuitExe @@ -66,7 +66,7 @@ - type: loadoutGroup id: JediNtBackpack - name: Страж Клинка, рюкзак + name: loadout-group-Jedi-backpack loadouts: # Stories-partners - start # Handbag diff --git a/Resources/Prototypes/Stories/Loadouts/partners_backpacks.yml b/Resources/Prototypes/Stories/Loadouts/partners_backpacks.yml index cb9cb83804..bbb67169d5 100644 --- a/Resources/Prototypes/Stories/Loadouts/partners_backpacks.yml +++ b/Resources/Prototypes/Stories/Loadouts/partners_backpacks.yml @@ -1,7 +1,7 @@ - type: loadoutGroup id: PartnersBackpacks minLimit: 0 - name: Спонсор, рюкзак + name: loadout-group-sponsor-Backpack loadouts: # Помогите! - ClothingBackpackHandbagAdidos diff --git a/Resources/Prototypes/Stories/Loadouts/prison_loadouts.yml b/Resources/Prototypes/Stories/Loadouts/prison_loadouts.yml index 9769ce78e8..ae683494c5 100644 --- a/Resources/Prototypes/Stories/Loadouts/prison_loadouts.yml +++ b/Resources/Prototypes/Stories/Loadouts/prison_loadouts.yml @@ -56,7 +56,7 @@ - type: loadoutGroup id: PRISONHeadOfPrisonHead - name: Начальник тюрьмы, голова + name: loadout-group-HeadOfPrison-head minLimit: 0 loadouts: - PRISONCapHeadOfPrison @@ -76,7 +76,7 @@ - type: loadoutGroup id: PRISONGloves - name: Тюрьма, перчатки + name: loadout-group-PRISON-Gloves minLimit: 0 loadouts: - PRISONGloves @@ -99,7 +99,7 @@ - type: loadoutGroup id: PRISONOuterClothing - name: Тюрьма, верхняя одежда + name: loadout-group-PRISON-OuterClothing loadouts: - PRISONArmorVest @@ -112,7 +112,7 @@ - type: loadoutGroup id: PRISONBackpack - name: Тюрьма, рюкзак + name: loadout-group-PRISON-Backpack loadouts: - PRISONBackpack - PRISONSatchel @@ -163,7 +163,7 @@ - type: loadoutGroup id: PRISONHead - name: Тюрьма, голова + name: loadout-group-PRISON-head minLimit: 0 loadouts: - PRISONCap @@ -183,7 +183,7 @@ - type: loadoutGroup id: PRISONShoes - name: Тюрьма, обувь + name: loadout-group-PRISON-Shoes loadouts: - CombatBoots - JackBoots @@ -199,7 +199,7 @@ - type: loadoutGroup id: PRISONBelt - name: Тюрьма, пояс + name: loadout-group-PRISON-Belt loadouts: - SecurityBelt - PRISONWebbing