From d8e360367e1b11ecef1d6fa04411fa973e53de6b Mon Sep 17 00:00:00 2001
From: Nim <128169402+Nimfar11@users.noreply.github.com>
Date: Tue, 6 May 2025 09:47:46 +0300
Subject: [PATCH] Well and new bed, aristocratic cloak  (#1228)

* well and bed

* aristocratic cloak

* fix

* GuardCommander

* fix2

* nop merchant

* bed resp

* fix well visual

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
---
 .../Locale/en-US/_CP14/loadouts/loadout.ftl   |   6 +---
 .../Locale/ru-RU/_CP14/loadouts/loadout.ftl   |   6 +---
 .../_CP14/Catalog/Fills/closets.yml           |   1 +
 .../Entities/Clothing/Cloak/Roles/general.yml |  13 +++++++-
 .../_CP14/Entities/Structures/well.yml        |  30 ++++++++++++++++++
 .../_CP14/Loadouts/Jobs/commandant.yml        |  26 ---------------
 .../_CP14/Loadouts/Jobs/merchant.yml          |  13 ++++++++
 .../_CP14/Loadouts/role_loadouts.yml          |   2 --
 .../aristocratic_cloak.rsi/equipped-CLOAK.png | Bin 0 -> 3462 bytes
 .../General/aristocratic_cloak.rsi/icon.png   | Bin 0 -> 832 bytes
 .../General/aristocratic_cloak.rsi/meta.json  |  18 +++++++++++
 .../Furniture/wooden_bed.rsi/icon.png         | Bin 604 -> 1032 bytes
 .../Furniture/wooden_bed.rsi/meta.json        |   2 +-
 .../Specific/Farming/well.rsi/icon.png        | Bin 0 -> 1807 bytes
 .../Specific/Farming/well.rsi/meta.json       |  14 ++++++++
 15 files changed, 91 insertions(+), 40 deletions(-)
 create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/well.yml
 delete mode 100644 Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml
 create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/equipped-CLOAK.png
 create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/icon.png
 create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json
 create mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png
 create mode 100644 Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json

diff --git a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl
index 84c2be1f88..fefcd53578 100644
--- a/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl
+++ b/Resources/Locale/en-US/_CP14/loadouts/loadout.ftl
@@ -43,12 +43,8 @@ cp14-loadout-guard-pants = Guard's pants
 cp14-loadout-guard-shirt = Guard's shirt
 cp14-loadout-guard-spells = Guard's spells
 
-# Trade guild
-
-cp14-loadout-commandant-head = Commandant's hat
-cp14-loadout-commandant-cloak = Commandant's cloak
-
 cp14-loadout-merchant-head = Merchant's hat
+cp14-loadout-merchant-cloak = Merchant's cloak
 cp14-loadout-merchant-outer = Merchant's waistcoat
 cp14-loadout-merchant-shirt = Merchant's shirt
 cp14-loadout-merchant-pants = Merchant's pants
diff --git a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl
index bd2e666757..abd16bfc7c 100644
--- a/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl
+++ b/Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl
@@ -43,12 +43,8 @@ cp14-loadout-guard-pants = Штаны стражи
 cp14-loadout-guard-shirt = Рубашка стражи
 cp14-loadout-guard-spells = Заклинания стражи
 
-# Trade guild
-
-cp14-loadout-commandant-head = Шляпа коменданта
-cp14-loadout-commandant-cloak = Накидка коменданта
-
 cp14-loadout-merchant-head = Шляпа торговца
+cp14-loadout-merchant-cloak = Накидка торговца
 cp14-loadout-merchant-outer = Жилет торговца
 cp14-loadout-merchant-shirt = Рубашка торговца
 cp14-loadout-merchant-pants = Штаны торговца
diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
index 642b81a6b7..59c554de93 100644
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -121,6 +121,7 @@
       - id: CP14EnergyCrystalMedium
       - id: CP14CrystalLampBlueEmpty
       - id: CP14StampGuardCommander
+      - id: CP14ClothingCloakAristocraticCloak
 
 - type: entity
   parent: CP14WoodenCloset
diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml
index 19297a0348..3dbbc08cce 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Cloak/Roles/general.yml
@@ -161,4 +161,15 @@
   - type: Sprite
     sprite: _CP14/Clothing/Cloak/Roles/General/yellow_syurko.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Cloak/Roles/General/yellow_syurko.rsi
\ No newline at end of file
+    sprite: _CP14/Clothing/Cloak/Roles/General/yellow_syurko.rsi
+
+- type: entity
+  parent: CP14ClothingCloakBase
+  id: CP14ClothingCloakAristocraticCloak
+  name: aristocratic cloak
+  description: Aristocratic red coat with fur collar, very expensive, very cool, a little uncomfortable.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/well.yml b/Resources/Prototypes/_CP14/Entities/Structures/well.yml
new file mode 100644
index 0000000000..b352041586
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Structures/well.yml
@@ -0,0 +1,30 @@
+- type: entity
+  id: CP14StoneWell
+  parent: BaseStructure
+  categories: [ ForkFiltered ]
+  name: well
+  description: At the bottom of this well gurgles clear water. If you have a bucket, you can reach it.
+  components:
+  - type: Sprite
+    noRot: true
+    offset: 0, 0.3
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Specific/Farming/well.rsi
+    layers:
+    - state: icon
+  #- type: Damageable
+  #  damageContainer: StructuralInorganic
+  #  damageModifierSet: CP14RockStructural
+  - type: DrawableSolution
+    solution: pool
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable.
+        reagents:
+        - ReagentId: Water
+          Quantity: 9999999
+  - type: DrainableSolution
+    solution: pool
+  - type: Drink
+    solution: pool
diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml
deleted file mode 100644
index 7250e6312a..0000000000
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Head
-
-- type: loadoutGroup
-  id: CP14CommandantHead
-  name: cp14-loadout-commandant-head
-  loadouts:
-  - CP14ClothingHeadBowlerGolden
-
-- type: loadout
-  id: CP14ClothingHeadBowlerGolden
-  equipment:
-    head: CP14ClothingHeadBowlerGolden
-
-# Cloak
-
-- type: loadoutGroup
-  id: CP14CommandantCloak
-  name: cp14-loadout-commandant-cloak
-  loadouts:
-  - CP14ClothingCloakCommandantJacket
-
-- type: loadout
-  id: CP14ClothingCloakCommandantJacket
-  equipment:
-    cloak: CP14ClothingCloakCommandantJacket
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml
index 49217715ac..9508918d42 100644
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/merchant.yml
@@ -13,6 +13,19 @@
   equipment:
     head: CP14ClothingHeadBowler
 
+# Cloak
+
+- type: loadoutGroup
+  id: CP14MerchantCloak
+  name: cp14-loadout-merchant-cloak
+  loadouts:
+  - CP14ClothingCloakCommandantJacket
+
+- type: loadout
+  id: CP14ClothingCloakCommandantJacket
+  equipment:
+    cloak: CP14ClothingCloakCommandantJacket
+
 # OuterClothing
 
 - type: loadoutGroup
diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
index 96f2cbe6e5..1ecbd232af 100644
--- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
@@ -112,10 +112,8 @@
   id: JobCP14Commandant
   groups:
   - CP14SkillTree
-  - CP14CommandantHead
   - CP14MerchantOuterClothing
   - CP14GeneralEyes
-  - CP14CommandantCloak
   - CP14MerchantShirt
   - CP14MerchantPants
   - CP14MerchantShoes
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/equipped-CLOAK.png
new file mode 100644
index 0000000000000000000000000000000000000000..b47d8bb3f1f8fa975c42300859423c09b0d14465
GIT binary patch
literal 3462
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
bO-%t=@Er!0Ki8<`vp>dA&kS9z;~e#W&7W@c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f52ff22d8ad9a57597d1a5e6d7b07dd6e1b00a00
GIT binary patch
literal 832
zcmV-G1Hb%<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj7&`Cr=R9Hvtl}$?<Q51%su}0G*W+7E$4AD>&L<&_m
zMJb_iAr?OnYHR66uzx^z{R5?4mi~e+3Vsx%3N0=SxM+8YwVObKj13`)TDpjdj7FU<
z;*6Qm%#5pckq2fm=iE8xz2}}e7phdL@{bYp1|#0Rc_lZsG_ts~!gfR?CmjLsaIgn}
z&tJdaC>}QvFflS9cXb9>UI?p+%W>Ns%+1fRy0*^7x2WZ~HG0E!OpFZ3&z?@|%~wdJ
zlepY=h6ej&y{{6M1mtrP2YY{rCq!Pqoo9AtRO5Hs9ZXG!=<U5vJ}2RF+ckb8ED0#=
zW(aR?($yKD%@@Gu_2afXRR4#M?-?DNWNYgOF1MY%pQ7e_BP^ZOSi4UKIPx{q*WXPv
z5@RQkQG22H-d$X7JNcYMVK;-b&c=qAv=rM?1suX{0J375<%O`O#7ZSX!5}+{jB0<-
z)@rE_Oa%-D{H5L3l$OrT&ydeanl*j>-2hBYhXA-E*K7Pnm<muRoD_NdWJrB4{}tnj
z(wRpiF%IR@#+`LG)o+Al0bC?lU0c_b8elsj65iZYEAgwC*Z7Sv72r5O2f*3U%J|r@
znnXdV#CAl)=k?<Wc-1Oc!BhZcJ4&UK_`LorlTdkA2GLEhB;Zh%86O+Q=k>F?wyt-p
zL?bZ(8U%st@rmAjEv5nvPS4<Cca(K}B|^a<?KYR*ToF?Nhq8>PzK&=lMk<{oo)9%t
zkg{2zi2E%Z(;x`+cs-`gU@D+NxEyHlgh*Fs04|a$kAlzZS1VO(EA>K0v++PO6wu@K
z$V#BBm?jhqs^_dHcP7x((nvHC<5<20I`Ne-6i_(54A3A5q|!-dUq08YQJ8)42re!z
zfYgyhwg|iX8ABC@0-UunsUwM<LJ@#3pEjUu<my>mS^?m+D6zYr5zLZf^)@VLVq`$h
z=cFss&`Po@RsKu<0y{1Re~iKM5C8xG4rN$LW=%~1DgXcg2mk;800000(o>TF0000<
KMNUMnLSTZb3~ZtR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json
new file mode 100644
index 0000000000..91784c23bb
--- /dev/null
+++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/aristocratic_cloak.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by vladimir.s, modified by jaraten",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-CLOAK",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/icon.png b/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/icon.png
index aedac7a0fb24d8fc0fdac672aef1aae12c3414f7..4f9e6143d36221b87e15bf753ffd5e6b7cd50a61 100644
GIT binary patch
delta 998
zcmV<C0~!3>1c(TbFn<H6Nkl<ZScUDDPj4GV7{-4No7h=<ZLimxqSkRz$RS%PK?p7t
z2YNspxNt#y20jLtT;KzMxb)VXP!Cl(a4IMgMWRBeQVgnT8snlCd;hp=Z~d>B!*(WP
zdnplW+Do3x?9RM9&oj@=`_95CPH~EtjMOLZzd7j*#$?kPUw?l4bLvHqs+=0YYB_&m
zWLI{-p4gTJK+APWF-(1T`7_C>l?)v-pF0uqot>SDv$ajwi2$f%O}_f#^GQ|V)UN(`
zcp~HgAAI;R0E3=S`Rq9<MCH_qxeP(K55Vs3?sFse{qZF1L>L8K_8A2o$8orI;|2i5
zTm~)Z_9^Bv0DnwanuuVrZ^uE)b>(y5$Ez%wF>(9P`%|&CT21l+XzMEmWkaJKjsd7t
zH>MQNLf9zA!cIgbYclBhb0X9}0mpH0_iwRQ&T!c7$5|jSyXvqL(QMS`go!bupihY$
z^n5wT!QEf6t#{_)RRqz91%PZ?BZx-QN)c!jbSl*iY=6t5*{IWO)FtWcWJW<Joi*oH
zoYbd6o9!6%{3&|{nV3j*ML44h2C#vHyHGxRZc1Ph7Lq!X>{SKYmL;ujHtKT+O%<z>
zi+6zDU_9@DZCSKj7yB8i)5?JpBJR}xpyj$aTiX}~ov;&OnpGL6ItKCHmyMYEmG`z*
zKP?$L=YLmnY`*&u`9g^&qdpHF+$WPU7!F1Z2cvi!GK&lcBebPuw54U9jQXUrCIw@O
z=<#Ffza7wh<dH9w7!E_Sx{kKA%%hISH`lMCX(?*88da^st7Z;u;qM~{yl~nsTTyOX
z*4#eNK3B3PP=A_&aU1v%MbnjOxwp3mfGGT{<$wIqU0~*O(lW9C;t++MC^3y@g*aQ=
z{P6uvY|A3>BYeLBRG+p-Q173VQ>n=6_tvFLIF7^l*EZ$KTdq5G(#1iV&4gy7u8@Lh
zR=IZV3YKNzI1Uh3LDzM;cl);dHg$1xV-j@xtgjewW}P=KT!>dyD#;+ztODTs4f!mf
zu757{Jo#PddHk}!FUKsU$o>A)O$2A^;^xK#pr|jxnf19~p?+43N*;RNl<3g&Xg+*M
z5?t3MIJgt@2?xYW5REA6iv-aKDe4(GPMnAl5c7*xX2HF`Lf(EoE+A{=3?(D^z#SJN
ztJcWKqN8#N(Nl#;+=%UP%wfC#uanQN3SW|4P~&FDgJ?w1?Z^KEs<QtJb)MslCpu7T
zHebkJu}J-(+mA1!|5ASvNZQ7if`0%Mk*}c<SR@Jn000hUSV?A0O#mtY000O800000
U007cclK=n!07*qoM6N<$f{+d5J^%m!

delta 567
zcmV-70?7S{2;2maFn<CTNkl<ZScUDCO>5LZ7{`ArD@wJn2dRXvK~mk9lL&%%m8G6M
z`2l2adgw{~3SLT2egO3Yco69&%yp6Nt*0c51eq;_f`>p~Z0SNgl*wi$$?l2^9?b8Q
zdFILU|IcJH4^&iCRQ&JMUTr>1_T>=(-~8{jWeaS*-AS_J_kY`OYEL@%5`YKxD)o)^
zHBQba05n#*$*t8o05`7HON*YIPttkytZHQWWj)5W9Xc&16WvMTy^jEFtgoS|#HSZL
z?Y{${({k`fAyS69BCZfxOyzC%dTEY73K<S|>9ic$Z3}=Ph_G#kcyFqy8F=*kby`%t
zq|9WCn6WI`*ne=KkK1hve-vu@SF!`!&WjfbsJvO?W$2&7*a5SMdY-q^dGoW-cEEI3
zR%p>Y>rVI23>2Zh`Lgn68ZZw?8H;W&=*EH|ntce1C^A*F+M>K@?BS0>f*?x8rJP|v
z$}s2HjFpK=8S>@pAZJp_5LXCXA#&ni`~}h2!xaEMZGW5nQK;Pmm!|S}Ly^g7>~V0Y
z&)+XIpm2o%dbmOmjXk2VN2leaV}MT|JYM#<QZbdM7!Gy;I5>=G-kvVTG*jE|KTDg%
z=O5+w|KDI5cyV{yH`2}okXUW)1?4tdK*h^eRg`N|i-KYUjg_mYZa5Fs0nM&hhU%6-
zk0!*Y7cf%;-DWds+`PV!=(35A&n^#Pe0=s#3{+GA{07=*1$`0Z?_K}^002ovPDHLk
FV1iv36~6!g

diff --git a/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/meta.json
index 9784f1517d..44c82adf14 100644
--- a/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/meta.json
+++ b/Resources/Textures/_CP14/Structures/Furniture/wooden_bed.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "All right reserved",
-    "copyright": "Created by jaraten(discord) , modified by vladimir.s",
+    "copyright": "Created by jaraten(discord) , modified by vladimir.s & resprite by omsoyk",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..23f5d0bbb7035c6c935c8f79eb8277968d902f8a
GIT binary patch
literal 1807
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json
new file mode 100644
index 0000000000..45007d99a5
--- /dev/null
+++ b/Resources/Textures/_CP14/Structures/Specific/Farming/well.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by omsoyk",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}