From cc732bc275fdc33d3ce90cb1c1d22560b35d8d5e Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 18 Jun 2024 11:26:41 +0200 Subject: [PATCH] Fix corvax backpacks and loadouts (#2285) --- .../fills/backpacks/startergear/backpack.ftl | 4 --- .../fills/backpacks/startergear/duffelbag.ftl | 4 --- .../fills/backpacks/startergear/satchel.ftl | 4 --- .../Fills/Backpacks/StarterGear/backpack.yml | 18 ------------- .../Fills/Backpacks/StarterGear/duffelbag.yml | 18 ------------- .../Fills/Backpacks/StarterGear/satchel.yml | 18 ------------- .../Entities/Clothing/Back/backpacks.yml | 5 ++-- .../Corvax/Entities/Clothing/Back/duffel.yml | 3 +-- .../Corvax/Entities/Clothing/Back/satchel.yml | 3 +-- .../Loadouts/Jobs/Wildcards/psychologist.yml | 27 ------------------- .../Corvax/Loadouts/loadout_groups.yml | 9 ------- .../Prototypes/Loadouts/role_loadouts.yml | 2 +- .../Roles/Jobs/Wildcards/psychologist.yml | 3 ++- 13 files changed, 7 insertions(+), 111 deletions(-) delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl delete mode 100644 Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml delete mode 100644 Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml delete mode 100644 Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml delete mode 100644 Resources/Prototypes/Corvax/Loadouts/Jobs/Wildcards/psychologist.yml diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl deleted file mode 100644 index 35508073687..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/backpack.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-ClothingBackpackIAAFilled = { ent-ClothingBackpack } - .desc = { ent-ClothingBackpack.desc } -ent-ClothingBackpackPsychologistFilled = { ent-ClothingBackpackMedical } - .desc = { ent-ClothingBackpackMedical.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl deleted file mode 100644 index bf39d8f1258..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/duffelbag.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-ClothingBackpackDuffelIAAFilled = { ent-ClothingBackpackDuffel } - .desc = { ent-ClothingBackpackDuffel.desc } -ent-ClothingBackpackDuffelPsychologistFilled = { ent-ClothingBackpackDuffelMedical } - .desc = { ent-ClothingBackpackDuffelMedical.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl deleted file mode 100644 index b8728031901..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/backpacks/startergear/satchel.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-ClothingBackpackSatchelIAAFilled = { ent-ClothingBackpackSatchel } - .desc = { ent-ClothingBackpackSatchel.desc } -ent-ClothingBackpackSatchelPsychologistFilled = { ent-ClothingBackpackSatchelMedical } - .desc = { ent-ClothingBackpackSatchelMedical.desc } diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml deleted file mode 100644 index 939a82c61f2..00000000000 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackIAAFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackMedical - id: ClothingBackpackPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml deleted file mode 100644 index 5c67e56c0dc..00000000000 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelIAAFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelMedical - id: ClothingBackpackDuffelPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist diff --git a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml deleted file mode 100644 index a18c641ca6f..00000000000 --- a/Resources/Prototypes/Corvax/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelIAAFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelMedical - id: ClothingBackpackSatchelPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Back/backpacks.yml index b78ccee7161..b74d42c4506 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Back/backpacks.yml @@ -8,8 +8,7 @@ sprite: Corvax/Back/Backpacks/military.rsi - type: Storage grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - 0,0,8,4 - type: entity parent: ClothingBackpack @@ -21,7 +20,7 @@ sprite: Corvax/Back/Backpacks/deathsquad-backpack.rsi - type: Storage grid: - - 0,0,6,3 # TODO: Change this + - 0,0,13,7 maxItemSize: Huge - type: entity diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Back/duffel.yml index e9621e7e112..376225aa4c3 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Back/duffel.yml @@ -8,8 +8,7 @@ sprite: Corvax/Back/Duffels/military.rsi - type: Storage grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - 0,0,8,4 - type: entity parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Back/satchel.yml index 1a05a3f3bc6..1f118b70983 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/Back/satchel.yml @@ -8,8 +8,7 @@ sprite: Corvax/Back/Satchels/military.rsi - type: Storage grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - 0,0,8,4 - type: entity parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Wildcards/psychologist.yml deleted file mode 100644 index 22b4c6a580f..00000000000 --- a/Resources/Prototypes/Corvax/Loadouts/Jobs/Wildcards/psychologist.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Back -- type: loadout - id: PsychologistBackpack - equipment: PsychologistBackpack - -- type: startingGear - id: PsychologistBackpack - equipment: - back: ClothingBackpackPsychologistFilled - -- type: loadout - id: PsychologistSatchel - equipment: PsychologistSatchel - -- type: startingGear - id: PsychologistSatchel - equipment: - back: ClothingBackpackSatchelPsychologistFilled - -- type: loadout - id: PsychologistDuffel - equipment: PsychologistDuffel - -- type: startingGear - id: PsychologistDuffel - equipment: - back: ClothingBackpackDuffelPsychologistFilled diff --git a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml index 95eab89bf34..d87ba1342b5 100644 --- a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml @@ -4,12 +4,3 @@ minLimit: 0 maxLimit: 5 loadouts: [] - -- type: loadoutGroup - id: PsychologistBackpack - name: loadout-group-psychologist-backpack - loadouts: - - PsychologistBackpack - - PsychologistSatchel - - PsychologistDuffel - diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 001892c47a1..703386a516d 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -421,7 +421,7 @@ - type: roleLoadout id: JobPsychologist groups: - - PsychologistBackpack # Corvax-MRP + - MedicalBackpack - Glasses - Trinkets - Inventory # Corvax-Loadouts diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 17bed0ee7f6..3dafa654f0d 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -21,4 +21,5 @@ ears: ClothingHeadsetMedical storage: back: - - BoxSurvivalMedical \ No newline at end of file + - BoxSurvivalMedical + - RubberStampPsychologist # Corvax-MRP