Skip to content

Commit

Permalink
Update droplight effects (#5563)
Browse files Browse the repository at this point in the history
Fixes #5547

Co-authored-by: Daegaladh <Daegaladh@users.noreply.github.com>
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
  • Loading branch information
3 people committed Nov 21, 2020
1 parent 060ba67 commit 071990e
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
21 changes: 20 additions & 1 deletion src/map/itemdb.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -759,12 +759,31 @@ enum e_itemshop_restrictions {
enum e_item_drop_effect : uint16 {
DROPEFFECT_NONE = 0,
DROPEFFECT_CLIENT,
#if PACKETVER < 20200304
DROPEFFECT_WHITE_PILLAR,
#endif
DROPEFFECT_BLUE_PILLAR,
DROPEFFECT_YELLOW_PILLAR,
DROPEFFECT_PURPLE_PILLAR,
#if PACKETVER < 20200304
DROPEFFECT_ORANGE_PILLAR,
#else
DROPEFFECT_GREEN_PILLAR,
#endif
#if PACKETVER >= 20200304
DROPEFFECT_RED_PILLAR,
#endif
DROPEFFECT_MAX,
#if PACKETVER >= 20200304
// White was removed in 2020-03-04
DROPEFFECT_WHITE_PILLAR,
// Orange was replaced by green in 2020-03-04
DROPEFFECT_ORANGE_PILLAR,
DROPEFFECT_MAX
#else
// Not supported before 2020-03-04
DROPEFFECT_GREEN_PILLAR,
DROPEFFECT_RED_PILLAR,
#endif
};

/// Enum for items with delayed consumption
Expand Down
2 changes: 2 additions & 0 deletions src/map/script_constants.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7979,6 +7979,8 @@
export_constant(DROPEFFECT_YELLOW_PILLAR);
export_constant(DROPEFFECT_PURPLE_PILLAR);
export_constant(DROPEFFECT_ORANGE_PILLAR);
export_constant(DROPEFFECT_GREEN_PILLAR);
export_constant(DROPEFFECT_RED_PILLAR);
export_constant(DROPEFFECT_MAX);

/* penalty types */
Expand Down

0 comments on commit 071990e

Please sign in to comment.