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

Implement Ifriit #661

Merged
merged 22 commits into from
Mar 9, 2024
Merged

Implement Ifriit #661

merged 22 commits into from
Mar 9, 2024

Conversation

Adrian16199
Copy link
Contributor

@Adrian16199 Adrian16199 commented Jan 10, 2024

The mystagogue's guardian.

So as it stands, this can be merged upon innate tool fix gets merged into master and notin pyrokinesis until it gets reworked.
Converting it to draft and going to apply changes for it to use innate tool again.

About the PR

YML

Why / Balance

They used to be a thing, simply fixes them

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase
    image
Delta-v.2024-02-10.20-12-08.mov

Breaking changes

Changelog

🆑

  • fix: Implements ifriit

The mystagogue's guardian.

TO-DO: Figure out how to give the ifriit the actual tool instead of bite that still has the damage propertys of the tool?
@github-actions github-actions bot added the Changes: YML Changes any yml files label Jan 10, 2024
giving different parent to make the bite attack frick off.
Dont let them shove, simple different attack would make sense.
@Adrian16199 Adrian16199 marked this pull request as ready for review January 11, 2024 14:04
@Adrian16199 Adrian16199 marked this pull request as draft January 11, 2024 17:38
@Adrian16199 Adrian16199 marked this pull request as ready for review January 11, 2024 19:21
@DebugOk DebugOk mentioned this pull request Jan 16, 2024
4 tasks
@VMSolidus
Copy link
Contributor

VMSolidus commented Jan 16, 2024

To make the ifrit spawn with a tool, you need to give them a relevant Inventory Template, so that they have handslots(Preferably ones immune to strip), and then you need a Loadout. The relevant components are

  • LoadoutComponent (Define what items the Ifrit spawns with and in what slots)
  • HandsComponent (They need hands to use a weapon, should be self explanatory)
  • InventoryComponent (This stores a templateId, which lets you define what inventory slots the Ifrit has)
  • InventorySlotsComponent (Lets the player actually see the equipment UI)

To make it so that nobody can take the tool, you just need to make sure that they don't have the StrippableComponent.

@Adrian16199
Copy link
Contributor Author

I though about tryin to restore InnateItemSystem (which i was lookin for a bit) but I suppose trying that could be the right solution in the first place.

@VMSolidus
Copy link
Contributor

I though about tryin to restore InnateItemSystem (which i was lookin for a bit) but I suppose trying that could be the right solution in the first place.

Yea, not much reason to make/remake an old component if the options to do what you want to do already exist. Wizden's already done the work for you, you just need to know what components and arguments are necessary.

@Adrian16199
Copy link
Contributor Author

I though about tryin to restore InnateItemSystem (which i was lookin for a bit) but I suppose trying that could be the right solution in the first place.

Yea, not much reason to make/remake an old component if the options to do what you want to do already exist. Wizden's already done the work for you, you just need to know what components and arguments are necessary.

You know, I did saw the starting gear but i never saw inhand option but you reminding me, made me realize that space ninja spawns with inhand item.

@VMSolidus
Copy link
Contributor

image
You need to remove the negative damage component here. It will cause the ifrit to directly heal people from their blunt damage if they have any.

@Adrian16199
Copy link
Contributor Author

okay so first things first, the loadout system doesnt spawn stuff in someone's hand and even if you write that in, it spawns On you but not in your hand. Space Ninja doesnt even spawn with it in their hand but it just spawns behind them which is just stupid.

@Guess-My-Name
Copy link
Contributor

image You need to remove the negative damage component here. It will cause the ifrit to directly heal people from their blunt damage if they have any.

It doesn't heal people. Normal welder does 5 blunt damage when turned off, and also has litMeleeDamageBonus component, but welder has 8 extra heat damage and -5 blunt, instead of extra 10 heat like ifrit does. If you remove it, when Ifrit hand is lit, it will deal 10 heat and 5 blunt.

@Adrian16199 Adrian16199 marked this pull request as draft January 18, 2024 18:51
Adrian16199 and others added 2 commits January 25, 2024 19:53
Not sure how long I will have to living but eh, at the least might aswell finish some PR's
@github-actions github-actions bot added the Changes: Sprite Changes any png or json in an rsi label Jan 30, 2024
Copy link
Contributor

github-actions bot commented Jan 30, 2024

RSI Diff Bot; head commit 83f1faf merging into f767c45
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nyanotrasen/Objects/Tools/ifrit_hand.rsi

State Old New Status
inhand-left-flame Modified
inhand-right-flame Modified

Edit: diff updated after 83f1faf

@Adrian16199 Adrian16199 marked this pull request as ready for review January 30, 2024 13:30
@DebugOk DebugOk changed the title Fixes ifriit. Implement Ifriit Feb 1, 2024
@Adrian16199
Copy link
Contributor Author

Made a video showcasin that it works, made a final adjustment, merged up.
Pretty much ready.

DebugOk
DebugOk previously approved these changes Feb 12, 2024
Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

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

This approval means nothing besides removing my review requirement. When @VMSolidus considers it good enough it can be merged

@Adrian16199 Adrian16199 marked this pull request as draft February 22, 2024 11:43
@DebugOk
Copy link
Contributor

DebugOk commented Mar 7, 2024

Inate Tools got fixed, so that can be used again

@Adrian16199
Copy link
Contributor Author

so innate tool does indeed work but weirdly enough, only one hand appears, probably an issue on my end so will try to get it done and just push the current changes to make it less messy.

@github-actions github-actions bot removed the Changes: Sprite Changes any png or json in an rsi label Mar 9, 2024
@Adrian16199 Adrian16199 marked this pull request as ready for review March 9, 2024 21:43
@Adrian16199
Copy link
Contributor Author

Works ingame, changed everything neccesary and removed everything that was uneccesary due to innate tools now working, made the pyrokinesis be a note until the rework of psionics, ready for review, again.

@DebugOk
Copy link
Contributor

DebugOk commented Mar 9, 2024

Worst case shit horribly breaks and we revert

@DebugOk DebugOk merged commit 484ca92 into DeltaV-Station:master Mar 9, 2024
19 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Mar 9, 2024
@Adrian16199 Adrian16199 deleted the fix_ifrit branch March 10, 2024 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants