juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bank preparation (#499)

Browse Source 
* TownSend condition

* personal objectives update

* add common objectives

* add common objectives

* tweaks

* quartermaster and merchant

* job spawner icons

* add merchants to tavern map
This commit is contained in:
Ed
2024-10-20 21:20:16 +03:00
committed by GitHub
parent 78e94b1623
commit 85463d380f
51 changed files with 857 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml
View File

@@ -1,49 +1,14 @@
- type: entity
id: CP14SpawnPointJobBase
parent: SpawnPointJobBase
abstract: true
categories: [ ForkFiltered ]
- type: entity
id: CP14SpawnPointAdventurer
parent: CP14SpawnPointJobBase
name: adventurer
categories:
- Spawner
components:
- type: SpawnPoint
job_id: CP14Adventurer
- type: Sprite
layers:
- state: green
- state: zookeeper #TODO Replace
- type: entity
id: CP14SpawnPointAlchemist
parent: CP14SpawnPointJobBase
name: alchemist
categories:
- Spawner
components:
- type: SpawnPoint
job_id: CP14Alchemist
- type: Sprite
layers:
- state: green
- state: zookeeper #TODO Replace
- type: entity
id: CP14SpawnPointInnkeeper
parent: CP14SpawnPointJobBase
name: innkeeper
categories:
- Spawner
components:
- type: SpawnPoint
job_id: CP14Innkeeper
- type: Sprite
layers:
- state: green
- state: zookeeper #TODO Replace
sprite: _CP14/Markers/jobs.rsi
snapCardinals: true
# Command
- type: entity
id: CP14SpawnPointCaptain
@@ -57,7 +22,9 @@
- type: Sprite
layers:
- state: green
- state: zookeeper #TODO Replace
- state: workman #TODO Replace
# Security
- type: entity
id: CP14SpawnPointGuardCommander
@@ -71,18 +38,78 @@
- type: Sprite
layers:
- state: green
- state: zookeeper #TODO Replace
- state: workman #TODO Replace
# Bank
- type: entity
id: CP14SpawnPointHouseKeeper
id: CP14SpawnPointQuartermaster
parent: CP14SpawnPointJobBase
name: house keeper
name: quartermaster
categories:
- Spawner
components:
- type: SpawnPoint
job_id: CP14HouseKeeper
job_id: CP14Quartermaster
- type: Sprite
layers:
- state: green
- state: zookeeper #TODO Replace
- state: workman #TODO Replace
- type: entity
id: CP14SpawnPointMerchant
parent: CP14SpawnPointJobBase
name: merchant
categories:
- Spawner
components:
- type: SpawnPoint
job_id: CP14Merchant
- type: Sprite
layers:
- state: green
- state: workman #TODO Replace
# Mercenary
- type: entity
id: CP14SpawnPointAdventurer
parent: CP14SpawnPointJobBase
name: adventurer
categories:
- Spawner
components:
- type: SpawnPoint
job_id: CP14Adventurer
- type: Sprite
layers:
- state: green
- state: adventurer
- type: entity
id: CP14SpawnPointAlchemist
parent: CP14SpawnPointJobBase
name: alchemist
categories:
- Spawner
components:
- type: SpawnPoint
job_id: CP14Alchemist
- type: Sprite
layers:
- state: green
- state: alchemist
- type: entity
id: CP14SpawnPointInnkeeper
parent: CP14SpawnPointJobBase
name: innkeeper
categories:
- Spawner
components:
- type: SpawnPoint
job_id: CP14Innkeeper
- type: Sprite
layers:
- state: green
- state: workman #TODO Replace

9
Resources/Prototypes/_CP14/Entities/Stations/base.yml
View File

@@ -7,9 +7,16 @@
- BaseStationJobsSpawning
- BaseStationAlertLevels #Checks fail without it
- CP14BaseTrading
- CP14BaseCommonObjectives
- type: entity
id: CP14BaseTrading
abstract: true
components:
- type: CP14StationTravelingStoreShipTarget
- type: CP14StationTravelingStoreShipTarget
- type: entity
id: CP14BaseCommonObjectives
abstract: true
components:
- type: CP14StationCommonObjectives

10
Resources/Prototypes/_CP14/GameRules/roundstart.yml
View File

@@ -8,14 +8,16 @@
- type: CP14RoundSeed
- type: entity
id: CP14ResourceHarvesting
id: CP14RoundObjectivesRule
parent: CP14BaseGameRule
categories: [ HideSpawnMenu ]
components:
- type: CP14ExpeditionObjectivesRule
- type: CP14CommonObjectivesRule
departmentObjectives:
CP14Command:
- CP14ExpeditionCollectObjectiveGroup
- CP14TownSendObjectiveGroup
- type: CP14PersonalObjectivesRule
departmentObjectives:
CP14Mercenary:
- CP14PersonalCurrencyCollectObjectiveGroup
# antags

16
Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
View File

@@ -69,7 +69,7 @@
- CP14GeneralTrinkets
- type: roleLoadout
id: JobCP14HouseKeeper
id: JobCP14Quartermaster
groups:
- CP14GeneralHead
- CP14GeneralEyes
@@ -80,4 +80,18 @@
- CP14GeneralPants
- CP14GeneralShoes
- CP14GeneralBack
- CP14GeneralTrinkets
- type: roleLoadout
id: JobCP14Merchant
groups:
- CP14GeneralHead
- CP14GeneralEyes
- CP14GeneralMask
- CP14GeneralCloak
- CP14GeneralGloves
- CP14GeneralShirt
- CP14GeneralPants
- CP14GeneralShoes
- CP14GeneralBack
- CP14GeneralTrinkets

7
Resources/Prototypes/_CP14/Maps/arenas.yml
View File

@@ -76,11 +76,10 @@
CP14Adventurer: [ -1, -1 ]
CP14Alchemist: [ 2, 3 ]
CP14Innkeeper: [ 3, 4 ]
#CP14Captain: [1, 1]
CP14Captain: [1, 1]
CP14Quartermaster: [1, 1]
CP14Merchant: [3, 4]
#CP14GuardCommander: [1, 1]
#CP14HouseKeeper: [1, 1]
#- type: CP14StationExpeditionTarget
# shuttlePath: /Maps/_CP14/Shuttles/test-ship.yml
- type: CP14StationZLevels
defaultMapLevel: 0
levels:

1
Resources/Prototypes/_CP14/Maps/debug.yml
View File

@@ -12,6 +12,7 @@
- type: StationJobs
availableJobs:
CP14Adventurer: [ -1, -1 ]
CP14Captain: [ -1, -1 ]
- type: gameMap
id: Dev

38
Resources/Prototypes/_CP14/Objectives/empire_orders.yml Normal file
View File

@@ -0,0 +1,38 @@
- type: entity
abstract: true
parent: BaseObjective
id: CP14BaseTownObjective
components:
- type: Objective
issuer: cp14-objective-issuer-town
# Send group
- type: entity
abstract: true
parent: CP14BaseTownObjective
id: CP14BaseTownSendObjective
components:
- type: Objective
- type: CP14TownSendCondition
minCollectionSize: 5
maxCollectionSize: 10
objectiveText: cp14-objective-town-send-title
descriptionText: cp14-objective-town-send-desc
descriptionMultiplyText: cp14-objective-town-send-multiply-desc
- type: entity
parent: CP14BaseTownSendObjective
id: CP14TownSendGoldObjective
components:
- type: CP14TownSendCondition
collectGroup: CP14Gold
minCollectionSize: 200
maxCollectionSize: 250
- type: Objective
difficulty: 1
- type: weightedRandom
id: CP14TownSendObjectiveGroup
weights:
CP14TownSendGoldObjective: 1

39
Resources/Prototypes/_CP14/Objectives/expedition_objectives.yml
View File

@@ -1,39 +0,0 @@
- type: entity
abstract: true
parent: BaseObjective
id: CP14BaseExpeditionObjective
components:
- type: Objective
issuer: cp14-objective-issuer-expedition
# Collect group
- type: entity
abstract: true
parent: CP14BaseExpeditionObjective
id: CP14BaseExpeditionCollectObjective
components:
- type: Objective
- type: CP14ExpeditionCollectCondition
minCollectionSize: 5
maxCollectionSize: 10
objectiveText: cp14-objective-expedition-collect-title
descriptionText: cp14-objective-expedition-collect-desc
descriptionMultiplyText: cp14-objective-expedition-collect-multiply-desc
- type: entity
parent: CP14BaseExpeditionCollectObjective
id: CP14ExpeditionCollectGoldObjective
components:
- type: CP14ExpeditionCollectCondition
verifyMapExistence: false
collectGroup: CP14Gold
minCollectionSize: 100
maxCollectionSize: 150
- type: Objective
difficulty: 1
- type: weightedRandom
id: CP14ExpeditionCollectObjectiveGroup
weights:
CP14ExpeditionCollectGoldObjective: 1

6
Resources/Prototypes/_CP14/Objectives/personal_objectives.yml
View File

@@ -32,7 +32,7 @@
- type: Objective
difficulty: 0.25
- type: CP14CurrencyCollectCondition
currency: 250
currency: 500
- type: entity
parent: CP14BasePersonalCurrencyCollectObjective
@@ -41,7 +41,7 @@
- type: Objective
difficulty: 0.5
- type: CP14CurrencyCollectCondition
currency: 500
currency: 650
- type: entity
parent: CP14BasePersonalCurrencyCollectObjective
@@ -50,7 +50,7 @@
- type: Objective
difficulty: 1
- type: CP14CurrencyCollectCondition
currency: 1000
currency: 800
- type: weightedRandom
id: CP14PersonalCurrencyCollectObjectiveGroup

16
Resources/Prototypes/_CP14/Roles/Jobs/Bank/merchant.yml Normal file
View File

@@ -0,0 +1,16 @@
- type: job
id: CP14Merchant
name: cp14-job-name-merchant
description: cp14-job-desc-merchant
playTimeTracker: CP14JobMerchant
startingGear: CP14MerchantGear
icon: "CP14JobIconMerchant"
requireAdminNotify: true
joinNotifyCrew: true
canBeAntag: true
supervisors: cp14-job-supervisors-quartermaster
- type: startingGear
id: CP14MerchantGear
equipment:
belt1: CP14KeyRingInnkeeper

17
Resources/Prototypes/_CP14/Roles/Jobs/Bank/quartermaster.yml Normal file
View File

@@ -0,0 +1,17 @@
- type: job
id: CP14Quartermaster
name: cp14-job-name-quartermaster
description: cp14-job-desc-quartermaster
playTimeTracker: CP14JobQuartermaster
startingGear: CP14QuartermasterGear
icon: "CP14JobIconQuartermaster"
requireAdminNotify: true
joinNotifyCrew: true
canBeAntag: false
supervisors: cp14-job-supervisors-command
weight: 2
- type: startingGear
id: CP14QuartermasterGear
equipment:
belt1: CP14KeyRingInnkeeper

1
Resources/Prototypes/_CP14/Roles/Jobs/Command/captain.yml
View File

@@ -9,6 +9,7 @@
joinNotifyCrew: true
canBeAntag: false
supervisors: cp14-job-supervisors-command
weight: 10
- type: startingGear
id: CP14CaptainGear

1
Resources/Prototypes/_CP14/Roles/Jobs/Command/guard_commander.yml
View File

@@ -9,6 +9,7 @@
joinNotifyCrew: true
canBeAntag: false
supervisors: cp14-job-supervisors-command
weight: 2
- type: startingGear
id: CP14GuardCommanderGear

16
Resources/Prototypes/_CP14/Roles/Jobs/Command/house_keeper.yml
View File

@@ -1,16 +0,0 @@
- type: job
id: CP14HouseKeeper
name: cp14-job-name-house-keeper
description: cp14-job-desc-house-keeper
playTimeTracker: CP14JobHouseKeeper
startingGear: CP14HouseKeeperGear
icon: "CP14JobIconHouseKeeper"
requireAdminNotify: true
joinNotifyCrew: true
canBeAntag: false
supervisors: cp14-job-supervisors-command
- type: startingGear
id: CP14HouseKeeperGear
equipment:
belt1: CP14KeyRingInnkeeper

37
Resources/Prototypes/_CP14/Roles/Jobs/departments.yml
View File

@@ -1,19 +1,32 @@
- type: department
id: CP14Mercenary
name: department-CP14Mercenary
description: department-CP14Mercenary-desc
color: "#429976"
roles:
- CP14Adventurer
- CP14Alchemist
- CP14Innkeeper
- type: department
id: CP14Command
name: department-CP14Command
description: department-CP14Command-desc
color: "#fadb3e"
primary: false
weight: 10
color: "#3ec8fa"
roles:
- CP14Captain
- CP14Quartermaster
- CP14GuardCommander
- CP14HouseKeeper
- type: department
id: CP14Bank
name: department-CP14Bank
description: department-CP14Bank-desc
weight: 9
color: "#fadb3e"
roles:
- CP14Quartermaster
- CP14Merchant
- type: department
id: CP14Mercenary
name: department-CP14Mercenary
description: department-CP14Mercenary-desc
weight: 0
color: "#429976"
roles:
- CP14Adventurer
- CP14Alchemist
- CP14Innkeeper

5
Resources/Prototypes/_CP14/Roles/play_time_tracker.yml
View File

@@ -16,4 +16,7 @@
id: CP14JobGuardCommander
- type: playTimeTracker
id: CP14JobHouseKeeper
id: CP14JobQuartermaster
- type: playTimeTracker
id: CP14JobMerchant

14
Resources/Prototypes/_CP14/StatusIcon/job.yml
View File

@@ -47,8 +47,16 @@
- type: jobIcon
parent: CP14JobIcon
id: CP14JobIconHouseKeeper
id: CP14JobIconQuartermaster
icon:
sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
state: HouseKeeper
jobName: cp14-job-name-house-keeper
state: Quartermaster
jobName: cp14-job-name-quartermaster
- type: jobIcon
parent: CP14JobIcon
id: CP14JobIconMerchant
icon:
sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi
state: Merchant
jobName: cp14-job-name-merchant

3
Resources/Prototypes/_CP14/game_presets.yml
View File

@@ -27,4 +27,5 @@
description: sandbox-description
showInVote: true # For playtest period only
rules:
- Sandbox
- Sandbox
- CP14RoundObjectivesRule