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

Hub 01 general mapgen additions #31411

Merged
merged 2 commits into from
Jun 15, 2019
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 8 additions & 0 deletions data/json/items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
207 changes: 178 additions & 29 deletions data/json/mapgen/robofachq_static.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/json/npcs/factions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 14 additions & 0 deletions data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"type": "item_group",
"id": "NC_ROBOFAC_SCIENTIST_worn",
"subtype": "collection",
"entries": [
{ "item": "under_armor" },
{ "item": "under_armor_shorts" },
{ "item": "robofac_jumpsuit" },
{ "item": "coat_lab" },
{ "item": "boots" }
]
}
]
80 changes: 80 additions & 0 deletions data/json/npcs/robofac/NPC_Ulysses_Rourke.json
Original file line number Diff line number Diff line change
@@ -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 }
]
}
]
67 changes: 67 additions & 0 deletions data/json/npcs/robofac/NPC_robofac_generic_security.json
Original file line number Diff line number Diff line change
@@ -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" } ]
}
]
18 changes: 17 additions & 1 deletion data/json/overmap/specials.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
144 changes: 144 additions & 0 deletions data/json/overmap_terrain_robofachq.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]