Persson-dev/GDMC-2024
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update wall generation

Browse Source
This commit is contained in:
Eclairsombre
2024-04-26 16:30:50 +02:00
parent 7d073fd561
commit d93c5e09cd
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
House.py
View File

@@ -22,6 +22,8 @@ class House:
self.editor.placeBlock((i, y_min, y), Block("oak_planks")) self.editor.placeBlock((i, y_min, y), Block("oak_planks"))
perimeter_width = x_max - x_min perimeter_width = x_max - x_min
perimeter_depth = z_max - z_min perimeter_depth = z_max - z_min
@@ -41,7 +43,7 @@ class House:
for j in range(0, depth-1): for j in range(0, depth-1):
self.editor.placeBlock((x + i, y_min, z + j), Block("stone")) self.editor.placeBlock((x + i, y_min, z + j), Block("stone"))
self.grid[x+i,z+j] = True,1 self.grid[x+i,z+j] = True,1
self.skeleton.append((x, z, width, depth)) self.skeleton.append((x, z, width-1, depth-1))
print("Coordinates of the corners: ", (x, z), (x, z+depth-1), (x+width-1, z), (x+width-1, z+depth-1)) print("Coordinates of the corners: ", (x, z), (x, z+depth-1), (x+width-1, z), (x+width-1, z+depth-1))
block = ["redstone_block", "gold_block", "diamond_block"] block = ["redstone_block", "gold_block", "diamond_block"]
@@ -53,10 +55,10 @@ class House:
around_around_corners = [(x-1, z+1), (x+1, z-1), (x-1, z+depth-3), (x+1, z+depth-1), (x+width-3, z-1), (x+width-1, z+1), (x+width-1, z+depth-3), (x+width-3, z+depth-1)] around_around_corners = [(x-1, z+1), (x+1, z-1), (x-1, z+depth-3), (x+1, z+depth-1), (x+width-3, z-1), (x+width-1, z+1), (x+width-1, z+depth-3), (x+width-3, z+depth-1)]
corners = corners + around_corners + around_around_corners corners = corners + around_corners + around_around_corners
print(corners)
for a in range(100000): for a in range(100000):
new_width = np.random.randint(width//2, width-2) new_width = np.random.randint(5, width-2)
new_depth = np.random.randint(depth//2, depth-2) new_depth = np.random.randint(5, depth-2)
new_x = np.random.randint(max(x_min+1, x - new_width ), min(x_max-new_width - 1, x + width )) new_x = np.random.randint(max(x_min+1, x - new_width ), min(x_max-new_width - 1, x + width ))
new_z = np.random.randint(max(z_min+1, z - new_depth), min(z_max-new_depth - 1, z + depth )) new_z = np.random.randint(max(z_min+1, z - new_depth), min(z_max-new_depth - 1, z + depth ))
@@ -76,13 +78,15 @@ class House:
continue continue
if not np.any(self.grid[new_x:new_x+new_width, new_z:new_z+new_depth]['bool']): if not np.any(self.grid[new_x:new_x+new_width, new_z:new_z+new_depth]['bool']):
print(new_x, new_z, x,z)
print(new_x+ new_width-1, new_z+new_depth-1, x+width-1, z+depth-1)
for i in range(0, new_width): for i in range(0, new_width):
for j in range(0, new_depth): for j in range(0, new_depth):
self.editor.placeBlock((new_x + i, y_min, new_z + j), Block(block[_]))
self.grid[new_x + i, new_z + j] = True,2 self.grid[new_x + i, new_z + j] = True,2
if i == 0 or i == new_width-1 or j == 0 or j == new_depth-1:
continue
else:
self.editor.placeBlock((new_x + i, y_min, new_z + j), Block(block[_]))
self.skeleton.append((new_x, new_z, new_width, new_depth)) self.skeleton.append((new_x, new_z, new_width, new_depth))
break break
else: else:
@@ -96,17 +100,22 @@ class House:
self.editor.placeBlock((x, y, z), Block("air")) self.editor.placeBlock((x, y, z), Block("air"))
def putWallOnSkeleton(self): def putWallOnSkeleton(self):
for skeleton in self.skeleton: for k in range(len(self.skeleton)):
x, z, width, depth = skeleton x, z, width, depth = self.skeleton[k]
for i in range(0, width): if k!= 0:
for j in range(0, depth): x+=1
for y in range(self.coordinates_min[1], self.coordinates_max[1]): z+=1
if i == 0 or i == width-1 or j == 0 or j == depth-1: width-=2
if not (self.grid[x + i - 1, z + j]['bool'] ) or \ depth-=2
not (self.grid[x + i + 1, z + j]['bool'] ) or \ for i in range(-1, width+1):
not (self.grid[x + i, z + j - 1]['bool'] ) or \ for j in range(-1, depth+1):
not (self.grid[x + i, z + j + 1]['bool'] ): for y in range(self.coordinates_min[1]+1, self.coordinates_max[1]):
if i == -1 or i == width or j == -1 or j == depth:
if not (self.grid[x + i, z + j]['bool']) and not (self.grid[x + i, z + j]['int'] == 1) or (self.grid[x + i, z + j]['bool'] and self.grid[x + i, z + j]['int'] == 2):
self.editor.placeBlock((x + i, y, z + j), Block("stone")) self.editor.placeBlock((x + i, y, z + j), Block("stone"))
print( i, y, j, self.grid[x + i, z + j]['bool'],self.grid[x + i, z + j]['int'])
if __name__ == "__main__": if __name__ == "__main__":

2
main.py
View File

@@ -5,7 +5,7 @@ import numpy as np
editor = Editor(buffering=True) editor = Editor(buffering=True)
# # Get a block # # Get a block
# block = editor.getBlock((0,48,0)) block = editor.getBlock((0,48,0))
# # Place a block # # Place a block
editor.placeBlock((-5, -58, 0), Block("stone")) editor.placeBlock((-5, -58, 0), Block("stone"))