Crew goals update (#355)

* randomization goals support

* maps update

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

@@ -21,6 +21,20 @@
   components:
   - type: SpawnPoint
     job_id: CP14Alchemist
+  - type: Sprite
+    layers:
+      - state: green
+      - state: zookeeper #TODO Replace
+
+- type: entity
+  id: CP14SpawnPointCaptain
+  parent: SpawnPointJobBase
+  name: captain
+  categories:
+  - Spawner
+  components:
+  - type: SpawnPoint
+    job_id: CP14Captain
   - type: Sprite
     layers:
       - state: green

Resources/Prototypes/_CP14/GameRules/roundstart.yml

@@ -12,10 +12,9 @@
   noSpawn: true
   components:
   - type: CP14ExpeditionObjectivesRule
-    objectives:
-    #- CP14ExpeditionCollectGoldObjective
-    - CP14PersonalCurrencyCollectObjectiveMedium
-  # Expedition random objectives
-  # main objective + sub objective?
-  # motivations
+    departmentObjectives:
+      CP14Command:
+      - CP14ExpeditionCollectObjectiveGroup
+      CP14Mercenary:
+      - CP14PersonalCurrencyCollectObjectiveGroup
   # antags

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -11,7 +11,7 @@
           mapNameTemplate: "Meteor Arena"
         - type: StationJobs
           availableJobs:
-            CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement
+            CP14Captain: [ -1, -1 ]
 
 - type: gameMap
   id: AlchemyTest
@@ -33,6 +33,7 @@
           availableJobs:
             CP14Adventurer: [ -1, -1 ]
             CP14Alchemist: [ -1, -1 ]
+            CP14Captain: [1, 1]
 
 - type: gameMap
   id: BattleRoyale
@@ -51,6 +52,7 @@
           availableJobs:
             CP14Adventurer: [ -1, -1 ]
             CP14Alchemist: [ -1, -1 ]
+            CP14Captain: [1, 1]
         - type: StationBiome
           biome: CP14GrassFill
         - type: CP14StationExpeditionTarget

Resources/Prototypes/_CP14/Objectives/expedition_objectives.yml

@@ -6,6 +6,8 @@
   - type: Objective
     issuer: cp14-objective-issuer-expedition
 
+
+# Collect group
 - type: entity
   abstract: true
   parent: CP14BaseExpeditionObjective
@@ -27,4 +29,9 @@
     verifyMapExistence: false
     collectGroup: CP14Gold
   - type: Objective
-    difficulty: 1
+    difficulty: 1
+
+- type: weightedRandom
+  id: CP14ExpeditionCollectObjectiveGroup
+  weights:
+    CP14ExpeditionCollectGoldObjective: 1

Resources/Prototypes/_CP14/Objectives/personal_objectives.yml

@@ -23,6 +23,8 @@
       sprite: /Textures/_CP14/Objects/Economy/gp_coin.rsi
       state: coin10
 
+# Collect currency group
+
 - type: entity
   parent: CP14BasePersonalCurrencyCollectObjective
   id: CP14PersonalCurrencyCollectObjectiveSmall
@@ -48,4 +50,11 @@
   - type: Objective
     difficulty: 3
   - type: CP14CurrencyCollectCondition
-    currency: 3000
+    currency: 3000
+
+- type: weightedRandom
+  id: CP14PersonalCurrencyCollectObjectiveGroup
+  weights:
+    CP14PersonalCurrencyCollectObjectiveSmall: 2
+    CP14PersonalCurrencyCollectObjectiveMedium: 1
+    CP14PersonalCurrencyCollectObjectiveBig: 0.3