Add magazines to many guns [RDY]

[mugling]

@Rivet-the-Zombie, as discussed in #15007 here is a PR combining #14995, #15002, #15003, #15009 with all of the merge conflicts resolved. To keep the size down I've left #15007 out for now as the 8x40 ammo type isn't used in bore conversions so no need to specify alternatives.

No new content is added but some item id's are changed to be consistent and accordingly there is a small patch (3a1ec1d) for the mshock tileset at the end.

@chaosvolt a lot of the specified alternatives in #15002 are omitted because they will never be used due to a lack of bore conversions. Eg. there is no bore conversion changing 9mm in to 9x18. Such a gunmod should probably exist to offset the intentional rarity of magazines for such weapons. We probably need to increase the penalties for bore mods also as they are now much more useful for situations where you haven't yet collected enough magazines of a type.

[kevingranade]

Swapping how it's defined later is fine, just wanted to raise the issue.

[mugling]

Ok so I think that's all the outstanding problems

[Malkeus]

Glurk!? A lot of red, but it doesn't seem to have had any ill effects.
https://i.imgur.com/WchvES0.png

[chaosvolt]

Ohgodwhat. ;w;

[Malkeus]

Am I the only one getting a wall of red when entering a game ? The save is
only a month old.
On Jan 31, 2016 12:40 PM, "Chaosvolt" notifications@github.com wrote:

Ohgodwhat. ;w;

—
Reply to this email directly or view it on GitHub
#15072 (comment)
.

[mugling]

Can't reproduce. Does it affect new games or just old saves?

[chaosvolt]

Yeah, start up a new game to test whether it isn't just a save compatibility issue, which I assumed could happen.

[mugling]

Although I did test for that and I presume so did others? Can you try building master and checking against that?

[Rivet-the-Zombie]

I can't reproduce this one. Maybe it's mod related?

[chaosvolt]

Hmm. I'll grab the latest build in a bit and transfer Snips over to it. I'd already previously had fun with it because I'd used the original build it was from to test my initial magazine PR, which led to a brief error after I later transferred to a fresh build that no longer had Sten magazines. XP

[Malkeus]

You're right @Rivet-the-Zombie , it appears to be a conflict with the Guns/Equipment/Weapons Expansion Mode. That and artyom's need to be updated to the new magazine system anyway, I'll remove them for now. I thought item-groups worked in an additive fashion though, ie. anytime a mod had a matching item_group id the data would be appended to the core game version. Is that wrong?

[chaosvolt]

Ah, odd. And itemgroups should be additive, yeah. If it was override-based like monstergroups are, a LOT of mods would be royally fucked. :V

[Malkeus]

Maybe it's the modified guns that are doing it. Either way, they are gone til they get straightened out. I hope my laser sniper rifle isn't from one of those...

Starting a new unmodded world gives no errors, so everything is cool on your end @mugling.

[Malkeus]

Oi, so many debug messages about missing items :(

[chaosvolt]

It must've been the mods, as transferred a save over without issue.

[Malkeus]

Agreed. I haven't gone digging to confirm, but I believe one or both of
those mods alters core game guns to give them magazines. This PR alters the
same files for the same reason, then the mod overrides it, leading to the
error. They will need to be updated. I did find a nifty bug with gunmods
requiring an unloaded weapon and ups powered weapons that can't be unloaded
after removing the mods from my save.
On Jan 31, 2016 2:42 PM, "Chaosvolt" notifications@github.com wrote:

It must've been the mods, as transferred a save over without issue.

—
Reply to this email directly or view it on GitHub
#15072 (comment)
.

[chaosvolt]

Hmm. Definitely peculiar. o.o

[kevingranade]

I suspect the mid is re-instituting the old version of the gun, which means it doesn't reference the magazines.

[chaosvolt]

I think that was what Malkeus already suspected as well, that must be it.

[mugling]

I don't have a forum account but it might be worth a post to the Latest experimental features thread stating that support for magazines is in mainline and which mods are currently incompatible.

[chaosvolt]

Doh. In addition likely mention it in the threads for those mods, though by now others might have.

[Malkeus]

I already dropped a post into both about this bug, I don't think I
mentioned the new magazine code specifically though. When they investigate
the bug it should become apparent...
On Jan 31, 2016 6:36 PM, "Chaosvolt" notifications@github.com wrote:

Doh. In addition likely mention it in the threads for those mods, though
by now others might have.

—
Reply to this email directly or view it on GitHub
#15072 (comment)
.

[chaosvolt]

Ah, hopefully.