chore: Fixes Indentation (mostly in chapter scripts) #221

san7890 · 2023-05-07T05:03:09Z

san7890 commented

2023-05-07 05:03:09 +00:00

When I started codediving, I just grabbed a random extension to help me understand the RenPy code (it helped very little). However, one (FUN) thing about it is that it lints for every single one of the indentation errors you could possibly make:

https://media.discordapp.net/attachments/701985793496842244/1104631399543222303/image.png?width=76&height=670 (not embedding this image because it's huge as hell, just screengrabbed because I thought it was funny)

Anyways, this PR just fixes all of that because I thought that would be a better way to spend the time than disabling the extension. While I was doing this though, there were two portions of the code that I did change beyond indentation, just to reduce copypasta:

The menu that you get after being asked if you're interested in Stella after the concert. (Chapter 7)
The menu that you get on the beach asking what your plans are after high school. (Chapter 14D)

These both had menu options that had copy-pasta lines between all of them and also had the indent fuckup, so I only touched those two while I was there. Let me know if I should undo that in case you really like atomic PRs and that stuff (they still work as expected per my testing).

Let me also know if you want something like a .git-blame-ignore-revs file (can only be made after this PR is preferably squash-merged) after the fact since this does murky up the code a bit and things like these always screw up the blames on other repositories I relish contributing to.

Thanks for your time.

When I started codediving, I just grabbed a random extension to help me understand the RenPy code (it helped very little). However, one (FUN) thing about it is that it lints for every single one of the indentation errors you could possibly make: ![image](/attachments/addf373b-7ada-4c5d-8753-5677c313a83a) https://media.discordapp.net/attachments/701985793496842244/1104631399543222303/image.png?width=76&height=670 (not embedding this image because it's huge as hell, just screengrabbed because I thought it was funny) Anyways, this PR just fixes all of that because I thought that would be a better way to spend the time than disabling the extension. While I was doing this though, there were two portions of the code that I did change beyond indentation, just to reduce copypasta: * The menu that you get after being asked if you're interested in Stella after the concert. (Chapter 7) * The menu that you get on the beach asking what your plans are after high school. (Chapter 14D) These both had menu options that had copy-pasta lines between all of them and also had the indent fuckup, so I only touched those two while I was there. Let me know if I should undo that in case you really like atomic PRs and that stuff (they still work as expected per my testing). Let me also know if you want something like a `.git-blame-ignore-revs` file (can only be made after this PR is preferably squash-merged) after the fact since this does murky up the code a bit and things like these always screw up the blames on other repositories I relish contributing to. Thanks for your time.

image.png

1.4 KiB

san7890 added 6 commits 2023-05-07 05:03:24 +00:00

9021619bf0 chapter 7 alignment issues

c274f8726a reduce copypasta in chapter7

dbffdf5c36 chapters 1 and 4

c890f2094c 2, 5, 8, 11

threes threes threes

378cb12bf4 Late Game (Chapters 13, 14) and Bonus Chapters

* Reduces copypasta in the "what plans do you have" scene at the beach.

0c648922aa common code

MichaelYick commented

2023-05-07 05:14:49 +00:00

@MapAnon can you give this one a look over? I'm pretty rusty on my Ren'py skills these days. I don't know if this whitespace fix will drop lines by accident or not.

MichaelYick requested review from MapAnon 2023-05-07 05:15:06 +00:00

MichaelYick added the

enhancement

Low Priority

labels 2023-05-07 05:15:15 +00:00

MapAnon commented

2023-05-07 05:27:06 +00:00

So long as there isn't an exception on launch, it should be fine. The menu changes are affected by the spanish translation since they translate all those redundant lines, but idk if that actually affects anything for the end user.

Won't be able to test it out for at least several days.

So long as there isn't an exception on launch, it should be fine. The menu changes *are* affected by the spanish translation since they translate all those redundant lines, but idk if that actually affects anything for the end user. Won't be able to test it out for at least several days.

👍 2

san7890 commented

2023-05-07 06:04:57 +00:00

No crash exception on launch, storyline starts fine as expected.

Will fix the Spanish stuff in an upcoming commit.

![image](/attachments/26068257-5d7c-4334-8c5c-39864377813f) No crash exception on launch, storyline starts fine as expected. Will fix the Spanish stuff in an upcoming commit.

image.png

172 KiB

san7890 changed title from ~~chore: Fixes Indentation (mostly in chapter scripts)~~ to wip: chore: Fixes Indentation (mostly in chapter scripts)

2023-05-07 06:05:15 +00:00

san7890 added 1 commit 2023-05-07 06:22:06 +00:00

9f2bd4ed5f fixes translation menus

deletes the old lines

san7890 changed title from ~~wip: chore: Fixes Indentation (mostly in chapter scripts)~~ to chore: Fixes Indentation (mostly in chapter scripts)

2023-05-07 06:22:12 +00:00

san7890 commented

2023-05-07 06:22:49 +00:00

Let me know if I extracted the translation files from Ren'Py the wrong way.

GManon reviewed 2023-05-14 04:23:05 +00:00

game/tl/es/script/7.concert-day.rpy

						
				@ -2633,0 +2594,4 @@

				translate es PostCableConundrum_afcbc2bb:

				    # A "I do NOT have a thing for Incontineisha."

				    A "Estoy pensando en hacer algo con música{cps=*.1}...{/cps} ¿quizás convertirme en ingeniero de sonido?"

GManon commented

2023-05-14 04:23:05 +00:00

"La incontinencia NO es mi fetiche."

😆 1

This pull request can be merged automatically.

You are not authorized to merge this pull request.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b san7890-indentation-stuff NewPatch

git pull indentation-stuff

Step 2:

Merge the changes and update on Gitea.

git checkout NewPatch

git merge --no-ff san7890-indentation-stuff

git push origin NewPatch

Sign in to join this conversation.

No reviewers

No Milestone

No project

No Assignees

4 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Cavemanon/SnootGame#221