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

ApocPrice added #33445

Merged
merged 57 commits into from
Sep 10, 2019
Merged

ApocPrice added #33445

merged 57 commits into from
Sep 10, 2019

Conversation

Maleclypse
Copy link
Member

@Maleclypse Maleclypse commented Aug 21, 2019

Adds "price_postapoc" to all ammo types, used existing price as price_postapoc" guesstimated pre cataclysm price with current prices and inflation and sensibility. Example rounded 9mm to $1 rather than put in 18 cents. If someone wants to make use of these feel free to edit prices. This was more about building infrastructure.

Summary :

Summary: Infrastructure "Added post-apocalyptic prices to all ammo types."

Purpose of change

This was on the list of first time contributors to help with.

Describe the solution

I added price_postapoc to all ammo items with an extant price.

Describe alternatives you've considered

Not helping.

Adds "price_postapoc" to all ammo types, used existing price as price_postapoc" guesstimated pre cataclysm price with current prices and inflation and sensibility.  Example rounded 9mm to $1 rather than put in 18 cents. If someone wants to make use of these feel free to edit prices. This was more about building infrastructure.
@Maleclypse
Copy link
Member Author

Should I be concerned about the failed checks? I used a build from last night, and I made minimally invasive changes as a first time editor.

Co-Authored-By: Kevin Granade <kevin.granade@gmail.com>
@kevingranade
Copy link
Member

Looks like a bunch of other instances of the same issue, make sure there are spaces after colons.

@Maleclypse
Copy link
Member Author

Maleclypse commented Aug 22, 2019

Looks like a bunch of other instances of the same issue, make sure there are spaces after colons.

I went through every line and I believe I've caught all the missed spaces after colons. Thank you! I also caught an additional ammo type that I'd missed adding price_postapoc to.

@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves labels Aug 22, 2019
Maleclypse and others added 4 commits September 8, 2019 14:55
Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
Co-Authored-By: ZhilkinSerg <ZhilkinSerg@users.noreply.github.com>
@@ -1,45 +0,0 @@
[
Copy link
Contributor

Choose a reason for hiding this comment

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

Was this file deleted accidentally?

Copy link
Member Author

Choose a reason for hiding this comment

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

I spoke to people on the discord about the problem that someone else had modified 300BLK extensively right around same time as I was adding apoc_price to all the ammo jsons. They suggested that since it was my first time contributing that I delete 300BLK from my PR request so my changes don't go conflict with the already mainlined changes and then I can come back and add apoc price specifically to that one file. I'm worried that I made my PR say it should delete 300BLK file entirely from mainstream. Please let me know which one I've done and if I can fix it?

Copy link
Contributor

Choose a reason for hiding this comment

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

I see. Yes, I guess there was some kind of miscommunication and by "deleting file X from pr" these people suggested "not doing changes in file X". I will restore the file.

Copy link
Contributor

Choose a reason for hiding this comment

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

Just check whether prices are okay in this file now and we are good to go.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok I resolved the multiple price issue. Thank you!

@ZhilkinSerg ZhilkinSerg merged commit 27ebd38 into CleverRaven:master Sep 10, 2019
misterprimus pushed a commit to misterprimus/Cataclysm-DDA that referenced this pull request Sep 21, 2019
* ApocPrice added

Adds "price_postapoc" to all ammo types, used existing price as price_postapoc" guesstimated pre cataclysm price with current prices and inflation and sensibility.  Example rounded 9mm to $1 rather than put in 18 cents. If someone wants to make use of these feel free to edit prices. This was more about building infrastructure.
@Maleclypse Maleclypse deleted the ApocPriceAmmo branch January 21, 2020 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants