diff --git a/data/json/items/fuel.json b/data/json/items/fuel.json index 893396faf01b..dcad380b63a8 100644 --- a/data/json/items/fuel.json +++ b/data/json/items/fuel.json @@ -246,7 +246,7 @@ "type": "AMMO", "name": { "str_sp": "gelled gasoline" }, "copy-from": "gasoline", - "description": "A flammable gel composed of gasoline and dissolved shavings of polystyrene, roughly similar in properties to napalm b. It's meant to be used with a flamethrower.", + "description": "A flammable gel composed of gasoline and a chemical that renders it to a gel, it is roughly similar in properties to napalm b. It's meant to be used with a flamethrower.", "price": "4 USD", "price_postapoc": "5 USD", "ammo_type": "flammable", @@ -257,7 +257,7 @@ "id": "flamethrower_fuel", "type": "AMMO", "name": { "str_sp": "flamethrower fuel" }, - "copy-from": "gasoline", + "copy-from": "napalm", "description": "A mixture of gasoline and diesel oil in equal parts. Its combustion properties make it unfit for applications where you would use any of them separately, but it can be used to feed a flamethrower.", "price": "4 USD", "price_postapoc": "5 USD", diff --git a/data/json/recipes/ammo/launcher.json b/data/json/recipes/ammo/launcher.json index 4fb5de51d862..27ccf9da682a 100644 --- a/data/json/recipes/ammo/launcher.json +++ b/data/json/recipes/ammo/launcher.json @@ -251,8 +251,80 @@ "time": "20 m", "batch_time_factors": [ 80, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], - "book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_anarch", 2, "Stuff THE MAN doesn't want you to know" ] ], - "components": [ [ [ "gasoline", 100 ] ], [ [ "plastic_chunk", 1 ] ] ], + "book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_anarch", 2 ] ], + "components": [ [ [ "gasoline", 100 ] ], [ [ "plastic_chunk", 5 ] ] ], + "delete_flags": [ "FILTHY" ], + "flags": [ "ALLOW_FILTHY" ] + }, + { + "type": "recipe", + "result": "gelled_gasoline", + "id_suffix": "detergent", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_LAUNCHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "10 m", + "batch_time_factors": [ 80, 5 ], + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], + "book_learn": [ [ "textbook_anarch", 2 ] ], + "components": [ [ [ "gasoline", 100 ] ], [ [ "detergent", 30 ] ], [ [ "chem_ethanol", 1 ] ] ], + "delete_flags": [ "FILTHY" ], + "flags": [ "ALLOW_FILTHY" ] + }, + { + "type": "recipe", + "result": "gelled_gasoline", + "id_suffix": "beeswax", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_LAUNCHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "10 m", + "batch_time_factors": [ 80, 5 ], + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], + "book_learn": [ [ "textbook_anarch", 2 ] ], + "components": [ [ [ "gasoline", 100 ] ], [ [ "wax", 30 ] ] ], + "delete_flags": [ "FILTHY" ], + "flags": [ "ALLOW_FILTHY" ] + }, + { + "type": "recipe", + "result": "gelled_gasoline", + "id_suffix": "animal blood", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_LAUNCHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "10 m", + "batch_time_factors": [ 80, 5 ], + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], + "book_learn": [ [ "textbook_anarch", 2 ] ], + "components": [ + [ [ "gasoline", 100 ] ], + [ [ "animal_blood", 30 ] ], + [ [ "salt", 3 ], [ "coffee", 3 ], [ "tea_raw", 3 ], [ "sugar", 3 ], [ "material_quicklime", 3 ] ] + ], + "delete_flags": [ "FILTHY" ], + "flags": [ "ALLOW_FILTHY" ] + }, + { + "type": "recipe", + "result": "gelled_gasoline", + "id_suffix": "egg powder", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_LAUNCHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "10 m", + "batch_time_factors": [ 80, 5 ], + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 1 } ], + "book_learn": [ [ "textbook_anarch", 2 ] ], + "components": [ + [ [ "gasoline", 100 ] ], + [ [ "powder_eggs", 12 ] ], + [ [ "salt", 3 ], [ "coffee", 3 ], [ "tea_raw", 3 ], [ "sugar", 3 ], [ "material_quicklime", 3 ] ] + ], "delete_flags": [ "FILTHY" ], "flags": [ "ALLOW_FILTHY" ] }, @@ -266,11 +338,7 @@ "time": "3 m", "batch_time_factors": [ 80, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], - "book_learn": [ - [ "textbook_gaswarfare", 2 ], - [ "textbook_anarch", 2, "Stuff THE MAN doesn't want you to know" ], - [ "manual_launcher", 2 ] - ], + "book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_anarch", 2 ], [ "manual_launcher", 2 ] ], "components": [ [ [ "gasoline", 125 ] ], [ [ "diesel", 125 ], [ "biodiesel", 125 ] ] ] }, {