Merge pull request lightvector#96 from lightvector/alpha-fixes

Alpha fixes
clyring · Jan 21, 2016 · 5841d6a · 5841d6a
2 parents 17fa8d5 + b9de229
commit 5841d6a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/frontend/js/components/createGameDialog.js b/frontend/js/components/createGameDialog.js
@@ -10,13 +10,14 @@ var CreateGameDialog = React.createClass({
 
   //Time controls to choose between
   timeControls: [
-    {label:"Lightning", tc:{initialTime:360, increment:5, overtimeAfter:70}},
-    {label:"Blitz", tc:{initialTime:480, increment:10, overtimeAfter:70}},
-    {label:"Fast",  tc:{initialTime:960, increment:20, overtimeAfter:70}},
-    {label:"Normal", tc:{initialTime:1800, increment:30, overtimeAfter:70}},
-    {label:"Slow", tc:{initialTime:2700, increment:45, overtimeAfter:70}},
-    {label:"Blitz (delay)", tc:{initialTime:480, delay:15, overtimeAfter:70}},
-    {label:"Fast (delay)",  tc:{initialTime:960, delay:30, overtimeAfter:70}},
+    {label:"Lightning", tc:{initialTime:180, increment:6, overtimeAfter:70}},
+    {label:"Blitz", tc:{initialTime:360, increment:12, overtimeAfter:70}},
+    {label:"Fast",  tc:{initialTime:600, increment:20, overtimeAfter:70}},
+    {label:"Normal", tc:{initialTime:900, increment:30, overtimeAfter:70}},
+    {label:"Steady", tc:{initialTime:1200, increment:40, overtimeAfter:70}},
+    {label:"Slow", tc:{initialTime:1800, increment:60, overtimeAfter:70}},
+    {label:"Blitz (delay)", tc:{initialTime:360, delay:18, overtimeAfter:70}},
+    {label:"Fast (delay)",  tc:{initialTime:600, delay:30, overtimeAfter:70}},
   ],
 
   handleTCChange: function(event) {

diff --git a/frontend/js/lib/arimaa.js b/frontend/js/lib/arimaa.js
@@ -472,8 +472,8 @@ var Arimaa = function(options) {
     //var stepObj = {piece:piece,squareNum:squareNum,direction:direction,string:stepString};
     var stepObj = ArimaaStep(piece, squareNum, direction);
 
-    if(piece === GRABBIT && direction === 's') return {success:false, stepsLeft: stepsLeft};
-    if(piece === SRABBIT && direction === 'n') return {success:false, stepsLeft: stepsLeft};
+    if(colorToMove === GOLD && piece === GRABBIT && direction === 's') return {success:false, stepsLeft: stepsLeft};
+    if(colorToMove === SILVER && piece === SRABBIT && direction === 'n') return {success:false, stepsLeft: stepsLeft};
 
     if(ongoingMove.length) {
       var prevStep = get_prev_step_no_caps();