Adventure guild returns (#1745)

* adventure guild

* fix order board

* fixes

* loadout + fix

* commit

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

@@ -82,6 +82,20 @@
       - state: green
       - state: guildmaster
 
+- type: entity
+  id: CP14SpawnPointGuildworker
+  parent: CP14SpawnPointJobBase
+  name: guildworker
+  categories:
+  - Spawner
+  components:
+  - type: SpawnPoint
+    job_id: CP14GuildWorker
+  - type: Sprite
+    layers:
+      - state: green
+      - state: guildmaster #TODO
+
 # Artisans
 
 - type: entity

Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/guildmaster.yml

@@ -8,9 +8,8 @@
 
 - type: entity
   parent: CP14KeyGoldBlank
-  id: CP14KeyDemiplaneCrystal
-  suffix: Demiplane Crystal
+  id: CP14KeyAdventureGuild
+  suffix: Adventure Guild
   components:
   - type: CP14Key
-    autoGenerateShape: DemiplaneCrystal
-
+    autoGenerateShape: AdventureGuild

Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml

@@ -127,4 +127,13 @@
   - type: StorageFill
     contents:
     - id: CP14KeyGuildmaster
-    - id: CP14KeyDemiplaneCrystal
+    - id: CP14KeyAdventureGuild
+
+- type: entity
+  parent: CP14BaseKeyRing
+  id: CP14KeyRingGuildworker
+  suffix: Guildworker
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14KeyAdventureGuild

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

@@ -8,25 +8,19 @@
   - type: Lock
     locked: true
 
-# Grill Gate
-
 - type: entity
-  parent: CP14FenceGateBigIron
-  id: CP14FenceGateBigIronGuildmaster
-  suffix: Guildmaster
+  parent: CP14WoodenDoor
+  id: CP14WoodenDoorAdventureGuild
+  suffix: Adventure guild
   components:
   - type: CP14Lock
-    autoGenerateShape: Guildmaster
+    autoGenerateShape: AdventureGuild
   - type: Lock
     locked: true
 
 - type: entity
-  parent: CP14FenceGateBigIron
-  id: CP14FenceGateBigIronDemiplaneCrystal
-  suffix: DemiplaneCrystal
-  components:
-  - type: CP14Lock
-    autoGenerateShape: DemiplaneCrystal
-  - type: Lock
-    locked: false
-
+  parent:
+  - CP14WoodenDoorAdventureGuild
+  - CP14WoodenDoorMirrored
+  id: CP14WoodenDoorAdventureGuildMirrored
+  suffix: Adventure guild, Mirrored

Resources/Prototypes/_CP14/Entities/Structures/Furniture/order_board.yml

@@ -0,0 +1,119 @@
+- type: entity
+  id: CP14OrderBoard
+  parent:
+  - BaseStructure
+  - CP14BaseFlammableSpreading
+  name: orders board
+  description: Is there a job for a witcher?
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    snapCardinals: true
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Furniture/order_board.rsi
+    layers:
+      - state: base
+      - state: paper-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: StorageFillVisualizer
+    maxFillLevels: 4
+    fillBaseName: paper
+  - type: Appearance
+  - type: InteractionOutline
+  - type: Clickable
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: CP14Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,4,3
+    maxItemSize: Small
+    whitelist:
+      tags:
+        - Document
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: Construction
+    graph: CP14OrderBoard
+    node: CP14OrderBoard
+
+- type: entity
+  parent: CP14OrderBoard
+  id: CP14OrderBoardBlue
+  suffix: Blue flag
+  components:
+  - type: Sprite
+    layers:
+      - state: base
+      - state: paper-0
+      - map: ["enum.StorageFillLayers.Fill"]
+      - state: flag_blue
+
+- type: entity
+  parent: CP14OrderBoard
+  id: CP14OrderBoardGreen
+  suffix: Green flag
+  components:
+  - type: Sprite
+    layers:
+      - state: base
+      - state: paper-0
+      - map: ["enum.StorageFillLayers.Fill"]
+      - state: flag_green
+
+- type: entity
+  parent: CP14OrderBoard
+  id: CP14OrderBoardPurple
+  suffix: Purple flag
+  components:
+  - type: Sprite
+    layers:
+      - state: base
+      - state: paper-0
+      - map: ["enum.StorageFillLayers.Fill"]
+      - state: flag_purple
+
+- type: entity
+  parent: CP14OrderBoard
+  id: CP14OrderBoardRed
+  suffix: Red flag
+  components:
+  - type: Sprite
+    layers:
+      - state: base
+      - state: paper-0
+      - map: ["enum.StorageFillLayers.Fill"]
+      - state: flag_red
+
+- type: entity
+  parent: CP14OrderBoard
+  id: CP14OrderBoardYellow
+  suffix: Yellow flag
+  components:
+  - type: Sprite
+    layers:
+      - state: base
+      - state: paper-0
+      - map: ["enum.StorageFillLayers.Fill"]
+      - state: flag_yellow

Resources/Prototypes/_CP14/Entities/Structures/Furniture/wallmount_order_border.yml

@@ -1,58 +0,0 @@
-- type: entity
-  id: CP14WallmountOrdersBorder
-  parent:
-  - CP14BaseWallmount
-  - CP14BaseFlammableSpreading
-  name: orders board
-  description: Is there a job for a witcher?
-  categories: [ ForkFiltered ]
-  components:
-  - type: Sprite
-    drawdepth: Mobs
-    sprite: _CP14/Structures/Furniture/wallmount_order_board.rsi
-    layers:
-      - state: base
-      - state: paper-0
-      - map: ["enum.StorageFillLayers.Fill"]
-  - type: StorageFillVisualizer
-    maxFillLevels: 4
-    fillBaseName: paper
-  - type: Appearance
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: CP14Wood
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 30
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: WoodDestroy
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          CP14WoodenPlanks1:
-            min: 1
-            max: 2
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  - type: Storage
-    grid:
-    - 0,0,4,3
-    maxItemSize: Small
-    whitelist:
-      tags:
-        - Document
-  - type: UserInterface
-    interfaces:
-      enum.StorageUiKey.Key:
-        type: StorageBoundUserInterface
-  - type: ContainerContainer
-    containers:
-      storagebase: !type:Container
-  - type: Construction
-    graph: CP14WallmountOrdersBorder
-    node: CP14WallmountOrdersBorder

Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml

@@ -142,6 +142,18 @@
   - CP14GeneralVillagerBackReinforced
   - CP14GeneralTrinkets
 
+- type: roleLoadout
+  id: JobCP14GuildWorker
+  groups:
+  - CP14GuildmasterOuterClothing
+  - CP14GeneralEyes
+  - CP14GeneralHead
+  - CP14GuildmasterShirt
+  - CP14GuildmasterPants
+  - CP14GuildmasterShoes
+  - CP14GeneralVillagerBackReinforced
+  - CP14GeneralTrinkets
+
 - type: roleLoadout
   id: JobCP14Merchant
   groups:

Resources/Prototypes/_CP14/LockCategories/lockTypes.yml

@@ -101,18 +101,6 @@
   complexity: 5
   name: cp14-lock-shape-merchant3
 
-# Mercenary
-
-- type: CP14LockType
-  id: Guildmaster
-  complexity: 6
-  name: cp14-lock-shape-guildmaster
-
-- type: CP14LockType
-  id: DemiplaneCrystal
-  complexity: 6
-  name: cp14-lock-shape-demiplane-crystal
-
 # Personal house
 
 - type: CP14LockType
@@ -228,3 +216,14 @@
   complexity: 7
   name: cp14-lock-shaper-guard-commander
 
+# Adventure Guild
+
+- type: CP14LockType
+  id: Guildmaster
+  complexity: 6
+  name: cp14-lock-shape-guildmaster
+
+- type: CP14LockType
+  id: AdventureGuild
+  complexity: 4
+  name: cp14-lock-shape-adventure-guild

Resources/Prototypes/_CP14/Maps/comoss.yml

@@ -14,7 +14,8 @@
         - type: StationJobs
           availableJobs:
             #Mercenary
-            #CP14Guildmaster: [1, 1]
+            CP14Guildmaster: [1, 1]
+            CP14GuildWorker: [3, 3]
             CP14Adventurer: [ -1, -1 ]
             #Artisans
             CP14Apprentice: [ 5, 5 ]
@@ -52,6 +53,7 @@
         - type: CP14StationProceduralLocation
           location: ComossIsland
           modifiers:
+          - DemiplaneArcSingle
           - RaidSpawners
           - Rabbits
           - Boar

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/orders_border.yml

@@ -1,16 +1,16 @@
 - type: constructionGraph
-  id: CP14WallmountOrdersBorder
+  id: CP14OrderBoard
   start: start
   graph:
     - node: start
       actions:
         - !type:DestroyEntity {}
       edges:
-        - to: CP14WallmountOrdersBorder
+        - to: CP14OrderBoard
           steps:
             - stackGroup: WoodenPlanks
-              amount: 1
+              amount: 3
               doAfter: 3
 
-    - node: CP14WallmountOrdersBorder
-      entity: CP14WallmountOrdersBorder
+    - node: CP14OrderBoard
+      entity: CP14OrderBoard

Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml

@@ -130,10 +130,10 @@
 
 - type: construction
   crystallPunkAllowed: true
-  id: CP14WallmountOrdersBorder
-  graph: CP14WallmountOrdersBorder
+  id: CP14OrderBoard
+  graph: CP14OrderBoard
   startNode: start
-  targetNode: CP14WallmountOrdersBorder
+  targetNode: CP14OrderBoard
   category: construction-category-furniture
   objectType: Structure
   placementMode: SnapgridCenter

Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml

@@ -22,7 +22,7 @@
     - !type:AddComponentSpecial
       components:
       - type: CP14SalaryCounter
-        salary: 400
+        salary: 200
     - !type:CP14AddTradingReputationSpecial
       factions:
       - Guards

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

@@ -0,0 +1,28 @@
+- type: job
+  id: CP14GuildWorker
+  name: cp14-job-name-guildworker
+  description: cp14-job-desc-guildworker
+  playTimeTracker: CP14JobGuildWorker
+  startingGear: CP14GuildWorkerGear
+  icon: "CP14JobIconGuildWorker"
+  supervisors: cp14-job-supervisors-guildmaster
+  weight: 2
+  requirements:
+    - !type:RoleTimeRequirement
+      role: CP14JobAdventurer
+      time: 7200 # 2 hours
+  special:
+    - !type:AddComponentSpecial
+      components:
+      - type: CP14SalaryCounter
+        salary: 50
+
+- type: startingGear
+  id: CP14GuildWorkerGear
+  storage:
+    back:
+    - CP14EnergyCrystalMedium
+    - CP14EnergyCrystalMedium
+  equipment:
+    keys: CP14KeyRingGuildworker
+    belt: CP14WalletFilledTest

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

@@ -1,6 +1,6 @@
 - type: job
   id: CP14Guildmaster
-  setPreference: false
+  setPreference: true
   name: cp14-job-name-guildmaster
   description: cp14-job-desc-guildmaster
   playTimeTracker: CP14JobGuildmaster
@@ -10,21 +10,19 @@
   joinNotifyCrew: true
   canBeAntag: false
   supervisors: cp14-job-supervisors-command
-  weight: 2
+  weight: 3
   requirements:
-    - !type:RoleTimeRequirement
-      role: CP14JobBlacksmith
-      time: 3600 # 1 hours
-    - !type:RoleTimeRequirement
-      role: CP14JobAlchemist
-      time: 3600 # 1 hours
+    #- !type:RoleTimeRequirement
+    #  role: CP14JobGuildWorker
+    #  time: 7200 # 2 hours
     - !type:RoleTimeRequirement
       role: CP14JobAdventurer
-      time: 7200 # 2 hours
-    - !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
+      time: 18000 # 5 hours
+  special:
+    - !type:AddComponentSpecial
+      components:
+      - type: CP14SalaryCounter
+        salary: 200
 
 - type: startingGear
   id: CP14GuildmasterGear
@@ -33,5 +31,4 @@
     - CP14EnergyCrystalMedium
   equipment:
     belt: CP14WalletFilledTest
-    keys: CP14KeyRingGuildmaster
-
+    keys: CP14KeyRingGuildmaster

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

@@ -54,4 +54,5 @@
   color: "#588151"
   roles:
   - CP14Guildmaster
+  - CP14GuildWorker
   - CP14Adventurer

Resources/Prototypes/_CP14/Roles/play_time_tracker.yml

@@ -18,6 +18,9 @@
 - type: playTimeTracker
   id: CP14JobGuildmaster
 
+- type: playTimeTracker
+  id: CP14JobGuildWorker
+
 - type: playTimeTracker
   id: CP14JobAdventurer
 

Resources/Prototypes/_CP14/StatusIcon/job.yml

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