diff --git a/gamecreate.php b/gamecreate.php index de50a5242..d3a6705ef 100755 --- a/gamecreate.php +++ b/gamecreate.php @@ -149,6 +149,7 @@ $input['specialCDturn'] = (int)$input['specialCDturn']; if ( $input['specialCDturn'] < 0 ) $input['specialCDturn'] = 0; + $input['specialCDcount'] = (int)$input['specialCDcount']; if ( $input['specialCDcount'] < 0 ) $input['specialCDcount'] = 0; diff --git a/gamepanel/game.php b/gamepanel/game.php index 494a1fdc8..b4705c87c 100755 --- a/gamepanel/game.php +++ b/gamepanel/game.php @@ -260,10 +260,21 @@ function gameVariants() { if( $this->anon=='Yes' ) $alternatives[]='Anon'; if( $this->potType=='Winner-takes-all' ) - $alternatives[]='WTA'; - if( $this->specialCDturn >= $this->turn) - $alternatives[]='NMR:'.$this->specialCDturn.'/'.$this->specialCDcount; + $alternatives[]='WTA'; + // The NMR-policy defaults + if( $this->specialCDturn != Config::$specialCDturnsDefault && $this->specialCDcount != Config::$specialCDcountDefault && $this->specialCDturn >= $this->turn) + { + if ( $this->specialCDturn == 0 && $this->specialCDcount == 0 ) + $alternatives[]='NMR: Off'; + elseif( $this->specialCDturn == 5 && $this->specialCDcount == 2 ) + $alternatives[]='NMR: Committed'; + elseif( $this->specialCDturn == 99 && $this->specialCDcount == 5 ) + $alternatives[]='NMR: Serious'; + else + $alternatives[]='NMR:'.$this->specialCDturn.'/'.$this->specialCDcount; + } + // Show the end of the game in the options if set. if(( $this->targetSCs > 0) && ($this->maxTurns > 0)) $alternatives[]='EoG: '.$this->targetSCs.' SCs or "'.$this->Variant->turnAsDate($this->maxTurns -1).'"'; diff --git a/locales/English/gamecreate.php b/locales/English/gamecreate.php index e8fa2567a..68786d122 100755 --- a/locales/English/gamecreate.php +++ b/locales/English/gamecreate.php @@ -318,13 +318,25 @@ function changeMinPhases(i){