image adaptations and thresholds

Scenarios/gear_scenario_uni_de.xml

@@ -103,7 +103,7 @@
 					<drawPriority>3</drawPriority>
 					<image>assets/feedback_button_true.png</image>
 					<rotateWithHandle>false</rotateWithHandle>
-					<triggerCondition>(Feedback==1) &amp;&amp; (((Task == 1) &amp;&amp; (ForceOnPedal &lt; 280)) || ((Task == 2) &amp;&amp; (Energy &gt; 23100)) || ((Task == 3) &amp;&amp; (ForceOnPedal &lt; 1500) &amp;&amp; (Energy &gt; 23100)) || ((Task == 4) &amp;&amp; (Energy &gt; 4100) &amp;&amp; (Energy &lt; 4200)) || ((Task == 5) &amp;&amp; (Energy &gt; 10000) &amp;&amp; (ForceOnPedal &gt; 2100) &amp;&amp; (ForceOnPedal &lt; 2200)) || ((Task == 6) &amp;&amp; (Energy == 8486) &amp;&amp; (ForceOnPedal == 2709))  || ((Task == 7) &amp;&amp; (Distance == 0) &amp;&amp; (Ground*PedalGear*WheelGear != 0) &amp;&amp; (Inclination != -10)) || ((Task == 8) &amp;&amp; (PedalGear == 0) &amp;&amp; (WheelGear == 0) &amp;&amp; (Ground*Distance != 0) &amp;&amp; (Inclination != -10)))</triggerCondition>
+					<triggerCondition>(Feedback==1) &amp;&amp; (((Task == 1) &amp;&amp; (ForceOnPedal == 322)) || ((Task == 2) &amp;&amp; (Energy == 148) &amp;&amp; (ForceOnPedal &lt; 1500)) || ((Task == 3) &amp;&amp; (ForceOnPedal &lt; 1500) &amp;&amp; (Energy &gt; 2886) &amp;&amp; (Energy &lt;= 5624)) || ((Task == 4) &amp;&amp; (Energy &gt; 5624) &amp;&amp; (Energy &lt;= 8362) &amp;&amp; (ForceOnPedal == 483)) || ((Task == 5) &amp;&amp; (Energy == 11100) &amp;&amp; (ForceOnPedal &gt; 1264) &amp;&amp; (ForceOnPedal &lt;= 1500)) || ((Task == 6) &amp;&amp; (Energy == 222) &amp;&amp; (ForceOnPedal == 1486))  || ((Task == 7) &amp;&amp; (Distance == 0) &amp;&amp; (Ground*PedalGear*WheelGear != 0) &amp;&amp; (Inclination != -10)) || ((Task == 8) &amp;&amp; (PedalGear == 0) &amp;&amp; (WheelGear == 0) &amp;&amp; (Ground*Distance != 0) &amp;&amp; (Inclination != -10)))</triggerCondition>
 				</corona>
 			</coronas>
 		</object>	
@@ -294,7 +294,7 @@
 					<drawPriority>20</drawPriority>
 					<image>assets/feedback_correct.png</image>
 					<rotateWithHandle>false</rotateWithHandle>
-					<triggerCondition>(Feedback==1) &amp;&amp; (((Task == 1) &amp;&amp; (ForceOnPedal &lt; 280)) || ((Task == 2) &amp;&amp; (Energy &gt; 23100)) || ((Task == 3) &amp;&amp; (ForceOnPedal &lt; 1500) &amp;&amp; (Energy &gt; 23100)) || ((Task == 4) &amp;&amp; (Energy &gt; 4100) &amp;&amp; (Energy &lt; 4200)) || ((Task == 5) &amp;&amp; (Energy &gt; 10000) &amp;&amp; (ForceOnPedal &gt; 2100) &amp;&amp; (ForceOnPedal &lt; 2200)) || ((Task == 6) &amp;&amp; (Energy == 8486) &amp;&amp; (ForceOnPedal == 2709))  || ((Task == 7) &amp;&amp; (Distance == 0) &amp;&amp; (Ground*PedalGear*WheelGear != 0) &amp;&amp; (Inclination != -10)) || ((Task == 8) &amp;&amp; (PedalGear == 0) &amp;&amp; (WheelGear == 0) &amp;&amp; (Ground*Distance != 0) &amp;&amp; (Inclination != -10)))</triggerCondition>
+					<triggerCondition>(Feedback==1) &amp;&amp; (((Task == 1) &amp;&amp; (ForceOnPedal == 322)) || ((Task == 2) &amp;&amp; (Energy == 148) &amp;&amp; (ForceOnPedal &lt; 1500)) || ((Task == 3) &amp;&amp; (ForceOnPedal &lt; 1500) &amp;&amp; (Energy &gt; 2886) &amp;&amp; (Energy &lt;= 5624)) || ((Task == 4) &amp;&amp; (Energy &gt; 5624) &amp;&amp; (Energy &lt;= 8362) &amp;&amp; (ForceOnPedal == 483)) || ((Task == 5) &amp;&amp; (Energy == 11100) &amp;&amp; (ForceOnPedal &gt; 1264) &amp;&amp; (ForceOnPedal &lt;= 1500)) || ((Task == 6) &amp;&amp; (Energy == 222) &amp;&amp; (ForceOnPedal == 1486))  || ((Task == 7) &amp;&amp; (Distance == 0) &amp;&amp; (Ground*PedalGear*WheelGear != 0) &amp;&amp; (Inclination != -10)) || ((Task == 8) &amp;&amp; (PedalGear == 0) &amp;&amp; (WheelGear == 0) &amp;&amp; (Ground*Distance != 0) &amp;&amp; (Inclination != -10)))</triggerCondition>
 				</corona>
 			</coronas>
 		</object>