From d9a5869504cf60e77ef5b0a3319897e768d9ca52 Mon Sep 17 00:00:00 2001 From: creamybag Date: Wed, 5 Mar 2025 17:28:41 +0300 Subject: [PATCH] Merge pull request #973 from creamybag/GuildmasterHat Guildmaster hat --- .../Locale/en-US/_CP14/loadouts/loadout.ftl | 1 + .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 3 +++ .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 1 + .../Clothing/Head/Roles/guildmaster.yml | 10 ++++++++++ .../_CP14/Loadouts/Jobs/guildmaster.yml | 10 ++++++++++ .../_CP14/Loadouts/role_loadouts.yml | 1 + .../guildmaster_hat.rsi/equipped-HELMET.png | Bin 0 -> 1090 bytes .../Guildmaster/guildmaster_hat.rsi/icon.png | Bin 0 -> 477 bytes .../Guildmaster/guildmaster_hat.rsi/meta.json | 18 ++++++++++++++++++ 9 files changed, 44 insertions(+) create mode 100644 Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/meta.json diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index a91bd27996..5fb56fe888 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -54,6 +54,7 @@ cp14-loadout-merchant-shoes = Merchant's shoes # Guildmaster cp14-loadout-guildmaster-outer = Guildmaster outer clothes +cp14-loadout-guildmaster-head = Guildmaster hat 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 95bc03f9db..cdb9f40b46 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -601,6 +601,9 @@ ent-CP14ClothingHeadAlchemistBeret = берет алхимика ent-CP14ClothingHeadCaptainCap = капитанская кепка .desc = Нет, ну вы посмотрите какой красавчик! +ent-CP14ClothingHeadGildmaster = шляпа гильдмастера + .desc = Знак безграничного опыта и чести. + ent-CP14ClothingHeadBeretBase = { ent-CP14ClothingHeadBase } .desc = Это берет. diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 7d32157e9c..54f5041b1a 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -54,6 +54,7 @@ cp14-loadout-merchant-shoes = Ботинки торговца # Guildmaster cp14-loadout-guildmaster-outer = Верхняя одежда гильдмастера +cp14-loadout-guildmaster-head = Шляпа гильдмастера cp14-loadout-guildmaster-cloak = Накидка гильдмастера cp14-loadout-guildmaster-shirt = Рубашка гильдмастера cp14-loadout-guildmaster-pants = Штаны гильдмастера diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml new file mode 100644 index 0000000000..03d52e0e88 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/guildmaster.yml @@ -0,0 +1,10 @@ +- type: entity + parent: CP14ClothingHeadBase + id: CP14ClothingHeadGildmaster + name: guildmaster hat + description: A sign of unlimited experience and honor. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml index a31095c1e9..bd9cc3f1a7 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guildmaster.yml @@ -1,6 +1,16 @@ # Head +- type: loadoutGroup + id: CP14GuildmasterHead + name: cp14-loadout-guildmaster-head + loadouts: + - CP14ClothingHeadGildmaster +- type: loadout + id: CP14ClothingHeadGildmaster + equipment: + cloak: CP14ClothingHeadGildmaster + # Cloak - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index 002e9cd80d..fa5076515f 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -127,6 +127,7 @@ - CP14GeneralSpells - CP14GuildmasterOuterClothing - CP14GeneralEyes + - CP14GuildmasterHead - CP14GuildmasterCloak - CP14GuildmasterShirt - CP14GuildmasterPants diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..8a5dabfd80e8e904cbdd286f121ab86f1908904a GIT binary patch literal 1090 zcmV-I1ikx-P)Px&{7FPXRCt{2+`&tmX8_0XZ_2g~H+-cIG8@_~MbOkDY%eHj=%|AXdhrh!V;}>2 z96L>R-Jyfs2MT4UfQJdPONRyB#Rdy0RJ5TWYIM=Pj11q6h;)=^hxlgE+Ie^%&FlL6 zTw-2d-~68Eecsm)!Vg45MC5EL&Q6(1sbE^2<1|%D1yh`zvNGm#VS@ln=JVJJ6m`Yf zDKnYR1OJXcj9AzMR7wT&+x8aawK9X(GbGZP(8r9bN~vHL9u!EXlDyk>(aKm~3wwY> zIuomu3Z}eP2EcV)QlDNuurhql=a2i97(lUD4EvHN>bU%XwaJH&x1c~Gorxt=Nhb4o zCcgXHY%H!G_`MT%xR6U2s1LCDF)Ccw#dTfw+WnX2pUme;rjjJmnV7Bop|1dd+}Lnq z#eDY7R{(76Kfm06rLo`Whv&?X=ex+|5(idPs|ERYrXN6i2eozY$oy~D78sk^AU8H_ zY~>Gq0tQC1#)&)Jc|6VQkE*n7?~uI~C*AQ3fYIJL046rNC~fZIWE}wf{;HuE{(n$d zL4JT8XyoUw9nzQDPCS3;6Hr_C@Z+60afiQioiGmbOCIw}ki8aXVx|j#(&jF|WNan^7srWr0`+_5VZP_@KUS%&do0hb zw0!jkTAAP4B=ik+8-V74Gz)?Qk(&HKtMXf)h+rT`dGk*v7WKEGr=9=QR$}wpwy2+k zqn!2pA|fIpA|fIp(t45mSl9-Aa3&%mA|fIpA|fIpA|fIpA|hhPtI``}vnvQJm36!- zy+O9Sg23W8(qW_kbT!v!6=&hxbOzGGsU9snNxFdup>p${-H zk~Kl8QF;6x0NqyxxY_eN0HYsoH};*F>EiCr8-ShgHU*35^NwdPWQKZOO;BT#ynPFR zjm6c_NHv7vy`@m+lt~()WCPuNs-Fpx&C**|=36?u=^|jL}wSkd-T7 zd2S`vH-xFJdt4m63LIa0^n7tI5|a<`d~q-4_g5S5>zjMx0zvkzg(rZ$&Y)B63kpQB zHz;UKJZ`@zmQ9I>h=_=Yh=_=Yh=_=Yh=_=Yh=_=Yh)8Sw1G|X?DKE4GDgXcg07*qo IM6N<$g2F2j%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/Roles/Guildmaster/guildmaster_hat.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6076521759408a37c077cb6cda115cb8d216bc57 GIT binary patch literal 477 zcmV<30V4j1P)Px$mq|oHRA_Jzk*R4XWvZA9~MIo%@S9wfzGF&1${A~rG$Dg1w$VVT|e&u`}egb+dq zA%qa(z4A|vbStRnQPm$a`8b|SgD2#YGZdm}n@0*q!Vzh-~P9|r~&d*XVl_>7-=*H#E zP`|PjpFBrHFW_Kn%6J6;ydN9=Kfbm59e~F3^UTWU{(FUQWBPD1jpsT26)|NT;On-l zm95yj_{qe1n~!&oxXU(~>3;we7Eb{vHqr#mF3ME^L@RBLZ+-@i19WO3k)1->ivL~; z4&baBa#jU**{1j_4M5QB^4nbndS{|j3r$M{3EV;eOZf#oHD{yj6wurAFGXSW+_ve| zLat7)6RDlpmA8~%&;Wx$2E`Kx5}Q0E7$6o0dCiBv%1Zhg6+#Fhgb+dqA>OMeKfi