Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finally Made It so IPCs Can't Have Bad Eye Traits if They Have Cyber Eyes, Etc, Fixes, IPCs Now Can't Take the Basic Cyber Eyes Trait. #1863

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+74 −1
Open

Finally Made It so IPCs Can't Have Bad Eye Traits if They Have Cyber Eyes, Etc, Fixes, IPCs Now Can't Take the Basic Cyber Eyes Trait. #1863

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0050dd8
Finally made it so IPCs cant have eye traits blah blah blah
Diggy0 Mar 3, 2025
db0fcdf
Comically minor fix
Diggy0 Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,21 @@
id: DermalArmor
- type: trait
id: CyberEyes
- type: trait
id: NaniteAutoRepairBots
- type: trait
id: BionicLeg
- type: trait
id: FlareShieldingModule
- type: trait
id: SecurityEyesModule
- type: trait
id: MedicalEyesModule
- type: trait
id: DiagnosticEyesModule
- type: trait
id: OmniEyesModule
- type: trait
id: LightAmplificationModule
- type: trait
id: ThermographicVisionModule
Comment on lines +46 to +63
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Directive: Expansion of Traits in TraitsMachine Group
The incorporation of new traits—NaniteAutoRepairBots, BionicLeg, and the complete suite of cyber eye modules (FlareShieldingModule, SecurityEyesModule, MedicalEyesModule, DiagnosticEyesModule, OmniEyesModule, LightAmplificationModule, ThermographicVisionModule)—into the TraitsMachine group is a decisive upgrade. This expansion fortifies our customization arsenal and ensures that IPCs are never burdened with the basic CyberEyes trait, keeping our fleet’s equipment state-of-the-art.

21 changes: 21 additions & 0 deletions Resources/Prototypes/Traits/disabilities.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
- Photophobia
- Nearsighted
- CyberEyes
- FlareShieldingModule
- SecurityEyesModule
- MedicalEyesModule
- DiagnosticEyesModule
- OmniEyesModule
- LightAmplificationModule
- ThermographicVisionModule
functions:
- !type:TraitAddComponent
components:
Expand All @@ -34,6 +41,13 @@
traits:
- Blindness
- CyberEyes
- FlareShieldingModule
- SecurityEyesModule
- MedicalEyesModule
- DiagnosticEyesModule
- OmniEyesModule
- LightAmplificationModule
- ThermographicVisionModule
functions:
- !type:TraitAddComponent
components:
Expand Down Expand Up @@ -288,6 +302,13 @@
traits:
- Blindness
- CyberEyes
- FlareShieldingModule
- SecurityEyesModule
- MedicalEyesModule
- DiagnosticEyesModule
- OmniEyesModule
- LightAmplificationModule
- ThermographicVisionModule
functions:
- !type:TraitReplaceComponent
components:
Expand Down
34 changes: 34 additions & 0 deletions Resources/Prototypes/Traits/physical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,10 @@
inverted: true
jobs:
- Prisoner # Bionics should be "Confiscated" from long term prisoners.
- !type:CharacterSpeciesRequirement
inverted: true
species:
- IPC
Comment on lines +597 to +600
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

❓ Verification inconclusive

Indentation Alert in CyberEyes Requirement
Our YAML vessel reports a misalignment on these lines—YAMLlint indicates an error at line 598 (expected 6 spaces but found 8). Please adjust the indentation in the CharacterSpeciesRequirement block for the CyberEyes trait so that IPCs are correctly barred from acquiring this trait.

Attention: Adjust YAML Indentation in CyberEyes Trait
Our YAML vessel in Resources/Prototypes/Traits/physical.yml (lines 597-600) indicates that the CharacterSpeciesRequirement block is misaligned. YAMLlint reports an error—expected 6 spaces but found 8—which could prevent the correct barring of IPCs from acquiring the CyberEyes trait. Please adjust the indentation so that the properties line up uniformly. For example, consider revising the snippet to:

    - !type:CharacterSpeciesRequirement
      inverted: true
      species:
        - IPC

This correction will ensure that our code remains shipshape against the disorganized tactics of the Sol Alliance.

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 598-598: wrong indentation: expected 6 but found 8

(indentation)

- !type:CharacterTraitRequirement
inverted: true
traits:
Expand Down Expand Up @@ -899,6 +903,12 @@
- !type:CharacterSpeciesRequirement
species:
- IPC
- !type:CharacterTraitRequirement
inverted: true
traits:
- Photophobia
- Blindness
- Nearsighted
Comment on lines 903 to +911
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Directive: FlareShieldingModule Trait Refinement
Excellent work integrating the inverted trait requirements (Photophobia, Blindness, Nearsighted) for FlareShieldingModule. This maneuver ensures that IPCs won’t inadvertently be saddled with incompatible visual traits. Keep these configurations shipshape!

- !type:CharacterItemGroupRequirement
group: TraitsMind
functions:
Expand Down Expand Up @@ -926,6 +936,9 @@
inverted: true
traits:
- OmniEyesModule
- Photophobia
- Blindness
- Nearsighted
- !type:CharacterItemGroupRequirement
group: TraitsMind
functions:
Expand All @@ -952,6 +965,9 @@
traits:
- DiagnosticEyesModule
- OmniEyesModule
- Photophobia
- Blindness
- Nearsighted
- !type:CharacterItemGroupRequirement
group: TraitsMind
functions:
Expand Down Expand Up @@ -981,6 +997,9 @@
traits:
- MedicalEyesModule
- OmniEyesModule
- Photophobia
- Blindness
- Nearsighted
- !type:CharacterItemGroupRequirement
group: TraitsMind
functions:
Expand Down Expand Up @@ -1010,6 +1029,9 @@
- !type:CharacterTraitRequirement
inverted: true
traits:
- Photophobia
- Blindness
- Nearsighted
- MedicalEyesModule
- DiagnosticEyesModule
- SecurityEyesModule
Expand Down Expand Up @@ -1042,6 +1064,12 @@
- !type:CharacterSpeciesRequirement
species:
- IPC
- !type:CharacterTraitRequirement
inverted: true
traits:
- Photophobia
- Blindness
- Nearsighted
- !type:CharacterItemGroupRequirement
group: TraitsMind
functions:
Expand All @@ -1061,6 +1089,12 @@
- !type:CharacterSpeciesRequirement
species:
- IPC
- !type:CharacterTraitRequirement
inverted: true
traits:
- Photophobia
- Blindness
- Nearsighted
- !type:CharacterItemGroupRequirement
group: TraitsMind
functions:
Expand Down
Loading