From 6a6350a82766c7d7a4549e17598f41cb0b4f6e01 Mon Sep 17 00:00:00 2001 From: creamybag Date: Thu, 27 Mar 2025 17:02:52 +0300 Subject: [PATCH] Blacksmith's gloves (#1045) * gloves * fix --- .../Locale/en-US/_CP14/loadouts/loadout.ftl | 1 + .../Locale/ru-RU/_CP14/loadouts/loadout.ftl | 1 + .../_CP14/Catalog/Fills/dresser.yml | 2 ++ .../_CP14/Entities/Clothing/Gloves/gloves.yml | 13 ++++++++++- .../_CP14/Loadouts/Jobs/blacksmith.yml | 21 +++++++++++++++++- .../_CP14/Loadouts/role_loadouts.yml | 2 +- .../blacksmith_gloves.rsi/equipped-HAND.png | Bin 0 -> 595 bytes .../Gloves/blacksmith_gloves.rsi/icon.png | Bin 0 -> 520 bytes .../Gloves/blacksmith_gloves.rsi/meta.json | 18 +++++++++++++++ 9 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/equipped-HAND.png create mode 100644 Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/meta.json diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl index 335bc384cb..8e8f00ad25 100644 --- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl @@ -28,6 +28,7 @@ cp14-loadout-alchemist-belt = Alchemist's belt # Blacksmith cp14-loadout-blacksmith-cloak = Blacksmith's cloak +cp14-loadout-blacksmith-gloves = Blacksmith's gloves # Guard commander diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl index 45c464b0cc..286a9c827f 100644 --- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl +++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl @@ -28,6 +28,7 @@ cp14-loadout-alchemist-belt = Пояс алхимика # Blacksmith cp14-loadout-blacksmith-cloak = Накидка кузнеца +cp14-loadout-blacksmith-gloves = Перчатки кузнеца # Guard commander diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml index 1cd0e00ed3..9784a8a61f 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml @@ -64,6 +64,8 @@ contents: - id: CP14ClothingCloakBlacksmithArpon prob: 1 + - id: CP14ClothingGlovesBlacksmith + prob: 0.8 - type: entity parent: CP14WoodenCabinet diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml index c1dc81927e..219bee4524 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Gloves/gloves.yml @@ -41,4 +41,15 @@ - type: Sprite sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi - type: Clothing - sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi \ No newline at end of file + sprite: _CP14/Clothing/Gloves/jagermeister_gloves.rsi + +- type: entity + parent: CP14ClothingGlovesBase + id: CP14ClothingGlovesBlacksmith + name: blacksmith's gloves + description: They say you can get your hands on a newly poured ingot in them. But it's still not worth checking. + components: + - type: Sprite + sprite: _CP14/Clothing/Gloves/blacksmith_gloves.rsi + - type: Clothing + sprite: _CP14/Clothing/Gloves/blacksmith_gloves.rsi diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml index 4b93f2e9fc..aaf495f264 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/blacksmith.yml @@ -9,4 +9,23 @@ - type: loadout id: CP14ClothingCloakBlacksmithArpon equipment: - cloak: CP14ClothingCloakBlacksmithArpon \ No newline at end of file + cloak: CP14ClothingCloakBlacksmithArpon + +# Gloves + +- type: loadoutGroup + id: CP14BlacksmithGloves + name: cp14-loadout-blacksmith-gloves + loadouts: + - CP14ClothingGlovesBlacksmith + - CP14ClothingGlovesGirdles + +- type: loadout + id: CP14ClothingGlovesBlacksmith + equipment: + gloves: CP14ClothingGlovesBlacksmith + +- type: loadout + id: CP14ClothingGlovesGirdles + equipment: + gloves: CP14ClothingGlovesGirdles \ 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 e5331881db..ac1b7ea9d7 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -69,7 +69,7 @@ - CP14GeneralOuterClothing - CP14GeneralEyes - CP14BlacksmithCloak - - CP14GeneralGloves + - CP14BlacksmithGloves - CP14GeneralShirt - CP14GeneralPants - CP14GeneralShoes diff --git a/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/equipped-HAND.png b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..c8122e3e2cb6933f3693678ec7244d849fe2242f GIT binary patch literal 595 zcmV-Z0<8UsP)Px%4M{{nRCt{2+A&KbK@xY|uvF%Kfb^bb2Y0JVUFU8yCW^M**u=J_Vni! z+qCAf^8urxDALKhuY0KorYgZsN%TwYzs zufahnilTSd)vF$WC)2Q2#>Eyw;JJM*zc+vA8e6~r7{#1w=%CX}b?5c%(-8WOw3+6x z@lkBm1P#54uFYmH!T498`#R9aNuJ?wXZyqJKI_XD#Xj8GMv`ax^JuM;7{3DX<4dVl z&LjY+(G~T+EmN($j!rMd=s1ndCKxXOFkIP97y1?W%-uHCYUicUALw5Po86zvstzBl hYF$J`L`1Zz{sIsI8NNz@KP~_O002ovPDHLkV1l8X7JC2y literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fde660398d977a27f6ac175667baec30135b1698 GIT binary patch literal 520 zcmV+j0{8uiP)Px$!bwCyR9J=Wl)b9kKoEsLhhS_hOO1>qaFHN+A;m3>L&`jW@B`!x@`Ax#p5a15 zeo%C|O~4jWvxk`TWxf@U3TW2nKL`kqeqV(|2qax^)0Kb2JR>F2j z3Q3Y3I^}xaB}kLUB4qaZEu$}A5s%;1habOg7V)er`O@=v^X@$_qgTwUoXL2^dNEVC z=IY#mC;tVH={G)o+yHQ&WeD3rctZtTZAmBJGzoy70bx5tzROnb0Vt~)fHqrh>VPKJ zqyR}FiA4xt$TcG0MHEt9>c&+9w6~M-2!Oz`47sqKe~8PfCh}c2$pcHz1G2LsT8B`0 zLlyb%$=z1&iF}t>gd~MDg378UaI6#Z`z#|C;n@MbC_s2awe&nT$pew^8eg>tU3t38 z2^@>0kfghut=tof(2%FQ+*o$Cfc0Xgbdsisz_E-FUAYznM_bCOHX=0n%@*itnw4zj z-Xshhi*%PWo!<>KsjwZA>@aAGXxox!hwvCA6=2BAsy3}`4qo%^$@z*EeeoCQM3eEz zkSEz;uwKlRK2PoD+rMMm(fSRKiL#UJrn@km-*sAKJ$m%$(ZnAw!yP0Y^(SWl0000< KMNUMnLSTZIjqT0= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/meta.json new file mode 100644 index 0000000000..efe9bf36a5 --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Gloves/blacksmith_gloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by creamy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +}