From d9d9959be97ab548734bfd7c2ac3e4653e1bf235 Mon Sep 17 00:00:00 2001 From: Ruben Date: Sun, 4 Sep 2016 18:01:07 +0100 Subject: [PATCH] Bug fixes --- src/Models/Game.php | 2 +- src/Models/Hit.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Models/Game.php b/src/Models/Game.php index 4b6fbce..c21151d 100644 --- a/src/Models/Game.php +++ b/src/Models/Game.php @@ -215,7 +215,7 @@ class Game $emotion = $target->getEmotion(); $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 " . $target->getScore() ."% " . $emotion->getName() diff --git a/src/Models/Hit.php b/src/Models/Hit.php index c6f056c..ea24b4c 100644 --- a/src/Models/Hit.php +++ b/src/Models/Hit.php @@ -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']; + + /** + * @JMS\Exclude + * @var array + */ public static $EXPRESSIONS_2ND_PERSON = [ 'mouth_open' => 'open your mouth', 'lip_press' => 'press your lips',