Skip to content

Commit

Permalink
Prober and Drainer crafting + Prober sounds (#398)
Browse files Browse the repository at this point in the history
* Prober Drainer graph and sounds

* normality crystal

I knew I was missing something

* Normality = 5 ectoplasm, drainer = 1 crystal

* Fix oopsy

* Psionic and Golemancy guidebooks

* I swear yml sometimes

* Change recipe to fit guidebook

* Update epistemics.yml

* add comment

---------

Signed-off-by: Colin-Tel <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
  • Loading branch information
FluffiestFloof and Colin-Tel authored Nov 11, 2023
1 parent 0815352 commit efe3d0d
Show file tree
Hide file tree
Showing 16 changed files with 324 additions and 169 deletions.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
guide-entry-altars-golemancy = Altars and Golemancy
guide-entry-psionics = Psionics
guide-entry-reverse-engineering = Reverse Engineering
2 changes: 2 additions & 0 deletions Resources/Prototypes/Guidebook/science.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
- Xenoarchaeology
- Robotics
- MachineUpgrading
- Psionics # Nyanotrasen - Psionics guidebook
# - AltarsGolemancy # When it's added # Nyanotrasen - Golemancy guidebook
- ReverseEngineering # Nyanotrasen - Reverse Engineering guidebook

- type: guideEntry
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Nyanotrasen/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,14 @@
Piercing: 0.5
Heat: 1.5
Holy: 3.0

- type: damageModifierSet
id: ShockAbsorber
coefficients:
Blunt: 0.7
Slash: 0.5
Piercing: 0.7
Shock: 0
flatReductions:
Blunt: 5
Heat: 5
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
destroyOnFry: false
- type: ClothingGrantPsionicPower
power: MetapsionicPower
#- type: GuideHelp
#guides:
#- Psionics
- type: GuideHelp
guides:
- Psionics

- type: entity
parent: ClothingHeadHelmetHardsuitSyndie
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
- type: Construction
graph: TinfoilHat
node: tinfoilhat
# - type: GuideHelp
# guides:
# - Psionics
- type: GuideHelp
guides:
- Psionics

- type: entity
parent: ClothingHeadBase
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
- type: entity
parent: BaseItem
id: CrystalNormality
name: normality crystal
description: It looks... normal. Placeholder sprite.
components:
- type: Sprite
sprite: Nyanotrasen/Objects/Materials/materials.rsi
state: bluespace
color: gray
- type: Tag
tags:
- NormalityCrystal

# - type: entity
# parent: BaseItem
# id: CrystalSoul
# name: soul crystal
# description: Contains a soul. Placeholder sprite.
# components:
# - type: Sprite
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# color: purple
# - type: Speech
# - type: Psionic
# - type: SoulCrystal
# - type: SolutionContainerManager
# solutions:
# ectoplasm:
# maxvol: 50
# reagents:
# - ReagentId: Ectoplasm
# Quantity: 50
# - type: Extractable
# grindableSolutionName: ectoplasm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
blockSlots: NONE #tranquillizer darts shouldn't be blocked by a mask
- type: InjectableSolution
solution: ammo
# - type: GuideHelp
# guides:
# - Psionics
- type: GuideHelp
guides:
- Psionics
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
components:
- type: Psionic
- type: GlimmerSource
#- type: Construction #Files are in place, but are commented out
#graph: GlimmerDevices
#node: glimmerProber
- type: Construction
graph: GlimmerDevices
node: glimmerProber
- type: ResearchPointSource
pointspersecond: 20
active: true
Expand Down Expand Up @@ -59,30 +59,30 @@
- type: PowerSwitch
- type: Damageable
damageContainer: Inorganic
# damageModifierSet: ShockAbsorber
damageModifierSet: ShockAbsorber
- type: CargoSellBlacklist
# - type: GuideHelp
# guides:
# - Psionics
- type: GuideHelp
guides:
- Psionics
- type: AmbientSound
range: 6
volume: -6
sound: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
- type: AmbientOnPowered
# - type: GlimmerSound
# glimmerTier:
# Minimal:
# path: /Audio/Ambience/Objects/prober_hum_low.ogg
# Low:
# path: /Audio/Ambience/Objects/prober_hum_low.ogg
# Moderate:
# path: /Audio/Ambience/Objects/prober_hum_moderate.ogg
# High:
# path: /Audio/Ambience/Objects/prober_hum_high.ogg
# Dangerous:
# path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
# Critical:
# path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
- type: GlimmerSound
glimmerTier:
Minimal:
path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
Low:
path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
Moderate:
path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_moderate.ogg
High:
path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_high.ogg
Dangerous:
path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg
Critical:
path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg

- type: entity
parent: BaseMachinePowered
Expand All @@ -93,9 +93,9 @@
- type: Psionic
- type: GlimmerSource
addToGlimmer: false
#- type: Construction #Files are in place, but commented out
#graph: GlimmerDevices
#node: glimmerDrain
- type: Construction
graph: GlimmerDevices
node: glimmerDrain
- type: Sprite
sprite: DeltaV/Structures/Machines/glimmer_machines.rsi # DeltaV reskin
noRot: true
Expand All @@ -114,9 +114,9 @@
False: {visible: false}
- type: PowerSwitch
- type: CargoSellBlacklist
# - type: GuideHelp
# guides:
# - Psionics
- type: GuideHelp
guides:
- Psionics
- type: NpcFactionMember
factions:
- PsionicInterloper # :^)
Expand Down Expand Up @@ -149,9 +149,9 @@
- type: Anchorable
- type: Rotatable
- type: Pullable
# - type: Construction #Files are in place, but commented out
#graph: GlimmerDevices
#node: frame
- type: Construction #Files are in place, but commented out
graph: GlimmerDevices
node: frame
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
gender: female
proper: true
- type: SpriteFade
#- type: GuideHelp # For whenever someones readds this
# guides:
# - Psionics
- type: GuideHelp
guides:
- Psionics
10 changes: 10 additions & 0 deletions Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
- type: guideEntry
id: Psionics
name: guide-entry-psionics
text: "/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Psionics.xml"

# - type: guideEntry # When it's added
# id: AltarsGolemancy
# name: guide-entry-altars-golemancy
# text: "/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml"

- type: guideEntry
id: ReverseEngineering
name: guide-entry-reverse-engineering
Expand Down
Original file line number Diff line number Diff line change
@@ -1,73 +1,70 @@
##I'm commenting all of this out because it's bascially all stuff we don't have yet.
##Remove these two top lines when you uncomment them.
# - type: constructionGraph
# id: GlimmerDevices
# start: start
# graph:
# - node: start
# edges:
# - to: frame
# completed:
# - !type:SetAnchor
# value: false
# steps:
# - material: Plasteel
# amount: 5
# doAfter: 8
# - material: Cable
# amount: 5
- type: constructionGraph
id: GlimmerDevices
start: start
graph:
- node: start
edges:
- to: frame
completed:
- !type:SetAnchor
value: false
steps:
- material: Plasteel
amount: 5
- material: Cable
amount: 5
doAfter: 8
- node: frame
entity: GlimmerDeviceFrame
edges:
- to: glimmerProber
conditions:
- !type:EntityAnchored {}
steps:
- material: Bluespace
amount: 5
doAfter: 10
- tool: Welding
doAfter: 5
- to: glimmerDrain
conditions:
- !type:EntityAnchored {}
steps:
- tag: NormalityCrystal # DeltaV - Temporarily makes Drain only need 1 Crystal until Golemnization is implemented otherwise it's just imposible to craft
icon:
sprite: Nyanotrasen/Objects/Materials/materials.rsi
state: bluespace
name: a normality crystal
doAfter: 1
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
- tool: Welding
doAfter: 5

# - node: frame
# entity: GlimmerDeviceFrame
# edges:
# - to: glimmerProber
# conditions:
# - !type:EntityAnchored {}
# steps:
# - material: Bluespace
# amount: 5
# doAfter: 10
# - tool: Welding
# doAfter: 5
# - to: glimmerDrain
# conditions:
# - !type:EntityAnchored {}
# steps:
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
# - tag: NormalityCrystal
# icon:
# sprite: Nyanotrasen/Objects/Materials/materials.rsi
# state: bluespace
# name: a normality crystal
# doAfter: 1
# - tool: Welding
# doAfter: 5
- node: glimmerProber
entity: GlimmerProber

# - node: glimmerProber
# entity: GlimmerProber

# - node: glimmerDrain
# entity: GlimmerDrain
- node: glimmerDrain
entity: GlimmerDrain
Loading

0 comments on commit efe3d0d

Please sign in to comment.