arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use sensible default metadata when placing stairs (if none provided)

Browse source
This commit is contained in:
walterhiggins 2013-04-14 14:55:23 +01:00
parent 0357b8fadc
commit 51374ac1db
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/javascript/drone/drone.js
View file

@ -814,7 +814,7 @@ Used when placing torches so that they face towards the drone.
}else{ }else{
message = [message]; message = [message];
} }
var bm = _getBlockIdAndMeta(block); var bm = this._getBlockIdAndMeta(block);
block = bm[0]; block = bm[0];
var meta = bm[1]; var meta = bm[1];
if (block != 63 && block != 68){ if (block != 63 && block != 68){
@ -838,7 +838,7 @@ Used when placing torches so that they face towards the drone.
var properBlocks = []; var properBlocks = [];
var len = blocks.length; var len = blocks.length;
for (var i = 0;i < len;i++){ for (var i = 0;i < len;i++){
var bm = _getBlockIdAndMeta(blocks[i]); var bm = this._getBlockIdAndMeta(blocks[i]);
properBlocks.push([bm[0],bm[1]]); properBlocks.push([bm[0],bm[1]]);
} }
if (typeof h == "undefined") if (typeof h == "undefined")
@ -905,7 +905,7 @@ Used when placing torches so that they face towards the drone.
Drone.prototype.cuboid = function(block,w,h,d){ Drone.prototype.cuboid = function(block,w,h,d){
var bm = _getBlockIdAndMeta(block); var bm = this._getBlockIdAndMeta(block);
return this.cuboidX(bm[0],bm[1], w,h,d); return this.cuboidX(bm[0],bm[1], w,h,d);
}; };
Drone.prototype.cuboid0 = function(block,w,h,d){ Drone.prototype.cuboid0 = function(block,w,h,d){
@ -1355,17 +1355,35 @@ Used when placing torches so that they face towards the drone.
return 1; // south return 1; // south
}; };
var _getBlockIdAndMeta = function(b){ var _getBlockIdAndMeta = function(b){
var defaultMeta = 0;
if (typeof b == 'string'){ if (typeof b == 'string'){
var bs = b; var bs = b;
var sp = bs.indexOf(':'); var sp = bs.indexOf(':');
if (sp == -1){ if (sp == -1){
return [parseInt(bs),0]; b = parseInt(bs);
// wph 20130414 - use sensible defaults for certain blocks e.g. stairs
// should face the drone.
for (var i in blocks.stairs){
if (blocks.stairs[i] === b){
defaultMeta = Drone.PLAYER_STAIRS_FACING[this.dir];
break;
}
}
return [b,defaultMeta];
} }
b = parseInt(bs.substring(0,sp)); b = parseInt(bs.substring(0,sp));
var md = parseInt(bs.substring(sp+1,bs.length)); var md = parseInt(bs.substring(sp+1,bs.length));
return [b,md]; return [b,md];
}else{ }else{
return [b,0]; // wph 20130414 - use sensible defaults for certain blocks e.g. stairs
// should face the drone.
for (var i in blocks.stairs){
if (blocks.stairs[i] === b){
defaultMeta = Drone.PLAYER_STAIRS_FACING[this.dir];
break;
}
}
return [b,defaultMeta];
} }
}; };
// //
@ -1539,7 +1557,7 @@ Used when placing torches so that they face towards the drone.
var d = srcBlocks[ww][hh].length; var d = srcBlocks[ww][hh].length;
_traverse[that.dir].depth(that,d,function(dd){ _traverse[that.dir].depth(that,d,function(dd){
var b = srcBlocks[ww][hh][dd]; var b = srcBlocks[ww][hh][dd];
var bm = _getBlockIdAndMeta(b); var bm = that._getBlockIdAndMeta(b);
var cb = bm[0]; var cb = bm[0];
var md = bm[1]; var md = bm[1];
// //