Skip to content

Refactor #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kshyshtoph wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Refactor #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
baa7e53
extract util
Kshyshtoph Jul 13, 2023
16572bb
make use of util
Kshyshtoph Jul 13, 2023
10c216c
too much newlines
Kshyshtoph Jul 13, 2023
6c412c2
add missing utils file
Kshyshtoph Aug 8, 2023
04ddf32
refactor port creation
Kshyshtoph Aug 8, 2023
566e2c6
refactor intersections
Kshyshtoph Aug 8, 2023
847d1cb
refactor meeple movement
Kshyshtoph Aug 9, 2023
3758c2a
refactor meeple movement
Kshyshtoph Aug 9, 2023
3ff86b4
refactor market
Kshyshtoph Aug 9, 2023
5c3953d
refactor market
Kshyshtoph Aug 9, 2023
df84305
further refactor
Kshyshtoph Oct 19, 2023
f6159b1
further progress refactor
Kshyshtoph Oct 19, 2023
b2e0188
further progress refactor
Kshyshtoph Oct 19, 2023
a6d6731
hex refactor
Kshyshtoph Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 41 additions & 111 deletions Board.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
class Board {
constructor(boardRadius, hexRadius) {
this.numbers = [];
this.colours = [
"lime",
"lime",
"lime",
"lime",
"green",
"green",
"green",
"green",
"gray",
"gray",
"gray",
"yellow",
"yellow",
"yellow",
"yellow",
"brown",
"brown",
"brown",
"burlywood"
const limes = Array(4).fill("lime")
const greens = Array(4).fill("green")
const grays = Array(3).fill("gray")
const yellows = Array(4).fill("yellow")
const browns = Array(3).fill("brown")
const burlywoods = ["burlywood"]

this.colors = [
...limes,
...greens,
...grays,
...yellows,
...browns,
...burlywoods
];
this.hexes = [];
this.ports = [];
Expand All @@ -37,42 +31,34 @@ class Board {
for (let i = 3; i <= 11; i++) {
this.numbers.push(i);
}
this.numbers.forEach((number, index) => {
if (number === 7) {
this.numbers.splice(index, 1);
}
});
};
createHexes = () => {
let grow = 1;
let currentId = 0;
let count = this.boardRadius;
const diagonal = this.boardRadius * 2 - 1;
let count = this.boardRadius
for (let i = 1; i <= diagonal; i++) {
if (i >= this.boardRadius) {
grow = -1;
}
for (let j = 1; j <= count; j++) {
const colour = this.colours.splice(
Math.floor(Math.random() * this.colours.length),
const [color] = this.colors.splice(
Math.floor(Math.random() * this.colors.length),
1
);
if (colour[0] === "burlywood") {
if (color === "burlywood") {
this.thief.x = ((i * 3) / 2) * hexRadius;
this.thief.y =
j * this.hexHeight + ((diagonal - count) / 2) * this.hexHeight;
this.thief.isSet = true;
}
const number =
colour[0] !== "burlywood"
? this.numbers.splice(
Math.floor(Math.random() * this.numbers.length),
1
)
color !== "burlywood"
? spliceRandomItem(this.numbers)
: null;
this.hexes.push(
new Hex(
colour,
color,
currentId,
number,
[i, j],
Expand Down Expand Up @@ -102,83 +88,27 @@ class Board {
});
};
createPorts = () => {
// the keys refer to hex numbers, array contains two corners
// of hex in which port should appear and conditionally port color
const ports = {
0: [2, 3],
1: [3, 4, "green"],
2: [4, 5],
3: [1, 2, "lime"],
7: [0, 1],
11: [3, 4, "brown"],
15: [4, 5],
16: [1, 2, "yellow"],
17: [0, 1],
18: [5, 0, "gray"]
}
this.hexes.forEach(hex => {
if (hex.id === 0) {
this.ports.push(
new Port(
(hex.corners[2][0] + hex.corners[3][0]) / 2,
(hex.corners[2][1] + hex.corners[3][1]) / 2
)
);
} else if (hex.id === 1) {
this.ports.push(
new Port(
(hex.corners[3][0] + hex.corners[4][0]) / 2,
(hex.corners[3][1] + hex.corners[4][1]) / 2,
"green"
)
);
} else if (hex.id === 2) {
this.ports.push(
new Port(
(hex.corners[4][0] + hex.corners[5][0]) / 2,
(hex.corners[4][1] + hex.corners[5][1]) / 2
)
);
} else if (hex.id === 11) {
this.ports.push(
new Port(
(hex.corners[3][0] + hex.corners[4][0]) / 2,
(hex.corners[3][1] + hex.corners[4][1]) / 2,
"brown"
)
);
} else if (hex.id === 15) {
this.ports.push(
new Port(
(hex.corners[4][0] + hex.corners[5][0]) / 2,
(hex.corners[4][1] + hex.corners[5][1]) / 2
)
);
} else if (hex.id === 18) {
this.ports.push(
new Port(
(hex.corners[5][0] + hex.corners[0][0]) / 2,
(hex.corners[5][1] + hex.corners[0][1]) / 2,
"gray"
)
);
} else if (hex.id === 16) {
this.ports.push(
new Port(
(hex.corners[1][0] + hex.corners[2][0]) / 2,
(hex.corners[1][1] + hex.corners[2][1]) / 2,
"yellow"
)
);
} else if (hex.id === 17) {
this.ports.push(
new Port(
(hex.corners[0][0] + hex.corners[1][0]) / 2,
(hex.corners[0][1] + hex.corners[1][1]) / 2
)
);
} else if (hex.id === 7) {
this.ports.push(
new Port(
(hex.corners[0][0] + hex.corners[1][0]) / 2,
(hex.corners[0][1] + hex.corners[1][1]) / 2
)
);
} else if (hex.id === 3) {
this.ports.push(
new Port(
(hex.corners[1][0] + hex.corners[2][0]) / 2,
(hex.corners[1][1] + hex.corners[2][1]) / 2,
"lime"
)
);
if (ports[hex.id] != undefined) {
const [cornerIndex1, cornerIndex2, color] = ports[hex.id]
const [x, y] = getCenter(hex.corners, cornerIndex1, cornerIndex2)
this.ports.push(new Port(x, y, color));
}
});
}
);
};
}
118 changes: 26 additions & 92 deletions Hex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class Hex {
constructor(colour, id, number, location, y, radius) {
this.colour = colour[0];
constructor(color, id, number, location, y, radius) {
this.color = color;
this.id = id;
this.number = number ? number[0] : "";
this.location = location;
Expand All @@ -19,67 +19,49 @@ class Hex {
]);
}
this.buildingMarkers = this.corners.map(
corner => new Marker(corner[0], corner[1])
corner => new BuildingMarker(corner[0], corner[1])
);
this.roadMarkers = [];
this.roadMarkers.push(
new RoadMarker(
(this.corners[0][0] + this.corners[this.corners.length - 1][0]) / 2,
(this.corners[0][1] + this.corners[this.corners.length - 1][1]) / 2,
this.switchDirection(
this.corners[0][0],
this.corners[this.corners.length - 1][0],
this.corners[0][1],
this.corners[this.corners.length - 1][1]
)
)
);
for (let i = 1; i < this.corners.length; i++) {
for (let i = 0; i < this.corners.length - 1; i++) {
const thisCorner = this.corners[i]
const [thisX, thisY] = thisCorner
const nextCorner = this.corners[i + 1]
const [nextX, nextY] = nextCorner
this.roadMarkers.push(
new RoadMarker(
(this.corners[i - 1][0] + this.corners[i][0]) / 2,
(this.corners[i - 1][1] + this.corners[i][1]) / 2,
(nextX + thisX) / 2,
(thisY + nextY) / 2,
this.switchDirection(
this.corners[i - 1][0],
this.corners[i][0],
this.corners[i - 1][1],
this.corners[i][1]
nextCorner[0],
thisCorner[0],
nextCorner[1],
thisCorner[1]
)
)
);
}
}
switchDirection = (x1, x2, y1, y2) => {
if (x1 > x2) {
if (y1 > y2) {
return 60;
} else if (y1 < y2) {
return 300;
} else {
return 180;
}
if (x1 <= x2) {
if (y1 !== y2) return 60;
return 180;
} else {
if (y1 > y2) {
return 120;
} else if (y1 < y2) {
return 240;
} else {
return 0;
}
if (y1 !== y2) return 120;
}
return 0;
};
draw = () => {
const numberOfEdges = 6;
ctx.fillStyle = this.colour;
ctx.fillStyle = this.color;
ctx.beginPath();
ctx.moveTo(this.x + this.radius, this.y);
ctx.font = "30px Arial";
for (let i = 0; i < numberOfEdges; i++) {
ctx.lineTo(
this.x +
Math.cos(((360 / numberOfEdges) * i * Math.PI) / 180) * this.radius,
Math.cos(((360 / numberOfEdges) * i * Math.PI) / 180) * this.radius,
this.y -
Math.sin(((360 / numberOfEdges) * i * Math.PI) / 180) * this.radius
Math.sin(((360 / numberOfEdges) * i * Math.PI) / 180) * this.radius
);
}
ctx.closePath();
Expand All @@ -103,58 +85,10 @@ class Hex {
diceResult === this.number &&
!(this.x === board.thief.x && this.y === board.thief.y)
) {
switch (this.colour) {
case "green":
this.buildingMarkers.forEach(marker => {
if (marker.ocupation) {
marker.ocupation.resources[0] += 1;
}
if (marker.city) {
marker.ocupation.resources[0] += 1;
}
});
break;
case "lime":
this.buildingMarkers.forEach(marker => {
if (marker.ocupation) {
marker.ocupation.resources[1] += 1;
}
if (marker.city) {
marker.ocupation.resources[0] += 1;
}
});
break;
case "brown":
this.buildingMarkers.forEach(marker => {
if (marker.ocupation) {
marker.ocupation.resources[2] += 1;
}
if (marker.city) {
marker.ocupation.resources[0] += 1;
}
});
break;
case "gray":
this.buildingMarkers.forEach(marker => {
if (marker.ocupation) {
marker.ocupation.resources[3] += 1;
}
if (marker.city) {
marker.ocupation.resources[0] += 1;
}
});
break;
case "yellow":
this.buildingMarkers.forEach(marker => {
if (marker.ocupation) {
marker.ocupation.resources[4] += 1;
}
if (marker.city) {
marker.ocupation.resources[0] += 1;
}
});
break;
}
resources = ["green", "lime", "brown", "gray", "yellow"]
index = resources.findIndex(this.color)
if (index === -1) return;
this.buildingMarkers.forEach(marker => marker.pay(resources[index]))
}
};
}
Loading