From f6ac9961cece910306396a3a4feee5e3723858cb Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Thu, 13 Jun 2019 22:32:51 -0600 Subject: [PATCH 1/2] Updates to Hub 01 mapgen --- data/json/items/armor.json | 8 + data/json/mapgen/robofachq_static.json | 207 +++++++++++++++--- data/json/npcs/factions.json | 2 +- .../robofac/NC_ROBOFAC_FIELD_RESEARCHER.json | 9 +- .../npcs/robofac/NC_ROBOFAC_SCIENTIST.json | 15 ++ .../json/npcs/robofac/NPC_Ulysses_Rourke.json | 80 +++++++ .../robofac/NPC_robofac_generic_security.json | 67 ++++++ data/json/overmap/specials.json | 18 +- data/json/overmap_terrain_robofachq.json | 144 ++++++++++++ 9 files changed, 514 insertions(+), 36 deletions(-) create mode 100644 data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json create mode 100644 data/json/npcs/robofac/NPC_Ulysses_Rourke.json create mode 100644 data/json/npcs/robofac/NPC_robofac_generic_security.json diff --git a/data/json/items/armor.json b/data/json/items/armor.json index ad2b431bb24af..78f6d000d3b25 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -5673,6 +5673,14 @@ "material_thickness": 1, "flags": [ "VARSIZE", "POCKETS" ] }, + { + "id": "robofac_jumpsuit", + "type": "ARMOR", + "copy-from": "jumpsuit", + "name": "Hub 01 jumpsuit", + "description": "A brown jumpsuit worn by the staff of Hub 01.", + "color": "brown" + }, { "id": "jumpsuit_xl", "type": "ARMOR", diff --git a/data/json/mapgen/robofachq_static.json b/data/json/mapgen/robofachq_static.json index 1687a78a56c26..5f50166819f4a 100644 --- a/data/json/mapgen/robofachq_static.json +++ b/data/json/mapgen/robofachq_static.json @@ -59,14 +59,14 @@ ",,|,yyyyyyyyy___________ss,|? t ||((((22| |(((([| |,,,,,,,,,,,,,,,,,,,,,,|,,", ",,|,____________________ss,|? 2 YY 5 |,,,,,,,,,,,,,,,,,,,,,,|,,", ",,|,____________________ss,|^a a 2 5 |,,,,,,,,,,,,,,,,,,,,,,|,,", - ",,|,____________________ss,||||||| ||||55GI||||55|||| |,,,,,,,,,,,,,,,,,,,,,,|,,", - ",,|,____________________ss,( [ ^| | | |; | |,,,,,,,,,,,,,,,,,,,,,,|,,", - ",,|,yyyyyyyyy___________ss,( h ( ^| | | 2 i| |,,,,,,,,,,,,,,,,,,,,,,|,,", - ",,|,____________________ss,( hth |[((| ||||55|||| |,,,,,,,,,,,,,,,,,,,,,,|,,", - ",,|,____________________ss,( hth | h|eeeeee(d d( |,,,,,,,,,,,,,,,,,,,,,,|,,", - ",,|,____________________ss,( hth | dd|eeeeee(6h 66 h6( |,,,,,,,,,,,,,,,,,,,,,,|,,", - ",,|,____________________ss,( h |^ h|Eeeeee(d 66 d( |,,,,,,,,,,,,,,,,,,,,,,|,,", - ",,|,yyyyyyyyy___________ss,| | |eeeeee| | |,,,,,,,,,,,,,,,,,,,,,,|,,", + ",,|,____________________ss,|||||||||||||55GI||||55|||| |,,,,,,,,,,,,,,,,,,,,,,|,,", + ",,|,____________________ss,|hhhhhhhhh| | | |; | |,,,,,,,,,,,,,,,,,,,,,,|,,", + ",,|,yyyyyyyyy___________ss,| 2 | | 2 i| |,,,,,,,,,,,,,,,,,,,,,,|,,", + ",,|,____________________ss,| lllllll | ||||55|||| |,,,,,,,,,,,,,,,,,,,,,,|,,", + ",,|,____________________ss,|2|||||||2|eeeeee(d d( |,,,,,,,,,,,,,,,,,,,,,,|,,", + ",,|,____________________ss,| 2~|~2 |eeeeee(6h 66 h6( |,,,,,,,,,,,,,,,,,,,,,,|,,", + ",,|,____________________ss,|i ||||| i|Eeeeee(d 66 d( |,,,,,,,,,,,,,,,,,,,,,,|,,", + ",,|,yyyyyyyyy___________ss,|i 2~|~2 i|eeeeee| | |,,,,,,,,,,,,,,,,,,,,,,|,,", ",,|,,,,,,,,,,___________ss,||||||||||||||||||||||||||||||||||||||||||||,,,,,,,,,,,,,,,,,,,,,,|,,", ",,|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|,,", ",,|,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,|,,", @@ -103,7 +103,7 @@ "I": "t_intercom" }, "items": { - "l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ], + "l": [ { "item": "NC_ROBOFAC_FIELD_RESEARCHER_worn", "chance": 50 }, { "item": "NC_ROBOFAC_SCIENTIST_worn", "chance": 50 } ], "i": { "item": "cleaning", "chance": 50 }, "B": [ { "item": "textbooks", "chance": 50 }, { "item": "manuals", "chance": 50 } ] }, @@ -128,38 +128,38 @@ "########################| YY c|###########################|; |ii| |rY Y|#", "########################|r cc c|##|||||||||||##############| 2 2 |rY Y|#", "########################|r ch c||||rrrrrrrrr|||||||||||||||||||||| |||2| i|FY |||||||||| |#", - "#############||||||||||||r YY (Y ???| htth hh htth |Yi|F iKKKKooK| |#", + "#############||||||||||||r YY (Y ???| htth hh htth G |Yi|F iKKKKooK| |#", "#############|6:::::::::|c ( ccccc6 ^|h tth tt htth cYK|FY YY c| |#", "#############| |c cc ( ???| htth hh cYK| iKKooK |#", "#############| 66::::6 |c cc ( ccccc6 ||||Y YccY YcY Y YY |#", - "#########||||| 4 YY 2 ???|Y YccY YcY iKKooK FFF|#", - "#########|666||||| ||||||(((((((((| ^| htth hh hh ||||2(((||||||||||||#", + "#########||||| G 4 YY 2 ???|Y YccY YcY iKKooK FFF|#", + "#########|666||||| ||||||(((((((((|G ^| htth hh hh ||||2(((||||||||||||#", "#########| 5 Y Y ???| htth tt tt W|#| Y |############", - "#########| 5 Y Y ||55|||| hh hh t|#|hdh |############", + "#########| 5 Y Y ||22|||| hh hh t|#|hdh |############", "########|| |||22||||(((((2(|||| | |Y Y||==========]]==========|||||||||############", - "########|6 |c r|^ ^| 4 |Y Y|? 5 . ,,,,,,,,,|^BBB^ |#|||||######", - "########|||44|||c r| hhh |&i| ||||||||? 5 ,,,,,,,,(YY |||:::|######", + "########|6 |c r|^ ^| 4 |Y Y|? . G,,,,,,,,,|^BBB^ |#|||||######", + "########|||44|||c r| hhh |&i| ||||||||? ,,,,,,,,(YY |||:::|######", "########|6 6|c r| ttttt ||||55|eeeeee d (,,,,,,t6t ,,,,,,,,(H dd 5T Y|######", "########|6 6|c r|Y hhh Y| |eeeeee Y d (,,,,,,Y Y2 6h Y5 6|######", - "########|6 66 6|c r|^ ^|66666|Eeeeee Y dh(,,,,,,Yt Y2 hd Y5 :|######", + "########|6 66 6|c r|^ ^|66666|Eeeeee Y dh(,,,,,,Yt Y2 hd QY5 :|######", "########||||||||||||||||||||||||||||||eeeeee d (,,,,,,t6t ,,,,,,,,( dd 5T Y|######", - "#####################################|||||||| 5 ,,,,,,,,(YY |||:::|######", - "#########################################|> 5 5 ,,,,,,,,,|^ A ^|#|||||######", + "#####################################||||||||G ,,,,,,,,(YY |||:::|######", + "#########################################|> 5 G,,,,,,,,,|^ A ^|#|||||######", "##########|||||||||#|||||||||#|||||||||#|||||Y Y||==========]]==========||||5||||############", - "##########|~ ;|~ ;|#|~ ;|~ ;|#|~ ;|~ ;|#|~ ;||55||||B B| ^|##||||||######", + "##########|~ ;|~ ;|#|~ ;|~ ;|#|~ ;|~ ;|#|~ ;||22||||B B| ^|##||||||######", "##########|~Yi|~Yi|#|~Yi|~Yi|#|~Yi|~Yi|#|~Yi| d |B htth t B htth B|th ^||||i; ~|######", "#########|||2|||2|||||||||2|||||2|||2|||||2|| dh|BYhtthYt Y Y BYhtthYB|thY Y 2 Y ~|######", "#########|D @|# @|D @|D @|D @|D @|@ D| d |B t B htth B| B|2|||||||######", "#########|B @|# @|B @|B @|B @|B @|@ B| |B B| B| h6|#########", - "########||| Y|||Y ||| Y|||Y ||| Y|||Y ||| Y|| |||BBBB^YH YBBBBB||| h B| t|#########", - "########|^||2|^|2||^||2|^|2||^||2|^|2||^||2| |||||||||||||||||||||||ccY ||@Y B|#########", - "########|^ Y Y Y Y Y |#####################| c|@ B|#########", - "########|^ |#####################|KFoKK||||||#########", - "########|^ Y Y Y Y Y |#####################|||||||##############", - "########|^||2|^|2||^||2|^|2||^||2|^|2||^||2| |##########################################", - "########||| Y|||Y ||| Y|||Y ||| Y|||Y ||| Y|| |||##########################################", - "#########|B @|B @|B @|B @|B @|B @|B @||||||||############################################", - "#########|D @|D @|D @|D @|D @|D @|D @|###################################################", + "########||| Y|||Y ||| Y|||Y ||| Y|||Y ||| Y||G |||BBBB^YH YBBBBB||| h B| t|#########", + "########|^||2|^|2||^||2|^|2||^||2|^|2||^||2| ||||||||||]]|||||||||,|ccY ||@Y B|#########", + "########|^ Y Y Y Y Y ] ,,,,| c|@ B|#########", + "########|^G ] ,,,,|KFoKK||||||#########", + "########|^ Y Y Y Y Y |h tt YYtt ,,,,|||||||##############", + "########|^||2|^|2||^||2|^|2||^||2|^|2||^||2| |t ? ? ,,,,|####################", + "########||| Y|||Y ||| Y|||Y ||| Y|||Y ||| Y|| |||h ????^ G ^????t,,,,|####################", + "#########|B @|B @|B @|B @|B @|B @|B @||||||||#|||||||||||||||||||||,|####################", + "#########|D @|D @|D @|D @|D @|D @|D @|############################|||####################", "##########||2|||2|||||2|||2|||||2|||2|||||2||###################################################", "##########|~Yi|~Yi|#|~Yi|~Yi|#|~Yi|~Yi|#|~Yi|###################################################", "##########|~ ;|~ ;|#|~ ;|~ ;|#|~ ;|~ ;|#|~ ;|###################################################", @@ -173,7 +173,6 @@ "terrain": { ",": [ "t_shrub_rose", "t_shrub", "t_grass", "t_grass", "t_grass_tall" ], "-": "t_wall_metal", - "G": "t_card_science", "e": "t_elevator", "E": "t_elevator_control", "Y": "t_thconc_floor_olight", @@ -187,6 +186,156 @@ "@": { "item": "bed", "chance": 80 }, "K": { "item": "kitchen", "chance": 40 }, "o": { "item": "oven", "chance": 70 }, + "D": { "item": "NC_ROBOFAC_SCIENTIST_worn", "chance": 50 }, + "B": [ + { "item": "magazines", "chance": 75, "repeat": [ 1, 5 ] }, + { "item": "lab_bookshelves", "chance": 55, "repeat": [ 1, 3 ] } + ] + }, + "npcs": { "G": { "class": "hub_security" }, "Q": { "class": "hub_security_head" } } + } + }, + { + "type": "mapgen", + "om_terrain": [ + [ "robofachq_ai_a0", "robofachq_ai_a1", "robofachq_ai_a2", "robofachq_ai_a3" ], + [ "robofachq_ai_b0", "robofachq_ai_b1", "robofachq_ai_b2", "robofachq_ai_b3" ] + ], + "method": "json", + "object": { + "fill_ter": "t_concrete", + "rows": [ + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "######################################################|||||||||||||||||||||||||||||||||||||||||#", + "######################################################|:YY:YY:YY:YY:YY:YY:YY:| rrrrrrrrrrr|#", + "######################################################|: : : : : : : :| Y|#", + "######################################################|: : : : : : : :| rrr rrrr |#", + "######################################################|: : : : : : : :| Y|#", + "###################################################||||: : : : : : : :| rrrrrrrrrrr|#", + "############################################||||||||YY|: : : : : : : :||5(((||||||||||||#", + "############################################| 5 5 Y2>|##########", + "############################################| 5 5 Y Y Y Y Y Y |||||||2|||##########", + "############################################| Y||||((((((((((((((((((((|6 |############", + "############################################| 5 (````````````````````||Y |||||||######", + "#####################################|||||||| |5(````````````````````6|: ::::::|######", + "#####################################|eeeeee d | (((((((((((``````````6|||| :|######", + "#####################################|eeeeee Y d | h6``````````6|: Y 6 :|######", + "#####################################|Eeeeee Y 6h| h6``````````6|: Y 6 :|######", + "#####################################|eeeeee d | (((((((((((``````````6|||| :|######", + "#####################################|||||||| |5(````````````````````6|: ::::::|######", + "########################################|>< 5 5 (````````````````````||Y |||||||######", + "########################################| | ||||((((((((((((((((((((|6 |############", + "########################################||||| 5 5 Y Y Y Y Y Y |||||||2|||##########", + "############################################| 5 5 Y2>|##########", + "############################################||||||||YY|: : : : : : : :||5(((||||||||||||#", + "###################################################||||: : : : : : : :| rrrrrrrrrrr|#", + "######################################################|: : : : : : : :| Y|#", + "######################################################|: : : : : : : :| rrr rrrr |#", + "######################################################|: : : : : : : :| Y|#", + "######################################################|:YY:YY:YY:YY:YY:YY:YY:| rrrrrrrrrrr|#", + "######################################################|||||||||||||||||||||||||||||||||||||||||#", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################" + ], + "palettes": [ "robofachq" ], + "terrain": { + "-": "t_wall_metal", + "e": "t_elevator", + "E": "t_elevator_control", + "Y": "t_thconc_floor_olight", + "#": "t_rock", + "6": "t_console" + }, + "furniture": { ":": "f_server", "K": "f_counter" }, + "items": { "r": [ { "item": "electronics", "chance": 75, "repeat": [ 1, 5 ] } ] } + } + }, + { + "type": "mapgen", + "om_terrain": [ + [ "robofachq_aiutl_a0", "robofachq_aiutl_a1", "robofachq_aiutl_a2", "robofachq_aiutl_a3" ], + [ "robofachq_aiutl_b0", "robofachq_aiutl_b1", "robofachq_aiutl_b2", "robofachq_aiutl_b3" ] + ], + "method": "json", + "object": { + "fill_ter": "t_concrete", + "rows": [ + "################################################################################################", + "################################################################################################", + "################################################################################################", + "################################################################################################", + "##############################################||||##############################################", + "##############################################|66|##############################################", + "##############################################| |##############################################", + "###########################|||||||||||||||||||| ||||||||||||||||||||||||||||||||||||||||||||||#", + "###########################|::::::::::::::::|B d ^|: : : : : : : :| :::::::::::|#", + "###########################| :|B Y h dh |: : : : : : : :| |#", + "###########################| :|B Y dd |YYYYYYYYYYYYYYYYYYYYYY| ::: :::::|#", + "###########################| :|B |: : : : : : : :| |#", + "###########################|:::::::: ||||||55||^||||: : : : : : : :| :::::::::::|#", + "###########################| 5 Y ||| |||||||||||||||||||||||||5(((||||||||||||#", + "###########################|::::::::::::| Y 5 5 2<|##########", + "###########################|||||||||||||||||| 5 5 Y Y Y Y Y Y |||||||2|||##########", + "############################################||55|||||||((((((((((((((((((((|6 |############", + "############################################| 5wwwwwwwwwwwwwwwwwwwwww||Y |||||||######", + "#####################################|||||||| |wwwwwwwwwwwwwwwwwwwwww:|: ::::::|######", + "#####################################|eeeeee (wwwwwwwwwwwwwwwwwwwwww:|||| :|######", + "#####################################|eeeeee Y (wwwwwwwwwwwwwwwwwwwwww:|: 6 :|######", + "#####################################|Eeeeee Y (wwwwwwwwwwwwwwwwwwwwww:|: 6 :|######", + "#####################################|eeeeee (wwwwwwwwwwwwwwwwwwwwww:|||| :|######", + "#####################################|||||||| |wwwwwwwwwwwwwwwwwwwwww:|: ::::::|######", + "########################################|>< 5 5wwwwwwwwwwwwwwwwwwwwww||Y |||||||######", + "########################################| ||55|||||||((((((((((((((((((((|6 |############", + "#############################|||||||||||||||| 5 5 Y Y Y Y Y Y ||2||||2|||##########", + "#############################|^ Y 5 5 | 2<|##########", + "#############################|^ Y ||| ||||||||||||||22|||||||||5(((||||||||||||#", + "#############################||2|2((((|(((2|||222||||||:::| : : : : : :| :::::::::::|#", + "#############################|i | |h B| |:::: | : : : : : :| |#", + "#############################|; | dd|dd B| Y 5 Y 2YYYYYYYYYYYYYYYYY:| :::: :::::|#", + "#############################|||| |h B| Y | | : : : : : :| |#", + "################################| h| ^|2||| |||2||:::| : : : : : :| :::::::::::|#", + "################################|2|||||||| |555||Y :|||||||||||||| |||||||||22||||||||||||||#", + "################################| ( | |:Y :|############| |#######| |: : : : : :|#", + "################################| cccc 2 2 ||2|||||||||||||||| ||||||||| |: : : : : :|#", + "################################| ||||| | |::::::::::::| 2 2 |#", + "################################| cccc | 2 2 |#", + "################################| 2 |||||||||||||||||#", + "################################| ccccccccc ||||| |||||||||||||||| |||||||||#################", + "################################| |###| :::::::::::::: :|######################", + "################################||||||||||||||###| 6 :|######################", + "#################################################| 6 :|######################", + "#################################################| :::::::::::::: :|######################", + "#################################################|||||||||||||||||||||||||######################", + "################################################################################################", + "################################################################################################" + ], + "palettes": [ "robofachq" ], + "terrain": { + "-": "t_wall_metal", + "e": "t_elevator", + "E": "t_elevator_control", + "Y": "t_thconc_floor_olight", + "#": "t_rock", + "6": "t_console" + }, + "items": { "B": [ { "item": "magazines", "chance": 75, "repeat": [ 1, 5 ] }, { "item": "lab_bookshelves", "chance": 55, "repeat": [ 1, 3 ] } diff --git a/data/json/npcs/factions.json b/data/json/npcs/factions.json index b746805d3a240..1a9441fdcbd4c 100644 --- a/data/json/npcs/factions.json +++ b/data/json/npcs/factions.json @@ -22,7 +22,7 @@ "type": "faction", "id": "robofac", "name": "Hub 01", - "likes_u": 0, + "likes_u": -200, "respects_u": 0, "known_by_u": false, "size": 100, diff --git a/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json b/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json index 7ea0a69fbb363..45067d9802ec5 100644 --- a/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json +++ b/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json @@ -1,15 +1,14 @@ [ { "type": "item_group", - "id": "NC_ROBOFAC_FIELD_RESEARCHER_worn", + "id": "NC_ROBOFAC_SCIENTIST_worn", "subtype": "collection", "entries": [ { "item": "under_armor" }, { "item": "under_armor_shorts" }, - { "item": "robofac_enviro_suit" }, - { "item": "mask_gas" }, - { "collection": [ { "group": "guns_pistol_milspec" }, { "item": "holster" } ], "prob": 50 }, - { "item": "chestrig" } + { "item": "robofac_jumpsuit" }, + { "item": "coat_lab" }, + { "item": "boots" } ] } ] diff --git a/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json b/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json new file mode 100644 index 0000000000000..7ea0a69fbb363 --- /dev/null +++ b/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json @@ -0,0 +1,15 @@ +[ + { + "type": "item_group", + "id": "NC_ROBOFAC_FIELD_RESEARCHER_worn", + "subtype": "collection", + "entries": [ + { "item": "under_armor" }, + { "item": "under_armor_shorts" }, + { "item": "robofac_enviro_suit" }, + { "item": "mask_gas" }, + { "collection": [ { "group": "guns_pistol_milspec" }, { "item": "holster" } ], "prob": 50 }, + { "item": "chestrig" } + ] + } +] diff --git a/data/json/npcs/robofac/NPC_Ulysses_Rourke.json b/data/json/npcs/robofac/NPC_Ulysses_Rourke.json new file mode 100644 index 0000000000000..4539c75a1193f --- /dev/null +++ b/data/json/npcs/robofac/NPC_Ulysses_Rourke.json @@ -0,0 +1,80 @@ +[ + { + "type": "npc", + "id": "hub_security_head", + "//": "A cold ex-mercenary from a third world country you have never heard of before. Third in charge after Melchior and Director Cohen. ", + "name_unique": "U. Rourke", + "name_suffix": "Head of Security", + "gender": "male", + "class": "NC_ROBOFAC_SECURITY_HEAD", + "attitude": 0, + "mission": 8, + "//": "He needs unique dialogue. But for now he's just the boss enemy of Hub 01, if the player attmepts to invade the lab.", + "chat": "TALK_HUB_SECURITY", + "faction": "robofac" + }, + { + "type": "npc_class", + "id": "NC_ROBOFAC_SECURITY_HEAD", + "name": "intercom", + "job_description": "I'm part of the Hub security team.", + "//": "Needs his own unique background.", + "traits": [ + { "group": "BG_survival_story_POLICE" }, + [ "TOUGH2", 100 ], + [ "PAINRESIST", 100 ], + [ "GOODCARDIO", 100 ], + { "group": "Appearance_demographics" } + ], + "bonus_str": { "rng": [ 2, 4 ] }, + "bonus_int": { "rng": [ 1, 2 ] }, + "bonus_per": { "rng": [ 2, 4 ] }, + "skills": [ + { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -1 } ] } }, + { "skill": "gun", "bonus": { "rng": [ 2, 4 ] } }, + { "skill": "pistol", "bonus": { "rng": [ 2, 4 ] } }, + { "skill": "smg", "bonus": { "rng": [ 2, 6 ] } } + ], + "bionics": [ + { "id": "bio_targeting", "chance": 100 }, + { "id": "bio_memory", "chance": 100 }, + { "id": "bio_armor_arms", "chance": 100 }, + { "id": "bio_armor_legs", "chance": 100 }, + { "id": "bio_hydraulics", "chance": 100 }, + { "id": "bio_cqb", "chance": 100 }, + { "id": "bio_metabolics", "chance": 100 }, + { "id": "bio_str_enhancer", "chance": 100 }, + { "id": "bio_blade", "chance": 100 }, + { "id": "bio_power_storage", "chance": 100 }, + { "id": "bio_torsionratchet", "chance": 100 } + ], + "carry_override": "NC_robofac_security_head_misc", + "worn_override": "NC_robofac_security_head_worn" + }, + { + "type": "item_group", + "id": "NC_robofac_security_head_worn", + "subtype": "collection", + "entries": [ + { "item": "under_armor" }, + { "item": "under_armor_shorts" }, + { "item": "rm13_armor" }, + { "item": "goggles_nv" }, + { "item": "holster", "prob": 50 }, + { "item": "chestrig" } + ] + }, + { + "type": "item_group", + "id": "NC_robofac_security_head_misc", + "subtype": "collection", + "entries": [ + { "item": "EMPbomb" }, + { "item": "needlegun" }, + { "item": "goggles_nv" }, + { "item": "flashbang", "count": 2 }, + { "item": "plut_cell", "count": 5 }, + { "item": "5x50heavy", "count": 10 } + ] + } +] diff --git a/data/json/npcs/robofac/NPC_robofac_generic_security.json b/data/json/npcs/robofac/NPC_robofac_generic_security.json new file mode 100644 index 0000000000000..e2378b7db15e8 --- /dev/null +++ b/data/json/npcs/robofac/NPC_robofac_generic_security.json @@ -0,0 +1,67 @@ +[ + { + "type": "npc", + "id": "hub_security", + "//": "A generic guard for Hub 01.", + "name_suffix": "Hub Security", + "class": "NC_ROBOFAC_SECURITY", + "attitude": 0, + "mission": 8, + "chat": "TALK_HUB_SECURITY", + "faction": "robofac" + }, + { + "type": "npc_class", + "id": "NC_ROBOFAC_SECURITY", + "name": "intercom", + "job_description": "I'm part of the Hub security team.", + "traits": [ { "group": "BG_survival_story_POLICE" }, { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ], + "bonus_str": { "rng": [ 1, 3 ] }, + "bonus_int": { "rng": [ 1, 2 ] }, + "bonus_per": { "rng": [ 1, 2 ] }, + "skills": [ + { "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -2 } ] } }, + { "skill": "gun", "bonus": { "rng": [ 2, 4 ] } }, + { "skill": "pistol", "bonus": { "rng": [ 2, 4 ] } }, + { "skill": "rifle", "bonus": { "rng": [ 2, 4 ] } } + ], + "carry_override": "NC_robofac_generic_security_misc", + "worn_override": "NC_robofac_generic_security_worn" + }, + { + "type": "item_group", + "id": "NC_robofac_generic_security_worn", + "subtype": "collection", + "entries": [ + { "item": "under_armor" }, + { "item": "under_armor_shorts" }, + { "item": "robofac_jumpsuit" }, + { "item": "tac_helmet" }, + { "item": "modularvestceramic" }, + { "item": "gloves_tactical" }, + { "item": "glasses_bal", "prob": 33 }, + { "item": "boots_combat" }, + { "item": "holster", "prob": 50 }, + { "item": "chestrig" } + ] + }, + { + "type": "item_group", + "id": "NC_robofac_generic_security_misc", + "subtype": "collection", + "entries": [ + { "item": "EMPbomb", "prob": 33 }, + { "item": "grenade", "prob": 2 }, + { "item": "PR24-extended" }, + { "item": "flashlight" }, + { "item": "l_mp_9mm" }, + { "item": "9mmP", "count": 6 } + ] + }, + { + "id": "TALK_GUARD", + "type": "talk_topic", + "dynamic_line": [ "Keep it civil, merc.", "Just on watch, move along.", { "u_male": [ "Sir." ], "no": [ "Ma'am" ] } ], + "responses": [ { "text": "...", "topic": "TALK_DONE" } ] + } +] diff --git a/data/json/overmap/specials.json b/data/json/overmap/specials.json index e0062880a610d..a0c8b92487f68 100644 --- a/data/json/overmap/specials.json +++ b/data/json/overmap/specials.json @@ -2169,7 +2169,23 @@ { "point": [ 0, 1, -2 ], "overmap": "robofachq_hab_b0" }, { "point": [ 1, 1, -2 ], "overmap": "robofachq_hab_b1" }, { "point": [ 2, 1, -2 ], "overmap": "robofachq_hab_b2" }, - { "point": [ 3, 1, -2 ], "overmap": "robofachq_hab_b3" } + { "point": [ 3, 1, -2 ], "overmap": "robofachq_hab_b3" }, + { "point": [ 0, 0, -6 ], "overmap": "robofachq_ai_a0" }, + { "point": [ 1, 0, -6 ], "overmap": "robofachq_ai_a1" }, + { "point": [ 2, 0, -6 ], "overmap": "robofachq_ai_a2" }, + { "point": [ 3, 0, -6 ], "overmap": "robofachq_ai_a3" }, + { "point": [ 0, 1, -6 ], "overmap": "robofachq_ai_b0" }, + { "point": [ 1, 1, -6 ], "overmap": "robofachq_ai_b1" }, + { "point": [ 2, 1, -6 ], "overmap": "robofachq_ai_b2" }, + { "point": [ 3, 1, -6 ], "overmap": "robofachq_ai_b3" }, + { "point": [ 0, 0, -7 ], "overmap": "robofachq_aiutl_a0" }, + { "point": [ 1, 0, -7 ], "overmap": "robofachq_aiutl_a1" }, + { "point": [ 2, 0, -7 ], "overmap": "robofachq_aiutl_a2" }, + { "point": [ 3, 0, -7 ], "overmap": "robofachq_aiutl_a3" }, + { "point": [ 0, 1, -7 ], "overmap": "robofachq_aiutl_b0" }, + { "point": [ 1, 1, -7 ], "overmap": "robofachq_aiutl_b1" }, + { "point": [ 2, 1, -7 ], "overmap": "robofachq_aiutl_b2" }, + { "point": [ 3, 1, -7 ], "overmap": "robofachq_aiutl_b3" } ], "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road" } ], "locations": [ "wilderness" ], diff --git a/data/json/overmap_terrain_robofachq.json b/data/json/overmap_terrain_robofachq.json index 7596cae1824aa..08a4c59ffeb5e 100644 --- a/data/json/overmap_terrain_robofachq.json +++ b/data/json/overmap_terrain_robofachq.json @@ -176,5 +176,149 @@ "color": "light_blue", "see_cost": 5, "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_ai_a0", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_ai_a1", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_ai_a2", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_ai_a3", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_ai_b0", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_ai_b1", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_ai_b2", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_ai_b3", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_aiutl_a0", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_aiutl_a1", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_aiutl_a2", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_aiutl_a3", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_aiutl_b0", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_aiutl_b1", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_aiutl_b2", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] + }, + { + "type": "overmap_terrain", + "id": "robofachq_aiutl_b3", + "name": "hub 01", + "sym": "0", + "color": "light_blue", + "see_cost": 5, + "flags": [ "NO_ROTATE" ] } ] From d012a662872b9a7b898f0ef9ed0ca5dba1add804 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Thu, 13 Jun 2019 22:52:56 -0600 Subject: [PATCH 2/2] Rename misnamed files --- data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json | 9 +++++---- data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json | 9 ++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json b/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json index 45067d9802ec5..7ea0a69fbb363 100644 --- a/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json +++ b/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json @@ -1,14 +1,15 @@ [ { "type": "item_group", - "id": "NC_ROBOFAC_SCIENTIST_worn", + "id": "NC_ROBOFAC_FIELD_RESEARCHER_worn", "subtype": "collection", "entries": [ { "item": "under_armor" }, { "item": "under_armor_shorts" }, - { "item": "robofac_jumpsuit" }, - { "item": "coat_lab" }, - { "item": "boots" } + { "item": "robofac_enviro_suit" }, + { "item": "mask_gas" }, + { "collection": [ { "group": "guns_pistol_milspec" }, { "item": "holster" } ], "prob": 50 }, + { "item": "chestrig" } ] } ] diff --git a/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json b/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json index 7ea0a69fbb363..45067d9802ec5 100644 --- a/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json +++ b/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json @@ -1,15 +1,14 @@ [ { "type": "item_group", - "id": "NC_ROBOFAC_FIELD_RESEARCHER_worn", + "id": "NC_ROBOFAC_SCIENTIST_worn", "subtype": "collection", "entries": [ { "item": "under_armor" }, { "item": "under_armor_shorts" }, - { "item": "robofac_enviro_suit" }, - { "item": "mask_gas" }, - { "collection": [ { "group": "guns_pistol_milspec" }, { "item": "holster" } ], "prob": 50 }, - { "item": "chestrig" } + { "item": "robofac_jumpsuit" }, + { "item": "coat_lab" }, + { "item": "boots" } ] } ]