Skip to content

Commit

Permalink
Obsolete flaming weapons (CleverRaven#37406)
Browse files Browse the repository at this point in the history 
* Obsolete flaming weapons

* Add flaming weapons to crazy cataclysm
  • Loading branch information
Matthew Taylor authored Jan 29, 2020
1 parent 36402aa commit 4230ca3
Show file tree
Hide file tree
Showing 16 changed files with 695 additions and 542 deletions.
2 changes: 0 additions & 2 deletions data/json/itemgroups/clothing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2351,8 +2351,6 @@
[ "balclava", 12 ],
[ "mask_survivorxl", 2 ],
[ "combatsaw_off", 1 ],
[ "firemachete_off", 1 ],
[ "shishkebab_off", 2 ],
[ "helsing", 1 ],
[ "tihar", 2 ],
[ "bigun", 2 ],
Expand Down
16 changes: 0 additions & 16 deletions data/json/items/melee.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
60 changes: 0 additions & 60 deletions data/json/items/melee/bludgeons.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
251 changes: 0 additions & 251 deletions data/json/items/melee/swords_and_blades.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Loading

0 comments on commit 4230ca3

Please sign in to comment.