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

Shadowkin Rework #1200

Open
wants to merge 20 commits into
base: master
Choose a base branch
from

Conversation

FoxxoTrystan
Copy link
Member

@FoxxoTrystan FoxxoTrystan commented Nov 9, 2024

Description

This PR compleatly rework shadowkins, slightly been forced this makes shadowkins more "psionic creature" then anything else.
This is a WIP, but in general this PR make Shadowkin "Psionic" and fall under the same rule.

RIP Shadowkin for me but ye.

CHANGES TO SHADOWKINS:
Shadowkins now follow the laws of psionic, they will always spawn with DarkSwapPower but can generate others power, they do not spawn with Shadeskip by default anymore, Mana has been lower from 250 to 200; they can now pick normal psionic jobs.

Changes to DarkSwap:
DarkSwap cost 30 Mana and will raise glimmer on use, its will drain 1 Mana/Sec, will eject the user when mana is fully drained.
DarkSwap is now a random roll.

Changes to Psionics:
Added the Mana Alert for all psionics


TODO

  • Psionic Mana Alert
  • DarkSwap Rework
  • Remove Unique Shadowkin Psionic Changes
  • Import bugs fixes/QOL changes.

Media

N/A


Changelog

🆑

  • tweak: Shadowkins has returned and has been reworked.
  • add: DarkSwap is now in the Psionic Power Pool.
  • tweak: Psionics can now see their mana pools.

@FoxxoTrystan FoxxoTrystan added the Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels label Nov 9, 2024
@FoxxoTrystan FoxxoTrystan self-assigned this Nov 9, 2024
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: YML Changes any yml files labels Nov 9, 2024
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI labels Nov 9, 2024
Copy link
Contributor

github-actions bot commented Nov 9, 2024

RSI Diff Bot; head commit b2143ff merging into 9989c4d
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after b2143ff

@FoxxoTrystan FoxxoTrystan requested review from a team, VMSolidus, Aidenkrz, Remuchi, DEATHB4DEFEAT, Peptide90, Pspritechologist and OldDanceJacket and removed request for a team November 9, 2024 18:45
@github-actions github-actions bot added Status: Needs Review Someone please review this labels Nov 9, 2024
@FoxxoTrystan FoxxoTrystan added Priority: 2-High Needs to be resolved as soon as possible Size: 3-Medium For medium issues/PRs and removed Status: Needs Review Someone please review this labels Nov 9, 2024
@FoxxoTrystan FoxxoTrystan marked this pull request as ready for review November 12, 2024 19:29
@FoxxoTrystan FoxxoTrystan added the Status: Needs Review Someone please review this label Nov 12, 2024
@FoxxoTrystan
Copy link
Member Author

PR Ready for review.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 17, 2024
Copy link
Contributor

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 Nov 17, 2024
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 30, 2024
Copy link
Contributor

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 Dec 1, 2024
Comment on lines 120 to +125
EnsureComp<PsionicComponent>(uid, out var magic);
magic.Mana = 250;
magic.MaxMana = 250;
magic.Mana = 200;
magic.MaxMana = 200;
magic.ManaGain = 0.25f;
magic.BypassManaCheck = true;
magic.Removable = false;
magic.MindbreakingFeedback = "shadowkin-blackeye";
magic.NoMana = "shadowkin-tired";
Copy link
Member

Choose a reason for hiding this comment

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

I think you can do this with something like this

if (!HasComp<PsionicComponent>(uid))
	AddComp(uid, new PsionicComponent
		{
			Mana = 200;
			MaxMana = 200;
			// etc...
		});

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh Neat

Content.Shared/Shadowkin/EtherealComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Shadowkin/EtherealComponent.cs Outdated Show resolved Hide resolved
Resources/Locale/en-US/psionics/psionic-powers.ftl Outdated Show resolved Hide resolved
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: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-High Needs to be resolved as soon as possible Size: 3-Medium For medium issues/PRs Status: Needs Review Someone please review this 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