Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix riot turret oversights #36437

Merged
merged 3 commits into from
Dec 26, 2019
Merged

Fix riot turret oversights #36437

merged 3 commits into from
Dec 26, 2019

Conversation

ymber
Copy link
Member

@ymber ymber commented Dec 25, 2019

Summary

SUMMARY: Bugfixes "Fix inconsistencies in riot turrets"

Purpose of change

Riot turrets were introduced with a new 40x46mm item that duplicated M1006. The turret itself was explicitly SWORDS derived but did not behave as such and the description for the M203 array was inconsistent with behavior.

Describe the solution

Use M1006 where appropriate, remove duplicate item, adjust numbers and descriptions for riot turrets. Remove unused mon_chickenbot and mon_tankbot definitions in map_extras.cpp.

Testing

Game loads correctly. Riot turret behaves as expected.

Additional context

It should be possible to define the starting ammo item for a monster in mapgen when it's placed. There's also no reason this thing couldn't be loaded with any 40x46mm ammo. We should have infrastructure to support these.

@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Monsters Monsters both friendly and unfriendly. labels Dec 26, 2019
@ZhilkinSerg ZhilkinSerg merged commit 76ecb0e into CleverRaven:master Dec 26, 2019
@ymber ymber deleted the riot_turret branch December 26, 2019 07:46
@thethunderhawk
Copy link

Huh, I guess I always envisioned these things with an internal magazine and autoloader. 6 rounds seems like not enough. But hey, realistic, I like that!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Monsters Monsters both friendly and unfriendly.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants