Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blazemod Mini-PR: Transfer tank treads and their dependents from blazemod to tankmod #40067

Merged
merged 1 commit into from
May 2, 2020
Merged

Blazemod Mini-PR: Transfer tank treads and their dependents from blazemod to tankmod #40067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/mods/HeavyMining/modinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"name": "Roadheader and other mining vehicles",
"authors": [ "Ckpyt" ],
"maintainers": [ "Ckpyt in the forest" ],
"description": "Adds a few mining vehicles, requires Vehicle Additions Pack.",
"description": "Adds a few mining vehicles, requires Tanks and Other Vehicles as it is no longer dependent on blazemod.",
"category": "vehicles",
"dependencies": [ "dda", "blazemod" ],
"dependencies": [ "dda", "Tanks" ],
"obsolete": true
}
]
51 changes: 51 additions & 0 deletions data/mods/Tanks/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,5 +506,56 @@
"skill": "launcher",
"price": 6000,
"required_level": 3
},
{
"id": "tread1",
"type": "WHEEL",
"category": "veh_parts",
"name": { "str": "Rubber Caterpillar Track" },
"description": "A short, interlocking set of hard rubber tracks reinforced by stiff wire held in place by a set of smaller wheels. Similar with what you might see used on light construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is quite heavy.",
"weight": "32368 g",
"volume": "50 L",
"price": 25500,
"to_hit": -3,
"bashing": 30,
"material": [ "plastic", "steel" ],
"symbol": "]",
"color": "white",
"diameter": 30,
"width": 15
},
{
"id": "tread2",
"type": "WHEEL",
"category": "veh_parts",
"name": { "str": "Steel Caterpillar Track" },
"description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on large construction vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is very heavy.",
"weight": "95968 g",
"volume": "75 L",
"price": 45500,
"to_hit": -3,
"bashing": 30,
"material": [ "steel" ],
"symbol": "]",
"color": "white",
"diameter": 50,
"width": 25
},
{
"id": "tread3",
"type": "WHEEL",
"category": "veh_parts",
"name": { "str": "Reinforced Caterpillar Track" },
"description": "A short, interlocking set of shaped steel tracks held in place by a set of smaller wheels. Similar with what you might see used on APCs and armored vehicles. It's significantly stronger than regular tires due to not being at risk of bursting; but is extremely heavy.",
"weight": "287824 g",
"volume": "87500 ml",
"price": 75500,
"to_hit": -3,
"bashing": 30,
"material": [ "hardsteel", "steel" ],
"symbol": "]",
"color": "white",
"diameter": 60,
"width": 30
}
]
2 changes: 1 addition & 1 deletion data/mods/Tanks/modinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"maintainers": [ "BorkBorkGoesTheCode" ],
"description": "Adds a few armored fighting vehicles and other such things, requires Vehicle Additions Pack.",
"category": "vehicles",
"dependencies": [ "dda", "blazemod" ],
"dependencies": [ "dda" ],
"obsolete": true
}
]
45 changes: 45 additions & 0 deletions data/mods/Tanks/recipes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,5 +179,50 @@
[ [ "cable", 10 ] ],
[ [ "chem_hmtd", 10 ] ]
]
},
{
"result": "tread1",
"type": "recipe",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 6,
"skills_required": [ "mechanics", 6 ],
"time": "116 h 40 m",
"autolearn": true,
"using": [ [ "forging_standard", 10 ], [ "steel_standard", 10 ] ],
"qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
"components": [ [ [ "wire", 20 ] ], [ [ "plastic_chunk", 200 ] ], [ [ "chain", 6 ] ] ]
},
{
"result": "tread2",
"type": "recipe",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 7,
"skills_required": [ "mechanics", 7 ],
"time": "144 h 26 m 40 s",
"autolearn": true,
"using": [ [ "forging_standard", 15 ], [ "steel_standard", 15 ] ],
"qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
"components": [ [ [ "steel_plate", 10 ] ], [ [ "chain", 6 ] ] ]
},
{
"result": "tread3",
"type": "recipe",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 7,
"skills_required": [ "mechanics", 7 ],
"time": "200 h",
"autolearn": true,
"using": [ [ "forging_standard", 20 ], [ "steel_standard", 20 ] ],
"qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
"components": [ [ [ "hard_plate", 10 ] ], [ [ "chain", 8 ] ] ]
}
]
0 ...s/blazemod/vehicleparts/blaze_treads.json → data/mods/Tanks/treads.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions data/mods/Tanks/vehicles.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@
{ "x": 0, "y": 1, "part": "plating_military" },
{ "x": 1, "y": 1, "part": "hdframe_vertical_2" },
{ "x": 1, "y": 1, "part": "hdhalfboard_ne" },
{ "x": 1, "y": 1, "part": "turretframe" },
{ "x": 1, "y": 1, "part": "am2browning", "ammo": 80, "ammo_qty": [ 10, 100 ] },
{ "x": 1, "y": 1, "part": "turret_mount" },
{ "x": 1, "y": 1, "part": "mounted_browning", "ammo": 80, "ammo_qty": [ 10, 100 ] },
{ "x": 1, "y": 1, "part": "plating_military" },
{ "x": 2, "y": 1, "part": "hdframe_vertical_2" },
{ "x": 2, "y": 1, "part": "hdhalfboard_horizontal" },
Expand Down Expand Up @@ -1521,7 +1521,7 @@
{ "x": -4, "y": 1, "part": "hdroof" },
{ "x": -3, "y": 1, "part": "hdframe_vertical_2" },
{ "x": -3, "y": 1, "part": "hdboard_vertical" },
{ "x": -3, "y": 1, "part": "turretframe" },
{ "x": -3, "y": 1, "part": "turret_mount" },
{
"x": -3,
"y": 1,
Expand Down Expand Up @@ -2071,7 +2071,7 @@
{ "x": 0, "y": -2, "part": "hdframe_vertical_2" },
{ "x": 0, "y": -2, "part": "seat" },
{ "x": 0, "y": -2, "part": "seatbelt_heavyduty" },
{ "x": 0, "y": -2, "part": "turretframe" },
{ "x": 0, "y": -2, "part": "turret_mount" },
{ "x": 0, "y": -2, "part": "tow_turret", "ammo": 60, "ammo_qty": [ 1, 2 ] },
{ "x": 0, "y": -2, "part": "controls" },
{ "x": 0, "y": -2, "part": "dashboard" },
Expand Down
53 changes: 0 additions & 53 deletions data/mods/blazemod/items/vehicle/blaze_treads.json
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions data/mods/blazemod/recipes/blaze_other_recipes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,51 +87,6 @@
[ [ "reinforced_solar_panel_v2", 3 ] ]
]
},
{
"result": "tread1",
"type": "recipe",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 6,
"skills_required": [ "mechanics", 6 ],
"time": "116 h 40 m",
"autolearn": true,
"using": [ [ "forging_standard", 10 ], [ "steel_standard", 10 ] ],
"qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
"components": [ [ [ "wire", 20 ] ], [ [ "plastic_chunk", 200 ] ], [ [ "chain", 6 ] ] ]
},
{
"result": "tread2",
"type": "recipe",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 7,
"skills_required": [ "mechanics", 7 ],
"time": "144 h 26 m 40 s",
"autolearn": true,
"using": [ [ "forging_standard", 15 ], [ "steel_standard", 15 ] ],
"qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
"components": [ [ [ "steel_plate", 10 ] ], [ [ "chain", 6 ] ] ]
},
{
"result": "tread3",
"type": "recipe",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 7,
"skills_required": [ "mechanics", 7 ],
"time": "200 h",
"autolearn": true,
"using": [ [ "forging_standard", 20 ], [ "steel_standard", 20 ] ],
"qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "CUT", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "anvil", -1 ] ], [ [ "swage", -1 ] ] ],
"components": [ [ [ "hard_plate", 10 ] ], [ [ "chain", 8 ] ] ]
},
{
"type": "recipe",
"result": "vehicle_shelving",
Expand Down
0 ...mod/vehicleparts/blaze_weapons_parts.json → ...d/vehicleparts/blaze_turrets_vanilla.json
View file
Open in desktop
File renamed without changes.