Skip to content

Commit 2b1554d

Browse files
Kenan2000Kenan2000
authored
Merge pull request #107 from meelock/fixblaze
Add missing parts of BlazeIndustries to Blazemod thanks to meelock's work
2 parents 1284a1c + 5478294 commit 2b1554d

File tree

8 files changed

+1064
-93
lines changed

8 files changed

+1064
-93
lines changed

‎Kenan-Modpack/blazemod/items/vehicle/blaze_gun.json‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
[
2+
{
3+
"id": "blaze_marlin_9a",
4+
"looks_like": "ar15",
5+
"type": "GUN",
6+
"reload_noise_volume": 10,
7+
"name": { "str": "modified Marlin 39A" },
8+
"description": "A Marlin 39A, modified for use in a vehicle turret",
9+
"weight": "2948 g",
10+
"volume": "2500 ml",
11+
"price": "230 USD",
12+
"price_postapoc": "20 USD",
13+
"to_hit": -1,
14+
"bashing": 12,
15+
"material": [ "iron", "wood" ],
16+
"symbol": "(",
17+
"color": "brown",
18+
"ammo": [ "22" ],
19+
"skill": "rifle",
20+
"ranged_damage": { "damage_type": "bullet", "amount": 5 },
21+
"dispersion": 90,
22+
"durability": 8,
23+
"blackpowder_tolerance": 56,
24+
"clip_size": 19,
25+
"valid_mod_locations": [
26+
[ "accessories", 4 ],
27+
[ "barrel", 1 ],
28+
[ "bore", 1 ],
29+
[ "brass catcher", 1 ],
30+
[ "grip", 1 ],
31+
[ "mechanism", 4 ],
32+
[ "muzzle", 1 ],
33+
[ "rail", 1 ],
34+
[ "sights", 1 ],
35+
[ "sling", 1 ],
36+
[ "stock", 1 ],
37+
[ "underbarrel", 1 ]
38+
],
39+
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
40+
"flags": [ "RELOAD_ONE" ],
41+
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "22": 19 } } ]
42+
},
43+
{
44+
"id": "blaze_sks",
45+
"looks_like": "ar15",
46+
"type": "GUN",
47+
"reload_noise_volume": 10,
48+
"name": { "str": "modified SKS" },
49+
"description": "An SKS, modified to be suitable for use in a vehicle turret",
50+
"weight": "3850 g",
51+
"volume": "2838 ml",
52+
"longest_side": "103 cm",
53+
"price": "380 USD",
54+
"price_postapoc": "35 USD",
55+
"to_hit": -1,
56+
"bashing": 12,
57+
"material": [ "steel", "wood" ],
58+
"symbol": "(",
59+
"color": "brown",
60+
"ammo": [ "762" ],
61+
"skill": "rifle",
62+
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
63+
"dispersion": 90,
64+
"durability": 8,
65+
"clip_size": 10,
66+
"barrel_volume": "500 ml",
67+
"built_in_mods": [ "inter_bayonet" ],
68+
"valid_mod_locations": [
69+
[ "accessories", 4 ],
70+
[ "barrel", 1 ],
71+
[ "bore", 1 ],
72+
[ "brass catcher", 1 ],
73+
[ "grip", 1 ],
74+
[ "mechanism", 4 ],
75+
[ "muzzle", 1 ],
76+
[ "rail", 1 ],
77+
[ "sights", 1 ],
78+
[ "sling", 1 ],
79+
[ "stock", 1 ],
80+
[ "underbarrel", 1 ]
81+
],
82+
"flags": [ "RELOAD_ONE", "NEVER_JAMS" ],
83+
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "762": 10 } } ]
84+
}
85+
]

