Skip to content

Commit

Permalink
Obsolete scrap weapons (#39438)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevingranade authored Apr 16, 2020
1 parent 1ab4139 commit b48eb09
Show file tree
Hide file tree
Showing 24 changed files with 436 additions and 683 deletions.
2 changes: 0 additions & 2 deletions data/json/itemgroups/Clothing_Gear/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -2371,8 +2371,6 @@
[ "balclava", 12 ],
[ "mask_survivorxl", 2 ],
[ "combatsaw_off", 1 ],
[ "helsing", 1 ],
[ "tihar", 2 ],
[ "bigun", 2 ],
[ "ashot", 4 ],
[ "pickaxe", 1 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
"type": "item_group",
"id": "mags_other_makeshift",
"//": "Makeshift or otherwise poor quality magazines that have no better category.",
"items": [ [ "nailmag", 20 ], [ "pressurized_tank_chem", 5 ], [ "aux_pressurized_tank", 10 ] ]
"items": [ [ "pressurized_tank_chem", 5 ], [ "aux_pressurized_tank", 10 ] ]
},
{
"type": "item_group",
Expand Down
3 changes: 0 additions & 3 deletions data/json/itemgroups/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
{ "item": "bio_speed", "prob": 10 },
{ "item": "bot_c4_hack", "prob": 30 },
{ "item": "bot_laserturret", "prob": 20 },
{ "item": "bot_mininuke_hack", "prob": 10 },
{ "item": "c4", "prob": 50 },
{ "item": "canister_goo", "prob": 80 },
{ "item": "cleansuit", "prob": 100 },
Expand All @@ -41,7 +40,6 @@
{ "item": "m60", "prob": 10 },
{ "item": "mask_bal", "prob": 100 },
{ "item": "militarymap", "prob": 20 },
{ "item": "mininuke", "prob": 10 },
{ "item": "mutagen", "prob": 80 },
{ "item": "optical_cloak", "prob": 20 },
{ "item": "holo_cloak", "prob": 20 },
Expand Down Expand Up @@ -149,7 +147,6 @@
{ "item": "iv_mutagen_elfa", "prob": 0 },
{ "item": "iv_mutagen_medical", "prob": 0 },
{ "item": "m2browning_sawn", "prob": 0 },
{ "item": "mininuke_launcher", "prob": 0 },
{ "item": "mutagen_alpha", "prob": 0 },
{ "item": "mutagen_chimera", "prob": 0 },
{ "item": "mutagen_elfa", "prob": 0 },
Expand Down
2 changes: 0 additions & 2 deletions data/json/itemgroups/science_and_tech.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
[ "EMPbomb", 2 ],
[ "pheromone", 1 ],
[ "flux_comp_gen", 3 ],
[ "recipe_mininuke_launch", 4 ],
[ "portal", 2 ],
[ "bot_manhack", 1 ],
[ "UPS_off", 5 ],
Expand Down Expand Up @@ -362,7 +361,6 @@
[ "recipe_lab_elec", 15 ],
[ "software_electronics_reference", 2 ],
[ "recipe_lab_cvd", 8 ],
[ "recipe_mininuke_launch", 5 ],
[ "teleporter", 10 ],
[ "antiparasitic", 5 ],
[ "usb_drive", 5 ]
Expand Down
18 changes: 0 additions & 18 deletions data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -743,24 +743,6 @@
"stack_size": 10,
"fuel": { "energy": 30 }
},
{
"type": "AMMO",
"id": "mininuke_mod",
"price": 180000,
"//": "Never marketed pre-Cataclysm.",
"name": { "str": "modified mininuke" },
"symbol": "*",
"color": "green",
"description": "A heavily modified handheld nuclear device on a rocket. Intended to be fired from a specialized launcher, it has been rigged to explode on impact instead of on a timer. It can fly further than the explosion will reach, probably.",
"material": "plastic",
"volume": "97 L",
"weight": "34500 g",
"bashing": 8,
"ammo_type": "mininuke_mod",
"damage": { "damage_type": "stab", "amount": 14 },
"stack_size": 2,
"effects": [ "MININUKE_MOD", "NEVER_MISFIRES" ]
},
{
"type": "AMMO",
"id": "ampoule",
Expand Down
6 changes: 0 additions & 6 deletions data/json/items/ammo_types.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,12 +413,6 @@
"name": "signal flare",
"default": "signal_flare"
},
{
"type": "ammunition_type",
"id": "mininuke_mod",
"name": "modified mininuke",
"default": "mininuke_mod"
},
{
"type": "ammunition_type",
"id": "charcoal",
Expand Down
18 changes: 0 additions & 18 deletions data/json/items/book/fabrication.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,24 +182,6 @@
"intelligence": 8,
"time": "20 m"
},
{
"id": "recipe_mininuke_launch",
"type": "BOOK",
"name": { "str": "238-NK: Practicality Enhancement", "str_pl": "copies of 238-NK: Practicality Enhancement" },
"description": "The authors of this thoroughly researched and documented proposal make a very persuasive case for the adoption of spring-driven nuclear shells. It's stamped \"DENIED\".",
"weight": "854 g",
"volume": "1500 ml",
"price": 30000,
"price_postapoc": 5000000,
"material": [ "paper" ],
"symbol": "?",
"color": "light_green",
"skill": "fabrication",
"required_level": 4,
"max_level": 5,
"intelligence": 9,
"time": "10 m"
},
{
"id": "textbook_armeast",
"type": "BOOK",
Expand Down
74 changes: 0 additions & 74 deletions data/json/items/gun/metal_rail.json

This file was deleted.

60 changes: 0 additions & 60 deletions data/json/items/gun/nail.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,4 @@
[
{
"id": "coilgun",
"copy-from": "gun_base",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "coilgun" },
"//": "Hard to make, plentiful and cheap ammo, and silent - people will want this thing.",
"description": "A homemade gun, using electromagnets to accelerate a ferromagnetic projectile to high velocity. Powered by UPS.",
"weight": "3341 g",
"volume": "2750 ml",
"price": 75000,
"price_postapoc": 5000,
"to_hit": -2,
"bashing": 10,
"material": [ "copper", "steel" ],
"ammo": "nail",
"skill": "rifle",
"range": 12,
"ranged_damage": { "damage_type": "stab", "amount": 4, "armor_penetration": 20 },
"dispersion": 180,
"durability": 5,
"ups_charges": 5,
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
],
"magazines": [ [ "nail", [ "nailmag" ] ] ]
},
{
"id": "nailgun",
"looks_like": "glock_17",
Expand All @@ -56,32 +23,5 @@
"clip_size": 20,
"reload": 50,
"valid_mod_locations": [ [ "grip mount", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "stock mount", 1 ], [ "underbarrel mount", 1 ] ]
},
{
"id": "nailrifle",
"copy-from": "nailgun",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "nail rifle" },
"description": "This is a nailgun that has been extensively modified with the addition of a short barrel, stock and hand guard. It can be reloaded using detachable magazines and is an overall much more effective weapon.",
"to_hit": -1,
"bashing": 12,
"price_postapoc": 750,
"skill": "rifle",
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
"clip_size": 0,
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
[ "grip", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
],
"magazines": [ [ "nail", [ "nailmag" ] ] ],
"relative": { "weight": 1000, "volume": 6, "range": 3, "ranged_damage": { "damage_type": "stab", "amount": 4 } },
"proportional": { "price": 3, "dispersion": 0.5 }
}
]
20 changes: 0 additions & 20 deletions data/json/items/magazine/nail.json

This file was deleted.

Loading

1 comment on commit b48eb09

@kevingranade
Copy link
Member Author

Choose a reason for hiding this comment

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

This commit has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there:

https://discourse.cataclysmdda.org/t/balance-heavy-rail-rifle/24427/3

Please sign in to comment.