From 2c7f1e931861593f5d8cc65d1a280d2dca946466 Mon Sep 17 00:00:00 2001 From: Alexsey Bezyuk Date: Sun, 1 Jun 2025 12:57:30 +1000 Subject: [PATCH] backpacks --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 4 +- Resources/Maps/_CP14/comoss.yml | 2 +- .../Entities/Clothing/Back/backpacks.yml | 81 +++++++++------- .../Clothing/Back/backpacks_explorer.yml | 96 +++++++++++++++++++ .../Clothing/Back/backpacks_satchels.yml | 86 +++++++++++++++++ .../Entities/Clothing/Back/container_base.yml | 33 +++++++ .../_CP14/Entities/Clothing/Back/satchels.yml | 29 ------ .../_CP14/Loadouts/Jobs/general.yml | 13 +-- 8 files changed, 274 insertions(+), 70 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index ca45030507..b34043d778 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -648,10 +648,10 @@ ent-CP14SpellScrollWaterCreation = свиток заклинания созда ent-CP14HeadSkeleton = череп .desc = Бедный Йорик... -ent-CP14ClothingBackpackLeather = кожаный рюкзак +ent-CP14ClothingBackpackT0 = кожаный рюкзак .desc = Вы носите его на спине и кладете в него предметы. -ent-CP14ClothingSatchelLeather = кожаная сумка +ent-CP14ClothingSatchelT0 = кожаная сумка .desc = Вы носите его на спине и кладете в него предметы. ent-CP14ClothingBeltPouchPotions = подсумок для зелий diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index 6827a7ebe2..22d705ebcf 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -39527,7 +39527,7 @@ entities: parent: 7459 - type: Physics canCollide: False -- proto: CP14ClothingSatchelLeather +- proto: CP14ClothingSatchelT0 entities: - uid: 7478 components: diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml index 5b81a40152..c4018c8e7f 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml @@ -1,43 +1,60 @@ - type: entity abstract: true - parent: - - Clothing - - ContentsExplosionResistanceBase + parent: CP14ClothingBackContainerBase id: CP14ClothingBackpackBase categories: [ ForkFiltered ] components: - - type: Item - size: Huge - - type: Clothing - equipDelay: 0.4 - unequipDelay: 0.2 - slots: - - back - quickEquip: false - breakOnMove: false - - type: Storage - grid: - - 0,0,6,3 - maxItemSize: Huge - - type: ContainerContainer - containers: - storagebase: !type:Container - ents: [] - - type: UseDelay - delay: 0.5 - - type: ExplosionResistance - damageCoefficient: 0.9 - - type: UserInterface - interfaces: - enum.StorageUiKey.Key: - type: StorageBoundUserInterface + - type: Sprite + sprite: _CP14/Clothing/Back/Backpacks/leather_backpack.rsi -- type: entity +type: entity parent: CP14ClothingBackpackBase - id: CP14ClothingBackpackLeather - name: leather backpack + id: CP14ClothingBackpackT0 + name: backpack T0 description: You wear this on your back and put items into it. components: - type: Sprite sprite: _CP14/Clothing/Back/Backpacks/leather_backpack.rsi - state: icon + state: iconT0 + - type: Storage + grid: + - 0,0,4,2 + +- type: entity + parent: CP14ClothingBackpackT0 + id: CP14ClothingBackpackT1 + name: backpack T1 + description: You wear this on your back and put items into it. + components: + - type: Sprite + state: iconT1 + - type: Storage + grid: + - 0,0,5,3 + +- type: entity + parent: CP14ClothingBackpackT1 + id: CP14ClothingBackpackT2 + name: backpack T2 + description: You wear this on your back and put items into it. + components: + - type: Sprite + state: iconT2 + - type: Storage + grid: + - 0,1,1,3 + - 3,0,9,3 + - 11,1,12,3 + +- type: entity + parent: CP14ClothingBackpackT2 + id: CP14ClothingBackpackT3 + name: backpack T3 + description: You wear this on your back and put items into it. + components: + - type: Sprite + state: iconT3 + - type: Storage + grid: + - 0,0,8,1 + - 0,3,8,6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml new file mode 100644 index 0000000000..39e229a5e5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml @@ -0,0 +1,96 @@ +- type: entity + abstract: true + parent: CP14ClothingBackContainerBase + id: CP14ClothingExplorerBackpackBase + categories: [ ForkFiltered ] + +- type: entity + parent: CP14ClothingExplorerBackpackBase + id: CP14ClothingExplorerBackpackT0 + name: Small Explorer Backpack + description: You wear this on your back and put items into it. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/leather_satchel.rsi + state: icon + - type: Storage + grid: + - 0,0,1,0 + - 0,2,1,2 + - 3,0,4,0 + - 3,2,4,2 + - 6,0,6,2 + - 8,0,8,2 + - 10,0,11,0 + - 10,2,11,2 + - 13,0,14,0 + - 13,2,14,2 + +- type: entity + parent: CP14ClothingExplorerBackpackBase + id: CP14ClothingExplorerBackpackT1 + name: Explorer Backpack + description: You wear this on your back and put items into it. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/leather_satchel.rsi + state: icon + - type: Storage + grid: + - 0,0,0,1 + - 0,3,0,4 + - 2,0,4,1 + - 2,3,4,4 + - 5,0,7,1 + - 5,3,7,4 + - 9,0,10,1 + - 9,3,10,4 + - 12,0,13,1 + - 12,3,13,4 + +- type: entity + parent: CP14ClothingExplorerBackpackBase + id: CP14ClothingExplorerBackpackT2 + name: Big Explorer Backpack + description: You wear this on your back and put items into it. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/leather_satchel.rsi + state: icon + - type: Storage + grid: + - 0,0,0,1 + - 0,3,0,5 + - 2,0,4,1 + - 2,3,4,5 + - 5,0,6,1 + - 5,3,6,5 + - 8,0,9,1 + - 8,3,9,5 + - 11,0,12,1 + - 11,3,12,5 + + +- type: entity + parent: CP14ClothingExplorerBackpackBase + id: CP14ClothingExplorerBackpackT3 + name: Huge Explorer Backpack + description: You wear this on your back and put items into it. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/leather_satchel.rsi + state: icon + - type: Storage + grid: + - 0,0,0,2 + - 0,4,0,6 + - 2,0,4,2 + - 2,4,4,6 + - 5,0,7,2 + - 5,4,7,6 + - 9,0,1,2 + - 9,4,1,6 + - 13,0,14,2 + - 13,4,14,6 + - 16,0,16,2 + - 16,4,16,6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml new file mode 100644 index 0000000000..cb6e94d361 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml @@ -0,0 +1,86 @@ +- type: entity + abstract: true + parent: CP14ClothingBackContainerBase + id: CP14ClothingSatchelBase + categories: [ ForkFiltered ] + components: + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-flip-verb + foldVerbText: fold-flip-verb + - type: FoldableClothing + foldedEquippedPrefix: flipped + foldedHeldPrefix: flipped + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/leather_satchel.rsi + - type: Storage + grid: + - 0,0,1,3 + - 3,0,6,3 + - 8,0,9,3 + +- type: entity + parent: CP14ClothingSatchelBase + id: CP14ClothingSatchelT0 + name: satchel T0 + description: You wear this on your back and put items into it. + components: + - type: Sprite + state: iconT0 + - type: Storage + grid: + - 1,0,1,0 + - 0,1,1,2 + - 3,0,5,2 + - 7,0,7,0 + - 7,1,8,2 + +- type: entity + parent: CP14ClothingSatchelT0 + id: CP14ClothingSatchelT1 + name: satchel T1 + description: You wear this on your back and put items into it. + components: + - type: Sprite + state: iconT1 + - type: Storage + grid: + - 0,1,1,3 + - 3,0,3,3 + - 5,0,7,3 + - 9,0,9,3 + - 11,4,12,3 + +- type: entity + parent: CP14ClothingSatchelT1 + id: CP14ClothingSatchelT2 + name: satchel T2 + description: You wear this on your back and put items into it. + components: + - type: Sprite + state: iconT2 + - type: Storage + grid: + - 0,0,1,1 + - 0,3,1,4 + - 3,0,5,4 + - 7,0,9,4 + - 11,0,12,1 + - 11,3,12,4 + +- type: entity + parent: CP14ClothingSatchelT2 + id: CP14ClothingSatchelT3 + name: satchel T3 + description: You wear this on your back and put items into it. + components: + - type: Sprite + state: iconT3 + - type: Storage + grid: + - 0,0,1,1 + - 0,3,1,6 + - 3,0,5,6 + - 7,0,9,6 + - 11,0,12,1 + - 11,3,12,6 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml new file mode 100644 index 0000000000..0dc66fc074 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml @@ -0,0 +1,33 @@ +- type: entity + abstract: true + parent: + - Clothing + - ContentsExplosionResistanceBase + id: CP14ClothingBackContainerBase + categories: [ ForkFiltered ] + components: + - type: Item + size: Huge + - type: Clothing + equipDelay: 0.4 + unequipDelay: 0.2 + slots: + - back + quickEquip: false + breakOnMove: false + - type: Storage + grid: + - 0,0,6,3 + maxItemSize: Huge + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + - type: UseDelay + delay: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml deleted file mode 100644 index 7400e3476f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/satchels.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - abstract: true - parent: CP14ClothingBackpackBase - id: CP14ClothingSatchelBase - categories: [ ForkFiltered ] - components: - - type: Storage - grid: - - 0,0,1,3 - - 3,0,6,3 - - 8,0,9,3 - -- type: entity - parent: CP14ClothingSatchelBase - id: CP14ClothingSatchelLeather - name: leather satchel - description: You wear this on your back and put items into it. - components: - - type: Sprite - sprite: _CP14/Clothing/Back/Satchel/leather_satchel.rsi - state: icon - - type: Foldable - canFoldInsideContainer: true - unfoldVerbText: fold-flip-verb - foldVerbText: fold-flip-verb - - type: FoldableClothing - foldedEquippedPrefix: flipped - foldedHeldPrefix: flipped - diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 401e80e211..71c00295e8 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -637,18 +637,19 @@ id: CP14GeneralBack name: cp14-loadout-general-back loadouts: - - CP14ClothingBackpackLeather - - CP14ClothingSatchelLeather + - CP14ClothingBackpackT0 + - CP14ClothingSatchelT0 + - CP14ClothingExplorerBackpackT0 - type: loadout - id: CP14ClothingBackpackLeather + id: CP14ClothingBackpackT0 equipment: - back: CP14ClothingBackpackLeather + back: CP14ClothingBackpackT0 - type: loadout - id: CP14ClothingSatchelLeather + id: CP14ClothingSatchelT0 equipment: - back: CP14ClothingSatchelLeather + back: CP14ClothingSatchelT0 # Trinkets