Merge branch 'develop'

chrxh · Aug 31, 2024 · 69a1af9 · 69a1af9
2 parents 02539a7 + ba73808
commit 69a1af9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/source/Gui/HelpStrings.h b/source/Gui/HelpStrings.h
@@ -73,9 +73,10 @@ namespace Const
         "#0: The strength of the movement, bending or expansion/contraction. A negative sign corresponds to the opposite "
         "action.\n\n" ICON_FA_CHEVRON_RIGHT " Input channel #1: This channel is solely utilized for acceleration due to bending. If the sign of channel #1 "
         "differs from the sign of channel #0, no acceleration will be obtained during the bending process.\n\n " ICON_FA_CHEVRON_RIGHT
-        " Input channel #3: This channel is used for muscles in movement mode. It contains the relative angle of the movement with respect to a "
-        "detected object. The object must have been targeted from a sensor cell from which the input signal originates (it does not have to be an adjacent cell). A value of -0.5 "
-        "correspond to -180 deg and +0.5 to +180 deg.";
+        " Input channel #3: This channel is used for muscles in movement mode. It encodes the relative angle for the movement with respect to a "
+        "detected object (if the parameter 'Movement toward target' is activated) or to the direction of the adjacent cell where the input signal comes from "
+        "(if the parameter 'Movement toward target' is deactivated). In the first case, the object must have been targeted by a sensor cell from which the "
+        "input signal originates (it does not have to be an adjacent cell). A value of -0.5 correspond to -180 deg and +0.5 to +180 deg.";
 
     std::string const DefenderTooltip =
         "A defender cell does not need to be activated. Its presence reduces the strength of an enemy attack involving attacker "
@@ -454,8 +455,9 @@ namespace Const
         "during the bending process.",
         "The following cell functions obtain their input from channel #2:\n\n" ICON_FA_CHEVRON_RIGHT " Neuron",
         "The following cell functions obtain their input from channel #3:\n\n" ICON_FA_CHEVRON_RIGHT " Neuron\n\n" ICON_FA_CHEVRON_RIGHT
-        " Muscle: This channel is used for muscles in movement mode. It allows to determine the relative angle of the movement with respect to a previously "
-        "detected target from a sensor cell. A value of -0.5 correspond to -180 deg and +0.5 to +180 deg.",
+        " Muscle: This channel is used for muscles in movement mode. It encodes the relative angle for the movement with respect to a previously "
+        "detected target by a sensor cell (if the parameter 'Movement toward target' is activated) or to the direction of the adjacent cell where the input "
+        "signal comes from (if the parameter 'Movement toward target' is deactivated). A value of -0.5 correspond to -180 deg and +0.5 to +180 deg.",
         "The following cell functions obtain their input from channel #4:\n\n" ICON_FA_CHEVRON_RIGHT " Neuron",
         "The following cell functions obtain their input from channel #5:\n\n" ICON_FA_CHEVRON_RIGHT " Neuron",
         "The following cell functions obtain their input from channel #6:\n\n" ICON_FA_CHEVRON_RIGHT " Neuron",

diff --git a/source/Gui/SimulationParametersWindow.cpp b/source/Gui/SimulationParametersWindow.cpp
@@ -1569,9 +1569,9 @@ void _SimulationParametersWindow::processBase()
                             .name("Fetch angle from adjacent sensor")
                             .textWidth(RightColumnWidth)
                             .defaultValue(origParameters.legacyCellFunctionMuscleMovementAngleFromSensor)
-                            .tooltip("This parameter changes the behavior of the parameter 'Movement angle from sensor'. If activated, the fetches the angle "
-                                     "directly from an connected (or connected-connected) sensor cell has previously detected a target (legacy behavior). If "
-                                     "deactivated, the signal must only originate from a sensor cell and must not be adjacent (new behavior)."),
+                            .tooltip("This parameter changes the behavior of the parameter 'Movement toward target'. If activated, the muscle cell fetches the "
+                                     "movement angle directly from a connected (or connected-connected) sensor cell that has previously detected a target "
+                                     "(legacy behavior). If deactivated, the input signal must only originate from a sensor cell and must not be adjacent (new behavior)."),
                         parameters.legacyCellFunctionMuscleMovementAngleFromSensor);
                     AlienImGui::EndTreeNode();
                 }