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

Relaxing with Alonso is now fun #78457

Merged
merged 1 commit into from
Dec 10, 2024

Conversation

SariusSkelrets
Copy link
Contributor

Summary

Features "Relaxing with Alonso is now fun"

Purpose of change

Relaxing with Alonso doesn't give any mood boost, despite said mood boost being desired by a code comment in the effect Alonso gives.

I decided to add said mood boost.

I also added the other beauty traits to his beauty-gated dialogue because being so ugly people find it hard to look in your general direction gave a longer effect duration than only being a bit ugly, which is weird.

Describe the solution

Add u_add_morale where appropriate.

Added the other beauty traits to his dialogue conditions.

Describe alternatives you've considered

Testing

Relaxed with Alonso, got a "feeling good" mood boost
He takes in account other beauty traits.

Additional context

@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON <Enhancement / Feature> New features, or enhancements on existing astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 10, 2024
@Night-Pryanik Night-Pryanik merged commit 12a9782 into CleverRaven:master Dec 10, 2024
20 of 26 checks passed
@SariusSkelrets SariusSkelrets deleted the Alonso_is_fun branch December 10, 2024 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants