Bug fixes

This commit is contained in:
Ruben 2016-09-04 18:01:07 +01:00
parent 222eb57de3
commit d9d9959be9
2 changed files with 6 additions and 1 deletions

View file

@ -215,7 +215,7 @@ class Game
$emotion = $target->getEmotion(); $emotion = $target->getEmotion();
$exaggerate = ($target->getScore() - $hit->getEmotions()->getEmotionScore($emotion)) > 20 ? "only " : ""; $exaggerate = ($target->getScore() - $hit->getEmotions()->getEmotionScore($emotion)) > 20 ? "only " : "";
$exaggerate = ($target->getScore() - $hit->getEmotions()->getEmotionScore($emotion)) < -20 ? "a whopping " : $only; $exaggerate = ($target->getScore() - $hit->getEmotions()->getEmotionScore($emotion)) < -20 ? "a whopping " : $exaggerate;
$text = "When you had to feel " $text = "When you had to feel "
. $target->getScore() ."% " . $emotion->getName() . $target->getScore() ."% " . $emotion->getName()

View file

@ -429,6 +429,11 @@ class Expressions {
*/ */
public static $EXPRESSIONS = ['roll','pitch','yaw','inter_ocular_distance','mouth_open','lip_press','brow_raise','nose_wrinkler','lip_depressor','brow_furrow','attention','smile','inner_brow_raiser','chin_raiser','smirk','lip_suck','upper_lip_raiser','lip_pucker','eye_closure','engagement','valence']; public static $EXPRESSIONS = ['roll','pitch','yaw','inter_ocular_distance','mouth_open','lip_press','brow_raise','nose_wrinkler','lip_depressor','brow_furrow','attention','smile','inner_brow_raiser','chin_raiser','smirk','lip_suck','upper_lip_raiser','lip_pucker','eye_closure','engagement','valence'];
/**
* @JMS\Exclude
* @var array
*/
public static $EXPRESSIONS_2ND_PERSON = [ public static $EXPRESSIONS_2ND_PERSON = [
'mouth_open' => 'open your mouth', 'mouth_open' => 'open your mouth',
'lip_press' => 'press your lips', 'lip_press' => 'press your lips',