From 4230ca3008b8a41a4edeb30b3cb0d99fecb500e9 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Wed, 29 Jan 2020 19:29:10 +0000 Subject: [PATCH] Obsolete flaming weapons (#37406) * Obsolete flaming weapons * Add flaming weapons to crazy cataclysm --- data/json/itemgroups/clothing.json | 2 - data/json/items/melee.json | 16 - data/json/items/melee/bludgeons.json | 60 --- data/json/items/melee/swords_and_blades.json | 251 ------------ data/json/items/obsolete.json | 384 ++++++++++++++++++ data/json/items/tool/misc.json | 57 --- data/json/martialarts.json | 22 - data/json/npcs/NC_JUNK_SHOPKEEP.json | 2 - .../NPC_free_merchant_shopkeep.json | 2 - data/json/recipes/recipe_deconstruction.json | 6 - data/json/recipes/recipe_obsolete.json | 35 ++ data/json/recipes/recipe_weapon.json | 99 ----- data/json/recipes/weapon/bashing.json | 24 -- data/mods/CrazyCataclysm/crazy_items.json | 204 ++++++++++ data/mods/CrazyCataclysm/crazy_recipes.json | 72 ++++ doc/JSON_FLAGS.md | 1 - 16 files changed, 695 insertions(+), 542 deletions(-) create mode 100644 data/mods/CrazyCataclysm/crazy_recipes.json diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index afc69f4e8b35c..a22e838a14617 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -2351,8 +2351,6 @@ [ "balclava", 12 ], [ "mask_survivorxl", 2 ], [ "combatsaw_off", 1 ], - [ "firemachete_off", 1 ], - [ "shishkebab_off", 2 ], [ "helsing", 1 ], [ "tihar", 2 ], [ "bigun", 2 ], diff --git a/data/json/items/melee.json b/data/json/items/melee.json index ff2e35459f8e9..707a8d1d6de6f 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -217,22 +217,6 @@ "bashing": 11, "price": 1000 }, - { - "type": "GENERIC", - "id": "battletorch_done", - "name": "burnt out Louisville Slaughterer", - "description": "A sturdy wood bat, wrapped in flame-resistant Nomex fabric. Makes a good melee weapon but better be disassembled to recycle the baseball bat and some Nomex patches.", - "weight": "1343 g", - "to_hit": 3, - "color": "brown", - "symbol": "/", - "material": [ "wood" ], - "techniques": [ "WBLOCK_1" ], - "flags": [ "DURABLE_MELEE" ], - "volume": "1750 ml", - "bashing": 19, - "price": 18000 - }, { "type": "GENERIC", "id": "bee_sting", diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index e40977b669065..4c5334bc708e7 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -578,66 +578,6 @@ "bashing": 8, "price": 1000 }, - { - "id": "battletorch", - "type": "TOOL", - "category": "weapons", - "name": "Louisville Slaughterer", - "description": "This is sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. Light it, and the ball game will REALLY heat up. You'll need a lighter or matches to light it.", - "weight": "1485 g", - "volume": "2 L", - "price": 16000, - "to_hit": 3, - "bashing": 18, - "material": [ "wood", "nomex" ], - "symbol": "/", - "color": "brown", - "initial_charges": 25, - "max_charges": 25, - "charges_per_use": 1, - "techniques": [ "WBLOCK_1" ], - "use_action": { - "target": "battletorch_lit", - "msg": "You light the Louisville Slaughterer.", - "active": true, - "need_fire": 1, - "menu_text": "Light", - "type": "transform" - }, - "flags": [ "DURABLE_MELEE" ] - }, - { - "id": "battletorch_lit", - "type": "TOOL", - "category": "weapons", - "name": "Louisville Slaughterer", - "name_plural": "Louisville Slaughterers", - "description": "This is a sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. It is burning brightly, and makes it much easier to see the baselines at night games (It also makes the umpire FAR more likely to call a ball instead of a strike).", - "weight": "1485 g", - "volume": "2 L", - "price": 16000, - "to_hit": 3, - "bashing": 18, - "material": [ "wood", "nomex" ], - "symbol": "/", - "color": "red", - "initial_charges": 25, - "max_charges": 25, - "turns_per_charge": 20, - "revert_to": "battletorch_done", - "techniques": [ "WBLOCK_1" ], - "use_action": [ - { "type": "firestarter", "moves": 30 }, - { - "target": "battletorch", - "msg": "The Louisville Slaughterer is extinguished.", - "active": false, - "menu_text": "Extinguish", - "type": "transform" - } - ], - "flags": [ "FIRE", "LIGHT_310", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ] - }, { "type": "GENERIC", "id": "mjolnir", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index a7238c8428c8d..d41bde7170a03 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -281,76 +281,6 @@ "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ] }, - { - "id": "firemachete_off", - "type": "TOOL", - "category": "weapons", - "name": "No. 9", - "name_plural": "No. 9's", - "description": "This huge steel knife has been modified with a fuel tank, insulated handguard, and ignition system. When filled with gasoline, a system of torches heats the blade, burning your target.", - "weight": "1814 g", - "volume": "1500 ml", - "price": 28000, - "to_hit": 1, - "bashing": 6, - "cutting": 20, - "material": "steel", - "symbol": "/", - "color": "dark_gray", - "ammo": "gasoline", - "charges_per_use": 1, - "max_charges": 50, - "techniques": "WBLOCK_2", - "use_action": { - "type": "fireweapon_off", - "target_id": "firemachete_on", - "moves": 10, - "noise": 0, - "success_chance": 2, - "success_message": "Your No. 9 glows!", - "failure_message": "Click.", - "lacks_fuel_message": "Click." - }, - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ], - "flags": [ "FIRE", "DURABLE_MELEE", "SHEATH_SWORD" ] - }, - { - "id": "firemachete_on", - "type": "TOOL", - "category": "weapons", - "name": "No. 9", - "name_plural": "No. 9's", - "description": "This huge steel knife has been modified with a fuel tank, insulated handguard, and ignition system. The blade is glowing with heat, making it a great plant scorcher and nightlight.", - "weight": "1814 g", - "volume": "1500 ml", - "price": 28000, - "to_hit": 1, - "bashing": 6, - "cutting": 20, - "material": "steel", - "symbol": "/", - "color": "red", - "ammo": "gasoline", - "max_charges": 50, - "turns_per_charge": 30, - "revert_to": "firemachete_off", - "techniques": [ "WBLOCK_2" ], - "use_action": [ - { - "type": "fireweapon_on", - "noise": 5, - "noise_chance": 25, - "noise_message": "Your No. 9 hisses.", - "auto_extinguish_chance": 100, - "auto_extinguish_message": "Your No. 9 cuts out!", - "voluntary_extinguish_message": "Your No. 9 goes dark.", - "charges_extinguish_message": "Out of ammo!", - "water_extinguish_message": "Your No. 9 hisses in the water and goes out." - }, - { "type": "firestarter", "moves": 30 } - ], - "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ] - }, { "id": "cavalry_sabre", "type": "TOOL", @@ -850,71 +780,6 @@ "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 13 ] ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ] }, - { - "id": "zweifire_off", - "type": "TOOL", - "category": "weapons", - "name": "flammenschwert (aus)", - "name_plural": "flammenschwerter (aus)", - "//": "All of this is SUPPOSED to be in German.", - "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.", - "weight": "3400 g", - "volume": "3750 ml", - "price": 160000, - "bashing": 17, - "cutting": 40, - "material": "steel", - "symbol": "/", - "color": "light_gray", - "ammo": "gasoline", - "charges_per_use": 1, - "max_charges": 50, - "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], - "use_action": { - "type": "fireweapon_off", - "target_id": "zweifire_on", - "moves": 10, - "noise": 10, - "success_message": "Die Klinge deines Schwertes brennt!", - "lacks_fuel_message": "Dein Flammenschwert hat keinen Brennstoff mehr." - }, - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 1 ] ], - "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ] - }, - { - "id": "zweifire_on", - "type": "TOOL", - "category": "weapons", - "name": "flammenschwert", - "name_plural": "flammenschwerter", - "//": "All of this is SUPPOSED to be in German.", - "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.", - "weight": "3400 g", - "volume": "3750 ml", - "price": 160000, - "bashing": 17, - "cutting": 40, - "material": "steel", - "symbol": "/", - "color": "red", - "ammo": "gasoline", - "max_charges": 50, - "turns_per_charge": 30, - "revert_to": "zweifire_off", - "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], - "use_action": [ - { - "type": "fireweapon_on", - "noise_chance": 35, - "noise_message": "Das Feuer um deine Schwertklinge leuchtet hell!", - "voluntary_extinguish_message": "Die Flamme deines Schwertes erlischt.", - "charges_extinguish_message": "Deinem Flammenschwert ist der Brennstoff ausgegangen!", - "water_extinguish_message": "Dein Schwert zischt und erlischt." - }, - { "type": "firestarter", "moves": 30 } - ], - "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH", "ALWAYS_TWOHAND" ] - }, { "id": "zweihander", "type": "TOOL", @@ -1292,59 +1157,6 @@ "category": "weapons", "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 9 ] ] }, - { - "id": "broadfire_off", - "type": "TOOL", - "category": "weapons", - "name": "firebrand (off)", - "name_plural": "firebrands (off)", - "description": "This is a combination of two Dark Age conflict-resolution classics, the broadsword and the torch. Use to light it up and show those heathen zombies who's Lord around here.", - "weight": "1474 g", - "volume": "2250 ml", - "price": 120000, - "to_hit": 1, - "bashing": 8, - "cutting": 35, - "material": "steel", - "symbol": "/", - "color": "light_gray", - "ammo": "gasoline", - "charges_per_use": 1, - "max_charges": 50, - "techniques": "WBLOCK_2", - "use_action": { - "type": "fireweapon_off", - "target_id": "broadfire_on", - "moves": 10, - "noise": 10, - "success_message": "Charge!", - "lacks_fuel_message": "No strength to fight!" - }, - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ] ], - "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ] - }, - { - "id": "broadfire_on", - "copy-from": "broadfire_off", - "type": "TOOL", - "name": "firebrand (on)", - "name_plural": "firebrands (on)", - "description": "This is a combination of two Dark Age conflict-resolution classics, the broadsword and the torch. The blade is glowing with heat. Excalibur can eat its heart out. Use to shut it off.", - "turns_per_charge": 30, - "revert_to": "broadfire_off", - "use_action": [ - { - "type": "fireweapon_on", - "noise_chance": 35, - "noise_message": "Your blade burns for combat!", - "voluntary_extinguish_message": "Run away!", - "charges_extinguish_message": "Thy strength fades!", - "water_extinguish_message": "Your sword hisses in the water and goes out." - }, - { "type": "firestarter", "moves": 30 } - ], - "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID" ] - }, { "id": "cutlass_fake", "type": "GENERIC", @@ -1461,69 +1273,6 @@ "category": "weapons", "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 9 ] ] }, - { - "id": "firekatana_off", - "type": "TOOL", - "category": "weapons", - "name": "Rising Sun", - "name_plural": "Rising Suns", - "description": "This is a katana with a nozzle just behind the cutting edge of the blade. People love fire, and people love katanas, so why not put them together? The gas burners attached to this blade can really turn up the heat on your foes. Use to ignite.", - "weight": "1400 g", - "volume": "2250 ml", - "price": 98000, - "bashing": 4, - "cutting": 31, - "material": "steel", - "symbol": "/", - "color": "light_gray", - "ammo": "gasoline", - "charges_per_use": 1, - "max_charges": 50, - "techniques": [ "RAPID", "WBLOCK_2" ], - "use_action": { - "type": "fireweapon_off", - "target_id": "firekatana_on", - "moves": 10, - "noise": 10, - "success_message": "The Sun rises.", - "lacks_fuel_message": "Time stands still." - }, - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ] ], - "flags": [ "FIRE", "DURABLE_MELEE", "SHEATH_SWORD" ] - }, - { - "id": "firekatana_on", - "type": "TOOL", - "category": "weapons", - "name": "Rising Sun", - "name_plural": "Rising Suns", - "description": "This is a katana that glows with the fury and heat of the SUN! Well, okay it's not THAT hot, but getting hit with it still stings like the dickens. Use to shut off the gas.", - "weight": "1400 g", - "volume": "2250 ml", - "price": 98000, - "bashing": 4, - "cutting": 31, - "material": "steel", - "symbol": "/", - "color": "red", - "ammo": "gasoline", - "max_charges": 50, - "turns_per_charge": 30, - "revert_to": "firekatana_off", - "techniques": [ "RAPID", "WBLOCK_2" ], - "use_action": [ - { - "type": "fireweapon_on", - "noise_chance": 35, - "noise_message": "The Sun shines brightly.", - "voluntary_extinguish_message": "The Sun sets.", - "charges_extinguish_message": "The Light Fades.", - "water_extinguish_message": "Your sword hisses in the water and goes out." - }, - { "type": "firestarter", "moves": 30 } - ], - "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ] - }, { "id": "zweihander_fake", "type": "GENERIC", diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index bfb56d63eb540..7034d22a04a90 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -1315,5 +1315,389 @@ "blackpowder_tolerance": 60, "relative": { "durability": -3 }, "proportional": { "reload": 4 } + }, + { + "id": "shishkebab_off", + "type": "TOOL", + "category": "weapons", + "name": "shishkebab (off)", + "name_plural": "shishkebabs (off)", + "description": "This is a large blade with a fuel pipe on the side, and a small tank and igniter built into the insulated hilt. When filled with gasoline, the blade can be made scorching hot to singe enemies and light your way. Use to ignite.", + "weight": "1701 g", + "volume": "2500 ml", + "price": 10000, + "bashing": 4, + "cutting": 14, + "material": [ "steel", "plastic" ], + "symbol": "/", + "color": "light_gray", + "ammo": "gasoline", + "charges_per_use": 1, + "max_charges": 50, + "use_action": { + "type": "fireweapon_off", + "target_id": "shishkebab_on", + "moves": 10, + "noise": 10, + "success_chance": 5, + "success_message": "Let's dance, Zeds!", + "failure_message": "Aw, dangit. It fails to start!", + "lacks_fuel_message": "This thing needs some fuel!" + }, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -30 ] ], + "techniques": [ "WBLOCK_1" ], + "flags": [ "FIRE", "SHEATH_SWORD" ] + }, + { + "id": "shishkebab_on", + "copy-from": "shishkebab_off", + "type": "TOOL", + "name": "shishkebab (on)", + "name_plural": "shishkebabs (on)", + "description": "This is a large blade with a fuel pipe on the side, and a small tank and igniter built into the insulated hilt. The blade is glowing brightly. Use to shut off the gas.", + "turns_per_charge": 20, + "revert_to": "shishkebab_off", + "use_action": [ + { + "type": "fireweapon_on", + "noise": 10, + "noise_chance": 25, + "noise_message": "Your shishkebab crackles!", + "auto_extinguish_chance": 75, + "auto_extinguish_message": "Bummer, man! Your shishkebab's flame flickers and dies out.", + "voluntary_extinguish_message": "Peace out. Your shishkebab's flame dies.", + "charges_extinguish_message": "Uncool, outta gas! Your shishkebab's flame goes out.", + "water_extinguish_message": "Your shishkebab hisses in the water and goes out." + }, + { "type": "firestarter", "moves": 30 } + ], + "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "TRADER_AVOID" ] + }, + { + "id": "firemachete_off", + "type": "TOOL", + "category": "weapons", + "name": "No. 9", + "name_plural": "No. 9's", + "description": "This huge steel knife has been modified with a fuel tank, insulated handguard, and ignition system. When filled with gasoline, a system of torches heats the blade, burning your target.", + "weight": "1814 g", + "volume": "1500 ml", + "price": 28000, + "to_hit": 1, + "bashing": 6, + "cutting": 20, + "material": "steel", + "symbol": "/", + "color": "dark_gray", + "ammo": "gasoline", + "charges_per_use": 1, + "max_charges": 50, + "techniques": "WBLOCK_2", + "use_action": { + "type": "fireweapon_off", + "target_id": "firemachete_on", + "moves": 10, + "noise": 0, + "success_chance": 2, + "success_message": "Your No. 9 glows!", + "failure_message": "Click.", + "lacks_fuel_message": "Click." + }, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ], + "flags": [ "FIRE", "DURABLE_MELEE", "SHEATH_SWORD" ] + }, + { + "id": "firemachete_on", + "type": "TOOL", + "category": "weapons", + "name": "No. 9", + "name_plural": "No. 9's", + "description": "This huge steel knife has been modified with a fuel tank, insulated handguard, and ignition system. The blade is glowing with heat, making it a great plant scorcher and nightlight.", + "weight": "1814 g", + "volume": "1500 ml", + "price": 28000, + "to_hit": 1, + "bashing": 6, + "cutting": 20, + "material": "steel", + "symbol": "/", + "color": "red", + "ammo": "gasoline", + "max_charges": 50, + "turns_per_charge": 30, + "revert_to": "firemachete_off", + "techniques": [ "WBLOCK_2" ], + "use_action": [ + { + "type": "fireweapon_on", + "noise": 5, + "noise_chance": 25, + "noise_message": "Your No. 9 hisses.", + "auto_extinguish_chance": 100, + "auto_extinguish_message": "Your No. 9 cuts out!", + "voluntary_extinguish_message": "Your No. 9 goes dark.", + "charges_extinguish_message": "Out of ammo!", + "water_extinguish_message": "Your No. 9 hisses in the water and goes out." + }, + { "type": "firestarter", "moves": 30 } + ], + "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ] + }, + { + "id": "firekatana_off", + "type": "TOOL", + "category": "weapons", + "name": "Rising Sun", + "name_plural": "Rising Suns", + "description": "This is a katana with a nozzle just behind the cutting edge of the blade. People love fire, and people love katanas, so why not put them together? The gas burners attached to this blade can really turn up the heat on your foes. Use to ignite.", + "weight": "1400 g", + "volume": "2250 ml", + "price": 98000, + "bashing": 4, + "cutting": 31, + "material": "steel", + "symbol": "/", + "color": "light_gray", + "ammo": "gasoline", + "charges_per_use": 1, + "max_charges": 50, + "techniques": [ "RAPID", "WBLOCK_2" ], + "use_action": { + "type": "fireweapon_off", + "target_id": "firekatana_on", + "moves": 10, + "noise": 10, + "success_message": "The Sun rises.", + "lacks_fuel_message": "Time stands still." + }, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ] ], + "flags": [ "FIRE", "DURABLE_MELEE", "SHEATH_SWORD" ] + }, + { + "id": "firekatana_on", + "type": "TOOL", + "category": "weapons", + "name": "Rising Sun", + "name_plural": "Rising Suns", + "description": "This is a katana that glows with the fury and heat of the SUN! Well, okay it's not THAT hot, but getting hit with it still stings like the dickens. Use to shut off the gas.", + "weight": "1400 g", + "volume": "2250 ml", + "price": 98000, + "bashing": 4, + "cutting": 31, + "material": "steel", + "symbol": "/", + "color": "red", + "ammo": "gasoline", + "max_charges": 50, + "turns_per_charge": 30, + "revert_to": "firekatana_off", + "techniques": [ "RAPID", "WBLOCK_2" ], + "use_action": [ + { + "type": "fireweapon_on", + "noise_chance": 35, + "noise_message": "The Sun shines brightly.", + "voluntary_extinguish_message": "The Sun sets.", + "charges_extinguish_message": "The Light Fades.", + "water_extinguish_message": "Your sword hisses in the water and goes out." + }, + { "type": "firestarter", "moves": 30 } + ], + "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ] + }, + { + "id": "broadfire_off", + "type": "TOOL", + "category": "weapons", + "name": "firebrand (off)", + "name_plural": "firebrands (off)", + "description": "This is a combination of two Dark Age conflict-resolution classics, the broadsword and the torch. Use to light it up and show those heathen zombies who's Lord around here.", + "weight": "1474 g", + "volume": "2250 ml", + "price": 120000, + "to_hit": 1, + "bashing": 8, + "cutting": 35, + "material": "steel", + "symbol": "/", + "color": "light_gray", + "ammo": "gasoline", + "charges_per_use": 1, + "max_charges": 50, + "techniques": "WBLOCK_2", + "use_action": { + "type": "fireweapon_off", + "target_id": "broadfire_on", + "moves": 10, + "noise": 10, + "success_message": "Charge!", + "lacks_fuel_message": "No strength to fight!" + }, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ] ], + "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ] + }, + { + "id": "broadfire_on", + "copy-from": "broadfire_off", + "type": "TOOL", + "name": "firebrand (on)", + "name_plural": "firebrands (on)", + "description": "This is a combination of two Dark Age conflict-resolution classics, the broadsword and the torch. The blade is glowing with heat. Excalibur can eat its heart out. Use to shut it off.", + "turns_per_charge": 30, + "revert_to": "broadfire_off", + "use_action": [ + { + "type": "fireweapon_on", + "noise_chance": 35, + "noise_message": "Your blade burns for combat!", + "voluntary_extinguish_message": "Run away!", + "charges_extinguish_message": "Thy strength fades!", + "water_extinguish_message": "Your sword hisses in the water and goes out." + }, + { "type": "firestarter", "moves": 30 } + ], + "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID" ] + }, + { + "id": "zweifire_off", + "type": "TOOL", + "category": "weapons", + "name": "flammenschwert (aus)", + "name_plural": "flammenschwerter (aus)", + "//": "All of this is SUPPOSED to be in German.", + "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.", + "weight": "3400 g", + "volume": "3750 ml", + "price": 160000, + "bashing": 17, + "cutting": 40, + "material": "steel", + "symbol": "/", + "color": "light_gray", + "ammo": "gasoline", + "charges_per_use": 1, + "max_charges": 50, + "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], + "use_action": { + "type": "fireweapon_off", + "target_id": "zweifire_on", + "moves": 10, + "noise": 10, + "success_message": "Die Klinge deines Schwertes brennt!", + "lacks_fuel_message": "Dein Flammenschwert hat keinen Brennstoff mehr." + }, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 1 ] ], + "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ] + }, + { + "id": "zweifire_on", + "type": "TOOL", + "category": "weapons", + "name": "flammenschwert", + "name_plural": "flammenschwerter", + "//": "All of this is SUPPOSED to be in German.", + "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.", + "weight": "3400 g", + "volume": "3750 ml", + "price": 160000, + "bashing": 17, + "cutting": 40, + "material": "steel", + "symbol": "/", + "color": "red", + "ammo": "gasoline", + "max_charges": 50, + "turns_per_charge": 30, + "revert_to": "zweifire_off", + "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], + "use_action": [ + { + "type": "fireweapon_on", + "noise_chance": 35, + "noise_message": "Das Feuer um deine Schwertklinge leuchtet hell!", + "voluntary_extinguish_message": "Die Flamme deines Schwertes erlischt.", + "charges_extinguish_message": "Deinem Flammenschwert ist der Brennstoff ausgegangen!", + "water_extinguish_message": "Dein Schwert zischt und erlischt." + }, + { "type": "firestarter", "moves": 30 } + ], + "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH", "ALWAYS_TWOHAND" ] + }, + { + "type": "GENERIC", + "id": "battletorch_done", + "name": "burnt out Louisville Slaughterer", + "description": "A sturdy wood bat, wrapped in flame-resistant Nomex fabric. Makes a good melee weapon but better be disassembled to recycle the baseball bat and some Nomex patches.", + "weight": "1343 g", + "to_hit": 3, + "color": "brown", + "symbol": "/", + "material": [ "wood" ], + "techniques": [ "WBLOCK_1" ], + "flags": [ "DURABLE_MELEE" ], + "volume": "1750 ml", + "bashing": 19, + "price": 18000 + }, + { + "id": "battletorch", + "type": "TOOL", + "category": "weapons", + "name": "Louisville Slaughterer", + "description": "This is sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. Light it, and the ball game will REALLY heat up. You'll need a lighter or matches to light it.", + "weight": "1485 g", + "volume": "2 L", + "price": 16000, + "to_hit": 3, + "bashing": 18, + "material": [ "wood", "nomex" ], + "symbol": "/", + "color": "brown", + "initial_charges": 25, + "max_charges": 25, + "charges_per_use": 1, + "techniques": [ "WBLOCK_1" ], + "use_action": { + "target": "battletorch_lit", + "msg": "You light the Louisville Slaughterer.", + "active": true, + "need_fire": 1, + "menu_text": "Light", + "type": "transform" + }, + "flags": [ "DURABLE_MELEE" ] + }, + { + "id": "battletorch_lit", + "type": "TOOL", + "category": "weapons", + "name": "Louisville Slaughterer", + "name_plural": "Louisville Slaughterers", + "description": "This is a sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. It is burning brightly, and makes it much easier to see the baselines at night games (It also makes the umpire FAR more likely to call a ball instead of a strike).", + "weight": "1485 g", + "volume": "2 L", + "price": 16000, + "to_hit": 3, + "bashing": 18, + "material": [ "wood", "nomex" ], + "symbol": "/", + "color": "red", + "initial_charges": 25, + "max_charges": 25, + "turns_per_charge": 20, + "revert_to": "battletorch_done", + "techniques": [ "WBLOCK_1" ], + "use_action": [ + { "type": "firestarter", "moves": 30 }, + { + "target": "battletorch", + "msg": "The Louisville Slaughterer is extinguished.", + "active": false, + "menu_text": "Extinguish", + "type": "transform" + } + ], + "flags": [ "FIRE", "LIGHT_310", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ] } ] diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index a0480d07b0d7a..0673ff8d84a3a 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -449,63 +449,6 @@ "symbol": ";", "color": "white" }, - { - "id": "shishkebab_off", - "type": "TOOL", - "category": "weapons", - "name": "shishkebab (off)", - "name_plural": "shishkebabs (off)", - "description": "This is a large blade with a fuel pipe on the side, and a small tank and igniter built into the insulated hilt. When filled with gasoline, the blade can be made scorching hot to singe enemies and light your way. Use to ignite.", - "weight": "1701 g", - "volume": "2500 ml", - "price": 10000, - "bashing": 4, - "cutting": 14, - "material": [ "steel", "plastic" ], - "symbol": "/", - "color": "light_gray", - "ammo": "gasoline", - "charges_per_use": 1, - "max_charges": 50, - "use_action": { - "type": "fireweapon_off", - "target_id": "shishkebab_on", - "moves": 10, - "noise": 10, - "success_chance": 5, - "success_message": "Let's dance, Zeds!", - "failure_message": "Aw, dangit. It fails to start!", - "lacks_fuel_message": "This thing needs some fuel!" - }, - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", -30 ] ], - "techniques": [ "WBLOCK_1" ], - "flags": [ "FIRE", "SHEATH_SWORD" ] - }, - { - "id": "shishkebab_on", - "copy-from": "shishkebab_off", - "type": "TOOL", - "name": "shishkebab (on)", - "name_plural": "shishkebabs (on)", - "description": "This is a large blade with a fuel pipe on the side, and a small tank and igniter built into the insulated hilt. The blade is glowing brightly. Use to shut off the gas.", - "turns_per_charge": 20, - "revert_to": "shishkebab_off", - "use_action": [ - { - "type": "fireweapon_on", - "noise": 10, - "noise_chance": 25, - "noise_message": "Your shishkebab crackles!", - "auto_extinguish_chance": 75, - "auto_extinguish_message": "Bummer, man! Your shishkebab's flame flickers and dies out.", - "voluntary_extinguish_message": "Peace out. Your shishkebab's flame dies.", - "charges_extinguish_message": "Uncool, outta gas! Your shishkebab's flame goes out.", - "water_extinguish_message": "Your shishkebab hisses in the water and goes out." - }, - { "type": "firestarter", "moves": 30 } - ], - "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "TRADER_AVOID" ] - }, { "id": "small_space_heater", "type": "TOOL", diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 5c9f3c2f0941e..323f2bbb72042 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -300,8 +300,6 @@ "cu_pipe", "diveknife", "fighter_sting", - "firemachete_off", - "firemachete_on", "glass_shiv", "hammer", "knife_combat", @@ -326,8 +324,6 @@ "shillelagh", "shillelagh_fake", "shillelagh_weighted", - "shishkebab_off", - "shishkebab_on", "shocktonfa_off", "shocktonfa_on", "stick", @@ -389,8 +385,6 @@ "broadsword", "broadsword_inferior", "broadsword_fake", - "broadfire_off", - "broadfire_on", "cane", "cavalry_sabre", "cavalry_sabre_fake", @@ -744,8 +738,6 @@ "broadsword", "broadsword_inferior", "broadsword_fake", - "broadfire_off", - "broadfire_on", "estoc", "estoc_inferior", "estoc_fake", @@ -755,8 +747,6 @@ "sword_crude", "sword_nail", "sword_wood", - "zweifire_off", - "zweifire_on", "zweihander", "zweihander_inferior", "zweihander_fake" @@ -869,8 +859,6 @@ "broadsword", "broadsword_inferior", "broadsword_fake", - "broadfire_off", - "broadfire_on", "butterfly_swords", "cavalry_sabre", "cavalry_sabre_fake", @@ -880,8 +868,6 @@ "cutlass", "dao", "diveknife", - "firekatana_off", - "firekatana_on", "i_staff", "jian", "jian_inferior", @@ -916,8 +902,6 @@ "shillelagh", "shillelagh_fake", "shillelagh_weighted", - "shishkebab_off", - "shishkebab_on", "shock_staff", "sickle", "switchblade", @@ -998,8 +982,6 @@ "bokken", "bokken_inferior", "bokken_fake", - "firekatana_off", - "firekatana_on", "katana", "katana_inferior", "katana_fake", @@ -1103,8 +1085,6 @@ "butterfly_swords", "cudgel", "diveknife", - "firemachete_off", - "firemachete_on", "glaive", "golf_club", "hockey_stick", @@ -1143,8 +1123,6 @@ "shillelagh", "shillelagh_fake", "shillelagh_weighted", - "shishkebab_off", - "shishkebab_on", "spear_knife", "spear_knife_superior", "spear_spike", diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json index 1b8d90406d71a..15a5da9879a10 100644 --- a/data/json/npcs/NC_JUNK_SHOPKEEP.json +++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json @@ -145,8 +145,6 @@ [ "pistol_scope", 10 ], [ "improve_sights", 20 ], [ "combatsaw_off", 5 ], - [ "firemachete_off", 5 ], - [ "shishkebab_off", 5 ], [ "helsing", 5 ], [ "tihar", 5 ], [ "ashot", 5 ], diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json index da837fc20736f..6d5e3fbf8e16e 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json @@ -203,8 +203,6 @@ [ "pistol_scope", 10 ], [ "improve_sights", 20 ], [ "combatsaw_off", 5 ], - [ "firemachete_off", 5 ], - [ "shishkebab_off", 5 ], [ "helsing", 5 ], [ "tihar", 5 ], [ "ashot", 5 ] diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index f95621da6a057..9968d6a0f03da 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -412,12 +412,6 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "leather", 2 ] ], [ [ "string_6", 2 ] ] ] }, - { - "result": "battletorch_done", - "type": "uncraft", - "time": "2 m", - "components": [ [ [ "bat", 1 ] ], [ [ "nomex", 5 ] ] ] - }, { "result": "bindle", "type": "uncraft", diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index c902bfb4cdec7..73a0c61612ffc 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2253,5 +2253,40 @@ "type": "recipe", "result": "crucible", "obsolete": true + }, + { + "type": "recipe", + "result": "battletorch_done", + "obsolete": true + }, + { + "type": "recipe", + "result": "battletorch", + "obsolete": true + }, + { + "type": "recipe", + "result": "shishkebab_off", + "obsolete": true + }, + { + "type": "recipe", + "result": "firemachete_off", + "obsolete": true + }, + { + "type": "recipe", + "result": "broadfire_off", + "obsolete": true + }, + { + "type": "recipe", + "result": "firekatana_off", + "obsolete": true + }, + { + "type": "recipe", + "result": "zweifire_off", + "obsolete": true } ] diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 051b5929f97e8..e4bb0a7ba96d3 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -1730,105 +1730,6 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "sword_wood", 1 ] ], [ [ "nail", 12 ] ] ] }, - { - "type": "recipe", - "result": "shishkebab_off", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_CUTTING", - "skill_used": "mechanics", - "difficulty": 1, - "time": "10 m", - "reversible": true, - "decomp_learn": 3, - "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], - "components": [ - [ [ "leather", 5 ] ], - [ [ "pipe", 1 ] ], - [ [ "makeshift_machete", 1 ] ], - [ [ "pilot_light", 1 ] ], - [ [ "aux_pressurized_tank", 1 ] ] - ] - }, - { - "type": "recipe", - "result": "firemachete_off", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_CUTTING", - "skill_used": "mechanics", - "difficulty": 4, - "time": "20 m", - "reversible": true, - "decomp_learn": 4, - "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], - "using": [ [ "welding_standard", 2 ] ], - "components": [ - [ [ "leather", 5 ] ], - [ [ "pipe", 1 ] ], - [ [ "machete", 1 ] ], - [ [ "pilot_light", 1 ] ], - [ [ "aux_pressurized_tank", 1 ] ] - ] - }, - { - "type": "recipe", - "result": "broadfire_off", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_CUTTING", - "skill_used": "mechanics", - "difficulty": 5, - "time": "30 m", - "reversible": true, - "decomp_learn": 4, - "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], - "using": [ [ "welding_standard", 2 ] ], - "components": [ - [ [ "leather", 5 ] ], - [ [ "pipe", 1 ] ], - [ [ "broadsword", 1 ] ], - [ [ "pilot_light", 1 ] ], - [ [ "aux_pressurized_tank", 1 ] ] - ] - }, - { - "type": "recipe", - "result": "firekatana_off", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_CUTTING", - "skill_used": "mechanics", - "difficulty": 5, - "time": "30 m", - "reversible": true, - "decomp_learn": 4, - "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], - "using": [ [ "welding_standard", 2 ] ], - "components": [ - [ [ "leather", 5 ] ], - [ [ "pipe", 1 ] ], - [ [ "katana", 1 ] ], - [ [ "pilot_light", 1 ] ], - [ [ "aux_pressurized_tank", 1 ] ] - ] - }, - { - "type": "recipe", - "result": "zweifire_off", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_CUTTING", - "skill_used": "mechanics", - "difficulty": 5, - "time": "30 m", - "reversible": true, - "decomp_learn": 4, - "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], - "using": [ [ "welding_standard", 2 ] ], - "components": [ - [ [ "leather", 5 ] ], - [ [ "pipe", 1 ] ], - [ [ "zweihander", 1 ] ], - [ [ "pilot_light", 1 ] ], - [ [ "aux_pressurized_tank", 1 ] ] - ] - }, { "type": "recipe", "result": "tihar", diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index d01f895f31a8a..c97fb969f0ee8 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -12,30 +12,6 @@ "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], "components": [ [ [ "2x4", 1 ] ], [ [ "nail", 5 ] ] ] }, - { - "result": "battletorch", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_BASHING", - "skill_used": "fabrication", - "time": "2 m", - "reversible": true, - "autolearn": true, - "components": [ - [ [ "rag", 1 ] ], - [ [ "bat", 1 ] ], - [ [ "nomex", 5 ] ], - [ - [ "lamp_oil", 50 ], - [ "motor_oil", 50 ], - [ "chem_ethanol", 100 ], - [ "denat_alcohol", 100 ], - [ "gasoline", 250 ], - [ "diesel", 250 ], - [ "biodiesel", 250 ] - ] - ] - }, { "type": "recipe", "result": "shillelagh", diff --git a/data/mods/CrazyCataclysm/crazy_items.json b/data/mods/CrazyCataclysm/crazy_items.json index c0a134a30f431..caee9b8fd927a 100644 --- a/data/mods/CrazyCataclysm/crazy_items.json +++ b/data/mods/CrazyCataclysm/crazy_items.json @@ -97,5 +97,209 @@ "durability": 7, "magazine_well": 1, "magazines": [ [ "9mm", [ "hptc9mag_8rd", "hptc9mag_10rd", "hptc9mag_15rd" ] ] ] + }, + { + "id": "firekatana_off", + "type": "TOOL", + "category": "weapons", + "name": "Rising Sun", + "name_plural": "Rising Suns", + "description": "This is a katana with a nozzle just behind the cutting edge of the blade. People love fire, and people love katanas, so why not put them together? The gas burners attached to this blade can really turn up the heat on your foes. Use to ignite.", + "weight": "1400 g", + "volume": "2250 ml", + "price": 98000, + "bashing": 4, + "cutting": 31, + "material": "steel", + "symbol": "/", + "color": "light_gray", + "ammo": "gasoline", + "charges_per_use": 1, + "max_charges": 50, + "techniques": [ "RAPID", "WBLOCK_2" ], + "use_action": { + "type": "fireweapon_off", + "target_id": "firekatana_on", + "moves": 10, + "noise": 10, + "success_message": "The Sun rises.", + "lacks_fuel_message": "Time stands still." + }, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 6 ] ], + "flags": [ "FIRE", "DURABLE_MELEE", "SHEATH_SWORD" ] + }, + { + "id": "firekatana_on", + "type": "TOOL", + "category": "weapons", + "name": "Rising Sun", + "name_plural": "Rising Suns", + "description": "This is a katana that glows with the fury and heat of the SUN! Well, okay it's not THAT hot, but getting hit with it still stings like the dickens. Use to shut off the gas.", + "weight": "1400 g", + "volume": "2250 ml", + "price": 98000, + "bashing": 4, + "cutting": 31, + "material": "steel", + "symbol": "/", + "color": "red", + "ammo": "gasoline", + "max_charges": 50, + "turns_per_charge": 30, + "revert_to": "firekatana_off", + "techniques": [ "RAPID", "WBLOCK_2" ], + "use_action": [ + { + "type": "fireweapon_on", + "noise_chance": 35, + "noise_message": "The Sun shines brightly.", + "voluntary_extinguish_message": "The Sun sets.", + "charges_extinguish_message": "The Light Fades.", + "water_extinguish_message": "Your sword hisses in the water and goes out." + }, + { "type": "firestarter", "moves": 30 } + ], + "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ] + }, + { + "id": "zweifire_off", + "type": "TOOL", + "category": "weapons", + "name": "flammenschwert (aus)", + "name_plural": "flammenschwerter (aus)", + "//": "All of this is SUPPOSED to be in German.", + "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.", + "weight": "3400 g", + "volume": "3750 ml", + "price": 160000, + "bashing": 17, + "cutting": 40, + "material": "steel", + "symbol": "/", + "color": "light_gray", + "ammo": "gasoline", + "charges_per_use": 1, + "max_charges": 50, + "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], + "use_action": { + "type": "fireweapon_off", + "target_id": "zweifire_on", + "moves": 10, + "noise": 10, + "success_message": "Die Klinge deines Schwertes brennt!", + "lacks_fuel_message": "Dein Flammenschwert hat keinen Brennstoff mehr." + }, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 1 ] ], + "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ] + }, + { + "id": "zweifire_on", + "type": "TOOL", + "category": "weapons", + "name": "flammenschwert", + "name_plural": "flammenschwerter", + "//": "All of this is SUPPOSED to be in German.", + "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.", + "weight": "3400 g", + "volume": "3750 ml", + "price": 160000, + "bashing": 17, + "cutting": 40, + "material": "steel", + "symbol": "/", + "color": "red", + "ammo": "gasoline", + "max_charges": 50, + "turns_per_charge": 30, + "revert_to": "zweifire_off", + "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], + "use_action": [ + { + "type": "fireweapon_on", + "noise_chance": 35, + "noise_message": "Das Feuer um deine Schwertklinge leuchtet hell!", + "voluntary_extinguish_message": "Die Flamme deines Schwertes erlischt.", + "charges_extinguish_message": "Deinem Flammenschwert ist der Brennstoff ausgegangen!", + "water_extinguish_message": "Dein Schwert zischt und erlischt." + }, + { "type": "firestarter", "moves": 30 } + ], + "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH", "ALWAYS_TWOHAND" ] + }, + { + "type": "GENERIC", + "id": "battletorch_done", + "name": "burnt out Louisville Slaughterer", + "description": "A sturdy wood bat, wrapped in flame-resistant Nomex fabric. Makes a good melee weapon but better be disassembled to recycle the baseball bat and some Nomex patches.", + "weight": "1343 g", + "to_hit": 3, + "color": "brown", + "symbol": "/", + "material": [ "wood" ], + "techniques": [ "WBLOCK_1" ], + "flags": [ "DURABLE_MELEE" ], + "volume": "1750 ml", + "bashing": 19, + "price": 18000 + }, + { + "id": "battletorch", + "type": "TOOL", + "category": "weapons", + "name": "Louisville Slaughterer", + "description": "This is sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. Light it, and the ball game will REALLY heat up. You'll need a lighter or matches to light it.", + "weight": "1485 g", + "volume": "2 L", + "price": 16000, + "to_hit": 3, + "bashing": 18, + "material": [ "wood", "nomex" ], + "symbol": "/", + "color": "brown", + "initial_charges": 25, + "max_charges": 25, + "charges_per_use": 1, + "techniques": [ "WBLOCK_1" ], + "use_action": { + "target": "battletorch_lit", + "msg": "You light the Louisville Slaughterer.", + "active": true, + "need_fire": 1, + "menu_text": "Light", + "type": "transform" + }, + "flags": [ "DURABLE_MELEE" ] + }, + { + "id": "battletorch_lit", + "type": "TOOL", + "category": "weapons", + "name": "Louisville Slaughterer", + "name_plural": "Louisville Slaughterers", + "description": "This is a sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. It is burning brightly, and makes it much easier to see the baselines at night games (It also makes the umpire FAR more likely to call a ball instead of a strike).", + "weight": "1485 g", + "volume": "2 L", + "price": 16000, + "to_hit": 3, + "bashing": 18, + "material": [ "wood", "nomex" ], + "symbol": "/", + "color": "red", + "initial_charges": 25, + "max_charges": 25, + "turns_per_charge": 20, + "revert_to": "battletorch_done", + "techniques": [ "WBLOCK_1" ], + "use_action": [ + { "type": "firestarter", "moves": 30 }, + { + "target": "battletorch", + "msg": "The Louisville Slaughterer is extinguished.", + "active": false, + "menu_text": "Extinguish", + "type": "transform" + } + ], + "flags": [ "FIRE", "LIGHT_310", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID", "WATER_EXTINGUISH" ] } ] diff --git a/data/mods/CrazyCataclysm/crazy_recipes.json b/data/mods/CrazyCataclysm/crazy_recipes.json new file mode 100644 index 0000000000000..1c074d00f261f --- /dev/null +++ b/data/mods/CrazyCataclysm/crazy_recipes.json @@ -0,0 +1,72 @@ +[ + { + "result": "battletorch_done", + "type": "uncraft", + "time": "2 m", + "components": [ [ [ "bat", 1 ] ], [ [ "nomex", 5 ] ] ] + }, + { + "type": "recipe", + "result": "firekatana_off", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_CUTTING", + "skill_used": "mechanics", + "difficulty": 5, + "time": "30 m", + "reversible": true, + "decomp_learn": 4, + "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], + "using": [ [ "welding_standard", 2 ] ], + "components": [ + [ [ "leather", 5 ] ], + [ [ "pipe", 1 ] ], + [ [ "katana", 1 ] ], + [ [ "pilot_light", 1 ] ], + [ [ "aux_pressurized_tank", 1 ] ] + ] + }, + { + "type": "recipe", + "result": "zweifire_off", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_CUTTING", + "skill_used": "mechanics", + "difficulty": 5, + "time": "30 m", + "reversible": true, + "decomp_learn": 4, + "book_learn": [ [ "welding_book", 8 ], [ "book_icef", 4 ] ], + "using": [ [ "welding_standard", 2 ] ], + "components": [ + [ [ "leather", 5 ] ], + [ [ "pipe", 1 ] ], + [ [ "zweihander", 1 ] ], + [ [ "pilot_light", 1 ] ], + [ [ "aux_pressurized_tank", 1 ] ] + ] + }, + { + "result": "battletorch", + "type": "recipe", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_BASHING", + "skill_used": "fabrication", + "time": "2 m", + "reversible": true, + "autolearn": true, + "components": [ + [ [ "rag", 1 ] ], + [ [ "bat", 1 ] ], + [ [ "nomex", 5 ] ], + [ + [ "lamp_oil", 50 ], + [ "motor_oil", 50 ], + [ "chem_ethanol", 100 ], + [ "denat_alcohol", 100 ], + [ "gasoline", 250 ], + [ "diesel", 250 ], + [ "biodiesel", 250 ] + ] + ] + } +] diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md index e7291158b9925..6f117e27eaddd 100644 --- a/doc/JSON_FLAGS.md +++ b/doc/JSON_FLAGS.md @@ -307,7 +307,6 @@ Some armor flags, such as `WATCH` and `ALARMCLOCK` are compatible with other ite - ```ACIDBOMB``` Pull the pin on an acid bomb. - ```AUTOCLAVE``` Sterilize one CBM by autoclaving it. - ```ARROW_FLAMABLE``` Light your arrow and let fly. -- ```BATTLETORCH``` Light the battle torch. - ```BELL``` Ring the bell. - ```BOLTCUTTERS``` Use your town key to gain access anywhere. - ```BREAK_STICK``` Breaks long stick into two.