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

Cooldown fix and minor changes #74139

Merged
merged 2 commits into from
Jun 1, 2024
Merged

Conversation

Ramza13
Copy link
Contributor

@Ramza13 Ramza13 commented May 27, 2024

Summary

None

Purpose of change

Fix #73587
Removed attack_chance member which did nothing.
Changed gun special attacks to not consume moves if the creature is out of ammo.

Describe the solution

Describe alternatives you've considered

Adding a flag to monster attacks to make them still able to waste time when out of ammo. For ferals and whatnot it doesn't make sense for them to just sit there not throwing a rock but maybe turrets should? I don't think it matters enough though.

Testing

Used line "cooldown": { "global_val": "test", "default": 3 }, in feral throw attack.

Additional context

@github-actions github-actions bot requested a review from Maleclypse May 27, 2024 20:08
@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. [Markdown] Markdown issues and PRs Mods: Xedra Evolved Anything to do with Xedra Evolved <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels May 27, 2024
@Maleclypse
Copy link
Member

Can this line be removed then? bool strict = src == "dda"; it's blocking this from passing.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 31, 2024
@dseguin dseguin merged commit b77c0c5 into CleverRaven:master Jun 1, 2024
23 of 27 checks passed
@Ramza13 Ramza13 deleted the special-vars branch June 28, 2024 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` <Documentation> Design documents, internal info, guides and help. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Monster special attack cooldowns should be allowed to use math
3 participants