Merge pull request #1 from sdphp/master

pulling new changes form sdphp:master
sdphp · Dec 13, 2014 · 704ca94 · 704ca94
2 parents e614ebc + f3dde39
commit 704ca94
Show file tree

Hide file tree

Showing 12 changed files with 217 additions and 235 deletions.
diff --git a/app/game b/app/game
@@ -24,8 +24,8 @@ $delegatingLoader = new DelegatingLoader($loaderResolver);
 
 $gameDice = new BasicDice();
 $gameLogic = new BasicGameLogic();
-$gameState = new BasicGameState($gameDice);
 $player = new BasicPlayer($delegatingLoader);
+$gameState = new BasicGameState($player, $gameDice, ['position' => 0]);
 $gameState->setPlayer($player);
 
 // <====

diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
         "php": ">=5.4",
         "symfony/console": "~2.6",
         "symfony/yaml": "~2.6",
-        "symfony/config": "~2.6"
+        "symfony/config": "~2.6",
+        "symfony/http-foundation": "~2.6"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Command/GameCommand.php b/src/Command/GameCommand.php
@@ -11,7 +11,7 @@
 use SDPHP\PHPMicrork\IO\GameCLIIO;
 use SDPHP\PHPMicrork\Logic\GameLogicInterface;
 use SDPHP\PHPMicrork\Loop\GameLoop;
-use SDPHP\PHPMicrork\State\GameStateInterface;
+use SDPHP\PHPMicrork\State\StateInterface;
 use Symfony\Component\Config\Loader\DelegatingLoader;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -42,7 +42,7 @@ class GameCommand extends Command
      */
     private $gameLogic;
 
