8000 Add clear-effects option to ClearItemsKit by CoWinkKeyDinkInc · Pull Request #901 · PGMDev/PGM · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add clear-effects option to ClearItemsKit #901

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Aug 22, 2021
Merged

Add clear-effects option to ClearItemsKit #901

merged 5 commits into from
Aug 22, 2021

Conversation

CoWinkKeyDinkInc
Copy link
Contributor
@CoWinkKeyDinkInc CoWinkKeyDinkInc commented Jul 14, 2021 •
edited
Loading

This PR adds a method to clear potions and other status effects from a player using a kit. This works just like the <clear/> and <clear-items> tags. This also adds a new method of parsing the ClearItemsKit which allows more finer configuration. Because of this, it is now possible to clear/keep only the armor slots.

<kit id="clear-effects" force="true">
      <clearinventory items="false" armor="false" effects="true"/>
</kit>
<!-- legacy -->
<kit id="clear-effects" force="true">
      <clear-effects/>
</kit>

@CoWinkKeyDinkInc
Add clear-effects option to ClearItemsKit, add new method of parsing …
9339f4e 
…ClearItemsKit

Signed-off-by: Patrick <cowinkkeydinkinc@gmail.com>
@Pablete1234
Copy link
Member

Naming is a bit mixed-up here, you have clearinventory with no separation, alongside clear-items or clear-effects. Also, clearinventory has more of a connotation of "items in your inventory" not a generic clear for everything.

I'd consider not adding any new clear-effects, as it does not seem to be documented in docs.oc.tc so i don't think it was ever added, and updating clear to include the attributes for items, armor, and effects.

<clear/> <- old method, defaults to clearing items and armor, not effects
<clear items="false" armor="true" effects="true"/> <- clears armor and effects

I'd completely remove clear-effects & clearinventory, and deprecate clear-items in favor of <clear armor="false"/> in a higher proto (1.4.3)

@Pablete1234 Pablete1234 added the feature New feature or request label Jul 15, 2021
@CoWinkKeyDinkInc
Rename <clearinventory> to <clear>, add legacy check
1c6a7a7 
Signed-off-by: Patrick <cowinkkeydinkinc@gmail.com>
Pablete1234
Pablete1234 requested changes Jul 15, 2021
View reviewed changes
CoWinkKeyDinkInc and others added 2 commits July 15, 2021 17:18
@CoWinkKeyDinkInc
Change default values
6759c62 
Signed-off-by: Patrick <cowinkkeydinkinc@gmail.com>
@CoWinkKeyDinkInc
Merge branch 'dev' into add-clear-effects
f737d13
@Pablete1234
Copy link
Member

@Electroid any reason this isn't merged yet?

@CoWinkKeyDinkInc
Copy link
Contributor Author

Yep this is ready to merge and has backwards compatability.

@Electroid Electroid merged commit 916c907 into PGMDev:dev Aug 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Electroid Electroid Electroid approved these changes

@Pablete1234 Pablete1234 Pablete1234 approved these changes

Assignees
No one assigned
Labels
feature New feature or request
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@CoWinkKeyDinkInc @Pablete1234 @Electroid
0