updated grafics

This commit is contained in:
Hannes
2026-05-31 20:50:59 +02:00
parent 2e484bb0c8
commit 4ad09533f7
2 changed files with 37 additions and 23 deletions
+36 -22
View File
@@ -181,7 +181,6 @@ def make_picture(board0, board1, next_board0, next_board1, output, score0=0, sco
if x>=b1.x and x<b1.x+b1.width and y>=b1.y and y<b1.y+b1.height:
xd = x-b1.x
yd = y-b1.y
# pixels[x, y] = colors[board[yd>>5][xd>>5]].multiply(sprite_pixels[yd&0b0000000000011111, xd&0b0000000000011111])
xs = xd&0x1F
ys = yd&0x1F
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
@@ -204,15 +203,20 @@ def make_picture(board0, board1, next_board0, next_board1, output, score0=0, sco
yd = y-nb1.y
xs = xd&0x1F
ys = yd&0x1F
if (xs == 31) or (ys==31):
if (xs == 0) or (ys == 0):
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].shiftr(1)
else:
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].shiftr(2)
elif (not xs) or (not ys):
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].get()
elif (xs > 5 and xs < 26) and (ys > 5 and ys < 26): # mid boarder
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFB0)
elif xs+ys<31: # top left edge
if xs>ys:
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].get()
else:
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFEF)
else:
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFC0)
if xs>ys:
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFD7)
else:
pixels[x, y] = colors[next_board0[yd>>5][xd>>5]].mask(0xFFFFFFC0)
### Score
elif x>=s1.x and x<s1.x+s1.width and y>=s1.y and y<s1.y+s1.height:
yd = y-s1.y
@@ -237,30 +241,40 @@ def make_picture(board0, board1, next_board0, next_board1, output, score0=0, sco
yd = y-b2.y
xs = xd&0x1F
ys = yd&0x1F
if (xs == 31) or (ys==31):
if (xs == 0) or (ys == 0):
pixels[x, y] = colors[board1[yd>>5][xd>>5]].shiftr(1)
else:
pixels[x, y] = colors[board1[yd>>5][xd>>5]].shiftr(2)
elif (not xs) or (not ys):
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
pixels[x, y] = colors[board1[yd>>5][xd>>5]].get()
elif (xs > 5 and xs < 26) and (ys > 5 and ys < 26): # mid boarder
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFB0)
elif xs+ys<31: # top left edge
if xs>ys:
pixels[x, y] = colors[board1[yd>>5][xd>>5]].get()
else:
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFEF)
else:
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFC0)
if xs>ys:
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFD7)
else:
pixels[x, y] = colors[board1[yd>>5][xd>>5]].mask(0xFFFFFFC0)
### Next Piece
elif x>=nb2.x and x<nb2.x+nb2.width and y>=nb2.y and y<nb2.y+nb2.height:
xd = x-nb2.x
yd = y-nb2.y
xs = xd&0x1F
ys = yd&0x1F
if (xs == 31) or (ys==31):
if (xs == 0) or (ys == 0):
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].shiftr(1)
else:
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].shiftr(2)
elif (not xs) or (not ys):
if (xs > 7 and xs < 24) and (ys > 7 and ys < 24): # middle
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].get()
elif (xs > 5 and xs < 26) and (ys > 5 and ys < 26): # mid boarder
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFB0)
elif xs+ys<31: # top left edge
if xs>ys:
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].get()
else:
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFEF)
else:
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFC0)
if xs>ys:
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFD7)
else:
pixels[x, y] = colors[next_board1[yd>>5][xd>>5]].mask(0xFFFFFFC0)
### Score
elif x>=s2.x and x<s2.x+s2.width and y>=s2.y and y<s2.y+s2.height:
yd = y-s2.y