github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 05:13:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some error handling.

Browse source
This commit is contained in:
xxAtrain223 2025-07-15 21:17:38 -05:00
commit c055e8cd92
2 changed files with 60 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
soh/soh/Enhancements/randomizer/logic_expression.cpp
View file

@ -560,6 +560,7 @@ void LogicExpression::Impl::PopulateFunctionAdapters() {
REGISTER_LOGIC_FUNCTION(GetGSCount), REGISTER_LOGIC_FUNCTION(GetGSCount),
REGISTER_LOGIC_FUNCTION(HasBossSoul), REGISTER_LOGIC_FUNCTION(HasBossSoul),
REGISTER_LOGIC_FUNCTION(HasProjectile), REGISTER_LOGIC_FUNCTION(HasProjectile),
REGISTER_LOGIC_FUNCTION(CanOpenUnderwaterChest),
}; };
} }

94
soh/soh/Enhancements/randomizer/randomizer_logic_tracker.cpp
View file

@ -24,6 +24,7 @@ struct ExpressionTable {
std::optional<LogicExpression::ValueVariant> AdultDay; std::optional<LogicExpression::ValueVariant> AdultDay;
std::optional<LogicExpression::ValueVariant> AdultNight; std::optional<LogicExpression::ValueVariant> AdultNight;
bool Expanded = false; bool Expanded = false;
std::string ErrorMessage;
}; };
ExpressionRow Root; ExpressionRow Root;
@ -106,47 +107,66 @@ static std::tuple<bool, bool, bool> CalculateCombines(const ExpressionTable::Exp
} }
static void PopulateConnectionExpression(LogicTrackerNode::Connection& connection, std::string expressionStr) { static void PopulateConnectionExpression(LogicTrackerNode::Connection& connection, std::string expressionStr) {
connection.ExpressionTable.Root = CreateExpressionRows(LogicExpression::Parse(expressionStr)); std::shared_ptr<LogicExpression> expression;
if (connection.ChildDayAccess) { try {
logic->IsChild = true; expression = LogicExpression::Parse(expressionStr);
logic->AtDay = true;
const auto& eval = EvaluateExpression(connection.ExpressionTable.Root.Expression);
PopulateExpressionValues(connection.ExpressionTable.Root, eval, AgeTime::ChildDay);
logic->IsChild = false;
logic->AtDay = false;
} }
if (connection.ChildNightAccess) { catch (const std::exception& e) {
logic->IsChild = true; connection.ExpressionTable.Root.ErrorMessage = std::string("Parse Error: ") + e.what();
logic->AtNight = true; connection.ExpressionTable.Root.Children.clear();
connection.ExpressionTable.CombineAll = true;
const auto& eval = EvaluateExpression(connection.ExpressionTable.Root.Expression); return;
PopulateExpressionValues(connection.ExpressionTable.Root, eval, AgeTime::ChildNight);
logic->IsChild = false;
logic->AtNight = false;
} }
if (connection.AdultDayAccess) {
logic->IsAdult = true;
logic->AtDay = true;
const auto& eval = EvaluateExpression(connection.ExpressionTable.Root.Expression); try {
PopulateExpressionValues(connection.ExpressionTable.Root, eval, AgeTime::AdultDay); connection.ExpressionTable.Root = CreateExpressionRows(expression);
logic->IsAdult = false; if (connection.ChildDayAccess) {
logic->AtDay = false; logic->IsChild = true;
} logic->AtDay = true;
if (connection.AdultNightAccess) {
logic->IsAdult = true;
logic->AtNight = true;
const auto& eval = EvaluateExpression(connection.ExpressionTable.Root.Expression); const auto& eval = EvaluateExpression(connection.ExpressionTable.Root.Expression);
PopulateExpressionValues(connection.ExpressionTable.Root, eval, AgeTime::AdultNight); PopulateExpressionValues(connection.ExpressionTable.Root, eval, AgeTime::ChildDay);
logic->IsAdult = false; logic->IsChild = false;
logic->AtNight = false; logic->AtDay = false;
}
if (connection.ChildNightAccess) {
logic->IsChild = true;
logic->AtNight = true;
const auto& eval = EvaluateExpression(connection.ExpressionTable.Root.Expression);
PopulateExpressionValues(connection.ExpressionTable.Root, eval, AgeTime::ChildNight);
logic->IsChild = false;
logic->AtNight = false;
}
if (connection.AdultDayAccess) {
logic->IsAdult = true;
logic->AtDay = true;
const auto& eval = EvaluateExpression(connection.ExpressionTable.Root.Expression);
PopulateExpressionValues(connection.ExpressionTable.Root, eval, AgeTime::AdultDay);
logic->IsAdult = false;
logic->AtDay = false;
}
if (connection.AdultNightAccess) {
logic->IsAdult = true;
logic->AtNight = true;
const auto& eval = EvaluateExpression(connection.ExpressionTable.Root.Expression);
PopulateExpressionValues(connection.ExpressionTable.Root, eval, AgeTime::AdultNight);
logic->IsAdult = false;
logic->AtNight = false;
}
} catch (const std::exception& e) {
connection.ExpressionTable.Root.ErrorMessage = std::string("Eval Error: ") + e.what();
connection.ExpressionTable.Root.Children.clear();
connection.ExpressionTable.CombineAll = true;
return;
} }
auto [combineAll, combineChild, combineAdult] = CalculateCombines(connection.ExpressionTable.Root); auto [combineAll, combineChild, combineAdult] = CalculateCombines(connection.ExpressionTable.Root);
@ -293,7 +313,7 @@ static void DrawColoredWrappedText(const std::vector<std::pair<ImVec4, std::stri
firstWordInSegment = false; firstWordInSegment = false;
} }
} }
ImGui::SetCursorScreenPos(ImVec2(x, y + fontSize)); ImGui::SetCursorScreenPos(ImVec2(pos.x, y + fontSize));
} }
static void DrawCondition(const LogicExpression& expression) { static void DrawCondition(const LogicExpression& expression) {
@ -362,8 +382,12 @@ static void DrawExpressionRow(const ExpressionTable& table, ExpressionTable::Exp
ImGui::EndDisabled(); ImGui::EndDisabled();
} }
ImGui::PopID(); ImGui::PopID();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
DrawCondition(*row.Expression); DrawCondition(*row.Expression);
if (!row.ErrorMessage.empty()) {
ImGui::TextWrapped("%s", row.ErrorMessage.c_str());
}
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::TextUnformatted(ToString(row.ChildDay).c_str()); ImGui::TextUnformatted(ToString(row.ChildDay).c_str());