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

Vulpkanin Update #715

Merged
merged 24 commits into from
Aug 15, 2024
Merged

Conversation

FoxxoTrystan
Copy link
Member

@FoxxoTrystan FoxxoTrystan commented Aug 10, 2024

WarningTrystan

Description

This PR is the rework regarding the unique feature for vulpkanins, this is mostly due to the "FORCED" Issue by VM: #711

This PR will mostly add the new features that will mostly make Vulpkanins unique.

For Vulpkanin Stats changed please check this PR: #713

  • Flash Damge: Flashable has 2 new variables "EyeDamageChance" (Float) and "EyeDamage" (int), those are default to 0 but if changed could give a chance from 0 to 1 to give EyeDamage from the EyeDamage Value, this is not fixed to vulpkanin and can be added to anything with the "Flashable" Component.
  • ScentTracker: Add a new Forensics type "Scent", scent will spread on everything you wear and only the ent with the "ScentTrackerSystem" can track a scent, tracking a scent will leave an effect on those who has or the item with the scent, scent can be cleaned away with soap or you can compleatly generate a new scent of a person by cleaning yourself, note: someone with a scent does not mean his the one making that scent, they may just have an item with the scent in their bag!
  • Vulpkanins Screams: I have 5 Fox Screams that need to be edited and need to be added in-game for vulpkanins with a lisence, just need to have the time to do it and this PR seem the perfect place for it.

TODO

  • Flash Damage
  • Scent System
  • ScentTracker System
  • Vulpkanin Screams

Media

image
image
image
image


Changelog

🆑 FoxxoTrystan

  • add: Forensics Scent Type and Vulpkanins can now track scents, better keep yourself clean!
  • tweak: Vulpkanins eyes are sensetive, please dont flash them with lights as this could damage them.
  • add: Vulpkanins now has their own screams!

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: YML Changes any yml files labels Aug 10, 2024
@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Aug 12, 2024
@github-actions github-actions bot added the Changes: Audio Changes any ogg files label Aug 13, 2024
@FoxxoTrystan FoxxoTrystan marked this pull request as ready for review August 13, 2024 17:07
@FoxxoTrystan
Copy link
Member Author

PR now ready for review!

Content.Server/Flash/FlashSystem.cs Outdated Show resolved Hide resolved
Content.Server/Forensics/Components/ScentComponent.cs Outdated Show resolved Hide resolved
Content.Client/Forensics/ScentTrackerSystem.cs Outdated Show resolved Hide resolved
Content.Server/Forensics/Systems/ForensicsSystem.cs Outdated Show resolved Hide resolved
Content.Server/Forensics/Systems/ForensicsSystem.cs Outdated Show resolved Hide resolved
Content.Shared/Forensics/ForensicsComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Forensics/ForensicsComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Forensics/ForensicsComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Forensics/ForensicsComponent.cs Outdated Show resolved Hide resolved
Content.Shared/Forensics/ScentTrackerComponent.cs Outdated Show resolved Hide resolved
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.

Verb menu locale string needs to be capitalised;
I don't like the "Has your scent" appearing above any other identifying text in the inspection menu
No way to stop tracking someone without sniffing someone else.
I also don't think the current visuals are a good way to represent the scent; but I'm okay if that's not fixed.

@FoxxoTrystan
Copy link
Member Author

FoxxoTrystan commented Aug 15, 2024

Verb menu locale string needs to be capitalised; I don't like the "Has your scent" appearing above any other identifying text in the inspection menu No way to stop tracking someone without sniffing someone else. I also don't think the current visuals are a good way to represent the scent; but I'm okay if that's not fixed.

  1. I would avoid to captialise those normally. (Changed)
  2. Too bad, this is staying as its required. (Just because you dont like it does not mean il remove it.)
  3. You can stop tracking someone by right clicking yourself.
  4. Tho can be changed later.

