From b5da942878121faad613048ef0bd8ed45052114c Mon Sep 17 00:00:00 2001 From: simon Date: Sun, 31 Dec 2017 09:58:29 -0500 Subject: [PATCH] Added console area --- game.php | 23 ++++++++++ mar/editor.min.js | 4 +- mar/phaser/mar.js | 100 ++++++++++++++++++++++++++---------------- mar/phaser/mar.min.js | 53 +++++++++++----------- 4 files changed, 114 insertions(+), 66 deletions(-) diff --git a/game.php b/game.php index a079138..99b2c92 100644 --- a/game.php +++ b/game.php @@ -95,6 +95,21 @@ if (isset($user)) { display: inline; } + #console { + font-family: fixedsys, monospace; + font-size: 24pt; + line-height: 21px; + resize: none; + overflow-y: scroll; + width: 680px; + height: 180px; + } + + #consoleContainer { + margin: 20px; + text-align: center; + } + @@ -169,6 +184,14 @@ if (isset($user)) { + +
+ + + Clear +
+
diff --git a/mar/editor.min.js b/mar/editor.min.js index 2c3ddcf..0898478 100644 --- a/mar/editor.min.js +++ b/mar/editor.min.js @@ -10,8 +10,8 @@ function parseDWInstruction(a,c,b){a=a.trim();if("dw"===a.substr(0,2).toLowerCas column:0,text:"Usage: DW IMM, IMM ...",type:"error"});break}}return!0}return!1} function getOperandType(a,c){a=a.trim();if(""===a)return OPERAND_INVALID;if(!isNaN(Number(a))&&Number(a)===Math.floor(Number(a))&&-1===a.indexOf("o")&&-1===a.indexOf("e"))return OPERAND_IMM;if(/^(a|b|c|d|x|y|bp|sp)$/.test(a.toLowerCase()))return OPERAND_REG;for(b=0;b= 40) { + + //Split the line... + var subLines = lines[i].match(/.{1,40}/g); + + for (var j = 0; j < subLines.length; j++) { + + //Don't put a newline at the end + if (j !== subLines.length - 1) { + tmpBuffer += "\n"; + } + } + + } else { + tmpBuffer += lines[i] + "\n"; + } + } + + myConsole.innerHTML = tmpBuffer; + mar.lastLines = str; + + //Autoscroll + myConsole.scrollTop = myConsole.scrollHeight; } } } diff --git a/mar/phaser/mar.min.js b/mar/phaser/mar.min.js index 01c08f3..9edf3f8 100644 --- a/mar/phaser/mar.min.js +++ b/mar/phaser/mar.min.js @@ -1,36 +1,37 @@ -DIR_NORTH=0;DIR_EAST=1;DIR_SOUTH=2;DIR_WEST=3;WORLD_HEIGHT=WORLD_WIDTH=16;var colorScheme={tileTint:16777215,wallTint:14540253,cubotHoverTint:65280,cubotTint:16777215,textFill:"#FFFFFF",textStroke:"#9298a8",biomassTint:6535263,biomassHoverTint:65280,tileHoverTint:65280,itemIron:4408129,itemCopper:13139256,hologramFill:"#0aced6",hologramStroke:"#12FFB0",hologramAlpha:.9},mar={kbBuffer:[],kbBufferText:"",animationFrames:{},controlledUnitVisible:!1};CUBOT_WALK_FRAMES={south:240,north:194,west:254,east:164}; -HARVESTER_WALK_FRAMES={south:347,north:317,west:377,east:287};LOW_ENERGY=100;fullscreen?(RENDERER_WIDTH=window.innerWidth-4,RENDERER_HEIGHT=window.innerHeight-4):(RENDERER_WIDTH=document.getElementById("game").clientWidth,RENDERER_HEIGHT=window.innerHeight/1.25);var game=new Phaser.Game(RENDERER_WIDTH,RENDERER_HEIGHT,Phaser.AUTO,"game",null,!0,!1); +DIR_NORTH=0;DIR_EAST=1;DIR_SOUTH=2;DIR_WEST=3;WORLD_HEIGHT=WORLD_WIDTH=16;var colorScheme={tileTint:16777215,wallTint:14540253,cubotHoverTint:65280,cubotTint:16777215,textFill:"#FFFFFF",textStroke:"#9298a8",biomassTint:6535263,biomassHoverTint:65280,tileHoverTint:65280,itemIron:4408129,itemCopper:13139256,hologramFill:"#0aced6",hologramStroke:"#12FFB0",hologramAlpha:.9},mar={kbBuffer:[],kbBufferText:"",animationFrames:{},controlledUnitVisible:!1,lastLines:""}; +CUBOT_WALK_FRAMES={south:240,north:194,west:254,east:164};HARVESTER_WALK_FRAMES={south:347,north:317,west:377,east:287};LOW_ENERGY=100;fullscreen?(RENDERER_WIDTH=window.innerWidth-4,RENDERER_HEIGHT=window.innerHeight-4):(RENDERER_WIDTH=document.getElementById("game").clientWidth,RENDERER_HEIGHT=window.innerHeight/1.25);var game=new Phaser.Game(RENDERER_WIDTH,RENDERER_HEIGHT,Phaser.AUTO,"game",null,!0,!1); function dispatchTileLeave(a,b){for(var c=0;c=a.keyCode||116===a.keyCode||32===a.keyCode)&&a.preventDefault(),"guest"!==mar.client.username&&16>=mar.kbBuffer.length&&(mar.client.sendKeypress(a.keyCode), mar.kbBuffer.push(a.keyCode),mar.kbBufferText=formattedKeyBuffer(mar.kbBuffer)))},game.input.onDown.add(function(){document.getElementById("game").focus()})))}function objectListener(a){"object"===a.t&&mar.world.updateObjects(a.objects)}function floppyListener(a){document.getElementById("floppyDown").innerHTML=' ';a=new Blob([a.data],{type:"application/octet-stream"});saveAs(a,"floppy.bin")} -function tickListener(a){"tick"===a.t&&(mar.client.socket.send(JSON.stringify({t:"object",x:mar.worldX,y:mar.worldY})),void 0!==a.keys&&(mar.kbBuffer=a.keys,mar.kbBufferText=formattedKeyBuffer(mar.kbBuffer)))} +function tickListener(a){if("tick"===a.t){mar.client.socket.send(JSON.stringify({t:"object",x:mar.worldX,y:mar.worldY}));void 0!==a.keys&&(mar.kbBuffer=a.keys,mar.kbBufferText=formattedKeyBuffer(mar.kbBuffer));var b=document.getElementById("console");0===a.cm&&(b.innerHTML="",mar.lastLines="");if(void 0!==a.c){for(var c=mar.lastLines,d=0;d