From 4b50afc93b32fb74fff239776f965c3a9d290802 Mon Sep 17 00:00:00 2001 From: Emily Venezia Date: Mon, 8 Apr 2024 03:53:09 -0400 Subject: [PATCH] misc(zq)!: Clarify 'Condition's in help text of combo triggers tab --- src/dialog/comboeditor.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/dialog/comboeditor.cpp b/src/dialog/comboeditor.cpp index 978dca938f..e55201b387 100644 --- a/src/dialog/comboeditor.cpp +++ b/src/dialog/comboeditor.cpp @@ -2876,7 +2876,8 @@ std::shared_ptr ComboEditorDialog::view() { InfoDialog("Proximity Requirement","If the value is >0, the combo " " will only trigger if the player is within that number of pixels of the combo." - "\nIf 'Invert Proximity Req' is checked, the player must be FARTHER than that distance instead.").show(); + "\nIf 'Invert Proximity Req' is checked, the player must be FARTHER than that distance instead." + "\n\nThis is a 'Condition'. It won't trigger the combo on its own, but it must apply for other triggers to work.").show(); } ), Label(text = "LightBeam:", fitParent = true), @@ -3109,9 +3110,11 @@ std::shared_ptr ComboEditorDialog::view() ) ), Rows<2>( - INFOBTN("Only trigger if the specified counter has at least the specified amount."), + INFOBTN("Only trigger if the specified counter has at least the specified amount." + "\n\nThis is a 'Condition'. It won't trigger the combo on its own, but it must apply for other triggers to work."), TRIGFLAG(51,"Require >="), - INFOBTN("Only trigger if the specified counter has less than the specified amount."), + INFOBTN("Only trigger if the specified counter has less than the specified amount." + "\n\nThis is a 'Condition'. It won't trigger the combo on its own, but it must apply for other triggers to work."), TRIGFLAG(52,"Require <"), INFOBTN("If the counter has the specified amount, consume it." " Negative amount will add to the counter."), @@ -3139,7 +3142,8 @@ std::shared_ptr ComboEditorDialog::view() InfoDialog("Item Requirement","If the value is >0, the item " " id set here must be owned to trigger the combo." "\nIf 'Invert Item Req' is checked, the item must NOT be owned instead." - "\nIf 'Consume Item Req' is checked, the item will be removed upon triggering.").show(); + "\nIf 'Consume Item Req' is checked, the item will be removed upon triggering." + "\n\nThis is a 'Condition'. It won't trigger the combo on its own, but it must apply for other triggers to work.").show(); } ), Label(text = "Spawn Item:", fitParent = true),