From 3fd780bc8eb2f81f1a5952928e3b367d3268e1d4 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 7 Feb 2025 15:28:31 +0300 Subject: [PATCH] Bank rename (#855) * job renamings * Job proto rename to merchant * loadout renaming * clothing rename * Update migration.yml * catalog * more folders rename * fix wood abuse * add selling ores * refolder * fix icons * herbals selling --- .../Locale/en-US/_CP14/job/department.ftl | 2 +- Resources/Locale/en-US/_CP14/job/job.ftl | 18 +-- .../Locale/en-US/_CP14/job/supervisors.ftl | 3 +- .../Locale/en-US/_CP14/loadouts/loadout.ftl | 15 ++- .../travelingStoreship/positions_sell.ftl | 41 +++++-- .../Locale/ru-RU/_CP14/job/department.ftl | 2 +- Resources/Locale/ru-RU/_CP14/job/job.ftl | 18 +-- .../Locale/ru-RU/_CP14/job/supervisors.ftl | 3 +- .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 13 +- .../travelingStoreship/positions_sell.ftl | 41 +++++-- .../Catalog/Cargo/Store/Sell/metalls.yml | 111 ++++++++++++++++++ .../_CP14/Catalog/Cargo/Store/Sell/misc.yml | 43 +++++++ .../_CP14/Catalog/Cargo/Store/sell.yml | 69 ----------- .../Prototypes/_CP14/Catalog/Cargo/crates.yml | 14 +-- .../_CP14/Catalog/Fills/closets.yml | 4 +- .../_CP14/Catalog/Fills/dresser.yml | 8 +- .../Cloak/Roles/{bank.yml => commandant.yml} | 4 +- .../Head/Roles/{bank.yml => merchant.yml} | 10 +- .../Clothing/OuterClothing/Roles/banker.yml | 22 ---- .../Clothing/OuterClothing/Roles/merchant.yml | 22 ++++ .../Pants/Roles/{bank.yml => merchant.yml} | 0 .../Entities/Clothing/Shirt/Roles/bank.yml | 10 -- .../Clothing/Shirt/Roles/merchant.yml | 10 ++ .../Spawners/Random/Loot/demiplane.yml | 3 - .../_CP14/Entities/Markers/Spawners/jobs.yml | 8 +- .../_CP14/Entities/Objects/Flora/wild.yml | 30 ++++- .../_CP14/Entities/Objects/Keys/keyrings.yml | 2 +- .../Prototypes/_CP14/Loadouts/Jobs/bank.yml | 63 ---------- .../_CP14/Loadouts/Jobs/merchant.yml | 63 ++++++++++ .../_CP14/Loadouts/role_loadouts.yml | 20 ++-- Resources/Prototypes/_CP14/Maps/arenas.yml | 4 +- .../_CP14/Roles/Jobs/Mercenary/adventurer.yml | 2 +- .../Jobs/{Bank => Traders}/commandant.yml | 0 .../{Bank/banker.yml => Traders/merchant.yml} | 16 +-- .../_CP14/Roles/Jobs/departments.yml | 2 +- .../_CP14/Roles/play_time_tracker.yml | 23 ++-- Resources/Prototypes/_CP14/StatusIcon/job.yml | 6 +- Resources/Prototypes/_CP14/tags.yml | 3 + .../commandant_cape.rsi/equipped-CLOAK.png | Bin .../commandant_cape.rsi/icon.png | Bin .../commandant_cape.rsi/meta.json | 0 .../bowler_golden_hat.rsi/equipped-HELMET.png | Bin .../bowler_golden_hat.rsi/icon.png | Bin .../bowler_golden_hat.rsi/meta.json | 0 .../bowler_hat.rsi/equipped-HELMET.png | Bin .../bowler_hat.rsi/icon.png | Bin .../bowler_hat.rsi/meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin .../vest_merchant.rsi}/icon.png | Bin .../vest_merchant.rsi}/inhand-left.png | Bin .../vest_merchant.rsi}/inhand-right.png | Bin .../vest_merchant.rsi}/meta.json | 0 .../equipped-OUTERCLOTHING.png | Bin .../vest_merchant_open.rsi}/icon.png | Bin .../vest_merchant_open.rsi}/inhand-left.png | Bin .../vest_merchant_open.rsi}/inhand-right.png | Bin .../vest_merchant_open.rsi}/meta.json | 0 .../merchant.rsi}/equipped-SHIRT.png | Bin .../merchant.rsi}/icon.png | Bin .../merchant.rsi}/inhand-left.png | Bin .../merchant.rsi}/inhand-right.png | Bin .../merchant.rsi}/meta.json | 0 .../{Banker.png => Merchant.png} | Bin .../Interface/Misc/job_icons.rsi/meta.json | 2 +- .../jobs.rsi/{banker.png => merchant.png} | Bin .../Textures/_CP14/Markers/jobs.rsi/meta.json | 2 +- .../Flora/Wild/store_position.rsi/meta.json | 14 +++ .../Flora/Wild/store_position.rsi/sell.png | Bin 0 -> 1267 bytes Resources/migration.yml | 11 +- 69 files changed, 472 insertions(+), 285 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml create mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml delete mode 100644 Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell.yml rename Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/{bank.yml => commandant.yml} (67%) rename Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/{bank.yml => merchant.yml} (56%) delete mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml rename Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/{bank.yml => merchant.yml} (100%) delete mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml delete mode 100644 Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml create mode 100644 Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml rename Resources/Prototypes/_CP14/Roles/Jobs/{Bank => Traders}/commandant.yml (100%) rename Resources/Prototypes/_CP14/Roles/Jobs/{Bank/banker.yml => Traders/merchant.yml} (60%) rename Resources/Textures/_CP14/Clothing/Cloak/Roles/{Bank => Commandant}/commandant_cape.rsi/equipped-CLOAK.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/Roles/{Bank => Commandant}/commandant_cape.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Cloak/Roles/{Bank => Commandant}/commandant_cape.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Head/Roles/{Bank => Merchant}/bowler_golden_hat.rsi/equipped-HELMET.png (100%) rename Resources/Textures/_CP14/Clothing/Head/Roles/{Bank => Merchant}/bowler_golden_hat.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Head/Roles/{Bank => Merchant}/bowler_golden_hat.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Head/Roles/{Bank => Merchant}/bowler_hat.rsi/equipped-HELMET.png (100%) rename Resources/Textures/_CP14/Clothing/Head/Roles/{Bank => Merchant}/bowler_hat.rsi/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Head/Roles/{Bank => Merchant}/bowler_hat.rsi/meta.json (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker.rsi => Merchant/vest_merchant.rsi}/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker.rsi => Merchant/vest_merchant.rsi}/icon.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker.rsi => Merchant/vest_merchant.rsi}/inhand-left.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker.rsi => Merchant/vest_merchant.rsi}/inhand-right.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker.rsi => Merchant/vest_merchant.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker_open.rsi => Merchant/vest_merchant_open.rsi}/equipped-OUTERCLOTHING.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker_open.rsi => Merchant/vest_merchant_open.rsi}/icon.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker_open.rsi => Merchant/vest_merchant_open.rsi}/inhand-left.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker_open.rsi => Merchant/vest_merchant_open.rsi}/inhand-right.png (100%) rename Resources/Textures/_CP14/Clothing/OuterClothing/Roles/{Bank/vest_banker_open.rsi => Merchant/vest_merchant_open.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{Bank/banker.rsi => Merchant/merchant.rsi}/equipped-SHIRT.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{Bank/banker.rsi => Merchant/merchant.rsi}/icon.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{Bank/banker.rsi => Merchant/merchant.rsi}/inhand-left.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{Bank/banker.rsi => Merchant/merchant.rsi}/inhand-right.png (100%) rename Resources/Textures/_CP14/Clothing/Shirt/Roles/{Bank/banker.rsi => Merchant/merchant.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/{Banker.png => Merchant.png} (100%) rename Resources/Textures/_CP14/Markers/jobs.rsi/{banker.png => merchant.png} (100%) create mode 100644 Resources/Textures/_CP14/Objects/Flora/Wild/store_position.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Flora/Wild/store_position.rsi/sell.png diff --git a/Resources/Locale/en-US/_CP14/job/department.ftl b/Resources/Locale/en-US/_CP14/job/department.ftl index fc56d2694a..bc604e6f8c 100644 --- a/Resources/Locale/en-US/_CP14/job/department.ftl +++ b/Resources/Locale/en-US/_CP14/job/department.ftl @@ -4,7 +4,7 @@ department-CP14Mercenary-desc = Free people trying to make money in this crazy w department-CP14Command = Command department-CP14Command-desc = Persons responsible for carrying out the task assigned from the empire, and managing everything that happens in the settlement. -department-CP14Bank = Bank +department-CP14Bank = Trade guild department-CP14Bank-desc = Persons closely connected with the economy and commerce working in a bank. department-CP14Guard = Guards diff --git a/Resources/Locale/en-US/_CP14/job/job.ftl b/Resources/Locale/en-US/_CP14/job/job.ftl index d5dd79c4c3..6c54b58ad2 100644 --- a/Resources/Locale/en-US/_CP14/job/job.ftl +++ b/Resources/Locale/en-US/_CP14/job/job.ftl @@ -6,25 +6,24 @@ cp14-job-desc-guard-commander = The most dangerous person in the neighborhood. M cp14-job-name-guard = Guard cp14-job-desc-guard = A fighting unit of the Empire, sworn to protect its people. Watch for safety, and defend others from possible dangers. -# Bank +# Trade guild cp14-job-name-commandant = Commandant cp14-job-desc-commandant = Control the economy of the settlement by trading with the Empire. Manage stocks and finances by directing resources to the laboring hands. -cp14-job-name-banker = Banker -cp14-job-desc-banker = Make deals, store entrusted valuables, issue interest-bearing deposits, and do any other economic work that will enrich your bank. +cp14-job-name-merchant = Merchant +cp14-job-desc-merchant = You have the ability to buy and sell almost anything in your hands! Use it to enrich yourself and your trade guild. # Mercenary cp14-job-name-guildmaster = Guildmaster -cp14-job-desc-guildmaster = Provide adventurers and artisans with work, and make sure they get enough profit for it. - -cp14-job-name-apprentice = Apprentice -cp14-job-desc-apprentice = A peaceful citizen of the empire, just beginning to learn the subtleties of various sciences. Choose a specialisation in equipment, and try to help others in their work, in exchange for a salary and invaluable experience. +cp14-job-desc-guildmaster = Protect the lives of your adventurers, provide them with everything they need, and make sure they do their job. cp14-job-name-adventurer = Adventurer cp14-job-desc-adventurer = A hunter for thrills, riches and fame, constantly risking his life. Fulfill the most dangerous orders, earning a living by mining resources or killing monsters. +# Artisans + cp14-job-name-alchemist = Alchemist cp14-job-desc-alchemist = A scientist of sorts, exploring the nature of substances. Create poisons and medicines from numerous natural plants and ingredients and earn money by selling them to people in need. @@ -32,4 +31,7 @@ cp14-job-name-innkeeper = Innkeeper [Early WIP] cp14-job-desc-innkeeper = Anywhere in Sylate there will be people looking to drink and relax. And you can capitalize on that desire! Find a way to provide people with good rest, food and drink. cp14-job-name-blacksmith = Blacksmith -cp14-job-desc-blacksmith = Create and improve equipment for everyone in need! You have the power of metal and fire in your hands, and only you know how to use them carefully to create masterpieces. \ No newline at end of file +cp14-job-desc-blacksmith = Create and improve equipment for everyone in need! You have the power of metal and fire in your hands, and only you know how to use them carefully to create masterpieces. + +cp14-job-name-apprentice = Apprentice +cp14-job-desc-apprentice = A peaceful citizen of the empire, just beginning to learn the subtleties of various sciences. Choose a specialisation in equipment, and try to help others in their work, in exchange for a salary and invaluable experience. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/job/supervisors.ftl b/Resources/Locale/en-US/_CP14/job/supervisors.ftl index a34fb0b90a..66759f5825 100644 --- a/Resources/Locale/en-US/_CP14/job/supervisors.ftl +++ b/Resources/Locale/en-US/_CP14/job/supervisors.ftl @@ -2,4 +2,5 @@ cp14-job-supervisors-empire = Empire and its authority cp14-job-supervisors-command = all authority figures cp14-job-supervisors-commandant = commandant -cp14-job-supervisors-guard-commander = guard commander \ No newline at end of file +cp14-job-supervisors-guard-commander = guard commander +cp14-job-supervisors-guildmaster = guildmaster \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index 367aa8e994..eea7e84348 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -12,6 +12,7 @@ cp14-loadout-general-back = Back cp14-loadout-general-trinkets = Trinkets cp14-loadout-general-spells = Spells cp14-loadout-general-keys = Keys + # Apprentice cp14-loadout-apprentice-bundle = Apprentice bundle @@ -21,6 +22,7 @@ cp14-loadout-apprentice-bundle = Apprentice bundle cp14-loadout-alchemist-head = Alchemist's head cp14-loadout-alchemist-cloak = Alchemist's cloak cp14-loadout-alchemist-eyes = Alchemical goggles + # Blacksmith cp14-loadout-blacksmith-cloak = Blacksmith's cloak @@ -37,15 +39,16 @@ cp14-loadout-guard-pants = Guard's pants cp14-loadout-guard-shirt = Guard's shirt cp14-loadout-guard-spells = Guard's spells -# Bank +# Trade guild -cp14-loadout-bank-head = Bank employee hat cp14-loadout-commandant-head = Commandant's hat cp14-loadout-commandant-cloak = Commandant's cloak -cp14-loadout-banker-outer = Banker's waistcoat -cp14-loadout-bank-shirt = Bank Employee shirt -cp14-loadout-bank-pants = Bank Employee pants -cp14-loadout-bank-shoes = Bank Employee shoes + +cp14-loadout-merchant-head = Merchant's hat +cp14-loadout-merchant-outer = Merchant's waistcoat +cp14-loadout-merchant-shirt = Merchant's shirt +cp14-loadout-merchant-pants = Merchant's pants +cp14-loadout-merchant-shoes = Merchant's shoes # Guildmaster diff --git a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell.ftl b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell.ftl index 8b5c27927c..a10b224289 100644 --- a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell.ftl +++ b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell.ftl @@ -1,16 +1,37 @@ cp14-store-sell-hint = To sell {$name}, load the desired goods onto the selling pallets. Our people in town will sort it out, pick up the goods and leave the money in the trade box on the ship. -cp14-store-sell-goldbar-name = 10 gold bars -cp14-store-sell-goldbar-desc = The mining and processing of gold ore is heavily sponsored by the empire, which uses gold as currency and material for jewelry. - -cp14-store-sell-ironbar-name = 10 iron bars -cp14-store-sell-ironbar-desc = Iron is an indispensable material in the manufacture of... almost anything that has any longevity in this world. And surely the Empire could use an extra shipment. - -cp14-store-sell-copperbar-name = 10 copper bars -cp14-store-sell-copperbar-desc = Although copper is used mainly as a coin material, it is also often enjoyed by blacksmiths in various alloys. - cp14-store-sell-wood-name = 30 wooden planks cp14-store-sell-wood-desc = Do you really think anyone needs planks from a faraway island? Well, you're right, we hope your settlement has something to keep you warm in the winter. cp14-store-sell-glass-name = 10 glass -cp14-store-sell-glass-desc = A fine material prized in the Empire for its versatility. The windows of palaces, the lenses of craftsmen, and even the mirrors of mages all require glass. Your labors are sure to find a use for it! \ No newline at end of file +cp14-store-sell-glass-desc = A fine material prized in the Empire for its versatility. The windows of palaces, the lenses of craftsmen, and even the mirrors of mages all require glass. Your labors are sure to find a use for it! + +cp14-store-sell-alchemical-herbals-name = 10 alchemical herbals +cp14-store-sell-alchemical-herbals-desc = TODO + +# Metalls + +cp14-store-sell-copperbar-name = 10 copper bars +cp14-store-sell-copperbar-desc = Although copper is used mainly as a coin material, it is also often enjoyed by blacksmiths in various alloys. + +cp14-store-sell-ironbar-name = 10 iron bars +cp14-store-sell-ironbar-desc = Iron is an indispensable material in the manufacture of... almost anything that has any longevity in this world. And surely the Empire could use an extra shipment. + +cp14-store-sell-goldbar-name = 10 gold bars +cp14-store-sell-goldbar-desc = The mining and processing of gold ore is heavily sponsored by the empire, which uses gold as currency and material for jewelry. + +cp14-store-sell-mithrilbar-name = 10 mithril bars +cp14-store-sell-mithrilbar-desc = TODO + + +cp14-store-sell-copperore-name = 10 copper ore +cp14-store-sell-copperore-desc = TODO + +cp14-store-sell-ironore-name = 10 iron ore +cp14-store-sell-ironore-desc = TODO + +cp14-store-sell-goldore-name = 10 gold ore +cp14-store-sell-goldore-desc = TODO + +cp14-store-sell-mithrilore-name = 10 mithril ore +cp14-store-sell-mithrilore-desc = TODO \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/job/department.ftl b/Resources/Locale/ru-RU/_CP14/job/department.ftl index 594030e7de..d8f03718fe 100644 --- a/Resources/Locale/ru-RU/_CP14/job/department.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/department.ftl @@ -4,7 +4,7 @@ department-CP14Mercenary-desc = Свободные люди, старающие department-CP14Command = Мэрия department-CP14Command-desc = Лица, ответственные за выполнение поставленной от империи задачи, и управляющие всем, что происходит в поселении. -department-CP14Bank = Банк +department-CP14Bank = Торговая гильдия department-CP14Bank-desc = Лица, тесно связанные с экономикой и торговлей, работающие в банке. department-CP14Guard = Стража diff --git a/Resources/Locale/ru-RU/_CP14/job/job.ftl b/Resources/Locale/ru-RU/_CP14/job/job.ftl index f17edc637d..28070a240d 100644 --- a/Resources/Locale/ru-RU/_CP14/job/job.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/job.ftl @@ -6,25 +6,24 @@ cp14-job-desc-guard-commander = Самая опасная личность в о cp14-job-name-guard = Стражник cp14-job-desc-guard = Боевая единица империи, поклявшаяся защищать ее народ. Следите за безопасностью, и обороняйте других от возможных опасностей. -# Bank +# Trade guild cp14-job-name-commandant = Комендант cp14-job-desc-commandant = Контролируйте экономику поселения, торгуя с Империей. Заведуйте запасами и финансами, направляя ресурсы рабочим рукам. -cp14-job-name-banker = Банкир -cp14-job-desc-banker = Заключайте сделки, храните доверенные ценности, выдавайте вклады под проценты и занимайтесь любой другой экономической работой, которая обогатит ваш банк. +cp14-job-name-merchant = Торговец +cp14-job-desc-merchant = В ваших руках возможность покупать и продавать почти что угодно! Используйте ее, чтобы обогатить себя и вашу торговую гильдию. # Mercenary cp14-job-name-guildmaster = Гильдмастер -cp14-job-desc-guildmaster = Обеспечивайте авантюристов и ремесленников работой, и следите чтобы они получали достаточно прибыли за это. - -cp14-job-name-apprentice = Подмастерье -cp14-job-desc-apprentice = Мирный житель империи, только начинающий постигать тонкости различных наук. Выберите специализацию в экипировке, и постарайтесь помочь другим в их работе, в обмен на зарплату и бесценный опыт. +cp14-job-desc-guildmaster = Оберегайте жизни ваших авантюристов, обеспечивайте их всем необходимым, и контролируйте чтобы они выполняли свою работу. cp14-job-name-adventurer = Авантюрист cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Выполняйте самые опасные заказы, зарабатывая на жизнь добычей ресурсов или убийством монстров. +# Artisans + cp14-job-name-alchemist = Алхимик cp14-job-desc-alchemist = В своем роде ученый, исследующий природу веществ. Создавайте яды и лекарства, из многочисленных природных растений и ингредиентов, и зарабатывайте деньги, продавая их нуждающимся. @@ -32,4 +31,7 @@ cp14-job-name-innkeeper = Трактирщик [Early WIP] cp14-job-desc-innkeeper = В любом месте Силейты найдутся желающие выпить и отдохнуть. И вы можете заработать на этом желании! Найдите способ обеспечить людей хорошим отдыхом, едой и выпивкой. cp14-job-name-blacksmith = Кузнец -cp14-job-desc-blacksmith = Создавайте и улучшайте экипировку для всех нуждающихся! В ваших руках мощь металла и огня, и только вы знаете как аккуратно использовать их, чтобы создавать шедевры. \ No newline at end of file +cp14-job-desc-blacksmith = Создавайте и улучшайте экипировку для всех нуждающихся! В ваших руках мощь металла и огня, и только вы знаете как аккуратно использовать их, чтобы создавать шедевры. + +cp14-job-name-apprentice = Подмастерье +cp14-job-desc-apprentice = Мирный житель империи, только начинающий постигать тонкости различных наук. Выберите специализацию в экипировке, и постарайтесь помочь другим в их работе, в обмен на зарплату и бесценный опыт. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl b/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl index 246abc8239..cfa72b5d8c 100644 --- a/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/supervisors.ftl @@ -2,4 +2,5 @@ cp14-job-supervisors-empire = Империи и ее представителя cp14-job-supervisors-command = всем представителям власти cp14-job-supervisors-commandant = коменданту -cp14-job-supervisors-guard-commander = командиру стражи \ No newline at end of file +cp14-job-supervisors-guard-commander = командиру стражи +cp14-job-supervisors-guildmaster = гильдмастеру \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 7289919e0a..0475f24f65 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -39,15 +39,16 @@ cp14-loadout-guard-pants = Штаны стражи cp14-loadout-guard-shirt = Рубашка стражи cp14-loadout-guard-spells = Заклинания стражи -# Bank +# Trade guild -cp14-loadout-bank-head = Шляпа работника банка cp14-loadout-commandant-head = Шляпа коменданта cp14-loadout-commandant-cloak = Накидка коменданта -cp14-loadout-banker-outer = Жилет банкира -cp14-loadout-bank-shirt = Рубашка работника банка -cp14-loadout-bank-pants = Штаны работника банка -cp14-loadout-bank-shoes = Ботинки работника банка + +cp14-loadout-merchant-head = Шляпа торговца +cp14-loadout-merchant-outer = Жилет торговца +cp14-loadout-merchant-shirt = Рубашка торговца +cp14-loadout-merchant-pants = Штаны торговца +cp14-loadout-merchant-shoes = Ботинки торговца # Guildmaster diff --git a/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_sell.ftl b/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_sell.ftl index 3a1cd17d11..547956d634 100644 --- a/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_sell.ftl +++ b/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_sell.ftl @@ -1,16 +1,37 @@ cp14-store-sell-hint = Чтобы продать {$name}, погрузите необходимый товар на продающие поддоны. Наши люди в городе разберутся что к чему, заберут товар и оставят деньги в торговом ящике на корабле. -cp14-store-sell-goldbar-name = 10 золотых слитков -cp14-store-sell-goldbar-desc = Добыча и обработка золотой руды активно спонсируется империей, использующей золото как валюту и материал для ювелирных украшений. - -cp14-store-sell-ironbar-name = 10 железных слитков -cp14-store-sell-ironbar-desc = Железо - незаменимый материал для производства... почти всего, что имеет хоть какую либо долговечность в этом мире. И конечно же, Империя не откажется от дополнительной партии. - -cp14-store-sell-copperbar-name = 10 медных слитков -cp14-store-sell-copperbar-desc = Хоть медь и используется в основном как материал для монет но и в разных сплавах он часто нравится кузнецам. - cp14-store-sell-wood-name = 30 деревянных досок cp14-store-sell-wood-desc = Вы правда думаете что хоть кому то нужны доски с далекого острова? Что ж вы правы, надеемся у вашего поселения есть чем греться зимой. cp14-store-sell-glass-name = 10 стекла -cp14-store-sell-glass-desc = Изящный материал, который ценится в Империи за свою универсальность. Окна дворцов, линзы мастеров и даже зеркала магов — все это требует стекла. Ваши труды точно найдут применение! \ No newline at end of file +cp14-store-sell-glass-desc = Изящный материал, который ценится в Империи за свою универсальность. Окна дворцов, линзы мастеров и даже зеркала магов — все это требует стекла. Ваши труды точно найдут применение! + +cp14-store-sell-alchemical-herbals-name = 10 алхимических растений +cp14-store-sell-alchemical-herbals-desc = TODO + +# Metalls + +cp14-store-sell-copperbar-name = 10 медных слитков +cp14-store-sell-copperbar-desc = Хоть медь и используется в основном как материал для монет но и в разных сплавах он часто нравится кузнецам. + +cp14-store-sell-ironbar-name = 10 железных слитков +cp14-store-sell-ironbar-desc = Железо - незаменимый материал для производства... почти всего, что имеет хоть какую либо долговечность в этом мире. И конечно же, Империя не откажется от дополнительной партии. + +cp14-store-sell-goldbar-name = 10 золотых слитков +cp14-store-sell-goldbar-desc = Добыча и обработка золотой руды активно спонсируется империей, использующей золото как валюту и материал для ювелирных украшений. + +cp14-store-sell-mithrilbar-name = 10 мифриловых слитков +cp14-store-sell-mithrilbar-desc = TODO + + +cp14-store-sell-copperore-name = 10 медной руды +cp14-store-sell-copperore-desc = TODO + +cp14-store-sell-ironore-name = 10 железной руды +cp14-store-sell-ironore-desc = TODO + +cp14-store-sell-goldore-name = 10 золотой руды +cp14-store-sell-goldore-desc = TODO + +cp14-store-sell-mithrilore-name = 10 мифриловой руды +cp14-store-sell-mithrilore-desc = TODO \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml new file mode 100644 index 0000000000..36b2e3b601 --- /dev/null +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/metalls.yml @@ -0,0 +1,111 @@ +- type: storePositionSell + id: CopperBars + name: cp14-store-sell-copperbar-name + desc: cp14-store-sell-copperbar-desc + icon: + sprite: _CP14/Objects/Materials/copper_bar.rsi + state: bar_3 + price: + min: 100 + max: 150 + service: !type:CP14SellStackService + stackId: CP14CopperBar + count: 10 + +- type: storePositionSell + id: CopperOre + name: cp14-store-sell-copperore-name + desc: cp14-store-sell-copperore-desc + icon: + sprite: _CP14/Objects/Materials/copper_ore.rsi + state: ore3 + price: + min: 10 + max: 20 + service: !type:CP14SellStackService + stackId: CP14OreCopper + count: 10 + +- type: storePositionSell + id: IronBars + name: cp14-store-sell-ironbar-name + desc: cp14-store-sell-ironbar-desc + icon: + sprite: _CP14/Objects/Materials/iron_bar.rsi + state: bar_3 + price: + min: 200 + max: 300 + service: !type:CP14SellStackService + stackId: CP14IronBar + count: 10 + +- type: storePositionSell + id: IronOre + name: cp14-store-sell-ironore-name + desc: cp14-store-sell-ironore-desc + icon: + sprite: _CP14/Objects/Materials/iron_ore.rsi + state: ore3 + price: + min: 20 + max: 30 + service: !type:CP14SellStackService + stackId: CP14OreIron + count: 10 + +- type: storePositionSell + id: GoldBars + name: cp14-store-sell-goldbar-name + desc: cp14-store-sell-goldbar-desc + icon: + sprite: _CP14/Objects/Materials/gold_bar.rsi + state: bar_3 + price: + min: 1000 + max: 1500 + service: !type:CP14SellStackService + stackId: CP14GoldBar + count: 10 + +- type: storePositionSell + id: GoldOre + name: cp14-store-sell-goldore-name + desc: cp14-store-sell-goldore-desc + icon: + sprite: _CP14/Objects/Materials/gold_ore.rsi + state: ore3 + price: + min: 100 + max: 150 + service: !type:CP14SellStackService + stackId: CP14OreGold + count: 10 + +- type: storePositionSell + id: MithrilBars + name: cp14-store-sell-mithrilbar-name + desc: cp14-store-sell-mithrilbar-desc + icon: + sprite: _CP14/Objects/Materials/mithril_bar.rsi + state: bar_3 + price: + min: 2000 + max: 3000 + service: !type:CP14SellStackService + stackId: CP14MithrilBar + count: 10 + +- type: storePositionSell + id: MithrilOre + name: cp14-store-sell-mithrilore-name + desc: cp14-store-sell-mithrilore-desc + icon: + sprite: _CP14/Objects/Materials/mithril_ore.rsi + state: ore3 + price: + min: 200 + max: 300 + service: !type:CP14SellStackService + stackId: CP14OreMithril + count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml new file mode 100644 index 0000000000..31e0cfadbc --- /dev/null +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sell/misc.yml @@ -0,0 +1,43 @@ +- type: storePositionSell + id: Wood + name: cp14-store-sell-wood-name + desc: cp14-store-sell-wood-desc + icon: + sprite: _CP14/Objects/Materials/wood.rsi + state: planks_3 + price: + min: 10 + max: 30 + service: !type:CP14SellStackService + stackId: CP14WoodenPlanks + count: 30 + +- type: storePositionSell + id: Glass + name: cp14-store-sell-glass-name + desc: cp14-store-sell-glass-desc + icon: + sprite: _CP14/Objects/Materials/glass.rsi + state: glass_3 + price: + min: 50 + max: 250 + service: !type:CP14SellStackService + stackId: CP14GlassSheet + count: 10 + +- type: storePositionSell + id: AlchemicalHerbals + name: cp14-store-sell-alchemical-herbals-name + desc: cp14-store-sell-alchemical-herbals-desc + icon: + sprite: _CP14/Objects/Flora/Wild/store_position.rsi + state: sell + price: + min: 30 + max: 60 + service: !type:CP14SellWhitelistService + whitelist: + tags: + - CP14AlchemicalHerbals + count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell.yml deleted file mode 100644 index 06402dce02..0000000000 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/sell.yml +++ /dev/null @@ -1,69 +0,0 @@ -- type: storePositionSell - id: CopperBars - name: cp14-store-sell-copperbar-name - desc: cp14-store-sell-copperbar-desc - icon: - sprite: _CP14/Objects/Materials/copper_bar.rsi - state: bar_3 - price: - min: 100 - max: 150 - service: !type:CP14SellStackService - stackId: CP14CopperBar - count: 10 - -- type: storePositionSell - id: IronBars - name: cp14-store-sell-ironbar-name - desc: cp14-store-sell-ironbar-desc - icon: - sprite: _CP14/Objects/Materials/iron_bar.rsi - state: bar_3 - price: - min: 200 - max: 300 - service: !type:CP14SellStackService - stackId: CP14IronBar - count: 10 - -- type: storePositionSell - id: GoldBars - name: cp14-store-sell-goldbar-name - desc: cp14-store-sell-goldbar-desc - icon: - sprite: _CP14/Objects/Materials/gold_bar.rsi - state: bar_3 - price: - min: 1000 - max: 1500 - service: !type:CP14SellStackService - stackId: CP14GoldBar - count: 10 - -- type: storePositionSell - id: Wood - name: cp14-store-sell-wood-name - desc: cp14-store-sell-wood-desc - icon: - sprite: _CP14/Objects/Materials/wood.rsi - state: planks_3 - price: - min: 10 - max: 55 - service: !type:CP14SellStackService - stackId: CP14WoodenPlanks - count: 30 - -- type: storePositionSell - id: Glass - name: cp14-store-sell-glass-name - desc: cp14-store-sell-glass-desc - icon: - sprite: _CP14/Objects/Materials/glass.rsi - state: glass_3 - price: - min: 50 - max: 250 - service: !type:CP14SellStackService - stackId: CP14GlassSheet - count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml index d7416202a9..c914ac8dcc 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml @@ -72,7 +72,9 @@ - type: StorageFill contents: - id: CP14DemiplaneKeyT1 - amount: 5 + amount: 4 + - id: CP14DemiplaneKeyT2 + amount: 1 - type: entity parent: CP14BrassChest @@ -83,16 +85,6 @@ contents: - id: CP14WoodenPlanks10 amount: 5 - # Gift - - id: CP14WoodLog - amount: 2 - prob: 0.5 - - id: CP14WoodLog - amount: 2 - prob: 0.4 - - id: CP14WoodLog - amount: 2 - prob: 0.3 - type: entity parent: CP14BrassChest diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index d5277eb77b..030756e360 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -42,8 +42,8 @@ - type: entity parent: CP14WoodenCloset - id: CP14WoodenClosetBankerFilled - suffix: Banker, Filled + id: CP14WoodenClosetMerchantFilled + suffix: Merchant, Filled components: - type: StorageFill contents: diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml index 1db7a171fa..8fb8e2e27d 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml @@ -18,8 +18,8 @@ - type: entity parent: CP14WoodenCabinet - id: CP14WoodenCabinetBanker - suffix: Banker, Filled + id: CP14WoodenCabinetMerchant + suffix: Merchant, Filled components: - type: StorageFill contents: @@ -27,7 +27,7 @@ prob: 0.5 - id: CP14ClothingPantsAristocratic prob: 0.5 - - id: CP14ClothingShirtBanker + - id: CP14ClothingShirtMerchant prob: 0.5 - id: CP14ClothingEyesMonocle prob: 0.2 @@ -47,7 +47,7 @@ prob: 0.5 - id: CP14ClothingPantsAristocratic prob: 0.5 - - id: CP14ClothingShirtBanker + - id: CP14ClothingShirtMerchant prob: 0.5 - id: CP14ClothingEyesMonocle prob: 0.2 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml similarity index 67% rename from Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml rename to Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml index 20f965aeb4..8b6e4001d9 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/bank.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/commandant.yml @@ -6,6 +6,6 @@ description: The colors white and gold tell you that you're looking at a higher power. components: - type: Sprite - sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi + sprite: _CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi - type: Clothing - sprite: _CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi \ No newline at end of file + sprite: _CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/bank.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/merchant.yml similarity index 56% rename from Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/bank.yml rename to Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/merchant.yml index 7086d79e9b..86f974f236 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/bank.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/merchant.yml @@ -2,12 +2,12 @@ parent: CP14ClothingHeadBase id: CP14ClothingHeadBowler name: bowler hat - description: It has an aristocratic air about it... + description: It has an aristocratic vibe about it... components: - type: Sprite - sprite: _CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi + sprite: _CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi - type: Clothing - sprite: _CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi + sprite: _CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi - type: entity parent: CP14ClothingHeadBase @@ -16,6 +16,6 @@ description: What an exquisite hat. It's clearly a hat that only sophisticated people prefer to wear. components: - type: Sprite - sprite: _CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi + sprite: _CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi - type: Clothing - sprite: _CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi \ No newline at end of file + sprite: _CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml deleted file mode 100644 index 107467bf77..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/banker.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: entity - parent: - - ClothingSlotBase - - CP14ClothingOuterClothingBase - id: CP14ClothingOuterClothingBankerWaistCoat - name: "banker's waistcoat" - description: Stylish waistcoat made of expensive leather. A special uniform for bank employees that makes customers feel like beggars. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi - -- type: entity - parent: CP14ClothingOuterClothingBankerWaistCoat - id: CP14ClothingOuterClothingBankerWaistCoatOpen - name: "open banker's waistcoat" - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml new file mode 100644 index 0000000000..f14b540a84 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/Roles/merchant.yml @@ -0,0 +1,22 @@ +- type: entity + parent: + - ClothingSlotBase + - CP14ClothingOuterClothingBase + id: CP14ClothingOuterClothingMerchantWaistCoat + name: "merchant's waistcoat" + description: Stylish waistcoat made of expensive leather. A special uniform for merchants that makes customers feel like beggars. + components: + - 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 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/bank.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/merchant.yml similarity index 100% rename from Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/bank.yml rename to Resources/Prototypes/_CP14/Entities/Clothing/Pants/Roles/merchant.yml diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml deleted file mode 100644 index 2184868458..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/bank.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: CP14ClothingShirtBase - id: CP14ClothingShirtBanker - name: banker's shirt - description: A white shirt with bronze inserts. Standard bank employee costume. - components: - - type: Sprite - sprite: _CP14/Clothing/Shirt/Roles/Bank/banker.rsi - - type: Clothing - sprite: _CP14/Clothing/Shirt/Roles/Bank/banker.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml new file mode 100644 index 0000000000..f152f25189 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/merchant.yml @@ -0,0 +1,10 @@ +- type: entity + parent: CP14ClothingShirtBase + id: CP14ClothingShirtMerchant + name: merchant's shirt + description: A white shirt with bronze inserts. + components: + - type: Sprite + sprite: _CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi + - type: Clothing + sprite: _CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml index 722c8c0c83..9435439221 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml @@ -56,9 +56,6 @@ - id: CP14VialTinyLumiMushroom - id: CP14BaseLockpick - id: CP14EnergyCrystalMediumEmpty - - id: CP14DemiplaneKeyT1 - weight: 2 - - id: CP14DemiplaneKeyT2 # Rare standard village crates loot - !type:NestedSelector tableId: CP14StationCrateLoot diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml index 64ea6930eb..fc62bb20fa 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml @@ -38,7 +38,7 @@ - state: green - state: guard -# Bank +# Traders - type: entity id: CP14SpawnPointCommandant @@ -55,18 +55,18 @@ - state: commandant - type: entity - id: CP14SpawnPointBanker + id: CP14SpawnPointMerchant parent: CP14SpawnPointJobBase name: merchant categories: - Spawner components: - type: SpawnPoint - job_id: CP14Banker + job_id: CP14Merchant - type: Sprite layers: - state: green - - state: banker + - state: merchant # Mercenary diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index 700835e577..99ca79eac3 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -42,6 +42,10 @@ reagents: - ReagentId: CP14BloodFlowerSap Quantity: 12 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14AgaricMushroom @@ -74,6 +78,10 @@ reagents: - ReagentId: CP14AgaricMushroom Quantity: 3 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14ChromiumSlime @@ -138,6 +146,10 @@ reagents: - ReagentId: CP14WildSageSap Quantity: 15 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14LumiMushroom @@ -173,6 +185,10 @@ reagents: - ReagentId: CP14LumiMushroom Quantity: 4 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14BlueAmanita @@ -202,6 +218,10 @@ reagents: - ReagentId: CP14BlueAmanita Quantity: 5 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14Dayflin @@ -231,6 +251,10 @@ reagents: - ReagentId: CP14YellowDayflinPulp Quantity: 4 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14AirLily @@ -258,4 +282,8 @@ maxVol: 5 reagents: - ReagentId: CP14AirLily - Quantity: 4 \ No newline at end of file + Quantity: 4 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml index 9536cd6ea2..060c25135b 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml @@ -81,7 +81,7 @@ - type: entity parent: CP14BaseKeyRing - id: CP14KeyRingBanker + id: CP14KeyRingMerchant suffix: Banker components: - type: StorageFill diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml deleted file mode 100644 index e9d733c18f..0000000000 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/bank.yml +++ /dev/null @@ -1,63 +0,0 @@ - -# Head - -- type: loadoutGroup - id: CP14BankHead - name: cp14-loadout-bank-head - minLimit: 0 - loadouts: - - CP14ClothingHeadBowler - -- type: loadout - id: CP14ClothingHeadBowler - equipment: - head: CP14ClothingHeadBowler - -# OuterClothing - -- type: loadoutGroup - id: CP14BankOuterClothing - name: cp14-loadout-banker-outer - minLimit: 0 - loadouts: - - CP14ClothingOuterClothingBankerWaistCoat - - CP14ClothingOuterClothingBankerWaistCoatOpen - -- type: loadout - id: CP14ClothingOuterClothingBankerWaistCoat - equipment: - outerClothing: CP14ClothingOuterClothingBankerWaistCoat - -- type: loadout - id: CP14ClothingOuterClothingBankerWaistCoatOpen - equipment: - outerClothing: CP14ClothingOuterClothingBankerWaistCoatOpen - -# Shirt - -- type: loadoutGroup - id: CP14BankShirt - name: cp14-loadout-bank-shirt - loadouts: - - CP14ClothingShirtBanker - -- type: loadout - id: CP14ClothingShirtBanker - equipment: - shirt: CP14ClothingShirtBanker - -# Pants - -- type: loadoutGroup - id: CP14BankPants - name: cp14-loadout-bank-pants - loadouts: - - CP14ClothingPantsAristocratic - -# Shoes - -- type: loadoutGroup - id: CP14BankShoes - name: cp14-loadout-bank-shoes - loadouts: - - CP14ShoesAristocraticBlack \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml new file mode 100644 index 0000000000..693d70c591 --- /dev/null +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml @@ -0,0 +1,63 @@ + +# Head + +- type: loadoutGroup + id: CP14MerchantHead + name: cp14-loadout-merchant-head + minLimit: 0 + loadouts: + - CP14ClothingHeadBowler + +- type: loadout + id: CP14ClothingHeadBowler + equipment: + head: CP14ClothingHeadBowler + +# OuterClothing + +- type: loadoutGroup + id: CP14MerchantOuterClothing + name: cp14-loadout-merchant-outer + minLimit: 0 + loadouts: + - CP14ClothingOuterClothingMerchantWaistCoat + - CP14ClothingOuterClothingMerchantWaistCoatOpen + +- type: loadout + id: CP14ClothingOuterClothingMerchantWaistCoat + equipment: + outerClothing: CP14ClothingOuterClothingMerchantWaistCoat + +- type: loadout + id: CP14ClothingOuterClothingMerchantWaistCoatOpen + equipment: + outerClothing: CP14ClothingOuterClothingMerchantWaistCoatOpen + +# Shirt + +- type: loadoutGroup + id: CP14MerchantShirt + name: cp14-loadout-merchant-shirt + loadouts: + - CP14ClothingShirtMerchant + +- type: loadout + id: CP14ClothingShirtMerchant + equipment: + shirt: CP14ClothingShirtMerchant + +# Pants + +- type: loadoutGroup + id: CP14MerchantPants + name: cp14-loadout-merchant-pants + loadouts: + - CP14ClothingPantsAristocratic + +# Shoes + +- type: loadoutGroup + id: CP14MerchantShoes + name: cp14-loadout-merchant-shoes + loadouts: + - CP14ShoesAristocraticBlack \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 465c7f9f4e..2c10afde7a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -108,10 +108,10 @@ - CP14CommandantHead - CP14GeneralEyes - CP14CommandantCloak - - CP14BankOuterClothing - - CP14BankShirt - - CP14BankPants - - CP14BankShoes + - CP14MerchantOuterClothing + - CP14MerchantShirt + - CP14MerchantPants + - CP14MerchantShoes - CP14GeneralBack - CP14GeneralTrinkets @@ -129,14 +129,14 @@ - CP14GuildmasterSpells - type: roleLoadout - id: JobCP14Banker + id: JobCP14Merchant groups: - CP14GeneralSpells - - CP14BankHead - - CP14BankOuterClothing + - CP14MerchantHead + - CP14MerchantOuterClothing - CP14GeneralEyes - - CP14BankShirt - - CP14BankPants - - CP14BankShoes + - CP14MerchantShirt + - CP14MerchantPants + - CP14MerchantShoes - CP14GeneralBack - CP14GeneralTrinkets diff --git a/Resources/Prototypes/_CP14/Maps/arenas.yml b/Resources/Prototypes/_CP14/Maps/arenas.yml index 3d644a037e..d45fbdd3eb 100644 --- a/Resources/Prototypes/_CP14/Maps/arenas.yml +++ b/Resources/Prototypes/_CP14/Maps/arenas.yml @@ -36,9 +36,9 @@ CP14Alchemist: [ 2, 2 ] CP14Blacksmith: [ 2, 2 ] CP14Innkeeper: [ 3, 4 ] - #Bank + #Traders CP14Commandant: [1, 1] - CP14Banker: [3, 4] + CP14Merchant: [3, 4] #Guard CP14Guard: [8, 8] CP14GuardCommander: [1, 1] diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml index 2b59a510e8..4fc9baf0fb 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml @@ -5,7 +5,7 @@ playTimeTracker: CP14JobAdventurer startingGear: CP14AdventurerGear icon: "CP14JobIconAdventurer" - supervisors: cp14-job-supervisors-command + supervisors: cp14-job-supervisors-guildmaster special: - !type:CP14AddKnowledgeSpecial knowledge: diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/commandant.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/commandant.yml similarity index 100% rename from Resources/Prototypes/_CP14/Roles/Jobs/Bank/commandant.yml rename to Resources/Prototypes/_CP14/Roles/Jobs/Traders/commandant.yml diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/banker.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml similarity index 60% rename from Resources/Prototypes/_CP14/Roles/Jobs/Bank/banker.yml rename to Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml index e4296a1cab..963295b544 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Bank/banker.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml @@ -1,10 +1,10 @@ - type: job - id: CP14Banker - name: cp14-job-name-banker - description: cp14-job-desc-banker - playTimeTracker: CP14JobBanker - startingGear: CP14BankerGear - icon: "CP14JobIconBanker" + id: CP14Merchant + name: cp14-job-name-merchant + description: cp14-job-desc-merchant + playTimeTracker: CP14JobMerchant + startingGear: CP14MerchantGear + icon: "CP14JobIconMerchant" supervisors: cp14-job-supervisors-commandant special: - !type:CP14AddKnowledgeSpecial @@ -15,11 +15,11 @@ time: 3600 # 1 hours - type: startingGear - id: CP14BankerGear + id: CP14MerchantGear storage: back: - CP14EnergyCrystalSmall - CP14EnergyCrystalSmall equipment: belt1: CP14WalletFilledTest - keys: CP14KeyRingBanker \ No newline at end of file + keys: CP14KeyRingMerchant \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml index 9531dc0406..24aa9fa388 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml @@ -28,7 +28,7 @@ color: "#fadb3e" roles: - CP14Commandant - - CP14Banker + - CP14Merchant - type: department id: CP14Artisan diff --git a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml index 4844183319..3da99577fd 100644 --- a/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml +++ b/Resources/Prototypes/_CP14/Roles/play_time_tracker.yml @@ -1,11 +1,9 @@ -# Jobs +# Artisans + - type: playTimeTracker id: CP14JobApprentice -- type: playTimeTracker - id: CP14JobAdventurer - - type: playTimeTracker id: CP14JobAlchemist @@ -15,17 +13,26 @@ - type: playTimeTracker id: CP14JobInnkeeper +# Mercenary + +- type: playTimeTracker + id: CP14JobGuildmaster + +- type: playTimeTracker + id: CP14JobAdventurer + +# Guard + - type: playTimeTracker id: CP14JobGuardCommander - type: playTimeTracker id: CP14JobGuard +# Trade guild + - type: playTimeTracker id: CP14JobCommandant - type: playTimeTracker - id: CP14JobBanker - -- type: playTimeTracker - id: CP14JobGuildmaster \ No newline at end of file + id: CP14JobMerchant \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/StatusIcon/job.yml b/Resources/Prototypes/_CP14/StatusIcon/job.yml index 38681101ab..a419613d5b 100644 --- a/Resources/Prototypes/_CP14/StatusIcon/job.yml +++ b/Resources/Prototypes/_CP14/StatusIcon/job.yml @@ -63,11 +63,11 @@ - type: jobIcon parent: CP14JobIcon - id: CP14JobIconBanker + id: CP14JobIconMerchant icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi - state: Banker - jobName: cp14-job-name-banker + state: Merchant + jobName: cp14-job-name-merchant - type: jobIcon parent: CP14JobIcon diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 0703c94707..78f0e1a228 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -84,3 +84,6 @@ - type: Tag id: CP14PlatePie + +- type: Tag + id: CP14AlchemicalHerbals diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi/equipped-CLOAK.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/equipped-CLOAK.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi/equipped-CLOAK.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Cloak/Roles/Bank/commandant_cape.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Cloak/Roles/Commandant/commandant_cape.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/equipped-HELMET.png rename to Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi/equipped-HELMET.png diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_golden_hat.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_golden_hat.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/equipped-HELMET.png rename to Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi/equipped-HELMET.png diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Head/Roles/Bank/bowler_hat.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Head/Roles/Merchant/bowler_hat.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/icon.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/meta.json b/Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Bank/vest_banker_open.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/OuterClothing/Roles/Merchant/vest_merchant_open.rsi/meta.json diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/equipped-SHIRT.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/equipped-SHIRT.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/equipped-SHIRT.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/icon.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/icon.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/inhand-left.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/inhand-left.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/inhand-right.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/inhand-right.png rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Clothing/Shirt/Roles/Bank/banker.rsi/meta.json rename to Resources/Textures/_CP14/Clothing/Shirt/Roles/Merchant/merchant.rsi/meta.json diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Banker.png b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Merchant.png similarity index 100% rename from Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Banker.png rename to Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/Merchant.png diff --git a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json index 19baf4dea2..c0962c81b2 100644 --- a/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json @@ -17,7 +17,7 @@ "name": "Apprentice" }, { - "name": "Banker" + "name": "Merchant" }, { "name": "Blacksmith" diff --git a/Resources/Textures/_CP14/Markers/jobs.rsi/banker.png b/Resources/Textures/_CP14/Markers/jobs.rsi/merchant.png similarity index 100% rename from Resources/Textures/_CP14/Markers/jobs.rsi/banker.png rename to Resources/Textures/_CP14/Markers/jobs.rsi/merchant.png diff --git a/Resources/Textures/_CP14/Markers/jobs.rsi/meta.json b/Resources/Textures/_CP14/Markers/jobs.rsi/meta.json index 3f37c57d0d..1fd438e043 100644 --- a/Resources/Textures/_CP14/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/_CP14/Markers/jobs.rsi/meta.json @@ -14,7 +14,7 @@ "name": "alchemist" }, { - "name": "banker" + "name": "merchant" }, { "name": "blacksmith" diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/store_position.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/store_position.rsi/meta.json new file mode 100644 index 0000000000..4d06ac3a69 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/store_position.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "All right reserved", + "copyright": "Created by TheShuEd and Max Gab", + "states": [ + { + "name": "sell" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/store_position.rsi/sell.png b/Resources/Textures/_CP14/Objects/Flora/Wild/store_position.rsi/sell.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee3abfbf01cc602b781c1a5d1d9e92c5d13c80c GIT binary patch literal 1267 zcmVPx(tw}^dR9J=OmR(F!XBfwS2Q*MAw$w_^RzVQ7nj(ZTCGG>mk_ppr16j;smgvnA zkwlXvMiX3IFE%fxBz`1j(L`g+vXqM%oqC~zY-)+JP&o+*Wu>(vmh{UMMwzqkF5nzF z7DPMeF804U=Y8JuKL7voywCHV7yj>%(p}iPqC%|6NC5E3Z~bZe$@r(_eaUPt6x+mW z6QGb=bV>S>*{JWEi_;R3Rt7A(Bpu_6RPr~hf2rbLi-6$7(`5?zNMJ!auF@;QnUQYF z`2&EC@kKa>dtTaK+SU8P$8QUpZ4st(j{wpl2S_h((}+itoS1{y(NHA-S})#xuCO^L zml~`Bz?f?Xz_`+;&fV#3li+CqOm-wd!~-5$YC{TI)pd<}K5sE&S>{Oe`+beZ~&- z^VUuoW3Ci`IK+yidXe6U75n}rvJ+D{63#4|+1GX%g7d-DMZ^p2|Eywh}^ z533IYs6yh=B+UnF)Xr!=Sfhy^p!@Q+S#*&XJM3d?Nx>Htj=i zbx>Hc1iL9u6>n+8 zzOF}(MDcmTvx@k%E?+&4~BEZS>GP}0h z@w-EsvmxamdVkNK_&fAq^%_+`8;8+ooPHt6pT+@$1J(otX#5y zv!{Mi3(M~gVXrm<@X==_DZcI1M!LKKHLLSpNM>$9Ue46#kH(%5jZ6}ZCusLhNQ(Vg z$gUV&-hkwHht%%)@swvi%K1^7pCuZLbYlNTv)Eat*KE;-BCF`WyiIH CrystallEdge migration zone end