Skip to content
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.

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

Star battle borders added #866

Merged
merged 11 commits into from
Oct 21, 2024
Merged

Conversation

offline171
Copy link
Collaborator

If there's a warning about the test, I'll fix that later, but for now I excluded it because there were problems with merging if I fixed it. Will deal with later.

Fixed Empty Adjacent Test (one of those one line deletion bug fixes) and got rid of print statements and comments blocking useful lines of code
Starter code for borders
Added primitive code to outline where borders would be placed
commented out rough draft on how element view draws borders. Don't need an image for them likely, just use basic drawRect function, and make sure to distinguish if it's vertical or horizontal if necessary
Made dedicated border classes to help define them for drawing
Changed how borders were counted and drawn to be more in line with skyscrapers
Borders added, slipped in-between cells equally, colored red so as to not be confused with the black empty squares
Attempting to solve merge issue
Undoing changes to fix merge conflict
Copy link
Collaborator

@jadeandtea jadeandtea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is an else statement that was commented out in StarBattleElementView.java, but if you need it later, then keep it. Other than that, the code looks fine.

@offline171 offline171 closed this Oct 21, 2024
@offline171 offline171 reopened this Oct 21, 2024
@offline171
Copy link
Collaborator Author

offline171 commented Oct 21, 2024

There is an else statement that was commented out in StarBattleElementView.java, but if you need it later, then keep it. Other than that, the code looks fine.

The commented out else statement is old code from when I considered making the borders a cell type, which I ultimately didn't do, so I should be able to get rid of it, maybe at a later date

@offline171 offline171 merged commit 7eb9fff into Bram-Hub:star-battle Oct 21, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants