Skip to content

Commit

Permalink
[Feat] Bring Back Die Glorious Death, Hijack And Ian's Meat Traitor O…
Browse files Browse the repository at this point in the history
…bjectives (Simple-Station#1323)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

Title

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Reintroduced 3 traitors objectives: steal Ian's meat, Die
Glorious Death and Hijack Evacuation Shuttle

Signed-off-by: Remuchi <[email protected]>
  • Loading branch information
Remuchi authored Dec 7, 2024
1 parent 5d64873 commit 0c60671
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 64 deletions.
27 changes: 12 additions & 15 deletions Resources/Prototypes/Objectives/objectiveGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
RDHardsuitStealObjective: 1
NukeDiskStealObjective: 1
MagbootsStealObjective: 1
# CorgiMeatStealObjective: 1 # DeltaV - Disable the horrible murder of Ian as an objective
CorgiMeatStealObjective: 1
MantisKnifeStealObjective: 1 # Nyanotrasen - ForensicMantis steal objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml
ClipboardStealObjective: 1
CaptainGunStealObjective: 0.5
Expand All @@ -38,8 +38,8 @@
id: TraitorObjectiveGroupState
weights:
EscapeShuttleObjective: 1
# DieObjective: 0.05 # DeltaV - Disable the lrp objective aka murderbone justification
#HijackShuttleObjective: 0.02
DieObjective: 0.05
HijackShuttleObjective: 0.02

- type: weightedRandom
id: TraitorObjectiveGroupSocial
Expand All @@ -48,7 +48,6 @@
RandomTraitorProgressObjective: 1
RaiseGlimmerObjective: 0.5 # Nyanotrasen - Raise glimmer to a target amount, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml


#Thief groups
- type: weightedRandom
id: ThiefObjectiveGroups
Expand All @@ -67,37 +66,35 @@
weights:
ThiefObjectiveGroupEscape: 1



- type: weightedRandom
id: ThiefObjectiveGroupCollection
weights:
HeadCloakStealCollectionObjective: 1 #command
HeadCloakStealCollectionObjective: 1 #command
HeadBedsheetStealCollectionObjective: 1
StampStealCollectionObjective: 1
DoorRemoteStealCollectionObjective: 1
TechnologyDiskStealCollectionObjective: 1 #rnd
FigurineStealCollectionObjective: 0.3 #service
TechnologyDiskStealCollectionObjective: 1 #rnd
FigurineStealCollectionObjective: 0.3 #service
IDCardsStealCollectionObjective: 1
LAMPStealCollectionObjective: 2 #only for moth

- type: weightedRandom
id: ThiefObjectiveGroupItem
weights:
ForensicScannerStealObjective: 1 #sec
ForensicScannerStealObjective: 1 #sec
FlippoEngravedLighterStealObjective: 0.5
ClothingHeadHatWardenStealObjective: 1
ClothingOuterHardsuitVoidParamedStealObjective: 1 #med
ClothingOuterHardsuitVoidParamedStealObjective: 1 #med
MedicalTechFabCircuitboardStealObjective: 1
ClothingHeadsetAltMedicalStealObjective: 1
FireAxeStealObjective: 1 #eng
FireAxeStealObjective: 1 #eng
AmePartFlatpackStealObjective: 1
ExpeditionsCircuitboardStealObjective: 1 #sup
ExpeditionsCircuitboardStealObjective: 1 #sup
CargoShuttleCircuitboardStealObjective: 1
SalvageShuttleCircuitboardStealObjective: 1
ClothingEyesHudBeerStealObjective: 1 #srv
ClothingEyesHudBeerStealObjective: 1 #srv
BibleStealObjective: 1
ClothingNeckGoldmedalStealObjective: 1 #other
ClothingNeckGoldmedalStealObjective: 1 #other
ClothingNeckClownmedalStealObjective: 0.5

- type: weightedRandom
Expand Down
98 changes: 49 additions & 49 deletions Resources/Prototypes/Objectives/traitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
limit: 2 # there is usually only 1 of each steal objective, have 2 max for drama

- type: entity # Head of Security steal objective.
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseTraitorStealObjective
id: HoSAntiqueWeaponStealObjective
components:
Expand All @@ -50,7 +50,7 @@
# state

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: [BaseTraitorObjective, BaseLivingObjective]
id: EscapeShuttleObjective
name: Escape to centcom alive and unrestrained.
Expand All @@ -63,43 +63,43 @@
state: shuttle
- type: EscapeShuttleCondition

##- type: entity # DeltaV
# categories: [ HideSpawnMenu ]
# parent: BaseTraitorObjective
# id: DieObjective
# name: Die a glorious death
# description: Die.
# components:
# - type: Objective
# difficulty: 0.5
# icon:
# sprite: Mobs/Ghosts/ghost_human.rsi
# state: icon
# - type: ObjectiveBlacklistRequirement
# blacklist:
# components:
# - EscapeShuttleCondition
# - StealCondition
# - type: DieCondition
- type: entity
categories: [HideSpawnMenu]
parent: BaseTraitorObjective
id: DieObjective
name: Die a glorious death
description: Die.
components:
- type: Objective
difficulty: 0.5
icon:
sprite: Mobs/Ghosts/ghost_human.rsi
state: icon
- type: ObjectiveBlacklistRequirement
blacklist:
components:
- EscapeShuttleCondition
- StealCondition
- type: DieCondition

#- type: entity
# categories: [ HideSpawnMenu ]
# parent: [BaseTraitorObjective, BaseLivingObjective]
# id: HijackShuttleObjective
# name: Hijack emergency shuttle
# description: Leave on the shuttle free and clear of the loyal Nanotrasen crew on board. Use ANY methods available to you. Syndicate agents, Nanotrasen enemies, and handcuffed hostages may remain alive on the shuttle. Ignore assistance from anyone other than a support agent.
# components:
# - type: Objective
# difficulty: 5 # insane, default config max difficulty
# icon:
# sprite: Objects/Tools/emag.rsi
# state: icon
# - type: HijackShuttleCondition
- type: entity
categories: [HideSpawnMenu]
parent: [BaseTraitorObjective, BaseLivingObjective]
id: HijackShuttleObjective
name: Hijack emergency shuttle
description: Leave on the shuttle free and clear of the loyal Nanotrasen crew on board. Use ANY methods available to you. Syndicate agents, Nanotrasen enemies, and handcuffed hostages may remain alive on the shuttle. Ignore assistance from anyone other than a support agent.
components:
- type: Objective
difficulty: 5 # insane, default config max difficulty
icon:
sprite: Objects/Tools/emag.rsi
state: icon
- type: HijackShuttleCondition

# kill

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: [BaseTraitorObjective, BaseKillObjective]
id: KillRandomPersonObjective
description: Do it however you like, just make sure they don't make it to centcom.
Expand All @@ -112,7 +112,7 @@
- type: PickRandomPerson

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: [BaseTraitorObjective, BaseKillObjective]
id: KillRandomHeadObjective
description: We need this head gone and you probably know why. Good luck, agent.
Expand All @@ -133,7 +133,7 @@
# social

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: [BaseTraitorSocialObjective, BaseKeepAliveObjective]
id: RandomTraitorAliveObjective
description: Identify yourself at your own risk. We just need them alive.
Expand All @@ -145,7 +145,7 @@
- type: RandomTraitorAlive

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: [BaseTraitorSocialObjective, BaseHelpProgressObjective]
id: RandomTraitorProgressObjective
description: Identify yourself at your own risk. We just need them to succeed.
Expand All @@ -171,7 +171,7 @@
owner: job-name-cmo

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseCMOStealObjective
id: CMOHyposprayStealObjective
components:
Expand Down Expand Up @@ -202,7 +202,7 @@
owner: job-name-rd

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseRDStealObjective
id: RDHardsuitStealObjective
components:
Expand All @@ -214,7 +214,7 @@
difficulty: 3

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseRDStealObjective
id: HandTeleporterStealObjective
components:
Expand All @@ -225,7 +225,7 @@
## hos

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseTraitorStealObjective
id: SecretDocumentsStealObjective
components:
Expand All @@ -242,7 +242,7 @@
## ce

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseTraitorStealObjective
id: MagbootsStealObjective
components:
Expand All @@ -256,7 +256,7 @@
## qm

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseTraitorStealObjective
id: ClipboardStealObjective
components:
Expand All @@ -270,7 +270,7 @@
## hop

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseTraitorStealObjective
id: CorgiMeatStealObjective
components:
Expand All @@ -296,7 +296,7 @@
job: Captain

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseCaptainObjective
id: CaptainIDStealObjective
components:
Expand All @@ -305,7 +305,7 @@
verifyMapExistence: true

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseCaptainObjective
id: CaptainJetpackStealObjective
components:
Expand All @@ -314,7 +314,7 @@
verifyMapExistence: true

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseCaptainObjective
id: CaptainGunStealObjective
components:
Expand All @@ -324,7 +324,7 @@
verifyMapExistence: true

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseCaptainObjective
id: NukeDiskStealObjective
components:
Expand All @@ -340,7 +340,7 @@
owner: objective-condition-steal-station

- type: entity
categories: [ HideSpawnMenu ]
categories: [HideSpawnMenu]
parent: BaseTraitorStealObjective
id: StealSupermatterSliverObjective
components:
Expand Down

0 comments on commit 0c60671

Please sign in to comment.