Skip to content

Commit

Permalink
Merge pull request #37295 from KorGgenT/orichalcum-frame
Browse files Browse the repository at this point in the history
[magiclysm] create orichalcum frame vehicle part
  • Loading branch information
ZhilkinSerg authored Jan 27, 2020
2 parents 7254bb0 + de33e1d commit 42a0692
Show file tree
Hide file tree
Showing 4 changed files with 276 additions and 0 deletions.
12 changes: 12 additions & 0 deletions data/mods/Magiclysm/items/vehicle/frames.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,17 @@
"color": "yellow",
"material": [ "orichalcum_metal" ],
"price": 10000
},
{
"type": "GENERIC",
"id": "orichalcum_frame",
"name": "orichalcum frame",
"symbol": "]",
"description": "A frame made of orichalcum. Significantly sturdier than steel, but also much more expensive.",
"volume": "10 L",
"weight": "20 kg",
"color": "yellow",
"material": [ "orichalcum_metal" ],
"price": 800000
}
]
78 changes: 78 additions & 0 deletions data/mods/Magiclysm/vehicleparts/frames.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,83 @@
},
"flags": [ "INITIAL_PART", "MOUNTABLE", "FOLDABLE" ],
"damage_reduction": { "all": 12 }
},
{
"abstract": "orichalcum_frame",
"type": "vehicle_part",
"name": "orichalcum frame",
"item": "orichalcum_frame",
"location": "structure",
"durability": 2000,
"description": "An expensive magical metal framework. Other vehicle components can be mounted on it, and it can be attached to other frames to increase the vehicle's size.",
"breaks_into": "orichalcum_frame_break",
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "20 m", "using": [ [ "welding_standard", 10 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "10 m", "using": "vehicle_weld_removal" },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "5 m", "using": [ [ "welding_standard", 5 ] ] }
},
"flags": [ "MOUNTABLE" ],
"damage_reduction": { "all": 78 }
},
{
"id": "frame_orichalcum_cover",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "^"
},
{
"id": "frame_orichalcum_cross",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "c",
"extend": { "flags": [ "INITIAL_PART" ] }
},
{
"id": "frame_orichalcum_horizontal",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "h"
},
{
"id": "frame_orichalcum_horizontal_2",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "="
},
{
"id": "frame_orichalcum_ne",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "u"
},
{
"id": "frame_orichalcum_nw",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "y"
},
{
"id": "frame_orichalcum_se",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "n"
},
{
"id": "frame_orichalcum_sw",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "b"
},
{
"id": "frame_orichalcum_vertical",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "j"
},
{
"id": "frame_orichalcum_vertical_2",
"copy-from": "orichalcum_frame",
"type": "vehicle_part",
"symbol": "H"
}
]
8 changes: 8 additions & 0 deletions data/mods/Magiclysm/vehicleparts/vehicle_parts.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"type": "item_group",
"id": "orichalcum_frame_break",
"subtype": "collection",
"entries": [ { "item": "orichalcum_lump", "count": [ 4, 6 ] }, { "item": "orichalcum_sliver", "count": [ 4, 6 ] } ]
}
]
178 changes: 178 additions & 0 deletions data/mods/Magiclysm/vehicles/vans_busses.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
[
{
"id": "security_van",
"type": "vehicle",
"name": "Security Van",
"blueprint": [
[ " o " ],
[ "O----+-O" ],
[ "|===|#'|" ],
[ "+===|o'>" ],
[ "|===|#'|" ],
[ "O--+-+-O" ],
[ " o " ]
],
"parts": [
{ "x": 0, "y": 1, "part": "frame_orichalcum_vertical" },
{ "x": 0, "y": 1, "part": "box" },
{ "x": 0, "y": 1, "part": "hdroof" },
{ "x": 0, "y": 0, "part": "frame_orichalcum_vertical_2" },
{ "x": 0, "y": 0, "part": "seat" },
{ "x": 0, "y": 0, "part": "seatbelt" },
{ "x": 0, "y": 0, "part": "controls" },
{ "x": 0, "y": 0, "part": "dashboard" },
{ "x": 0, "y": 0, "part": "vehicle_alarm" },
{ "x": 0, "y": 0, "part": "horn_car" },
{ "x": 0, "y": 0, "part": "hdroof" },
{ "x": 0, "y": 2, "part": "frame_orichalcum_vertical_2" },
{ "x": 0, "y": 2, "part": "seat" },
{ "x": 0, "y": 2, "part": "seatbelt" },
{ "x": 0, "y": 2, "part": "hdroof" },
{ "x": 0, "y": -1, "part": "frame_orichalcum_vertical" },
{ "x": 0, "y": -1, "part": "hddoor" },
{ "x": 0, "y": -1, "part": "plating_steel" },
{ "x": 0, "y": 3, "part": "frame_orichalcum_vertical" },
{ "x": 0, "y": 3, "part": "hddoor" },
{ "x": 0, "y": 3, "part": "plating_steel" },
{ "x": 1, "y": 1, "part": "frame_orichalcum_horizontal" },
{ "x": 1, "y": 1, "part": "reinforced_windshield" },
{ "x": 1, "y": 1, "part": "plating_steel" },
{ "x": 1, "y": 1, "part": "diesel_engine_v6" },
{ "x": 1, "y": 1, "part": "alternator_truck" },
{ "x": 1, "y": 1, "part": "battery_car" },
{ "x": 1, "y": 0, "part": "frame_orichalcum_horizontal" },
{ "x": 1, "y": 0, "part": "reinforced_windshield" },
{ "x": 1, "y": 0, "part": "plating_steel" },
{ "x": 1, "y": 2, "part": "frame_orichalcum_horizontal" },
{ "x": 1, "y": 2, "part": "reinforced_windshield" },
{ "x": 1, "y": 2, "part": "plating_steel" },
{ "x": 1, "y": -1, "part": "frame_orichalcum_vertical" },
{ "x": 1, "y": -1, "part": "reinforced_windshield" },
{ "x": 1, "y": -1, "part": "plating_steel" },
{ "x": 1, "y": -2, "part": "wing_mirror" },
{ "x": 1, "y": 3, "part": "frame_orichalcum_vertical" },
{ "x": 1, "y": 3, "part": "reinforced_windshield" },
{ "x": 1, "y": 3, "part": "plating_steel" },
{ "x": 1, "y": 4, "part": "wing_mirror" },
{ "x": 2, "y": 0, "part": "frame_orichalcum_horizontal" },
{ "x": 2, "y": 0, "part": "hdhalfboard_horizontal_2" },
{ "x": 2, "y": 0, "part": "plating_steel" },
{ "x": 2, "y": 1, "part": "hdframe_cover" },
{ "x": 2, "y": 1, "part": "hdhalfboard_horizontal_2" },
{ "x": 2, "y": 1, "part": "plating_steel" },
{ "x": 2, "y": 2, "part": "frame_orichalcum_horizontal" },
{ "x": 2, "y": 2, "part": "hdhalfboard_horizontal_2" },
{ "x": 2, "y": 2, "part": "plating_steel" },
{ "x": 2, "y": -1, "part": "frame_orichalcum_nw" },
{ "x": 2, "y": -1, "part": "hdhalfboard_nw" },
{ "x": 2, "y": -1, "part": "headlight_reinforced" },
{ "x": 2, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel_wide" ] },
{ "x": 2, "y": -1, "part": "plating_steel" },
{ "x": 2, "y": 3, "part": "frame_orichalcum_ne" },
{ "x": 2, "y": 3, "part": "hdhalfboard_ne" },
{ "x": 2, "y": 3, "part": "headlight_reinforced" },
{ "x": 2, "y": 3, "parts": [ "wheel_mount_medium_steerable", "wheel_wide" ] },
{ "x": 2, "y": 3, "part": "plating_steel" },
{ "x": -1, "y": 0, "part": "frame_orichalcum_horizontal" },
{ "x": -1, "y": 0, "part": "hdboard_horizontal" },
{ "x": -1, "y": 0, "part": "plating_steel" },
{ "x": -1, "y": 1, "part": "frame_orichalcum_horizontal" },
{ "x": -1, "y": 1, "part": "hdboard_horizontal" },
{ "x": -1, "y": 1, "part": "plating_steel" },
{ "x": -1, "y": 2, "part": "frame_orichalcum_horizontal" },
{ "x": -1, "y": 2, "part": "hdboard_horizontal" },
{ "x": -1, "y": 2, "part": "plating_steel" },
{ "x": -1, "y": -1, "part": "frame_orichalcum_sw" },
{ "x": -1, "y": -1, "part": "hdboard_sw" },
{ "x": -1, "y": -1, "part": "plating_steel" },
{ "x": -1, "y": -1, "part": "tank", "fuel": "diesel" },
{ "x": -1, "y": 3, "part": "frame_orichalcum_se" },
{ "x": -1, "y": 3, "part": "hdboard_se" },
{ "x": -1, "y": 3, "part": "tank", "fuel": "diesel" },
{ "x": -1, "y": 3, "part": "plating_steel" },
{ "x": -2, "y": 0, "part": "frame_orichalcum_vertical" },
{ "x": -2, "y": 0, "part": "trunk" },
{ "x": -2, "y": 0, "part": "hdroof" },
{ "x": -2, "y": 1, "part": "frame_orichalcum_vertical" },
{ "x": -2, "y": 1, "part": "aisle_horizontal" },
{ "x": -2, "y": 1, "part": "hdroof" },
{ "x": -2, "y": 2, "part": "frame_orichalcum_vertical" },
{ "x": -2, "y": 2, "part": "aisle_horizontal" },
{ "x": -2, "y": 2, "part": "hdroof" },
{ "x": -2, "y": -1, "part": "frame_orichalcum_vertical" },
{ "x": -2, "y": -1, "part": "hdboard_vertical" },
{ "x": -2, "y": -1, "part": "hdroof" },
{ "x": -2, "y": -1, "part": "plating_steel" },
{ "x": -2, "y": 3, "part": "frame_orichalcum_vertical" },
{ "x": -2, "y": 3, "part": "hddoor_opaque" },
{ "x": -2, "y": 3, "part": "hdroof" },
{ "x": -2, "y": 3, "part": "plating_steel" },
{ "x": -3, "y": 0, "part": "frame_orichalcum_horizontal" },
{ "x": -3, "y": 0, "part": "trunk" },
{ "x": -3, "y": 0, "part": "hdroof" },
{ "x": -3, "y": 1, "part": "frame_orichalcum_horizontal" },
{ "x": -3, "y": 1, "part": "aisle_horizontal" },
{ "x": -3, "y": 1, "part": "hdroof" },
{ "x": -3, "y": 2, "part": "frame_orichalcum_horizontal" },
{ "x": -3, "y": 2, "part": "seat" },
{ "x": -3, "y": 2, "part": "seatbelt" },
{ "x": -3, "y": 2, "part": "hdroof" },
{ "x": -3, "y": -1, "part": "frame_orichalcum_vertical" },
{ "x": -3, "y": -1, "part": "hdboard_vertical" },
{ "x": -3, "y": -1, "part": "hdroof" },
{ "x": -3, "y": -1, "part": "plating_steel" },
{ "x": -3, "y": 3, "part": "frame_orichalcum_vertical" },
{ "x": -3, "y": 3, "part": "hdboard_vertical" },
{ "x": -3, "y": 3, "part": "hdroof" },
{ "x": -3, "y": 3, "part": "plating_steel" },
{ "x": -4, "y": 0, "part": "frame_orichalcum_horizontal" },
{ "x": -4, "y": 0, "part": "trunk" },
{ "x": -4, "y": 0, "part": "hdroof" },
{ "x": -4, "y": 1, "part": "frame_orichalcum_horizontal" },
{ "x": -4, "y": 1, "part": "aisle_horizontal" },
{ "x": -4, "y": 1, "part": "hdroof" },
{ "x": -4, "y": 2, "part": "frame_orichalcum_horizontal" },
{ "x": -4, "y": 2, "part": "trunk" },
{ "x": -4, "y": 2, "part": "hdroof" },
{ "x": -4, "y": -1, "part": "frame_orichalcum_vertical" },
{ "x": -4, "y": -1, "part": "hdboard_vertical" },
{ "x": -4, "y": -1, "part": "hdroof" },
{ "x": -4, "y": -1, "part": "plating_steel" },
{ "x": -4, "y": 3, "part": "frame_orichalcum_vertical" },
{ "x": -4, "y": 3, "part": "hdboard_vertical" },
{ "x": -4, "y": 3, "part": "hdroof" },
{ "x": -4, "y": 3, "part": "plating_steel" },
{ "x": -5, "y": 0, "part": "frame_orichalcum_horizontal" },
{ "x": -5, "y": 0, "part": "hdboard_horizontal" },
{ "x": -5, "y": 0, "part": "hdroof" },
{ "x": -5, "y": 0, "part": "plating_steel" },
{ "x": -5, "y": 1, "part": "frame_orichalcum_horizontal" },
{ "x": -5, "y": 1, "part": "hddoor_opaque" },
{ "x": -5, "y": 1, "part": "hdroof" },
{ "x": -5, "y": 1, "part": "plating_steel" },
{ "x": -5, "y": 2, "part": "frame_orichalcum_horizontal" },
{ "x": -5, "y": 2, "part": "hdboard_horizontal" },
{ "x": -5, "y": 2, "part": "beeper" },
{ "x": -5, "y": 2, "part": "hdroof" },
{ "x": -5, "y": 2, "part": "plating_steel" },
{ "x": -5, "y": -1, "part": "frame_orichalcum_sw" },
{ "x": -5, "y": -1, "part": "hdboard_sw" },
{ "x": -5, "y": -1, "parts": [ "wheel_mount_medium", "wheel_wide" ] },
{ "x": -5, "y": -1, "part": "hdroof" },
{ "x": -5, "y": -1, "part": "plating_steel" },
{ "x": -5, "y": 3, "part": "frame_orichalcum_se" },
{ "x": -5, "y": 3, "part": "hdboard_se" },
{ "x": -5, "y": 3, "parts": [ "wheel_mount_medium", "wheel_wide" ] },
{ "x": -5, "y": 3, "part": "hdroof" },
{ "x": -5, "y": 3, "part": "plating_steel" }
],
"items": [
{ "x": 0, "y": 1, "chance": 70, "magazine": 100, "ammo": 50, "item_groups": [ "guns_cop" ] },
{ "x": -2, "y": 0, "chance": 50, "item_groups": [ "supplies_metal_precious", "supplies_metal_precious" ] },
{ "x": -2, "y": 0, "chance": 50, "item_groups": [ "supplies_metal_precious", "supplies_metal_precious" ] },
{ "x": -3, "y": 0, "chance": 20, "item_groups": [ "supplies_metal_precious", "supplies_metal_precious" ] },
{ "x": -4, "y": 0, "chance": 20, "item_groups": [ "supplies_metal_precious", "supplies_metal_precious" ] },
{ "x": -4, "y": 0, "chance": 20, "items": [ "diamond", "diamond", "diamond", "diamond", "diamond" ] }
]
}
]

0 comments on commit 42a0692

Please sign in to comment.