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

Trait Points #434

Merged
merged 31 commits into from
Jun 20, 2024
Merged

Trait Points #434

merged 31 commits into from
Jun 20, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Jun 3, 2024

Description

Some improvements to loadouts too.


TODO

  • Points logic
  • Server-side validation
  • Categorize traits
  • Assign points to traits
  • Header costs
  • Sort entries
  • Max traits
    • Communicate max traits
  • Point bar
  • Group exclusivity
  • Black outline on text
  • Fix existing component whitelists

Media

Accurate except for small details

image

Something to note:

image

image

image


Changelog

🆑

  • add: Added trait points
  • add: Added categories for traits

@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 2-High Needs to be resolved as soon as possible Size: 2-Large For large issues/PRs Type: Feature Creation of or significant changes to a feature Type: Port Brings something to here from another codebase Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels labels Jun 3, 2024
@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: YML Changes any yml files labels Jun 3, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT marked this pull request as ready for review June 20, 2024 09:02
@DEATHB4DEFEAT DEATHB4DEFEAT removed their assignment Jun 20, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jun 20, 2024
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

Approved with just one question

Content.Shared/CCVar/CCVars.cs Outdated Show resolved Hide resolved
@DEATHB4DEFEAT DEATHB4DEFEAT added Status: Do Not Merge Do not merge Status: Help Wanted Extra attention is needed labels Jun 20, 2024
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.

I'm satisfied with this system now. My only complaint is something out of scope of this PR, but is something a ton of people are going to solve pretty shortly once we've merged this, myself included. That is, the game outright lacks positive traits for people to spend their trait points on. The entire list is all negative or neutral traits.

@VMSolidus VMSolidus merged commit d3ed34f into Simple-Station:master Jun 20, 2024
12 checks passed
SimpleStation14 added a commit that referenced this pull request Jun 20, 2024
@DangerRevolution
Copy link
Contributor

DEATHB4DEFEAT added Status: Do Not Merge Status: Help Wanted labels 43 minutes ago

@VMSolidus
Copy link
Member

DEATHB4DEFEAT added Status: Do Not Merge Status: Help Wanted labels 43 minutes ago

Yea I was with him in a voice call doing what he needed done. :)

@DangerRevolution
Copy link
Contributor

DEATHB4DEFEAT added Status: Do Not Merge Status: Help Wanted labels 43 minutes ago

Yea I was with him in a voice call doing what he needed done. :)

Labels are a lie.. 1984

@DEATHB4DEFEAT DEATHB4DEFEAT removed Status: Do Not Merge Do not merge Status: Help Wanted Extra attention is needed labels Jun 20, 2024
VMSolidus added a commit to VMSolidus/Einstein-Engines that referenced this pull request Jun 21, 2024
Some improvements to loadouts too.

---

- [x] Points logic
- [x] Server-side validation
- [x] Categorize traits
- [x] Assign points to traits
- [x] Header costs
- [x] Sort entries
- [x] Max traits
	- [x] Communicate max traits
- [x] Point bar
- [x] Group exclusivity
- Black outline on text
- [x] Fix existing component whitelists

---

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

![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/c0ab2fbf-3bce-4e54-81d5-8e546d6b3c0b)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/09a3948e-0c9f-4f57-b297-f62063b11845)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/35d76095-0714-4613-a17b-73df25a9a832)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/87149e5c-0af2-4ac0-bbde-52f317a008a0)

</p>
</details>

---

:cl:
- add: Added trait points
- add: Added categories for traits

---------

Co-authored-by: VMSolidus <evilexecutive@gmail.com>
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this pull request Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 2-High Needs to be resolved as soon as possible Size: 2-Large For large issues/PRs Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature Type: Port Brings something to here from another codebase Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants