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.

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

fix roll_remainder eoc effect #79526

Merged
merged 1 commit into from
Feb 4, 2025
Merged

fix roll_remainder eoc effect #79526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/npctalk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7365,7 +7365,6 @@ parsers = {
{ "u_learn_recipe", "npc_learn_recipe", jarg::member, &talk_effect_fun::f_learn_recipe },
{ "u_forget_recipe", "npc_forget_recipe", jarg::member, &talk_effect_fun::f_forget_recipe },
{ "u_message", "npc_message", jarg::member, &talk_effect_fun::f_message },
{ "message", "message", jarg::member, &talk_effect_fun::f_message },
{ "u_add_wet", "npc_add_wet", jarg::member | jarg::array, &talk_effect_fun::f_add_wet },
{ "u_assign_activity", "npc_assign_activity", jarg::member, &talk_effect_fun::f_assign_activity },
{ "u_make_sound", "npc_make_sound", jarg::member, &talk_effect_fun::f_make_sound },
Expand Down Expand Up @@ -7451,6 +7450,9 @@ parsers = {
{ "u_set_talker", "npc_set_talker", jarg::member, &talk_effect_fun::f_set_talker },
{ "turn_cost", jarg::member, &talk_effect_fun::f_turn_cost },
{ "transform_item", jarg::member, &talk_effect_fun::f_transform_item },
// since parser checks all effects in order, having "message" field in any another effect (like in f_roll_remainder)
// would cause parser to think it's a "message" effect
{ "message", "message", jarg::member, &talk_effect_fun::f_message },
};

void talk_effect_t::parse_sub_effect( const JsonObject &jo, const std::string_view src )
Expand Down
Loading