2048-js-ai: comparison 2048.html

equal deleted inserted replaced

-:eb31d2025a1d
+:d8106c8c0481
 <html>
 <head>
 <title>2048 AI</title>
 <meta name="viewport" content="width=device-width; initial-scale=1.0"/>
 <meta charset="utf-8"/>
+<script src="board.js"></script>
+<script src="perf.js"></script>
 <style>
 body {
 width: 100%;
 }
 return false;
 }
 }
 return true;
 }
-board.random = function(brd) {
+board.putRandom = function(brd) {
 var cnt = board.freeCnt(brd);
 cnt = Math.floor(Math.random() * cnt)+1;
 for (var i = 0; i < 4 && cnt > 0; i++) {
 for (var j = 0; j < 4 && cnt > 0; j++) {
 if (brd[i][j] !== 0)
 continue;
 if (cnt === 1)
-brd[i][j] = 2;
+brd[i][j] = (Math.random() > .9) ? 2 : 1;
 cnt--;
 }
 }
 }
 /* http://www.reddit.com/r/2048/comments/214njx/highest_possible_score_for_2048_warning_math */
-var boardScoreTbl = {"0": 0};
+var boardScoreTbl = [0];
 for (var i = 1, exp = 2; i < 16; i++, exp *= 2) {
-boardScoreTbl[exp] = (i-1)*exp;
+boardScoreTbl[i] = (i-1)*exp;
 }
 board.score = function(brd) {
 var score = 0;
 var max = 0;
 for (var i = 0; i < 4; i++) {
 score += boardScoreTbl[val];
 if (max < val)
 max = val;
 }
 }
-return {score: score, max: max};
+return {score: score, max: Math.pow(2, max)};
 }
 board.row = {};
 board.row.init = function() {
 return {stack: [], curr: 0};
 if (state.curr === 0) {
 state.curr = val;
 return;
 }
 if (state.curr === val) {
-state.stack.push(state.curr*2);
+state.stack.push(state.curr+1);
 state.curr = 0;
 } else {
 state.stack.push(state.curr);
 state.curr = val;
 }
 boardDom.querySelectorAll("tr")[i].querySelectorAll("td")[j].innerHTML = val;
 }
 ui.board.update = function(brd) {
 for (var i = 0; i < 4; i++) {
 for (var j = 0; j < 4; j++) {
-ui.board.set(i, j, (brd[i][j] >= 2) ? brd[i][j] : "");
+ui.board.set(i, j, (brd[i][j] >= 1) ? brd[i][j] : "");
 }
 }
 }
 ui.score = {};
 var scoreDom = document.getElementById("score");
 function start() {
 ui.score.clear();
 ui.message.clear();
 board.current = board.create();
-board.random(board.current);
+board.putRandom(board.current);
 ui.board.update(board.current);
 }
 document.getElementById("start").addEventListener("click", start);
 function up() {
 var updated = board.move.up(board.current);
 if (updated) {
-board.random(board.current);
+board.putRandom(board.current);
 ui.board.update(board.current);
 ui.score.update(board.current);
 }
 }
 document.getElementById("up").addEventListener("click", up);
 function down() {
 var updated = board.move.down(board.current);
 if (updated) {
-board.random(board.current);
+board.putRandom(board.current);
 ui.board.update(board.current);
 ui.score.update(board.current);
 }
 }
 document.getElementById("down").addEventListener("click", down);
 function left() {
 var updated = board.move.left(board.current);
 if (updated) {
-board.random(board.current);
+board.putRandom(board.current);
 ui.board.update(board.current);
 ui.score.update(board.current);
 }
 }
 document.getElementById("left").addEventListener("click", left);
 function right() {
 var updated = board.move.right(board.current);
 if (updated) {
-board.random(board.current);
+board.putRandom(board.current);
 ui.board.update(board.current);
 ui.score.update(board.current);
 }
 }
 document.getElementById("right").addEventListener("click", right);
 ui.message.set("I don't know how to move!");
 return;
 }
 var updated = board.move[fn].call(null, board.current);
 if (updated) {
-board.random(board.current);
+board.putRandom(board.current);
 ui.board.update(board.current);
 ui.score.update(board.current);
 } else {
 ui.message.set("Wrong move!");
 }
 ui.message.set("I don't know how to move!");
 return;
 }
 var updated = board.move[fn].call(null, board.current);
 if (updated) {
-board.random(board.current);
+board.putRandom(board.current);
 } else {
 ui.board.update(board.current);
 ui.score.update(board.current);
 ui.message.set("Wrong move!");
 return;

changeset 7	d8106c8c0481
parent 4	732aef931a9e
child 10	70ece7f758a0