From 002ae140e900345068b369140b3b76e4af5fea21 Mon Sep 17 00:00:00 2001 From: ymber Date: Sun, 10 May 2020 18:36:42 +0100 Subject: [PATCH 1/2] Remove control laptop --- data/json/itemgroups/main.json | 1 - data/json/itemgroups/tools.json | 1 - data/json/items/obsolete.json | 22 ++++++++++++++++++++++ data/json/items/tool/electronics.json | 22 ---------------------- data/json/recipes/recipe_electronics.json | 15 --------------- data/json/recipes/recipe_obsolete.json | 5 +++++ 6 files changed, 27 insertions(+), 39 deletions(-) diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json index 15a78751e0d20..d03b9ca7e9ad2 100644 --- a/data/json/itemgroups/main.json +++ b/data/json/itemgroups/main.json @@ -115,7 +115,6 @@ { "item": "high_density_capacitor", "prob": 10 }, { "item": "beam_scatterer", "prob": 10 }, { "item": "power_armor_light", "prob": 10 }, - { "item": "control_laptop", "prob": 10 }, { "item": "rm11b_sniper_rifle", "prob": 10 }, { "item": "rm13_armor", "prob": 10 }, { "item": "v29", "prob": 10 } diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index bfe637e7bd107..a0a1ffae6ae41 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -415,7 +415,6 @@ [ "file", 10 ], [ "atomic_lamp", 1 ], [ "smart_lamp", 2 ], - [ "control_laptop", 1 ], [ "bot_manhack", 2 ], [ "teleporter", 1 ], [ "laptop", 4 ], diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index afa06c24e9dd6..b95f9e7446fee 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -2609,5 +2609,27 @@ "id": "shotcanister", "name": "shotcanisters", "default": "shotcanister_scrap" + }, + { + "id": "control_laptop", + "type": "TOOL", + "name": { "str": "control laptop" }, + "description": "A modified laptop, now capable of transmitting in the ultra-high frequencies utilized by robots. Activate it to command robots from afar.", + "weight": "2721 g", + "volume": "1 L", + "price": 10000, + "price_postapoc": 8000, + "material": [ "plastic", "aluminum" ], + "symbol": ",", + "color": "yellow", + "ammo": [ "battery" ], + "charges_per_use": 2, + "use_action": "ROBOTCONTROL", + "magazines": [ + [ + "battery", + [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + ] + ] } ] diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 890f3abc0bbdb..74026e2c8346e 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -128,28 +128,6 @@ "use_action": { "target": "cell_phone", "msg": "You stop lighting up the screen.", "menu_text": "Turn off", "type": "transform" }, "flags": [ "WATCH", "LIGHT_8", "CHARGEDIM", "TRADER_AVOID" ] }, - { - "id": "control_laptop", - "type": "TOOL", - "name": { "str": "control laptop" }, - "description": "A modified laptop, now capable of transmitting in the ultra-high frequencies utilized by robots. Activate it to command robots from afar.", - "weight": "2721 g", - "volume": "1 L", - "price": 10000, - "price_postapoc": 8000, - "material": [ "plastic", "aluminum" ], - "symbol": ",", - "color": "yellow", - "ammo": [ "battery" ], - "charges_per_use": 2, - "use_action": "ROBOTCONTROL", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] - ] - }, { "id": "directional_antenna", "type": "TOOL", diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json index 61ff14ded7d59..72b0230877c4f 100644 --- a/data/json/recipes/recipe_electronics.json +++ b/data/json/recipes/recipe_electronics.json @@ -1809,21 +1809,6 @@ [ [ "turret_chassis", 1 ] ] ] }, - { - "type": "recipe", - "result": "control_laptop", - "category": "CC_ELECTRONIC", - "subcategory": "CSC_ELECTRONIC_TOOLS", - "skill_used": "electronics", - "skills_required": [ "computer", 4 ], - "difficulty": 7, - "time": "25 m", - "book_learn": [ [ "recipe_lab_elec", 7 ], [ "textbook_robots", 7 ] ], - "using": [ [ "soldering_standard", 14 ] ], - "qualities": [ { "id": "SCREW", "level": 1 } ], - "tools": [ [ [ "software_hacking", -1 ] ] ], - "components": [ [ [ "laptop", 1 ] ], [ [ "receiver", 2 ] ], [ [ "e_scrap", 2 ] ], [ [ "antenna", 1 ] ] ] - }, { "type": "recipe", "result": "dehydrator", diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index 4b70ca936cc6e..8b047ecd71cc3 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2464,5 +2464,10 @@ "type": "recipe", "result": "pine_nuts", "obsolete": true + }, + { + "type": "recipe", + "result": "control_laptop", + "obsolete": true } ] From ccb6150dc4ae638b8c2f2c75f4e4e6401f64a734 Mon Sep 17 00:00:00 2001 From: ymber Date: Mon, 11 May 2020 10:59:19 +0100 Subject: [PATCH 2/2] Add control laptop to aftershock --- data/mods/Aftershock/items/tools.json | 22 ++++++++++++++++++++++ data/mods/Aftershock/recipes/recipes.json | 15 +++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index b6ae692fc0bdd..d53e7fb9a1029 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -257,5 +257,27 @@ "description": "This device replaces standard power connections and battery ports for electronic devices with a carefully-shaped port that hooks into bionic implants. When applied, it will convert an item to run directly off of bionic power.", "ammo_modifier": "battery", "flags": [ "USES_BIONIC_POWER", "NO_UNLOAD", "NO_RELOAD" ] + }, + { + "id": "control_laptop", + "type": "TOOL", + "name": { "str": "control laptop" }, + "description": "A modified laptop, now capable of transmitting in the ultra-high frequencies utilized by robots. Activate it to command robots from afar.", + "weight": "2721 g", + "volume": "1 L", + "price": 10000, + "price_postapoc": 8000, + "material": [ "plastic", "aluminum" ], + "symbol": ",", + "color": "yellow", + "ammo": [ "battery" ], + "charges_per_use": 2, + "use_action": "ROBOTCONTROL", + "magazines": [ + [ + "battery", + [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + ] + ] } ] diff --git a/data/mods/Aftershock/recipes/recipes.json b/data/mods/Aftershock/recipes/recipes.json index b3923d5402920..3bee6ef794171 100644 --- a/data/mods/Aftershock/recipes/recipes.json +++ b/data/mods/Aftershock/recipes/recipes.json @@ -516,5 +516,20 @@ "using": [ [ "forging_standard", 1 ] ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], "components": [ [ [ "afs_titanium_small", 400 ] ] ] + }, + { + "type": "recipe", + "result": "control_laptop", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_TOOLS", + "skill_used": "electronics", + "skills_required": [ "computer", 4 ], + "difficulty": 7, + "time": "25 m", + "book_learn": [ [ "recipe_lab_elec", 7 ], [ "textbook_robots", 7 ] ], + "using": [ [ "soldering_standard", 14 ] ], + "qualities": [ { "id": "SCREW", "level": 1 } ], + "tools": [ [ [ "software_hacking", -1 ] ] ], + "components": [ [ [ "laptop", 1 ] ], [ [ "receiver", 2 ] ], [ [ "e_scrap", 2 ] ], [ [ "antenna", 1 ] ] ] } ]