diff --git a/Resources/Locale/en-US/_CP14/job/job.ftl b/Resources/Locale/en-US/_CP14/job/job.ftl index 6ec2da9809..ef14940f55 100644 --- a/Resources/Locale/en-US/_CP14/job/job.ftl +++ b/Resources/Locale/en-US/_CP14/job/job.ftl @@ -10,11 +10,11 @@ cp14-job-desc-guard-commander = The most dangerous person in the neighborhood. M # Bank -cp14-job-name-quartermaster = Quartermaster -cp14-job-desc-quartermaster = Responsible for material resources. In charge of the settlement's supplies and finances, directing resources to the mercenaries who do all the dirty work. +cp14-job-name-quartermaster = Commandant +cp14-job-desc-quartermaster = 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-merchant = Merchant -cp14-job-desc-merchant = Make deals, give out deposits at interest, and do any other economic work that will enrich the settlement. +cp14-job-name-merchant = Banker +cp14-job-desc-merchant = Make deals, store entrusted valuables, issue interest-bearing deposits, and do any other economic work that will enrich your bank. # Mercenary diff --git a/Resources/Locale/ru-RU/_CP14/job/job.ftl b/Resources/Locale/ru-RU/_CP14/job/job.ftl index 06ae8602c3..14e5898759 100644 --- a/Resources/Locale/ru-RU/_CP14/job/job.ftl +++ b/Resources/Locale/ru-RU/_CP14/job/job.ftl @@ -10,11 +10,11 @@ cp14-job-desc-guard-commander = Самая опасная личность в о # Bank -cp14-job-name-quartermaster = Квартирмейстр -cp14-job-desc-quartermaster = Ответственный за материальные ресурсы. Заведуйте запасами и финансами поселения, направляя ресурсы выполняющим всю грязную работу наемникам. +cp14-job-name-quartermaster = Комендант +cp14-job-desc-quartermaster = Контролируйте экономику поселения, торгуя с Империей. Заведуйте запасами и финансами, направляя ресурсы рабочим рукам. -cp14-job-name-merchant = Купец -cp14-job-desc-merchant = Заключайте сделки, выдавайте вклады под проценты и занимайтесь любой другой экономической работой, которая обогатит поселение. +cp14-job-name-merchant = Банкир +cp14-job-desc-merchant = Заключайте сделки, храните доверенные ценности, выдавайте вклады под проценты и занимайтесь любой другой экономической работой, которая обогатит ваш банк. # Mercenary diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/jewelry.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/jewelry.yml new file mode 100644 index 0000000000..1ecaaf58a9 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/jewelry.yml @@ -0,0 +1,95 @@ +- type: entity + abstract: true + parent: BaseItem + id: CP14BaseJewelry + categories: [ ForkFiltered ] + components: + - type: Tag + tags: + - CP14Coin + - type: Sprite + sprite: /Textures/_CP14/Objects/Economy/jewelry.rsi + - type: Item + size: Tiny + - type: CP14Currency + currency: 1 + category: Currency + +- type: entity + parent: CP14BaseJewelry + id: CP14JewelryRuby + name: ruby + description: A beautiful ruby stone that's worth a lot of money. + suffix: 25gp + components: + - type: CP14Currency + currency: 2500 + - type: Sprite + layers: + - state: ruby1 + map: ["random"] + - type: RandomSprite + available: + - random: + ruby1: "" + ruby2: "" + ruby3: "" + +- type: entity + parent: CP14BaseJewelry + id: CP14JewelryEmerald + name: emerald + description: A beautiful emerald stone that's worth a lot of money. + suffix: 20gp + components: + - type: CP14Currency + currency: 2000 + - type: Sprite + layers: + - state: emerald1 + map: ["random"] + - type: RandomSprite + available: + - random: + emerald1: "" + emerald2: "" + emerald3: "" + emerald4: "" + +- type: entity + parent: CP14BaseJewelry + id: CP14JewelrySapphire + name: sapphire + description: A beautiful sapphire stone that's worth a lot of money. + suffix: 30gp + components: + - type: CP14Currency + currency: 3000 + - type: Sprite + layers: + - state: sapphire1 + map: ["random"] + - type: RandomSprite + available: + - random: + sapphire1: "" + sapphire2: "" + sapphire3: "" + +- type: entity + parent: CP14BaseJewelry + id: CP14JewelryTopaz + name: topaz + description: A beautiful topaz stone that's worth a lot of money. + suffix: 10gp + components: + - type: CP14Currency + currency: 1000 + - type: Sprite + layers: + - state: topaz1 + map: ["random"] + - type: RandomSprite + available: + - random: + topaz1: "" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald1.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald1.png new file mode 100644 index 0000000000..2b09e572a9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald1.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald2.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald2.png new file mode 100644 index 0000000000..5ae7c826d4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald2.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald3.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald3.png new file mode 100644 index 0000000000..8c36e59cae Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald3.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald4.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald4.png new file mode 100644 index 0000000000..4cc2465081 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald4.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/meta.json b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/meta.json new file mode 100644 index 0000000000..befda0e7b0 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created by Prazat for CrystallPunk14", + "states": [ + { + "name": "emerald1" + }, + { + "name": "emerald2" + }, + { + "name": "emerald3" + }, + { + "name": "emerald4" + }, + { + "name": "ruby1" + }, + { + "name": "ruby2" + }, + { + "name": "ruby3" + }, + { + "name": "sapphire1" + }, + { + "name": "sapphire2" + }, + { + "name": "sapphire3" + }, + { + "name": "topaz1" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby1.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby1.png new file mode 100644 index 0000000000..6cf2ba5b8c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby1.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby2.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby2.png new file mode 100644 index 0000000000..72d4306287 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby2.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby3.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby3.png new file mode 100644 index 0000000000..df7b055876 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby3.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire1.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire1.png new file mode 100644 index 0000000000..edc47bf25e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire1.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire2.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire2.png new file mode 100644 index 0000000000..71c7197de9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire2.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire3.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire3.png new file mode 100644 index 0000000000..d8d32d6007 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire3.png differ diff --git a/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/topaz1.png b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/topaz1.png new file mode 100644 index 0000000000..58628d28cf Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/topaz1.png differ