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

Upstreams #629

Merged
merged 14 commits into from
Nov 24, 2024
Merged

Upstreams #629

merged 14 commits into from
Nov 24, 2024

Conversation

CrimeMoot
Copy link
Collaborator

@CrimeMoot CrimeMoot commented Nov 24, 2024

Summary by CodeRabbit

  • Новые функции

    • Добавлена возможность управления функцией GPT-чата через новую кнопку в интерфейсе.
    • Введен новый элемент управления для автоматического чата GPT, который можно включать и выключать.
  • Изменения в документации

    • Обновлены файлы локализации для администраторских действий и руководства, добавлены новые ключи для автоматического чата GPT.
  • Исправления ошибок

    • Улучшена обработка сообщений от пользователей в системе Bwoink, включая интеграцию с Discord для автоматических ответов.

Rxup and others added 12 commits November 23, 2024 19:31
* фиксы синхронизации системы лежания

* Update LayingDownSystem.cs
* They did surgery on a monkey

* Update animals.yml

* Fix some things
* хирургия на рыбе

хирургия на рыбе

Co-Authored-By: deltanedas <@deltanedas:kde.org>

* Shadowkin upgrade + commentary fixes

* add localization

* kill BreathingImmunity

---------

Co-authored-by: deltanedas <[email protected]>
* Mood Upgrades

Mood Upgrades