{
[RegisterComponent]
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
Copy link
Contributor

Choose a reason for hiding this comment

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

This exposes the ForensicsComponent to all clients which is probably really bad in a server-authoritative context.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah but i need to read those data anyway.

If client read it, yes its annoying but if they cheat to get info they will be caught by admins after a moment.

@DangerRevolution
Copy link
Contributor

DangerRevolution commented Aug 15, 2024

Verb menu locale string needs to be capitalised; I don't like the "Has your scent" appearing above any other identifying text in the inspection menu No way to stop tracking someone without sniffing someone else. I also don't think the current visuals are a good way to represent the scent; but I'm okay if that's not fixed.

  1. Too bad, this is staying as its required. (Just because you dont like it does not mean il remove it.)

I was thinking more of uh, can it be at the bottom of the text box? Or somewhere in the middle?

@FoxxoTrystan
Copy link
Member Author

Verb menu locale string needs to be capitalised; I don't like the "Has your scent" appearing above any other identifying text in the inspection menu No way to stop tracking someone without sniffing someone else. I also don't think the current visuals are a good way to represent the scent; but I'm okay if that's not fixed.

  1. Too bad, this is staying as its required. (Just because you dont like it does not mean il remove it.)
    I was thinking more of uh, can it be at the bottom of the text box? Or somewhere in the middle?

Unsure, i dont think that possible from what i have looked or seen, I think its alphabetical.

@FoxxoTrystan
Copy link
Member Author

Verb menu locale string needs to be capitalised; I don't like the "Has your scent" appearing above any other identifying text in the inspection menu No way to stop tracking someone without sniffing someone else. I also don't think the current visuals are a good way to represent the scent; but I'm okay if that's not fixed.

  1. Too bad, this is staying as its required. (Just because you dont like it does not mean il remove it.)
    I was thinking more of uh, can it be at the bottom of the text box? Or somewhere in the middle?

Unsure, i dont think that possible from what i have looked or seen, I think its alphabetical.

Nevermind there is a priority, let me fix one then.

@DangerRevolution
Copy link
Contributor

test fail was valid i'm pretty sure; ping me if it passes and I'll merge it

@VMSolidus VMSolidus merged commit d9a0469 into Simple-Station:master Aug 15, 2024
11 checks passed
SimpleStation14 added a commit that referenced this pull request Aug 15, 2024
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
# Description

Per Simple-Station#711, this PR adds new stat changes to Vulpkanins to make them more
mechanically interesting and distinct from Humans.

- Receive the Voracious trait by default, giving them 2x eating/drinking
speed.
- Takes 30% less Cold damage
- Takes 30% more Heat damage, up from 15%.
- Hunger rate increased by 25%.
- Receive 25% more fire stacks, increasing the Heat damage and duration
of being on fire.
- Flash duration has been increased by 50%.
  - The duration of flashes, 5 seconds, will become 7.5 seconds.

**Only merge** alongside Simple-Station#715.

## Media

<details><summary>Expand</summary>

**New flash duration**


https://github.com/user-attachments/assets/afafd890-d40b-4c63-9259-53ae6a355e53

</details>

## Changelog

:cl: Skubman
- add: Vulpkanins receive the Voracious trait for free, giving them 2x
eating/drinking speed, but Vulpkanins get hungrier 25% faster.
- tweak: Vulpkanins gain a 30% Cold resistance, but their Heat
vulnerability has increased from 15% to 30%. Vulpkanins also receive 25%
more Fire stacks, amplifying the damage and duration of being on fire.
- tweak: Flash duration against Vulpkanins has been increased by 50%.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
![WarningTrystan](https://github.com/user-attachments/assets/958f868b-11b9-48f0-80ab-13d9ff243f06)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This PR is the rework regarding the unique feature for vulpkanins, this
is mostly due to the "FORCED" Issue by VM:
Simple-Station#711

This PR will mostly add the new features that will mostly make
Vulpkanins unique.

For Vulpkanin Stats changed please check this PR:
Simple-Station#713

- Flash Damge: Flashable has 2 new variables "EyeDamageChance" (Float)
and "EyeDamage" (int), those are default to 0 but if changed could give
a chance from 0 to 1 to give EyeDamage from the EyeDamage Value, this is
not fixed to vulpkanin and can be added to anything with the "Flashable"
Component.
- ScentTracker: Add a new Forensics type "Scent", scent will spread on
everything you wear and only the ent with the "ScentTrackerSystem" can
track a scent, tracking a scent will leave an effect on those who has or
the item with the scent, scent can be cleaned away with soap or you can
compleatly generate a new scent of a person by cleaning yourself, note:
someone with a scent does not mean his the one making that scent, they
may just have an item with the scent in their bag!
- Vulpkanins Screams: I have 5 Fox Screams that need to be edited and
need to be added in-game for vulpkanins with a lisence, just need to
have the time to do it and this PR seem the perfect place for it.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Flash Damage
- [x] Scent System
- [x] ScentTracker System
- [x] Vulpkanin Screams

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

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


![image](https://github.com/user-attachments/assets/3bd60c0f-2528-4be7-a52d-defe2990c475)

![image](https://github.com/user-attachments/assets/6756b6af-3f76-4faa-9fbd-c35964b267b3)

![image](https://github.com/user-attachments/assets/b4ff84a2-64eb-4985-876b-d3e93fc8bd12)

![image](https://github.com/user-attachments/assets/dd4b47ea-ae39-44c3-b5a2-27ee68703857)

</p>
</details>

---

# 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: FoxxoTrystan
- add: Forensics Scent Type and Vulpkanins can now track scents, better
keep yourself clean!
- tweak: Vulpkanins eyes are sensetive, please dont flash them with
lights as this could damage them.
- add: Vulpkanins now has their own screams!

---------

Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
Per Simple-Station#711, this PR adds new stat changes to Vulpkanins to make them more
mechanically interesting and distinct from Humans.

- Receive the Voracious trait by default, giving them 2x eating/drinking
speed.
- Takes 30% less Cold damage
- Takes 30% more Heat damage, up from 15%.
- Hunger rate increased by 25%.
- Receive 25% more fire stacks, increasing the Heat damage and duration
of being on fire.
- Flash duration has been increased by 50%.
  - The duration of flashes, 5 seconds, will become 7.5 seconds.

**Only merge** alongside Simple-Station#715.

<details><summary>Expand</summary>

**New flash duration**

https://github.com/user-attachments/assets/afafd890-d40b-4c63-9259-53ae6a355e53

</details>

:cl: Skubman
- add: Vulpkanins receive the Voracious trait for free, giving them 2x
eating/drinking speed, but Vulpkanins get hungrier 25% faster.
- tweak: Vulpkanins gain a 30% Cold resistance, but their Heat
vulnerability has increased from 15% to 30%. Vulpkanins also receive 25%
more Fire stacks, amplifying the damage and duration of being on fire.
- tweak: Flash duration against Vulpkanins has been increased by 50%.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
![WarningTrystan](https://github.com/user-attachments/assets/958f868b-11b9-48f0-80ab-13d9ff243f06)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

This PR is the rework regarding the unique feature for vulpkanins, this
is mostly due to the "FORCED" Issue by VM:
Simple-Station#711

This PR will mostly add the new features that will mostly make
Vulpkanins unique.

For Vulpkanin Stats changed please check this PR:
Simple-Station#713

- Flash Damge: Flashable has 2 new variables "EyeDamageChance" (Float)
and "EyeDamage" (int), those are default to 0 but if changed could give
a chance from 0 to 1 to give EyeDamage from the EyeDamage Value, this is
not fixed to vulpkanin and can be added to anything with the "Flashable"
Component.
- ScentTracker: Add a new Forensics type "Scent", scent will spread on
everything you wear and only the ent with the "ScentTrackerSystem" can
track a scent, tracking a scent will leave an effect on those who has or
the item with the scent, scent can be cleaned away with soap or you can
compleatly generate a new scent of a person by cleaning yourself, note:
someone with a scent does not mean his the one making that scent, they
may just have an item with the scent in their bag!
- Vulpkanins Screams: I have 5 Fox Screams that need to be edited and
need to be added in-game for vulpkanins with a lisence, just need to
have the time to do it and this PR seem the perfect place for it.

---

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Flash Damage
- [x] Scent System
- [x] ScentTracker System
- [x] Vulpkanin Screams

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

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

![image](https://github.com/user-attachments/assets/3bd60c0f-2528-4be7-a52d-defe2990c475)

![image](https://github.com/user-attachments/assets/6756b6af-3f76-4faa-9fbd-c35964b267b3)

![image](https://github.com/user-attachments/assets/b4ff84a2-64eb-4985-876b-d3e93fc8bd12)

![image](https://github.com/user-attachments/assets/dd4b47ea-ae39-44c3-b5a2-27ee68703857)

</p>
</details>

---

<!--
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: FoxxoTrystan
- add: Forensics Scent Type and Vulpkanins can now track scents, better
keep yourself clean!
- tweak: Vulpkanins eyes are sensetive, please dont flash them with
lights as this could damage them.
- add: Vulpkanins now has their own screams!

---------

Signed-off-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
tmcqueen pushed a commit to tmcqueen/Syndicate-Station that referenced this pull request Aug 24, 2024
SsalamethVersaach added a commit to Grimbly-Station/Grimbly-Station that referenced this pull request Sep 8, 2024
## About the PR
FINALLY, HUMAN RESKIN NO LONGER

![image](https://github.com/user-attachments/assets/676946f0-e9be-45d6-8d5e-eb460dace2be)

## Why / Balance
idk content lmao

## Technical details
- Tweaked FlammableSystem and FlashSystem to account for different
multipliers.
- Small refactors to the forensics system to add scents
- Added again the OnTargetMove function to DoAfterArgs (we'll probably
need it for future EE code anyway)
- Added 2 "traits" to compensate for the missing components from EE.
These modify eating speed, along with modifying how susceptible or
resilient one is to flashes (eye damage, duration, etc).

## Media
Ill just attach the PRs from the other repos. [Number
Changes](Simple-Station/Einstein-Engines#713),
[Scent System & Flash
Vuln.](Simple-Station/Einstein-Engines#715)

## Requirements
Remove this shit from the templates or im gonna bomb a felinid orphanage
- [X] I have read and I am following the [Pull Request
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
I understand that not doing so may get my pr closed at maintainer’s
discretion
- [X] I have added screenshots/videos to this PR showcasing its changes
ingame, **or** this PR does not require an ingame showcase

## Special Thanks
Thanks to Angelo and Trystan for the work on this! Despite the funny
last minute threat of removal for the species teehee :trollface:

**Changelog**
🆑 Mocho, Skubman & FoxxoTrystan
- add: Vulpkanins receive the Voracious trait for free, giving them 2x
eating/drinking speed, but Vulpkanins get hungrier 25% faster.
- add: Vulpkanins can now track scents, better keep yourself clean!
- add: Vulpkanins now have their own screams!
- tweak: Vulpkanins gain a 30% Cold resistance, but their Heat
vulnerability has increased from 15% to 30%. Vulpkanins also receive 25%
more Fire stacks, amplifying the damage and duration of being on fire.
- tweak: Flash duration against Vulpkanins has been increased by 50%.
- tweak: Vulpkanins eyes are now extra-sensitive to bright lights, such
as those from flashes or flashbangs and have a chance of being damaged
by them.
if (TryComp<ForensicsComponent>(args.Target, out var forensicsComp)
&& forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned
&& forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count > 0
&& forensicsComp.Scent != string.Empty)
Copy link
Contributor

Choose a reason for hiding this comment

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

this broke soap cleaning because most entities don't have scents.

VMSolidus pushed a commit that referenced this pull request Oct 16, 2024
# Description
Fixes cleaning forensics off of an object being impossible unless it has
a scent. Explained in the latest (to date) comment to #715.

Also removes some unnecessarily duplicated code and inverts an if
condition.

# Changelog
:cl:
- fix: Soap once again can be used to clean evidence off.
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: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants