ensuring that all cards have a name attribute, not just Hearts and Di…

…amonds
farfromunique · Jun 1, 2015 · 50b3d00 · 50b3d00
1 parent 781a05f
commit 50b3d00
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/classes/PowerTwist.class.php b/classes/PowerTwist.class.php
@@ -26,13 +26,17 @@ public function __construct ($target = ['Poker','RandomValue','RandomSuit']) {
 					$this->twist['Suit'] = $this->twist['Suit'][0];
 					$this->twist['Value'] = $this->twist['Value'][0];
 
-					if ($this->twist['Suit']['name'] === 'Spades' || $this->twist['Suit']['name'] === 'Clubs') {
+					if ($this->twist['Suit']['name'] === 'Spades' 
+					|| $this->twist['Suit']['name'] === 'Clubs') {
 						$this->twist['image'] = '/card/r-' . strtolower($this->twist['Value']['name']) . '.' . strtolower($this->twist['Suit']['name']);
 						} else {
-							$this->twist['image'] = '/card/b-' . strtolower($this->twist['Value']['name']) . '.' . strtolower($this->twist['Suit']['name']);
-
-							$this->twist['name'] = $this->twist['Value']['name'] . ' of ' . $this->twist['Suit']['name'];
-						}
+							$this->twist['image'] = '/card/b-' 
+								. strtolower($this->twist['Value']['name']) . '.' 
+								. strtolower($this->twist['Suit']['name']);
+						}							
+						$this->twist['name'] = $this->twist['Value']['name'] 
+							. ' of ' . $this->twist['Suit']['name'];
+
 				} else {
 					$this->twist['Tarot'] = $this->array_random_assoc($this->twistList['Tarot']);
 					$this->twist['Tarot'] = $this->twist['Tarot'][0];
@@ -43,13 +47,18 @@ public function __construct ($target = ['Poker','RandomValue','RandomSuit']) {
 					$this->twist['Suit'] = $this->twistList['Suit'][$target[2]];
 
 
-					if ($this->twist['Suit']['name'] === 'Spades' || $this->twist['Suit']['name'] === 'Clubs') {
-						$this->twist['image'] = '/card/r-' . strtolower($this->twist['Value']['name']) . '.' . strtolower($this->twist['Suit']['name']);
+					if ($this->twist['Suit']['name'] === 'Spades' 
+					|| $this->twist['Suit']['name'] === 'Clubs') {
+						$this->twist['image'] = '/card/r-'
+							 . strtolower($this->twist['Value']['name']) . '.' 
+							 . strtolower($this->twist['Suit']['name']);
 						} else {
-							$this->twist['image'] = '/card/b-' . strtolower($this->twist['Value']['name']) . '.' . strtolower($this->twist['Suit']['name']);
-
-							$this->twist['name'] = $this->twist['Value']['name'] . ' of ' . $this->twist['Suit']['name'];
+							$this->twist['image'] = '/card/b-' 
+								. strtolower($this->twist['Value']['name']) . '.' 
+								. strtolower($this->twist['Suit']['name']);
 						}
+						$this->twist['name'] = $this->twist['Value']['name'] 
+							. ' of ' . $this->twist['Suit']['name'];
 				} else {
 					$this->twist['Tarot'] = $this->array_random_assoc($this->twistList['Tarot']);
 					$this->twist['Tarot'] = $this->twist['Tarot'][0];
@@ -61,7 +70,7 @@ public function __construct ($target = ['Poker','RandomValue','RandomSuit']) {
 		public function getBigImageCell() {
 			$output = "\t\t" . '<td>' . "\n";
 			$output .= "\t\t\t" . '<img src="' . $this->twist['image'] . '"><br />' . "\n";
-			$output .= "\t\t\t" . $this->twist['name'] . '<br />' . "\n";
+			$output .= "\t\t\t" . $this->twist['name'] . "\n";
 			$output .= "\t\t" .  '</td>' . "\n";
 
 			return $output;