Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upChanges to .22, 9x19mm, 5.56 NATO and 7.62 NATO - V2 #12831
Conversation
added some commits
Jul 3, 2015
ghost
referenced this pull request
Jul 3, 2015
Closed
Changes to .22, 9x19mm, 5.56 NATO and 7.62 NATO #12827
This comment has been minimized.
This comment has been minimized.
|
You still have a bunch of unrelated changes bundled in here, look at the "files changed" tab. |
added some commits
Jul 3, 2015
This comment has been minimized.
This comment has been minimized.
|
All instances of 9mmjhp have been changed back to 9mmfmj. What do you mean by unrelated changes? |
tvm1
reviewed
Jul 4, 2015
| @@ -1775,6 +1782,7 @@ | |||
| ["celery", 5], | |||
| ["wheat", 3], | |||
| ["onion", 3], | |||
| ["garlic", 3], | |||
This comment has been minimized.
This comment has been minimized.
tvm1
reviewed
Jul 4, 2015
| @@ -8758,6 +8854,7 @@ | |||
| "id" : "loincloth", | |||
| "items":[ | |||
| ["loincloth", 2], | |||
| ["loincloth_wool", 1], | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
I'll fix that. |
added some commits
Jul 4, 2015
This comment has been minimized.
This comment has been minimized.
|
This is ready to go now. Further changes will go much smoother. |
BevapDin
reviewed
Jul 5, 2015
| @@ -803,11 +803,11 @@ | |||
| { "type" : "AMMO", | |||
| "id" : "9mmP2", | |||
| "price" : 2700, "//" : "Same price as +P, but half the amount.", | |||
| "name" : "9mm +P+", | |||
| "name" : "9x19mm +P+", | |||
| "name_plural" : "9mm +P+", | |||
This comment has been minimized.
This comment has been minimized.
BevapDin
Jul 5, 2015
Contributor
Plural is still only "9mm +P+" without the "x19" - intended?
Edit: and the ammo type is is still named "9mm" without the "x19", wasn't this about consistent naming?
This comment has been minimized.
This comment has been minimized.
|
The lack of plural name changes was an oversight. The IDs are unchanged to prevent breaking save compatibility and to keep them short. |
This comment has been minimized.
This comment has been minimized.
|
Minor note: Oxford comma is now standard, as is 2 spaces after a period. That's all! (proxy for Rivet, I'm possessed, send help) |
added some commits
Jul 5, 2015
This comment has been minimized.
This comment has been minimized.
|
Serial commas and double spaces added. Restored inadvertently reverted changes to 556 and 762. |
This comment has been minimized.
This comment has been minimized.
|
Righteous. :-) Thanks bud. |
This comment has been minimized.
This comment has been minimized.
|
Scheisse. Why do I gave the feeling that this is what hindered merging the 5.45x39mm mainlining? It would've gone in literally overnight if I hadn't missed a load error that had been present in Icecoon's mod for a while. :V |
ghost commentedJul 3, 2015
Context: http://smf.cataclysmdda.com/index.php?topic=10693.0
Changes:
9x19mm FMJ replaced with 9x19mm JHP
Changed damage for .22LR, all 9x19mm rounds, 5.56 NATO and 7.62 NATO to √Ek
New names and descriptions for .22LR, 9x19mm, 5.56 NATO and 7.62 NATO
Recoil is currently unchanged because I have not yet worked out a consistent way to calculate it.
9mmjhp and 556 have minor arbitrary increases in damage to account for terminal ballistics.
I have made a second PR to make further work easier to keep track of.