search

yairm210 / Unciv

Open-source Android/Desktop remake of Civ V
Mozilla Public License 2.0
8.5k stars 1.58k forks source link

Civ borders don't show #5884

Closed xlenstra closed 2 years ago

xlenstra commented 2 years ago

Platform Desktop, Linux 64-bit

Version f06242ebe11c3d6c679ef7d2424c2fb01b780d51

Describe the bug No borders show up, not of my nation and not of any other nation. image

In other tilesets, the same problem persists: image

I have tried removing all .atlas and .png files and regenerating those, but that did not solve the problem.

Enabling bubbly borders mod does solve the problem: image

Though only in the fanatasyhex tileset, as other tilesets still lack borders, even with the mod as a permanent audio-visual mod enabled:

image

will-ca commented 2 years ago

Try regenerating game.atlas. Deleting it and running the game should do it.

I exclude it from my commits to keep the history clean (So many conflicts otherwise!), but that means it never gets updated in a fresh repo since git resets mtime.

Ooh. I'm gonna accept that Collaborator offer and push the commit myself real quick.

EDIT: Oh my god, I am so sorry. Did not fully read original issue, apparently. AHHHHHH.

will-ca commented 2 years ago

So, I've immediately learned a lesson about getting too excited and skipping review even if I think something looks very simple. Also about checking all tilesets; I made the same mistake with the arrows 😳.

Default tileset is simple enough. I neglected to give it border images in #5868, and I couldn't make it use FantasyHex as a fallback in #5852 due to its overlay images being disabled in TileGroup.kt when it has situation-specific images, so it's just missing images. #5886 should fix it.

image

FantasyHex already works for me, however.

image

Side note about the mods: They should provide borders in their own tilesets, in FantasyHex, and in Pix5 and 5Hex— They won't do anything in Default because they override FantasyHex tiles, which can't affect Default as mentioned above. Do they not work in Pix5 and 5Hex?

Poor yairm210, probably waking up and seeing his new "hire" immediately making a hash of things…

will-ca commented 2 years ago

@xlenstra If FantasyHex is still broken for you, can you check if /android/Images/TileSets/FantasyHex/Borders exists and has the following files?

https://github.com/yairm210/Unciv/tree/master/android/Images/TileSets/FantasyHex/Borders

Also CTRL+F should find those paths in game.atlas.

Also, sorry about, like, this issue existing. This is the second oversight from one of my changes that you've fixed/caught in the last 24 hours. I will test more thoroughly in the future.

xlenstra commented 2 years ago

@xlenstra If FantasyHex is still broken for you, can you check if /android/Images/TileSets/FantasyHex/Borders exists and has the following files?

https://github.com/yairm210/Unciv/tree/master/android/Images/TileSets/FantasyHex/Borders

Also CTRL+F should find those paths in game.atlas.

I'm currently not home, but I'll look into it tomorrow

Also, sorry about, like, this issue existing. This is the second oversight from one of my changes that you've fixed/caught in the last 24 hours. I will test more thoroughly in the future.

No worries, I've done similar things on multiple occasions 🙃. But as we're all part of the team that is what we're here for :)

AdityaMH commented 2 years ago

Side note about the mods: They should provide borders in their own tilesets, in FantasyHex, and in Pix5 and 5Hex— They won't do anything in Default because they override FantasyHex tiles, which can't affect Default as mentioned above.

But i'm dont want to set border my own, so let's player freely choose default border, or bubble border

will-ca commented 2 years ago

@AdityaMH Sorry, I was specifically referring to the "Bubbly Borders", "Greasy Borders", etc. mods. "Should" as in "intended behaviour in these specific mods", not "should" as in "requirement for all mods".

Other tilesets like Pix5 are fine even if you don't provide borders. In that case, the player can freely choose by downloading a mod that does override borders, like the Bubbly Borders Example. So it already works kinda like you describe.

xlenstra commented 2 years ago

@xlenstra If FantasyHex is still broken for you, can you check if /android/Images/TileSets/FantasyHex/Borders exists and has the following files?

https://github.com/yairm210/Unciv/tree/master/android/Images/TileSets/FantasyHex/Borders

Also CTRL+F should find those paths in game.atlas.

Also, sorry about, like, this issue existing. This is the second oversight from one of my changes that you've fixed/caught in the last 24 hours. I will test more thoroughly in the future.

I've just tested it, and fantasy-hex does seem to show borders this time around. I don't know what changed, but it seems like #5886 should fully close this issue now