Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Wojciech Łukasik 2020-04-28 14:00:48 +02:00
commit 9f4de9afd4
1 changed files with 20 additions and 20 deletions

View File

@ -263,56 +263,56 @@ function createShelf(){
const listOfShelf = [];
//pierwszy poziom
let shelf = new Shelf(2, 1, true, 221, 222, 0);
let shelf = new Shelf(2, 1, true, 211, 212, 0);
listOfShelf.push(shelf)
shelf = new Shelf(3, 1, true, 321, 0, 0);
shelf = new Shelf(3, 1, true, 311, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(4, 4, false, 341, 342, 343);
shelf = new Shelf(4, 4, false, 441, 442, 443);
listOfShelf.push(shelf)
shelf = new Shelf(1, 4, true, 0, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(4, 6, true, 361, 362, 0);
shelf = new Shelf(4, 6, true, 461, 462, 0);
listOfShelf.push(shelf)
shelf = new Shelf(1, 6, true, 261, 0, 0);
shelf = new Shelf(1, 6, true, 161, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(3, 9, true, 381, 0, 0);
shelf = new Shelf(3, 9, true, 391, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(2, 9, true, 281, 0, 0);
shelf = new Shelf(2, 9, true, 291, 0, 0);
listOfShelf.push(shelf)
//drugi poziom
shelf = new Shelf(5, 1, true, 521, 0, 0);
shelf = new Shelf(5, 1, true, 511, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(5, 4, true, 531, 0, 0);
shelf = new Shelf(5, 4, true, 541, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(5, 6, true, 571, 0, 0);
shelf = new Shelf(5, 6, true, 561, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(5, 9, true, 581, 0, 0);
shelf = new Shelf(5, 9, true, 591, 0, 0);
listOfShelf.push(shelf)
//trzeci poziom
shelf = new Shelf(7, 1, true, 721, 0, 0);
shelf = new Shelf(7, 1, true, 711, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(8, 1, true, 821, 0, 0);
shelf = new Shelf(8, 1, true, 811, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(6, 4, true, 741, 0, 0);
shelf = new Shelf(6, 4, true, 641, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(9, 4, true, 841, 0, 0);
shelf = new Shelf(9, 4, true, 941, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(6, 6, true, 761, 0, 0);
shelf = new Shelf(6, 6, true, 661, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(9, 6, true, 861, 0, 0);
shelf = new Shelf(9, 6, true, 961, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(7, 9, true, 781, 0, 0);
shelf = new Shelf(7, 9, true, 791, 0, 0);
listOfShelf.push(shelf)
shelf = new Shelf(8, 9, true, 881, 0, 0);
shelf = new Shelf(8, 9, true, 891, 0, 0);
listOfShelf.push(shelf)
@ -343,7 +343,7 @@ function getDistance(x1,y1,x2,y2){
let board = createBoard(10,10);
board = createShelfOnBoard(board);
board = createCostofField(board, 10, 10);
let candy = new Candy('zelek', 'truskawkowy', 'Jumbo', 222);
let candy = new Candy('zelek', 'truskawkowy', 'Jumbo', 541);
let shelfs = createShelf();
let agent = new Agent(0,0, 'Right');