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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase Blood Drinker System, Arachne, Oneirophage #438

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

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented Jun 10, 2024

Description

This is a simple rebase of the Blood Drinker System, and its related features that have been commented out and/or omitted due to its lack of rebase. I am NOT substantially updating any of this code at this time, outside of the barest minimum updates needed to make it run in the first place. The reason I am doing this is that I require the Blood Drinker system functional as a prerequisite for future features, and I will update or refactor it when needed.

Arachne are still pending a Full Rework, but that is beyond the scope of this PR.

TODO

  • Make the code functional
  • Port Arachne
  • Uncomment Oneirophages
  • Re-add Oneirophage midround event

Changelog

馃啈

  • add: Arachne have been reimplemented!
  • add: Oneirophages are back!

@github-actions github-actions bot added the Changes: C# Changes any cs files label Jun 10, 2024
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jun 10, 2024
Copy link
Contributor

github-actions bot commented Jun 10, 2024

RSI Diff Bot; head commit 6a5ceb9 merging into 7c83c8b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Customization/anytaur_masking_helpers.rsi

State Old New Status
female_full Added
female_none Added
female_top Added
full Added
male_full Added
male_none Added
male_top Added
none Added
top Added
unisex_full Added
unisex_none Added
unisex_top Added

Resources/Textures/Mobs/Customization/spidereyes.rsi

State Old New Status
eyes Added

Resources/Textures/Mobs/Species/arachne.rsi

State Old New Status
spider_body Added
spider_body_front Added

Resources/Textures/Mobs/Species/eyes.rsi

State Old New Status
eyes Added

Resources/Textures/Nyanotrasen/Structures/cocoon.rsi

State Old New Status
cocoon1 Added
cocoon2 Added
cocoon3 Added
cocoon_large1 Added
cocoon_large2 Added
cocoon_large3 Added

Edit: diff updated after 6a5ceb9

@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jun 10, 2024
@DangerRevolution DangerRevolution added Priority: 2-High Needs to be resolved as soon as possible Holy Shit Size: 2-Large For large issues/PRs Type: Feature Creation of or significant changes to a feature labels Jun 10, 2024
@VMSolidus VMSolidus marked this pull request as ready for review June 10, 2024 20:25
@VMSolidus
Copy link
Member Author

DONE

@FoxxoTrystan
Copy link
Contributor

What about the "normal" spooders?

@VMSolidus
Copy link
Member Author

You know, there's no reason I couldn't, only that it would require touching a lot of the "Wizcode" spider stuff. :)

Copy link
Contributor

Choose a reason for hiding this comment

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

Now That "Languages" got merged, specie should have a LanguageSpeaker Component.

Or they will go to the fallback as MobBase (if its is the right one)

Copy link
Member Author

Choose a reason for hiding this comment

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

They're using MobBaseHuman right now, so they are defaulted to Galactic Common + Sol Common. I haven't had a chance to really think about what language they should use to be fair.

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.

They need a language to come with; and I also wanted to ask what the plan would be for Arachnids, what direction to take them if Arachnes become the vampires.

/// Whether to inject chems into a chemstream when we suck something.
/// </summary>
[DataField("injectWhenSucc")]
public bool InjectWhenSucc = false;
Copy link
Contributor

Choose a reason for hiding this comment

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

Woah; cool possibities here for snake people

{
[RegisterComponent]
/// <summary>
/// Item that gives a bloodsucker injection glands (for poison, usually)
Copy link
Contributor

Choose a reason for hiding this comment

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

Very cool

@VMSolidus
Copy link
Member Author

They need a language to come with; and I also wanted to ask what the plan would be for Arachnids, what direction to take them if Arachnes become the vampires.

So longer term, I'm actually going to comprehensively rework the Vampirism mechanic to later go with Arachne. I just needed this system rebased for other purposes, and changed as little as feasibly possible to get it working.

Arachnids are meant to be parallel to it, it sort of fits in with a longer term goal that server hosts should just be able to toggle on or off any species they want for their server. If that means toggling off Arachnids and turning on Arachne, or vice versa, or having both enabled at the same time, that's on them. We can have defaults set(and the default for EE species is just, "All of them on by default".)

For now I think I'm going to leave it as Sol Common in keeping with the "Humans & Human Mutants" theme. When I rework them it'll be fine for me to write a language just for Arachne.

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.

I'm actually going to say that Arachne do need a language; even if it's the lowest effort thing you can drum up where they just make different variants of "Hisssss"; people are going to want to play Arachne even if you don't see them as finished (AKA it's going to be merged pre-emptively by people) and a language would flesh them out further; while also expanding on the language system. Makes us look cooler.

@DangerRevolution
Copy link
Contributor

I'm actually going to say that Arachne do need a language; even if it's the lowest effort thing you can drum up where they just make different variants of "Hisssss"; people are going to want to play Arachne even if you don't see them as finished (AKA it's going to be merged pre-emptively by people) and a language would flesh them out further; while also expanding on the language system. Makes us look cooler.

If you don't want to, I'll drum something up tomorrow morning.

@VMSolidus
Copy link
Member Author

I'm actually going to say that Arachne do need a language; even if it's the lowest effort thing you can drum up where they just make different variants of "Hisssss"; people are going to want to play Arachne even if you don't see them as finished (AKA it's going to be merged pre-emptively by people) and a language would flesh them out further; while also expanding on the language system. Makes us look cooler.

If you don't want to, I'll drum something up tomorrow morning.

Alright! I'm not opposed to you doing that, I'd actually really appreciate it if you did.

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 30, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jun 30, 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: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Holy Shit 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants