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

Cleanup ammo effects #68069

Merged
merged 5 commits into from
Sep 10, 2023
Merged

Cleanup ammo effects #68069

merged 5 commits into from
Sep 10, 2023

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Sep 9, 2023

Summary

None

Purpose of change

Found MININUKE_MOD and STREAM_GAS_INSCENTICIDAL are not used anywhere, jumped in a hole with it
partially adress #67783

Describe the solution

  • Removed MININUKE_MOD and STREAM_GAS_INSCENTICIDAL as having lack of usage
  • Removed DRAW_LASER_BEAM and redirect all it's use cases into LASER, since they do exactly same thing (spawn fd_laser of intensity 2)
  • Replaced ammo effect magic with MAGIC to save consistency between another ammo effects
  • Updated Ammo Effects information in json_info.md to describe all fields that exist in ammo effects
  • Cut all information about ammo effects from json_flags.md, including hardcoded, and moved it to ammo_effects.json, created json definition for all hardcoded ammo effects, and added comment to describe their effect here

Testing

The game opens, hardcoded ammo effects still carry their abilities

Additional context

What is wrong with RECOVER_ effect scale? even recover 2 grant 50% recoverability, and after 10 it's just beyond 90%, at the level of margin. Why not make it flat percent instead?

Like really

image

@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` [Markdown] Markdown issues and PRs Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Aftershock Anything to do with the Aftershock mod Mods: Xedra Evolved Anything to do with Xedra Evolved labels Sep 9, 2023
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Sep 9, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 9, 2023
@Maleclypse Maleclypse merged commit 4cb4c92 into CleverRaven:master Sep 10, 2023
19 of 25 checks passed
@GuardianDll GuardianDll deleted the ammo_effects branch September 10, 2023 09:53
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 [C++] Changes (can be) made in C++. Previously named `Code` <Documentation> Design documents, internal info, guides and help. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions [Markdown] Markdown issues and PRs Mods: Aftershock Anything to do with the Aftershock mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants