From 0652c3f0b47962bb87c7982ba345f2d637126f5d Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:25:58 +0300 Subject: [PATCH] Prazat jewelry stones (#504) * marble floor * fix * bank wallpaper, marble floor resprite * marble window * rename whitebrick wall to marble wall, delete iron walls * job desc fix * jewelry * Update jewelry.yml --- Resources/Locale/en-US/_CP14/job/job.ftl | 8 +- Resources/Locale/ru-RU/_CP14/job/job.ftl | 8 +- .../Entities/Objects/Economy/jewelry.yml | 95 ++++++++++++++++++ .../Objects/Economy/jewelry.rsi/emerald1.png | Bin 0 -> 325 bytes .../Objects/Economy/jewelry.rsi/emerald2.png | Bin 0 -> 334 bytes .../Objects/Economy/jewelry.rsi/emerald3.png | Bin 0 -> 298 bytes .../Objects/Economy/jewelry.rsi/emerald4.png | Bin 0 -> 389 bytes .../Objects/Economy/jewelry.rsi/meta.json | 44 ++++++++ .../Objects/Economy/jewelry.rsi/ruby1.png | Bin 0 -> 306 bytes .../Objects/Economy/jewelry.rsi/ruby2.png | Bin 0 -> 276 bytes .../Objects/Economy/jewelry.rsi/ruby3.png | Bin 0 -> 305 bytes .../Objects/Economy/jewelry.rsi/sapphire1.png | Bin 0 -> 297 bytes .../Objects/Economy/jewelry.rsi/sapphire2.png | Bin 0 -> 354 bytes .../Objects/Economy/jewelry.rsi/sapphire3.png | Bin 0 -> 353 bytes .../Objects/Economy/jewelry.rsi/topaz1.png | Bin 0 -> 295 bytes 15 files changed, 147 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Economy/jewelry.yml create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald1.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald2.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald3.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/emerald4.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby1.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby2.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/ruby3.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire1.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire2.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/sapphire3.png create mode 100644 Resources/Textures/_CP14/Objects/Economy/jewelry.rsi/topaz1.png 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 0000000000000000000000000000000000000000..2b09e572a9f693a75b5d41507837f1f20f5b8e15 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}|2Hp7-%>yvN% z`zOl0X|V^R&XTN%x!*eLyGK`K;l`3{r0Z1S&`GDSF$V zR6L-neB{7^kK%ciQQw5y?B~}R)Ku2YOu27t5Fo*ndDCCxqTfzt2?+^}PqvYKKfXPY zJ>0#zUP5I{q{NLMJ5FpB=Q~kk*}vvpy`H3ETfYCjz$d>04Y=G6YDlp100D#S_8>m1 T(|>D#LBZhZ>gTe~DWM4fJ8^*1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5ae7c826d44cd990526a36c27d89e2aeeb4d0d0f GIT binary patch literal 334 zcmV-U0kQsxP)Px$2uVaiR9J=W)4z(sKoAD-Pe~*wiztWKiP(yz%@+C!5qyC3zJaZ!kKhwTFqQpU z*jS3a2o@rTas>ZyCys>#3$fS@oQ3l%m))62js@|8=XRErhD z(tY47m)ecdqkwSY^hYw*YXEjOja;>EJO$$b!$}M6#t7oeft^j8meJ=0l6>V-u3D#v zuiXEgKyPq(Ix}5H?EvGxZPMo@?OzbdSMnH6S^$7fcMnTA5TzQ0t9e4Fj@IQ!K{lya zPT>&V2N-^z@%MAYB|JknfYA)kzwW^=%B0+E7j(rLYeB^>M* gvskqlW9)O?0AHh6i-2g-5dZ)H07*qoM6N<$g3cO_Pyhe` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8c36e59cae47d816d066c37caa36370468d7e668 GIT binary patch literal 298 zcmV+_0oDGAP)Px#gI*w}au58xqCV`FDA z^9Ym&P?EABM1*6ZQOd@-WlHB;-n!@iJ2PEC2qA=`UeKUe!-ig zEmnynH@vDF0DykzBBR|oV|YB@re4q>r(L7y6A%%3zRlVKYXjZk1^Mz8&DMf*U9G^N zy$1k{Iw|FF0ANj-jMvDPG^}Q6^g~yvK!S5gH!XS=xZ<)qzRqulGxqc8S2J1vz$ct= wfVlzSeG8}Mh83<%H!ad~#rU3LA%yq~4|%F#$k>!hwg3PC07*qoM6N<$g00AZ9smFU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4cc24650810e53abc23119b14846b2d1145819ff GIT binary patch literal 389 zcmV;00eb$4P)Px$KS@MER9J=Wlrc-gKorM+l?Fl~gqG65MZ~p;Q?Jr=J9lGa0BCTY9Ba?-a^1_P jp5>ObiW>|D!=K;-zT{^lzf~G!00000NkvXXu0mjf4CJgu literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6cf2ba5b8cf4a68760e6bff3f0d2af6fd604c161 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Z#-QbLn2y} z6C_v{Cy4YkP2`i%yjT*?WzQb(#5&;jv$-nZ2ubP6s8xugK=dM?*D*Vb~UST;NnIKb{#^TTnI z+$84*N806i#F%6X?9M!Y65%(E`N1?t-L|8DJA>6gTe~DWM4f6=`_) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..72d4306287f0de15b891a57554c52c62c93c6afe GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}=R92;Ln2z= zPBP?cau9H}Ki0)%$s(#IcI=*UKmoIL{sUHGQV+8x_y@Gz6q`K>bmz^ zF6Z3IQpwzY>ZoB{?>td))&(k0H_l_&{Wqb;En8zMbHT~LHB8rk@|>V>kMW{%u1YYQ`+>6F98HrygVXcwOHF@TAPx#<4Ht8R9J=Wl&uN^Q4mIti}(PtN$`ioU@-UqCY#!Qhb;;|h#&^5AQmwRHk&@c zh7AT0f8ZwB2QaJ#xuVe#)-oqu24>F3+{*<;Q55CRq<(2`bvJi_z=W8EFPbH4vf@I~ z1>k(TibJF&aw{J9E3bOH2j<&hk^qIG`yqbHw*)2>=mh~Lvnl6Olhv?}KiIw29~~~q z1hDvn9h2FVINAf?WXs6~c&@uD68;<@j`rZ?0myoJqW8K0N7D3u-;H`xB({j(Kwv^@ vxhm`B2!Pvhp4>;2DRu7lEEOw?q9~RJ6*x-lqYcfb00000NkvXXu0mjf(kpsH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..71c7197de9928619e637c450a884c41f33bb491d GIT binary patch literal 354 zcmV-o0iFJdP)Px$97#k$R9J=Wl(9+!K@>$#7K#00HOp#TQdp$O5BLMAck>OVN#TcVVKZ9_ViP+H zD`ABcHYrl1ND;y&!BoqBK#Giw6Gaf5F@oTnYIw!Hciww5;BYt`|DD=CL_{oATeJXp zxH>n|{8509#>Xc|04x`!QHTRu^G<)Lw6VNA+tq_4vz0VM#8Q2x(;upOqpM7GJlg=( zd_^yv0?UngQVXO(=dbfQY36C`UO&Ax-+n(yj<6jHsNbtk@y(GKXj2T6wKHz`LsPx$8%ab#R9J=Wl(9;~P!xv07Lm>+Q^Z8X(LuU72+kdxtj~}xeSp40I=JX4h)c%| zt_^g^(!oJUhf-<_PT@X4hu#k1O29$y3FvaaF>wC#t_9mR%fWAIM-F8IM-2}>pzibb%we- zn0}L}%Gl(ISCC{WN4-b-qxsjj{%FqA%d=I^fu#A{=R3u0Qi=dcFXiU)nj}lDvqS<_ z)N%vB+Am+jPA#nJtyf^%;3vcrXtvJ)XrCU}60n}Yb~SFO<)(IHgJ=RfwLnq+y}61> zmQu_nY*%BeizvS1hbMR1tiedxHg`B24hO&AO=z52*MV*>+&itT%oYPLDPv}a~!KKwH{ULqms$gIOoeNRt_ z+1+07CH~TXy%0CacO0`U8SXl<%(gk;vhV4N2S439-uKV>?>LG1L>E&EH)~4r3Dc$$ zc85pdGaG@x(c#*pgA*QFbp4t5*|51_TU?w}wAGSbbFp=vf9&S3j3^P6