Skip to content
This repository was archived by the owner on Feb 10, 2024. It is now read-only.

add(potions): portion rework#828

Draft
MrLar wants to merge 12 commits intomasterfrom
potion-rework
Draft

add(potions): portion rework#828
MrLar wants to merge 12 commits intomasterfrom
potion-rework

Conversation

@MrLar
Copy link
Member

@MrLar MrLar commented Sep 22, 2023 •
edited
Loading

  • Mainly allows multiple kinds of potions to be equipped at once
  • Adds a way to limit what buffs/potions can be stacked together (using PotionEffectType)
  • Adds emotes to use item for potions
  • Will add some potions and make some potions accessible through new/other means

@MrLar MrLar marked this pull request as ready for review September 22, 2023 00:50
@MrLar MrLar marked this pull request as draft September 22, 2023 00:51
@MrLar MrLar marked this pull request as ready for review October 14, 2023 19:26
@MrLar MrLar marked this pull request as draft October 14, 2023 19:27
MrLar added 8 commits October 14, 2023 16:38
@MrLar @Kodehawa
add(potions): allow different kinds of buffs/potions to be equipped a…
fbbd1dd 
…t once
@MrLar @Kodehawa
add(profile): add profile buffs (removes buffs from profile stats)
aadf0c4
@MrLar @Kodehawa
add(effects): more maintainable buff handling
55d1c98
@MrLar @Kodehawa
fix(effects): save effect clearing
5881d4c 
- Ironically due to java reference types this only ever effected the milky potion and was also a thing pre-potion-rework
@MrLar @Kodehawa
fix(profile): make buff list more pretty
677dda1
@MrLar @Kodehawa
fix(profile): sort buff list the same way every time
e256bfd
@MrLar @Kodehawa
add(effects): minor tweaks
f6e5418
@MrLar @Kodehawa
add(effects): make milky potion able to select specific type & remove…
7ec9460 
… distinction between potion/buff

add(effects): rename waifu pill -> tea and make it conditionless (this is not a final decision)
add(operations): add select menu ops
fix(equipment): potions/buffs could be equipped lol
fix(profile): buffs cmd failed if no buffs
MrLar and others added 4 commits October 14, 2023 21:53
@MrLar
add(cast): make tea castable (only)
53dbd89 
add(item/buff): buff tea money gain (will stay money buff)
add(item): streamline "is item usable" and "is item potion" checks
add(usable): proper method name for handling usable items
fix(buff): properly rename money key
@MrLar
add(buffs): add pet toy
b8acfcd
@MrLar
add(chop/fish): improve drop logic
cf22f71
@Kodehawa
Merge branch 'master' into potion-rework
a4ee12a
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MrLar @Kodehawa