Merge pull request #27 from Arthur1/release/2.0.5

Release 2.0.5

Makefile

@@ -1,21 +1,13 @@
-ps:
-	cd laradock; docker-compose ps
+SAIL := ./vendor/bin/sail
 
-restart:
-	make stop
-	make start
+up:
+	$(SAIL) up -d
 
-start:
-	cd laradock; docker-compose up -d workspace nginx mysql php-worker
+down:
+	$(SAIL) down
 
-stop:
-	cd laradock; docker-compose down
+migrate:
+	$(SAIL) artisan migrate
 
-build:
-	cd laradock; docker-compose build workspace nginx mysql php-worker
-
-exec:
-	cd laradock; docker-compose exec --user 1000 workspace bash
-
-exec_mysql:
-	cd laradock; docker-compose exec mysql bash
+mysql:
+	$(SAIL) mysql

app/Game/HandCards/HandCard23.php

@@ -13,7 +13,7 @@ final class HandCard23 extends HandCardBase implements HandCard
 
     public function build()
     {
-        $this->increaseMaxHandCardsNumber(2);
+        $this->increaseMaxHandCardsNumber(4);
         parent::build();
     }
 }

app/Http/Controllers/GamePlayController.php

@@ -126,13 +126,13 @@ public function sell(Request $request, $id)
 
     private function createNextLog(Game $game)
     {
+        $game->refresh();
         $next_player = $game->next_player;
         if ($next_player) {
             GameLog::createUseBuildingLog($game, $next_player);
             return;
         }
 
-        $game->refresh();
         $game->load(['discardLogs', 'wageLogs']);
         $game->append(['wage', 'players_sorted_from_sp', 'discard_in_round_logs', 'wage_in_round_logs']);
         $sorted_players = $game->players_sorted_from_sp;

composer.json

@@ -25,6 +25,7 @@
     "require-dev": {
         "facade/ignition": "^2.3.6",
         "fzaninotto/faker": "^1.9.1",
+        "laravel/sail": "^1.10",
         "laravel/telescope": "^4.1",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^5.0",