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

Station AI #1423

Merged
merged 27 commits into from
Jan 11, 2025
Merged

Station AI #1423

merged 27 commits into from
Jan 11, 2025

Conversation

sleepyyapril
Copy link
Contributor

@sleepyyapril sleepyyapril commented Jan 4, 2025

Description

Implements station AI and all relevant fixes/changes/features.


Changelog

🆑

  • add: Ported Station AI.
  • add: Saltern is now fitted with a Station AI

* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: Map Changes any yml file in the Maps directories Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI Changes: Audio Changes any ogg files labels Jan 4, 2025
@sleepyyapril sleepyyapril added the Status: Do Not Merge Do not merge label Jan 4, 2025
Copy link
Contributor

github-actions bot commented Jan 4, 2025

RSI Diff Bot; head commit 5242ceb merging into 83fa923
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Interface/Actions/actions_ai.rsi

State Old New Status
ai_core Added
camera_light Added
crew_monitor Added
manifest Added
state_laws Added

Resources/Textures/Interface/Misc/job_icons.rsi

State Old New Status
StationAi Added

Resources/Textures/Interface/noise.rsi

State Old New Status
noise Added

Resources/Textures/Mobs/Silicon/output.rsi

State Old New Status
ai-banned-unshaded Added
ai-banned Added
ai-banned_dead-unshaded Added
ai-banned_dead Added
ai-empty-unshaded Added
ai-empty Added
ai-holo-old-unshaded Added
ai-holo-old Added
ai-unshaded Added
ai Added
ai_dead-unshaded Added
ai_dead Added
default-unshaded Added
default Added
floating_face-unshaded Added
floating_face Added
horror-unshaded Added
horror Added
xeno_queen-unshaded Added
xeno_queen Added

Resources/Textures/Mobs/Silicon/station_ai.rsi

State Old New Status
ai Added
ai_dead Added
ai_empty Added
base Added
default Added

Resources/Textures/Objects/Devices/ai_card.rsi

State Old New Status
base Added
empty Added
full Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Devices/output.rsi

State Old New Status
aicard-full-unshaded Added
aicard-full Added
aicard-unshaded Added
aicard Added

Edit: diff updated after 5242ceb

@sleepyyapril sleepyyapril added Holy Shit Size: 1-Very Large For especially large issues/PRs labels Jan 4, 2025
Resources/Prototypes/Roles/Jobs/Science/borg.yml Outdated Show resolved Hide resolved
metalgearsloth and others added 6 commits January 4, 2025 13:40
* Verb tweaks

Remove the LOS check because this is already done above in CanExamine.

* Fix outlines

* import
* ItemToggle + slots stuff

- Add component for itemslot locks to match LockComponent (surprised this didn't exist).
- Add thing for pointlight to match itemtoggle. In future should be used for PDAs and stuff but need to fix some other stuff first.

* Also this

* grill
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
* Move SleepingSystem to Shared & cleanup

* Remove empty OnShutdown handler
metalgearsloth and others added 10 commits January 4, 2025 14:23
Applies EntProtoId changes upon insertion / removal from container. Can also be useful for borgs / mechs / vehicles in future but atm I just used it for AI.
* Re-add improved random sentience event

* Make randomly sentient PDA more likely

* Make vending machine sentience less likely

* Make requested changes

* Make randomly sentient captain's gear more likely

* Sentient captain sabre has pirate accent

* Tweak new random sentient object a bit more

* Sentient PDA improvements

* Apply recommended fixes

* Add requested changes

* Fix merge conflict
@sleepyyapril sleepyyapril requested a review from VMSolidus January 4, 2025 20:11
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jan 4, 2025
angelofallars and others added 3 commits January 5, 2025 15:46
# Description

**(Use a MERGE COMMIT, not squash if possible to ~~avoid~~ reduce merge
conflicts for our downstream)**

Cherry-picks some PRs from The Den:

- TheDenSS14/TheDen#8
- TheDenSS14/TheDen#31
- TheDenSS14/TheDen#108
- TheDenSS14/TheDen#116
- TheDenSS14/TheDen#117
- TheDenSS14/TheDen#123
- TheDenSS14/TheDen#124

# 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: The Den Contributors
- fix: Put actual prescription lenses in the prescription medhuds and
sechuds (by KyuPolaris)
- add: Added the CMO turtleneck and head mirror to the CMO loadouts. (by
sleepyyapril, KyuPolaris)
- add: Added an armored trenchcoat for the Captain. Enjoy your swag! (by
Rosycup)
- fix: Fixed uneven pants leg on summer security uniforms. (by Rosycup)
- add: Added the Captain's Combat Gas Mask, for those more fond of close
encounters. (by Rosycup)
- tweak: Added the Captain's Trenchcoat to the other captain locker
variants. (by Rosycup)
- fix: Fixed they/them pronouns being displayed for it/its characters in
the character preview. (by Azzy)

---------

Co-authored-by: flyingkarii <[email protected]>
Co-authored-by: sleepyyapril <[email protected]>
Copy link
Contributor

github-actions bot commented Jan 7, 2025

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 10, 2025
@VMSolidus
Copy link
Member

image

Neat. There are some issues though. For example the AI Hologram needs languages (It can probably be given the same languages as a PAI to be fair)

@VMSolidus
Copy link
Member

Alright I have added languages to AI, ensured that most station computers are accessible to AIs(And am utterly baffled the AI didn't have them before), and put a Station AI spawn on Saltern.

@VMSolidus
Copy link
Member

In doing further testing, I learned that a Latejoining AI does not correctly spawn. I'm kind of drawing a blank on how this would even be fixed.

Latejoin:
image

Roundstart:
image

@bruhmogus
Copy link

In doing further testing, I learned that a Latejoining AI does not correctly spawn. I'm kind of drawing a blank on how this would even be fixed.

Latejoin: image

Roundstart: image

isn't there a wiz pr that fixes that?

@VMSolidus
Copy link
Member

image

This specific block of code was preventing AI from spawning during latejoin.

@VMSolidus
Copy link
Member

Which uhhh.. Means we can either have Prisoners, or AI?...

@VMSolidus
Copy link
Member

image

I managed to get them both working at the same time. I fucking hate this though.

Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

It now actually works. And I have tested extensively that it works.

@VMSolidus
Copy link
Member

I found an issue that Station AI's would spawn with a pile of clothes underneath their core. So I added two datafields for JobPrototypes for SpawnLoadout and ApplyTraits, both allow jobs to declare that they skip the loadout system and trait system respectively. These are currently only used by Station AI.

@VMSolidus
Copy link
Member

ALRIGHT THIS TIME. MERGE COMMIT. NOT SQUASH.

@VMSolidus VMSolidus merged commit 6903924 into Simple-Station:master Jan 11, 2025
13 of 14 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Holy Shit Size: 1-Very Large For especially large issues/PRs Status: Do Not Merge Do not merge Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants