Skip to content

Commit df219a3

Browse files
committed
Tweaks
1 parent 5aa72d0 commit df219a3

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

src/main/java/hexed/HexedGenerator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
public class HexedGenerator extends Generator{
1818
public final static int size = 448;
19-
public final static int radius = 70;
20-
public final static int spacing = 90;
19+
public final static int radius = 74;
20+
public final static int spacing = 94;
2121
public IntArray hex = getHex();
2222

2323
// elevation --->
@@ -89,9 +89,9 @@ public void generate(Tile[][] tiles){
8989
}
9090
});
9191
Angles.circle(3, 360f / 3 / 2f - 90, f -> {
92-
Tmp.v1.trnsExact(f, spacing + 10);
92+
Tmp.v1.trnsExact(f, spacing + 12);
9393
if(Structs.inBounds(x + (int)Tmp.v1.x, y + (int)Tmp.v1.y, width, height)){
94-
Tmp.v1.trnsExact(f, spacing / 2 + 1);
94+
Tmp.v1.trnsExact(f, spacing / 2 + 7);
9595
Bresenham2.line(x, y, x + (int)Tmp.v1.x, y + (int)Tmp.v1.y, (cx, cy) -> {
9696
Geometry.circle(cx, cy, width, height, 3, (c2x, c2y) -> tiles[c2x][c2y].setBlock(Blocks.air));
9797
});
@@ -128,7 +128,7 @@ public IntArray getHex(){
128128
double h = Math.sqrt(3) * spacing/2;
129129
//base horizontal spacing=1.5w
130130
//offset = 3/4w
131-
for(int x = 0; x < width / spacing - 2; x++){
131+
for(int x = 0; x < width / spacing - 1; x++){
132132
for(int y = 0; y < height / (h/2) - 2; y++){
133133
int cx = (int)(x * spacing*1.5 + (y%2)*spacing*3.0/4) + spacing/2;
134134
int cy = (int)(y * h / 2) + spacing/2;

src/main/java/hexed/HexedMod.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ public class HexedMod extends Plugin{
3232
public void init(){
3333
rules.pvp = true;
3434
rules.tags.put("hexed", "true");
35-
rules.loadout = ItemStack.list(Items.copper, 300, Items.lead, 500, Items.graphite, 100, Items.metaglass, 100, Items.silicon, 100);
35+
rules.loadout = ItemStack.list(Items.copper, 300, Items.lead, 500, Items.graphite, 150, Items.metaglass, 150, Items.silicon, 150);
3636
rules.buildCostMultiplier = 1f;
37-
rules.buildSpeedMultiplier = 0.25f;
37+
rules.buildSpeedMultiplier = 1f / 3f;
3838
rules.unitBuildSpeedMultiplier = 1f;
3939
rules.enemyCoreBuildRadius = (HexedGenerator.radius + 2) * tilesize / 2f;
4040
rules.unitDamageMultiplier = 1f;
4141
rules.playerHealthMultiplier = 2f;
4242

43-
start = Schematics.readBase64("bXNjaAB4nE2SfW7DIAzFDSR8pP1nB8lJdgqaoalSClHSburtZxPbWqXCL8HvPQOBC1wMDDU/Cgy3fBR8Xtq2lX3+zesKH/8e5jXv3wXi0upPebcdXN4XuBwN389brmWFcCz5+Sw7XJe2l7m+lrW8DvCPUr/wbXzVtWWi6162fEdZu9cnhFtXvQHgE/9gQEbbicZBaVTyWhdAfolnw7ND6uwszuJi1MWwC9WlE5AmjrDsMvRKWiWyXGdp6M5Wna06W3Ym7v25ESnqO8lwmuE0w3GGR7dRdyKKQRXDqbChd0jbjkix759Wk1aKVtwS0qmdYOQ0ot6fo9WkCtF6dfOsjUikNS4gda2hVcn1qpUbGpEMuwROI5KzD6qQkyKSc47n3i3RqORVEdgvqnNU56jO0p1DOk+c7l6+taQZSTMSZ1BdUK04J3WeeG90u+IyqcuknU7cwx8dFTGj");
43+
start = Schematics.readBase64("bXNjaAB4nE2SgY7CIAyGC2yDsXkXH2Tvcq+AkzMmc1tQz/j210JpXDL8hu3/lxYY4FtBs4ZbBLvG1ync4wGO87bvMU2vsCzTEtIlwvCxBW7e1r/43hKYkGY4nFN4XqbfMD+29IbhvmHOtIc1LjCmuIcrfm3X9QH2PofHIyYY5y3FaX3OS3ze4fiRwX7dLa5nDHTPddkCkT3l1DcA/OALihZNq4H6NHnV+HZCVshJXA9VYZC9kfVU+VQGKSsbjVT1lOgp1qO4rGIo9yvnquxH1ORIohap6HVIDbtpaNlDi4cWD80eFJdrNhbJc8W61Jzdqi/3wrRIRii7GYdelvWMZDQs1kNbqtYe9/KuGvDX5zD6d5SML66+5dwRqXgQee5GK3Edxw1ITfb3SJ71OomzUAdjuWsWqZyJavd8Issdb5BqVbaoGCVzJqrddaUGTWSFHPs67m6H5HlaTqbqpFc91Kfn+2eQSp9pr96/Xtx6cevZjeKKDuUOklvvXy9uPGdNZFjZi7IXZS/n8Hyf/wFbjj/q");
44+
4445
Events.on(Trigger.update, () -> {
4546
if(active()){
4647
for(Player player : playerGroup.all()){
@@ -66,7 +67,7 @@ public void init(){
6667
int x = Pos.x(lastGenerator.hex.get(i));
6768
int y = Pos.y(lastGenerator.hex.get(i));
6869
boolean[] synth = {false};
69-
Geometry.circle(x, y, 4, (cx, cy) -> {
70+
Geometry.circle(x, y, 15, (cx, cy) -> {
7071
if(world.tile(x, y).block().synthetic()){
7172
synth[0] = true;
7273
}
@@ -90,6 +91,7 @@ public void init(){
9091
return team;
9192
}
9293
}
94+
Call.onInfoMessage(player.con, "There are currently no empty hex spaces available.\nAssigning into spectator mode.");
9395
return Team.derelict;
9496
}else{
9597
return prev.assign(player, players);

0 commit comments

Comments
 (0)