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.

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

The Mech Update #2829

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
24 changes: 24 additions & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2665,6 +2665,30 @@
"volume": "750 ml",
"category": "spare_parts"
},
{
"id": "gatling_mech_laser_salvaged",
"copy-from": "cerberus_laser",
"looks_like": "gatling_mech_laser",
"type": "GENERIC",
"color": "blue",
"name": { "str": "salvaged CMES gatling laser" },
"description": "A rapid-fire weapon system stripped from a wrecked combat exoskeleton. No longer usable as a weapon in its current condition.",
"material": [ "superalloy", "plastic" ],
"weight": "39500 g",
"volume": "11 L"
},
{
"id": "recon_mech_laser_salvaged",
"copy-from": "cerberus_laser",
"looks_like": "recon_mech_laser",
"type": "GENERIC",
"color": "blue",
"name": { "str": "salvaged RMES marksman laser" },
"description": "A long-range weapon system stripped from a wrecked recon exoskeleton. No longer usable as a weapon in its current condition.",
"material": [ "superalloy", "plastic" ],
"weight": "12500 g",
"volume": "5500 ml"
},
{
"id": "light_bulb",
"type": "GENERIC",
Expand Down
34 changes: 29 additions & 5 deletions data/json/items/gun/ups.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,26 @@
"material": [ "superalloy", "plastic" ],
"color": "blue",
"range": 30,
"ranged_damage": { "damage_type": "heat", "amount": 20, "armor_penetration": 4 },
"ranged_damage": { "damage_type": "heat", "amount": 40, "armor_penetration": 5 },
"dispersion": 100,
"loudness": 12,
"ups_charges": 20,
"modes": [ [ "DEFAULT", "3 rd.", 3 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "high auto", 15 ] ],
"ups_charges": 50,
"modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 5 ], [ "AUTO", "auto", 10 ] ],
"ammo_effects": [ "LASER", "PLASMA_BUBBLE", "INCENDIARY" ],
"extend": { "flags": [ "NO_UNWIELD", "NO_SALVAGE", "NO_REPAIR", "UNBREAKABLE_MELEE" ] }
},
{
"id": "gatling_mech_laser_rebuilt",
"copy-from": "gatling_mech_laser",
"type": "GUN",
"name": { "str": "rebuilt CMES gatling laser" },
"description": "A rapid-fire weapon system stripped from a combat mech, modified for handheld use. While less efficient and too bulky to fire without proper support, its rotating-barrel laser system can still spray death downrange with ease.",
"weight": "40 kg",
"dispersion": 200,
"ups_charges": 80,
"extend": { "flags": [ "MOUNTED_GUN" ] },
"delete": { "flags": [ "NO_UNWIELD", "NO_SALVAGE", "NO_REPAIR", "UNBREAKABLE_MELEE" ] }
},
{
"id": "recon_mech_laser",
"copy-from": "rifle_energy",
Expand All @@ -68,13 +80,25 @@
"material": [ "superalloy", "plastic" ],
"color": "blue",
"range": 45,
"ranged_damage": { "damage_type": "heat", "amount": 30, "armor_penetration": 4 },
"ranged_damage": { "damage_type": "heat", "amount": 80, "armor_penetration": 10 },
"dispersion": 15,
"loudness": 1,
"ups_charges": 50,
"ups_charges": 100,
"ammo_effects": [ "LASER", "PLASMA_BUBBLE", "INCENDIARY" ],
"extend": { "flags": [ "NO_UNWIELD", "NO_REPAIR", "NO_SALVAGE", "UNBREAKABLE_MELEE" ] }
},
{
"id": "recon_mech_laser_rebuilt",
"copy-from": "recon_mech_laser",
"type": "GUN",
"name": { "str": "rebuilt RMES marksman laser" },
"description": "Along-range weapon system stripped from a recon mech, modified for handheld use. While less efficient and too bulky to fire without proper support, it's still a quiet and relatively accurate marksman laser rifle.",
"weight": "13 kg",
"dispersion": 30,
"ups_charges": 160,
"extend": { "flags": [ "MOUNTED_GUN" ] },
"delete": { "flags": [ "NO_UNWIELD", "NO_REPAIR", "NO_SALVAGE", "UNBREAKABLE_MELEE" ] }
},
{
"id": "laser_cannon",
"copy-from": "rifle_energy",
Expand Down
2 changes: 2 additions & 0 deletions data/json/monsters/mechsuits.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"NOHEAD",
"NO_BREATHE",
"RIDEABLE_MECH",
"MECH_DEFENSIVE",
"PRIORITIZE_TARGETS",
"PATH_AVOID_DANGER_2"
]
Expand Down Expand Up @@ -91,6 +92,7 @@
"NOHEAD",
"NO_BREATHE",
"RIDEABLE_MECH",
"MECH_DEFENSIVE",
"PRIORITIZE_TARGETS",
"PATH_AVOID_DANGER_2",
"LOUDMOVES"
Expand Down
28 changes: 28 additions & 0 deletions data/json/recipes/weapon/ranged.json
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,34 @@
"qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
"components": [ [ [ "cerberus_laser", 1 ] ], [ [ "battery_ups", 1 ] ], [ [ "cable", 15 ] ] ]
},
{
"type": "recipe",
"result": "gatling_mech_laser_rebuilt",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_RANGED",
"skill_used": "electronics",
"skills_required": [ [ "fabrication", 5 ], [ "gun", 1 ] ],
"difficulty": 7,
"time": "30 m",
"autolearn": true,
"using": [ [ "welding_standard", 5 ], [ "steel_tiny", 2 ] ],
"qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
"components": [ [ [ "gatling_mech_laser_salvaged", 1 ] ], [ [ "battery_ups", 1 ] ], [ [ "cable", 25 ] ] ]
},
{
"type": "recipe",
"result": "gatling_mech_laser_rebuilt",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_RANGED",
"skill_used": "electronics",
"skills_required": [ [ "fabrication", 5 ], [ "gun", 1 ] ],
"difficulty": 7,
"time": "30 m",
"autolearn": true,
"using": [ [ "welding_standard", 5 ], [ "steel_tiny", 2 ] ],
"qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
"components": [ [ [ "gatling_mech_laser_salvaged", 1 ] ], [ [ "battery_ups", 1 ] ], [ [ "cable", 25 ] ] ]
},
{
"type": "recipe",
"result": "m2browning_sawn",
Expand Down
11 changes: 8 additions & 3 deletions data/json/uncraft/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,7 @@
"using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ],
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [
[ [ "recon_mech_laser_salvaged", 1 ] ],
[ [ "ai_module", 1 ] ],
[ [ "sensor_module", 1 ] ],
[ [ "memory_module", 1 ] ],
Expand All @@ -1025,7 +1026,8 @@
[ [ "power_supply", 20 ] ],
[ [ "storage_battery", 2 ] ],
[ [ "plut_cell", 4 ] ],
[ [ "mil_plate", 15 ] ]
[ [ "mil_plate", 15 ] ],
[ [ "alloy_sheet", 25 ] ]
]
},
{
Expand All @@ -1046,7 +1048,8 @@
[ [ "power_supply", 20 ] ],
[ [ "storage_battery", 2 ] ],
[ [ "plut_cell", 4 ] ],
[ [ "mil_plate", 6 ] ]
[ [ "mil_plate", 6 ] ],
[ [ "alloy_sheet", 15 ] ]
]
},
{
Expand All @@ -1058,6 +1061,7 @@
"using": [ [ "soldering_standard", 30 ], [ "welding_standard", 20 ] ],
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [
[ [ "gatling_mech_laser_salvaged", 1 ] ],
[ [ "ai_module", 1 ] ],
[ [ "sensor_module", 1 ] ],
[ [ "memory_module", 1 ] ],
Expand All @@ -1067,7 +1071,8 @@
[ [ "power_supply", 20 ] ],
[ [ "storage_battery", 2 ] ],
[ [ "plut_cell", 4 ] ],
[ [ "mil_plate", 20 ] ]
[ [ "mil_plate", 20 ] ],
[ [ "alloy_sheet", 20 ] ]
]
},
{
Expand Down