Skip to content

Fixinlinedir #22

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
Bobbsterperson wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Fixinlinedir #22

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3066aed
seems like its working, still needs more testing
Bobbsterperson Jul 2, 2024
6f071a6
if unique is placed next to 4 or more green and one pink on other sid…
Bobbsterperson Jul 2, 2024
63492ad
in progress
Bobbsterperson Jul 2, 2024
c45d58e
resolved issues from sorcery and few minor changes
Bobbsterperson Jul 5, 2024
970350f
tried to apply the logic provided from our friend, faild in my attemp…
Bobbsterperson Jul 8, 2024
ebdee44
it no longer removes lines of different colors but when i line of a f…
Bobbsterperson Jul 8, 2024
1ab24df
added find adjacent lines in assign_random_imgae_to_button so the met…
Bobbsterperson Jul 8, 2024
9a7861d
only same color disapears on a line and only if buttons are adjacent …
Bobbsterperson Jul 8, 2024
c3b9bbf
removed img
Bobbsterperson Jul 8, 2024
3c121fc
in progress
Bobbsterperson Jul 9, 2024
0ad291b
Merge branch 'main' of https://github.com/Fenigor/align-game into fix…
Bobbsterperson Jul 9, 2024
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
75 changes: 48 additions & 27 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,8 @@ def find_line_in_direction(
x, y = row, col
dir_x, dir_y = direction
previous_image = None
while True:
run = True
while run:
x += dir_x
y += dir_y
if not self.is_within_bounds(x, y):
Expand All @@ -417,6 +418,7 @@ def find_line_in_direction(

if not previous_image and adjacent_image != UNIQUE_BUTT:
previous_image = adjacent_image

# print(f'Set previous_image to {previous_image}')
# print('------------------------------')
if previous_image and adjacent_image not in (
Expand All @@ -433,35 +435,54 @@ def find_line_in_direction(
# of line of same color nothing happens
# if you stack 4 unique and 1 color the or 5 unique they disapear

if adjacent_image in (current_image, UNIQUE_BUTT):
# if adjacent_image in (current_image, UNIQUE_BUTT):
# current_line.add((x, y))
if current_image == 'assets/green.png' and (adjacent_image == 'assets/green.png' or adjacent_image == UNIQUE_BUTT):
Comment thread
Bobbsterperson marked this conversation as resolved.
Outdated
current_line.add((x, y))
print(
f'curentimag{current_image}andajacentimag{adjacent_image}',
)
print('------------------------------')
print('current green to green or unique')
elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/green.png':
if (x, y) in current_line in adjacent_image:
current_line.add((x, y))

# elif current_image == UNIQUE_BUTT and adjacent_image != 'assets/green.png':
# if (x, y) in current_line in adjacent_image:
# current_line.add((x, y))
# if (x, y) in current_line in adjacent_image == UNIQUE_BUTT:
# current_line.add((x, y))

if current_image == 'assets/pink.png' and (adjacent_image == 'assets/pink.png' or adjacent_image == UNIQUE_BUTT):
run = True
current_line.add((x, y))
elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/pink.png':
current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image != 'assets/pink.png':
# continue

# if the color is unique but the adjacent is not
# elif current_image == UNIQUE_BUTT and adjacent_image == "assets/green.png":
# current_line.add((x, y)) # have to indentify what color the
# adjacent_image is so it removes only that color
# elif current_image == UNIQUE_BUTT and adjacent_image == "assets/pink.png":
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == "assets/blue.png":
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == "assets/yellow.png":
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == "assets/turquoise.png":
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == "assets/purple.png":
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == "assets/orange.png":
# current_line.add((x, y))

# print(f"Added ({x}, {y}) to current_line; unique image matched with {adjacent_image}")
# print('------------------------------')
# elif current_image == UNIQUE_BUTT and adjacent_image == current_image:
# current_line.add((x, y)) # problem potentioly here

# if the color is unique but the adjacent is not
# elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/green.png':
# current_line.add((x, y)) # have to indentify what color the
# # adjacent_image is so it removes only that color

# elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/pink.png':
# if (x, y) in current_line in adjacent_image:
# current_line.add((x, y))
# if (x, y) in current_line in adjacent_image == UNIQUE_BUTT:
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/pink.png':

# current_line.add((x, y))

# elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/blue.png':
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/yellow.png':
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/turquoise.png':
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/purple.png':
# current_line.add((x, y))
# elif current_image == UNIQUE_BUTT and adjacent_image == 'assets/orange.png':
# current_line.add((x, y))
def is_within_bounds(self, x, y):
return 0 <= x < 9 and 0 <= y < 9

Expand Down