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

Fix stacks of ammo giving one round of components #37494

Closed
wants to merge 47 commits into from
Closed

Fix stacks of ammo giving one round of components #37494

Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d2523eb
Merge pull request #3 from CleverRaven/master
Rogal-Dorn Jan 29, 2020
95e06d8
Update 10mm.json
Rogal-Dorn Jan 29, 2020
87605b8
Update 22.json
Rogal-Dorn Jan 29, 2020
ae51c92
Update 223.json
Rogal-Dorn Jan 29, 2020
1a237d5
Update 270win.json
Rogal-Dorn Jan 29, 2020
25edd06
Update 30-06.json
Rogal-Dorn Jan 29, 2020
ea0b698
Update 300.json
Rogal-Dorn Jan 29, 2020
034defa
Update 300blk.json
Rogal-Dorn Jan 29, 2020
e4c9f5a
Update 308.json
Rogal-Dorn Jan 29, 2020
170034d
Update 32.json
Rogal-Dorn Jan 29, 2020
f323b25
Update 357mag.json
Rogal-Dorn Jan 29, 2020
f89c8d0
Update 357sig.json
Rogal-Dorn Jan 29, 2020
0bc2cda
Update 38.json
Rogal-Dorn Jan 29, 2020
a93eb64
Update 380.json
Rogal-Dorn Jan 29, 2020
e399039
Update 38super.json
Rogal-Dorn Jan 29, 2020
8a9a30f
Update 40.json
Rogal-Dorn Jan 29, 2020
a6133da
Update 410shot.json
Rogal-Dorn Jan 29, 2020
dd07d23
Update 44.json
Rogal-Dorn Jan 29, 2020
39cba68
Update 45.json
Rogal-Dorn Jan 29, 2020
72fbd48
Update 454.json
Rogal-Dorn Jan 29, 2020
e220e74
Update 4570.json
Rogal-Dorn Jan 29, 2020
822ec7e
Update 45colt.json
Rogal-Dorn Jan 29, 2020
467161c
Update 460.json
Rogal-Dorn Jan 29, 2020
ef439c3
Update 46mm.json
Rogal-Dorn Jan 29, 2020
713cd03
Update 500.json
Rogal-Dorn Jan 29, 2020
ca22701
Update 50bmg.json
Rogal-Dorn Jan 29, 2020
e2c7382
Update 545.json
Rogal-Dorn Jan 29, 2020
f3cad69
Update 556.json
Rogal-Dorn Jan 29, 2020
c75de62
Update 57mm.json
Rogal-Dorn Jan 29, 2020
6fe042c
Update 5x50.json
Rogal-Dorn Jan 29, 2020
dd441d8
Update 700nx.json
Rogal-Dorn Jan 29, 2020
676f9dd
Update 762x25.json
Rogal-Dorn Jan 29, 2020
c6df76c
Update 762x39.json
Rogal-Dorn Jan 29, 2020
334bd52
Update 762x51.json
Rogal-Dorn Jan 29, 2020
9bc7486
Update 762x54.json
Rogal-Dorn Jan 29, 2020
578d89d
Update 9mm.json
Rogal-Dorn Jan 29, 2020
098bf94
Update 9x18mm.json
Rogal-Dorn Jan 29, 2020
8a64d4a
Update shot.json
Rogal-Dorn Jan 29, 2020
f8a6010
Update 762x25.json
Rogal-Dorn Jan 29, 2020
0a81b67
Update 9mm.json
Rogal-Dorn Jan 29, 2020
3b09ffe
Update 380.json
Rogal-Dorn Jan 29, 2020
a55f11c
Update 38super.json
Rogal-Dorn Jan 29, 2020
1c6544c
Update 5x50.json
Rogal-Dorn Jan 29, 2020
f66edf5
Update 5x50.json
Rogal-Dorn Jan 29, 2020
fb145fc
Update 5x50.json
Rogal-Dorn Jan 29, 2020
e73f4e8
Update 357sig.json
Rogal-Dorn Jan 29, 2020
95fc106
Update 357mag.json
Rogal-Dorn Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/uncraft/ammo/10mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "10mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ],
"components": [ [ [ "lead", 80 ] ], [ [ "10mm_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_magnum_pistol", 200 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
8 changes: 4 additions & 4 deletions data/json/uncraft/ammo/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"difficulty": 5,
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 1 ] ] ],
"components": [ [ [ "lead", 300 ] ], [ [ "22_casing_new", 150 ] ], [ [ "gunpowder_pistol", 150 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
Expand All @@ -16,7 +16,7 @@
"difficulty": 5,
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ],
"components": [ [ [ "lead", 200 ] ], [ [ "22_casing_new", 100 ] ], [ [ "gunpowder_pistol", 200 ] ], [ [ "copper", 100 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
Expand All @@ -26,7 +26,7 @@
"difficulty": 5,
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ],
"components": [ [ [ "lead", 200 ] ], [ [ "22_casing_new", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
Expand All @@ -36,7 +36,7 @@
"difficulty": 5,
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ],
"components": [ [ [ "lead", 200 ] ], [ [ "22_casing_new", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
10 changes: 5 additions & 5 deletions data/json/uncraft/ammo/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 3 ] ],
[ [ "223_casing", 1 ] ],
[ [ "smrifle_primer", 1 ] ],
[ [ "gunpowder_rifle", 4 ] ],
[ [ "copper", 2 ] ]
[ [ "lead", 141 ] ],
[ [ "223_casing", 47 ] ],
[ [ "smrifle_primer", 47 ] ],
[ [ "gunpowder_rifle", 188 ] ],
[ [ "copper", 94 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
Expand Down
8 changes: 4 additions & 4 deletions data/json/uncraft/ammo/270win.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 5 ] ],
[ [ "270win_casing", 1 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "gunpowder_large_rifle", 10 ] ],
[ [ "lead", 100 ] ],
[ [ "270win_casing", 20 ] ],
[ [ "lgrifle_primer", 20 ] ],
[ [ "gunpowder_large_rifle", 200 ] ],
[ [ "copper", 3 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
Expand Down
30 changes: 15 additions & 15 deletions data/json/uncraft/ammo/30-06.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 6 ] ],
[ [ "3006_casing", 1 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "gunpowder_large_rifle", 8 ] ],
[ [ "copper", 6 ] ]
[ [ "lead", 120 ] ],
[ [ "3006_casing", 20 ] ],
[ [ "lgrifle_primer", 20 ] ],
[ [ "gunpowder_large_rifle", 160 ] ],
[ [ "copper", 120 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
Expand All @@ -23,11 +23,11 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "incendiary", 6 ] ],
[ [ "3006_casing", 1 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "gunpowder_large_rifle", 8 ] ],
[ [ "copper", 6 ] ]
[ [ "incendiary", 120 ] ],
[ [ "3006_casing", 20 ] ],
[ [ "lgrifle_primer", 20 ] ],
[ [ "gunpowder_large_rifle", 160 ] ],
[ [ "copper", 120 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
Expand All @@ -39,11 +39,11 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 6 ] ],
[ [ "3006_casing", 1 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "gunpowder_large_rifle", 8 ] ],
[ [ "copper", 6 ] ]
[ [ "lead", 120 ] ],
[ [ "3006_casing", 20 ] ],
[ [ "lgrifle_primer", 20 ] ],
[ [ "gunpowder_large_rifle", 160 ] ],
[ [ "copper", 120 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
Expand Down
10 changes: 5 additions & 5 deletions data/json/uncraft/ammo/300.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 8 ] ],
[ [ "300_casing", 1 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "gunpowder_large_rifle", 16 ] ],
[ [ "copper", 21 ] ]
[ [ "lead", 120 ] ],
[ [ "300_casing", 15 ] ],
[ [ "lgrifle_primer", 15 ] ],
[ [ "gunpowder_large_rifle", 240 ] ],
[ [ "copper", 315 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
Expand Down
20 changes: 10 additions & 10 deletions data/json/uncraft/ammo/300blk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 5 ] ],
[ [ "300blk_casing", 1 ] ],
[ [ "smrifle_primer", 1 ] ],
[ [ "gunpowder_rifle", 4 ] ],
[ [ "copper", 2 ] ]
[ [ "lead", 235 ] ],
[ [ "300blk_casing", 47 ] ],
[ [ "smrifle_primer", 147 ] ],
[ [ "gunpowder_rifle", 188 ] ],
[ [ "copper", 94 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
Expand All @@ -23,11 +23,11 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 5 ] ],
[ [ "300blk_casing", 1 ] ],
[ [ "smrifle_primer", 1 ] ],
[ [ "gunpowder", 3 ] ],
[ [ "copper", 2 ] ]
[ [ "lead", 235 ] ],
[ [ "300blk_casing", 47 ] ],
[ [ "smrifle_primer", 47 ] ],
[ [ "gunpowder", 141 ] ],
[ [ "copper", 94 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
Expand Down
10 changes: 5 additions & 5 deletions data/json/uncraft/ammo/308.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 6 ] ],
[ [ "308_casing", 1 ] ],
[ [ "lgrifle_primer", 1 ] ],
[ [ "gunpowder_large_rifle", 10 ] ],
[ [ "copper", 6 ] ]
[ [ "lead", 120 ] ],
[ [ "308_casing", 20 ] ],
[ [ "lgrifle_primer", 20 ] ],
[ [ "gunpowder_large_rifle", 200 ] ],
[ [ "copper", 120 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/uncraft/ammo/32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"difficulty": 5,
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ],
"components": [ [ [ "lead", 160 ] ], [ [ "32_casing", 80 ] ], [ [ "smpistol_primer", 80 ] ], [ [ "gunpowder_pistol", 160 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
4 changes: 2 additions & 2 deletions data/json/uncraft/ammo/357mag.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ],
"components": [ [ [ "lead", 100 ] ], [ [ "357mag_casing", 50 ] ], [ [ "lgpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 250 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "357mag_jhp",
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ],
"components": [ [ [ "lead", 100 ] ], [ [ "357mag_casing", 50 ] ], [ [ "lgpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 250 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
4 changes: 2 additions & 2 deletions data/json/uncraft/ammo/357sig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 2 ] ] ],
"components": [ [ [ "lead", 100 ] ], [ [ "357sig_casing", 50 ] ], [ [ "smpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 100 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "357sig_jhp",
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 2 ] ] ],
"components": [ [ [ "lead", 100 ] ], [ [ "357sig_casing", 50 ] ], [ [ "smpistol_primer", 50 ] ], [ [ "gunpowder_magnum_pistol", 100 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
6 changes: 3 additions & 3 deletions data/json/uncraft/ammo/38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ],
"components": [ [ [ "lead", 80 ] ], [ [ "38_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 80 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "38_special",
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ],
"components": [ [ [ "lead", 80 ] ], [ [ "38_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 80 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "38_super",
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 3 ] ] ],
"components": [ [ [ "lead", 80 ] ], [ [ "38_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 120 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
12 changes: 6 additions & 6 deletions data/json/uncraft/ammo/380.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
"result": "380_JHP",
"copy-from": "ammo_cartridge",
"type": "uncraft",
"using": [ [ "ammo_380", 1 ] ],
"using": [ [ "ammo_380", 50 ] ],
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ]
"components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ]
},
{
"result": "380_FMJ",
"copy-from": "ammo_cartridge",
"type": "uncraft",
"using": [ [ "ammo_380", 1 ] ],
"using": [ [ "ammo_380", 50 ] ],
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ]
"components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 150 ] ] ]
},
{
"result": "380_p",
"copy-from": "ammo_cartridge",
"type": "uncraft",
"using": [ [ "ammo_380", 1 ] ],
"using": [ [ "ammo_380", 50 ] ],
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 4 ] ] ]
"components": [ [ [ "lead", 100 ] ], [ [ "gunpowder_pistol", 200 ] ] ]
}
]
2 changes: 1 addition & 1 deletion data/json/uncraft/ammo/38super.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"difficulty": 5,
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 3 ] ] ],
"components": [ [ [ "lead", 80 ] ], [ [ "38super_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_magnum_pistol", 120 ] ] ],
Copy link
Contributor

Choose a reason for hiding this comment

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

Here it's just expecting you to put it through the linter because the line has become too long with the numbers increasing. It's expecting

[
  {
    "result": "38super_fmj",
    "type": "uncraft",
    "skill_used": "gun",
    "difficulty": 5,
    "time": "5 s",
    "qualities": [ { "id": "PULL", "level": 1 } ],
    "components": [
      [ [ "lead", 80 ] ],
      [ [ "38super_casing", 40 ] ],
      [ [ "smpistol_primer", 40 ] ],
      [ [ "gunpowder_magnum_pistol", 120 ] ]
    ],
    "flags": [ "UNCRAFT_SINGLE_CHARGE" ]
  }
]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for letting me know! I used your correction there and I'll make sure to follow any further errors when I wake up.

"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
4 changes: 2 additions & 2 deletions data/json/uncraft/ammo/40.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ],
"components": [ [ [ "lead", 40 ] ], [ [ "40_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 160 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "40sw",
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ],
"components": [ [ [ "lead", 80 ] ], [ [ "40_casing", 40 ] ], [ [ "smpistol_primer", 40 ] ], [ [ "gunpowder_pistol", 160 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
2 changes: 1 addition & 1 deletion data/json/uncraft/ammo/410shot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"difficulty": 5,
"time": "1 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "410shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_pistol", 5 ] ], [ [ "lead", 5 ] ] ],
"components": [ [ [ "410shot_hull", 20 ] ], [ [ "shotgun_primer", 20 ] ], [ [ "gunpowder_pistol", 100 ] ], [ [ "lead", 100 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
10 changes: 5 additions & 5 deletions data/json/uncraft/ammo/44.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [
[ [ "lead", 7 ] ],
[ [ "44_casing", 1 ] ],
[ [ "lgpistol_primer", 1 ] ],
[ [ "gunpowder_magnum_pistol", 10 ] ],
[ [ "lead", 140 ] ],
[ [ "44_casing", 20 ] ],
[ [ "lgpistol_primer", 20 ] ],
[ [ "gunpowder_magnum_pistol", 200 ] ],
[ [ "copper", 7 ] ]
],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
Expand All @@ -22,7 +22,7 @@
"difficulty": 5,
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 10 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 10 ] ] ],
"components": [ [ [ "lead", 200 ] ], [ [ "44_casing", 20 ] ], [ [ "lgpistol_primer", 20 ] ], [ [ "gunpowder_magnum_pistol", 200 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
6 changes: 3 additions & 3 deletions data/json/uncraft/ammo/45.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ],
"components": [ [ [ "lead", 90 ] ], [ [ "45_casing", 30 ] ], [ [ "lgpistol_primer", 30 ] ], [ [ "gunpowder_pistol", 120 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "45_jhp",
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ],
"components": [ [ [ "lead", 90 ] ], [ [ "45_casing", 30 ] ], [ [ "lgpistol_primer", 30 ] ], [ [ "gunpowder_pistol", 120 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
},
{
"result": "45_super",
"type": "uncraft",
"time": "5 s",
"qualities": [ { "id": "PULL", "level": 1 } ],
"components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ],
"components": [ [ [ "lead", 90 ] ], [ [ "45_casing", 30 ] ], [ [ "lgpistol_primer", 30 ] ], [ [ "gunpowder_magnum_pistol", 150 ] ] ],
"flags": [ "UNCRAFT_SINGLE_CHARGE" ]
}
]
Loading