diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index d6b1f08e02..e82c28ba6f 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -15,6 +15,11 @@ cp14-loadout-general-spells = Spells cp14-loadout-skill-tree = Specialization cp14-loadout-general-keys = Keys +# Villagers +cp14-loadout-general-villager-back-cargo = Cargo backpacks +cp14-loadout-general-villager-back = Villager backpacks +cp14-loadout-general-villager-back-reinforced = Reinforced Backpacks + # Adventurer cp14-loadout-adventurers-equip = Adventurer weapons diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index 49f6c0bf22..f46d65b085 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -20,10 +20,12 @@ cp14-stack-iron-ore = iron ore cp14-stack-gold-ore = gold ore cp14-stack-mithril-ore = mithril ore +cp14-stack-salt-stone = salt stone + cp14-stack-wallpaper = rolls of wallpaper cp14-stack-glass-sheet = glass cp14-stack-ash-pile = pile of ashes -cp14-stack-group-wooden-planks-any = planks (any) \ No newline at end of file +cp14-stack-group-wooden-planks-any = planks (any) diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 1a94d25379..1c54034051 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -706,13 +706,41 @@ ent-CP14ImpactEffectWaterCreation = { ent-CP14BaseMagicImpact } ent-CP14SpellScrollWaterCreation = свиток заклинания создания воды .desc = { ent-CP14BaseSpellScrollWater.desc } -ent-CP14ClothingBackLeatherBackpack = кожаный рюкзак - .desc = Вы носите его на спине и кладете в него предметы. +ent-CP14RuneIceShards = { ent-CP14BaseMagicRune } + .desc = { ent-CP14BaseMagicRune.desc } -ent-CP14ClothingSatchelBase = None +ent-CP14ClothingBackBackpackT0 = мешок + .desc = Простой тканевый мешок с базовой вместимостью. Легкий, но не очень надежный. -ent-CP14ClothingBackLeatherSatchel = кожаная сумка - .desc = Вы носите его на спине и кладете в него предметы. +ent-CP14ClothingBackBackpackT1 = рюкзак + .desc = Стандартный рюкзак с приличным объемом хранения. Идеально подходит для повседневного использования. Немного стесняет движения, но защищает спину от ударов! + +ent-CP14ClothingBackBackpackT2 = расширенный рюкзак + .desc = Расширенный рюкзак увеличенной вместимости. Идеально подходит для длительных поездок. Стесняет движения, но защищает спину от ударов и сохраняет тепло! + +ent-CP14ClothingBackBackpackT3 = рюкзак путешественника + .desc = Большой, хорошо организованный рюкзак, предназначенный для длительных путешествий, с несколькими отделениями. Значительно стесняет движения, но защищает спину! + +ent-CP14ClothingBackBackpackReinforced = усиленный рюкзак + .desc = Прочный рюкзак с усиленными швами и материалами для дополнительной защиты ваших вещей. Стесняет движения, но защищает спину от ударов и сохраняет тепло! + +ent-CP14ClothingBackBackpackCargo = грузовая сумка + .desc = Утилитарная грузовая сумка, предназначенная для тяжелых условий эксплуатации. Удобна для переноски и хранения рабочих вещей. + +ent-CP14ClothingBackSatchelT0 = подсумок + .desc = Небольшой базовый подсумок для переноски предметов первой необходимости. Можно носить на поясе или через плечо. + +ent-CP14ClothingBackSatchelT1 = деревенская сумка + .desc = Кожаная сумка ручной работы с деревенским шармом. Обеспечивает скромное хранение с традиционным стилем. Можно носить на поясе или через плечо. Мешает спринту. + +ent-CP14ClothingBackSatchelT2 = курьерская сумка + .desc = Профессиональная сумка, предназначенная для курьеров, с организованными отделениями для быстрого доступа. Мешает спринту. + +ent-CP14ClothingBackSatchelT3 = вещмешок + .desc = Прочный вещмешок военного образца с большой вместимостью, предназначенный для длительного использования в полевых условиях. Мешает спринту. + +ent-CP14ClothingBackSatchelReinforced = усиленный вещмешок + .desc = Прочный вещмешок с усиленными швами и влагостойкими материалами для тяжелых условий. Мешает спринту. ent-CP14ClothingBeltPouchPotions = подсумок для зелий .desc = Мешочек для хранения зелий - здесь они точно не разобьются. diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 7e692c2624..afe42c9792 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -15,6 +15,11 @@ cp14-loadout-general-spells = Заклинания cp14-loadout-skill-tree = Специализация cp14-loadout-general-keys = Ключи +# Villagers +cp14-loadout-general-villager-back-cargo = Грузовые рюкзаки +cp14-loadout-general-villager-back = Рюкзаки жителей +cp14-loadout-general-villager-back-reinforced = Бронированные рюкзаки + # Adventurer cp14-loadout-adventurers-equip = Оружие авантюриста @@ -66,4 +71,4 @@ cp14-loadout-guildmaster-cloak = Накидка гильдмастера cp14-loadout-guildmaster-shirt = Рубашка гильдмастера cp14-loadout-guildmaster-pants = Штаны гильдмастера cp14-loadout-guildmaster-shoes = Ботинки гильдмастера -cp14-loadout-guildmaster-spells = Заклинания гильдмастера +cp14-loadout-guildmaster-spells = Заклинания гильдмастера \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index ebaa8cb974..7cd0d44a60 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -20,6 +20,8 @@ cp14-stack-iron-ore = железная руда cp14-stack-gold-ore = золотая руда cp14-stack-mithril-ore = мифриловая руда +cp14-stack-salt-stone = соляной камень + cp14-stack-wallpaper = рулон обоев cp14-stack-glass-sheet = стекло @@ -28,4 +30,4 @@ cp14-stack-ash-pile = кучка пепла -cp14-stack-group-wooden-planks-any = доски (любые) \ No newline at end of file +cp14-stack-group-wooden-planks-any = доски (любые) diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml index d676643b6d..2d88a07462 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks.yml @@ -1,43 +1,201 @@ -- type: entity - abstract: true - parent: - - Clothing - - ContentsExplosionResistanceBase - 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 + # TODO: recolor woth tags --- normal backpack T0 --- color backpack T0 + +# ======================== +# Base +# ======================== - type: entity - parent: CP14ClothingBackpackBase - id: CP14ClothingBackLeatherBackpack - name: leather backpack - description: You wear this on your back and put items into it. + abstract: true + parent: CP14ClothingBackContainerBase + id: CP14ClothingBackBackpackBase + categories: [ ForkFiltered ] + +# ======================== +# Tiers +# ======================== + +- type: entity + parent: CP14ClothingBackBackpackBase + id: CP14ClothingBackBackpackT0 + name: Sack + suffix: backpack T0 + description: A simple cloth sack with basic storage capacity. Lightweight but not very secure. + components: + - type: Clothing + slots: + - back + - belt + equipDelay: 0.8 + unequipDelay: 0.3 + - type: Sprite + sprite: _CP14/Clothing/Back/Backpacks/backpack_t0.rsi + - type: Storage + grid: # 15 + - 0,0,4,2 # 5*3=15 + - type: PhysicalComposition + materialComposition: + CP14Cloth: 120 # 100u CP14Cloth (10x10u) + 20u CP14String (4x5u) + CP14Iron: 2 # 2u CP14IronBuckle (1x2u) + # Cost: (120×0.3) + (2×2) = 36 + 4 = 40 copper coins + +- type: entity + parent: CP14ClothingBackBackpackT0 + id: CP14ClothingBackBackpackT1 + name: Backpack + suffix: backpack T1 + description: A standard backpack with decent storage space. Perfect for everyday use. It restricts movement a little, but it protects your back from blows! + components: + - type: Clothing + slots: + - back + - type: Sprite + sprite: _CP14/Clothing/Back/Backpacks/backpack_t1.rsi + - type: Storage + grid: # 24 + - 0,0,5,3 # 6*4=24 + - type: PhysicalComposition + materialComposition: + CP14Leather: 46 # 40u CP14Leather (8x5u) + 6u CP14LeatherStrap (2x3u) + CP14SaltStone: 46 # 40u (8x5u) + 6u (2x3u) + CP14Iron: 2 # 2u CP14IronBuckle (1x2u) + # Cost: (46×1.2) + (46×0.4) + (2×2) = 55.2 + 18.4 + 4 = 77.6 copper coins + - type: Armor + modifiers: + coefficients: + Blunt: 0.94 + Slash: 0.98 + Heat: 0.94 + Caustic: 0.94 + - type: ClothingSpeedModifier + walkModifier: 0.95 + sprintModifier: 0.95 + +- type: entity + parent: CP14ClothingBackBackpackT1 + id: CP14ClothingBackBackpackT2 + name: Extended Backpack + suffix: backpack T2 + description: An expanded backpack with increased capacity. Ideal for longer trips. It restricts movement, but it protects your back from blows and keeps you warm! components: - type: Sprite - sprite: _CP14/Clothing/Back/Backpacks/leather_backpack.rsi - state: icon + sprite: _CP14/Clothing/Back/Backpacks/backpack_t2.rsi + - type: Storage + grid: # 40 + - 0,1,1,3 # 2*3=6 + - 3,0,9,3 # 7*4=28 + - 11,1,12,3 #2*3=6 + - type: PhysicalComposition + materialComposition: + CP14Leather: 92 # 80u CP14Leather (8x10u) + 12u CP14LeatherStrap (4x3u) + CP14SaltStone: 92 # 80u (8x10u) + 12u (4x3u) + CP14Iron: 4 # 4u CP14IronBuckle (2x2u) + # Cost: (92×1.2) + (92×0.4) + (4×2) = 110.4 + 36.8 + 8 = 155.2 copper coins + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.94 + Heat: 0.90 + Caustic: 0.90 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + +- type: entity + parent: CP14ClothingBackBackpackT2 + id: CP14ClothingBackBackpackT3 + name: Traveler Backpack + suffix: backpack T3 + description: A large, well-organized backpack designed for extensive traveling with multiple compartments. It greatly restricts movement, but it protects your back! + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Backpacks/backpack_t3.rsi + - type: Storage + grid: # 66 + - 0,0,9,1 # 10*2=20 + - 2,2,7,2 # 6*1=6 + - 0,3,9,6 # 10*4=40 + - type: PhysicalComposition + materialComposition: + CP14Leather: 224 # 200u CP14Leather (8x25u) + 24u CP14RuggedStrap (4x6u) + CP14SaltStone: 180 # 160u (8x20u) + 20u (4x5u) + CP14Iron: 4 # 4u CP14IronBuckle (2x2u) + # Cost: (224×1.2) + (180×0.4) + (4×2) = 268.8 + 72 + 8 = 348.8 copper coins + - type: Armor + modifiers: + coefficients: + Blunt: 0.86 + Slash: 0.90 + Piercing: 0.98 + Heat: 0.86 + Caustic: 0.86 + - type: ClothingSpeedModifier + walkModifier: 0.70 + sprintModifier: 0.70 + - type: Clothing + equipDelay: 1.2 + unequipDelay: 0.8 + +# ======================== +# Special +# ======================== + +- type: entity + parent: CP14ClothingBackBackpackT2 + id: CP14ClothingBackBackpackReinforced + name: Reinforced Backpack + suffix: backpack T2 + description: A durable backpack with reinforced stitching and materials for extra protection of your belongings. It restricts movement, but it protects your back from blows and keeps you warm! + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi + - type: Storage + grid: # 35 + - 1,0,5,0 # 5*1=5 + - 0,1,6,2 # 7*2=14 + - 0,4,2,5 # 3*2=6 + - 1,6,2,6 # 2*1=2 + - 4,4,6,5 # 3*2=6 + - 4,6,5,6 # 2*1=2 + - type: PhysicalComposition + materialComposition: + CP14Leather: 110 # 80u CP14Leather (8x10u) + 30u CP14LeatherStrap (10x3u) + CP14SaltStone: 110 # 80u (8x10u) + 30u (10x3u) + CP14Iron: 8 # 8u CP14IronBuckle (4x2u) + # Cost: (110×1.2) + (110×0.4) + (8×2) = 132 + 44 + 16 = 192 copper coins + - type: Armor + modifiers: + coefficients: + Blunt: 0.86 + Slash: 0.92 + Piercing: 0.95 + Heat: 0.92 + - type: ClothingSpeedModifier + walkModifier: 0.80 + sprintModifier: 0.80 + +- type: entity + parent: CP14ClothingBackBackpackT2 + id: CP14ClothingBackBackpackCargo + name: Cargo Bag + suffix: backpack T2 + description: A utilitarian cargo bag designed for heavy-duty use. Convenient for carrying and storing work stuff. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi + - type: Storage + grid: # 38 + - 3,0,4,0 # 2*1=2 + - 2,1,5,2 # 4*2=8 + - 1,3,6,3 # 6*1=6 + - 0,4,7,5 # 8*2=16 + - 1,6,6,6 # 6*1=6 + - type: PhysicalComposition + materialComposition: + CP14Leather: 96 # 60u CP14Leather (6x10u) + 36u CP14LeatherStrap (12x3u) + CP14SaltStone: 96 # 60u (6x10u) + 36u (12x3u) + CP14Iron: 12 # 12u CP14IronBuckle (6x2u) + # Cost: (96×1.2) + (96×0.4) + (12×2) = 115.2 + 38.4 + 24 = 177.6 copper coins + - type: ClothingSpeedModifier + walkModifier: 0.83 + sprintModifier: 0.83 \ 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..710aa92c78 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_explorer.yml @@ -0,0 +1,128 @@ +# # TODO: Icons (as unloading and waist bags), Modifiers + +# # ======================== +# # Base +# # ======================== + +# - type: entity +# abstract: true +# parent: CP14ClothingBackContainerBase +# id: CP14ClothingBackExplorerBackpackBase +# categories: [ ForkFiltered ] + +# # ======================== +# # Tiers +# # ======================== + +# - type: entity +# parent: CP14ClothingBackExplorerBackpackBase +# id: CP14ClothingBackExplorerBackpackT0 +# name: Scout Pouch +# suffix: backpack T0 +# description: A lightweight pouch for scouts, allowing quick access to essential tools while maintaining mobility. +# components: +# - type: Sprite +# sprite: _CP14/Clothing/Back/Explorer_Backpack/explorer_t0.rsi +# state: icon +# - type: Storage +# grid: # 22 +# - 0,0,1,0 # 2x1=2 +# - 0,2,1,2 # 2x1=2 +# - 3,0,4,0 # 2x1=2 +# - 3,2,4,2 # 2x1=2 +# - 6,0,6,2 # 1x3=3 +# - 8,0,8,2 # 1x3=3 +# - 10,0,11,0 # 2x1=2 +# - 10,2,11,2 # 2x1=2 +# - 13,0,14,0 # 2x1=2 +# - 13,2,14,2 # 2x1=2 +# - type: PhysicalComposition +# materialComposition: +# CP14Cloth: 80 # 60u CP14Cloth (6x10u) + 20u CP14String (4x5u) +# CP14Iron: 16 # 16u CP14IronBuckle (8x2u) +# # Cost: (80×0.3) + (16×2) = 24 + 32 = 56 copper coins + +# - type: entity +# parent: CP14ClothingBackExplorerBackpackT0 +# id: CP14ClothingBackExplorerBackpackT1 +# name: Explorer Backpack +# suffix: Trail Bag +# description: A durable trail bag designed for field researchers, with compartments for samples and mapping equipment. +# components: +# - type: Sprite +# sprite: _CP14/Clothing/Back/Explorer_Backpack/explorer_t1.rsi +# state: icon +# - type: Storage +# grid: # 36 +# - 0,0,0,1 # 1x2=2 +# - 0,3,0,4 # 1x2=2 +# - 2,0,3,1 # 2x2=4 +# - 2,3,3,4 # 2x2=4 +# - 5,0,7,1 # 3x2=6 +# - 5,3,7,4 # 3x2=6 +# - type: PhysicalComposition +# materialComposition: +# CP14Leather: 36 # 30u CP14Leather (6x5u) + 6u CP14LeatherStrap (2x3u) +# CP14SaltStone: 36 # 30u (6x5u) + 6u (2x3u) +# CP14Iron: 20 # 20u CP14IronBuckle (10x2u) +# # Cost: (36×1.2) + (36×0.4) + (20×2) = 43.2 + 14.4 + 40 = 97.6 copper coins + +# - type: entity +# parent: CP14ClothingBackExplorerBackpackT1 +# id: CP14ClothingBackExplorerBackpackT2 +# name: Reliquary Backpack +# suffix: Explorer Pack +# description: An archaeologist's specialized pack with protective compartments for delicate artifacts and ancient relics. +# components: +# - type: Sprite +# sprite: _CP14/Clothing/Back/Explorer_Backpack/explorer_t2.rsi +# state: icon +# - type: Storage +# grid: # 50 +# - 0,0,0,1 # 1x2=2 +# - 0,3,0,5 # 1x3=3 +# - 2,0,3,1 # 2x2=4 +# - 2,3,3,5 # 2x3=6 +# - 5,0,6,1 # 2x2=4 +# - 5,3,6,5 # 2x3=6 +# - 8,0,9,1 # 2x2=4 +# - 8,3,9,5 # 2x3=6 +# - 11,0,12,1 # 2x2=4 +# - 11,3,12,5 # 2x3=6 +# - type: PhysicalComposition +# materialComposition: +# CP14Leather: 72 # 60u CP14Leather (6x10u) + 12u CP14LeatherStrap (4x3u) +# CP14SaltStone: 72 # 60u (6x10u) + 12u (4x3u) +# CP14Iron: 24 # 24u CP14IronBuckle (12x2u) +# # Cost: (72×1.2) + (72×0.4) + (24×2) = 86.4 + 28.8 + 48 = 163.2 copper coins + +# - type: entity +# parent: CP14ClothingBackExplorerBackpackT2 +# id: CP14ClothingBackExplorerBackpackT3 +# name: Artifact Hunter Rucksack +# suffix: backpack T3 +# description: A professional-grade expedition rucksack with reinforced compartments for valuable finds and extended fieldwork. +# components: +# - type: Sprite +# sprite: _CP14/Clothing/Back/Explorer_Backpack/explorer_t3.rsi +# state: icon +# - type: Storage +# grid: # 72 +# - 0,0,0,2 # 1x3=3 +# - 0,4,0,6 # 1x3=3 +# - 2,0,3,2 # 2x3=6 +# - 2,4,3,6 # 2x3=6 +# - 5,0,7,2 # 3x3=9 +# - 5,4,7,6 # 3x3=9 +# - 9,0,11,2 # 3x3=9 +# - 9,4,11,6 # 3x3=9 +# - 13,0,14,2 # 2x3=6 +# - 13,4,14,6 # 2x3=6 +# - 16,0,16,2 # 1x3=3 +# - 16,4,16,6 # 1x3=3 +# - type: PhysicalComposition +# materialComposition: +# CP14Leather: 174 # 150u CP14Leather (6x25u) + 24u CP14RuggedStrap (4x6u) +# CP14SaltStone: 140 # 120u (6x20u) + 20u (4x5u) +# CP14Iron: 24 # 24u CP14IronBuckle (12x2u) +# # Cost: (174×1.2) + (140×0.4) + (24×2) = 208.8 + 56 + 48 = 312.8 copper coins 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..f01673d9fe --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/backpacks_satchels.yml @@ -0,0 +1,189 @@ +# ======================== +# Base +# ======================== + +- type: entity + abstract: true + parent: CP14ClothingBackContainerBase + id: CP14ClothingBackSatchelBase + 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/satchel_t0.rsi + - type: Storage + grid: # 28 + - 0,0,1,3 # 2x4=8 + - 3,0,6,3 # 4x4=16 + - 8,0,9,3 # 2x4=4 + +# ======================== +# Tiers +# ======================== + +- type: entity + parent: CP14ClothingBackSatchelBase + id: CP14ClothingBackSatchelT0 + name: Pouch + suffix: backpack T0 + description: A small basic pouch for carrying essential items. Can be worn on the belt or over the shoulder. + components: + - type: Clothing + slots: + - back + - belt + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/satchel_t0.rsi + - type: Storage + grid: # 19 + - 1,0,1,0 # 1x1=1 + - 0,1,1,2 # 2x2=4 + - 3,0,5,2 # 3x3=9 + - 7,0,7,0 # 1x1=1 + - 7,1,8,2 # 2x2=4 + - type: PhysicalComposition + materialComposition: + CP14Cloth: 120 # 80u CP14Cloth (8x10u) + 40u CP14String (8x5u) + CP14Iron: 6 # 6u CP14IronBuckle (3x2u) + # Cost: (120×0.3) + (6×2) = 36 + 12 = 48 copper coins + +- type: entity + parent: CP14ClothingBackSatchelT0 + id: CP14ClothingBackSatchelT1 + name: Rustic Satchel + suffix: backpack T1 + description: A handcrafted leather satchel with rustic charm. Provides modest storage with traditional styling. Can be worn on the belt or over the shoulder. Interferes with sprinting. + components: + - type: Clothing + slots: + - back + - belt + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/satchel_t1.rsi + - type: Storage + grid: # 32 + - 0,1,1,3 # 2x3=6 + - 3,0,3,3 # 1x4=4 + - 5,0,7,3 # 3x4=12 + - 9,0,9,3 # 1x4=4 + - 11,1,12,3 # 2x3=6 + - type: PhysicalComposition + materialComposition: + CP14Leather: 60 # 30u CP14Leather (6x5u) + 30u CP14LeatherStrap (10x3u) + CP14SaltStone: 60 # 30u (6x5u) + 30u (10x3u) + CP14Iron: 8 # 8u CP14IronBuckle (4x2u) + # Cost: (60×1.2) + (60×0.4) + (8×2) = 72 + 24 + 16 = 112 copper coins + - type: ClothingSpeedModifier + sprintModifier: 0.97 + +- type: entity + parent: CP14ClothingBackSatchelT1 + id: CP14ClothingBackSatchelT2 + name: Courier Satchel + suffix: backpack T2 + description: A professional-grade satchel designed for messengers, with organized compartments for quick access. Interferes with sprinting. + components: + - type: Clothing + slots: + - back + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/satchel_t2.rsi + - type: Storage + grid: # 46 + - 0,0,1,1 # 2x2=4 + - 0,3,1,4 # 2x2=4 + - 3,0,5,4 # 3x5=15 + - 7,0,9,4 # 3x5=15 + - 11,0,12,1 # 2x2=4 + - 11,3,12,4 # 2x2=4 + - type: PhysicalComposition + materialComposition: + CP14Leather: 96 # 60u CP14Leather (6x10u) + 36u CP14LeatherStrap (12x3u) + CP14SaltStone: 96 # 60u (6x10u) + 36u (12x3u) + CP14Iron: 12 # 12u CP14IronBuckle (6x2u) + # Cost: (96×1.2) + (96×0.4) + (12×2) = 115.2 + 38.4 + 24 = 177.6 copper coins + - type: Armor + modifiers: + coefficients: + Heat: 0.98 + Caustic: 0.96 + - type: ClothingSpeedModifier + sprintModifier: 0.80 + +- type: entity + parent: CP14ClothingBackSatchelBase + id: CP14ClothingBackSatchelT3 + name: Haversack + suffix: backpack T3 + description: A sturdy military-style haversack with ample capacity, designed for extended field use. Interferes with sprinting. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/satchel_t3.rsi + - type: Storage + grid: # 66 + - 0,0,1,1 # 2x2=4 + - 0,3,1,6 # 2x4=8 + - 3,0,5,6 # 3x7=21 + - 7,0,9,6 # 3x7=21 + - 11,0,12,1 # 2x2=4 + - 11,3,12,6 # 2x4=8 + - type: PhysicalComposition + materialComposition: + CP14Leather: 222 # 150u CP14Leather (6x25u) + 72u CP14RuggedStrap (12x6u) + CP14SaltStone: 180 # 120u (6x20u) + 60u (12x5u) + CP14Iron: 12 # 12u CP14IronBuckle (6x2u) + # Cost: (222×1.2) + (180×0.4) + (12×2) = 266.4 + 72 + 24 = 362.4 copper coins + - type: Armor + modifiers: + coefficients: + Blunt: 0.96 + Slash: 0.96 + Heat: 0.94 + Caustic: 0.90 + - type: ClothingSpeedModifier + sprintModifier: 0.75 + +# ======================== +# Special +# ======================== + +- type: entity + parent: CP14ClothingBackSatchelT2 + id: CP14ClothingBackSatchelReinforced + name: Reinforced Satchel + suffix: backpack T2 + description: A heavy-duty satchel with reinforced seams and weather-resistant materials for tough conditions. Interferes with sprinting. + components: + - type: Sprite + sprite: _CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi + - type: Storage + grid: # 36 + - 1,0,3,0 # 3x1=3 + - 0,1,3,1 # 4x1=4 + - 0,3,3,4 # 4x2=8 + - 1,5,3,5 # 3x1=3 + - 5,0,7,0 # 3x1=3 + - 5,1,8,1 # 4x1=4 + - 5,3,8,4 # 4x2=8 + - 5,5,7,5 # 3x1=3 + - type: PhysicalComposition + materialComposition: + CP14Leather: 102 # 60u CP14Leather (6x10u) + 42u CP14LeatherStrap (14x3u) + CP14SaltStone: 102 # 60u (6x10u) + 42u (14x3u) + CP14Iron: 12 # 12u CP14IronBuckle (6x2u) + # Cost: (102×1.2) + (102×0.4) + (12×2) = 122.4 + 40.8 + 24 = 187.2 copper coins + - type: Armor + modifiers: + coefficients: + Blunt: 0.91 + Slash: 0.94 + Piercing: 0.97 + Heat: 0.98 + - type: ClothingSpeedModifier + sprintModifier: 0.77 \ No newline at end of file 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..fb7100419f --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Back/container_base.yml @@ -0,0 +1,38 @@ +- type: entity + abstract: true + parent: + - Clothing + - ContentsExplosionResistanceBase + id: CP14ClothingBackContainerBase + categories: [ ForkFiltered ] + components: + - type: Item + size: Huge + - type: Sprite + sprite: _CP14/Clothing/Back/Backpacks/backpack_t2.rsi + state: icon + - 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: StaticPrice + price: 30 # for crafting 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 0f0a502427..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: CP14ClothingBackLeatherSatchel - 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/Entities/Mobs/NPC/animals.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml index f5b907e3c8..a956ad8a6b 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/animals.yml @@ -69,6 +69,12 @@ spawned: - id: CP14FoodMeatRabbit amount: 4 + - id: CP14ThinAnimalHide + amount: 1 + maxAmount: 2 + - id: CP14Fur + amount: 1 + prob: 0.75 - type: Bloodstream bloodMaxVolume: 50 bloodReagent: CP14BloodAnimal @@ -155,6 +161,9 @@ - id: CP14FoodMeatPigLeg amount: 1 prob: 0.3 + - id: CP14AnimalHide + amount: 1 + maxAmount: 3 - type: Bloodstream bloodMaxVolume: 150 bloodReagent: CP14BloodAnimal @@ -202,6 +211,19 @@ spawned: - id: CP14FoodMeatBoar amount: 4 + - id: CP14AnimalHide + amount: 2 + maxAmount: 4 + - id: CP14ScrapAnimalHide + amount: 1 + maxAmount: 3 + prob: 0.5 + - id: CP14RuggedAnimalHide + amount: 1 + prob: 0.1 + - id: CP14CheapFur + amount: 1 + prob: 0.25 - type: Reproductive partnerWhitelist: tags: @@ -293,6 +315,9 @@ spawned: - id: CP14FoodMeatFrogLeg amount: 2 + - id: CP14ScrapAnimalHide + amount: 1 + prob: 0.5 - type: MeleeWeapon angle: 0 animation: WeaponArcBite @@ -408,6 +433,14 @@ amount: 4 - id: CP14String # As long as there are no mechanics to shearing wool, the only way to get string. amount: 4 + maxAmount: 16 + - id: CP14ThinAnimalHide + amount: 2 + maxAmount: 5 + - id: CP14ScrapAnimalHide + amount: 1 + maxAmount: 5 + prob: 0.3 - type: Bloodstream bloodMaxVolume: 150 bloodReagent: CP14BloodAnimal diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml index bcc1c37971..f647c45d2a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/dinosaurs.yml @@ -94,6 +94,13 @@ spawned: - id: CP14FoodMeatDino amount: 4 + - id: CP14RuggedAnimalHide + amount: 1 + maxAmount: 2 + prob: 0.2 + - id: CP14AnimalHide + amount: 2 + maxAmount: 4 - type: Bloodstream bloodMaxVolume: 200 - type: SpamEmitSound @@ -166,6 +173,13 @@ spawned: - id: CP14FoodMeatHydra amount: 2 + - id: CP14AnimalHide + amount: 1 + prob: 0.5 + - id: CP14ScrapAnimalHide + amount: 1 + maxAmount: 3 + prob: 0.75 - type: Bloodstream bloodMaxVolume: 100 - type: SoundWhileAlive diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml index 24eefc9b40..422258a83d 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/mole.yml @@ -79,6 +79,19 @@ - id: CP14FoodMeatMonsterLeg amount: 1 prob: 0.6 + - id: CP14RuggedAnimalHide + amount: 1 + prob: 0.2 + - id: CP14AnimalHide + amount: 1 + maxAmount: 4 + - id: CP14ScrapAnimalHide + amount: 1 + maxAmount: 2 + prob: 0.5 + - id: CP14CheapFur + amount: 1 + prob: 0.25 - type: Bloodstream bloodMaxVolume: 200 bloodReagent: CP14BloodMonster diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml index b9a78f2c97..517d7e19c3 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spider.yml @@ -35,6 +35,7 @@ - id: CP14FoodMeatMonsterLeg #TODO amount: 1 prob: 0.6 + # TODO: Chitin drops - type: CombatMode - type: MeleeWeapon angle: 0 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml index 4e79f68aaf..094cbbe8db 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml @@ -107,6 +107,10 @@ - id: CP14ModularInlayQuartzWater amount: 1 prob: 0.1 + - id: CP14ScrapAnimalHide + amount: 1 + maxAmount: 3 + prob: 0.5 - type: entity id: CP14MobWatcherMagma @@ -138,3 +142,7 @@ - id: CP14ModularInlayQuartzFire amount: 1 prob: 0.1 + - id: CP14ScrapAnimalHide + amount: 1 + maxAmount: 3 + prob: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/hide.yml b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/hide.yml new file mode 100644 index 0000000000..1df8655e83 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/hide.yml @@ -0,0 +1,67 @@ +- type: entity + id: CP14HideBase + parent: BaseItem + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Ingredients/hide.rsi + +# ================ +# Hide Types +- type: entity + id: CP14ThinAnimalHide + parent: CP14HideBase + name: thin animal hide + description: Untreated thin animal hide. It seems you can push it with your finger! + components: + - type: Sprite + state: thin_hide + - type: PhysicalComposition + materialComposition: + CP14Leather: 10 # 5*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml) + +- type: entity + id: CP14AnimalHide + parent: CP14HideBase + name: animal hide + description: Untreated animal hide. It would make a great pouch. + components: + - type: Sprite + state: hide + - type: PhysicalComposition + materialComposition: + CP14Leather: 20 # 10*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml) + +- type: entity + id: CP14RuggedAnimalHide + parent: CP14HideBase + name: rugged hide + description: Durable animal hide. It would make great expensive boots or even protect against cuts. + components: + - type: Item + size: Normal + shape: + - 0,0,2,1 # 3x2 + - type: Sprite + state: rugged_hide + - type: PhysicalComposition + materialComposition: + CP14Leather: 50 # 25*2 ~~~ Gives 2 leather when crafted on a tanner table (LeatherWorking/tanner.yml) + +# Pieces of hide to assemble whole hide. +- type: entity + id: CP14ScrapAnimalHide + parent: CP14HideBase + name: scraps of hide + description: Scraps of skin, someone cut it off carelessly! + components: + - type: Item + size: Tiny + - type: Sprite + state: scrap_hide + - type: PhysicalComposition + materialComposition: + CP14Leather: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml new file mode 100644 index 0000000000..3f866e6bc9 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/ingredients.yml @@ -0,0 +1,24 @@ +- type: entity + id: CP14IngredientBase # An item intended for crafting + parent: BaseItem + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + size: Tiny + +# Buckle +- type: entity + id: CP14IronBuckle + parent: CP14IngredientBase + name: Iron Buckle + description: A sturdy metal buckle for fastening straps and belts. + components: + - type: Sprite + sprite: _CP14/Objects/Ingredients/buckle.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14Iron: 2 # 1/5 iron bar (10u) + - type: StaticPrice + price: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/leather.yml b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/leather.yml new file mode 100644 index 0000000000..5dfcb83ccc --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Ingredients/leather.yml @@ -0,0 +1,106 @@ +# T0 - Rawhide Leather [None] +# T1 - Thin Leather [By PhantomRU] +# T2 - Coarse Leather [By PhantomRU] +# T3 - Rugged Leather [By PhantomRU] +# T4 - Thick Leather [None] +# T5 - Hardened Leather [None] +# Rough Leather ? + +- type: entity + id: CP14LeatherBase + parent: BaseItem + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + size: Small + - type: Sprite + sprite: _CP14/Objects/Ingredients/leather.rsi + +# ================ +# Leather Types +- type: entity + id: CP14ThinLeather + parent: CP14LeatherBase + name: thin leather + description: Soft and flexible leather, perfect for lightweight items. + components: + - type: Sprite + sprite: _CP14/Objects/Ingredients/leather.rsi + state: thin_leather + - type: PhysicalComposition + materialComposition: + CP14Leather: 5 # x0.5 Leather from hide + CP14SaltStone: 5 # x0.5 Salt + +- type: entity + id: CP14Leather + parent: CP14LeatherBase + name: coarse leather + description: Standard quality leather for various crafts. + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Ingredients/leather.rsi + state: leather + - type: PhysicalComposition + materialComposition: + CP14Leather: 10 # x1 Leather from hide + CP14SaltStone: 10 # x1 Salt + +- type: entity + id: CP14RuggedLeather + parent: CP14LeatherBase + name: rugged leather + description: Thick and durable leather. + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Ingredients/leather.rsi + state: rugged_leather + - type: PhysicalComposition + materialComposition: + CP14Leather: 25 # x2.5 Leather from hide + CP14SaltStone: 20 # x2 Salt + +# ================ +# Straps +- type: entity + id: CP14LeatherStrap + parent: CP14LeatherBase + name: leather strap + description: A flexible strap made of leather, used in various crafts. + components: + - type: Item + size: Small + shape: + - 0,0,1,0 # 2x1 + - type: Sprite + sprite: _CP14/Objects/Ingredients/leather.rsi + state: strap + - type: PhysicalComposition + materialComposition: + CP14Leather: 3 # 2.5 ~~~ 1/4 leather (10u) + CP14SaltStone: 3 # 1/4 Salt (10u) + CP14Cloth: 3 # 2.5 ~~~ 1/2 CP14String (5u) + +- type: entity + id: CP14RuggedStrap + parent: CP14LeatherBase + name: reinforced strap + description: A sturdy strap reinforced with additional layers. + components: + - type: Item + size: Small + shape: + - 0,0,1,0 # 2x1 + - type: Sprite + sprite: _CP14/Objects/Ingredients/leather.rsi + state: rugged_strap + - type: PhysicalComposition + materialComposition: + CP14Leather: 6 # 6.25 or 1/4 rugged leather (25u) + CP14SaltStone: 5 # 1/4 Salt (20u) + CP14Cloth: 5 # 1x CP14String (5u) \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml index 3afc9f366f..77df4f3130 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml @@ -117,4 +117,49 @@ suffix: 10 components: - type: Stack - count: 10 \ No newline at end of file + count: 10 + +# Salt +- type: entity + id: CP14SaltStone1 + parent: BaseItem + name: Salt + description: A crystalline mineral used to season and preserve food. + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + - type: Appearance + - type: Sprite + sprite: _CP14/Objects/Materials/salt_stone.rsi + layers: + - state: salt1 + map: ["base"] + - type: Stack + stackType: CP14SaltStone + count: 1 + baseLayer: base + layerStates: + - salt1 + - salt2 + - salt3 + - type: Material + - type: PhysicalComposition + materialComposition: + CP14SaltStone: 10 + +- type: entity + id: CP14SaltStone5 + parent: CP14SaltStone1 + suffix: 5 + components: + - type: Stack + count: 5 + +- type: entity + id: CP14SaltStone10 + parent: CP14SaltStone1 + suffix: 10 + components: + - type: Stack + count: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml index 31644aed6a..da68df67fd 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml @@ -238,4 +238,4 @@ suffix: 10 components: - type: Stack - count: 10 + count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml index a68758c80a..ace46549d2 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml @@ -8,7 +8,7 @@ - type: Item size: Normal shape: - - 0,0,1,0 + - 0,0,1,2 # 2x3 - type: Sprite sprite: _CP14/Objects/Materials/wood.rsi layers: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/fur.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/fur.yml new file mode 100644 index 0000000000..e2720ecf66 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/fur.yml @@ -0,0 +1,56 @@ +- type: entity + id: CP14FurBase + parent: BaseItem + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + size: Small + - type: Sprite + sprite: _CP14/Objects/Misc/fur.rsi + +# ================ +# Fur Types +- type: entity + id: CP14CheapFur + parent: CP14FurBase + name: cheap fur + description: Thin, uneven fur that is only good for wiping your feet on. + components: + - type: Item + size: Small + - type: Sprite + sprite: _CP14/Objects/Misc/fur.rsi + state: cheap_fur + - type: StaticPrice + price: 15 + +- type: entity + id: CP14Fur + parent: CP14FurBase + name: fur + description: Ordinary fur, intended for everyday use and carpets. + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Misc/fur.rsi + state: fur + - type: StaticPrice + price: 40 + +- type: entity + id: CP14GoodFur + parent: CP14FurBase + name: soft fur + description: Good, pleasant fur, perfect for fur coats and insulation. + components: + - type: Item + size: Normal + shape: + - 0,0,1,2 # 2x3 + - type: Sprite + sprite: _CP14/Objects/Misc/fur.rsi + state: good_fur + - type: StaticPrice + price: 80 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 2ce9105ec8..43cdf833b0 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -112,6 +112,7 @@ - CP14BaseWorkbench - CP14BaseFlammable name: cooking table + suffix: Workbench description: A table to work with food. Time to cook! components: - type: Sprite @@ -133,6 +134,7 @@ - CP14BaseWorkbench - CP14BaseFlammable name: sewing table + suffix: Clothing Workbench description: A table with embroidery tools to create different clothing and materials. components: - type: Sprite @@ -148,3 +150,25 @@ recipeTags: - CP14RecipeSewing +- type: entity + id: CP14WorkbenchLeather + parent: + - CP14BaseWorkbench + - CP14BaseFlammable + name: tanner table + suffix: Leather Workbench + description: Table for leather processing and creation of leather goods. + components: + - type: Sprite + state: tanner_table + - type: Icon + state: tanner_table + - type: Construction + graph: CP14WorkbenchLeather + node: CP14WorkbenchLeather + - type: CP14Workbench + craftSound: + collection: CP14Sawing # TODO CP14Leather? + recipeTags: + - CP14RecipeLeatherWorking + diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 4f3e4117d8..5ec045ec1a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -672,18 +672,24 @@ id: CP14GeneralBack name: cp14-loadout-general-back loadouts: - - CP14ClothingBackLeatherBackpack - - CP14ClothingBackLeatherSatchel + - CP14ClothingBackBackpackT0 + - CP14ClothingBackSatchelT0 +# - CP14ClothingBackExplorerBackpackT0 - type: loadout - id: CP14ClothingBackLeatherBackpack + id: CP14ClothingBackBackpackT0 equipment: - back: CP14ClothingBackLeatherBackpack + back: CP14ClothingBackBackpackT0 - type: loadout - id: CP14ClothingBackLeatherSatchel + id: CP14ClothingBackSatchelT0 equipment: - back: CP14ClothingBackLeatherSatchel + back: CP14ClothingBackSatchelT0 + +# - type: loadout +# id: CP14ClothingBackExplorerBackpackT0 +# equipment: +# back: CP14ClothingBackExplorerBackpackT0 # Trinkets diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general_villagers.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general_villagers.yml new file mode 100644 index 0000000000..e9dcff0c92 --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general_villagers.yml @@ -0,0 +1,24 @@ +# Back + +- type: loadoutGroup + id: CP14GeneralVillagerBack + name: cp14-loadout-general-villager-back + loadouts: + - CP14ClothingBackBackpackT1 + - CP14ClothingBackSatchelT1 +# - CP14ClothingBackExplorerBackpackT1 + +- type: loadout + id: CP14ClothingBackBackpackT1 + equipment: + back: CP14ClothingBackBackpackT1 + +- type: loadout + id: CP14ClothingBackSatchelT1 + equipment: + back: CP14ClothingBackSatchelT1 + +# - type: loadout +# id: CP14ClothingBackExplorerBackpackT1 +# equipment: +# back: CP14ClothingBackExplorerBackpackT1 diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general_villagers_high.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general_villagers_high.yml new file mode 100644 index 0000000000..2c9eea5c23 --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general_villagers_high.yml @@ -0,0 +1,51 @@ +# Back + +- type: loadoutGroup + id: CP14GeneralVillagerBackCargo + name: cp14-loadout-general-villager-back-cargo + loadouts: + - CP14ClothingBackBackpackT2 + - CP14ClothingBackBackpackCargo + - CP14ClothingBackSatchelT2 +# - CP14ClothingBackExplorerBackpackT2 + +- type: loadout + id: CP14ClothingBackBackpackT2 + equipment: + back: CP14ClothingBackBackpackT2 + +- type: loadout + id: CP14ClothingBackBackpackCargo + equipment: + back: CP14ClothingBackBackpackCargo + +- type: loadout + id: CP14ClothingBackSatchelT2 + equipment: + back: CP14ClothingBackSatchelT2 + +# - type: loadout +# id: CP14ClothingBackExplorerBackpackT2 +# equipment: +# back: CP14ClothingBackExplorerBackpackT2 + + +- type: loadoutGroup + id: CP14GeneralVillagerBackReinforced + name: cp14-loadout-general-villager-back-reinforced + loadouts: + - CP14ClothingBackBackpackT2 + - CP14ClothingBackBackpackReinforced + - CP14ClothingBackSatchelT2 + - CP14ClothingBackSatchelReinforced +# - CP14ClothingBackExplorerBackpackT2 + +- type: loadout + id: CP14ClothingBackBackpackReinforced + equipment: + back: CP14ClothingBackBackpackReinforced + +- type: loadout + id: CP14ClothingBackSatchelReinforced + equipment: + back: CP14ClothingBackSatchelReinforced diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 96503e4c60..d7cff3d4cf 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -25,7 +25,7 @@ - CP14GeneralShirt - CP14GeneralPants - CP14GeneralShoes - - CP14GeneralBack + - CP14GeneralVillagerBack - CP14GeneralTrinkets - CP14GeneralKeys @@ -41,7 +41,7 @@ - CP14AlchemistBelt # - CP14GeneralPants - CP14GeneralShoes - - CP14GeneralBack + - CP14GeneralVillagerBack - CP14GeneralTrinkets - type: roleLoadout @@ -55,7 +55,7 @@ - CP14GeneralShirt - CP14GeneralPants - CP14GeneralShoes - - CP14GeneralBack + - CP14GeneralVillagerBack - CP14GeneralTrinkets - type: roleLoadout @@ -69,7 +69,7 @@ - CP14GeneralShirt - CP14GeneralPants - CP14GeneralShoes - - CP14GeneralBack + - CP14GeneralVillagerBackCargo - CP14GeneralTrinkets - type: roleLoadout @@ -83,7 +83,7 @@ - CP14GuardShirt - CP14GuardPants - CP14GeneralShoes - - CP14GeneralBack + - CP14GeneralVillagerBackReinforced - CP14GeneralTrinkets - CP14GuardEquip @@ -98,9 +98,10 @@ - CP14GuardShirt - CP14GuardPants - CP14GeneralShoes + - CP14GeneralVillagerBackReinforced - CP14GeneralBack - CP14GeneralTrinkets - - CP14GuardEquip + - CP14GuardEquip - type: roleLoadout id: JobCP14Guard @@ -113,7 +114,7 @@ - CP14GuardShirt - CP14GuardPants - CP14GeneralShoes - - CP14GeneralBack + - CP14GeneralVillagerBackReinforced - CP14GeneralTrinkets - CP14GuardEquip @@ -125,7 +126,7 @@ - CP14MerchantShirt - CP14MerchantPants - CP14MerchantShoes - - CP14GeneralBack + - CP14GeneralVillagerBackReinforced - CP14GeneralTrinkets - type: roleLoadout @@ -138,7 +139,7 @@ - CP14GuildmasterShirt - CP14GuildmasterPants - CP14GuildmasterShoes - - CP14GeneralBack + - CP14GeneralVillagerBackReinforced - CP14GeneralTrinkets - type: roleLoadout @@ -150,5 +151,5 @@ - CP14MerchantShirt - CP14MerchantPants - CP14MerchantShoes - - CP14GeneralBack + - CP14GeneralVillagerBackCargo - CP14GeneralTrinkets diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index 7f296203d2..94af6c0611 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -130,3 +130,21 @@ icon: { sprite: _CP14/Objects/Materials/ash.rsi, state: ash_1 } color: "#2d313c" price: 0 + +- type: material + id: CP14SaltStone + stackEntity: CP14SaltStone1 + name: cp14-material-salt + unit: cp14-materials-unit-pile + icon: { sprite: _CP14/Objects/Materials/salt_stone.rsi, state: salt1 } + color: "#85a6a8" + price: 0.4 + +- type: material + id: CP14Leather + #stackEntity: CP14Leather + name: cp14-material-leather + unit: materials-unit-roll + icon: { sprite: _CP14/Objects/Ingredients/leather.rsi, state: leather } + color: "#a78a63" + price: 1.2 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml index 517f8afe8a..d6a14c4441 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml @@ -191,3 +191,19 @@ doAfter: 2 - node: CP14WorkbenchSewing entity: CP14WorkbenchSewing + +- type: constructionGraph + id: CP14WorkbenchLeather + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WorkbenchLeather + steps: + - stackGroup: WoodenPlanks + amount: 3 + doAfter: 2 + - node: CP14WorkbenchLeather + entity: CP14WorkbenchLeather diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/workstations.yml b/Resources/Prototypes/_CP14/Recipes/Construction/workstations.yml index c7673e5b0d..33bf33761b 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/workstations.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/workstations.yml @@ -37,3 +37,15 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + id: CP14WorkbenchLeather + graph: CP14WorkbenchLeather + startNode: start + targetNode: CP14WorkbenchLeather + category: construction-category-machines + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index e92e8cf5f6..002b615242 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -490,3 +490,16 @@ stack: CP14IronBar count: 3 result: CP14CookingPot + +- type: CP14Recipe + id: CP14IronBuckleRecipe + tag: CP14RecipeAnvil + craftTime: 4 + requiredSkills: + - IronMelting + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14IronBuckle + resultCount: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml new file mode 100644 index 0000000000..a213688f10 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks.yml @@ -0,0 +1,122 @@ +# Backpacks (heavy on leather) +- type: CP14Recipe + id: CP14ClothingBackBackpackT0 + tag: CP14RecipeLeatherWorking + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14Cloth + count: 10 # 100u CP14Cloth ~~~ CP14Cloth (10u) + - !type:ProtoIdResource + protoId: CP14String + count: 4 # 20u CP14Cloth ~~~ 1/2 CP14Cloth (5u) + - !type:ProtoIdResource + protoId: CP14IronBuckle + count: 1 # 2u CP14Iron ~~~ 1/5 iron bar (10u) + result: CP14ClothingBackBackpackT0 + +- type: CP14Recipe + id: CP14ClothingBackBackpackT1 + tag: CP14RecipeLeatherWorking + craftTime: 4 + requirements: + - !type:ProtoIdResource + protoId: CP14ThinLeather + count: 8 # 40u CP14Leather ~~~ 1/2 CP14Leather (5u) + - !type:ProtoIdResource + protoId: CP14LeatherStrap + count: 2 # 6u CP14Leather ~~~ 1/4 CP14Leather (2.5u) + - !type:ProtoIdResource + protoId: CP14IronBuckle + count: 1 # 2u CP14Iron ~~~ 1/5 iron bar (10u) + result: CP14ClothingBackBackpackT1 + +- type: CP14Recipe + id: CP14ClothingBackBackpackT2 + tag: CP14RecipeLeatherWorking + craftTime: 6 + requirements: + - !type:ProtoIdResource + protoId: CP14Leather + count: 8 # 80u CP14Leather ~~~ CP14Leather (10u) + - !type:ProtoIdResource + protoId: CP14LeatherStrap + count: 4 # 12u CP14Leather ~~~ 1/4 CP14Leather (2.5u) + - !type:ProtoIdResource + protoId: CP14IronBuckle + count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u) + result: CP14ClothingBackBackpackT2 + +- type: CP14Recipe + id: CP14ClothingBackBackpackT3 + tag: CP14RecipeLeatherWorking + craftTime: 10 + requirements: + - !type:ProtoIdResource + protoId: CP14RuggedLeather + count: 8 # 200u CP14Leather ~~~ CP14RuggedLeather (25u) + - !type:ProtoIdResource + protoId: CP14RuggedStrap + count: 4 # 24u CP14Leather ~~~ 1/4 CP14RuggedLeather (6.25u) + - !type:ProtoIdResource + protoId: CP14IronBuckle + count: 2 # 4u CP14Iron ~~~ 1/5 iron bar (10u) + result: CP14ClothingBackBackpackT3 + +# ====================================== +# Upgrade Recipes with Material Tracking +# ====================================== + +# Backpack T1 Upgrade (Precise Leather Calculation) +- type: CP14Recipe + id: CP14ClothingBackBackpackT1_Upgrade + tag: CP14RecipeLeatherWorking + craftTime: 6 + requirements: + - !type:ProtoIdResource + protoId: CP14ClothingBackBackpackT0 # Contains 100u CP14Cloth (10u) + count: 1 + - !type:ProtoIdResource + protoId: CP14Leather # +20u CP14Leather (2x10u) + count: 2 + - !type:ProtoIdResource + protoId: CP14LeatherStrap # 6u CP14Leather (2x3u) + count: 2 + result: CP14ClothingBackBackpackT1 + # Total Leather: 100u (cloth) + 20u + 6u = 36u vs original 40u+6u=46u + +# Backpack T2 Upgrade (Exact Leather Carryover) +- type: CP14Recipe + id: CP14ClothingBackBackpackT2_Upgrade + tag: CP14RecipeLeatherWorking + craftTime: 8 + requirements: + - !type:ProtoIdResource + protoId: CP14ClothingBackBackpackT1 # 40u (thin) + 6u (straps) + count: 1 + - !type:ProtoIdResource + protoId: CP14Leather # +40u CP14Leather (4x10u) + count: 4 + - !type:ProtoIdResource + protoId: CP14LeatherStrap # 12u CP14Leather (4x3u) + count: 4 + result: CP14ClothingBackBackpackT2 + # Total Leather: 40u+6u + 40u+12u = 98u vs original 80u+12u=92u + +# Backpack T3 Upgrade (Rugged Conversion) +- type: CP14Recipe + id: CP14ClothingBackBackpackT3_Upgrade + tag: CP14RecipeLeatherWorking + craftTime: 12 + requirements: + - !type:ProtoIdResource + protoId: CP14ClothingBackBackpackT2 # 80u + 12u = 92u (46u rugged equiv) + count: 1 + - !type:ProtoIdResource + protoId: CP14RuggedLeather # 100u CP14Leather (4x25u) + count: 4 + - !type:ProtoIdResource + protoId: CP14RuggedStrap # 24u CP14Leather (4x6u) + count: 4 + result: CP14ClothingBackBackpackT3 + # Total Leather: 92u + 100u + 24u = 216u (108u rugged equiv) vs original 200u+24u=224u \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml new file mode 100644 index 0000000000..0d1c4a4b9f --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_explorer.yml @@ -0,0 +1,133 @@ +# # Explorer Backpacks (heavy on buckles) +# - type: CP14Recipe +# id: CP14ClothingBackExplorerBackpackT0 +# tag: CP14RecipeLeatherWorking +# craftTime: 4 +# requirements: +# - !type:StackResource +# stack: CP14Cloth +# count: 6 # 60u CP14Cloth ~~~ CP14Cloth (10u) +# - !type:StackResource +# stack: CP14String +# count: 4 # 20u CP14Cloth ~~~ CP14Cloth (5u) +# - !type:ProtoIdResource +# protoId: CP14IronBuckle +# count: 8 # 16u CP14Iron ~~~ 1/5 iron bar (10u) +# result: CP14ClothingBackExplorerBackpackT0 + +# - type: CP14Recipe +# id: CP14ClothingBackExplorerBackpackT1 +# tag: CP14RecipeLeatherWorking +# craftTime: 4 +# requirements: +# - !type:ProtoIdResource +# protoId: CP14ThinLeather +# count: 6 # 30u CP14Leather ~~~ CP14ThinLeather (5u) +# - !type:ProtoIdResource +# protoId: CP14LeatherStrap +# count: 2 # 6u CP14Leather ~~~ CP14LeatherStrap (3u) +# - !type:ProtoIdResource +# protoId: CP14IronBuckle +# count: 10 # 20u CP14Iron ~~~ 1/5 iron bar (10u) +# result: CP14ClothingBackExplorerBackpackT1 + +# - type: CP14Recipe +# id: CP14ClothingBackExplorerBackpackT2 +# tag: CP14RecipeLeatherWorking +# craftTime: 6 +# requirements: +# - !type:ProtoIdResource +# protoId: CP14Leather +# count: 6 # 60u CP14Leather ~~~ CP14Leather (10u) +# - !type:ProtoIdResource +# protoId: CP14LeatherStrap +# count: 4 # 12u CP14Leather ~~~ CP14LeatherStrap (3u) +# - !type:ProtoIdResource +# protoId: CP14IronBuckle +# count: 12 # 24u CP14Iron ~~~ 1/5 iron bar (10u) +# result: CP14ClothingBackExplorerBackpackT2 + +# - type: CP14Recipe +# id: CP14ClothingBackExplorerBackpackT3 +# tag: CP14RecipeLeatherWorking +# craftTime: 10 +# requirements: +# - !type:ProtoIdResource +# protoId: CP14RuggedLeather +# count: 6 # 150u CP14Leather ~~~ CP14RuggedLeather (25u) +# - !type:ProtoIdResource +# protoId: CP14RuggedStrap +# count: 4 # 24u CP14Leather ~~~ CP14RuggedStrap (6u) +# - !type:ProtoIdResource +# protoId: CP14IronBuckle +# count: 12 # 24u CP14Iron ~~~ 1/5 iron bar (10u) +# result: CP14ClothingBackExplorerBackpackT3 + +# # ====================================== +# # Upgrade Recipes with Material Tracking +# # ====================================== + +# # Explorer T1 Upgrade (Leather Carryover) +# - type: CP14Recipe +# id: CP14ClothingBackExplorerBackpackT1_Upgrade +# tag: CP14RecipeLeatherWorking +# craftTime: 6 +# requirements: +# - !type:ProtoIdResource +# protoId: CP14ClothingBackExplorerBackpackT0 # 60u cloth + 20u string = 80u (8u leather equiv) +# count: 1 +# - !type:ProtoIdResource +# protoId: CP14ThinLeather # +15u CP14Leather (3x5u) +# count: 3 +# - !type:ProtoIdResource +# protoId: CP14IronBuckle # +16u CP14Iron (8x2u) +# count: 8 +# result: CP14ClothingBackExplorerBackpackT1 +# # Leather Logic: +# # T0 provides 3 leather, needs 6 total (3 new thin = 1.5 normal) +# # Net 4.5/6 leather (75%) since buckles are main cost +# # Total Leather: 8u + 15u = 23u vs original 30u + +# # Explorer T2 Upgrade (Leather Accumulation) +# - type: CP14Recipe +# id: CP14ClothingBackExplorerBackpackT2_Upgrade +# tag: CP14RecipeLeatherWorking +# craftTime: 8 +# requirements: +# - !type:ProtoIdResource +# protoId: CP14ClothingBackExplorerBackpackT1 # 30u + 6u = 36u +# count: 1 +# - !type:ProtoIdResource +# protoId: CP14Leather # +30u CP14Leather (3x10u) +# count: 3 +# - !type:ProtoIdResource +# protoId: CP14IronBuckle # +20u CP14Iron (10x2u) +# count: 10 +# result: CP14ClothingBackExplorerBackpackT2 +# # Progression: +# # T1 provides 4.5/6 leather (75%) +# # T2 adds 3/6 (50%) for total 7.5/12 (62.5%) +# # Buckles reduced by 16% to compensate +# # Total Leather: 36u + 30u = 66u vs original 60u + +# # Explorer T3 Upgrade (Rugged Premium) +# - type: CP14Recipe +# id: CP14ClothingBackExplorerBackpackT3_Upgrade +# tag: CP14RecipeLeatherWorking +# craftTime: 12 +# requirements: +# - !type:ProtoIdResource +# protoId: CP14ClothingBackExplorerBackpackT2 # 60u + 12u = 72u (36u rugged equiv) +# count: 1 +# - !type:ProtoIdResource +# protoId: CP14RuggedLeather # +75u CP14Leather (3x25u) +# count: 3 +# - !type:ProtoIdResource +# protoId: CP14IronBuckle # +20u CP14Iron (10x2u) +# count: 10 +# result: CP14ClothingBackExplorerBackpackT3 +# # Final Balance: +# # T2's 7.5 normal = 3.75 rugged +# # Add 3 new rugged = 6.75 total vs original 6 +# # Slight overpayment compensates for buckle savings +# # Total Leather: 72u + 75u = 147u (73.5u rugged equiv) vs original 150u \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml new file mode 100644 index 0000000000..c1d61bfba1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/backpacks_satchels.yml @@ -0,0 +1,122 @@ +# Satchels (heavy on straps) +- type: CP14Recipe + id: CP14ClothingBackSatchelT0 + tag: CP14RecipeLeatherWorking + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14Cloth + count: 8 # 80u CP14Cloth ~~~ CP14Cloth (10u) + - !type:ProtoIdResource + protoId: CP14String + count: 8 # 40u CP14Cloth ~~~ CP14Cloth (5u) + - !type:ProtoIdResource + protoId: CP14IronBuckle + count: 3 # 6u CP14Iron ~~~ 1/5 iron bar (10u) + result: CP14ClothingBackSatchelT0 + +- type: CP14Recipe + id: CP14ClothingBackSatchelT1 + tag: CP14RecipeLeatherWorking + craftTime: 4 + requirements: + - !type:ProtoIdResource + protoId: CP14ThinLeather + count: 6 # 30u CP14Leather ~~~ CP14ThinLeather (5u) + - !type:ProtoIdResource + protoId: CP14LeatherStrap + count: 10 # 30u CP14Leather ~~~ CP14LeatherStrap (3u) + - !type:ProtoIdResource + protoId: CP14IronBuckle + count: 4 # 8u CP14Iron ~~~ 1/5 iron bar (10u) + result: CP14ClothingBackSatchelT1 + +- type: CP14Recipe + id: CP14ClothingBackSatchelT2 + tag: CP14RecipeLeatherWorking + craftTime: 6 + requirements: + - !type:ProtoIdResource + protoId: CP14Leather + count: 6 # 60u CP14Leather ~~~ CP14Leather (10u) + - !type:ProtoIdResource + protoId: CP14LeatherStrap + count: 12 # 36u CP14Leather ~~~ CP14LeatherStrap (3u) + - !type:ProtoIdResource + protoId: CP14IronBuckle + count: 6 # 12u CP14Iron ~~~ 1/5 iron bar (10u) + result: CP14ClothingBackSatchelT2 + +- type: CP14Recipe + id: CP14ClothingBackSatchelT3 + tag: CP14RecipeLeatherWorking + craftTime: 10 + requirements: + - !type:ProtoIdResource + protoId: CP14RuggedLeather + count: 6 # 150u CP14Leather ~~~ CP14RuggedLeather (25u) + - !type:ProtoIdResource + protoId: CP14RuggedStrap + count: 12 # 72u CP14Leather ~~~ CP14RuggedStrap (6u) + - !type:ProtoIdResource + protoId: CP14IronBuckle + count: 6 # 12u CP14Iron ~~~ 1/5 iron bar (10u) + result: CP14ClothingBackSatchelT3 + +# ====================================== +# Upgrade Recipes with Material Tracking +# ====================================== + +# Satchel T1 Upgrade (Leather Inheritance) +- type: CP14Recipe + id: CP14ClothingBackSatchelT1_Upgrade + tag: CP14RecipeLeatherWorking + craftTime: 6 + requirements: + - !type:ProtoIdResource + protoId: CP14ClothingBackSatchelT0 # 80u cloth + 40u string = 120u (12u leather equiv) + count: 1 + - !type:ProtoIdResource + protoId: CP14ThinLeather # +10u CP14Leather (2x5u) + count: 2 + - !type:ProtoIdResource + protoId: CP14LeatherStrap # +30u CP14Leather (10x3u) + count: 6 + result: CP14ClothingBackSatchelT1 + # Total Leather: 12u + 10u + 30u = 52u vs original 30u+30u=60u + +# Satchel T2 Upgrade (Leather Optimization) +- type: CP14Recipe + id: CP14ClothingBackSatchelT2_Upgrade + tag: CP14RecipeLeatherWorking + craftTime: 8 + requirements: + - !type:ProtoIdResource + protoId: CP14ClothingBackSatchelT1 # 30u + 30u = 60u + count: 1 + - !type:ProtoIdResource + protoId: CP14Leather # +20u CP14Leather (2x10u) + count: 2 + - !type:ProtoIdResource + protoId: CP14LeatherStrap # +18u CP14Leather (6x3u) + count: 6 + result: CP14ClothingBackSatchelT2 + # Total Leather: 60u + 20u + 18u = 98u vs original 60u+36u=96u + +# Satchel T3 Upgrade (Rugged Transition) +- type: CP14Recipe + id: CP14ClothingBackSatchelT3_Upgrade + tag: CP14RecipeLeatherWorking + craftTime: 12 + requirements: + - !type:ProtoIdResource + protoId: CP14ClothingBackSatchelT2 # 60u + 36u = 96u (48u rugged equiv) + count: 1 + - !type:ProtoIdResource + protoId: CP14RuggedLeather # +50u CP14Leather (2x25u) + count: 2 + - !type:ProtoIdResource + protoId: CP14RuggedStrap # +36u CP14Leather (6x6u) + count: 6 + result: CP14ClothingBackSatchelT3 + # Total Leather: 96u + 50u + 36u = 182u vs original 150u+72u=222u \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml new file mode 100644 index 0000000000..0b3b92aad6 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/LeatherWorking/tanner.yml @@ -0,0 +1,143 @@ +# ================ +# Hide +# ================ +# Crafting Recipes +# Leather Processing +- type: CP14Recipe + id: CP14ThinHideRecipe + tag: CP14RecipeLeatherWorking + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14ThinAnimalHide + count: 1 # 10u leather + - !type:StackResource + stack: CP14SaltStone + count: 1 # 10u salt + result: CP14ThinLeather + resultCount: 2 # 2x thin leather (5u leather + 5u salt each) + # Cost: (10×1.2) + (10×0.4) = 12 + 4 = 16 copper coins + +- type: CP14Recipe + id: CP14HideRecipe + tag: CP14RecipeLeatherWorking + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14AnimalHide + count: 1 # 20u leather + - !type:StackResource + stack: CP14SaltStone + count: 2 # 20u salt + result: CP14Leather + resultCount: 2 # 2x leather (10u leather + 10u salt each) + # Cost: (20×1.2) + (20×0.4) = 24 + 8 = 32 copper coins + +- type: CP14Recipe + id: CP14RuggedAnimalHideRecipe + tag: CP14RecipeLeatherWorking + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14RuggedAnimalHide + count: 1 # 50u leather + - !type:StackResource + stack: CP14SaltStone + count: 4 # 40u salt + result: CP14RuggedLeather + resultCount: 2 # 2x rugged leather (25u leather + 20u salt total, 12.5u + 10u each) + # Cost: (50×1.2) + (40×0.4) = 60 + 16 = 76 copper coins + +- type: CP14Recipe + id: CP14ScrapHideRecipe + tag: CP14RecipeLeatherWorking + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14ScrapAnimalHide + count: 3 # 3x scraps (15u total) + - !type:ProtoIdResource + protoId: CP14String + count: 3 # 15u cloth + result: CP14AnimalHide + resultCount: 1 # 1x hide (20u) = 24 copper coins + # Cost: (15×1.2) + (15×0.3) = 18 + 4.5 = 22.5 copper coins + +# ================ +# Leather Crafting +- type: CP14Recipe + id: CP14ThinToNormalLeatherRecipe + tag: CP14RecipeLeatherWorking + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14LeatherStrap + count: 2 # 6u leather + 6u salt + - !type:ProtoIdResource + protoId: CP14String + count: 3 # 15u cloth + result: CP14Leather + resultCount: 1 # 10u leather + 10u salt + # Cost: (6×1.2) + (6×0.4) + (15×0.3) = 7.2 + 2.4 + 4.5 = 14.1 copper coins + +# ================ +# Straps Crafting +- type: CP14Recipe + id: CP14ThinLeatherStrapRecipe + tag: CP14RecipeLeatherWorking + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14ThinLeather + count: 1 # 5u leather + 5u salt + - !type:ProtoIdResource + protoId: CP14String + count: 4 # 20u cloth + result: CP14LeatherStrap + resultCount: 3 # 3x straps (3u leather + 3u salt total, 1u + 1u each) + # Cost: (5×1.2) + (5×0.4) + (20×0.3) = 6 + 2 + 6 = 14 copper coins + +- type: CP14Recipe + id: CP14LeatherStrapRecipe + tag: CP14RecipeLeatherWorking + craftTime: 1 + requirements: + - !type:ProtoIdResource + protoId: CP14Leather + count: 1 # 10u leather + 10u salt + - !type:ProtoIdResource + protoId: CP14String + count: 2 # 10u cloth + result: CP14LeatherStrap + resultCount: 4 # 4x straps (3u leather + 3u salt total, 0.6u + 0.6u each) + # Cost: (10×1.2) + (10×0.4) + (10×0.3) = 12 + 4 + 3 = 19 copper coins + +- type: CP14Recipe + id: CP14StringedRuggedStrapRecipe + tag: CP14RecipeLeatherWorking + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14Leather + count: 1 # 10u leather + 10u salt + - !type:ProtoIdResource + protoId: CP14String + count: 8 # 40u cloth + result: CP14RuggedStrap + resultCount: 3 # 2x straps (6u leather + 5u salt total, 1.5u + 1.25u each) + # Cost: (10×1.2) + (10×0.4) + (40×0.3) = 12 + 4 + 12 = 28 copper coins + +- type: CP14Recipe + id: CP14RuggedStrapRecipe + tag: CP14RecipeLeatherWorking + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14RuggedLeather + count: 1 # 25u leather + 20u salt + - !type:ProtoIdResource + protoId: CP14String + count: 3 # 15u cloth + result: CP14RuggedStrap + resultCount: 4 # 4x straps (6u leather + 5u salt total, 1.5u + 1.25u each) + # Cost: (25×1.2) + (20×0.4) + (15×0.3) = 30 + 8 + 4.5 = 42.5 copper coins \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml index e2bd3f2a0b..d913bd5afb 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml @@ -12,7 +12,7 @@ - type: CP14Recipe id: CP14StringCotton tag: CP14RecipeSewing - craftTime: 2 + craftTime: 1 requirements: - !type:ProtoIdResource protoId: CP14Cotton @@ -51,7 +51,7 @@ stack: CP14Cloth count: 1 result: CP14String - resultCount: 2 + resultCount: 4 - type: CP14Recipe id: CP14ClothingShirtCottonBlue diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index 1091993af7..ea5706f7a5 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -116,3 +116,10 @@ icon: { sprite: "_CP14/Objects/Materials/ash.rsi", state: ash_1 } spawn: CP14Ash1 maxCount: 10 + +- type: stack + id: CP14SaltStone + name: cp14-stack-salt-stone + icon: { sprite: _CP14/Objects/Materials/salt_stone.rsi, state: salt1 } + spawn: CP14SaltStone1 + maxCount: 10 diff --git a/Resources/Prototypes/_CP14/Stacks/ores.yml b/Resources/Prototypes/_CP14/Stacks/ores.yml index a7a0da5386..23e96dc5b1 100644 --- a/Resources/Prototypes/_CP14/Stacks/ores.yml +++ b/Resources/Prototypes/_CP14/Stacks/ores.yml @@ -31,4 +31,4 @@ name: cp14-stack-coal-ore spawn: CP14OreCoal1 icon: { sprite: _CP14/Objects/Materials/coal_ore.rsi, state: ore3 } - maxCount: 10 \ No newline at end of file + maxCount: 10 diff --git a/Resources/Prototypes/_CP14/Tags/misc.yml b/Resources/Prototypes/_CP14/Tags/misc.yml index 55a4fcb8c6..cf6f114a77 100644 --- a/Resources/Prototypes/_CP14/Tags/misc.yml +++ b/Resources/Prototypes/_CP14/Tags/misc.yml @@ -52,6 +52,9 @@ - type: Tag id: CP14RecipeMeltingFurnace +- type: Tag + id: CP14RecipeLeatherWorking + - type: Tag id: CP14Rabbit diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml index f40d38d187..cbb4b40683 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml @@ -165,4 +165,43 @@ state: flem_torso service: !type:CP14BuyItemsService product: CP14FoodMeatFlemTorso - count: 1 \ No newline at end of file + count: 1 + + +# Hide + +- type: cp14TradingPosition + id: CP14ThinAnimalHide + faction: Butchers + reputationLevel: 1 + uiPosition: 7 + icon: + sprite: _CP14/Objects/Ingredients/hide.rsi + state: thin_hide + service: !type:CP14BuyItemsService + product: CP14ThinAnimalHide + count: 1 + +- type: cp14TradingPosition + id: CP14AnimalHide + faction: Butchers + reputationLevel: 2 + uiPosition: 7 + icon: + sprite: _CP14/Objects/Ingredients/hide.rsi + state: hide + service: !type:CP14BuyItemsService + product: CP14AnimalHide + count: 1 + +- type: cp14TradingPosition + id: CP14RuggedAnimalHide + faction: Butchers + reputationLevel: 3 + uiPosition: 7 + icon: + sprite: _CP14/Objects/Ingredients/hide.rsi + state: rugged_hide + service: !type:CP14BuyItemsService + product: CP14RuggedAnimalHide + count: 1 diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml index 4f5036c46b..5714566937 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml @@ -77,6 +77,17 @@ service: !type:CP14BuyItemsService product: CP14Lighter +- type: cp14TradingPosition + id: CP14SaltStone5 + faction: DwarfMining + reputationLevel: 1 + uiPosition: 1 + icon: + sprite: _CP14/Objects/Materials/salt_stone.rsi + state: salt1 + service: !type:CP14BuyItemsService + product: CP14SaltStone5 + # Rep 2 - type: cp14TradingPosition @@ -111,4 +122,4 @@ sprite: _CP14/Structures/Specific/Blacksmith/sharpening_stone.rsi state: base service: !type:CP14BuyItemsService - product: CP14BaseSharpeningStoneStructure \ No newline at end of file + product: CP14BaseSharpeningStoneStructure diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..9fc5909d79 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..e97207bb07 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BELT.png new file mode 100644 index 0000000000..24b9aabcad Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..d8ffb23bae Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/icon.png new file mode 100644 index 0000000000..a36d43c113 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/inhand-left.png new file mode 100644 index 0000000000..f339573f2a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/inhand-right.png new file mode 100644 index 0000000000..dac1e1a4e7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/meta.json new file mode 100644 index 0000000000..b3694ebeb1 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t0.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..ae3a4929a4 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..e0d70987e6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/icon.png new file mode 100644 index 0000000000..71a71e07db Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/inhand-left.png new file mode 100644 index 0000000000..03ea4caca1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/inhand-right.png new file mode 100644 index 0000000000..07abdab740 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/meta.json similarity index 76% rename from Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/meta.json index 764d75a44d..d80790f4b4 100644 --- a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t1.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by jaraten (Discord/Github)", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", "size": { "x": 32, "y": 32 @@ -18,10 +18,6 @@ "name": "equipped-BACKPACK-goblin", "directions": 4 }, - { - "name": "equipped-BACKPACK-carcat", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..ffac7df804 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..2b1b9a4f8e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/icon.png new file mode 100644 index 0000000000..17b4595a47 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/inhand-left.png new file mode 100644 index 0000000000..30e09376e6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/inhand-right.png new file mode 100644 index 0000000000..28a0dcdab9 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/meta.json new file mode 100644 index 0000000000..d80790f4b4 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..55d4053bd9 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..179a0b0174 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/icon.png new file mode 100644 index 0000000000..4cb7a324a7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/inhand-left.png new file mode 100644 index 0000000000..56d76159cb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/inhand-right.png new file mode 100644 index 0000000000..2e168480e6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/meta.json new file mode 100644 index 0000000000..d80790f4b4 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_cargo.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..cae0d20d41 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..7dc8ed7cae Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/icon.png new file mode 100644 index 0000000000..9704ac5243 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/inhand-left.png new file mode 100644 index 0000000000..65b8e31fc5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/inhand-right.png new file mode 100644 index 0000000000..8e30fe8f9b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/meta.json new file mode 100644 index 0000000000..d80790f4b4 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t2_reinforced.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..0927e05391 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..5ed1c55813 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/icon.png new file mode 100644 index 0000000000..823852d139 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/inhand-left.png new file mode 100644 index 0000000000..96748f1930 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/inhand-right.png new file mode 100644 index 0000000000..3fa2216d9e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/meta.json new file mode 100644 index 0000000000..d80790f4b4 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Backpacks/backpack_t3.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-carcat.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-carcat.png deleted file mode 100644 index 5d6604d2ce..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-carcat.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-goblin.png deleted file mode 100644 index 9b6302fc5a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK-goblin.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK.png deleted file mode 100644 index d22a5e46d5..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/icon.png deleted file mode 100644 index 01c9921565..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-left.png deleted file mode 100644 index d47ee3a7d5..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-right.png deleted file mode 100644 index 2e7c40d93f..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Backpacks/leather_backpack.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-carcat.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-carcat.png deleted file mode 100644 index f23c15fb68..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-carcat.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-goblin.png deleted file mode 100644 index 670db2682e..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK-goblin.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK.png deleted file mode 100644 index 905533424e..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-carcat.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-carcat.png deleted file mode 100644 index 1d23892196..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-carcat.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-goblin.png deleted file mode 100644 index c476e396f2..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK-goblin.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK.png deleted file mode 100644 index 6cb1e475ca..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/flipped-equipped-BACKPACK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/icon.png deleted file mode 100644 index bbec63fdeb..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-left.png deleted file mode 100644 index f905171fd0..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-right.png deleted file mode 100644 index 57aae1140a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..8f0036591d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..d5f763270c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BELT.png new file mode 100644 index 0000000000..bf72501002 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..31ee56ca6d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..7b6027b4f2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BACKPACK.png new file mode 100644 index 0000000000..fd16e99be1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BELT.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BELT.png new file mode 100644 index 0000000000..31ee56ca6d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BELT2.png new file mode 100644 index 0000000000..bf72501002 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-inhand-left.png new file mode 100644 index 0000000000..d9437bc041 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-inhand-right.png new file mode 100644 index 0000000000..b1610cc1b1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/icon.png new file mode 100644 index 0000000000..65aad87aa7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/inhand-left.png new file mode 100644 index 0000000000..d9437bc041 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/inhand-right.png new file mode 100644 index 0000000000..b1610cc1b1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/meta.json new file mode 100644 index 0000000000..2e6b0be7bb --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t0.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "flipped-equipped-BELT", + "directions": 4 + }, + { + "name": "flipped-equipped-BELT2", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "flipped-inhand-left", + "directions": 4 + }, + { + "name": "flipped-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..33534ab899 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..fa2d476ad1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BELT.png new file mode 100644 index 0000000000..65627a5798 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..fb1d1033f8 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..3a6e7dd7cc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BACKPACK.png new file mode 100644 index 0000000000..59896d09db Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BELT.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BELT.png new file mode 100644 index 0000000000..fb1d1033f8 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BELT2.png new file mode 100644 index 0000000000..65627a5798 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-inhand-left.png new file mode 100644 index 0000000000..7f43c1ee5b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-inhand-right.png new file mode 100644 index 0000000000..912be89679 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/icon.png new file mode 100644 index 0000000000..6a878176ca Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/inhand-left.png new file mode 100644 index 0000000000..7f43c1ee5b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/inhand-right.png new file mode 100644 index 0000000000..912be89679 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/meta.json new file mode 100644 index 0000000000..2e6b0be7bb --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t1.rsi/meta.json @@ -0,0 +1,62 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "flipped-equipped-BELT", + "directions": 4 + }, + { + "name": "flipped-equipped-BELT2", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "flipped-inhand-left", + "directions": 4 + }, + { + "name": "flipped-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..0bad81a1c3 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..2c951dda2a Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..2d545354e5 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-equipped-BACKPACK.png new file mode 100644 index 0000000000..8bfee9d62e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-inhand-left.png new file mode 100644 index 0000000000..b4e664c6a6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-inhand-right.png new file mode 100644 index 0000000000..7acd3572ab Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/icon.png new file mode 100644 index 0000000000..a12ca8504f Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/inhand-left.png new file mode 100644 index 0000000000..b4e664c6a6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/inhand-right.png new file mode 100644 index 0000000000..7acd3572ab Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/meta.json similarity index 80% rename from Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/meta.json index 6d5cf5101d..d2f4b84a0f 100644 --- a/Resources/Textures/_CP14/Clothing/Back/Satchel/leather_satchel.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by creame (Discord)", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", "size": { "x": 32, "y": 32 @@ -18,10 +18,6 @@ "name": "equipped-BACKPACK-goblin", "directions": 4 }, - { - "name": "equipped-BACKPACK-carcat", - "directions": 4 - }, { "name": "flipped-equipped-BACKPACK", "directions": 4 @@ -30,10 +26,6 @@ "name": "flipped-equipped-BACKPACK-goblin", "directions": 4 }, - { - "name": "flipped-equipped-BACKPACK-carcat", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 @@ -41,6 +33,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "flipped-inhand-left", + "directions": 4 + }, + { + "name": "flipped-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..b0f5bd5bf2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..48f80edc35 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..c62d53ed80 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-equipped-BACKPACK.png new file mode 100644 index 0000000000..8d411a74ec Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-inhand-left.png new file mode 100644 index 0000000000..c97fa6dc4b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-inhand-right.png new file mode 100644 index 0000000000..af3734d2ff Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/icon.png new file mode 100644 index 0000000000..0c2834db70 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/inhand-left.png new file mode 100644 index 0000000000..c97fa6dc4b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/inhand-right.png new file mode 100644 index 0000000000..af3734d2ff Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/meta.json new file mode 100644 index 0000000000..d2f4b84a0f --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t2_reinforced.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "flipped-inhand-left", + "directions": 4 + }, + { + "name": "flipped-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..2bda2e3af2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..1b2aaab144 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-equipped-BACKPACK-goblin.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-equipped-BACKPACK-goblin.png new file mode 100644 index 0000000000..a5440f4f96 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-equipped-BACKPACK-goblin.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-equipped-BACKPACK.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-equipped-BACKPACK.png new file mode 100644 index 0000000000..773175da40 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-equipped-BACKPACK.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-inhand-left.png new file mode 100644 index 0000000000..c97fa6dc4b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-inhand-right.png new file mode 100644 index 0000000000..af3734d2ff Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/flipped-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/icon.png new file mode 100644 index 0000000000..241547c56e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/inhand-left.png new file mode 100644 index 0000000000..e7c096c199 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/inhand-right.png new file mode 100644 index 0000000000..1d4bd4be6c Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/meta.json new file mode 100644 index 0000000000..d2f4b84a0f --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Back/Satchel/satchel_t3.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by Ell_Good (icon) and PhantomRU (equiped, recolor, inhand)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK", + "directions": 4 + }, + { + "name": "flipped-equipped-BACKPACK-goblin", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "flipped-inhand-left", + "directions": 4 + }, + { + "name": "flipped-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Ingredients/buckle.rsi/icon.png b/Resources/Textures/_CP14/Objects/Ingredients/buckle.rsi/icon.png new file mode 100644 index 0000000000..db3c7944af Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/buckle.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/buckle.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ingredients/buckle.rsi/meta.json new file mode 100644 index 0000000000..f39b1dc556 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Ingredients/buckle.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by PhantornRU (Github)", + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide.png new file mode 100644 index 0000000000..c75ccd35aa Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/hide.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/meta.json new file mode 100644 index 0000000000..76257a8f61 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by PhantornRU (Github)", + "states": [ + { + "name": "thin_hide" + }, + { + "name": "hide" + }, + { + "name": "rugged_hide" + }, + { + "name": "scrap_hide" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide.png new file mode 100644 index 0000000000..62682d0d3d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/rugged_hide.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/scrap_hide.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/scrap_hide.png new file mode 100644 index 0000000000..f879d639cd Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/scrap_hide.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide.png b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide.png new file mode 100644 index 0000000000..27613db552 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/hide.rsi/thin_hide.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/leather.png b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/leather.png new file mode 100644 index 0000000000..0b3f071c5b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/leather.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/meta.json new file mode 100644 index 0000000000..383ff9d4bd --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by PhantornRU (Github)", + "states": [ + { + "name": "thin_leather" + }, + { + "name": "leather" + }, + { + "name": "rugged_leather" + }, + { + "name": "strap" + }, + { + "name": "rugged_strap" + } + ] + } diff --git a/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/rugged_leather.png b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/rugged_leather.png new file mode 100644 index 0000000000..d2ceb1c3a0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/rugged_leather.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/rugged_strap.png b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/rugged_strap.png new file mode 100644 index 0000000000..f9446f3ebb Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/rugged_strap.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/strap.png b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/strap.png new file mode 100644 index 0000000000..e28b2140e6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/strap.png differ diff --git a/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/thin_leather.png b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/thin_leather.png new file mode 100644 index 0000000000..2dfeab6c68 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Ingredients/leather.rsi/thin_leather.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/meta.json new file mode 100644 index 0000000000..dbef8c2fb4 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by PhantomRU", + "states": [ + { + "name": "salt1" + }, + { + "name": "salt2" + }, + { + "name": "salt3" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt1.png b/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt1.png new file mode 100644 index 0000000000..58d5ab3114 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt1.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt2.png b/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt2.png new file mode 100644 index 0000000000..1e353a8f17 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt3.png b/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt3.png new file mode 100644 index 0000000000..f3a7b36919 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/salt_stone.rsi/salt3.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/fur.rsi/cheap_fur.png b/Resources/Textures/_CP14/Objects/Misc/fur.rsi/cheap_fur.png new file mode 100644 index 0000000000..600cea39aa Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/fur.rsi/cheap_fur.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/fur.rsi/fur.png b/Resources/Textures/_CP14/Objects/Misc/fur.rsi/fur.png new file mode 100644 index 0000000000..365ae5acfb Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/fur.rsi/fur.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/fur.rsi/good_fur.png b/Resources/Textures/_CP14/Objects/Misc/fur.rsi/good_fur.png new file mode 100644 index 0000000000..599c47bb2a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Misc/fur.rsi/good_fur.png differ diff --git a/Resources/Textures/_CP14/Objects/Misc/fur.rsi/meta.json b/Resources/Textures/_CP14/Objects/Misc/fur.rsi/meta.json new file mode 100644 index 0000000000..ad72b34c1f --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Misc/fur.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by PhantornRU (Github)", + "states": [ + { + "name": "cheap_fur" + }, + { + "name": "fur" + }, + { + "name": "good_fur" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json index 26e2b611df..d6a5cebacf 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by jaraten(discord), modified by vladimir.s. Cooking table by Max Gab, research_table by TheShuEd(github)", + "copyright": "Created by jaraten(discord), modified by vladimir.s. Cooking table by Max Gab, research_table by TheShuEd(github). tanner_table by PhantomRU(discord)", "size": { "x": 48, "y": 48 @@ -21,6 +21,9 @@ }, { "name": "research_table" + }, + { + "name": "tanner_table" } ] } diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/tanner_table.png b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/tanner_table.png new file mode 100644 index 0000000000..da1c810573 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/tanner_table.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 9048fb266b..45b6a543bb 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -379,8 +379,8 @@ CP14FoodPieMeat: null CP14FoodPieMeatRaw: null # 2025-07-20 -CP14ClothingBackpackLeather: CP14ClothingBackLeatherBackpack -CP14ClothingSatchelLeather: CP14ClothingBackLeatherSatchel +CP14ClothingBackpackLeather: CP14ClothingBackBackpackT1 +CP14ClothingSatchelLeather: CP14ClothingBackSatchelT1 CP14ClothingBlueCollarDress: CP14ClothingShirtBlueCollarDress CP14ClothingBlueOpenDress: CP14ClothingShirtBlueOpenDress CP14ClothingRedOpenDress: CP14ClothingShirtRedOpenDress @@ -424,6 +424,10 @@ CP14CandleBlackSmallInfinite: CP14CandleIgnited CP14CandleGreenSmallInfinite: CP14CandleIgnited CP14CandlePurpleSmallInfinite: CP14CandleIgnited +#2025-07-28 +CP14ClothingBackLeatherBackpack: CP14ClothingBackBackpackT1 +CP14ClothingBackLeatherSatchel: CP14ClothingBackSatchelT1 + #2025-08-01 CP14SpellScrollResurrection: null diff --git a/Tools/_CP14/LocalizationHelper/last_launch_result/result.json b/Tools/_CP14/LocalizationHelper/last_launch_result/result.json index 32d1f439d3..fcc3af32c4 100644 --- a/Tools/_CP14/LocalizationHelper/last_launch_result/result.json +++ b/Tools/_CP14/LocalizationHelper/last_launch_result/result.json @@ -1665,27 +1665,104 @@ "parent": "CP14RightFootHuman", "suffix": null }, - "CP14ClothingBackpackLeather": { - "id": "CP14ClothingBackpackLeather", - "name": "leather backpack", - "description": "You wear this on your back and put items into it.", - "parent": "CP14ClothingBackpackBase", - "suffix": null - }, - "CP14ClothingSatchelBase": { - "id": "CP14ClothingSatchelBase", + "CP14ClothingBackBackpackBase": { + "id": "CP14ClothingBackBackpackBase", "name": null, "description": null, - "parent": "CP14ClothingBackpackBase", + "parent": "CP14ClothingBackContainerBase", "suffix": null }, - "CP14ClothingSatchelLeather": { - "id": "CP14ClothingSatchelLeather", - "name": "leather satchel", - "description": "You wear this on your back and put items into it.", - "parent": "CP14ClothingSatchelBase", + "CP14ClothingBackBackpackT0": { + "id": "CP14ClothingBackBackpackT0", + "name": "Sack", + "description": "A simple cloth sack with basic storage capacity. Lightweight but not very secure.", + "parent": "CP14ClothingBackBackpackBase", + "suffix": "backpack T0" + }, + "CP14ClothingBackBackpackT1": { + "id": "CP14ClothingBackBackpackT1", + "name": "Backpack", + "description": "A standard backpack with decent storage space. Perfect for everyday use. It restricts movement a little, but it protects your back from blows!", + "parent": "CP14ClothingBackBackpackT0", + "suffix": "backpack T1" + }, + "CP14ClothingBackBackpackT2": { + "id": "CP14ClothingBackBackpackT2", + "name": "Extended Backpack", + "description": "An expanded backpack with increased capacity. Ideal for longer trips. It restricts movement, but it protects your back from blows and keeps you warm!", + "parent": "CP14ClothingBackBackpackT1", + "suffix": "backpack T2" + }, + "CP14ClothingBackBackpackT3": { + "id": "CP14ClothingBackBackpackT3", + "name": "Traveler Backpack", + "description": "A large, well-organized backpack designed for extensive traveling with multiple compartments. It greatly restricts movement, but it protects your back!", + "parent": "CP14ClothingBackBackpackT2", + "suffix": "backpack T3" + }, + "CP14ClothingBackBackpackReinforced": { + "id": "CP14ClothingBackBackpackReinforced", + "name": "Reinforced Backpack", + "description": "A durable backpack with reinforced stitching and materials for extra protection of your belongings. It restricts movement, but it protects your back from blows and keeps you warm!", + "parent": "CP14ClothingBackBackpackT2", + "suffix": "backpack T2" + }, + "CP14ClothingBackBackpackCargo": { + "id": "CP14ClothingBackBackpackCargo", + "name": "Cargo Bag", + "description": "A utilitarian cargo bag designed for heavy-duty use. Convenient for carrying and storing work stuff.", + "parent": "CP14ClothingBackBackpackT2", + "suffix": "backpack T2" + }, + + "CP14ClothingBackSatchelBase": { + "id": "CP14ClothingBackSatchelBase", + "name": null, + "description": null, + "parent": "CP14ClothingBackContainerBase", "suffix": null }, + "CP14ClothingBackSatchelT0": { + "id": "CP14ClothingBackSatchelT0", + "name": "Pouch", + "description": "A small basic pouch for carrying essential items. Can be worn on the belt or over the shoulder.", + "parent": "CP14ClothingBackSatchelBase", + "suffix": "backpack T0" + }, + "CP14ClothingBackSatchelT1": { + "id": "CP14ClothingBackSatchelT1", + "name": "Rustic Satchel", + "description": "A handcrafted leather satchel with rustic charm. Provides modest storage with traditional styling. Can be worn on the belt or over the shoulder. Interferes with sprinting.", + "parent": "CP14ClothingBackSatchelT0", + "suffix": "backpack T1" + }, + "CP14ClothingBackSatchelT2": { + "id": "CP14ClothingBackSatchelT2", + "name": "Courier Satchel", + "description": "A professional-grade satchel designed for messengers, with organized compartments for quick access. Interferes with sprinting.", + "parent": "CP14ClothingBackSatchelT1", + "suffix": "backpack T2" + }, + "CP14ClothingBackSatchelT3": { + "id": "CP14ClothingBackSatchelT3", + "name": "Haversack", + "description": "A sturdy military-style haversack with ample capacity, designed for extended field use. Interferes with sprinting.", + "parent": "CP14ClothingBackSatchelBase", + "suffix": "backpack T3" + }, + "CP14ClothingBackSatchelReinforced": { + "id": "CP14ClothingBackSatchelReinforced", + "name": "Reinforced Satchel", + "description": "A heavy-duty satchel with reinforced seams and weather-resistant materials for tough conditions. Interferes with sprinting.", + "parent": "CP14ClothingBackSatchelT2", + "suffix": "backpack T2" + }, + + + + + + "CP14ClothingBeltPouchPotions": { "id": "CP14ClothingBeltPouchPotions", "name": "potions pouch", @@ -10366,13 +10443,6 @@ "parent": null, "suffix": "Water" }, - "CP14ClothingBackpackBase": { - "id": "CP14ClothingBackpackBase", - "name": null, - "description": null, - "parent": null, - "suffix": null - }, "CP14ClothingCloakMaidArpon": { "id": "CP14ClothingCloakMaidArpon", "name": "maid's apron", @@ -11207,4 +11277,4 @@ "parent": "CP14WindowBase", "suffix": null } -} \ No newline at end of file +}