Skip to content

Fixup new lines of units descriptions and encyclopedias#21675

Merged
penev92 merged 4 commits into
OpenRA:bleedfrom
test1232156:encyclopedia-fixup
Dec 20, 2024
Merged

Fixup new lines of units descriptions and encyclopedias#21675
penev92 merged 4 commits into
OpenRA:bleedfrom
test1232156:encyclopedia-fixup

Conversation

@PunkPun

@PunkPun PunkPun commented Dec 13, 2024

Copy link
Copy Markdown
Member

fixes #21660

@PunkPun PunkPun added this to the Next Release milestone Dec 13, 2024
@penev92

penev92 commented Dec 18, 2024

Copy link
Copy Markdown
Member
  1. Was the previously-there indentation even an intentional feature? Honestly it looks a bit weird.
    image

  2. the PR adds hardcoded indentation of 4 spaces to the first text line (in FTL), but we use 3 spaces for some reason, so this looks odd
    image

@penev92

penev92 commented Dec 19, 2024

Copy link
Copy Markdown
Member

From Discord:

penev92 — Today at 00:12
I'm going to assume that someone just assumed 4 out of habit initially 😐
because the FTL files are configured to use 3 and do use 3
but the place I see it now is your newly added (and modified) code, so you can "fix" it there at least 🙂 
otherwise we can add an override to .editorconfig to switch FTL files to 4-space indentation to match our other stuff, but that's a bigger can of worms

Can we change the extraction code to hardcode 3 spaces instead of 4 so we reduce the number of inconsistencies in FTL files rather than introduce more inconsistencies please?

Unless we're planning to override the default FTL indentation from 3 to 4 spaces?

@PunkPun

PunkPun commented Dec 19, 2024

Copy link
Copy Markdown
Member Author

the extraction does 3 spaces, and when it comes to new lines, it replaces with 4 spaces.

Was the previously-there indentation even an intentional feature? Honestly it looks a bit weird.

It was intentional, however it was not consistently applied. I went through all mods and ingame checked for all indentation, I fixed up incorrect usage so now it should look much better.

I also changed up d2k upgrade descriptions as I though the old way of listing unlocked units sucked

@penev92 penev92 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍

@penev92 penev92 merged commit 48d5b3c into OpenRA:bleed Dec 20, 2024
@PunkPun PunkPun deleted the encyclopedia-fixup branch December 20, 2024 20:01
@penev92

penev92 commented Dec 20, 2024

Copy link
Copy Markdown
Member

Commits on prep-2411:
2192a6b
34c29f8
e282193
0566b6f

@PunkPun

PunkPun commented Dec 20, 2024

Copy link
Copy Markdown
Member Author

68ad916...0566b6f

@PunkPun

PunkPun commented Dec 20, 2024

Copy link
Copy Markdown
Member Author

changelog

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Automatic ftl intendation normalisation broke unit destriptions

3 participants