Help me make my new variant! (please!)

[Nick]

Does it have to use the first blow though?
I mean, couldn't it check for a SPIT/GAZE blow method when using a ranged SPIT/GAZE, then use the blow effect used by the melee version?
That's what I'm trying to figure out how to do.

You could do that; assuming you'e making a new effect like LASH, you'd have to either hard-code in to look for that blow method, or pass that in to the effect via a parameter (probably context->other).

[Julian]

Does it have to use the first blow though?
I mean, couldn't it check for a SPIT/GAZE blow method when using a ranged SPIT/GAZE, then use the blow effect used by the melee version?
That's what I'm trying to figure out how to do.

(I've already added a couple other blow types and blow effects, and monster spells, so I know basically how those work.)

You can. The blow names are stored as strings, so you can search through them.

[will_asher]

You can. The blow names are stored as strings, so you can search through them.

ugh. I'm not good at dealing with strings, but I can probably figure it out looking at other stuff.

[will_asher]

If I want to import changes from newer V to my variant, I made a pull request on github, but how do I exclude certain files and tell it which changes I don't want?

Also, I noticed the old_class.txt file has changed. I thought that file was no longer used?

[Julian]

If I want to import changes from newer V to my variant, I made a pull request on github, but how do I exclude certain files and tell it which changes I don't want?

You can use git to cherry-pick which parts of a merge you want to take, but most of the time you’re just going to want to merge the two branches, and anything that’s a merge conflict you just resolve in favor of your code.

[Nick]

If I want to import changes from newer V to my variant, I made a pull request on github, but how do I exclude certain files and tell it which changes I don't want?

This is not completely straightforward. What I do for FAangband is to use git cherry-pick to pull individual git commits in. Another way is to use git rebase to take current V and then replay the changes you've made on top of it (note that this doesn't remove changes you don't want).

Sorry there isn't a simple answer - I see a bunch of learning about git in your future

Also, I noticed the old_class.txt file has changed. I thought that file was no longer used?

I am attempting to keep it updated so that people can still use it with current V if they prefer to. I'm not sure how well I'm doing with that, but I haven't had any recent complaints (which is my only current measure).

[will_asher]

This is not completely straightforward. What I do for FAangband is to use git cherry-pick to pull individual git commits in. Another way is to use git rebase to take current V and then replay the changes you've made on top of it (note that this doesn't remove changes you don't want).

Sorry there isn't a simple answer - I see a bunch of learning about git in your future

So is git cherry-pick an additional app or add-on? How do I find it and how to use it?

[backwardsEric]

So is git cherry-pick an additional app or add-on? How do I find it and how to use it?

It's one of git's standard commands; documentation for it is here, https://git-scm.com/docs/git-cherry-pick .

If you're working with GitHub's "Desktop", there's supposedly a cherry-picking feature that's been added. A blog post mentioning that is here, https://github.blog/2021-03-30-githu...herry-picking/ .

I don't know if GitHub has something to do cherry picking from within it's web interface.

[will_asher]

It's one of git's standard commands; documentation for it is here, https://git-scm.com/docs/git-cherry-pick .

If you're working with GitHub's "Desktop", there's supposedly a cherry-picking feature that's been added. A blog post mentioning that is here, https://github.blog/2021-03-30-githu...herry-picking/ .

I don't know if GitHub has something to do cherry picking from within it's web interface.

Thank you.

[will_asher]

Working on merging in the recent commits from V and resolving differences.
What does this mean in the code:

"<<<<<<< HEAD"
...
"=======
>>>>>>> 6c45e566d (Use Angband 4 command system for debugging commands (#4676))"

I've never seen it in C before.
EDIT: To me it looks like a temporary note that should be deleted before trying to run the program, but I want to make sure.

[Julian]

Working on merging in the recent commits from V and resolving differences.
What does this mean in the code:

"<<<<<<< HEAD"
...
"=======
>>>>>>> 6c45e566d (Use Angband 4 command system for debugging commands (#4676))"

I've never seen it in C before.
EDIT: To me it looks like a temporary note that should be deleted before trying to run the program, but I want to make sure.

That’s a merge conflict to resolve

[will_asher]

That’s a merge conflict to resolve

But it just marks the beginning and end. It doesn't say what I need to change in between those markers for it to be resolved. How do I know what needs to be changed? (The diff isn't showing any changes in between the markers.)

[backwardsEric]

But it just marks the beginning and end. It doesn't say what I need to change in between those markers for it to be resolved. How do I know what needs to be changed? (The diff isn't showing any changes in between the markers.)

From what you wrote before, it looks like your version (the first part marked HEAD up to the "========") has code with some local changes that was removed (or in the case of this particular change, likely moved to a different file) in Vanilla Angband.

As for resolving the conflict, that'll depend on whether Vanilla moved stuff or completely removed it. Looking at what the changes were in Vanilla should help clarify that. For this, I'm guessing it's code that was moved from wiz-debug.c to cmd-wizard.c. If that's the case, you would want to determine whether to transfer what you had changed to its new location or completely reject Vanilla's rearrangement of the code.

[Julian]

From what you wrote before, it looks like your version (the first part marked HEAD up to the "========") has code with some local changes that was removed (or in the case of this particular change, likely moved to a different file) in Vanilla Angband.

As for resolving the conflict, that'll depend on whether Vanilla moved stuff or completely removed it. Looking at what the changes were in Vanilla should help clarify that. For this, I'm guessing it's code that was moved from wiz-debug.c to cmd-wizard.c. If that's the case, you would want to determine whether to transfer what you had changed to its new location or completely reject Vanilla's rearrangement of the code.

What he said. You should be able to ask git to tell you what commit 6c45e566d was (I don’t recall how, because I’m not good with git), but unless it’s directly affecting things you’re changing, I’m of the opinion that you should keep up with the mainline changes; they’re doing a lot of bug-fixing and infrastructure work.

[wobbly]

What he said. You should be able to ask git to tell you what commit 6c45e566d was (I don’t recall how, because I’m not good with git), but unless it’s directly affecting things you’re changing, I’m of the opinion that you should keep up with the mainline changes; they’re doing a lot of bug-fixing and infrastructure work.

I'm asuming its this:

https://github.com/angband/angband/commit/6c45e566d