update some stuff

wombat/src/main/cpp/behaviour/Trigger.cpp

@@ -72,7 +72,17 @@ Trigger* Trigger::operator||(std::pair<std::function<bool()>, std::string> rhs)
                      rhs.second);
 }
 
+Trigger* Trigger::operator||(std::function<bool()> rhs) {
+  return new Trigger([condition = m_condition, rhs = std::move(rhs)]() { return condition() || rhs(); },
+                     "Logical or of " + k_name);
+}
+
 Trigger* Trigger::operator&&(std::pair<std::function<bool()>, std::string> rhs) {
   return new Trigger([condition = m_condition, rhs = std::move(rhs)]() { return condition() && rhs.first(); },
                      rhs.second);
 }
+
+Trigger* Trigger::operator&&(std::function<bool()> rhs) {
+  return new Trigger([condition = m_condition, rhs = std::move(rhs)]() { return condition() && rhs(); },
+                     "Logical and of " + k_name);
+}

wombat/src/main/include/behaviour/Trigger.h

@@ -100,17 +100,35 @@ class Trigger {
   /**
    * Returns a Trigger* from a logical OR with m_condition and the provided condition.
    *
-   * @param rhs A std::pair of the right hand condition of the logical OR operation and the name for the new trigger.
+   * @param rhs A std::pair of the right hand condition of the logical OR operation and the name for the new
+   * trigger.
    */
   Trigger* operator||(std::pair<std::function<bool()>, std::string> rhs);
 
+  /**
+   * Returns a Trigger* from a logical OR with m_condition and the provided condition. <br> <b> WARNING </b>
+   * The name for this isn't unique so you can only use one operator like this.
+   *
+   * @param rhs The hand condition of the logical OR operation
+   */
+  Trigger* operator||(std::function<bool()> rhs);
+
   /**
    * Returns a Trigger* from a logical AND with m_condition and the provided condition.
    *
-   * @param rhs A std::pair of the right hand condition of the logical AND operation and the name for the new trigger.
+   * @param rhs A std::pair of the right hand condition of the logical AND operation and the name for the new
+   * trigger.
    */
   Trigger* operator&&(std::pair<std::function<bool()>, std::string> rhs);
 
+  /**
+   * Returns a Trigger* from a logical AND with m_condition and the provided condition. <br> <b> WARNING </b>
+   * The name for this isn't unique so you can only use one operator like this.
+   *
+   * @param rhs The hand condition of the logical AND operation
+   */
+  Trigger* operator&&(std::function<bool()> rhs);
+
  private:
   std::string k_name;
   std::function<bool()> m_condition;