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.

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

Fixed AI Actions #31823

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: Gravity
gravityShakeSound: !type:SoundPathSpecifier
path: /Audio/Effects/alert.ogg
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_courser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_delta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_lox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_omega.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_raven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_rod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
1 change: 1 addition & 0 deletions Resources/Maps/Shuttles/emergency_wode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ entities:
configurators: []
deviceLists: []
transmitFrequencyId: ShuttleTimer
deviceNetId: Wireless
- type: DecalGrid
chunkCollection:
version: 2
Expand Down
64 changes: 64 additions & 0 deletions Resources/Prototypes/Actions/station_ai.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Actions
- type: entity
id: ActionJumpToCore
name: Jump to core
description: Sends your eye back to the core.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Actions/actions_ai.rsi
state: ai_core
event: !type:JumpToCoreEvent

- type: entity
id: ActionShowJobIcons
name: Show job icons
description: Shows job icons for crew members.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Actions/actions_ai.rsi
state: job_view
event: !type:ActionComponentChangeEvent
components:
- type: ShowJobIcons

- type: entity
id: ActionSurvCameraLights
name: Toggle camera lights
description: Enable surveillance camera lights near wherever you're viewing.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Actions/actions_ai.rsi
state: camera_light
event: !type:RelayedActionComponentChangeEvent
components:
- type: LightOnCollideCollider
- type: FixturesChange
fixtures:
lightTrigger:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 80
hard: false
layer:
- GhostImpassable


- type: entity
id: ActionAIViewLaws
name: View Laws
description: View the laws that you must follow.
components:
- type: InstantAction
itemIconStyle: NoItem
icon:
sprite: Interface/Actions/actions_ai.rsi
state: state_laws
event: !type:ToggleLawsScreenEvent
useDelay: 0.5
13 changes: 7 additions & 6 deletions Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: CrewMonitor
transmitFrequencyId: ShuttleTimer
- type: WirelessNetworkConnection
range: 500
- type: StationLimitedNetwork
Expand Down Expand Up @@ -122,8 +123,8 @@
description: View a mass scanner interface.
components:
- type: InstantAction
icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
iconOn: Structures/Machines/parts.rsi/box_2.png
icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner }
iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png
keywords: [ "AI", "console", "interface" ]
priority: -10
event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key }
Expand All @@ -146,8 +147,8 @@
description: View a crew monitoring interface.
components:
- type: InstantAction
icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
iconOn: Structures/Machines/parts.rsi/box_2.png
icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor }
iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png
keywords: [ "AI", "console", "interface" ]
priority: -10
event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key }
Expand All @@ -158,8 +159,8 @@
description: View a station records Interface.
components:
- type: InstantAction
icon: { sprite: Structures/Machines/parts.rsi, state: box_0 }
iconOn: Structures/Machines/parts.rsi/box_2.png
icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records }
iconOn: Interface/Actions/actions_ai.rsi/station_records.png
keywords: [ "AI", "console", "interface" ]
priority: -10
event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key }
59 changes: 8 additions & 51 deletions Resources/Prototypes/Entities/Mobs/Player/silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- ActionJumpToCore
- ActionShowJobIcons
- ActionSurvCameraLights
- ActionViewLaws
- ActionAIViewLaws
- type: UserInterface
interfaces:
enum.RadarConsoleUiKey.Key:
Expand All @@ -54,57 +54,14 @@
toggleAction: ActionAGhostShowCrewMonitoring
enum.GeneralStationRecordConsoleKey.Key:
toggleAction: ActionAGhostShowStationRecords
- type: CrewMonitoringConsole
- type: GeneralStationRecordConsole
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: CrewMonitor
- type: RadarConsole
followEntity: false

# Actions
- type: entity
id: ActionJumpToCore
name: Jump to core
description: Sends your eye back to the core.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Actions/actions_ai.rsi
state: ai_core
event: !type:JumpToCoreEvent

- type: entity
id: ActionShowJobIcons
name: Show job icons
description: Shows job icons for crew members.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Misc/job_icons.rsi
state: Captain
event: !type:ActionComponentChangeEvent
components:
- type: ShowJobIcons

- type: entity
id: ActionSurvCameraLights
name: Toggle camera lights
description: Enable surveillance camera lights near wherever you're viewing.
components:
- type: InstantAction
itemIconStyle: BigAction
icon:
sprite: Interface/Actions/actions_ai.rsi
state: camera_light
event: !type:RelayedActionComponentChangeEvent
components:
- type: LightOnCollideCollider
- type: FixturesChange
fixtures:
lightTrigger:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 80
hard: false
layer:
- GhostImpassable

# Ai
- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
- type: ExtensionCableReceiver
- type: Screen
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: ShuttleTimer

- type: entity
Expand Down
Binary file modified Resources/Textures/Interface/Actions/actions_ai.rsi/ai_core.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@
},
{
"name": "state_laws"
}
},
{
"name": "station_records"
},
{
"name": "mass_scanner"
},
{
"name": "job_view"
},
{
"name": "comms_console"
}
]
}
Binary file modified Resources/Textures/Interface/Actions/actions_ai.rsi/state_laws.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading