Skip to content

Commit

Permalink
let psionic abilities be used while cuffed + cleanup (#2686)
Browse files Browse the repository at this point in the history
* move psionic action textures to the rsi

* move psionic actions to _DV psionic.yml, let them be used while cuffed

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
  • Loading branch information
deltanedas authored Jan 23, 2025
1 parent 1cdf746 commit f54427a
Show file tree
Hide file tree
Showing 28 changed files with 205 additions and 209 deletions.
32 changes: 0 additions & 32 deletions Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,16 @@ cage-resist-third-person = {CAPITALIZE(THE($user))} starts removing {POSS-ADJ($u
cage-uncage-verb = Uncage
action-name-metapsionic = Metapsionic Pulse
action-description-metapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
metapsionic-pulse-success = You detect psychic presence nearby.
metapsionic-pulse-failure = You don't detect any psychic presence nearby.
metapsionic-pulse-power = You detect that {$power} was used nearby.
action-name-dispel = Dispel
action-description-dispel = Dispel summoned entities such as familiars or forcewalls.
action-name-mass-sleep = Mass Sleep
action-description-mass-sleep = Put targets in a small area to sleep.
accept-psionics-window-title = Psionic!
accept-psionics-window-prompt-text-part = You rolled a psionic power!
It's possible that certain anti-psychic forces may hunt you,
so you should consider keeping it secret.
Do you still wish to be psionic?
action-name-psionic-invisibility = Psionic Invisibility
action-description-psionic-invisibility = Render yourself invisible to any entity that could potentially be psychic. Borgs, animals, and so on are not affected.
action-name-psionic-invisibility-off = Turn Off Psionic Invisibility
action-description-psionic-invisibility-off = Return to visibility, and receive a stun.
action-name-mind-swap = Mind Swap
action-description-mind-swap = Swap minds with the target. Either can change back after 20 seconds.
action-name-mind-swap-return = Reverse Mind Swap
action-description-mind-swap-return = Return to your original body.
action-name-telegnosis = Telegnosis
action-description-telegnosis = Create a telegnostic projection to remotely observe things.
action-name-psionic-regeneration = Psionic Regeneration
action-description-psionic-regeneration = Push your natural metabolism to the limit to power your body's regenerative capability.
glimmer-report = Current Glimmer Level: {$level}Ψ.
glimmer-event-report-generic = Noöspheric discharge detected. Glimmer level has decreased by {$decrease} to {$level}Ψ.
glimmer-event-report-signatures = New psionic signatures manifested. Glimmer level has decreased by {$decrease} to {$level}Ψ.
Expand All @@ -56,11 +29,6 @@ telegnostic-trapped-entity-desc = Its many eyes betray sadness.
psionic-burns-up = {CAPITALIZE(THE($item))} burns up with arcs of strange energy!
psionic-burn-resist = Strange arcs dance across {THE($item)}!
action-name-noospheric-zap = Noospheric Zap
action-description-noospheric-zap = Shocks the conciousness of the target and leaves them stunned and stuttering.
action-name-pyrokinesis = Pyrokinesis
action-description-pyrokinesis = Light a flammable target on fire.
pyrokinesis-power-used = A wisp of flame engulfs {THE($target)}, igniting {OBJECT($target)}!
action-name-psychokinesis = Psychokinesis
Expand Down
125 changes: 0 additions & 125 deletions Resources/Prototypes/Nyanotrasen/Actions/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,128 +17,3 @@
icon: { sprite: Nyanotrasen/Objects/Specific/Species/felinid.rsi, state: icon }
useDelay: 30
event: !type:HairballActionEvent

- type: entity
id: ActionDispel
name: action-name-dispel
description: action-description-dispel
components:
- type: EntityTargetAction
icon: Nyanotrasen/Interface/VerbIcons/dispel.png
useDelay: 45
checkCanAccess: false
range: 6
itemIconStyle: BigAction
canTargetSelf: false
event: !type:DispelPowerActionEvent

- type: entity
id: ActionMassSleep
name: action-name-mass-sleep
description: action-description-mass-sleep
components:
- type: WorldTargetAction
icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png
useDelay: 60
checkCanAccess: false
range: 8
itemIconStyle: BigAction
event: !type:MassSleepPowerActionEvent

- type: entity
id: ActionMindSwapPsionic
name: action-name-mind-swap
description: action-description-mind-swap
components:
- type: EntityTargetAction
icon: Nyanotrasen/Interface/VerbIcons/mind_swap.png
useDelay: 240
checkCanAccess: false
range: 8
itemIconStyle: BigAction
event: !type:MindSwapPowerActionEvent

- type: entity
id: ActionMindSwapReturn
name: action-name-mind-swap-return
description: action-description-mind-swap-return
components:
- type: InstantAction
icon: Nyanotrasen/Interface/VerbIcons/mind_swap_return.png
useDelay: 20
checkCanInteract: false
event: !type:MindSwapPowerReturnActionEvent

- type: entity
id: ActionNoosphericZap
name: action-name-noospheric-zap
description: action-description-noospheric-zap
components:
- type: EntityTargetAction
icon: Nyanotrasen/Interface/VerbIcons/noospheric_zap.png
useDelay: 100
range: 5
itemIconStyle: BigAction
event: !type:NoosphericZapPowerActionEvent

- type: entity
id: ActionPyrokinesis
name: action-name-pyrokinesis
description: action-description-pyrokinesis
components:
- type: EntityTargetAction
icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
useDelay: 50
range: 6
checkCanAccess: false
itemIconStyle: BigAction
event: !type:PyrokinesisPowerActionEvent

- type: entity
id: ActionMetapsionic
name: action-name-metapsionic
description: action-description-metapsionic
components:
- type: InstantAction
icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
useDelay: 45
event: !type:MetapsionicPowerActionEvent

- type: entity
id: ActionPsionicRegeneration
name: action-name-psionic-regeneration
description: action-description-psionic-regeneration
components:
- type: InstantAction
icon: Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png
useDelay: 120
event: !type:PsionicRegenerationPowerActionEvent

- type: entity
id: ActionTelegnosis
name: action-name-telegnosis
description: action-description-telegnosis
components:
- type: InstantAction
icon: Nyanotrasen/Interface/VerbIcons/telegnosis.png
useDelay: 150
event: !type:TelegnosisPowerActionEvent

- type: entity
id: ActionPsionicInvisibility
name: action-name-psionic-invisibility
description: action-description-psionic-invisibility
components:
- type: InstantAction
icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png
useDelay: 120
event: !type:PsionicInvisibilityPowerActionEvent

- type: entity
id: ActionPsionicInvisibilityUsed
name: action-name-psionic-invisibility-off
description: action-description-psionic-invisibility-off
components:
- type: InstantAction
icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png
event: !type:RemovePsionicInvisibilityOffPowerActionEvent
169 changes: 169 additions & 0 deletions Resources/Prototypes/_DV/Actions/psionic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
- type: entity
id: ActionDispel
name: Dispel
description: Dispel summoned entities such as familiars or forcewalls.
components:
- type: EntityTargetAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: dispel
useDelay: 45
checkCanAccess: false
checkCanInteract: false
range: 6
itemIconStyle: BigAction
canTargetSelf: false
event: !type:DispelPowerActionEvent

- type: entity
id: ActionMassSleep
name: Mass Sleep
description: Put targets in a small area to sleep.
components:
- type: WorldTargetAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: mass_sleep
useDelay: 60
checkCanAccess: false
checkCanInteract: false
range: 8
itemIconStyle: BigAction
event: !type:MassSleepPowerActionEvent

- type: entity
id: ActionMindSwapPsionic
name: Mind Swap
description: Swap minds with the target. Either can change back after 20 seconds.
components:
- type: EntityTargetAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: mind_swap
useDelay: 240
checkCanAccess: false
checkCanInteract: false
range: 8
itemIconStyle: BigAction
event: !type:MindSwapPowerActionEvent

- type: entity
id: ActionMindSwapReturn
name: Reverse Mind Swap
description: Return to your original body.
components:
- type: InstantAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: mind_swap_return
useDelay: 20
checkCanInteract: false
event: !type:MindSwapPowerReturnActionEvent

- type: entity
id: ActionNoosphericZap
name: Noospheric Zap
description: Shocks the conciousness of the target and leaves them stunned and stuttering.
components:
- type: EntityTargetAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: noospheric_zap
useDelay: 100
checkCanInteract: false
range: 5
itemIconStyle: BigAction
event: !type:NoosphericZapPowerActionEvent

- type: entity
id: ActionPyrokinesis
name: Pyrokinesis
description: Light a flammable target on fire.
components:
- type: EntityTargetAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: pyrokinesis
useDelay: 50
range: 6
checkCanAccess: false
itemIconStyle: BigAction
event: !type:PyrokinesisPowerActionEvent

- type: entity
id: ActionMetapsionic
name: Metapsionic Pulse
description: Send a mental pulse through the area to see if there are any psychics nearby.
components:
- type: InstantAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: metapsionic
useDelay: 45
checkCanInteract: false
event: !type:MetapsionicPowerActionEvent

- type: entity
id: ActionPsionicRegeneration
name: Psionic Regeneration
description: Push your natural metabolism to the limit to power your body's regenerative capability.
components:
- type: InstantAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: regeneration
useDelay: 120
checkCanInteract: false
event: !type:PsionicRegenerationPowerActionEvent

- type: entity
id: ActionTelegnosis
name: Telegnosis
description: Create a telegnostic projection to remotely observe things.
components:
- type: InstantAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: telegnosis
useDelay: 150
checkCanInteract: false
event: !type:TelegnosisPowerActionEvent

- type: entity
id: ActionPsionicInvisibility
name: Psionic Invisibility
description: Render yourself invisible to any entity that could potentially be psychic. Borgs, animals, and so on are not affected.
components:
- type: InstantAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: invisibility
useDelay: 120
checkCanInteract: false
event: !type:PsionicInvisibilityPowerActionEvent

- type: entity
id: ActionPsionicInvisibilityUsed
name: Turn Off Psionic Invisibility
description: Return to visibility, and receive a stun.
components:
- type: InstantAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: invisibility_off
checkCanInteract: false
event: !type:RemovePsionicInvisibilityOffPowerActionEvent

- type: entity
id: ActionPrecognition
name: Precognition
description: See into the future to get a hint about the next random event.
components:
- type: InstantAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: precognition
useDelay: 240
checkCanInteract: false
checkConsciousness: false
event: !type:PrecognitionPowerActionEvent
14 changes: 0 additions & 14 deletions Resources/Prototypes/_DV/Actions/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,6 @@
state: full
event: !type:ToggleCrawlingStateEvent

- type: entity
id: ActionPrecognition
name: Precognition
description: See into the future to get a hint about the next random event.
components:
- type: InstantAction
icon:
sprite: _DV/Interface/Actions/actions_psionics.rsi
state: precognition
useDelay: 240
checkCanInteract: false
checkConsciousness: false
event: !type:PrecognitionPowerActionEvent

- type: entity
id: ActionChitzite
name: Cough Up Chitzite
Expand Down

This file was deleted.

13 changes: 0 additions & 13 deletions Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit f54427a

Please sign in to comment.