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

Big bore air rifles #33106

Closed
Closed
Changes from 86 commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
7f0a765
Update military.json
misterprimus Jul 22, 2019
d4177f1
Update defense_bot.json
misterprimus Jul 22, 2019
3a6056b
Update generic.json
misterprimus Jul 22, 2019
1cfc92d
Update recipe_deconstruction.json
misterprimus Jul 22, 2019
d0f2f4c
Update monstergenerator.cpp
misterprimus Jul 22, 2019
7a8eaf8
Update mtype.h
misterprimus Jul 22, 2019
41f440c
Update mondeath.cpp
misterprimus Jul 22, 2019
e9e1e0a
Update data/json/items/generic.json
misterprimus Jul 22, 2019
7eda425
Update data/json/items/generic.json
misterprimus Jul 22, 2019
a534c77
Update data/json/items/generic.json
misterprimus Jul 22, 2019
064e51f
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
5241ab4
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
9948d17
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
0d489e5
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
15a9982
Update src/mondeath.cpp
misterprimus Jul 22, 2019
d399b1b
Update src/monstergenerator.cpp
misterprimus Jul 22, 2019
80c4ed5
Update src/mondeath.cpp
misterprimus Jul 22, 2019
d94706d
Update data/json/items/generic.json
misterprimus Jul 22, 2019
40b643c
Update data/json/items/generic.json
misterprimus Jul 22, 2019
0667e0f
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
a5e2f3a
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
4607c7c
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
7eb7655
Update src/mtype.h
misterprimus Jul 22, 2019
b35930f
Update src/mondeath.cpp
misterprimus Jul 22, 2019
db94001
Update data/json/items/generic.json
misterprimus Jul 22, 2019
76d4ff1
Update data/json/items/generic.json
misterprimus Jul 22, 2019
4d8d6e8
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
f39a0cf
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
0548b3c
Update src/mondeath.cpp
misterprimus Jul 22, 2019
831dde5
Update src/mondeath.cpp
misterprimus Jul 22, 2019
197b8f2
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
35ee6b8
Update src/mondeath.cpp
misterprimus Jul 22, 2019
8fe4969
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
0e36911
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
ca8062f
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
20f6922
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
373d376
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
ec4074f
Update src/monstergenerator.cpp
misterprimus Jul 22, 2019
6154128
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
440d8ca
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
08c98d5
Update src/mtype.h
misterprimus Jul 22, 2019
40849ec
Update src/mtype.h
misterprimus Jul 22, 2019
52b1e36
Update src/monstergenerator.cpp
misterprimus Jul 22, 2019
0b843eb
Update data/json/recipes/recipe_deconstruction.json
misterprimus Jul 22, 2019
181c1d8
Update mondeath.cpp
misterprimus Jul 23, 2019
683bb9f
Update recipe_deconstruction.json
misterprimus Jul 23, 2019
7a32800
Merge branch 'master' into master
misterprimus Jul 23, 2019
d1fd87f
Update recipe_deconstruction.json
misterprimus Jul 23, 2019
6911bba
Update recipe_deconstruction.json
misterprimus Jul 23, 2019
12feb8d
Update military.json
misterprimus Jul 23, 2019
209229d
Update defense_bot.json
misterprimus Jul 23, 2019
a13a5d5
Update mondeath.cpp
misterprimus Jul 23, 2019
81c442d
Update mondeath.cpp
misterprimus Jul 23, 2019
b5b1a58
Update mondeath.cpp
misterprimus Jul 23, 2019
1acc735
Update mondeath.cpp
misterprimus Jul 23, 2019
ab80519
Update data/json/items/generic.json
misterprimus Jul 28, 2019
264f731
Update data/json/items/generic.json
misterprimus Jul 28, 2019
f2a46e9
Update data/json/items/generic.json
misterprimus Jul 28, 2019
c8559a9
Update data/json/items/generic.json
misterprimus Jul 28, 2019
1d6b736
Merge branch 'master' into master
misterprimus Jul 28, 2019
702651c
Update generic.json
misterprimus Jul 28, 2019
c40b5cc
Update generic.json
misterprimus Jul 28, 2019
6b99810
Update src/mondeath.cpp
misterprimus Jul 29, 2019
1408a8b
Update mondeath.cpp
misterprimus Jul 29, 2019
632add5
adds big bore air rifles
misterprimus Aug 10, 2019
c520a84
Update data/json/items/ammo.json
misterprimus Aug 10, 2019
65490ba
Update data/json/items/ammo/50pellet.json
misterprimus Aug 10, 2019
aec5979
Update data/json/items/ammo/50pellet.json
misterprimus Aug 10, 2019
26c1c52
pellet volume and air fitting price
misterprimus Aug 10, 2019
8dbe585
Update data/json/items/vehicle_parts.json
misterprimus Aug 10, 2019
c736897
Update src/activity_handlers.cpp
misterprimus Aug 10, 2019
9c0c437
Update src/activity_handlers.cpp
misterprimus Aug 10, 2019
505809f
Update src/activity_handlers.cpp
misterprimus Aug 10, 2019
696b4f0
Update src/avatar_action.cpp
misterprimus Aug 10, 2019
d5a9fe7
Update src/avatar_action.cpp
misterprimus Aug 10, 2019
0029bef
Update src/item.cpp
misterprimus Aug 10, 2019
e75583c
Update src/player.cpp
misterprimus Aug 10, 2019
da9b591
Update src/player.cpp
misterprimus Aug 10, 2019
22eae75
Update data/json/vehicleparts/vehicle_parts.json
misterprimus Aug 10, 2019
df4a75e
Update src/player.cpp
misterprimus Aug 10, 2019
01c07fe
Update src/player.cpp
misterprimus Aug 10, 2019
85e120a
Update player.cpp
misterprimus Aug 10, 2019
795e626
Merge branch 'big_bore_air_rifle' of https://github.com/misterprimus/…
misterprimus Aug 10, 2019
e824e54
Update itype.h
misterprimus Aug 10, 2019
ce60830
Update item.cpp
misterprimus Aug 10, 2019
8910336
remove references to UPS form air-related activity
misterprimus Aug 10, 2019
ce44264
Update src/visitable.cpp
misterprimus Aug 11, 2019
5b2a81c
remove redundant string formatting (bevapdin)
misterprimus Aug 11, 2019
3a58829
Update iuse.cpp
misterprimus Aug 11, 2019
3d02b7f
Update player.cpp
misterprimus Aug 11, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -924,6 +924,11 @@
"id": "HAND_CRANK",
"name": "Recharge a battery"
},
{
"type": "item_action",
"id": "HAND_CRANK_AIR",
"name": "Refill a cylinder"
},
{
"type": "item_action",
"id": "VIBE",
@@ -0,0 +1,56 @@
[
{
"id": "heavy_air_cylinder",
"type": "MAGAZINE",
"category": "spare_parts",
"name": "heavy air cylinder",
"name_plural": "heavy air cylinders",
"description": "This is a high pressure heavy air cylinder.",
"weight": 63000,
"volume": "49L",
"price": 10000,
"material": [ "steel" ],
"looks_like": "heavy_battery_cell",
"symbol": "=",
"color": "yellow",
"ammo_type": "air",
"capacity": 10000,
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE_AIR" ]
},
{
"id": "medium_air_cylinder",
"type": "MAGAZINE",
"category": "spare_parts",
"name": "medium air cylinder",
"name_plural": "medium air cylinders",
"description": "This is a high pressure medium-sized air cylinder.",
"weight": 31000,
"volume": "25L",
"looks_like": "heavy_battery_cell",
"price": 10000,
"material": [ "steel" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "air",
"capacity": 5000,
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE_AIR" ]
},
{
"id": "light_air_cylinder",
"type": "MAGAZINE",
"category": "spare_parts",
"name": "light air cylinder",
"name_plural": "light air cylinders",
"description": "This is a high pressure lightweight air cylinder.",
"weight": 15750,
"looks_like": "heavy_battery_cell",
"volume": "13L",
"price": 10000,
"material": [ "steel" ],
"symbol": "=",
"color": "yellow",
"ammo_type": "air",
"capacity": 2500,
"flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE_AIR" ]
}
]
@@ -20,6 +20,24 @@
"//2": "1 battery is 1 kJ of energy. 40 batteries is an alkaline C-cell.",
"fuel": { "energy": 1 }
},
{
"type": "AMMO",
"id": "air",
"category": "spare_parts",
"price": 12000,
"name": "air",
"name_plural": "air",
"symbol": "=",
"color": "yellow",
"description": "Some free-floating air charge. This can be reloaded into rechargable air cylinders, but can never be unloaded.",
"flags": "TRADER_AVOID",
"material": "iron",
"volume": 1,
"//": "Setting air volume to 0 causes weirdness in vehicle tests. Please don't do that.",
"ammo_type": "air",
"reload_time": 1,
"count": 100
},
{
"type": "TOOL",
"id": "betavoltaic",
@@ -0,0 +1,65 @@
[
{
"id": "50pellet",
"type": "AMMO",
"name": ".50 pellet",
"description": "A huge .50 pellet for big bore air rifles. It causes tremendous tissue damage for an air rifle.",
"weight": 10,
"volume": "15 ml",
"price": 3500,
"material": [ "lead" ],
"symbol": "=",
"color": "light_gray",
"count": 20,
"stack_size": 50,
"ammo_type": "50pellet",
"looks_like": "bearing",
"range": 35,
"damage": 60,
"pierce": 1,
"dispersion": 30,
"recoil": 500
},
{
"id": "50pellet_copper",
"type": "AMMO",
"name": ".50 Pellet copper",
"description": "A huge .50 pellet for big bore air rifles. It causes tremendous tissue damage for an air rifle. This one is made out of copper, which allows it to retain it's shape better, but reduces tissue damage.",
"weight": 10,
"volume": "15 ml",
"price": 3500,
"material": [ "copper" ],
"symbol": "=",
"color": "light_gray",
"count": 20,
"stack_size": 50,
"ammo_type": "50pellet",
"looks_like": "bearing",
"range": 35,
"damage": 55,
"pierce": 8,
"dispersion": 30,
"recoil": 500
},
{
"id": "50pellet_steelcore",
"type": "AMMO",
"name": ".50 Pellet steel core",
"description": "A huge .50 pellet for big bore air rifles. This one has a steel core to increase penetration, but it does less tissue damage.",
"weight": 10,
"volume": "15 ml",
"price": 3500,
"material": [ "lead", "steel" ],
"symbol": "=",
"color": "light_gray",
"count": 20,
"stack_size": 50,
"ammo_type": "50pellet",
"looks_like": "bearing",
"range": 35,
"damage": 50,
"pierce": 20,
"dispersion": 30,
"recoil": 500
}
]
@@ -299,6 +299,12 @@
"name": "batteries",
"default": "battery"
},
{
"type": "ammunition_type",
"id": "air",
"name": "air",
"default": "air"
},
{
"type": "ammunition_type",
"id": "money",
@@ -467,6 +473,12 @@
"name": ".32",
"default": "32_acp"
},
{
"type": "ammunition_type",
"id": "50pellet",
"name": "50pellet",
"default": "50pellet"
},
{
"type": "ammunition_type",
"id": "762x25",
@@ -5885,6 +5885,7 @@
"308",
"12mm",
"8x40mm",
"50pellet",
"20x66mm",
"5x50",
"metal_rail",
@@ -2929,6 +2929,67 @@
"weight": 11339,
"volume": 12
},
{

This comment has been minimized.

Copy link
@John-Candlebury

John-Candlebury Aug 12, 2019

Contributor

I only gave your code a quick glance, but the changes in this file seem completely unrelated to adding the big bore rifles?

If they are unrelated, you should probably revert them and split them into a new pr.

This comment has been minimized.

Copy link
@misterprimus

misterprimus Aug 12, 2019

Author Contributor

They're changes from my turret ammo drops PR. I don't know how they got into this PR or even why they appear as changes since that PR was already merged. Do I just delete those files from this PR?

This comment has been minimized.

Copy link
@ymber

ymber Aug 12, 2019

Member

For future reference the way to deal with this is update your master and rebase your feature branch onto it.

"type": "GENERIC",
"id": "broken_turret",
"symbol": ",",
"color": "green",
"name": "broken turret",
"category": "other",
"description": "A broken turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
"weight": 62650,
"volume": "30 L",
"bashing": 4,
"cutting": 4,
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
},
{
"type": "GENERIC",
"id": "broken_turret_rifle",
"symbol": ",",
"color": "green",
"name": "broken milspec turret",
"weight": 70000,
"copy-from": "broken_turret"
},
{
"type": "GENERIC",
"id": "broken_turret_bmg",
"symbol": ",",
"color": "green",
"name": "broken antimateriel turret",
"weight": 100000,
"copy-from": "broken_turret"
},
{
"type": "GENERIC",
"id": "broken_laserturret",
"symbol": ",",
"color": "green",
"name": "broken laser turret",
"weight": 110000,
"copy-from": "broken_turret"
},
{
"type": "GENERIC",
"id": "broken_secubot",
"symbol": ",",
"color": "green",
"name": "broken secubot",
"category": "other",
"description": "A broken secubot, with its casing broken and fluid drained. Could be gutted for parts.",
"price": 1000,
"material": [ "steel", "plastic" ],
"weight": 100000,
"volume": "65000 ml",
"bashing": 4,
"cutting": 4,
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
},
{
"type": "GENERIC",
"id": "fire_brick",
@@ -0,0 +1,20 @@
[
{
"id": "bbprmmag",
"type": "MAGAZINE",
"name": "modified big bore pneumatic rifle magazine",
"//": "",
"description": "Home-made 50-round box magazine for a modified big bore pneumatic rifle.",
"weight": 727,
"volume": 2,
"price": 10000,
"material": "steel",
"symbol": "#",
"color": "light_gray",
"looks_like": "m107a1mag",
"ammo_type": "50pellet",
"capacity": 50,
"reload_time": 130,
"flags": [ "MAG_BULKY" ]
}
]
@@ -330,6 +330,80 @@
[ "underbarrel mount", 1 ]
]
},
{
"id": "bbpr",
"type": "GUN",
"reload_noise_volume": 10,
"name": "big bore pneumatic rifle",
"description": "A single-shot big bore pneumatic rifle. It's very powerful and deadly, but it uses a lot of air and requires considerable pumping time before it's ready.",
"weight": 2213,
"volume": 8,
"price": 350000,
"to_hit": -1,
"bashing": 10,
"material": [ "steel", "wood" ],
"flags": [ "STR_RELOAD", "RELOAD_ONE" ],
"symbol": "(",
"color": "brown",
"ammo": "50pellet",
"skill": "rifle",
"looks_like": "m107a1",
"ranged_damage": -5,
"range": 30,
"dispersion": 95,
"durability": 6,
"clip_size": 1,
"barrel_length": 5,
"reload": 14000,
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "mechanism", 4 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
]
},
{
"id": "bbprm",
"type": "GUN",
"reload_noise_volume": 10,
"symbol": "(",
"color": "light_gray",
"name": "modified big bore pneumatic rifle",
"description": "A big bore pneumatic rifle that has been heavily modified. The integrated pumping mechanism and air reservoir have been replaced with a high pressure fitting and the receiver has been altered to accept magazines. It no longer requires long pumping sessions to reload, but requires a constant external supply of pressurized air.",
"price": 240000,
"material": [ "steel", "wood" ],
"skill": "rifle",
"ammo": "50pellet",
"weight": 4211,
"volume": 11,
"bashing": 8,
"to_hit": -1,
"ranged_damage": -5,
"range": 30,
"dispersion": 95,
"durability": 7,
"looks_like": "m107a1",
"reload": 150,
"loudness": 18,
"barrel_length": 5,
"compressed_air_used": 130,
"magazine_well": 1,
"magazines": [ [ "50pellet", [ "bbprmmag" ] ] ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "mechanism", 4 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
]
},
{
"id": "helsing",
"type": "GUN",
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.