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

Strict tiling #194

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Strict tiling #194

wants to merge 11 commits into from

Conversation

balt-dev
Copy link
Owner

Tiling mode is now an enumerated string, out-of-bounds animation frames now give an error, and many tiles have been fixed.

Copy link
Collaborator

@CenTdemeern1 CenTdemeern1 left a comment

Choose a reason for hiding this comment

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

A few concerns and mostly nitpicks (this many file changes weren't fun to review... my browser is lagging...)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there a reason why this PR includes unrelated README changes?

Copy link
Owner Author

Choose a reason for hiding this comment

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

i forgot to switch branches

Copy link
Collaborator

Choose a reason for hiding this comment

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

Please just cherrypick your commit to the right branch or something, if I really have to go through 249 files by hand I'd refer you'd only keep it to the relevant ones

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm not sure you meant to commit this

Copy link
Owner Author

Choose a reason for hiding this comment

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

no i did not! good catch thanks

Copy link
Collaborator

Choose a reason for hiding this comment

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

(I'll mark this conversation as resolved when you fix this)

Copy link
Collaborator

Choose a reason for hiding this comment

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

This file seems to be using the old header comment. Are there any others like it?

Copy link
Owner Author

Choose a reason for hiding this comment

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

not that i'm aware of?

Copy link
Owner Author

Choose a reason for hiding this comment

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

come to think of it this should probably be reimported because i imported it using an older version of the game, but i'd need a copy of the latest version of baba is you for that which i don't. have at the moment, because i'm at college

Copy link
Collaborator

Choose a reason for hiding this comment

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

I do. If you'd like, and if you can give me proper instructions, I can do it for you.

data/levels/levels/world_data.txt Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why did so many unrelated sprites and such change? Is this metadata? Should we be using optipng?

Copy link
Owner Author

Choose a reason for hiding this comment

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

i uh accidentally committed an old version of the basegame palettes so i fixed that here. should've done it on main but i forgot to switch branches

Copy link
Collaborator

Choose a reason for hiding this comment

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

See convo 1

.replace("|", "vert")
.replace("?", "quest")
.replace("*", "ast")
)
Copy link
Collaborator

Choose a reason for hiding this comment

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

This seems like it could become a problem (also, no handling of '?)

Copy link
Owner Author

Choose a reason for hiding this comment

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

what do you think i should do?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm not sure, it's just that this doesn't catch all special characters and endlessly replace chaining seems like a bad idea
I'd prefer something that just applies to certain character ranges but I'm not sure where the character names would come from

src/cogs/owner.py Show resolved Hide resolved
src/cogs/owner.py Show resolved Hide resolved
if tiling == TilingMode.TILING:
# Check for diagonal tiling
if pathlib.Path(f"data/sprites/{constants.BABA_WORLD}/{sprite}_16_1.png").exists():
tiling = +TilingMode.DIAGONAL_TILING
Copy link
Collaborator

Choose a reason for hiding this comment

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

Copy pasted check from earlier?

Copy link
Owner Author

Choose a reason for hiding this comment

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

i think so

Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there anything that reasonably can or should be done about this?

#
# ----------------------------------------------------------------------------
""")
f.write("# Please read CONTRIBUTING.md for guidance on how to properly edit this file.\n\n\n")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Also seems copy pasted?

Copy link
Owner Author

Choose a reason for hiding this comment

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

think so here too

Copy link
Collaborator

Choose a reason for hiding this comment

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

This might need to be a constant or something.

@CenTdemeern1
Copy link
Collaborator

Most of this boils down to "please clean up this branch and its diff"

@CenTdemeern1
Copy link
Collaborator

@balt-dev your turn.

@balt-dev
Copy link
Owner Author

give me a little while, i'm in class

@balt-dev
Copy link
Owner Author

thanks for doing this btw

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