From 8db260afa8b4ffae3e2fafc9473d35c6705ef895 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Mon, 25 Oct 2021 20:22:50 -0400 Subject: [PATCH] TCL drone adjustments (#52423) --- .../terrain-mechanisms.json | 12 +++--- data/json/items/id_cards.json | 8 ++-- .../lab/lab_modular/lab_cargo_surface.json | 36 +++--------------- .../lab_effect_on_condition.json | 2 +- data/json/monsters/lab_security_drones.json | 37 ++++++++++--------- 5 files changed, 35 insertions(+), 60 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json index 2a1bb21ddd442..81485f4a61422 100644 --- a/data/json/furniture_and_terrain/terrain-mechanisms.json +++ b/data/json/furniture_and_terrain/terrain-mechanisms.json @@ -393,9 +393,9 @@ { "type": "terrain", "id": "t_card_science_maintenance_yellow", - "name": "Maintenance: yellow zone card reader", - "description": "This is a smartcard reader. It sports the stylized symbol of an atom and a wrench on a yellow background. You could swipe a maintenance employee badge near it to unlock the gates.", - "//": "Tier 2 card for a lab. Medium security access.", + "name": "Maintenance: ocher zone card reader", + "description": "This is a smartcard reader. It sports the stylized symbol of an atom and a wrench on a ocher background. You could swipe a maintenance employee badge near it to unlock the gates.", + "//": "Tier 2 card for a lab. Medium security access. Reanamed player facing name to ocher.", "symbol": "6", "color": "yellow", "copy-from": "t_card_science", @@ -537,11 +537,11 @@ { "type": "terrain", "id": "t_card_science_mutagen_green", - "name": "Researcher: green zone card reader", - "description": "This is a smartcard reader. It sports the stylized symbol of an atom and a flask on a green background. You could swipe a researcher scientist badge near it to unlock the gates.", + "name": "Researcher: light green zone card reader", + "description": "This is a smartcard reader. It sports the stylized symbol of an atom and a flask on a light green background. You could swipe a researcher scientist badge near it to unlock the gates.", "//": "Entrance card for a lab research areas.", "symbol": "6", - "color": "green", + "color": "light_green", "copy-from": "t_card_science", "looks_like": "t_card_science", "examine_action": { diff --git a/data/json/items/id_cards.json b/data/json/items/id_cards.json index 49722d9af725f..9f4f61df7fa16 100644 --- a/data/json/items/id_cards.json +++ b/data/json/items/id_cards.json @@ -109,8 +109,8 @@ "id": "id_science_maintenance_yellow", "symbol": ",", "copy-from": "id_science", - "name": { "str": "Maintenance: yellow zone badge" }, - "description": "This is an employee badge for a maintence worker. The reverse side describes protocol for using it; this could grant access to yellow zone card readers.", + "name": { "str": "Maintenance: ocher zone badge" }, + "description": "This is an employee badge for a maintence worker. The reverse side describes protocol for using it; this could grant access to ocher zone card readers.", "flags": [ "SCIENCE_CARD_MAINTENANCE_YELLOW", "PRESERVE_SPAWN_OMT" ] }, { @@ -198,8 +198,8 @@ "id": "id_science_mutagen_green", "symbol": ",", "copy-from": "id_science", - "name": { "str": "Researcher: green zone badge" }, - "description": "This is an employee badge for a research scientist. The reverse side describes protocol for using it; this could grant access to green zone card readers.", + "name": { "str": "Researcher: light green zone badge" }, + "description": "This is an employee badge for a research scientist. The reverse side describes protocol for using it; this could grant access to light green zone card readers.", "flags": [ "SCIENCE_CARD_MUTAGEN_GREEN", "PRESERVE_SPAWN_OMT" ] }, { diff --git a/data/json/mapgen/lab/lab_modular/lab_cargo_surface.json b/data/json/mapgen/lab/lab_modular/lab_cargo_surface.json index 0936cb3062819..b4863ea94c4ef 100644 --- a/data/json/mapgen/lab/lab_modular/lab_cargo_surface.json +++ b/data/json/mapgen/lab/lab_modular/lab_cargo_surface.json @@ -160,21 +160,8 @@ { "chunks": [ [ "lab_wall_chain_5x5", 50 ], [ "null", 50 ] ], "x": 40, "y": 17 } ], "place_monster": [ - { "monster": "mon_lab_security_drone_GM", "x": [ 33, 40 ], "y": [ 2, 22 ], "chance": 60, "pack_size": [ 1, 2 ] }, - { - "monster": "mon_lab_security_drone_GM", - "x": [ 2, 22 ], - "y": [ 6, 22 ], - "chance": 40, - "pack_size": [ 1, 2 ] - }, - { - "monster": "mon_lab_security_drone_GM", - "x": [ 25, 40 ], - "y": [ 6, 18 ], - "chance": 40, - "pack_size": [ 1, 2 ] - } + { "monster": "mon_lab_security_drone_GM", "x": [ 33, 40 ], "y": [ 2, 22 ], "chance": 100 }, + { "monster": "mon_lab_security_drone_GM", "x": [ 2, 22 ], "y": [ 6, 22 ], "chance": 50 } ], "place_vehicles": [ { "vehicle": "golf_cart_4seat", "x": 2, "y": 6, "chance": 100, "rotation": 180 }, @@ -235,21 +222,8 @@ { "chunks": [ [ "lab_wall_chain_5x5", 50 ], [ "null", 50 ] ], "x": 40, "y": 17 } ], "place_monster": [ - { "monster": "mon_lab_security_drone_GM", "x": [ 33, 40 ], "y": [ 2, 22 ], "chance": 60, "pack_size": [ 1, 2 ] }, - { - "monster": "mon_lab_security_drone_GM", - "x": [ 2, 22 ], - "y": [ 2, 18 ], - "chance": 60, - "pack_size": [ 1, 2 ] - }, - { - "monster": "mon_lab_security_drone_GM", - "x": [ 25, 40 ], - "y": [ 2, 18 ], - "chance": 40, - "pack_size": [ 1, 2 ] - } + { "monster": "mon_lab_security_drone_GM", "x": [ 33, 40 ], "y": [ 2, 22 ], "chance": 100 }, + { "monster": "mon_lab_security_drone_GM", "x": [ 2, 22 ], "y": [ 2, 18 ], "chance": 50 } ], "place_vehicles": [ { "vehicle": "truck_trailer", "x": 5, "y": 8, "chance": 30, "rotation": 180 }, @@ -301,7 +275,7 @@ "palettes": [ "lab_common_palette", "lab_maintenance_palette" ], "terrain": { "¥": "t_card_science_maintenance_green" }, "place_monster": [ - { "monster": "mon_lab_security_drone_GM", "x": [ 27, 40 ], "y": [ 2, 22 ], "chance": 60, "pack_size": [ 1, 2 ] }, + { "monster": "mon_lab_security_drone_GM", "x": [ 27, 40 ], "y": [ 2, 22 ], "chance": 100 }, { "monster": "mon_skitterbot", "x": 24, "y": 11, "chance": 100 }, { "monster": "mon_skitterbot", "x": 24, "y": 12, "chance": 100 } ], diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_effect_on_condition.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_effect_on_condition.json index 99f65d662484a..bcbfd84b7004f 100644 --- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_effect_on_condition.json +++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_effect_on_condition.json @@ -154,7 +154,7 @@ "effect": [ { "mapgen_update": "release_bots_3", "om_terrain": "lab_1x1_RES_8_commons_MAINT" } ] }, { - "//": "Opens bot release if you lack a yellow security ID card.", + "//": "Opens bot release if you lack a yellow (ocher) security ID card.", "type": "mapgen", "update_mapgen_id": "release_bots_3", "method": "json", diff --git a/data/json/monsters/lab_security_drones.json b/data/json/monsters/lab_security_drones.json index 9dc75d5a5d27c..ef9e543bd865e 100644 --- a/data/json/monsters/lab_security_drones.json +++ b/data/json/monsters/lab_security_drones.json @@ -47,11 +47,11 @@ "copy-from": "base_drone", "type": "MONSTER", "name": { "str": "GM security drone" }, - "description": "A small drone, it has a camera and speaker visible.", + "description": "A small drone, it has a camera and speaker visible. It looks solid and built to withstand a lot of abuse.", "diff": 2, "speed": 190, "color": "light_green", - "hp": 500, + "hp": 200, "melee_cut": 12, "default_faction": "science", "special_attacks": [ @@ -70,7 +70,8 @@ { "id": "yellow_maintenance_check", "type": "SPELL", - "name": { "str": "Yellow maintenance Badge Trait" }, + "name": { "str": "ocher Maintenance Badge Trait" }, + "//": "reanamed player facing name to ocher.", "description": "Adds trait for badge check", "valid_targets": [ "hostile" ], "flags": [ "SILENT" ], @@ -108,12 +109,12 @@ "id": "mon_lab_security_drone_YM", "copy-from": "base_drone", "type": "MONSTER", - "name": { "str": "YM security drone" }, - "description": "A small drone, it has a camera and speaker visible.", + "name": { "str": "OM security drone" }, + "description": "A small drone, it has a camera and speaker visible. It looks solid and built to withstand a lot of abuse.", "diff": 2, "speed": 190, "color": "yellow", - "hp": 500, + "hp": 200, "melee_cut": 12, "default_faction": "science", "special_attacks": [ @@ -171,11 +172,11 @@ "copy-from": "base_drone", "type": "MONSTER", "name": { "str": "BM security drone" }, - "description": "A small drone, it has a camera and speaker visible.", + "description": "A small drone, it has a camera and speaker visible. It looks solid and built to withstand a lot of abuse.", "diff": 2, "speed": 190, "color": "blue", - "hp": 500, + "hp": 200, "melee_cut": 12, "default_faction": "science", "special_attacks": [ @@ -259,11 +260,11 @@ "copy-from": "base_drone", "type": "MONSTER", "name": { "str": "BM security drone" }, - "description": "A small drone, it has a camera and speaker visible.", + "description": "A small drone, it has a camera and speaker visible. It looks solid and built to withstand a lot of abuse.", "diff": 2, "speed": 190, "color": "cyan", - "hp": 500, + "hp": 200, "melee_cut": 12, "default_faction": "science", "special_attacks": [ @@ -282,7 +283,7 @@ { "id": "green_researcher_check", "type": "SPELL", - "name": { "str": "Green researcher Badge Trait" }, + "name": { "str": "Light Green researcher Badge Trait" }, "description": "Adds trait for badge check", "valid_targets": [ "hostile" ], "flags": [ "SILENT" ], @@ -318,14 +319,14 @@ ] }, { - "//": "Opens bot release if you lack a green researcher ID card.", + "//": "Opens bot release if you lack a light green researcher ID card.", "type": "mapgen", "update_mapgen_id": "bot_release_rearcher_green", "method": "json", "object": { "set": [ { "line": "terrain", "id": "t_thconc_r", "x": 19, "y": 15, "x2": 19, "y2": 16 } ] } }, { - "//": "Opens bot release if you lack a green researcher ID card.", + "//": "Opens bot release if you lack a light green researcher ID card.", "type": "mapgen", "update_mapgen_id": "bot_release_rearcher_green_2", "method": "json", @@ -335,12 +336,12 @@ "id": "mon_lab_security_drone_GR", "copy-from": "base_drone", "type": "MONSTER", - "name": { "str": "GR security drone" }, - "description": "A small drone, it has a camera and speaker visible.", + "name": { "str": "LGR security drone" }, + "description": "A small drone, it has a camera and speaker visible. It looks solid and built to withstand a lot of abuse.", "diff": 2, "speed": 190, "color": "light_green", - "hp": 500, + "hp": 200, "melee_cut": 12, "default_faction": "science", "special_attacks": [ @@ -439,11 +440,11 @@ "copy-from": "base_drone", "type": "MONSTER", "name": { "str": "BS security drone" }, - "description": "A small drone, it has a camera and speaker visible.", + "description": "A small drone, it has a camera and speaker visible. It looks solid and built to withstand a lot of abuse.", "diff": 2, "speed": 190, "color": "dark_gray", - "hp": 500, + "hp": 200, "melee_cut": 12, "default_faction": "science", "special_attacks": [