New apprentice role / Новая роль подмастерья (#731)

* new role

* Update role_loadouts.yml

* Update jobs.yml

* Delete g.png

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

@@ -21,6 +21,9 @@ cp14-job-desc-banker = Make deals, store entrusted valuables, issue interest-bea
 
 # Mercenary
 
+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.
+
 cp14-job-name-adventurer = Adventurer
 cp14-job-desc-adventurer = A hunter for thrills, riches and fame, constantly risking his life. Fulfill the most dangerous orders, earning a living by mining resources or killing monsters.
 

Resources/Locale/en-US/_CP14/loadouts/loadout.ftl

@@ -12,6 +12,9 @@ cp14-loadout-general-back = Back
 cp14-loadout-general-trinkets = Trinkets
 cp14-loadout-general-spells = Spells
 cp14-loadout-general-keys = Keys
+# Apprentice
+
+cp14-loadout-apprentice-bundle = Apprentice bundle
 
 # Alchemist
 

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

@@ -21,6 +21,9 @@ cp14-job-desc-banker = Заключайте сделки, храните дов
 
 # Mercenary
 
+cp14-job-name-apprentice = Подмастерье
+cp14-job-desc-apprentice = Мирный житель империи, только начинающий постигать тонкости различных наук. Выберите специализацию в экипировке, и постарайтесь помочь другим в их работе, в обмен на зарплату и бесценный опыт.
+
 cp14-job-name-adventurer = Авантюрист
 cp14-job-desc-adventurer = Охотник за острыми эмоциями, богатствами и славой, постоянно рискующий своей жизнью. Выполняйте самые опасные заказы, зарабатывая на жизнь добычей ресурсов или убийством монстров.
 

Resources/Locale/ru-RU/_CP14/loadouts/loadout.ftl

@@ -13,6 +13,10 @@ cp14-loadout-general-trinkets = Безделушки
 cp14-loadout-general-spells = Заклинания
 cp14-loadout-general-keys = Ключи
 
+# Apprentice
+
+cp14-loadout-apprentice-bundle = Набор подмастерья
+
 # Alchemist
 
 cp14-loadout-alchemist-head = Шляпа алхимика

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

@@ -16,15 +16,14 @@
       - id: CP14Dropper
         amount: 1
       - id: CP14VialTinyReinforced
-        amount: 2
+        amount: 1
       - id: CP14VialTiny
-        amount: 4
+        amount: 3
       - id: CP14VialSmallReinforced
-        amount: 2
+        amount: 1
       - id: CP14VialSmall
         amount: 3
-      - id: CP14Paper
-        amount: 2
+      - id: CP14PaperFolderBlue
       - id: CP14PenFeather
         amount: 1
         #Random start resource
@@ -40,8 +39,6 @@
       - id: CP14VialSmallAgaricMushroom
       - id: CP14VialSmallWildSage
       - id: CP14VialSmallBlueAmanita
-      - id: CP14VialTinyChromiumSlime
-      - id: CP14VialTinyLumiMushroom
 
 - type: entity
   parent: CP14WoodenCloset
@@ -123,8 +120,7 @@
       - id: CP14CopperBar10
       - id: CP14IronBar10
       - id: CP14GoldBar5
-      - id: CP14Paper
-        amount: 2
+      - id: CP14PaperFolderRed
       - id: CP14PenFeather
         amount: 1
 

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

@@ -70,6 +70,20 @@
 
 # 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

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

@@ -0,0 +1,50 @@
+# Equip groups
+
+- type: loadoutGroup
+  id: CP14ApprenticeBundle
+  name: cp14-loadout-apprentice-bundle
+  minLimit: 0
+  loadouts:
+  - CP14BundleAlchemy
+  - CP14BundleBlacksmith
+
+- type: entity
+  id: CP14LoadoutDummyBundleAlchemy
+  categories: [ HideSpawnMenu ]
+  name: alchemy bundle
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
+    state: full
+
+- type: loadout
+  id: CP14BundleAlchemy
+  dummyEntity: CP14LoadoutDummyBundleAlchemy
+  storage:
+    back:
+    - CP14Syringe
+    - CP14VialTinyReinforced
+    - CP14VialSmallReinforced
+    - CP14VialSmallReinforced
+    - CP14VialSmallGroundQuartz
+    - CP14VialSmallBloodFlowerSap
+    - CP14VialSmallAgaricMushroom
+    - CP14VialSmallWildSage
+    - CP14VialSmallBlueAmanita
+
+- type: entity
+  id: CP14LoadoutDummyBundleBlacksmith
+  categories: [ HideSpawnMenu ]
+  name: blacksmith bundle
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/copper_bar.rsi
+    state: bar_3
+
+- type: loadout
+  id: CP14BundleBlacksmith
+  dummyEntity: CP14LoadoutDummyBundleBlacksmith
+  storage:
+    back:
+    - CP14CopperBar10
+    - CP14IronBar10

Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml

@@ -14,6 +14,21 @@
   - CP14GeneralTrinkets
   - CP14GeneralKeys
 
+- type: roleLoadout
+  id: JobCP14Apprentice
+  groups:
+  - CP14GeneralSpells
+  - CP14GeneralHead
+  - CP14GeneralEyes
+  - CP14GeneralGloves
+  - CP14GeneralShirt
+  - CP14GeneralPants
+  - CP14GeneralShoes
+  - CP14GeneralBack
+  - CP14GeneralTrinkets
+  - CP14ApprenticeBundle
+  - CP14GeneralKeys
+
 - type: roleLoadout
   id: JobCP14Alchemist
   groups:

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -13,34 +13,6 @@
           availableJobs:
             CP14Adventurer: [ -1, -1 ]
 
-- type: gameMap
-  id: Village
-  mapName: Sandbox village
-  mapPath: /Maps/_CP14/tavern.yml
-  maxRandomOffset: 0
-  randomRotation: false
-  minPlayers: 0
-  stations:
-    Village:
-      stationProto: CP14BaseExpedition
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: "Sandbox village"
-        - type: StationJobs
-          availableJobs:
-            CP14Adventurer: [ -1, -1 ]
-            CP14Alchemist: [ 2, 4 ]
-            CP14Blacksmith: [ 1, 1 ]
-            CP14Innkeeper: [ 3, 4 ]
-            CP14Commandant: [1, 1]
-            CP14Banker: [3, 4]
-            #CP14GuardCommander: [1, 1]
-        - type: CP14StationZLevels
-          defaultMapLevel: 0
-          levels:
-            -1:
-              path: /Maps/_CP14/tavern_cave.yml
-
 - type: gameMap
   id: Comoss
   mapName: "Comoss island"
@@ -56,6 +28,7 @@
           mapNameTemplate: "Comoss island"
         - type: StationJobs
           availableJobs:
+            CP14Apprentice: [ 5, 5 ]
             CP14Adventurer: [ -1, -1 ]
             CP14Alchemist: [ 2, 2 ]
             CP14Blacksmith: [ 2, 2 ]

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

@@ -0,0 +1,18 @@
+- type: job
+  id: CP14Apprentice
+  name: cp14-job-name-apprentice
+  description: cp14-job-desc-apprentice
+  playTimeTracker: CP14JobApprentice
+  startingGear: CP14ApprenticeGear
+  icon: "CP14JobIconApprentice"
+  supervisors: cp14-job-supervisors-command
+
+- type: startingGear
+  id: CP14ApprenticeGear
+  storage:
+    back:
+    - CP14EnergyCrystalSmall
+    - CP14EnergyCrystalSmall
+  equipment:
+    keys: CP14BaseKeyRing
+    belt1: CP14WalletFilledTest

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

@@ -36,6 +36,7 @@
   weight: 0
   color: "#588151"
   roles:
+  - CP14Apprentice
   - CP14Adventurer
   - CP14Alchemist
   - CP14Innkeeper

Resources/Prototypes/_CP14/Roles/play_time_tracker.yml

@@ -1,5 +1,8 @@
 
 # Jobs
+- type: playTimeTracker
+  id: CP14JobApprentice
+
 - type: playTimeTracker
   id: CP14JobAdventurer
 

Resources/Prototypes/_CP14/StatusIcon/job.yml

@@ -21,6 +21,14 @@
     state: Alchemist
   jobName: cp14-job-name-alchemist
 
+- type: jobIcon
+  parent: CP14JobIcon
+  id: CP14JobIconApprentice
+  icon:
+    sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
+    state: Apprentice
+  jobName: cp14-job-name-apprentice
+
 - type: jobIcon
   parent: CP14JobIcon
   id: CP14JobIconInnkeeper

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

@@ -13,6 +13,9 @@
     {
       "name": "Alchemist"
     },
+    {
+      "name": "Apprentice"
+    },
     {
       "name": "Banker"
     },