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

Arachne Port (Real?) #1473

Closed

Conversation

ghost
Copy link

@ghost ghost commented Jul 9, 2024

About the PR

"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)"

Adds Arachne back to the Delta-V codebase, with the help of Einstein-Engines' port of them. Also adds Oneiro (with its invisibility broken slightly, because psionics are broken pending a very much needed refactor / rebase. Like holy fuck.)
This will be a draft PR unless it's instantly shot down due to being a bad port, somehow. I can imagine the oneiro being readded may be out of scope for this, as a lot of related things will be, but I might as well try to do this 👍

A TODO for this Draft PR, because it's so fucking full of bugs, yum:

  • Move everything in here to Einstein-Engines folders, since the way things are right now, it's walking merge conflict material since Arachne's in upstream folders. Oh god, oh fuck.
  • Make them less huge on the character creation menu because it conveniently obscures the loadout button. Curious.
  • Find some way to make them not allergic to blood, because despite being vampires they get sick drinking it
  • Unfuck the damage layers, because taking damage that makes blood or burns appear gives you the big YAML Error thing instead of displaying a proper damagevisualizer
  • Make the range of cocoons less small or big because it scales really weirdly and I always never really liked that.
  • Find some way to give them something like StepTriggerImmune without the client refusing to spawn them.
  • Make a clothing whitelist / tag because they can only wear the upper half of jumpsuits and some of the jumpsuits they can wear presently break, or are just pants, which are no-bueno because everything cuts off at the waist.

Why / Balance

I wanted to bring back Arachne because it's part of the effort to rebase things we had pre-rebase on Delta-v-Legacy. This includes Nyanotrasen stuff.
Arachne have weird balance to begin with. They don't have the ability to wear hardsuits, and the way this was fixed pre-rebase was putting on a winter coat, going to space, and having a rads buff or something. I don't exactly remember.
I would like to fix this by spriting Arachne-specific hardsuits / space suits, but I'm not even sure if this is possible or feasible? It also may be out of scope for this.

Technical details

"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." - The PR this cherrypicks from
It probably mostly inherits Nyano code. If anyone would like to rewrite that, and then replace how it's like in this PR, please contact me; or if you're a maintainer just edit this.
This has the barest minimum updates needed to make it run in the first place. The reason VM was doing this is that they require the Blood Drinker system functional as a prerequisite for future features on their end.

Media

image
image
image
image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • add: Brings back Arachne, the spider versions of centaurs from Nyanotrasen, back to Delta-V.

VMSolidus and others added 9 commits July 8, 2024 02:18
Had a bit of trouble figuring this out at a base but they were pretty helpful regarding it, thanks VMSolidus you a real one. 😺
I dunno if we already have Killer Tomatoes elsewhere since I know they are in game. Probably not an entity in Mutants anymore. But I also couldn't find MobTomatoKiller anywhere else in the code currently so I'm really really confused
This makes them able to spawn at the cost of them being completely silent in terms of footsteps. Dunno how I'm gonna fix.
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Jul 9, 2024
Copy link
Contributor

github-actions bot commented Jul 9, 2024

RSI Diff Bot; head commit b6b774c merging into 7b3b801
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 b6b774c

@ghost ghost added S: Merge Conflict Fix your PR! S: Do Not Merge Don't merge this yet S: Needs Cleanup Someone has to clean this before merging S: Help Wanted Extra attention is needed labels Jul 9, 2024
@NullWanderer NullWanderer removed the S: Merge Conflict Fix your PR! label Jul 9, 2024
@NullWanderer NullWanderer self-assigned this Jul 9, 2024
@NullWanderer
Copy link
Contributor

Make a clothing whitelist / tag because they can only wear the upper half of jumpsuits and some of the jumpsuits they can wear presently break, or are just pants, which are no-bueno because everything cuts off at the waist.

Just use displacement maps to nuke the legs

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Jul 22, 2024
Copy link
Contributor

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

@ghost
Copy link
Author

ghost commented Aug 13, 2024

Closing this. Not happening unless someone else does it. I'm sorry.

@ghost ghost closed this Aug 13, 2024
@VMSolidus
Copy link
Contributor

Closing this. Not happening unless someone else does it. I'm sorry.

Yea, when we get around to opening the floodgates for porting back and forth, I can fairly easily bring this over as well as fix most of the issues it had here.

@ghost ghost deleted the Einstein-Engines-Arachne-Port branch August 14, 2024 22:30
deltanedas pushed a commit that referenced this pull request Sep 2, 2024
* Does all the under the hood changes to mail components before I EVEN start thinking about MailSystem

