From be702fe365e553a1223d8e24c29c8d554dd9272c Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sat, 22 Feb 2025 19:05:56 -0500 Subject: [PATCH] Fix some missing annotations in the button dictionary. These are mostly errors that were already wrong in the old dictionary. It's possible that some are things missed in the refactor though. --- src/scenario/special-affect.cpp | 3 ++- src/scenario/special-condition.cpp | 1 + src/scenario/special-general.cpp | 3 +-- src/scenario/special-town.cpp | 9 ++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/scenario/special-affect.cpp b/src/scenario/special-affect.cpp index 6b257638..7a2ac983 100644 --- a/src/scenario/special-affect.cpp +++ b/src/scenario/special-affect.cpp @@ -12,7 +12,8 @@ node_category_info_t CAT_AFFECT{eSpecType::SELECT_TARGET, eSpecType::UNSTORE_PC} namespace { node_properties_t S_SELECT = node_builder_t(eSpecType::SELECT_TARGET) - .msg(); + .msg() + .ex1b(eSpecPicker::NODE); node_properties_t S_DAMAGE = node_builder_t(eSpecType::DAMAGE) .msg() .ex2b(eSpecPicker::DAMAGE_TYPE) diff --git a/src/scenario/special-condition.cpp b/src/scenario/special-condition.cpp index 303636a4..b07af5d9 100644 --- a/src/scenario/special-condition.cpp +++ b/src/scenario/special-condition.cpp @@ -97,6 +97,7 @@ namespace { .ex1c(eSpecPicker::NODE); node_properties_t S_NUM = node_builder_t(eSpecType::IF_NUM_RESPONSE) .msg1(+eSpecPicker::MSG_SINGLE) + .ptyp(eSpecPicker::NODE) .ex1b(STRT_CMP) .ex1c(eSpecPicker::NODE) .ex2b(STRT_CMP) diff --git a/src/scenario/special-general.cpp b/src/scenario/special-general.cpp index ae94a0bb..a05f1077 100644 --- a/src/scenario/special-general.cpp +++ b/src/scenario/special-general.cpp @@ -111,8 +111,7 @@ namespace{ .ex2b(STRT_TER); node_properties_t S_TERTRANS = node_builder_t(eSpecType::TRANS_TER) .msg() - .loc(eSpecField::EX1A, eSpecField::EX1B) - .ex2a(STRT_TER); + .loc(eSpecField::EX1A, eSpecField::EX1B); node_properties_t S_BUF_CLEAR = node_builder_t(eSpecType::CLEAR_BUF); node_properties_t S_BUF_ADDSTR = node_builder_t(eSpecType::APPEND_STRING) .ex1a(eSpecPicker::MSG_SINGLE); diff --git a/src/scenario/special-town.cpp b/src/scenario/special-town.cpp index 51f17cec..40940371 100644 --- a/src/scenario/special-town.cpp +++ b/src/scenario/special-town.cpp @@ -97,9 +97,11 @@ namespace { .ex2a(STRT_ITEM); node_properties_t S_SPLIT = node_builder_t(eSpecType::TOWN_SPLIT_PARTY) .msg() - .loc(eSpecField::EX1A, eSpecField::EX1B); + .loc(eSpecField::EX1A, eSpecField::EX1B) + .ex2a(eSpecPicker::SOUND); node_properties_t S_REUNITE = node_builder_t(eSpecType::TOWN_REUNITE_PARTY) - .msg(); + .msg() + .ex1c(eSpecPicker::SOUND); node_properties_t S_TIMER = node_builder_t(eSpecType::TOWN_TIMER_START) .msg() .ex1b(eSpecPicker::NODE); @@ -115,7 +117,8 @@ namespace { .msg(); node_properties_t S_TARGET = node_builder_t(eSpecType::TOWN_START_TARGETING) .msg() - .ex1a(STRT_SPELL_PAT); + .ex1a(STRT_SPELL_PAT) + .ex2a(eSpecPicker::NODE); node_properties_t S_FIELDS = node_builder_t(eSpecType::TOWN_SPELL_PAT_FIELD) .msg() .loc(eSpecField::EX1A, eSpecField::EX1B)