Skip to content

Commit

Permalink
Blazemod update
Browse files Browse the repository at this point in the history
  • Loading branch information
TheGoatGod committed Sep 16, 2024
1 parent d0f67aa commit 499203a
Show file tree
Hide file tree
Showing 36 changed files with 273 additions and 492 deletions.
123 changes: 0 additions & 123 deletions data/Legacy_mods/mods/blazemod/Blazemod/blaze_override.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"sound_fail": "squish!",
"items": [ { "item": "bfeed", "count": [ 250, 500 ] } ]
},
"flags": [ "WALL", "TRANSPARENT", "EASY_DECONSTRUCT" ]
"flags": [ "WALL", "TRANSPARENT" ]
},
{
"id": "blob_pit_slime",
Expand All @@ -59,6 +59,6 @@
"sound_fail": "squish!",
"items": [ { "item": "bfeed", "count": [ 50, 250 ] } ]
},
"flags": [ "WALL", "TRANSPARENT", "EASY_DECONSTRUCT" ]
"flags": [ "WALL", "TRANSPARENT" ]
}
]
12 changes: 12 additions & 0 deletions data/Legacy_mods/mods/blazemod/Blazemod/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,17 @@
{
"id": "TURRET",
"type": "json_flag"
},
{
"id": "NON-FOULING",
"type": "json_flag"
},
{
"id": "FOLDABLE",
"type": "json_flag"
},
{
"id": "OVER",
"type": "json_flag"
}
]
10 changes: 0 additions & 10 deletions data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/blaze_ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"abstract": "canbomb_generic",
"type": "AMMO",
"name": { "str": "IED" },
"bashing": 8,
"material": [ "iron" ],
"symbol": "*",
"color": "red",
Expand Down Expand Up @@ -89,7 +88,6 @@
"weight": "3816 g",
"volume": "250 ml",
"price": "1800 USD",
"bashing": 8,
"material": [ "plastic" ],
"symbol": "*",
"color": "green",
Expand All @@ -108,7 +106,6 @@
"weight": "1455 g",
"volume": "2500 ml",
"price": "10 USD",
"bashing": 5,
"material": [ "wood" ],
"symbol": "=",
"color": "brown",
Expand All @@ -122,7 +119,6 @@
"type": "AMMO",
"name": { "str": "IED rigged bolt" },
"volume": "250 ml",
"bashing": 8,
"material": [ "iron" ],
"symbol": "*",
"color": "red",
Expand Down Expand Up @@ -190,7 +186,6 @@
"weight": "2055 g",
"volume": "1250 ml",
"price": "20 USD",
"bashing": 1,
"material": [ "wood", "iron" ],
"symbol": "=",
"color": "green",
Expand All @@ -208,7 +203,6 @@
"weight": "3816 g",
"volume": "250 ml",
"price": "1800 USD",
"bashing": 8,
"material": [ "plastic" ],
"symbol": "*",
"color": "green",
Expand All @@ -227,7 +221,6 @@
"weight": "1555 g",
"volume": "1250 ml",
"price": "10 USD",
"bashing": 1,
"material": [ "wood" ],
"symbol": "=",
"color": "green",
Expand All @@ -246,7 +239,6 @@
"volume": "250 ml",
"price": "2 USD",
"to_hit": -3,
"bashing": 8,
"material": [ "steel" ],
"symbol": "*",
"color": "blue",
Expand All @@ -264,7 +256,6 @@
"weight": "1255 g",
"volume": "250 ml",
"price": "2 USD",
"bashing": 1,
"material": [ "steel" ],
"symbol": "=",
"color": "green",
Expand All @@ -282,7 +273,6 @@
"weight": "1 g",
"volume": "250 ml",
"price": "0 cent",
"bashing": 1,
"material": [ "iron" ],
"symbol": "=",
"color": "blue",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"weight": "3 g",
"volume": "250 ml",
"price": "100 USD",
"bashing": 1,
"material": [ "diamond" ],
"symbol": "=",
"color": "white",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"material": [ "plastic" ],
"volume": "250 ml",
"weight": "68 g",
"bashing": 1,
"ammo_type": "fusion",
"damage": { "damage_type": "stab", "amount": 11, "armor_penetration": 14 },
"range": 30,
Expand Down
41 changes: 41 additions & 0 deletions data/Legacy_mods/mods/blazemod/Blazemod/items/ammo/metal_rail.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[
{
"id": "rebar_rail",
"type": "AMMO",
"name": { "str": "rebar rail" },
"description": "A short piece of ferromagnetic rebar which has been straightened and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.",
"weight": "236 g",
"longest_side": "16 cm",
"volume": "300 ml",
"price": 1000,
"price_postapoc": 250,
"to_hit": -1,
"material": [ "steel" ],
"symbol": "=",
"color": "light_gray",
"count": 10,
"ammo_type": "metal_rail",
"range": 40,
"damage": { "damage_type": "stab", "amount": 70, "armor_penetration": 25 },
"dispersion": 150,
"effects": [ "RECYCLED", "NON_FOULING" ],
"melee_damage": { "bash": 5, "cut": 1 }
},
{
"id": "steel_rail",
"copy-from": "rebar_rail",
"type": "AMMO",
"name": { "str": "steel rail" },
"description": "A short piece of steel which has been forged true and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.",
"weight": "212 g",
"volume": "270 ml",
"price": 1500,
"price_postapoc": 500,
"material": [ "steel" ],
"color": "light_gray",
"dispersion": 0,
"effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
"relative": { "range": 10, "damage": { "damage_type": "stab", "amount": -5, "armor_penetration": 15 } },
"melee_damage": { "bash": 4, "cut": 2 }
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"description": "Seeing this is a bug.",
"weight": "3 g",
"volume": "3 ml",
"bashing": 1,
"phase": "solid",
"material": [ "vpower" ],
"flags": [ "PSEUDO", "PERPETUAL" ],
Expand Down
8 changes: 8 additions & 0 deletions data/Legacy_mods/mods/blazemod/Blazemod/items/ammo_types.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"type": "ammunition_type",
"id": "metal_rail",
"name": "ferrous rail projectile",
"default": "rebar_rail"
}
]
Loading

0 comments on commit 499203a

Please sign in to comment.