-    public function __construct(DelegatingLoader $delegatingLoader, GameStateInterface $gameState, GameLogicInterface $gameLogic, $name = null)
+    public function __construct(DelegatingLoader $delegatingLoader, StateInterface $gameState, GameLogicInterface $gameLogic, $name = null)
     {
         parent::__construct($name);
         $this->delegatingLoader = $delegatingLoader;
@@ -53,7 +53,7 @@ public function __construct(DelegatingLoader $delegatingLoader, GameStateInterfa
     protected function configure()
     {
         $this
-            ->setName('micrork:run')
+            ->setName('run')
             ->setDescription('Main command to start a new PHPOrk game.')
             ->addArgument(
                 'name',
@@ -85,16 +85,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $gameIO = new GameCLIIO($questionHelper, $input, $output);
         $gameLoop = new GameLoop($gameIO);
         $this->gameState->getPlayer()->setName($name);
-        $next = true;
 
-        while ($next !== false) {
-            $this->gameState->setLevel( $this->currentLevel['level']);
+        while (!$this->gameState->isStateOver()) {
+            $this->gameState->setProperty('level', $this->currentLevel['level']);
             $gameLoop->start($this->gameState, $this->gameLogic);
-
-            if ($this->gameState->isGameOver()) {
-                $next = false;
-            } elseif ($this->gameState->isLevelOver()) {
-                $next = $this->gameState->getNextLevel();
+            $next = $this->gameState->getProperty('next_level', false);
+            if ($next) {
                 $this->loadLevel($next);
             }
         }

diff --git a/src/Logic/BasicGameLogic.php b/src/Logic/BasicGameLogic.php
@@ -9,7 +9,8 @@
 
 use SDPHP\PHPMicrork\IO\GameIOInterface;
 use SDPHP\PHPMicrork\Loop\FightLoop;
-use SDPHP\PHPMicrork\State\GameStateInterface;
+use SDPHP\PHPMicrork\Player\BasicNPC;
+use SDPHP\PHPMicrork\State\StateInterface;
 
 /**
  * BasicGameLogic - Description. 
@@ -18,12 +19,14 @@
  */
 class BasicGameLogic implements GameLogicInterface
 {
-    public function switchState(GameStateInterface $gameState, GameIOInterface $gameIO)
+    public function switchState(StateInterface $gameState, GameIOInterface $gameIO)
     {
-        $room = $gameState->getRoom();
+        $location = $gameState->getProperty('location');
+        $locationProperty = sprintf('level[room][%s]', $location);
+        $room = $gameState->getProperty($locationProperty);
         $directions = $room['directions'];
-        $gameIO->printPlace($room);
 
+        $gameIO->printPlace($room);
         $input = $gameIO->askQuestion('Choose your next move: ');
 
         // get command an argument, usually a verb followed by noun
@@ -34,31 +37,31 @@ public function switchState(GameStateInterface $gameState, GameIOInterface $game
         switch(strtolower($command)) {
             case 'north':
                 if (isset($directions[$command]) && $directions[$command] !== '-') {
-                    $gameState->setPosition($directions[$command]);
+                    $gameState->setProperty('location', $directions[$command]);
                 } else {
                     $gameIO->printError("You cannot go north!");
                 }
                 break;
 
             case 'south':
                 if (isset($directions[$command]) && $directions[$command] !== '-') {
-                    $gameState->setPosition($directions[$command]);
+                    $gameState->setProperty('location', $directions[$command]);
                 } else {
                     $gameIO->printError("You cannot go south!");
                 }
                 break;
 
             case 'west':
                 if (isset($directions[$command]) && $directions[$command] !=='-') {
-                    $gameState->setPosition($directions[$command]);
+                    $gameState->setProperty('location', $directions[$command]);
                 } else {
                     $gameIO->printError("You cannot go west!");
                 }
                 break;
 
             case 'east':
                 if (isset($directions[$command]) && $directions[$command] !== '-') {
-                    $gameState->setPosition($directions[$command]);
+                    $gameState->setProperty('location', $directions[$command]);
                 } else {
                     $gameIO->printError("You cannot go east!");
                 }
@@ -70,7 +73,7 @@ public function switchState(GameStateInterface $gameState, GameIOInterface $game
 
             case 'fight':
                     if ($argument) {
-                        $gameState->loadNPC($argument);
+                        $gameState->setNpc(new BasicNPC($argument));
                         $fightLoop = new FightLoop($gameIO);
                         $fightLoop->start($gameState, new FightLogic());
 
@@ -92,7 +95,7 @@ public function switchState(GameStateInterface $gameState, GameIOInterface $game
                 if ($argument) {
                     $gameIO->printComment(sprintf('Drinking %s, glup...', $argument));
                     if ($argument === 'water') {
-                        $gameIO->printComment('Sissy!');
+                        $gameIO->printComment('You hear a drunken warrion in the distance yell: "Sissy!"');
                     }
                 } else {
                     $gameIO->printError('You need to choose what you are Drinking');

diff --git a/src/Logic/FightLogic.php b/src/Logic/FightLogic.php
@@ -7,7 +7,8 @@
  */
 
 namespace SDPHP\PHPMicrork\Logic;
-use SDPHP\PHPMicrork\State\GameStateInterface;
+
+use SDPHP\PHPMicrork\State\StateInterface;
 use SDPHP\PHPMicrork\IO\GameIOInterface;
 
 
@@ -19,10 +20,11 @@
 class FightLogic implements GameLogicInterface
 {
 
-    public function switchState(GameStateInterface $state, GameIOInterface $gameIO)
+    public function switchState(StateInterface $state, GameIOInterface $gameIO)
     {
         $player = $state->getPlayer();
-        $npc = $state->getNPC();
+        $npc = $state->getNPCs();
+
         // TODO: Implement switchState() method.
     }
 }
diff --git a/src/Logic/GameLogicInterface.php b/src/Logic/GameLogicInterface.php
@@ -5,10 +5,11 @@
  * please view the LICENSE file that was distributed 
  * with this source code.
  */
+
 namespace SDPHP\PHPMicrork\Logic;
 
 use SDPHP\PHPMicrork\IO\GameIOInterface;
-use SDPHP\PHPMicrork\State\GameStateInterface;
+use SDPHP\PHPMicrork\State\StateInterface;
 
 /**
  * LogicInterface - Description. 
@@ -17,5 +18,5 @@
  */
 interface GameLogicInterface
 {
-    public function switchState(GameStateInterface $state, GameIOInterface $gameIO);
+    public function switchState(StateInterface $state, GameIOInterface $gameIO);
 }
diff --git a/src/Loop/AbstractGameLoop.php b/src/Loop/AbstractGameLoop.php
@@ -9,7 +9,7 @@
 
 use SDPHP\PHPMicrork\IO\GameIOInterface;
 use SDPHP\PHPMicrork\Logic\GameLogicInterface;
-use SDPHP\PHPMicrork\State\GameStateInterface;
+use SDPHP\PHPMicrork\State\StateInterface;
 
 /**
  * AbstractGameLoopo - Description. 
@@ -28,5 +28,5 @@ public function __construct(GameIOInterface $gameIO)
         $this->gameIO = $gameIO;
     }
 
-    abstract public function start(GameStateInterface $gameState, GameLogicInterface $gameLogic);
+    abstract public function start(StateInterface $gameState, GameLogicInterface $gameLogic);
 }