diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index eea7e84348..a91bd27996 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -1,5 +1,6 @@ # General +cp14-loadout-general-outer = Outer Clothes cp14-loadout-general-cloak = Cloak cp14-loadout-general-eyes = Goggles cp14-loadout-general-gloves = Gloves @@ -52,6 +53,7 @@ cp14-loadout-merchant-shoes = Merchant's shoes # Guildmaster +cp14-loadout-guildmaster-outer = Guildmaster outer clothes cp14-loadout-guildmaster-cloak = Guildmaster cloak cp14-loadout-guildmaster-shirt = Guildmaster shirt cp14-loadout-guildmaster-pants = Guildmaster pants diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 70f305bb4e..9a356a675e 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -656,6 +656,24 @@ ent-CP14ClothingRingFlashLight = проводящее кольцо вспышк .desc = Стандартное манапроводящее кольцо, позволяющее вызвать яркую ослепляющую вспышку света. .suffix = Вспышка света +ent-CP14ClothingBeltBrown = коричневый пояс + .desc = Простой коричневый пояс. Он поможет рубашке не развеваться на ветру. + +ent-CP14ClothingOuterClothingGreenVest = зелёная жилетка + .desc = Стильный зеленый жилет с золотыми пуговицами. + +ent-CP14ClothingOuterClothingRedVest = красная жилетка + .desc = Стильный красный жилет с золотыми крапинками. + +ent-CP14ClothingOuterClothingBrownVest1 = коричневый жилет + .desc = Простой, приличный кожаный жилет. Довольно стильно. + +ent-CP14ClothingOuterClothingBrownVest2 = коричневый жилет с застежками + .desc = Тот же простой коричневый кожаный жилет, но с застежками. + +ent-CP14ClothingOuterClothingBrownVest3 = лёгкий кожаный жилет + .desc = Два кожаных лоскута, соединенных ремнем снизу. + ent-CP14ClothingShirtBase = рубашка .desc = Приятный на ощупь материал, удобная свободная форма рубашки. @@ -692,21 +710,6 @@ ent-CP14ClothingShirtCottonRed = холщовая красная рубашка ent-CP14ClothingShirtCottonWhite = холщовая белая рубашка .desc = { ent-CP14ClothingShirtBase.desc } -ent-CP14ClothingShirtCottonWhiteBelt = холщовая опоясанная белая рубашка - .desc = { ent-CP14ClothingShirtBase.desc } - -ent-CP14ClothingShirtCottonWhiteBrownVest = холщовая опоясанная бело-коричневая рубашка - .desc = { ent-CP14ClothingShirtBase.desc } - -ent-CP14ClothingShirtCottonWhiteBrownVest2 = { ent-CP14ClothingShirtCottonWhiteBrownVest } - .desc = { ent-CP14ClothingShirtCottonWhiteBrownVest.desc } - -ent-CP14ClothingShirtCottonWhiteBrownVest3 = { ent-CP14ClothingShirtCottonWhiteBrownVest } - .desc = { ent-CP14ClothingShirtCottonWhiteBrownVest.desc } - -ent-CP14ClothingShirtCottonWhiteCollar = холщовая белая рубашка с воротником - .desc = { ent-CP14ClothingShirtBase.desc } - ent-CP14ClothingShirtCottonYellow = холщовая желтая рубашка .desc = { ent-CP14ClothingShirtBase.desc } diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 0475f24f65..7d32157e9c 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -1,5 +1,6 @@ # General +cp14-loadout-general-outer = Верхняя одежда cp14-loadout-general-cloak = Накидка cp14-loadout-general-eyes = Очки cp14-loadout-general-gloves = Перчатки @@ -52,6 +53,7 @@ cp14-loadout-merchant-shoes = Ботинки торговца # Guildmaster +cp14-loadout-guildmaster-outer = Верхняя одежда гильдмастера cp14-loadout-guildmaster-cloak = Накидка гильдмастера cp14-loadout-guildmaster-shirt = Рубашка гильдмастера cp14-loadout-guildmaster-pants = Штаны гильдмастера diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml index 8fb8e2e27d..c3ed555fcb 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml @@ -105,7 +105,7 @@ contents: - id: CP14ClothingCloakGuildmasterCape prob: 1 - - id: CP14ClothingShirtGuildmasterVest - prob: 0.6 - - id: CP14ClothingShirtGuildmasterVest2 + - id: CP14ClothingShirtCottonWhite + prob: 1 + - id: CP14ClothingOuterClothingGreenVest prob: 0.6 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml new file mode 100644 index 0000000000..5f38f8120d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/brown.yml @@ -0,0 +1,19 @@ +- type: entity + parent: ClothingBeltBase + id: CP14ClothingBeltBrown + name: brown belt + description: A simple brown belt. It will help the shirt not to flutter in the wind. + categories: [ ForkFiltered ] + components: + - type: Sprite + sprite: _CP14/Clothing/Belt/brown.rsi + state: icon + - type: Clothing + slots: + - belt + equipSound: + path: /Audio/Effects/rustle1.ogg + quickEquip: false + breakOnMove: false + equipDelay: 0.45 + unequipDelay: 0.45 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml new file mode 100644 index 0000000000..650f73f59d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/general.yml @@ -0,0 +1,65 @@ +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterFoldableBase + id: CP14ClothingOuterClothingGreenVest + name: green vest + description: Stylish green vest with gold buttons. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/green.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/green.rsi + +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterFoldableBase + id: CP14ClothingOuterClothingRedVest + name: red vest + description: Stylish red vest with gold flecks. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/red.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/red.rsi + +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterFoldableBase + id: CP14ClothingOuterClothingBrownVest1 + name: brown vest + description: A simple, decent leather vest. It's kind of stylish. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown.rsi + +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingBrownVest2 + name: brown vest with clasps + description: The same plain brown leather vest, but with clasps. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi + +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingBrownVest3 + name: lightweight leather vest + description: Two flaps of leather connected by a belt from below. + components: + - type: Sprite + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi + - type: Clothing + sprite: _CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi + diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml index f14b540a84..16ed29837e 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml @@ -1,7 +1,7 @@ - type: entity parent: - ClothingSlotBase - - CP14ClothingOuterClothingBase + - CP14ClothingOuterFoldableBase id: CP14ClothingOuterClothingMerchantWaistCoat name: "merchant's waistcoat" description: Stylish waistcoat made of expensive leather. A special uniform for merchants that makes customers feel like beggars. @@ -9,14 +9,4 @@ - type: Sprite sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi - type: Clothing - sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi - -- type: entity - parent: CP14ClothingOuterClothingMerchantWaistCoat - id: CP14ClothingOuterClothingMerchantWaistCoatOpen - name: "open merchant's waistcoat" - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi \ No newline at end of file + sprite: _CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml index fd809b400e..8b3e10b4fe 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/base.yml @@ -10,4 +10,25 @@ slots: - outerClothing - type: Sprite - state: icon \ No newline at end of file + state: icon + +- type: entity + abstract: true + parent: [ CP14ClothingOuterClothingBase, BaseFoldable ] + id: CP14ClothingOuterFoldableBase + components: + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + unfoldVerbText: fold-zip-verb + foldVerbText: fold-unzip-verb + - type: FoldableClothing + foldedEquippedPrefix: open + foldedHeldPrefix: open + - type: Sprite + layers: + - state: icon + map: [ "unfoldedLayer" ] + - state: icon-open + map: ["foldedLayer"] + visible: false \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml index 880b45ad9d..8edf93eea4 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml @@ -99,54 +99,6 @@ - type: Clothing sprite: _CP14/Clothing/Shirt/Roles/General/white.rsi -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonWhiteBelt - name: cotton white belt shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_belt.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_belt.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonWhiteBrownVest - name: cotton white brown vest shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest.rsi - -- type: entity - parent: CP14ClothingShirtCottonWhiteBrownVest - id: CP14ClothingShirtCottonWhiteBrownVest2 - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest2.rsi - -- type: entity - parent: CP14ClothingShirtCottonWhiteBrownVest - id: CP14ClothingShirtCottonWhiteBrownVest3 - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_brown_vest3.rsi - -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtCottonWhiteCollar - name: cotton white collar shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/General/white_collar.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/General/white_collar.rsi - - type: entity parent: CP14ClothingShirtBase id: CP14ClothingShirtCottonYellow diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml deleted file mode 100644 index 81c2e9893c..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/guildmaster.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtGuildmasterVest - name: cotton white green vest shirt - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi - -- type: entity - parent: CP14ClothingShirtGuildmasterVest - id: CP14ClothingShirtGuildmasterVest2 - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 0064419f12..738398ba00 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -54,6 +54,38 @@ equipment: cloak: CP14ClothingCloakFurCoat +# OuterClothing + +- type: loadoutGroup + id: CP14GeneralOuterClothing + name: cp14-loadout-general-outer + minLimit: 0 + loadouts: + - CP14ClothingOuterClothingBrownVest1 + - CP14ClothingOuterClothingBrownVest2 + - CP14ClothingOuterClothingBrownVest3 + - CP14ClothingOuterClothingRedVest + +- type: loadout + id: CP14ClothingOuterClothingBrownVest1 + equipment: + cloak: CP14ClothingOuterClothingBrownVest1 + +- type: loadout + id: CP14ClothingOuterClothingBrownVest2 + equipment: + cloak: CP14ClothingOuterClothingBrownVest2 + +- type: loadout + id: CP14ClothingOuterClothingBrownVest3 + equipment: + cloak: CP14ClothingOuterClothingBrownVest3 + +- type: loadout + id: CP14ClothingOuterClothingRedVest + equipment: + cloak: CP14ClothingOuterClothingRedVest + # Eyes - type: loadoutGroup @@ -276,11 +308,6 @@ - CP14ClothingShirtCottonPurple - CP14ClothingShirtCottonRed - CP14ClothingShirtCottonWhite - - CP14ClothingShirtCottonWhiteBelt - - CP14ClothingShirtCottonWhiteBrownVest - - CP14ClothingShirtCottonWhiteBrownVest2 - - CP14ClothingShirtCottonWhiteBrownVest3 - - CP14ClothingShirtCottonWhiteCollar - CP14ClothingShirtCottonYellow - CP14ClothingShirtCottonYellowCollar @@ -329,31 +356,6 @@ equipment: shirt: CP14ClothingShirtCottonWhite -- type: loadout - id: CP14ClothingShirtCottonWhiteBelt - equipment: - shirt: CP14ClothingShirtCottonWhiteBelt - -- type: loadout - id: CP14ClothingShirtCottonWhiteBrownVest - equipment: - shirt: CP14ClothingShirtCottonWhiteBrownVest - -- type: loadout - id: CP14ClothingShirtCottonWhiteBrownVest2 - equipment: - shirt: CP14ClothingShirtCottonWhiteBrownVest2 - -- type: loadout - id: CP14ClothingShirtCottonWhiteBrownVest3 - equipment: - shirt: CP14ClothingShirtCottonWhiteBrownVest3 - -- type: loadout - id: CP14ClothingShirtCottonWhiteCollar - equipment: - shirt: CP14ClothingShirtCottonWhiteCollar - - type: loadout id: CP14ClothingShirtCottonYellow equipment: @@ -431,6 +433,7 @@ - CP14FluteInstrument - CP14LyraInstrument - CP14ClothingBeltQuiver + - CP14ClothingBeltBrown - type: loadout id: CP14ManaOperationGlove @@ -522,6 +525,12 @@ back: - CP14ClothingBeltQuiver +- type: loadout + id: CP14ClothingBeltBrown + storage: + back: + - CP14ClothingBeltBrown + # Keys - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml index 366dbe30d2..ac48c3bc94 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -14,24 +14,26 @@ equipment: cloak: CP14ClothingCloakGuildmasterCape +# OuterClothing + +- type: loadoutGroup + id: CP14GuildmasterOuterClothing + name: cp14-loadout-guildmaster-outer + loadouts: + - CP14ClothingOuterClothingGreenVest + +- type: loadout + id: CP14ClothingOuterClothingGreenVest + equipment: + cloak: CP14ClothingOuterClothingGreenVest + # Shirt - type: loadoutGroup id: CP14GuildmasterShirt name: cp14-loadout-guildmaster-shirt loadouts: - - CP14ClothingShirtGuildmasterVest - - CP14ClothingShirtGuildmasterVest2 - -- type: loadout - id: CP14ClothingShirtGuildmasterVest - equipment: - shirt: CP14ClothingShirtGuildmasterVest - -- type: loadout - id: CP14ClothingShirtGuildmasterVest2 - equipment: - shirt: CP14ClothingShirtGuildmasterVest2 + - CP14ClothingShirtCottonWhite # Pants diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml index 693d70c591..2c1b521921 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml @@ -21,18 +21,12 @@ minLimit: 0 loadouts: - CP14ClothingOuterClothingMerchantWaistCoat - - CP14ClothingOuterClothingMerchantWaistCoatOpen - type: loadout id: CP14ClothingOuterClothingMerchantWaistCoat equipment: outerClothing: CP14ClothingOuterClothingMerchantWaistCoat -- type: loadout - id: CP14ClothingOuterClothingMerchantWaistCoatOpen - equipment: - outerClothing: CP14ClothingOuterClothingMerchantWaistCoatOpen - # Shirt - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 2c10afde7a..b8818a9cd7 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -3,6 +3,7 @@ groups: - CP14GeneralSpells - CP14GeneralHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GeneralMask - CP14GeneralCloak @@ -19,6 +20,7 @@ groups: - CP14GeneralSpells - CP14GeneralHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GeneralGloves - CP14GeneralShirt @@ -34,6 +36,7 @@ groups: - CP14GeneralSpells - CP14AlchemistHead # + - CP14GeneralOuterClothing - CP14AlchemistEyes # - CP14AlchemistCloak # - CP14GeneralGloves @@ -48,6 +51,7 @@ groups: - CP14GeneralSpells - CP14GeneralHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GeneralCloak - CP14GeneralGloves @@ -62,6 +66,7 @@ groups: - CP14GeneralSpells - CP14GeneralHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14BlacksmithCloak - CP14GeneralGloves @@ -76,6 +81,7 @@ groups: - CP14GeneralSpells - CP14GuardHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GuardCommanderCloak # - CP14GeneralGloves @@ -91,6 +97,7 @@ groups: - CP14GeneralSpells - CP14GuardHead + - CP14GeneralOuterClothing - CP14GeneralEyes - CP14GuardCloak # - CP14GeneralGloves @@ -106,9 +113,9 @@ groups: - CP14GeneralSpells - CP14CommandantHead + - CP14MerchantOuterClothing - CP14GeneralEyes - CP14CommandantCloak - - CP14MerchantOuterClothing - CP14MerchantShirt - CP14MerchantPants - CP14MerchantShoes @@ -119,6 +126,7 @@ id: JobCP14Guildmaster groups: - CP14GeneralSpells + - CP14GuildmasterOuterClothing - CP14GeneralEyes - CP14GuildmasterCloak - CP14GuildmasterShirt diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..37ca353eda Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..37ca353eda Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png new file mode 100644 index 0000000000..03fee9ce71 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json new file mode 100644 index 0000000000..447f75bbd6 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Belt/brown.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT1", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..61822391fc Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon-open.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon-open.png new file mode 100644 index 0000000000..2a8614d2b6 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon-open.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon.png new file mode 100644 index 0000000000..c7767e827e Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/meta.json similarity index 63% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/meta.json index 8155cf3eb1..1452f4b3d7 100644 --- a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "All right reserved", - "copyright": "Created by dinazewwr", + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord)", "size": { "x": 32, "y": 32 @@ -15,11 +15,10 @@ "directions": 4 }, { - "name": "inhand-left", - "directions": 4 + "name": "icon-open" }, { - "name": "inhand-right", + "name": "open-equipped-OUTERCLOTHING", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..78a5f134bd Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..36940739e7 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/icon.png new file mode 100644 index 0000000000..e7e81701fb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/meta.json similarity index 85% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/meta.json index be228e48bf..efcfaa38fc 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_2.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-SHIRT", + "name": "equipped-OUTERCLOTHING", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..59ba4362c2 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/icon.png new file mode 100644 index 0000000000..e3b0ccd860 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/meta.json similarity index 85% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/meta.json index be228e48bf..efcfaa38fc 100644 --- a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/brown_3.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-SHIRT", + "name": "equipped-OUTERCLOTHING", "directions": 4 } ] diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..7f27103421 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon-open.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon-open.png new file mode 100644 index 0000000000..0fdb4d8c2d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon-open.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon.png new file mode 100644 index 0000000000..abdf188379 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/meta.json new file mode 100644 index 0000000000..1452f4b3d7 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon-open" + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..62adb31bc1 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/green.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..2edffae735 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon-open.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon-open.png new file mode 100644 index 0000000000..aefe9ca781 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon-open.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon.png new file mode 100644 index 0000000000..3699d0028d Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/meta.json new file mode 100644 index 0000000000..1452f4b3d7 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by omsoyk (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon-open" + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/open-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..26d25e6e01 Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/General/red.rsi/open-equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/icon-open.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/icon-open.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json index 8155cf3eb1..168f3b112b 100644 --- a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json +++ b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json @@ -21,6 +21,21 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "icon-open" + }, + { + "name": "open-equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "open-inhand-left", + "directions": 4 + }, + { + "name": "open-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/open-inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/equipped-SHIRT.png index 10cd0c51e0..04f7514f13 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/equipped-SHIRT.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/equipped-SHIRT.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/icon.png index c7b1221f7b..f7961be79a 100644 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/icon.png and b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/white.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/equipped-SHIRT.png deleted file mode 100644 index 44b838f09a..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/equipped-SHIRT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/icon.png deleted file mode 100644 index 8ff47b9ae9..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/equipped-SHIRT.png deleted file mode 100644 index 469f875465..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/equipped-SHIRT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/icon.png deleted file mode 100644 index 2dcd39e2b9..0000000000 Binary files a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Mercenary/guildmaster_vest2.rsi/icon.png and /dev/null differ diff --git a/Resources/migration.yml b/Resources/migration.yml index ab91c270b8..65a3b10613 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -243,7 +243,7 @@ CP14Nail10: CP14Nail20 #2025-07-02 CP14SpawnPointBanker: CP14SpawnPointMerchant CP14ClothingOuterClothingBankerWaistCoat: CP14ClothingOuterClothingMerchantWaistCoat -CP14ClothingOuterClothingBankerWaistCoatOpen: CP14ClothingOuterClothingMerchantWaistCoatOpen +CP14ClothingOuterClothingBankerWaistCoatOpen: null CP14ClothingShirtBanker: CP14ClothingShirtMerchant CP14KeyRingBanker: CP14KeyRingMerchant CP14WoodenCabinetBanker: CP14WoodenCabinetMerchant