(WIP) Gunmod support for crossbows!

[NaturesWitness]

Adds a new mod category, crossbow. I think this is something people have wanted for a while, and as it turns out it wasn't nearly as hard as i thought it would be. Currently, only the laser sight is flagged as being compatible with crossbows, I used it for testing. I could use some guidance as to what gunmods should be flagged as crossbow-compatible, so please tell me what you think I should add!

Tested and works, I'll enable more gunmods for crossbows and see if anything breaks.

[NaturesWitness]

Just realized this doesn't differentiate between crossbows and regular bows, anyone know how to implement this?

[desrik]

New flag on crossbows?

Or perhaps check the ammo type? Arrows == Bow, Bolts == Crossbow

[NaturesWitness]

That's what I'm thinking, I'm just not certain how to implement it.

[desrik]

Yeah I see what you have to do now... You need another else if:

} else if (guntype->skill_used == Skill::skill("archery") && mod->used_on_crossbow && !guntype->ammo == "bolt") {
g->add_msg(_("That %s can only be attached to a crossbow."),
used->tname().c_str());
return;
}

This will prevent any mods from ever being installed on anything that uses arrows for ammo.

[NaturesWitness]

This doesn't seem to work, still lets me put a laser on a compound bow.

[desrik]

See my updated line comment? Sorry about that :)

Although a laser on a compund bow should be allowed :) I have seen them IRL.

[NaturesWitness]

Adding mods for regular bows was going to be my next PR, I just wanted to keep to categories separate. For example, I want underbarrel mods like bayonets and grenade launchers to work on crossbows, but not on regular bows. I guess these both really need to be sorted out at the same time, huh?

[desrik]

In that case you most likely would need to set up the mod categories first. New json field perhaps? "location": "underbarrel", "location": "scope", etc. Then in-code assign different weapon types a set of valid locations. When installing the mod check the mod location against the target weapon types valid mod locations.

[NaturesWitness]

I like the idea of having mods being based on location on the weapon as opposed to the current blanket fields, but I think something like that is beyond my coding ability. I wonder if I should make an issue request asking if someone could implement it? It would be a big improvement, not just for bows but for all guns.

For the moment, maybe I'll just change this to a more general "archery" mod category that covers both bows and crossbows. That could at least allow laser sight, improved iron sights and scopes for these. Either that, or maybe I can just stick a "IS_CROSSBOW" flag on all the crossbows in the .json, and have it look for it?

[desrik]

For now you could just check the id and if it's not one you want compatible then message the player and return. Crude but it will work until mod locations get implemented. Might actually take it on myself here in a bit. Need a break on the construction expansion anyways. Spent around an hour and a half last night coding a deconstruct menu only to find out I need to write a few new functions before it would work :P

[NaturesWitness]

Right now I'm trying to implement a "CROSSBOW" flag on items in the .json that the code can check for, but it doesn't seem to be working. Here's what I got so far;

} else if (guntype->skill_used == Skill::skill("archery") && !mod->used_on_crossbow) && !gun->item_tags.count("CROSSBOW") {
g->add_msg(_("That %s cannot be attached to a crossbow."),
used->tname().c_str());
return;

What am I missing here? This is the error I'm getting;

C:\Documents and Settings\Mason\My Documents\GitHub\Cataclysm-DDA\src\player.cpp||In member function 'void player::use(int)':|
C:\Documents and Settings\Mason\My Documents\GitHub\Cataclysm-DDA\src\player.cpp|8303|error: expected identifier before '!' token|
C:\Documents and Settings\Mason\My Documents\GitHub\Cataclysm-DDA\src\player.cpp|8303|error: expected ';' before '!' token|
||=== Build finished: 2 errors, 0 warnings (0 minutes, 6 seconds) ===|

[desrik]

Try: !gun->has_flag("CROSSBOW")

[desrik]

Ah :) Your right @Rivet-the-Zombie. Also seems to be a double left parenthesis. g->add_msg(("That

Oh and @NaturesWitness, here is what I came up with for mod locations:

ammo
auxiliary
barrel
bore
grip
mechanism
side
sights
stock
tip

[Rivet-the-Zombie]

Yeah looks to be simple separator errors.

[Rivet-the-Zombie]

Rivet's pedantic nitpick of the day:

axillary - Of or relating to the armpit.

auxiliary - Available to provide extra help, power, etc., when it is needed.

Sorry, that was too funny for me to resist.

[desrik]

Lol. That's the Firefox auto-spellcheck for you :P

[NaturesWitness]

Thanks to desrik's awesome work, this PR is no longer necessary, so I'm closing it.

[kevingranade]

I don't think there is one right now, but we've been planning on moving
xbows to use the rifle skill instead of archery, which would provide he
differentiation you want.