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

Convert chemical thrower to use magazines #30118

Merged
merged 1 commit into from
May 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 0 additions & 36 deletions data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -969,42 +969,6 @@
"weight": 300,
"ammo_type": "unfinished_char"
},
{
"type": "AMMO",
"id": "gas_fungicidal",
"category": "chems",
"price": 3500,
"name": "sprayable fungicide",
"symbol": "=",
"color": "yellow",
"container": "bottle_plastic",
"description": "Fungicide enhanced with sulfur to create sprayable anti-fungal ammo for the chemical thrower. Best be used with some kind of mask or mouth protection.",
"volume": 1,
"weight": 1,
"phase": "liquid",
"ammo_type": "chemical_spray",
"range": 4,
"count": 100,
"effects": [ "GAS_FUNGICIDAL", "STREAM_GAS_FUNGICIDAL", "NEVER_MISFIRES", "JET" ]
},
{
"type": "AMMO",
"id": "gas_chloramine",
"category": "chems",
"price": 3500,
"name": "sprayable toxic gas",
"symbol": "=",
"color": "green",
"container": "bottle_plastic",
"description": "A hazardous mixture made from household cleaners, improvised for use in a chemical thrower. Best be used with some kind of mask or mouth protection.",
"volume": 1,
"weight": 1,
"phase": "liquid",
"ammo_type": "chemical_spray",
"range": 4,
"count": 100,
"effects": [ "TOXICGAS", "NEVER_MISFIRES", "JET" ]
},
{
"type": "AMMO",
"id": "chain_link",
Expand Down
38 changes: 38 additions & 0 deletions data/json/items/ammo/chemical_spray.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[
{
"id": "gas_chloramine",
"type": "AMMO",
"name": "sprayable toxic gas",
"description": "A hazardous mixture made from household cleaners, improvised for use in a chemical thrower. Best be used with some kind of mask or mouth protection.",
"weight": 3,
"volume": 1,
"price": 3500,
"material": "water",
"symbol": "=",
"color": "green",
"container": "bottle_plastic",
"phase": "liquid",
"ammo_type": "chemical_spray",
"range": 4,
"count": 100,
"effects": [ "TOXICGAS", "NEVER_MISFIRES", "JET" ]
},
{
"id": "gas_fungicidal",
"type": "AMMO",
"name": "sprayable fungicide",
"description": "Fungicide enhanced with sulfur to create sprayable anti-fungal ammo for the chemical thrower. Best be used with some kind of mask or mouth protection.",
"weight": 3,
"volume": 1,
"price": 3500,
"material": "water",
"symbol": "=",
"color": "yellow",
"container": "bottle_plastic",
"phase": "liquid",
"ammo_type": "chemical_spray",
"range": 4,
"count": 100,
"effects": [ "GAS_FUNGICIDAL", "STREAM_GAS_FUNGICIDAL", "NEVER_MISFIRES", "JET" ]
}
]
31 changes: 31 additions & 0 deletions data/json/items/gun/chemical_spray.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[
{
"id": "chemical_thrower",
"copy-from": "gun_base",
"type": "GUN",
"reload_noise": "slosh.",
"name": "makeshift chemical thrower",
"description": "A bulky, self-made chemical sprayer with an internal conversion mechanism that allows all sorts of chemicals to be dispersed to your surroundings.",
"weight": 4588,
"volume": 17,
"price": 10000,
"to_hit": -1,
"bashing": 9,
"material": [ "steel", "plastic" ],
"flags": [ "FIRE_50", "NEVER_JAMS" ],
"skill": "launcher",
"ammo": "chemical_spray",
"dispersion": 300,
"durability": 6,
"magazines": [ [ "chemical_spray", [ "pressurized_tank_chem" ] ] ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "grip", 1 ],
[ "rail", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "underbarrel", 1 ]
]
}
]
18 changes: 18 additions & 0 deletions data/json/items/magazine/chemical_spray.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[
{
"id": "pressurized_tank_chem",
"type": "MAGAZINE",
"name": "pressurized chemical tank",
"description": "A makeshift pressurized 2L canister designed to feed a makeshift chemical thrower.",
"weight": 800,
"volume": 8,
"price": 5000,
"material": "steel",
"symbol": "#",
"color": "light_gray",
"ammo_type": "chemical_spray",
"capacity": 800,
"reliability": 9,
"reload_time": 3
}
]
25 changes: 0 additions & 25 deletions data/json/items/ranged.json
Original file line number Diff line number Diff line change
Expand Up @@ -576,30 +576,5 @@
"clip_size": 100,
"reload": 0,
"valid_mod_locations": [ [ "sling", 1 ] ]
},
{
"id": "chemical_thrower",
"type": "GUN",
"reload_noise_volume": 10,
"reload_noise": "slosh.",
"symbol": "(",
"color": "dark_gray",
"name": "chemical thrower",
"description": "A bulky, self-made chemical sprayer with an internal conversion mechanism that allows all sorts of chemicals to be dispersed to your surroundings.",
"price": 15000,
"material": [ "steel", "plastic" ],
"flags": [ "FIRE_50", "NEVER_JAMS" ],
"skill": "launcher",
"ammo": "chemical_spray",
"weight": 1150,
"volume": 25,
"bashing": 9,
"to_hit": -1,
"ranged_damage": -5,
"dispersion": 300,
"durability": 6,
"clip_size": 1000,
"reload": 10,
"valid_mod_locations": [ [ "sling", 1 ] ]
}
]
21 changes: 0 additions & 21 deletions data/json/recipes/recipe_weapon.json
Original file line number Diff line number Diff line change
Expand Up @@ -3013,26 +3013,5 @@
[ [ "pipe", 1 ] ],
[ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ]
]
},
{
"type": "recipe",
"result": "chemical_thrower",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_RANGED",
"skill_used": "mechanics",
"skills_required": [ "launcher", 2 ],
"difficulty": 6,
"time": 30000,
"reversible": true,
"autolearn": true,
"using": [ [ "welding_standard", 40 ] ],
"qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
"components": [
[ [ "pilot_light", 1 ] ],
[ [ "metal_tank_little", 1 ] ],
[ [ "pipe", 2 ] ],
[ [ "hose", 2 ] ],
[ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ]
]
}
]
14 changes: 14 additions & 0 deletions data/json/recipes/weapon/magazines.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,20 @@
[ [ "duct_tape", 20 ] ]
]
},
{
"result": "pressurized_tank_chem",
"type": "recipe",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_MAGAZINES",
"skill_used": "fabrication",
"difficulty": 4,
"skills_required": [ "mechanics", 3 ],
"time": 40000,
"autolearn": true,
"using": [ [ "welding_standard", 2 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"components": [ [ [ "metal_tank_little", 1 ] ] ]
},
{
"result": "survivor223mag",
"type": "recipe",
Expand Down
15 changes: 15 additions & 0 deletions data/json/recipes/weapon/ranged.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
[
{
"type": "recipe",
"result": "chemical_thrower",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_RANGED",
"skill_used": "mechanics",
"skills_required": [ "launcher", 2 ],
"difficulty": 6,
"time": 30000,
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
"using": [ [ "welding_standard", 40 ] ],
"components": [ [ [ "pipe", 2 ] ], [ [ "hose", 2 ] ], [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ] ]
},
{
"result": "nailrifle",
"type": "recipe",
Expand Down