Guildmaster + Comoss update (#808)

* setup guildmaster job

* divide artisans and adventurer departments

* comoss tavern update

* Update comoss.yml

Resources/Locale/en-US/_CP14/job/department.ftl

@@ -8,4 +8,7 @@ department-CP14Bank = Bank
 department-CP14Bank-desc = Persons closely connected with the economy and commerce working in a bank.
 
 department-CP14Guard = Guards
-department-CP14Guard-desc = Protectors and warriors who oversee security and law and order in all corners of the Empire.
+department-CP14Guard-desc = Protectors and warriors who oversee security and law and order in all corners of the Empire.
+
+department-CP14Artisan = Artisans
+department-CP14Artisan-desc = People who have learnt peaceful professions, people who help the settlement with their knowledge and skills.

Resources/Locale/en-US/_CP14/job/job.ftl

@@ -1,8 +1,3 @@
-# Command
-
-cp14-job-name-captain = Captain
-cp14-job-desc-captain = You are the most important person. Organize your wards and manage the processes to complete the task set from the empire.
-
 # Guards
 
 cp14-job-name-guard-commander = Guard commander
@@ -21,6 +16,9 @@ cp14-job-desc-banker = Make deals, store entrusted valuables, issue interest-bea
 
 # Mercenary
 
+cp14-job-name-guildmaster = Guildmaster
+cp14-job-desc-guildmaster = Provide adventurers and artisans with work, and make sure they get enough profit for it. 
+
 cp14-job-name-apprentice = Apprentice
 cp14-job-desc-apprentice = A peaceful citizen of the empire, just beginning to learn the subtleties of various sciences. Choose a specialisation in equipment, and try to help others in their work, in exchange for a salary and invaluable experience.
 

Resources/Locale/en-US/_CP14/lockKey/locks-types.ftl

@@ -37,4 +37,5 @@ cp14-lock-shape-personalhouse15 = house  №15
 cp14-lock-shaper-guard-entrance = barracks, entrance
 cp14-lock-shaper-guard-staff = barracks
 cp14-lock-shaper-guard-commander = guardhouse
-cp14-lock-shaper-guard-weapon-storage = weapons storage
+cp14-lock-shaper-guard-weapon-storage = weapons storage
+cp14-lock-shape-guildmaster = guildmaster

Resources/Locale/ru-RU/_CP14/job/department.ftl

@@ -8,4 +8,7 @@ department-CP14Bank = Банк
 department-CP14Bank-desc = Лица, тесно связанные с экономикой и торговлей, работающие в банке.
 
 department-CP14Guard = Стража
-department-CP14Guard-desc = Защитники и войны, следящие за безопасностью и правопорядком во всех уголках империи.
+department-CP14Guard-desc = Защитники и войны, следящие за безопасностью и правопорядком во всех уголках империи.
+
+department-CP14Artisan = Ремесленники
+department-CP14Artisan-desc = Освоившие мирные профессии, люди, которые помогают поселению своими знаниями и умениями.

Resources/Locale/ru-RU/_CP14/job/job.ftl

@@ -1,8 +1,3 @@
-# Command
-
-cp14-job-name-captain = Капитан
-cp14-job-desc-captain = Вы - самая важная персона. Организуйте ваших подопечных и руководите процессами, чтобы выполнить поставленную от империи задачу.
-
 # Guards
 
 cp14-job-name-guard-commander = Командир стражи
@@ -21,6 +16,9 @@ cp14-job-desc-banker = Заключайте сделки, храните дов
 
 # Mercenary
 
+cp14-job-name-guildmaster = Гильдмастер
+cp14-job-desc-guildmaster = Обеспечивайте авантюристов и ремесленников работой, и следите чтобы они получали достаточно прибыли за это. 
+
 cp14-job-name-apprentice = Подмастерье
 cp14-job-desc-apprentice = Мирный житель империи, только начинающий постигать тонкости различных наук. Выберите специализацию в экипировке, и постарайтесь помочь другим в их работе, в обмен на зарплату и бесценный опыт.
 

Resources/Locale/ru-RU/_CP14/lockKey/locks-types.ftl

@@ -37,4 +37,5 @@ cp14-lock-shape-personalhouse15 = дом №15
 cp14-lock-shaper-guard-entrance = казармы, вход
 cp14-lock-shaper-guard-staff = казармы
 cp14-lock-shaper-guard-commander = дом главы стражи
-cp14-lock-shaper-guard-weapon-storage = хранилище оружия
+cp14-lock-shaper-guard-weapon-storage = хранилище оружия
+cp14-lock-shape-guildmaster = гильдмастер

Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml

@@ -70,20 +70,6 @@
 
 # Mercenary
 
-- type: entity
-  id: CP14SpawnPointApprentice
-  parent: CP14SpawnPointJobBase
-  name: apprentice
-  categories:
-  - Spawner
-  components:
-  - type: SpawnPoint
-    job_id: CP14Apprentice
-  - type: Sprite
-    layers:
-      - state: green
-      - state: workman #TODO Replace
-
 - type: entity
   id: CP14SpawnPointAdventurer
   parent: CP14SpawnPointJobBase
@@ -98,6 +84,37 @@
       - state: green
       - state: adventurer
 
+- type: entity
+  id: CP14SpawnPointGuildmaster
+  parent: CP14SpawnPointJobBase
+  name: guildmaster
+  categories:
+  - Spawner
+  components:
+  - type: SpawnPoint
+    job_id: CP14Guildmaster
+  - type: Sprite
+    layers:
+      - state: green
+      - state: adventurer #TODO
+        color: red
+
+# Artisans
+
+- type: entity
+  id: CP14SpawnPointApprentice
+  parent: CP14SpawnPointJobBase
+  name: apprentice
+  categories:
+  - Spawner
+  components:
+  - type: SpawnPoint
+    job_id: CP14Apprentice
+  - type: Sprite
+    layers:
+      - state: green
+      - state: workman #TODO Replace
+
 - type: entity
   id: CP14SpawnPointAlchemist
   parent: CP14SpawnPointJobBase

Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/guildmaster.yml

@@ -0,0 +1,21 @@
+- type: entity
+  parent: CP14IronDoor
+  id: CP14IronDoorGuardGuildmaster
+  suffix: Guildmaster
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Guildmaster
+  - type: Lock
+    locked: true
+
+# Grill Gate
+
+- type: entity
+  parent: CP14FenceIronGrilleGate
+  id: CP14FenceIronGrilleGateGuildmaster
+  suffix: Guildmaster
+  components:
+  - type: CP14Lock
+    autoGenerateShape: Guildmaster
+  - type: Lock
+    locked: true

Resources/Prototypes/_CP14/LockCategories/lockTypes.yml

@@ -93,6 +93,11 @@
   complexity: 3
   name: cp14-lock-shape-blacksmith2
 
+- type: CP14LockType
+  id: Guildmaster
+  complexity: 5
+  name: cp14-lock-shape-guildmaster
+
 # Personal house
 
 - type: CP14LockType

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -44,9 +44,6 @@
               path: /Maps/_CP14/comoss_d.yml
         - type: CP14StationKeyDistribution
           keys:
-          - TavernDorms1
-          - TavernDorms2
-          - TavernDorms3
           - Alchemy1
           - Alchemy2
           - Blacksmith1
@@ -58,7 +55,7 @@
           - PersonalHouse5
           - PersonalHouse6
           - PersonalHouse7
-          #- PersonalHouse8 #TODO: return 8 house
+          - PersonalHouse8
           - PersonalHouse9
           - PersonalHouse10
           - PersonalHouse11

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml

@@ -0,0 +1,31 @@
+- type: job
+  id: CP14Guildmaster
+  name: cp14-job-name-guildmaster
+  description: cp14-job-desc-guildmaster
+  playTimeTracker: CP14JobGuildmaster
+  startingGear: CP14GuildmasterGear
+  icon: "CP14JobIconGuildmaster"
+  requireAdminNotify: true
+  joinNotifyCrew: true
+  canBeAntag: false
+  supervisors: cp14-job-supervisors-command
+  weight: 2
+  requirements:
+    - !type:RoleTimeRequirement
+      role: CP14JobBlacksmith
+      time: 3600 # 1 hours
+    - !type:RoleTimeRequirement
+      role: CP14JobAlchemist
+      time: 3600 # 1 hours
+    - !type:RoleTimeRequirement
+      role: CP14JobAdventurer
+      time: 7200 # 2 hours
+
+- type: startingGear
+  id: CP14GuildmasterGear
+  storage:
+    back:
+    - CP14EnergyCrystalSmall
+  equipment:
+    belt1: CP14WalletFilledTest
+  #  keys: CP14KeyRingInnkeeper

Resources/Prototypes/_CP14/Roles/Jobs/departments.yml

@@ -8,12 +8,13 @@
   roles:
   - CP14Commandant
   - CP14GuardCommander
+  - CP14Guildmaster
 
 - type: department
   id: CP14Guard
   name: department-CP14Guard
   description: department-CP14Guard-desc
-  weight: 1
+  weight: 9
   color: "#576384"
   roles:
   - CP14GuardCommander
@@ -23,21 +24,31 @@
   id: CP14Bank
   name: department-CP14Bank
   description: department-CP14Bank-desc
-  weight: 9
+  weight: 8
   color: "#fadb3e"
   roles:
   - CP14Commandant
   - CP14Banker
 
+- type: department
+  id: CP14Artisan
+  name: department-CP14Artisan
+  description: department-CP14Artisan-desc
+  weight: 7
+  color: "#834833"
+  roles:
+  - CP14Guildmaster
+  - CP14Alchemist
+  - CP14Blacksmith
+  - CP14Apprentice
+  - CP14Innkeeper
+
 - type: department
   id: CP14Mercenary
   name: department-CP14Mercenary
   description: department-CP14Mercenary-desc
-  weight: 0
+  weight: 6
   color: "#588151"
   roles:
-  - CP14Apprentice
-  - CP14Adventurer
-  - CP14Alchemist
-  - CP14Innkeeper
-  - CP14Blacksmith
+  - CP14Guildmaster
+  - CP14Adventurer

Resources/Prototypes/_CP14/Roles/play_time_tracker.yml

@@ -25,4 +25,7 @@
   id: CP14JobCommandant
 
 - type: playTimeTracker
-  id: CP14JobBanker
+  id: CP14JobBanker
+
+- type: playTimeTracker
+  id: CP14JobGuildmaster

Resources/Prototypes/_CP14/StatusIcon/job.yml

@@ -84,3 +84,11 @@
     sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
     state: Blacksmith
   jobName: cp14-job-name-blacksmith
+
+- type: jobIcon
+  parent: CP14JobIcon
+  id: CP14JobIconGuildmaster
+  icon:
+    sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
+    state: Guildmaster
+  jobName: cp14-job-name-guildmaster

Resources/Textures/_CP14/Interface/Misc/job_icons.rsi/meta.json

@@ -25,15 +25,15 @@
     {
       "name": "Guard"
     },
-    {
-      "name": "Captain"
-    },
     {
       "name": "Commandant"
     },
     {
       "name": "GuardCommander"
     },
+    {
+      "name": "Guildmaster"
+    },
     {
       "name": "Innkeeper"
     }