Not at all, wish I'd mentioned the annoyance years ago now (it was one of those things I learnt so early it predates contributing and I'm so used to it).Dilvish wrote:I'm looking into that-- it's pretty clear to me that's not how it was intended. Before the key change was made all the buildings would be produced at once (and in the case of terraforming, iirc, each one would then process just fine). When the code was changed to block that, the accompanying comment isThere is also essentially the same code and comment for ships. Note the phrase "on the same turn" -- this clearly wasn't intended to (and doesn't) remove all instances of the same building/ship at the same location from the queue; having it remove only ones that happen to complete on the same turn as a first blocking one (for which current content has no ship examples) simply creates a micromanagement headache, so I don't think that was the intent.Code: Select all
// check location condition before each building is created, so // that buildings being produced can prevent subsequent // buildings completions on the same turn from going through
Anyone object to me changing this so the items don't get deleted from the queue?
What he said, I've done worse more than once and nearly had things end up in the repo, I've found creating a new branch, ideally taking it from the tracking master, is the easiest approach, but it appears every Git GUI has a different system, which makes teaching people harder.Eh, good try, almost but not quite-- when you see something likeKassiopeija wrote:I just did, but actually I have no idea if I did it correctly... :shrug:Dilvish wrote:Care to submit a Pull Request on github for it?when you probably only have one commit, that's a red flag And anytime github says it can't automatically figure out how to do the merge, then that's a red flag also (that actually blocks things). I expect the problem relates to the fact that you're working with your master branch, and have probably made past changes there, and now when you submit your master branch for the PR git & github get all confused & can't even merge in the change. I explained a bit about how to keep things cleaner, in a comment to the PR. Note, in your PR github also shows lots of old line comments from other commits your PR was pulling in, just scroll to the very bottom for my comment. Don't be disheartened-- you're not the first to do this here, we're all (most of us) still getting used to working with git & github. I hope you are game to take the time to straighten things up.Kassiopeija wants to merge 1,151 commits into release-0.4.4 from master
From what I can see the work you've done is right though, it's just, well,
Code: Select all
Sorry, we could not display the entire diff because too many files (810) changed.