‎Kenan-Modpack/blazemod/items/vehicle/blaze_solar.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,44 @@
44
"type": "GENERIC",
55
"category": "veh_parts",
66
"name": { "str": "solar array" },
7-
"description": "A dozen solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able track the sun. However, this comes at the cost of being prohibitively heavy.",
8-
"weight": "265400 g",
9-
"volume": "62500 ml",
7+
"description": "A vertical array of three solar panels set on a chassis rising above one another on a metal pole with rudimentary tracking and motors. Due to the flimsy nature of the hydraulics and high surface area profile to maximize sunlight, they can't really be installed onto an existing vehicle. Requires a jumper cable or similar to pull power from.",
8+
"weight": "50000 g",
9+
"volume": "10000 ml",
1010
"price": "1200 USD",
11+
"price_postapoc": "10 USD",
1112
"to_hit": -4,
1213
"bashing": 1,
1314
"material": [ "glass" ],
1415
"symbol": "]",
1516
"color": "yellow"
1617
},
1718
{
18-
"id": "solar_array2",
19+
"id": "reinforced_solar_array",
1920
"type": "GENERIC",
20-
"category": "veh_parts",
21+
"copy-from": "solar_array",
22+
"name": { "str": "reinforced solar array" },
23+
"description": "A vertical array of three reinforced solar panels set on a chassis rising above one another on a metal pole with rudimentary tracking and motors. Due to the flimsy nature of the hydraulics and high surface area profile to maximize sunlight, they can't really be installed onto an existing vehicle. Requires a jumper cable or similar to pull power from.",
24+
"weight": "80459 g",
25+
"volume": "20500 ml",
26+
"material": [ "glass", "steel" ],
27+
"color": "light_blue"
28+
},
29+
{
30+
"id": "solar_array_v2",
31+
"type": "GENERIC",
32+
"copy-from": "solar_array",
2133
"name": { "str": "upgraded solar array" },
22-
"description": "A dozen upgraded solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.",
23-
"weight": "319328 g",
24-
"volume": "62500 ml",
25-
"price": "1500 USD",
26-
"to_hit": -4,
27-
"bashing": 1,
28-
"material": [ "glass" ],
29-
"symbol": "]",
30-
"color": "yellow"
34+
"description": "A vertical array of three upgraded solar panels set on a chassis rising above one another on a metal pole with rudimentary tracking and motors. Due to the flimsy nature of the hydraulics and high surface area profile to maximize sunlight, they can't really be installed onto an existing vehicle. Requires a jumper cable or similar to pull power from.",
35+
"weight": "63482 g",
36+
"volume": "14500 ml"
3137
},
3238
{
33-
"id": "solar_array2r",
39+
"id": "reinforced_solar_array_v2",
3440
"type": "GENERIC",
35-
"category": "veh_parts",
41+
"copy-from": "reinforced_solar_array",
3642
"name": { "str": "upgraded reinforced solar array" },
37-
"description": "A dozen upgraded reinforced solar panels set on a chassis reaching several meters high. It keeps the fragile panels safely away from any potential threats and improves efficiency due to being able to track the sun. However, this comes at the cost of being prohibitively heavy and obstructive.",
38-
"weight": "382736 g",
39-
"volume": "80500 ml",
40-
"price": "1500 USD",
41-
"to_hit": -4,
42-
"bashing": 1,
43-
"material": [ "glass", "steel" ],
44-
"symbol": "]",
45-
"color": "light_blue"
43+
"description": "A vertical array of three upgraded reinforced solar panels set on a chassis rising above one another on a metal pole with rudimentary tracking and motors. Due to the flimsy nature of the hydraulics and high surface area profile to maximize sunlight, they can't really be installed onto an existing vehicle. Requires a jumper cable or similar to pull power from.",
44+
"weight": "95186 g",
45+
"volume": "23500 ml"
4646
}
4747
]

‎Kenan-Modpack/blazemod/recipes/blaze_construction_recipes.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[
2+
{
3+
"type": "construction",
4+
"id": "constr_blz_fridge_vehicle",
5+
"group": "convert_fridge_power_supply",
6+
"category": "FURN",
7+
"required_skills": [ [ "fabrication", 3 ], [ "electronics", 4 ], [ "mechanics", 3 ] ],
8+
"time": 30,
9+
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 2 } ],
10+
"components": [ [ [ "cable", 10 ] ], [ [ "power_supply", 1 ] ], [ [ "plastic_chunk", 2 ] ] ],
11+
"pre_note": "Converts a fridge to run off of vehicle power. You can 'e'xamine it afterwards to take it down for mounting.",
12+
"pre_terrain": "f_fridge",
13+
"post_terrain": "f_afs_fridge_vehicle"
14+
},
15+
{
16+
"type": "construction",
17+
"id": "constr_blz_freezer_vehicle",
18+
"group": "convert_vehicle_fridge_to_freezer",
19+
"category": "FURN",
20+
"required_skills": [ [ "electronics", 3 ], [ "mechanics", 3 ] ],
21+
"time": 20,
22+
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 3 }, { "id": "SAW_M", "level": 2 } ],
23+
"components": [ [ [ "cable", 10 ] ], [ [ "amplifier", 3 ] ], [ [ "refrigerant_tank", 2 ] ] ],
24+
"pre_note": "Further modifies a converted fridge to function as a freezer. You can 'e'xamine it afterwards to take it down for mounting.",
25+
"pre_terrain": "f_afs_fridge_vehicle",
26+
"post_terrain": "f_afs_freezer_vehicle"
27+
}
28+
]

‎Kenan-Modpack/blazemod/recipes/blaze_gun_recipes.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[
2+
{
3+
"result": "blaze_sks",
4+
"type": "recipe",
5+
"activity_level": "LIGHT_EXERCISE",
6+
"category": "CC_OTHER",
7+
"subcategory": "CSC_OTHER_PARTS",
8+
"skill_used": "mechanics",
9+
"difficulty": 2,
10+
"time": "20 m",
11+
"autolearn": true,
12+
"qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ],
13+
"components": [ [ [ "sks", 1 ] ] ]
14+
},
15+
{
16+
"result": "blaze_marlin_9a",
17+
"type": "recipe",
18+
"activity_level": "LIGHT_EXERCISE",
19+
"category": "CC_OTHER",
20+
"subcategory": "CSC_OTHER_PARTS",
21+
"skill_used": "mechanics",
22+
"difficulty": 2,
23+
"time": "20 m",
24+
"autolearn": true,
25+
"qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 } ],
26+
"components": [ [ [ "marlin_9a", 1 ] ] ]
27+
}
28+
]

0 commit comments

Comments
 (0)