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>

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

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 = Штаны торговца

Resources/Prototypes/_CP14/Catalog/Fills/closets.yml

@@ -121,6 +121,7 @@
       - id: CP14EnergyCrystalMedium
       - id: CP14CrystalLampBlueEmpty
       - id: CP14StampGuardCommander
+      - id: CP14ClothingCloakAristocraticCloak
 
 - type: entity
   parent: CP14WoodenCloset

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
+    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

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

Resources/Prototypes/_CP14/Loadouts/Jobs/commandant.yml

@@ -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

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

Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml

@@ -112,10 +112,8 @@
   id: JobCP14Commandant
   groups:
   - CP14SkillTree
-  - CP14CommandantHead
   - CP14MerchantOuterClothing
   - CP14GeneralEyes
-  - CP14CommandantCloak
   - CP14MerchantShirt
   - CP14MerchantPants
   - CP14MerchantShoes

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
+        }
+    ]
+}

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

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"
+        }
+    ]
+}