Vanilla Code Questions

[DavidMedley]

It's not a crucial issue

[Nick]

It's your .angband directory, not your angband directory

[DavidMedley]

Aha! I missed the tilde in your earlier post. Got it now. Thanks!

[DavidMedley]

How do I get "player-flags:RAGE_FUEL" to not throw a parse error on startup?

[Nick]

How do I get "player-flags:RAGE_FUEL" to not throw a parse error on startup?

It will need an entry in player_property.txt, and an entry in list-player-flags.h

[DavidMedley]

I swear to God list-player-flags.h sprang into existence the moment you made this post through some vanilla maintainer sorcery

[wobbly]

When I'm adding flags I use a search all files on a flag thats already there. So you can search know_zapper and all the relevent files will pop up. At least almost, it'll miss a couple like is_zapper for instance, but at least it'll find the list flags file you missed.

[DavidMedley]

Yeah. I think I must have searched for an object flag -- probably IMPAIR_HP -- and that's why I wasn't finding what I needed.

[DavidMedley]

Why is it so hard to keep my fork up to date? I've barely changed anything in github, and I could throw those few changes away. But when I try

damedley wants to merge 202 commits into damedley:master from angband:master

it's saying I have like a dozen files I have to manually merge. What gives? More to the point, how can I make it easy as possible to merge changes into my version, and request a pull into the real version?

[DavidMedley]

it's saying I have like a dozen files I have to manually merge.

To clarify, these are changes that I have nothing to do with. Maybe they haven't been merged in the mainline version yet? And once they are it won't be an issue for me anymore?

[wobbly]

You've done something funky. Some of the changes you're trying to pull in have been in master since September 2019

[DavidMedley]

You've done something funky. Some of the changes you're trying to pull in have been in master since September 2019

Hmm ok thanks for the tip.

[DavidMedley]

I guess I'll have to delete this and fork anew.

[DavidMedley]

I think I'm on the right track with github now. Question: is there a git setting to avoid updating a bunch of lines where the only change is my editor auto-trimmed some trailing whitespace?

[moosferatu]

If it's actually trimming spaces, you'll need to configure that in your editor.

What OS are you using? Windows? Most likely, it's converting line endings -- a highly irritating problem.

https://help.github.com/en/github/using-git/configuring-git-to-handle-line-endings