Chemical Moodlets (And Drug Addictions!) (Rxup#896)

This PR implements a new Reagent Reaction that modifies a character's
mood, done by raising a MoodEvent on that character. It also extends
some of the functionality of the TraitSystem and MoodSystem so as to
support a new serializable Drug Addiction mechanic.

https://www.youtube.com/watch?v=8liPBsUtND4

![image](https://github.com/user-attachments/assets/3962c492-7677-4007-bf31-23e74b2b7382)

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/207210d6-e573-46e2-beb4-fab83a83d8b4)

![image](https://github.com/user-attachments/assets/4e1277e1-a873-4185-98b3-39abe06a8235)

![image](https://github.com/user-attachments/assets/e1a6cefe-82ee-482c-ace1-9fb511385fe4)

![image](https://github.com/user-attachments/assets/454dafa2-ba9e-46a6-9ac0-15e2ed35c4f8)

</p>
</details>

:cl:
- add: Drug Addictions! Drug addictions are long lasting Moodlet-Pairs.
The first consisting of a temporary Mood bonus that is refreshed by
consuming the drug, and the second consisting of an extremely long
lasting mood penalty, which replaces the mood bonus should you go a long
enough time between consuming the drug in question.
- add: Nicotine Addiction has been added as a new minor negative trait.
- add: Drugs/Reagents can now affect your character's Mood! Both with,
and without Addiction.
- add: TraitSystem has had functionality added for directly adding
Moodlets to a character upon joining the round, such as drug addictions,
or permanent mood modifications like Sanguine/Saturnine
- add: Lotophagoi Oil now induces an extremely powerful drug addiction,
providing an extremely large mood benefit for a short time. Which when
it wears off, creates an equally extreme mood penalty that lasts for a
very long time(or until you drink more Loto Oil).

Add Mood & Special Actions guidebook

Add more addictions for narcotics

* col

---------

Co-authored-by: VMSolidus <[email protected]>
* обновление gptchat добавление ттс для фигурок

* fix
Copy link

coderabbitai bot commented Nov 24, 2024

Caution

Review failed

The pull request is closed.

Прохождение

В данном пулл-реквесте внесены изменения, касающиеся управления функционалом GPT-чата в интерфейсе администрирования. Добавлен новый элемент управления CheckButton с именем GptChatToggle, который по умолчанию невидим и предназначен для переключения автоматического чата GPT. Также изменен существующий элемент Button для GPT-чата, который теперь использует самозакрывающийся тег. Внесены изменения в классы, связанные с состоянием персонажей и взаимодействием с сообщениями, что улучшает управление и отображение статуса игроков.

Изменения

Файл Краткое описание изменений
Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml Добавлен новый элемент <CheckButton> GptChatToggle (невидимый по умолчанию); изменен тег для существующего элемента <Button> GptChat.
Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs Добавлена логика для нового элемента GptChatToggle, включая обработчик события OnPressed и обновления состояния кнопок.
Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml Изменен размер окна с "900 500" на "1000 500".
Content.Client/Backmen/Standing/LayingDownSystem.cs Добавлена подписка на событие AfterAutoHandleStateEvent и метод OnChangeStanding для обработки состояния стояния.
Content.Client/UserInterface/Systems/Info/InfoUIController.cs Добавлен условный компиляционный директив для отладочной команды "fuckrules".
Content.Server/Administration/Systems/AdminSystem.cs Добавлено новое поле для GptAhelpSystem и изменен метод GetPlayerInfo.
Content.Server/Administration/Systems/BwoinkSystem.cs Добавлена зависимость GptAhelpSystem и обновлен метод OnBwoinkTextMessage для интеграции с GPT.
Content.Server/Backmen/Administration/Bwoink/Gpt/GptAhelpSystem.cs Добавлены новые методы и свойства для управления пользователями и командами GPT.
Content.Server/Backmen/Administration/Bwoink/Gpt/GptCommands.cs Изменены методы для улучшения управления командами и логированием.
Content.Server/Backmen/Administration/Bwoink/Gpt/Models/GptUserInfo.cs Изменен тип с record на sealed class, добавлен новый конструктор.
Content.Server/Backmen/Blob/ZombieBlobSystem.cs Добавлена новая зависимость и обновлены методы для обработки состояния.
Content.Server/Backmen/Mood/MoodComponent.cs Добавлен новый порог для настроения HealthOkayDamage.
Content.Server/Backmen/Mood/MoodSystem.cs Добавлен новый метод ReplaceMood для управления настроением.
Content.Server/Body/Systems/RespiratorSystem.cs Обновлена логика для обработки механики дыхания и удушья.
Content.Server/Corvax/TTS/TTSSystem.cs Добавлен новый метод для инициализации TTS-компонентов.
Content.Server/EntityEffects/Effects/ChemAddMoodlet.cs Введен новый класс для управления эффектами настроения.
Resources/Changelog/ChangelogBkm.yml Обновлен журнал изменений с новыми записями о модификациях и исправлениях.
Resources/Locale/en-US/_backmen/markings/reptilian.ftl Добавлены новые метки для рептилий.
Resources/Locale/en-US/administration/ui/actions.ftl Добавлен новый ключ для автоматического действия GPT.
Resources/Locale/en-US/guidebook/chemistry/effects.ftl Добавлен новый эффект для модификации настроения.
Resources/Locale/en-US/mood/mood.ftl Добавлены новые эффекты настроения, связанные с зависимостями.
Resources/Locale/ru-RU/administration/ui/actions.ftl Добавлен новый ключ для автоматического действия GPT на русском.
Resources/Locale/ru-RU/backmen/entities/bodyparts.ftl Добавлены переводы для частей тела.
Resources/Locale/ru-RU/backmen/guidebook/guides.ftl Добавлены новые записи для руководства.
Resources/Locale/ru-RU/backmen/markings/reptilian.ftl Добавлены новые метки для рептилий на русском.
Resources/Prototypes/Body/Organs/Animal/animal.yml Добавлены новые органы для животных.
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml Обновлены сущности животных.
Resources/Prototypes/Entities/Mobs/Player/humanoid.yml Добавлены черные списки для видов.
Resources/Prototypes/Guidebook/newplayer.yml Обновлены записи для новых игроков.
Resources/Prototypes/Reagents/gases.yml Обновлены параметры реагентов.
Resources/Prototypes/Reagents/narcotics.yml Добавлены эффекты для реагентов, связанных с настроением.
Resources/Prototypes/_Backmen/Species/kobold.yml Добавлены новые сущности для вида "Кобольд".
Resources/Prototypes/_Backmen/Species/monkey.yml Добавлены новые сущности для вида "Обезьяна".

Возможно связанные PR

  • Upstreams #580: Изменения в классе HealthChange, которые могут быть связаны с новой функциональностью кнопки для переключения GPT-чата.
  • Upstreams #608: Изменения в классе HealthAnalyzerBoundUserInterface, которые улучшают управление частями тела в интерфейсе, что связано с модификациями в главном PR.

Стихотворение

В норе уютной, в тени лугов,
Мы рады изменениям, как в сказке, вновь!
Кнопка GPT, что чата зовёт,
В мир общения, где каждый живёт.
Взлетаем выше, в мечтах и делах,
С новым функционалом — к успехам в мечтах! 🐇✨

Warning

Rate limit exceeded

@github-actions[bot] has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 3 minutes and 16 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between 24ebb17 and ff7c157.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

github-actions bot commented Nov 24, 2024

RSI Diff Bot; head commit ff7c157 merging into 24ebb17
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Animals/kobold.rsi

State Old New Status
kobold Modified
eyes Added
full Added
head_f Added
head_m Added
innerline Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
tail Added
torso_f Added
torso_m Added

Resources/Textures/Backmen/Mobs/Customization/reptilian_64x32.rsi

State Old New Status
tail_kangaroo Removed
tail_snakelarge Removed
tail_snakelarge_overlay Removed
tail_westerndragon_overlay Removed
kangaroo Added
snake_large Added
snake_large_overlay Added
snake_large_wagging Added
snake_large_wagging_overlay Added
western_dragon_overlay Added

Resources/Textures/Backmen/Mobs/Customization/snouts.rsi

State Old New Status
easterndnw_primary Removed
easterndnw_secondary Removed
easterndw_primary Removed
eastern_dragon Added
eastern_dragon_overlay Added
eastern_dragon_usiki Added
guilmon Added
noodle Added
noodle_overlay_1 Added
noodle_overlay_2 Added

Resources/Textures/Backmen/Mobs/Customization/reptilian.rsi

State Old New Status
spines_aquatic_alt Added
spines_long_alt Added
spines_longmembrane_alt Added
spines_short_alt Added
spines_shortmembrane_alt Added

Resources/Textures/Mobs/Animals/monkey.rsi

State Old New Status
eyes Added
full Added
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
tail Added
torso_f Added
torso_m Added

Resources/Textures/_Goobstation/Mobs/Aliens/Carps/carp_parts.rsi

State Old New Status
tail Added
torso Added

Edit: diff updated after ff7c157

@CrimeMoot CrimeMoot merged commit b38f7e4 into master Nov 24, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants