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.

Sign up for GitHub

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

Jump to bottom

Use damage objects for gun/ammo damage #38882

Merged
merged 1 commit into from
Apr 11, 2020
Merged

Use damage objects for gun/ammo damage #38882

merged 1 commit into from
Apr 11, 2020

Conversation

anothersimulacrum
Copy link
Member

@anothersimulacrum anothersimulacrum commented Mar 18, 2020 •
edited
Loading

Summary

SUMMARY: None

Purpose of change

JSON changes following #37329
Work towards #36110

Describe the solution

Use damage objects for all main game data.

Describe alternatives you've considered

Doing mods too

Testing

This will fail until #37329 is merged
Other than that, game loads without errors, and comparison of weapons and ammo before and after this change shows the same thing.

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves labels Mar 18, 2020
SirPendrak
SirPendrak reviewed Mar 19, 2020
View reviewed changes
Copy link
Contributor

@SirPendrak SirPendrak left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just some casual eyeballing over the code. What about changing rocks and pebbles damage type to bashing? It may seem logical but idk if it wont break anything.
Also, before this change, was every type of ranged damage considered piercing? So armor was only 0.8 times effecitve right? and now armor will remain as effective as it was right? ; p

data/json/items/ammo.json Outdated
@@ -425,8 +424,7 @@
"volume": "250 ml",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to this PR, but shouldnt the descrieption be saying 66mm high-explosive anti tank round?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, probably.

@anothersimulacrum anothersimulacrum force-pushed the dmg-objs branch 2 times, most recently from 8f17b30 to 79828b0 Compare March 19, 2020 18:00
@anothersimulacrum
Copy link
Member Author

What about changing rocks and pebbles damage type to bashing?

It would probably make sense, but I don't think I'm going to make any actual changes in this PR, (everything will load into the game the same). I'll look at that in a future PR.

Also, before this change, was every type of ranged damage considered piercing? So armor was only 0.8 times effecitve right? and now armor will remain as effective as it was right? ; p

Yes, before everything was loaded as "stab" (piercing), and now it still is.

@anothersimulacrum anothersimulacrum mentioned this pull request Mar 20, 2020
Merged
@anothersimulacrum anothersimulacrum force-pushed the dmg-objs branch 2 times, most recently from c334ff7 to 428816e Compare April 4, 2020 04:16
@anothersimulacrum anothersimulacrum force-pushed the dmg-objs branch 2 times, most recently from 693b544 to 4aa6021 Compare April 9, 2020 17:33
@anothersimulacrum
Use damage objects for gun/ammo damage
5796bc0 
Damage objects provide a concise, consistent and clear way to specify
what already can be specified for guns and ammo, but with one member
instead of the multiple members that exist now.

As such, use these damage objects, and instead of different members for
damage, pierce, and prop_damage.
@kevingranade kevingranade merged commit 6789f45 into CleverRaven:master Apr 11, 2020
@anothersimulacrum anothersimulacrum deleted the dmg-objs branch April 11, 2020 04:21
@weekly-digest weekly-digest bot mentioned this pull request Apr 12, 2020
Closed
@ZhilkinSerg ZhilkinSerg mentioned this pull request Apr 13, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SirPendrak SirPendrak SirPendrak left review comments

Assignees
No one assigned
Labels
Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@anothersimulacrum @SirPendrak @kevingranade @ZhilkinSerg