From b74b4c4f28652bc4bf637eec566f83a9a95ded2c Mon Sep 17 00:00:00 2001 From: walterhiggins Date: Sat, 23 Aug 2014 16:45:43 +0100 Subject: [PATCH] New drone.extend() style invocation. --- src/main/js/plugins/drone/contrib/cottage.js | 11 ++++---- .../js/plugins/drone/contrib/dancefloor.js | 5 ++-- .../js/plugins/drone/contrib/hangtorch.js | 5 ++-- src/main/js/plugins/drone/contrib/mazegen.js | 10 +++---- src/main/js/plugins/drone/contrib/rainbow.js | 5 ++-- .../js/plugins/drone/contrib/spiral_stairs.js | 27 ++++++++++--------- src/main/js/plugins/drone/contrib/temple.js | 5 ++-- 7 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/main/js/plugins/drone/contrib/cottage.js b/src/main/js/plugins/drone/contrib/cottage.js index b9c2272..15f62d1 100644 --- a/src/main/js/plugins/drone/contrib/cottage.js +++ b/src/main/js/plugins/drone/contrib/cottage.js @@ -10,8 +10,7 @@ var Drone = require('../drone').Drone; // // /js drone.cottage(); // - -Drone.extend('cottage',function ( ) { +function cottage( ) { this.chkpt('cottage') .box0(48,7,2,6) // 4 walls .right(3) @@ -28,12 +27,12 @@ Drone.extend('cottage',function ( ) { .right(4) .sign(['Home','Sweet','Home'],68) .move('cottage'); -}); +} // // a more complex script that builds an tree-lined avenue with // cottages on both sides. // -Drone.extend('cottage_road', function( numberCottages ) { +function cottage_road( numberCottages ) { if (typeof numberCottages == 'undefined'){ numberCottages = 6; } @@ -90,5 +89,7 @@ Drone.extend('cottage_road', function( numberCottages ) { } // return drone to where it was at start of function return this.move('cottage_road'); -}); +} +Drone.extend(cottage_road); +Drone.extend(cottage); diff --git a/src/main/js/plugins/drone/contrib/dancefloor.js b/src/main/js/plugins/drone/contrib/dancefloor.js index a1b17d6..67333e0 100644 --- a/src/main/js/plugins/drone/contrib/dancefloor.js +++ b/src/main/js/plugins/drone/contrib/dancefloor.js @@ -6,7 +6,7 @@ var Drone = require('../drone').Drone; // // See it in action here => http://www.youtube.com/watch?v=UEooBt6NTFo // -Drone.extend('dancefloor',function(width,length) +function dancefloor(width,length) { if (typeof width == "undefined") width = 5; @@ -35,4 +35,5 @@ Drone.extend('dancefloor',function(width,length) var everySecond = 20; task = server.scheduler.runTaskTimer(__plugin,strobe,now,everySecond); return this; -}); +} +Drone.extend(dancefloor); diff --git a/src/main/js/plugins/drone/contrib/hangtorch.js b/src/main/js/plugins/drone/contrib/hangtorch.js index aa15c57..f0265ae 100644 --- a/src/main/js/plugins/drone/contrib/hangtorch.js +++ b/src/main/js/plugins/drone/contrib/hangtorch.js @@ -10,7 +10,7 @@ function canHang( material ) { return false; } } -Drone.extend('hangtorch', function () { +function hangtorch() { var torch = '50:' + Drone.PLAYER_TORCH_FACING[this.dir]; var moves = 0; var block = this.world.getBlockAt(this.x, this.y, this.z); @@ -28,4 +28,5 @@ Drone.extend('hangtorch', function () { } this.box(torch) .fwd(moves); -}); +} +Drone.extend(hangtorch); diff --git a/src/main/js/plugins/drone/contrib/mazegen.js b/src/main/js/plugins/drone/contrib/mazegen.js index b02c22c..17e51cb 100644 --- a/src/main/js/plugins/drone/contrib/mazegen.js +++ b/src/main/js/plugins/drone/contrib/mazegen.js @@ -96,12 +96,12 @@ function maze_draw(maze_string, d) { } } } - -// User-facing code starts here -// Example: Try /js amazing(5,7) -Drone.extend('amazing', function(size_x, size_y) { +function maze(size_x, size_y) { m = maze_make(size_x, size_y); if (m.x > 0 && m.y > 0) { maze_draw(maze_display(m), this); } -}); +} +// User-facing code starts here +// Example: Try /js amazing(5,7) +Drone.extend(maze); diff --git a/src/main/js/plugins/drone/contrib/rainbow.js b/src/main/js/plugins/drone/contrib/rainbow.js index 2575a62..a16f179 100644 --- a/src/main/js/plugins/drone/contrib/rainbow.js +++ b/src/main/js/plugins/drone/contrib/rainbow.js @@ -18,7 +18,7 @@ Creates a Rainbow. ![rainbow example](img/rainbowex1.png) ***/ -Drone.extend('rainbow', function(radius){ +function rainbow( radius ) { var i, colors, bm; @@ -44,4 +44,5 @@ Drone.extend('rainbow', function(radius){ orientation: 'vertical'}).right().up(); } return this.move('rainbow'); -}); +} +Drone.extend(rainbow); diff --git a/src/main/js/plugins/drone/contrib/spiral_stairs.js b/src/main/js/plugins/drone/contrib/spiral_stairs.js index ad51633..43e4f9d 100644 --- a/src/main/js/plugins/drone/contrib/spiral_stairs.js +++ b/src/main/js/plugins/drone/contrib/spiral_stairs.js @@ -30,17 +30,18 @@ To construct a spiral staircase 5 floors high made of oak... spiral_stairs('oak', 5); ***/ -Drone.extend("spiral_stairs",function(stairBlock, flights){ - this.chkpt('spiral_stairs'); +function spiral_stairs(stairBlock, flights){ + this.chkpt('spiral_stairs'); - for (var i = 0; i < flights; i++){ - this - .box(blocks.stairs[stairBlock] + ':' + Drone.PLAYER_STAIRS_FACING[this.dir]) - .up().fwd() - .box(blocks.stairs[stairBlock] + ':' + Drone.PLAYER_STAIRS_FACING[this.dir]) - .up().fwd() - .box(blocks.slab[stairBlock]) - .turn().fwd(); - } - return this.move('spiral_stairs'); -}); + for (var i = 0; i < flights; i++){ + this + .box(blocks.stairs[stairBlock] + ':' + Drone.PLAYER_STAIRS_FACING[this.dir]) + .up().fwd() + .box(blocks.stairs[stairBlock] + ':' + Drone.PLAYER_STAIRS_FACING[this.dir]) + .up().fwd() + .box(blocks.slab[stairBlock]) + .turn().fwd(); + } + return this.move('spiral_stairs'); +} +Drone.extend(spiral_stairs); diff --git a/src/main/js/plugins/drone/contrib/temple.js b/src/main/js/plugins/drone/contrib/temple.js index 8545e60..0597e0a 100644 --- a/src/main/js/plugins/drone/contrib/temple.js +++ b/src/main/js/plugins/drone/contrib/temple.js @@ -2,7 +2,7 @@ var Drone = require('../drone').Drone; // // constructs a mayan temple // -Drone.extend('temple', function(side) { +function temple( side ) { if ( !side ) { side = 20; } @@ -27,4 +27,5 @@ Drone.extend('temple', function(side) { } this.move('temple'); -}); +} +Drone.extend(temple);