* Mail Handheld Rapid Parcel Delivery System (#974)

* Mail RPDS

* removed sizes, more items go in capsules

* fixed error

* capsule resprite, added it to service techfab

* Update after upstream merge

* glass

* Update frontier.yml

* tag fix

---------

Co-authored-by: Dvir <dvirf01@gmail.com>

* Mail Buff (#1473)

* MailUp

* Update base_mail.yml

* Update base_mail.yml

* Update MailTeleporterComponent.cs

* Update MailComponent.cs

* Update base_mail.yml

* Update base_mail.yml

* Update Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Mail/base_mail.yml

Sure

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

* Mail table rework (#1477)

* Mail table, system for smoke prank

* Format mail messages

* DelayedItemSystem cleanup, more mail table entries

* More mail table entries

* Remove hoverbike from mail pool

* Add large mail.

FIXME: mail_large.rsi has no copyright info

* Default mail isLarge to false, comment cleanup

* More mail types

* Add optional large mail flag to admin mailto cmd

* mail_large copyright

* admin cmd fix, new mail types, const cleanup

* Mail: new components, weighting, a few new items

* Fix merge conflict, add placeholder pipebomb mail

* Format mail text, separate sword mail from knives

* Mail: fix exp. welder ID, split up Dan's cigs

* Fourth muffin, decrease captain's sabre chance

* yaml fixes

* Add ShowJobIcons component to mail hud

* Reorganize mail items, add build-a-buddy mail

* Build-a-Buddy fixes, slime & vulp versions, text

* Reptillian->Reptilian

* More signatures, label necrosol bottle, bigger emp

* lowercase i

* extra premium cigars, premium liquors

* Cleanup

* Fixups And Edits

* Remove kendo hakama, jabroni comment, fix cigars

* Platinum cigars, fix sprites

* fix premium absinthe ID

* Remove cyberpen, add BibleUserImplanter, ATV mail

Also adjusts weights for TacticalMaid (missing a zero), Restraints (cut
in half)

* kendo mail order, more mail comments

* Remove Nyano mail lists & parcels, move into _NF/

* True to true, cigars aren't fragile

---------

Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Whatstone <whatstone3@gmail.com>

* Kills accidentally cherrypicked platinum cig, makes mail be sorted into 5 ymls again

* THE MAIL TABLE!!!!! AHHHHHHHHHHHHHHHHHHHH

* NUKES two UNNECCESSARY RANDOMLY PASTED BRACKETS

FUCK YOU BUILD ERROR !!! EAT SHIT

* a semicolon for good measure

Adei versus the one silly

* Fuck is this? Why is it in my mail?

* Pro forgot values for two of the engineering mails

:skull:

* First pass to fix various mail bugs + editing of papers

* obliterates a random S in a C# file, also returns the mail teleporter to how it was

* Nukes the platinum cigar's YAML

Since there's no intent for it to spawn in the mail, might as well.

* Milon's Review

Does some shit to the mail / courierdrobe and gets rid of string keys. Thanks Milon

* Milon's Review 2, Electric Boogaloo

* Various YAML fixes as I try to satisfy the Linter and fail

* Fixes Mail.yml / If I get rid of the EMP china lake does it fix things? Let's find out!

* Cleans up more C# at Milon's behest

* TORTUGAAAAAAAAAAAAAAAAAAAA!!!!

Why is this mapped in?

* Revert "TORTUGAAAAAAAAAAAAAAAAAAAA!!!!"

This reverts commit b1d415a.

* Migrations

* Does a bit more fixing

* Update Resources/Locale/en-US/_NF/mail/mail.ftl

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>

* Update Resources/Locale/en-US/nyanotrasen/Mail/mail.ftl

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>

* Fixes Mail Capsule / Creates frontierMigrations

Blame Velcro for frontierMigrations.

* Update Resources/Migrations/deltaMigrations.yml

Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>

* Rewords that one fucking comment I made 2 months ago about MIT / AGPL

* Just gives the delayed smoke prank and delayed EMP effects the instant effect sprites

* Where the fuck are these random curly braces from??

* An attempt to satisfy the Yaml Linter

* Revert "Update Resources/Locale/en-US/nyanotrasen/Mail/mail.ftl"

This reverts commit 0ee3869.

* Revert "Update Resources/Locale/en-US/_NF/mail/mail.ftl"

This reverts commit 29129df.

* Mail FTL fixes / I think I know what the linter wants

* will this sprite be valid pretty please?

* Does a first pass on noSpawn for all mails.

ANOTHER COMMIT FOR THE PILE.

* Unfucks noSpawn from the mail prototypes

---------

Signed-off-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>
Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Whatstone <whatstone3@gmail.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
This pull request was closed.
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 S: Do Not Merge Don't merge this yet S: Help Wanted Extra attention is needed S: Merge Conflict Fix your PR! S: Needs Cleanup Someone has to clean this before merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants