Adding an auto answer for distress signal + small fixes.

dbmodel.sql

@@ -12,9 +12,10 @@ ALTER TABLE `player` ADD `comm_token` varchar(16) NOT NULL DEFAULT 'middle' COMM
 ALTER TABLE `player` ADD `comm_pending` smallint(1) NOT NULL DEFAULT '0' COMMENT 'want to communicate next time is possible';
 
 ALTER TABLE `player` ADD `comm_card_id` int(10) DEFAULT NULL COMMENT 'id of the communicated card';
-ALTER TABLE `player` ADD `distress_choice` smallint(1) DEFAULT 0 COMMENT 'unset, clockwise, anticlockwise or dontuse';
+ALTER TABLE `player` ADD `distress_choice` smallint(1) DEFAULT 0 COMMENT 'unset, clockwise, anticlockwise, dontuse, agree';
 ALTER TABLE `player` ADD `distress_card_id` int(10) unsigned NULL COMMENT 'id of the card to pass with distress';
 ALTER TABLE `player` ADD `reply_choice` int(10) unsigned NULL COMMENT 'id of the chosen reply';
+ALTER TABLE `player` ADD `distress_auto` smallint(1) DEFAULT 0 COMMENT 'none, autono, autoyes';
 
 
 

modules/css/layout.scss

@@ -253,6 +253,7 @@ html,body {
             &[data-choice="1"] {  background-position: 20% 100%; }
             &[data-choice="2"] {  background-position: 70% 50%; }
             &[data-choice="3"] {  background-position: 10% 100%; filter: drop-shadow(0 0 2px #FFF);}
+            &[data-choice="4"] {  background-position: 90% 100%;}
 
             @for $i from 0 through 4 {
               &[data-no="#{$i}"] { order:$i; }
@@ -304,6 +305,11 @@ html,body {
                 font-size:18px;
               }
 
+              &#agree-button {
+                width:auto;
+                padding:0px 5px;
+              }
+
               &#clockwise-button div, &#anticlockwise-button div {
                 background-image: url('img/sprites.png');
                 background-size: 1100%;
@@ -371,7 +377,7 @@ html,body {
               display: flex;
               align-items: center;
               font-weight: bold;
-              
+
               .thecrew-arrow-down {
                 transform:rotate(-90deg);
                 margin:0;

modules/css/playerPanel.scss

@@ -53,3 +53,13 @@
 @for $i from 0 through 5 {
   #overall-content[data-commander="#{$i}"] .panel-container[data-no="#{$i}"] .panel-commander { display:block; }
 }
+
+
+#player_config {
+  #autopick-selector {
+    display:flex;
+    flex-flow: column;
+    justify-content: center;
+    align-items: center;
+  }
+}

modules/js/States/DistressTrait.js

@@ -1,5 +1,5 @@
 define(["dojo", "dojo/_base/declare"], (dojo, declare) => {
-  const CLOCKWISE = 1, DONT_USE = 2, ANTICLOCKWISE = 3;
+  const CLOCKWISE = 1, DONT_USE = 2, ANTICLOCKWISE = 3, AGREE = 4;
   return declare("thecrew.distressTrait", null, {
     constructor(){
       this._notifications.push(
@@ -18,6 +18,9 @@ define(["dojo", "dojo/_base/declare"], (dojo, declare) => {
       this.connect($('clockwise-button'), 'click', () => this.onChooseDistressDirection(CLOCKWISE) );
       this.connect($('dont-use-button'),  'click', () => this.onChooseDistressDirection(DONT_USE) );
       this.connect($('anticlockwise-button'),  'click', () => this.onChooseDistressDirection(ANTICLOCKWISE) );
+      this.connect($('agree-button'),  'click', () => this.onChooseDistressDirection(AGREE) );
+
+      Object.keys(args.players).forEach(pId => dojo.attr('distress-choice-' + pId, 'data-choice', args.players[pId]) );
     },
 
     onChooseDistressDirection(dir){

modules/php/Game/Players.php

@@ -143,6 +143,15 @@ public function clearDistressCards()
 
   public function getNextToCommunicate()
   {
-    return self::DB()->where('comm_pending', 1)->where('comm_token', '<>', 'used')->limit(1)->get(true);
+    return self::DB()->where('comm_pending', 1)->where('comm_token', '<>', 'used')->whereNull('comm_card_id')->limit(1)->get(true);
   }
+
+  public function getAllDistressChoices() {
+    return array_unique(self::getAll()->map(function($player){ return $player->getDistressChoice(); }));
+  }
+
+  public function getAllDistressChoicesAssoc() {
+    return self::getAll()->assocMap(function($player){ return $player->getDistressChoice(); });
+  }
+
 }

modules/php/LogBook.php

@@ -81,7 +81,10 @@ public static function loadCampaign()
       $json = substr($json, 1, strlen($json)-2);
       $logs = json_decode ($json, true);
       foreach($logs as $log_id => $log){
-        self::insert($log['mission'], $log['attempt'], $log['success'], $log['distress']);
+        if(\array_key_exists('mission', $log))
+          self::insert($log['mission'], $log['attempt'], $log['success'], $log['distress']);
+        else
+          self::insert($log[0], $log[1], $log[2], $log[3]);
       }
     }
     else {

modules/php/Player.php

@@ -25,6 +25,7 @@ public function __construct($row)
     $this->distressChoice = $row['distress_choice'];
     $this->distressCard = $row['distress_card_id'];
     $this->reply = $row['reply_choice'];
+    $this->distressAuto = $row['distress_auto'];
   }
 
   private $id;
@@ -60,6 +61,7 @@ public function getTricksWon(){ return $this->nTricks; }
   public function isCommander() { return $this->id == Globals::getCommander(); }
   public function isSpecial() { return $this->id == Globals::getSpecial(); }
   public function isSpecial2() { return $this->id == Globals::getSpecial2(); }
+  public function getDistressAuto(){ return $this->distressAuto; }
 
   public function getUiData($pId)
   {
@@ -80,6 +82,7 @@ public function getUiData($pId)
       'canCommunicate' => $this->canCommunicate(),
       'distressChoice' => $this->distressChoice,
       'distressCard' => $pId == $this->id? $this->distressCard : null,
+      'distressAuto' => $this->distressAuto,
       'reply' => $this->reply,
     ];
   }
@@ -176,4 +179,10 @@ public function reply($i)
   {
     self::DB()->update(['reply_choice' => $i], $this->id);
   }
+
+
+  public function setAutoPick($mode)
+  {
+    self::DB()->update(['distress_auto' => $mode], $this->id);
+  }
 }

modules/php/States/CommunicationTrait.php

@@ -22,7 +22,7 @@ function stBeforeComm()
 
     $player = Players::getNextToCommunicate();
     $mission = Missions::getCurrent();
-    if(!$mission->isDisrupted() && !is_null($player)){
+    if(!$mission->isDisrupted() && !is_null($player) && $player->canCommunicate()){
       $player->toggleComm();
       Notifications::startComm($player);
       $nextPlayer = $player;
@@ -44,7 +44,7 @@ function actToggleComm()
 
     $mission = Missions::getCurrent();
     $stateName = $this->gamestate->state()['name'];
-    if(!$mission->isDisrupted() && $player->isCommPending() && $stateName == 'playerTurn' && Cards::countOnTable() == 0){
+    if(!$mission->isDisrupted() && $player->isCommPending() && $stateName == 'playerTurn' && Cards::countOnTable() == 0 && $player->canCommunicate()){
       $this->gamestate->nextState('startComm');
     }
   }

modules/php/States/DistressTrait.php

@@ -12,11 +12,31 @@
  */
 trait DistressTrait
 {
+  function stPreDistress()
+  {
+    foreach(Players::getAll() as $player){
+      $player->chooseDirection($player->getDistressAuto());
+    }
+
+    $choices = Players::getAllDistressChoices();
+    $choices = array_values(array_diff($choices, [WHATEVER]));
+    $needVote = (count($choices) > 1 || $choices[0] == 0);
+    $this->gamestate->nextState($needVote? 'setup' : 'turn');
+  }
+
+
+
   function stDistressSetup()
   {
     $this->gamestate->setAllPlayersMultiactive();
   }
 
+  function argDistressSetup()
+  {
+    return [
+      'players' => Players::getAllDistressChoicesAssoc()
+    ];
+  }
 
   function actChooseDirection($dir)
   {
@@ -25,9 +45,11 @@ function actChooseDirection($dir)
     Notifications::chooseDirection($player, $dir);
 
     // Get other players choice that differs from mine
-    $choices = Players::getAll()->assocMap(function($player){ return $player->getDistressChoice(); });
-    $otherChoices = array_diff($choices, [$dir]);
-    if(empty($otherChoices)){
+    $choices = Players::getAllDistressChoices();
+    $choices = array_values(array_diff($choices, [WHATEVER]));
+    if(empty($choices) || (count($choices) == 1 && $choices[0] != 0)){
+      $dir = empty($choices)? DONT_USE : $choices[0];
+
       // Everyone agrees on same direction, let's go!
       Notifications::chooseDistressDirection($dir);
       Globals::setDistressDirection($dir);
@@ -39,7 +61,13 @@ function actChooseDirection($dir)
         $this->gamestate->nextState('turn');
       }
     } else {
-      $this->gamestate->setPlayersMultiactive(array_keys($otherChoices), '', true);
+      if($dir == WHATEVER){
+        $this->gamestate->setPlayerNonMultiactive($player->getId(), '');
+      } else {
+        $choices = Players::getAllDistressChoicesAssoc();
+        $otherChoices = array_diff($choices, [$dir, WHATEVER]);
+        $this->gamestate->setPlayersMultiactive(array_keys($otherChoices), '', true);
+      }
     }
   }
 
@@ -93,4 +121,14 @@ function stDistressExchange()
     $this->gamestate->changeActivePlayer(Globals::getCommander());
     $this->gamestate->nextState('next');
   }
+
+
+  /***********************
+  ******* AUTOPICK *******
+  ***********************/
+  public function actSetAutopick($mode)
+  {
+    $player = Players::getCurrent();
+    $player->setAutoPick($mode);
+  }
 }

modules/php/States/MissionTrait.php

@@ -102,7 +102,11 @@ function stSave()
   {
     if(Globals::isCampaign()) {
       $logs = self::getCollectionFromDb("SELECT mission, attempt, success, distress FROM logbook");
-      $json = json_encode ($logs);
+      $result = [];
+      foreach($logs as $log)
+        $result[] = [$log['mission'], $log['attempt'], $log['success'], $log['distress']];
+
+      $json = json_encode($result);
       $this->storeLegacyTeamData($json);
     }
     $this->gamestate->nextState('next');

modules/php/constants.inc.php

@@ -17,6 +17,8 @@
 
 define("STATE_NEW_TRICK",4);
 
+
+define("STATE_PRE_DISTRESS",35);
 define("STATE_DISTRESS_SETUP",14);
 define("STATE_DISTRESS",15);
 define("STATE_DISTRESS_EXCHANGE",16);
@@ -55,6 +57,12 @@
 define('CLOCKWISE', 1);
 define('DONT_USE', 2);
 define('ANTICLOCKWISE', 3);
+define('WHATEVER', 4);
+
+
+define('DISABLED', 0);
+define('ALWAYS_NO', 2);
+define('ALWAYS_AGREE', 4);
 
 /*
  * COLORS

states.inc.php

@@ -142,7 +142,7 @@
     "action" => "stNewTrick",
     "transitions" => [
       "next" => STATE_BEFORE_COMM,
-      "distress" => STATE_DISTRESS_SETUP,
+      "distress" => STATE_PRE_DISTRESS,
       "giveTask" => STATE_GIVE_TASK,
     ]
   ],
@@ -160,7 +160,7 @@
     "args" => "argGiveTask",
     "possibleactions" => ["actGiveTask", "actPassGiveTask"],
     "transitions" => [
-      'pass' => STATE_DISTRESS_SETUP,
+      'pass' => STATE_PRE_DISTRESS,
       'askConfirmation' => STATE_GIVE_TASK_CONFIRMATION,
       "zombiePass" => STATE_CHANGE_MISSION
     ]
@@ -187,20 +187,32 @@
     "description" => "",
     "type" => "game",
     "action" => "stGiveTaskExchange",
-    "transitions" => ["next" => STATE_DISTRESS_SETUP],
+    "transitions" => ["next" => STATE_PRE_DISTRESS],
   ],
 
 
 
   /***********************
   ****** DISTRESS  *******
   ***********************/
+  STATE_PRE_DISTRESS => [
+    "name" => "preDistress",
+    "description" => "",
+    "type" => "game",
+    "action" => "stPreDistress",
+    "transitions" => [
+      "setup" => STATE_DISTRESS_SETUP,
+      "turn" => STATE_BEFORE_COMM,
+    ],
+  ],
+
   STATE_DISTRESS_SETUP => [
     "name" => "distressSetup",
     "description" => clienttranslate('The distress signal might be used'),
     "descriptionmyturn" => clienttranslate('${you} may use the distress signal'),
     "type" => "multipleactiveplayer",
     "action" => "stDistressSetup",
+    "args" => "argDistressSetup",
     "possibleactions" => ["actChooseDirection"],
     "transitions" => [
       "next" => STATE_DISTRESS,
@@ -276,7 +288,7 @@
     "transitions" => [
       "next" => STATE_NEXT_PLAYER,
       "startComm" => STATE_BEFORE_COMM,
-      "distress" => STATE_DISTRESS_SETUP,
+      "distress" => STATE_PRE_DISTRESS,
       "zombiePass" => STATE_CHANGE_MISSION
     ]
   ],

thecrew.action.php

@@ -30,6 +30,16 @@ public function __default()
   }
 
 
+  public function setAutopick()
+  {
+    self::setAjaxMode();
+    $mode = self::getArg("autopick", AT_posint, true);
+    $this->game->actSetAutopick($mode);
+    self::ajaxResponse();
+  }
+
+
+
   public function actMoveTile()
   {
     self::setAjaxMode();

thecrew.game.php

@@ -184,9 +184,13 @@ public function upgradeTableDb($from_version)
       self::testBigMerge();
     }
 
-    if($frow_version <= 2103171142){
+    if($from_version <= 2103171142){
       self::applyDbUpgradeToAllDB("DELETE FROM DBPREFIX_card WHERE `color` = 6");
     }
+
+    if($from_version <= 2103172308){
+      self::applyDbUpgradeToAllDB("ALTER TABLE DBPREFIX_player ADD `distress_auto` smallint(1) DEFAULT 0 COMMENT 'none, autono, autoyes'");
+    }
   }
 
   public function testBigMerge()