These are chat archives for BSData/warhammer-age-of-sigmar

11th
Mar 2018
OftKilted
@OftKilted
Mar 11 2018 15:32
@FreylisUK I’m seeing conflicts in your merge request after processing @rweyrauch prior merge request.
The 40k side updated their implementation guidelines https://github.com/BSData/wh40k/wiki/CAT-Creation-Guidlines#guidelines
Simon Barlow
@FreylisUK
Mar 11 2018 19:33
@OftKilted No problem, I'll take a look this evening.
OftKilted
@OftKilted
Mar 11 2018 19:37

The big one on the update for 40k (which is valid as well for AoS) is the updated rule 0

“All choices, entries, upgrades etc. that are valid or possibly valid MUST be represented (implemented) and MUST NOT raise errors/warnings. This is the single most important rule. If there is a doubt if an option is legal, it MUST be included. Motivation: we are not rules lawyers. Our effort targets all audiences, no matter their personal decisions, erratas or agreements. Our only source is Rules As Written (RAW), published by Games Workshop and their subsidiaries (Forge World etc.); that includes officially posted Erratas and FAQs (Facebook pages, emails and other unofficial channels excluded). If you feel we've missed a valid option (and you can provide reasonable argument supporting its legality) please raise an issue on GitHub.”

Simon Barlow
@FreylisUK
Mar 11 2018 22:12
Okay, I'm having some major problems with this merge. I had so many errors I decided to start afresh with @rweyrauch 's most recent Order.cat file and re-add all my KO changes back to it in BS rather than try to resolve it, but even now I'm getting errors when trying to merge. I don't really see, given the files were identical before I added my changes, how there can be merge errors. I feel like I've wasted my evening looking at this so if somebody with more experience is able to take a look at it that would be a massive help. I'm basically stuck now as I don't want to continue with the DoK until this is fixed :worried:
I suppose the only real solution I have if the merge can't be processed is to split the file out and create separate Catalogues, which I'm more than happy to do as it will prevent problems like this occurring in the future. Let me know how you would like me to proceed.
OftKilted
@OftKilted
Mar 11 2018 22:20
When I'll often do when I run into those kinds of issues is to have my 'copy work' off to a second instance window, open the file I'm working into and then do a copy-paste into the working from the file I had.
OftKilted
@OftKilted
Mar 11 2018 22:28
Okay, given that we merged into the new 2.0 ... you'd want to work moving it into the new 2.0, not their fork.
tekton
@tekton
Mar 11 2018 22:34
IN the process of splitting out the destruction armies I kind of want to leave everyone that doesn't have their own book in the same cat ><
OftKilted
@OftKilted
Mar 11 2018 22:36
@FreylisUK Why are you merging into @rweyrauch AoS-v2.0-rick rather than working from the AoS-v2.0?
Simon Barlow
@FreylisUK
Mar 11 2018 22:36
@OftKilted That's exactly what I did. I ran two instances of BS and copy-pasted into Rick's file, then tried to merge it back.
OftKilted
@OftKilted
Mar 11 2018 22:36
@tekton Insanity I tell you ... you're just Destroying things ...
Yes ... Why?
Why not work from the A0S-v2.0?
So ... rick would push his stuff into main, and you'd do the same thing ...
At the end of the day, I'm just not quite on the same page I suppose.
Simon Barlow
@FreylisUK
Mar 11 2018 22:39
I wasn't trying to push into Rick's branch; what I wanted was his latest so I could continue working on the DoK without a massive merge further down the line.
The issues with my pull request to AoS-v2.0 we're separate but I ended up getting stuck between two versions of the file I was working on.
I'll grab a clean Order.cat from AoS-v2.0 and re-add my KO changes again.
OftKilted
@OftKilted
Mar 11 2018 22:41
Okay, something to keep in mind.
You can have two copies open, and cut and paste between them.
Simon Barlow
@FreylisUK
Mar 11 2018 22:41
Yeah, that's what I did.
OftKilted
@OftKilted
Mar 11 2018 22:42
Okay, I'm going to discard your pull request?
Is that alright?
Simon Barlow
@FreylisUK
Mar 11 2018 22:43
Absolutely! I'll try again later this week. I just want to get my KO stuff into the main catalogue and move onto the DoK.
OftKilted
@OftKilted
Mar 11 2018 22:43
Pull from the current Order.cat, make your copy changes into that and then I'll get those merged.
Simon Barlow
@FreylisUK
Mar 11 2018 22:43
Yep, that's my plan.
OftKilted
@OftKilted
Mar 11 2018 22:43
Alternately, hold tight and we can look to the split out of factions.
Simon Barlow
@FreylisUK
Mar 11 2018 22:44
Let me give it a go later this week. I've not lost anything except time so my edits are still valid.
If you happen to get around to splitting out the cats in the meantime then I'll do that instead.
OftKilted
@OftKilted
Mar 11 2018 22:45
@Mad-Spy Is substantially more in-tune with the plan for the split-out. I'm still wrapping my head around the allies validation proposal for the split out ... and the cross-cat validation without categories in the GST
In other news ... the death.cat is basically done .. all the core moving parts have been input, it's pretty much just profile input. I think that all my core validation is set. (pre-split)
And beating my head against FEC.
Simon Barlow
@FreylisUK
Mar 11 2018 22:48
Grats!
tekton
@tekton
Mar 11 2018 22:53
i'm somewhat starting to understand why the warscroll builder just has an allies checkbox on all units, it is rather the easy way out
OftKilted
@OftKilted
Mar 11 2018 23:11
Yeah ....
There's an advantage to doing that actually.
Basically, it forces the users to do their own validation.
And if the RAW for the process doesn't match the RAI for the process ... then we basically just got it wrong.
Jon Kissinger
@alphalas
Mar 11 2018 23:53
@OftKilted @FreylisUK welcome to the hell that is XML merges
The data editor randomly rearranges stuff; so even if you think there are no more changes, there are