From 0c958d2863c10e848dbec0171addea1bde4eade8 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 10 Feb 2020 19:05:02 -0500 Subject: [PATCH 01/75] Frankenstein recipe, class, item, book. Needs Cyrus Whately NPC, needs Millyficent to create mission to meet him that adds mapgen. Cyrus Questlines. --- data/mods/Aftershock/items/books.json | 20 ++++++++ .../Aftershock/items/frankenstein_items.json | 23 +++++++++ .../Aftershock/npcs/frankenstein_classes.json | 50 +++++++++++++++++++ .../recipes/frankenstein_recipes.json | 28 +++++++++++ 4 files changed, 121 insertions(+) create mode 100644 data/mods/Aftershock/items/frankenstein_items.json create mode 100644 data/mods/Aftershock/npcs/frankenstein_classes.json create mode 100644 data/mods/Aftershock/recipes/frankenstein_recipes.json diff --git a/data/mods/Aftershock/items/books.json b/data/mods/Aftershock/items/books.json index 64e9a22369b95..d8e2842d19dee 100644 --- a/data/mods/Aftershock/items/books.json +++ b/data/mods/Aftershock/items/books.json @@ -132,5 +132,25 @@ "name_plural": "tripod schematics", "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" + }, + { + "id": "cyrus'_notes", + "type": "BOOK", + "name": { "str": "Cyrus Whateley's Notes on Repurposing mi-go victims", "str_pl": "copies of Cyrus Whateley's Notes" }, + "description": "A folio of notes written by a madman. They seem to suggestion ways to re-animate the dead and create various affronts to the natural order.", + "weight": "2063 g", + "volume": "2 L", + "price": 929200, + "bashing": 8, + "material": [ "paper" ], + "symbol": "?", + "looks_like": "adv_chemistry", + "color": "light_green", + "skill": "firstaid", + "required_level": 8, + "max_level": 9, + "intelligence": 13, + "fun": -1, + "time": "50 m" } ] diff --git a/data/mods/Aftershock/items/frankenstein_items.json b/data/mods/Aftershock/items/frankenstein_items.json new file mode 100644 index 0000000000000..1f684e20835ba --- /dev/null +++ b/data/mods/Aftershock/items/frankenstein_items.json @@ -0,0 +1,23 @@ +[ + { + "id": "inactive_frankenstein", + "type": "TOOL", + "name": "inactive frankenstein", + "description": "This stitched together abomination in human form lies still and waiting for you to give it the spark of life. In all likelihood you are the monster. ", + "weight": "68 kg", + "volume": "62 L", + "price": 600000, + "to_hit": -3, + "bashing": 8, + "material": "flesh", + "symbol": ";", + "color": "green", + "use_action": { + "type": "place_npc", + "npc_class_id": "frankenstein", + "summon_msg": "It's alive!", + "place_randomly": true, + "moves": 50 + } + } +] diff --git a/data/mods/Aftershock/npcs/frankenstein_classes.json b/data/mods/Aftershock/npcs/frankenstein_classes.json new file mode 100644 index 0000000000000..ebc3be8ba5692 --- /dev/null +++ b/data/mods/Aftershock/npcs/frankenstein_classes.json @@ -0,0 +1,50 @@ +[ + { + "type": "npc_class", + "id": "frankenstein", + "name": "Abomination", + "job_description": "The mi-go took me and vivisected me. Now you've given me a body again.", + "//": "Make a Frankenstein BG story", + "traits": [ + { "group": "BG_survival_story_UNIVERSAL" }, + { "group": "NPC_starting_traits" }, + { "group": "Appearance_demographics" }, + [ "SHOUT1", 75 ] + ], + "skills": [ + { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 4, 2 ] }, { "rng": [ -3, -1 ] } ] } ] } } + ], + "worn_override": "NC_CYBORG_worn", + "carry_override": "NC_CYBORG_carried", + "common": false, + "bionics": [ + { "id": "bio_ankles", "chance": 50 }, + { "id": "bio_dis_shock", "chance": 50 }, + { "id": "bio_dis_acid", "chance": 50 }, + { "id": "bio_drain", "chance": 50 }, + { "id": "bio_noise", "chance": 50 }, + { "id": "bio_power_weakness", "chance": 50 }, + { "id": "bio_itchy", "chance": 50 }, + { "id": "bio_nostril", "chance": 50 }, + { "id": "bio_thumbs", "chance": 50 }, + { "id": "bio_spasm", "chance": 50 }, + { "id": "bio_shakes", "chance": 50 }, + { "id": "bio_leaky", "chance": 50 }, + { "id": "bio_blade", "chance": 50 }, + { "id": "bio_deformity", "chance": 100 }, + { "id": "bio_voice", "chance": 100 }, + { "id": "bio_eye_enhancer", "chance": 50 }, + { "id": "bio_ankles", "chance": 50 }, + { "id": "bio_trip", "chance": 50 }, + { "id": "bio_stiff", "chance": 50 }, + { "id": "bio_armor_head", "chance": 50 }, + { "id": "bio_armor_torso", "chance": 50 }, + { "id": "bio_armor_arms", "chance": 50 }, + { "id": "bio_armor_legs", "chance": 50 }, + { "id": "bio_armor_eyes", "chance": 50 }, + { "id": "bio_claws", "chance": 50 }, + { "id": "bio_power_storage", "chance": 100 }, + { "id": "bio_torsionratchet", "chance": 100 } + ] + } +] diff --git a/data/mods/Aftershock/recipes/frankenstein_recipes.json b/data/mods/Aftershock/recipes/frankenstein_recipes.json new file mode 100644 index 0000000000000..86b67d2fb3edf --- /dev/null +++ b/data/mods/Aftershock/recipes/frankenstein_recipes.json @@ -0,0 +1,28 @@ +[ + { + "type": "recipe", + "result": "inactive_frankenstein", + "category": "CC_ELECTRONIC", + "subcategory": "CSC_ELECTRONIC_CBMS", + "skill_used": "electronics", + "skills_required": [ "firstaid", 8 ], + "difficulty": 7, + "time": 50000, + "reversible": true, + "decomp_learn": 5, + "book_learn": [ [ "cyrus'_notes", 7 ] ], + "using": [ [ "soldering_standard", 20 ] ], + "tools": [ [ [ "afs_solderers_item", -1 ], [ "toolset", -1 ] ] ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 } ], + "components": [ + [ [ "power_supply", 6 ], [ "UPS_off", 1 ] ], + [ [ "amplifier", 4 ] ], + [ [ "living_brain_jar", 1 ] ], + [ [ "humming_heart", 2 ] ], + [ [ "bot_broken_cyborg", 1 ] ], + [ [ "thread", 200 ] ], + [ [ "1st_aid", 4 ] ], + [ [ "chain", 2 ] ] + ] + } +] From 76baf49d2133c07553c9dfaa90436f15241928fe Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 12 Apr 2020 23:43:17 -0500 Subject: [PATCH 02/75] Update frankenstein_recipes.json --- data/mods/Aftershock/recipes/frankenstein_recipes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/recipes/frankenstein_recipes.json b/data/mods/Aftershock/recipes/frankenstein_recipes.json index 86b67d2fb3edf..3717f8c572588 100644 --- a/data/mods/Aftershock/recipes/frankenstein_recipes.json +++ b/data/mods/Aftershock/recipes/frankenstein_recipes.json @@ -13,10 +13,10 @@ "book_learn": [ [ "cyrus'_notes", 7 ] ], "using": [ [ "soldering_standard", 20 ] ], "tools": [ [ [ "afs_solderers_item", -1 ], [ "toolset", -1 ] ] ], - "qualities": [ { "id": "SCREW_FINE", "level": 1 } ], + "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "CUT_FINE", "level": 2 } ], "components": [ - [ [ "power_supply", 6 ], [ "UPS_off", 1 ] ], - [ [ "amplifier", 4 ] ], + [ [ "afs_energy_storage_4", 6 ] ], + [ [ "afs_biomaterial_3", 4 ] ], [ [ "living_brain_jar", 1 ] ], [ [ "humming_heart", 2 ] ], [ [ "bot_broken_cyborg", 1 ] ], From 94cbba311f9e5820ffabd537eb3fce8579f1591a Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 8 May 2020 21:57:20 -0500 Subject: [PATCH 03/75] Update whately_dialogue.json --- .../Aftershock/npcs/whately_dialogue.json | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index c0a01a5004b8e..104e6fcaa1847 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -177,6 +177,7 @@ "item": "humming_heart", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], + "followup": "MISSION_FIND_CYRUS", "dialogue": { "describe": "Parts, parts, parts. Bring me some hearts. ", "offer": "The Whately's are known in these parts for gathering body parts. Ha! That's just rumors and hearsay. But I do need two humming hearts.", @@ -189,5 +190,49 @@ "failure": "I can't be Dr Frankenstein unless you get me these." }, "end": { "effect": [ { "u_buy_item": "mutagen_migo", "container": "flask_glass", "count": 2 } ] } + }, + { + "id": "MISSION_FIND_CYRUS", + "type": "mission_definition", + "name": "Find my great uncle Cyrus Whately", + "description": "Cyrus and his family were poorly liked even for Whately's before the end of the world. They went so far off grid that they may not even know anything has changed. I need to know he's alive and where his research has taken him.", + "goal": "MGOAL_TALK_TO_NPC", + "difficulty": 2, + "value": 150000, + "start": { + "assign_mission_target": { + "om_terrain": "lmoe_whately", + "om_special": "Whately_lmoe", + "reveal_radius": 3, + "must_see": false, + "random": true, + "search_range": 180 + } + }, + "end": { + "opinion": { "trust": 1, "value": 1 }, + "update_mapgen": [ + { + "om_terrain": "mortuary_2story", + "set": { "place_npcs": [ { "class": "whately_cousin", "x": 17, "y": 18 } ] }, + "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] + }, + { + "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, + "dialogue": { + "describe": "My great uncle Cyrus had an unconventional relationship with both his neighbors and the mi-go before the Cataclysm. I'd like to know where he has gotten with his research since I haven't heard from him in years.", + "offer": "Can you go find my uncle and let him know where I am?", + "accepted": "Of course you said yes, you want to know what he's found just as much as I do!", + "rejected": "Oh well. I was hoping to teach you some new things, so you could start your own experiments.", + "advice": "I've given you directions to that branch of the family's bunker. Yes I said bunker did you think he'd be in a tower?", + "inquire": "How is the search going?", + "success": "Thanks, now that he knows I'm here he's sent some of my cousins. Now that I have more disposable help, take a copy of my early research.", + "success_lie": "What good does this do us?", + "failure": "I hope he didn't meet Leandrus' fate…" + } + } + ] + } } ] From dff66bea08e1c5a8e2b8d3294d1429a23a49994a Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 8 May 2020 23:09:54 -0500 Subject: [PATCH 04/75] Whately Cousins --- data/mods/Aftershock/mutations/mutations.json | 1 + data/mods/Aftershock/npcs/classes.json | 20 +++++++ .../npcs/mutant_npcs/trait_groups.json | 52 +++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/data/mods/Aftershock/mutations/mutations.json b/data/mods/Aftershock/mutations/mutations.json index 1550e4b8e3c99..16c3e58b49592 100644 --- a/data/mods/Aftershock/mutations/mutations.json +++ b/data/mods/Aftershock/mutations/mutations.json @@ -170,6 +170,7 @@ "points": 3, "description": "You no longer move like a human, others find it disconcerting. Dexterity + 4", "prereqs": [ "ENHANCED_REACTIONS" ], + "threshreq": "THRESH_YUGGOTH", "category": [ "MIGO" ], "passive_mods": { "dex_mod": 4 } }, diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 5327aa960cf84..dfa0354f0dd5c 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -60,6 +60,7 @@ "name": "mi-go enthusiast", "job_description": "I've been studying the mi-go for years…", "common": false, + "gender": "female", "traits": [ [ "hair_red_long", 100 ], [ "SKIN_LIGHT", 100 ], @@ -78,5 +79,24 @@ { "skill": "firstaid", "bonus": { "rng": [ 1, 4 ] } }, { "skill": "cooking", "bonus": { "rng": [ 6, 8 ] } } ] + }, + { + "type": "npc_class", + "id": "whately_cousin", + "name": "Whately Cousin", + "common": "false", + "job_description": "Our family has been through hard times before. We know how to survive.", + "skills": [ + { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, + { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } }, + { "skill": "unarmed", "bonus": { "rng": [ 3, 6 ] } } + ], + "bonus_str": 2, + "bonus_dex": 2, + "traits": [ + { "group": "trait_mutant_npc_common" }, + { "group": "trait_group_migo" }, + { "distribution": [ { "group": "trait_group_migo_nonthres" }, { "group": "trait_group_migo_postthres" } ] } + ] } ] diff --git a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json index 7f96b7efc88f3..af9a6331006fe 100644 --- a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json +++ b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json @@ -967,5 +967,57 @@ ] } ] + }, + { + "type": "trait_group", + "id": "trait_group_migo", + "subtype": "collection", + "traits": [ + { "trait": "PATCHFUR", "prob": 50 }, + { "trait": "LEATHER_FEET", "prob": 50 }, + { "trait": "SKINFOLDS", "prob": 50 }, + { "trait": "HAULER", "prob": 50 }, + { "trait": "WEAKJOINTS", "prob": 50 }, + { "trait": "UPLIFTED" }, + { "trait": "ELEPHANTINE_SMELL", "prob": 50 }, + { "trait": "SPECAILIZED_DIET", "prob": 50 }, + { "trait": "ELEPHANTINE_SMELL", "prob": 50 }, + { "trait": "CRUSHINGFEET", "prob": 50 }, + { "trait": "HERBIVORE", "prob": 50 }, + { "trait": "FACEBUMPS", "prob": 50 } + ] + }, + { + "type": "trait_group", + "id": "trait_group_migo_nonthres", + "subtype": "collection", + "traits": [ + { "trait": "MIGO_BREATHE", "prob": 50 }, + { "trait": "SHOUT1", "prob": 50 }, + { "trait": "NEURAL_IMPROVEMENT", "prob": 50 }, + { "trait": "ENHANCED_REACTIONS", "prob": 50 }, + { "trait": "QUICKENING", "prob": 50 }, + { "distribution": [ { "trait": "NEURAL_IMPROVEMENT" }, { "trait": "EXPANDED_CONSCIOUSNESS" } ] }, + { "distribution": [ { "trait": "WARM_NATURED" }, { "trait": "MOUTH_TENDRILS" } ] } + ] + }, + { + "type": "trait_group", + "id": "trait_group_migo_postthres", + "subtype": "collection", + "traits": [ + { "trait": "THRESH_YUGGOTH", "MIGO" }, + { "distribution": [ { "trait": "UPLIFTED" }, { "trait": "ALIEN_INT" } ] }, + { "trait": "MIGO_HEAT_RESIST", "prob": 50 }, + { "trait": "OTHERWORLDLY_GRACE", "prob": 20 }, + { "trait": "NEW_MUSCLES", "prob": 20 }, + { "trait": "MUSCLE_FIBER", "prob": 50 }, + { + "distribution": [ + { "trait": "MIGO_EARS" }, + { "collection": [ { "trait": "NEW_MUSCLES" }, { "trait": "MUSCLE_FIBER" }, { "trait": "DETACHMENT" } ] } + ] + } + ] } ] From 91136ae6c10a53ff93ab91e9a81fe9d79548221f Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 9 May 2020 11:29:18 -0500 Subject: [PATCH 05/75] fixes --- data/mods/Aftershock/items/books.json | 2 +- data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/items/books.json b/data/mods/Aftershock/items/books.json index 6f12d74540b1c..e3b6544ce525d 100644 --- a/data/mods/Aftershock/items/books.json +++ b/data/mods/Aftershock/items/books.json @@ -176,7 +176,7 @@ "required_level": 10, "max_level": 10, "intelligence": 16, - "time": "15 m", + "time": "35 m", "fun": -3 } ] diff --git a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json index af9a6331006fe..785987eb876f6 100644 --- a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json +++ b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json @@ -1006,7 +1006,8 @@ "id": "trait_group_migo_postthres", "subtype": "collection", "traits": [ - { "trait": "THRESH_YUGGOTH", "MIGO" }, + { "trait": "THRESH_YUGGOTH" }, + { "trait": "MIGO" }, { "distribution": [ { "trait": "UPLIFTED" }, { "trait": "ALIEN_INT" } ] }, { "trait": "MIGO_HEAT_RESIST", "prob": 50 }, { "trait": "OTHERWORLDLY_GRACE", "prob": 20 }, From 323e8795e33c46659112540348c452d0ad3c63fe Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 9 May 2020 12:42:21 -0500 Subject: [PATCH 06/75] Update classes.json --- data/mods/Aftershock/npcs/classes.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index dfa0354f0dd5c..8240c36cc16d3 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -67,8 +67,7 @@ [ "WARM_NATURED", 100 ], [ "INT_UP_3", 100 ], [ "DEX_UP_2", 100 ], - [ "STR_UP", 100 ], - { "group": "Appearance_demographics", "prob": 100 } + [ "STR_UP", 100 ] ], "bonus_dex": { "rng": [ -1, 0 ] }, "bonus_int": { "rng": [ 2, 5 ] }, @@ -84,7 +83,7 @@ "type": "npc_class", "id": "whately_cousin", "name": "Whately Cousin", - "common": "false", + "common": false, "job_description": "Our family has been through hard times before. We know how to survive.", "skills": [ { "skill": "dodge", "bonus": { "rng": [ 3, 6 ] } }, From d807c1fad1ea2650d8927681556caab725957c89 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 9 May 2020 23:13:03 -0500 Subject: [PATCH 07/75] fixes --- data/mods/Aftershock/npcs/classes.json | 4 ++-- data/mods/Aftershock/recipes/frankenstein_recipes.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 8240c36cc16d3..4fc4b4f0d89b3 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -52,7 +52,8 @@ "mission": 7, "chat": "TALK_Millyficent_1", "mission_offered": "MISSION_migo_biology_1", - "faction": "whately_family" + "faction": "whately_family", + "gender": "female", }, { "type": "npc_class", @@ -60,7 +61,6 @@ "name": "mi-go enthusiast", "job_description": "I've been studying the mi-go for years…", "common": false, - "gender": "female", "traits": [ [ "hair_red_long", 100 ], [ "SKIN_LIGHT", 100 ], diff --git a/data/mods/Aftershock/recipes/frankenstein_recipes.json b/data/mods/Aftershock/recipes/frankenstein_recipes.json index 3717f8c572588..77d699718bff2 100644 --- a/data/mods/Aftershock/recipes/frankenstein_recipes.json +++ b/data/mods/Aftershock/recipes/frankenstein_recipes.json @@ -20,7 +20,7 @@ [ [ "living_brain_jar", 1 ] ], [ [ "humming_heart", 2 ] ], [ [ "bot_broken_cyborg", 1 ] ], - [ [ "thread", 200 ] ], + [ [ "thread", 600 ] ], [ [ "1st_aid", 4 ] ], [ [ "chain", 2 ] ] ] From 25f247adda2370dc4da484af40bfb4c0553a360a Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 9 May 2020 23:28:56 -0500 Subject: [PATCH 08/75] Update classes.json --- data/mods/Aftershock/npcs/classes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 4fc4b4f0d89b3..44f763e0a66f4 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -53,7 +53,7 @@ "chat": "TALK_Millyficent_1", "mission_offered": "MISSION_migo_biology_1", "faction": "whately_family", - "gender": "female", + "gender": "female" }, { "type": "npc_class", From 9f06fdbb6846f162776f0cd463c11eeb51bb7bcd Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 10 May 2020 00:13:07 -0500 Subject: [PATCH 09/75] needs whately lmoe and whately cousin nest --- data/mods/Aftershock/npcs/whately_dialogue.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index 104e6fcaa1847..4eb22ce155fcf 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -211,11 +211,8 @@ }, "end": { "opinion": { "trust": 1, "value": 1 }, - "update_mapgen": [ - { - "om_terrain": "mortuary_2story", - "set": { "place_npcs": [ { "class": "whately_cousin", "x": 17, "y": 18 } ] }, - "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] + "update_mapgen": [ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_cousin_update" ], "x": 17, "y": 18 } ] } ], + "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] }, { "origins": [ "ORIGIN_SECONDARY" ], From 3adb5925a54c7ef6a6bb8bfd1d2aa712f5ad5845 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 10 May 2020 00:43:39 -0500 Subject: [PATCH 10/75] cousin chunks placed --- .../maps/mapgen/millyficent_lab.json | 6 ++++ .../Aftershock/npcs/whately_dialogue.json | 32 ++++++++----------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json index 6c044f0d6e11d..9eda1038c001b 100644 --- a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json +++ b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json @@ -333,5 +333,11 @@ } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "whately_cousin_update", + "object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "whately_cousin", "x": 0, "y": 0 } ] } } ] diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index 4eb22ce155fcf..1685eee5a7499 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -211,25 +211,21 @@ }, "end": { "opinion": { "trust": 1, "value": 1 }, - "update_mapgen": [ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_cousin_update" ], "x": 17, "y": 18 } ] } ], + "update_mapgen": [ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ], "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] - }, - { - "origins": [ "ORIGIN_SECONDARY" ], - "has_generic_rewards": false, - "dialogue": { - "describe": "My great uncle Cyrus had an unconventional relationship with both his neighbors and the mi-go before the Cataclysm. I'd like to know where he has gotten with his research since I haven't heard from him in years.", - "offer": "Can you go find my uncle and let him know where I am?", - "accepted": "Of course you said yes, you want to know what he's found just as much as I do!", - "rejected": "Oh well. I was hoping to teach you some new things, so you could start your own experiments.", - "advice": "I've given you directions to that branch of the family's bunker. Yes I said bunker did you think he'd be in a tower?", - "inquire": "How is the search going?", - "success": "Thanks, now that he knows I'm here he's sent some of my cousins. Now that I have more disposable help, take a copy of my early research.", - "success_lie": "What good does this do us?", - "failure": "I hope he didn't meet Leandrus' fate…" - } - } - ] + }, + "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, + "dialogue": { + "describe": "My great uncle Cyrus had an unconventional relationship with both his neighbors and the mi-go before the Cataclysm. I'd like to know where he has gotten with his research since I haven't heard from him in years.", + "offer": "Can you go find my uncle and let him know where I am?", + "accepted": "Of course you said yes, you want to know what he's found just as much as I do!", + "rejected": "Oh well. I was hoping to teach you some new things, so you could start your own experiments.", + "advice": "I've given you directions to that branch of the family's bunker. Yes I said bunker did you think he'd be in a tower?", + "inquire": "How is the search going?", + "success": "Thanks, now that he knows I'm here he's sent some of my cousins. Now that I have more disposable help, take a copy of my early research.", + "success_lie": "What good does this do us?", + "failure": "I hope he didn't meet Leandrus' fate…" } } ] From 6262f349df8ed8032f2cedf412298e0ceec9e831 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 10 May 2020 22:36:43 -0500 Subject: [PATCH 11/75] Update whately_dialogue.json --- data/mods/Aftershock/npcs/whately_dialogue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index 1685eee5a7499..1593aaf7284bf 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -207,7 +207,7 @@ "must_see": false, "random": true, "search_range": 180 - } + }, }, "end": { "opinion": { "trust": 1, "value": 1 }, From 111e62c694843e835c274d40a410aebe50b45bae Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 30 May 2020 00:52:43 -0500 Subject: [PATCH 12/75] updates LMOE and quests --- .../maps/mapgen/millyficent_lab.json | 10 +- .../Aftershock/maps/mapgen/whately_lmoe.json | 270 ++++++++++++++++++ .../Aftershock/npcs/whately_dialogue.json | 28 +- 3 files changed, 289 insertions(+), 19 deletions(-) create mode 100644 data/mods/Aftershock/maps/mapgen/whately_lmoe.json diff --git a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json index 9eda1038c001b..f3c99481f59a2 100644 --- a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json +++ b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json @@ -151,7 +151,7 @@ "T": "t_linoleum_white", "8": "t_console_broken", "W": "t_water_dispenser", - "*": "t_utility_light" + "*": "t_thconc_floor_olight" }, "liquids": { "E": { "liquid": "water_clean", "amount": [ 0, 100 ] } }, "furniture": { @@ -217,12 +217,12 @@ "__||wwww||%%%%||wwww||__", "__wZZil.b|%%%%|8....1|__", "|||ZZ..cb|%%%%|F.....w__", - "|&|A....b|%%%%|e.....|__", - "|%+......+%%%%m.....1|__", + "|&|A.*..b|%%%%|e.....|__", + "|%+......+%%%%m..*..1|__", "|S|D ll P|%%%%|E.....|__", "||||||||||:++:|h.....|__", "__|BB>CoC|1..t|a....1|__", - "__|B..*..+.*st|o.....w__", + "__|B..*..+.*st|o.*...w__", "__|TBBfiB|1..t|......|__", "__||||||||||||||w||w||__", "________________________" @@ -241,7 +241,7 @@ "m": "t_door_metal_c", "o": "t_centrifuge", "x": "t_console_broken", - "*": "t_utility_light", + "*": "t_thconc_floor_olight", "w": "t_window_bars_curtains", ">": "t_wood_stairs_down", "_": "t_open_air" diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json new file mode 100644 index 0000000000000..9bd1d198a5e43 --- /dev/null +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -0,0 +1,270 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "whately_lmoe" ], + "//": "Above ground", + "weight": 100, + "//2": "ask curstwist how to appropriately remove weight based on quest generated mapgen." + "object": { + "rows": [ + " S S S", + " S S S ", + " S S S ", + " S ", + " S S SSSSS S ", + " SSSSSSSSSSSS ", + " SS$$$$$$$$$$SS ", + " S$$TTTTTTTT$$S S ", + " SS$$T))))))T$$S ", + " S SS$$T)####)T$$SS ", + " SS$$T)#<>#)T$$SS ", + " SS$$T)#..#)T$$SS ", + " SS$$T)#+##)T$$SS S", + " S S$$T))_)))T$$SS ", + " S$$$$$_$$$$$$S ", + " SS$$$$_$$$$$SS S ", + " SSSSS_SSSSSS ", + "S S S SS S ", + " S S ", + " S S ", + " S S ", + " S", + " S S ", + " S " + ], + "palettes": [ "whately_bunker_ext" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "whately_lmoe_roof" ], + "//": "Above ground", + "weight": 100, + "object": { + "rows": [ + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvv((((((vvvvvvvvv", + "vvvvvvvvv(< (vvvvvvvvv", + "vvvvvvvvv( (vvvvvvvvv", + "vvvvvvvvv( (vvvvvvvvv", + "vvvvvvvvv( (vvvvvvvvv", + "vvvvvvvvv((v(((vvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv" + ], + "palettes": [ "whately_bunker_ext" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "whately_lmoe_under_first_floor" ], + "//": "Residence of Cyrus Whately and his clan", + "weight": 100, + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + "########################", + "########################", + "##||||||||||||||||||||##", + "##|{{{{{|UUUUUU|w__BB|##", + "##|u____|U_k__U|d__BB|##", + "##|u___h|U_UU_U|A,,,_|##", + "##|u_k_D|=*==*=|_,k,}|##", + "##|A____:__k___+_,,,}|##", + "##|||||||_1,,1_|S__hD|##", + "##|VVVVV=_e,,P_|||||||##", + "##|__k__*__,,_k__|s_K|##", + "##|vvvvv=_E,,f___+__t|##", + "##|||||||||++|||||||||##", + "##|c_bbbbA|,,|CSCCKCC|##", + "##|c__k___|,,|u__k__C|##", + "##|c_TT___|,,|u_hLh_F|##", + "##|c_TTh__+_k+___k__>|##", + "##|c_TT___|__|rrrr__~|##", + "##|c__k___|k_|||||+|||##", + "##|c______|__*_ka|k_A|##", + "##|ccccccc|<<=G_a|HlW|##", + "##||||||||||||||||||||##", + "########################", + "########################" + ], + "palettes": [ "whately_bunker", "whately_empty_bunker_items" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "whately_lmoe_under_second_floor" ], + "//": "Whately clan dwellings.", + "//2": "This is a commercially built 4-bed LMOE shelter based on IRL plans.", + "//3": "There are extensive secret rooms which might contain a lot of treasure in the non-looted version.", + "weight": 100, + "object": { + "fill_ter": "t_carpet_metal", + "rows": [ + "##|||||#################", + "##|,,<|||||||###########", + "##|Y,<|w,BBd|###########", + "||||+||},BB,|###########", + "|A,,,E|,,k,,|###########", + "|f,k,,|+|||||||||||#####", + "|f,,,e|,,,,b|_____|#####", + "|f,,,,|,,h,,|_____|#####", + "|Dh,,P|,hLh,|__k__|#####", + "|,,k,,|,hLh,|_____|#####", + "|,,,,,+,kh,,|_____|#####", + "|,|||||~,,,u|__k__|#####", + "|,+k,B|K,,,u:_____|#####", + "|,|d,B|COC,u|_____|#####", + "|,||||||||+||__k__|#####", + "|,+k,B|t,k,K|_____|#####", + "|}|d,B|WAv,s|_____|#####", + "|;|||||||||:|||+||||||||", + "|__|_____|__|_______=__|", + "|__|_____||+|___k___*__|", + "|__|___k____|_______=__|", + "|__|________+___>___=__|", + "|__+___k____|___k___=__|", + "||||||||||||||||||||||||" + ], + "palettes": [ "whately_bunker", "whately_empty_bunker_items" ], + "place_nested": [ + { "chunks": [ "lmoe3_storage_11x11" ], "x": 13, "y": 6 }, + { "chunks": [ "lmoe3_tankroom_11x11" ], "x": 1, "y": 18 }, + { "chunks": [ "lmoe3_crafting_11x11" ], "x": 13, "y": 18 } + ] + } + }, + { + "type": "palette", + "id": "whately_bunker", + "terrain": { + "#": "t_rock", + "*": "t_chaingate_c", + "+": "t_door_metal_c", + "-": "t_scrap_wall", + "_": "t_metal_floor", + ",": "t_carpet_metal", + "1": "t_column", + "<": "t_stairs_up", + ">": "t_stairs_down", + "=": "t_chainfence", + "|": "t_wall_metal", + ":": "t_secretdoor_metal_c", + ";": "t_secretdoor_metal_o", + "~": "t_water_pump", + "G": "t_generator_broken", + "t": "t_metal_floor", + "k": "t_thconc_floor_olight" + }, + "furniture": { + "A": "f_air_filter", + "a": "f_standing_tank", + "b": "f_bookcase", + "B": "f_bed", + "c": "f_counter", + "C": "f_cupboard", + "d": "f_dresser", + "D": "f_desk", + "e": "f_ergometer", + "E": "f_exercise", + "F": "f_fridge", + "f": "f_sofa", + "h": "f_chair", + "H": "f_water_heater", + "K": "f_sink", + "l": "f_utility_shelf", + "L": "f_table", + "O": "f_oven", + "P": "f_punching_bag", + "r": "f_rack", + "R": "f_rack", + "s": "f_shower", + "S": "f_woodstove", + "T": "f_table", + "U": "f_utility_shelf", + "u": "f_utility_shelf", + "v": "f_utility_shelf", + "V": "f_utility_shelf", + "w": "f_wardrobe", + "W": "f_water_purifier", + "Y": "f_rack_coat", + "^": "f_rubble", + "&": "f_trashcan", + "{": "f_rack", + "}": "f_bookcase" + }, + "toilets": { "t": { } } + }, + { + "type": "palette", + "id": "whately_empty_bunker_items", + "items": { + "b": [ { "item": "manuals", "chance": 60 }, { "item": "textbooks", "chance": 40 } ], + "B": { "item": "bed", "chance": 70, "repeat": [ 1, 2 ] }, + "c": { "item": "hardware", "chance": 50 }, + "C": [ { "item": "dining", "chance": 30, "repeat": [ 1, 3 ] }, { "item": "oven", "chance": 20 } ], + "d": { "item": "allclothes", "chance": 80, "repeat": [ 2, 4 ] }, + "D": { "item": "office", "chance": 70 }, + "l": { "item": "hardware", "chance": 50, "repeat": [ 1, 2 ] }, + "L": { "item": "dining", "chance": 30 }, + "r": { "item": "stash_wood", "chance": 85 }, + "R": { "item": "hardware", "chance": 80 }, + "S": { "item": "oven", "chance": 80 }, + "T": { "item": "tools_common", "chance": 60, "repeat": [ 1, 2 ] }, + "U": { "item": "gear_survival", "chance": 20, "repeat": [ 3, 5 ] }, + "u": [ { "item": "cannedfood", "chance": 20, "repeat": [ 1, 5 ] }, { "item": "pasta", "chance": 10, "repeat": [ 1, 3 ] } ], + "v": { "item": "softdrugs", "chance": 50 }, + "V": { "item": "bags", "chance": 30 }, + "w": { "item": "allclothes", "chance": 80, "repeat": [ 2, 4 ] }, + "Y": [ { "item": "jackets", "chance": 15 }, { "item": "hatstore_hats", "chance": 15 }, { "item": "winter", "chance": 10 } ], + "^": { "item": "shelter", "chance": 30 }, + "{": [ { "item": "lmoe_guns", "chance": 80 }, { "item": "ammo", "chance": 5, "repeat": [ 3, 7 ] } ], + "}": { "item": "novels", "chance": 90, "repeat": [ 3, 8 ] } + } + }, + { + "type": "palette", + "id": "whately_bunker_ext", + "terrain": { + " ": [ [ "t_region_groundcover", 60 ], [ "t_region_shrub", 2 ], "t_region_tree" ], + "_": [ "t_region_groundcover", [ "t_region_groundcover_barren", 9 ] ], + "#": "t_rock", + "$": [ "t_region_tree_fruit", "t_region_tree_nut", "t_region_shrub_fruit", "t_region_shrub" ], + "S": [ + [ "t_region_groundcover", 5 ], + "t_region_tree_fruit", + "t_region_tree_nut", + "t_region_tree", + "t_region_shrub_fruit", + "t_region_shrub" + ], + "v": "t_open_air", + "+": "t_door_metal_c", + ".": "t_rock_floor", + ">": "t_stairs_down", + ")": "t_slope_up", + "(": "t_slope_down", + "T": [ "t_region_tree_fruit", "t_region_tree_nut" ] + }, + "items": { " ": [ { "item": "forest", "chance": 1 }, { "item": "field", "chance": 2 } ] } + } +] diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index 1593aaf7284bf..d5c58ad9b7a5b 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -199,6 +199,19 @@ "goal": "MGOAL_TALK_TO_NPC", "difficulty": 2, "value": 150000, + "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, + "dialogue": { + "describe": "My great uncle Cyrus had an unconventional relationship with both his neighbors and the mi-go before the Cataclysm. I'd like to know where he has gotten with his research since I haven't heard from him in years.", + "offer": "Can you go find my uncle and let him know where I am?", + "accepted": "Of course you said yes, you want to know what he's found just as much as I do!", + "rejected": "Oh well. I was hoping to teach you some new things, so you could start your own experiments.", + "advice": "I've given you directions to that branch of the family's bunker. Yes I said bunker did you think he'd be in a tower?", + "inquire": "How is the search going?", + "success": "Thanks, now that he knows I'm here he's sent some of my cousins. Now that I have more disposable help, take a copy of my early research.", + "success_lie": "What good does this do us?", + "failure": "I hope he didn't meet Leandrus' fate…" + }, "start": { "assign_mission_target": { "om_terrain": "lmoe_whately", @@ -207,25 +220,12 @@ "must_see": false, "random": true, "search_range": 180 - }, + } }, "end": { "opinion": { "trust": 1, "value": 1 }, "update_mapgen": [ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ], "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] - }, - "origins": [ "ORIGIN_SECONDARY" ], - "has_generic_rewards": false, - "dialogue": { - "describe": "My great uncle Cyrus had an unconventional relationship with both his neighbors and the mi-go before the Cataclysm. I'd like to know where he has gotten with his research since I haven't heard from him in years.", - "offer": "Can you go find my uncle and let him know where I am?", - "accepted": "Of course you said yes, you want to know what he's found just as much as I do!", - "rejected": "Oh well. I was hoping to teach you some new things, so you could start your own experiments.", - "advice": "I've given you directions to that branch of the family's bunker. Yes I said bunker did you think he'd be in a tower?", - "inquire": "How is the search going?", - "success": "Thanks, now that he knows I'm here he's sent some of my cousins. Now that I have more disposable help, take a copy of my early research.", - "success_lie": "What good does this do us?", - "failure": "I hope he didn't meet Leandrus' fate…" } } ] From c74dd339fc2b9c714cdf49703aefde4d1f5a73ea Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 3 Jun 2020 23:33:11 -0500 Subject: [PATCH 13/75] Update whately_lmoe.json --- data/mods/Aftershock/maps/mapgen/whately_lmoe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index 9bd1d198a5e43..3c3b537bbb10e 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -5,7 +5,7 @@ "om_terrain": [ "whately_lmoe" ], "//": "Above ground", "weight": 100, - "//2": "ask curstwist how to appropriately remove weight based on quest generated mapgen." + "//2": "ask curstwist how to appropriately remove weight based on quest generated mapgen.", "object": { "rows": [ " S S S", From 03f616b5e6d50d01e4b9ab71dd70b9f57ebfab89 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 3 Jun 2020 23:41:34 -0500 Subject: [PATCH 14/75] dialogue chicanery --- data/mods/Aftershock/npcs/whately_dialogue.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index d5c58ad9b7a5b..ff3aa5f0412e4 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -224,8 +224,13 @@ }, "end": { "opinion": { "trust": 1, "value": 1 }, - "update_mapgen": [ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ], - "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] + "update_mapgen": [ + { + "om_terrain": "mortuary_2story", + "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ], + "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] + } + ] } } ] From 388769141d9c97b652a5ddf0402cec017acf6a23 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 28 Jun 2020 03:10:41 -0500 Subject: [PATCH 15/75] Update whately_dialogue.json --- data/mods/Aftershock/npcs/whately_dialogue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index ff3aa5f0412e4..8ae33b3827c92 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -228,7 +228,7 @@ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ], - "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] + "effect": { "u_buy_item": "millyficents_diary", "count": 1 } } ] } From dd691f509015a28e128b15e5c7b456fdb048e2ed Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 7 Jul 2020 18:00:26 -0500 Subject: [PATCH 16/75] add whately turrets --- .../Aftershock/maps/mapgen/millyficent_lab.json | 6 ++++++ .../mods/Aftershock/maps/mapgen/whately_lmoe.json | 15 +++++++++------ data/mods/Aftershock/mobs/monster_faction.json | 3 ++- data/mods/Aftershock/mobs/robots.json | 8 ++++++++ 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json index f3c99481f59a2..3aafd46705b1b 100644 --- a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json +++ b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json @@ -339,5 +339,11 @@ "method": "json", "nested_mapgen_id": "whately_cousin_update", "object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "whately_cousin", "x": 0, "y": 0 } ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "whately_bioturret_update", + "object": { "mapgensize": [ 1, 1 ], "place_monster": [ { "monster": "mon_migoturret_whately", "x": 0, "y": 0 } ] } } ] diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index 3c3b537bbb10e..607db119b4eb4 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -9,13 +9,13 @@ "object": { "rows": [ " S S S", - " S S S ", - " S S S ", + " S X S S ", + " S S X S ", " S ", " S S SSSSS S ", " SSSSSSSSSSSS ", " SS$$$$$$$$$$SS ", - " S$$TTTTTTTT$$S S ", + " X S$$TTTTTTTT$$S S ", " SS$$T))))))T$$S ", " S SS$$T)####)T$$SS ", " SS$$T)#<>#)T$$SS ", @@ -25,9 +25,9 @@ " S$$$$$_$$$$$$S ", " SS$$$$_$$$$$SS S ", " SSSSS_SSSSSS ", - "S S S SS S ", + "S X S S SS S ", " S S ", - " S S ", + " S S X ", " S S ", " S", " S S ", @@ -265,6 +265,9 @@ "(": "t_slope_down", "T": [ "t_region_tree_fruit", "t_region_tree_nut" ] }, - "items": { " ": [ { "item": "forest", "chance": 1 }, { "item": "field", "chance": 2 } ] } + "items": { " ": [ { "item": "forest", "chance": 1 }, { "item": "field", "chance": 2 } ] }, + "monster": { + "X": { "monster": "mon_migoturret_whately" } + } } ] diff --git a/data/mods/Aftershock/mobs/monster_faction.json b/data/mods/Aftershock/mobs/monster_faction.json index 3ca96e7bad4c0..b9ed66f4d1e8d 100644 --- a/data/mods/Aftershock/mobs/monster_faction.json +++ b/data/mods/Aftershock/mobs/monster_faction.json @@ -12,6 +12,7 @@ "name": "whately", "friendly": [ "human", "player" ], "neutral": "herbivore", - "by_mood": [ "insect", "small_animal" ] + "by_mood": [ "insect", "small_animal" ], + "hate": "zombie" } ] diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json index 216ad92f5e25c..a91b68c2fe659 100644 --- a/data/mods/Aftershock/mobs/robots.json +++ b/data/mods/Aftershock/mobs/robots.json @@ -34,6 +34,14 @@ "death_function": [ "BROKEN" ], "flags": [ "SEES", "ELECTRONIC", "IMMOBILE", "NO_BREATHE" ] }, + { + "id": "mon_migoturret_whately", + "type": "MONSTER", + "name": { "str": "Whately family brain blaster" }, + "description": "The Whately family deploys mi-go style techno-organic defensive turrets. They claim that these turrets are made from family members near death, but you have doubts.", + "default_faction": "whately", + "copy-from": "afs_mon_migoturret" + }, { "id": "mon_chickenbot", "type": "MONSTER", From cd2ab8660f393923da9bf27d6640d555b623384d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 7 Jul 2020 18:42:04 -0500 Subject: [PATCH 17/75] update fun to appropriate for creating abominations --- data/mods/Aftershock/items/books.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/books.json b/data/mods/Aftershock/items/books.json index e3b6544ce525d..0ee376bf8170c 100644 --- a/data/mods/Aftershock/items/books.json +++ b/data/mods/Aftershock/items/books.json @@ -147,7 +147,7 @@ "required_level": 8, "max_level": 9, "intelligence": 13, - "fun": -1, + "fun": -3, "time": "50 m" }, { From d4b190e53c0ffec604eb482f4696b736aecc1e06 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 7 Jul 2020 19:39:58 -0500 Subject: [PATCH 18/75] chemistry and linting --- data/mods/Aftershock/items/books.json | 4 ++-- data/mods/Aftershock/maps/mapgen/whately_lmoe.json | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/data/mods/Aftershock/items/books.json b/data/mods/Aftershock/items/books.json index 0ee376bf8170c..31700c5914073 100644 --- a/data/mods/Aftershock/items/books.json +++ b/data/mods/Aftershock/items/books.json @@ -156,7 +156,7 @@ "name": { "str": "Dr Moreau and You", "str_pl": "copies of Dr Moreau and You" }, "description": "In what many considered a stunning example of poor taste and others considered overt specieism this text on the creation of Uplifted Animals references a story about sapient animals killing their creator. Otherwise a dry text about genetic modification.", "copy-from": "textbook_atomic", - "skill": "cooking", + "skill": "chemistry", "required_level": 9, "max_level": 10 }, @@ -172,7 +172,7 @@ "symbol": "?", "looks_like": "ZSG", "color": "cyan", - "skill": "cooking", + "skill": "chemistry", "required_level": 10, "max_level": 10, "intelligence": 16, diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index 607db119b4eb4..730eadf4db7c3 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -266,8 +266,6 @@ "T": [ "t_region_tree_fruit", "t_region_tree_nut" ] }, "items": { " ": [ { "item": "forest", "chance": 1 }, { "item": "field", "chance": 2 } ] }, - "monster": { - "X": { "monster": "mon_migoturret_whately" } - } + "monster": { "X": { "monster": "mon_migoturret_whately" } } } ] From 209db1b86cbd1ef5cdc5b26b3d59bb613bb7fe73 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 7 Jul 2020 20:43:07 -0500 Subject: [PATCH 19/75] terrains and fixes --- .../Aftershock/maps/mapgen/whately_lmoe.json | 5 ++- .../Aftershock/maps/overmap_specials.json | 15 ++++++++ .../mods/Aftershock/maps/overmap_terrain.json | 36 +++++++++++++++++++ data/mods/Aftershock/npcs/npc.json | 11 ++++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index 730eadf4db7c3..1c00d43a3dcab 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -7,6 +7,7 @@ "weight": 100, "//2": "ask curstwist how to appropriately remove weight based on quest generated mapgen.", "object": { + "fill_ter": "t_dirt", "rows": [ " S S S", " S X S S ", @@ -43,6 +44,7 @@ "//": "Above ground", "weight": 100, "object": { + "fill_ter": "t_dirt", "rows": [ "vvvvvvvvvvvvvvvvvvvvvvvv", "vvvvvvvvvvvvvvvvvvvvvvvv", @@ -263,7 +265,8 @@ ">": "t_stairs_down", ")": "t_slope_up", "(": "t_slope_down", - "T": [ "t_region_tree_fruit", "t_region_tree_nut" ] + "T": [ "t_region_tree_fruit", "t_region_tree_nut" ], + "X": "t_grass_dead" }, "items": { " ": [ { "item": "forest", "chance": 1 }, { "item": "field", "chance": 2 } ] }, "monster": { "X": { "monster": "mon_migoturret_whately" } } diff --git a/data/mods/Aftershock/maps/overmap_specials.json b/data/mods/Aftershock/maps/overmap_specials.json index 71cb777cac0dd..dae26e3e89012 100644 --- a/data/mods/Aftershock/maps/overmap_specials.json +++ b/data/mods/Aftershock/maps/overmap_specials.json @@ -61,5 +61,20 @@ "city_sizes": [ 2, -1 ], "occurrences": [ 0, 1 ], "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "Strange LMOE Shelter", + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "whately_lmoe_north" }, + { "point": [ 0, 0, 1 ], "overmap": "whately_lmoe_roof_north" }, + { "point": [ 0, 0, -1 ], "overmap": "whately_lmoe_under_first_floor_north" }, + { "point": [ 0, 0, -2 ], "overmap": "whately_lmoe_under_second_floor_north" } + ], + "locations": [ "land" ], + "city_distance": [ 20, -1 ], + "city_sizes": [ 0, 12 ], + "occurrences": [ 0, 0 ], + "flags": [ "UNIQUE" ] } ] diff --git a/data/mods/Aftershock/maps/overmap_terrain.json b/data/mods/Aftershock/maps/overmap_terrain.json index 0361a3988aee4..a289c8eb8c966 100644 --- a/data/mods/Aftershock/maps/overmap_terrain.json +++ b/data/mods/Aftershock/maps/overmap_terrain.json @@ -106,5 +106,41 @@ "sym": "M", "color": "light_green", "see_cost": 3 + }, + { + "type": "overmap_terrain", + "id": "whately_lmoe", + "name": "LMOE shelter", + "sym": "+", + "color": "red", + "see_cost": 2, + "flags": [ "KNOWN_DOWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "whately_lmoe_roof", + "name": "LMOE shelter", + "sym": ".", + "color": "brown", + "see_cost": 2, + "flags": [ "KNOWN_DOWN" ] + }, + { + "type": "overmap_terrain", + "id": "whately_lmoe_under_first_floor", + "name": "LMOE shelter", + "sym": "+", + "color": "red", + "see_cost": 2, + "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] + }, + { + "type": "overmap_terrain", + "id": "whately_lmoe_under_second_floor", + "name": "LMOE shelter", + "sym": "+", + "color": "red", + "see_cost": 2, + "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] } ] diff --git a/data/mods/Aftershock/npcs/npc.json b/data/mods/Aftershock/npcs/npc.json index c420e2d9addb2..fcca2e30d48de 100644 --- a/data/mods/Aftershock/npcs/npc.json +++ b/data/mods/Aftershock/npcs/npc.json @@ -9,5 +9,16 @@ "mission": 0, "chat": "TALK_PrepNet_gardener_1", "faction": "Prepnet_Phyle" + }, + { + "type": "npc", + "id": "whately_cousin", + "//": "Abomination. Change the chat if this loads.", + "name_suffix": "Cousin", + "class": "whately_cousin", + "attitude": 1, + "mission": 0, + "chat": "TALK_PrepNet_gardener_1", + "faction": "whately_family" } ] From 5522e2f20f3b8ec9780d7799122fdd853006daec Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 7 Jul 2020 23:16:48 -0500 Subject: [PATCH 20/75] Update whately_dialogue.json --- data/mods/Aftershock/npcs/whately_dialogue.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index 8ae33b3827c92..326449c5f9077 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -189,7 +189,7 @@ "success_lie": "Thanks for trying… I guess.", "failure": "I can't be Dr Frankenstein unless you get me these." }, - "end": { "effect": [ { "u_buy_item": "mutagen_migo", "container": "flask_glass", "count": 2 } ] } + "end": { "effect": [ { "u_buy_item": "mutagen_migo", "container": "bottle_glass", "count": 3 } ] } }, { "id": "MISSION_FIND_CYRUS", @@ -215,7 +215,8 @@ "start": { "assign_mission_target": { "om_terrain": "lmoe_whately", - "om_special": "Whately_lmoe", + "om_special": "Strange LMOE Shelter", + "z": 0, "reveal_radius": 3, "must_see": false, "random": true, From f2798116b1cae69c4055af42a6c23d1bc09663b9 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 7 Jul 2020 23:21:04 -0500 Subject: [PATCH 21/75] wooden floor with lighting terrain --- .../maps/mapgen/millyficent_lab.json | 2 +- data/mods/Aftershock/maps/terrain.json | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json index 3aafd46705b1b..d8f91d6cda519 100644 --- a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json +++ b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json @@ -241,7 +241,7 @@ "m": "t_door_metal_c", "o": "t_centrifuge", "x": "t_console_broken", - "*": "t_thconc_floor_olight", + "*": "t_floor_olight", "w": "t_window_bars_curtains", ">": "t_wood_stairs_down", "_": "t_open_air" diff --git a/data/mods/Aftershock/maps/terrain.json b/data/mods/Aftershock/maps/terrain.json index 7787f0a693dce..2453d9125a0c4 100644 --- a/data/mods/Aftershock/maps/terrain.json +++ b/data/mods/Aftershock/maps/terrain.json @@ -8,5 +8,26 @@ "color": "light_green", "move_cost": 0, "flags": [ "TRANSPARENT", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "PLACE_ITEM" ] - } + }, + { + "type": "terrain", + "id": "t_floor_olight", + "name": "wooden floor, overhead light", + "description": "Interlocking wooden tiles that are more than likely treated against fire, with a still-functioning light attached to the ceiling above.", + "symbol": ".", + "color": "white", + "move_cost": 2, + "light_emitted": 120, + "roof": "t_flat_roof", + "looks_like": "t_floor", + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_null", + "str_min": 50, + "str_max": 400, + "str_min_supported": 100, + "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] + } + }, ] From 8c22e9d16838dd4c310c88625b361774298a41b6 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 7 Jul 2020 23:26:45 -0500 Subject: [PATCH 22/75] Update terrain.json --- data/mods/Aftershock/maps/terrain.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/maps/terrain.json b/data/mods/Aftershock/maps/terrain.json index 2453d9125a0c4..c6a5878bceda0 100644 --- a/data/mods/Aftershock/maps/terrain.json +++ b/data/mods/Aftershock/maps/terrain.json @@ -29,5 +29,5 @@ "str_min_supported": 100, "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] } - }, + } ] From 2184b609c8f8947043d826e6cfe626cd54627d90 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 8 Jul 2020 00:43:32 -0500 Subject: [PATCH 23/75] corrections --- data/mods/Aftershock/maps/terrain.json | 2 +- data/mods/Aftershock/mobs/robots.json | 1 + data/mods/Aftershock/npcs/whately_dialogue.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/maps/terrain.json b/data/mods/Aftershock/maps/terrain.json index c6a5878bceda0..7da105082f4e8 100644 --- a/data/mods/Aftershock/maps/terrain.json +++ b/data/mods/Aftershock/maps/terrain.json @@ -27,7 +27,7 @@ "str_min": 50, "str_max": 400, "str_min_supported": 100, - "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] } ] + "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] }, { "item": "glass_shard", "count": [ 8, 16 ] } ] } } ] diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json index f4cbe2fb41079..9afe780c675ff 100644 --- a/data/mods/Aftershock/mobs/robots.json +++ b/data/mods/Aftershock/mobs/robots.json @@ -19,6 +19,7 @@ "armor_bash": 14, "armor_cut": 16, "vision_day": 50, + "starting_ammo": { "acidic_bore": 500 }, "revert_to_itype": "bot_migoturret", "special_attacks": [ [ "PARROT", 0 ], diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/whately_dialogue.json index 326449c5f9077..de877c8ce63e2 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_dialogue.json @@ -214,7 +214,7 @@ }, "start": { "assign_mission_target": { - "om_terrain": "lmoe_whately", + "om_terrain": "whately_lmoe", "om_special": "Strange LMOE Shelter", "z": 0, "reveal_radius": 3, From 9d8b460851b3737c5df5b4d5e9fb1a1de00fadfc Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 9 Jul 2020 00:49:10 -0500 Subject: [PATCH 24/75] need to make background revival traits from the trait group and then dialogue for it. --- .../Aftershock/maps/mapgen/whately_lmoe.json | 4 +-- data/mods/Aftershock/maps/terrain.json | 31 ++++++++++++++++++- .../mods/Aftershock/mobs/monster_faction.json | 2 +- data/mods/Aftershock/mobs/robots.json | 3 +- .../npcs/Backgrounds/BG_trait_groups_afs.json | 16 ++++++++++ .../Aftershock/npcs/frankenstein_classes.json | 2 +- ...logue.json => milly_whately_dialogue.json} | 2 +- 7 files changed, 53 insertions(+), 7 deletions(-) rename data/mods/Aftershock/npcs/{whately_dialogue.json => milly_whately_dialogue.json} (99%) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index 1c00d43a3dcab..3220230cd90b9 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -175,7 +175,7 @@ "~": "t_water_pump", "G": "t_generator_broken", "t": "t_metal_floor", - "k": "t_thconc_floor_olight" + "k": "t_metal_floor_olight" }, "furniture": { "A": "f_air_filter", @@ -269,6 +269,6 @@ "X": "t_grass_dead" }, "items": { " ": [ { "item": "forest", "chance": 1 }, { "item": "field", "chance": 2 } ] }, - "monster": { "X": { "monster": "mon_migoturret_whately" } } + "monster": { "X": { "monster": "mon_migoturret_whately", "friendly": "true" } } } ] diff --git a/data/mods/Aftershock/maps/terrain.json b/data/mods/Aftershock/maps/terrain.json index 7da105082f4e8..e14d72a6075ee 100644 --- a/data/mods/Aftershock/maps/terrain.json +++ b/data/mods/Aftershock/maps/terrain.json @@ -27,7 +27,36 @@ "str_min": 50, "str_max": 400, "str_min_supported": 100, - "items": [ { "item": "splinter", "count": [ 2, 8 ] }, { "item": "nail", "charges": [ 5, 10 ] }, { "item": "glass_shard", "count": [ 8, 16 ] } ] + "items": [ + { "item": "splinter", "count": [ 2, 8 ] }, + { "item": "nail", "charges": [ 5, 10 ] }, + { "item": "glass_shard", "count": [ 8, 16 ] } + ] + } + }, + { + "type": "terrain", + "id": "t_metal_floor_olight", + "name": "metal floor, with overhead light", + "description": "High-quality and tough checkered flooring to reduce risk of slips and falls, with a still-functioning light attached to the ceiling above.", + "symbol": ".", + "color": "light_cyan", + "move_cost": 2, + "light_emitted": 120, + "roof": "t_flat_roof", + "flags": [ "TRANSPARENT", "INDOORS", "FLAT", "ROAD" ], + "bash": { + "sound": "thump", + "ter_set": "t_null", + "str_min": 200, + "str_max": 500, + "str_min_supported": 200, + "items": [ + { "item": "steel_lump", "count": [ 1, 4 ] }, + { "item": "steel_chunk", "count": [ 3, 12 ] }, + { "item": "scrap", "count": [ 9, 36 ] }, + { "item": "glass_shard", "count": [ 8, 16 ] } + ] } } ] diff --git a/data/mods/Aftershock/mobs/monster_faction.json b/data/mods/Aftershock/mobs/monster_faction.json index 85b895d7330b2..e74ee8171bf92 100644 --- a/data/mods/Aftershock/mobs/monster_faction.json +++ b/data/mods/Aftershock/mobs/monster_faction.json @@ -10,7 +10,7 @@ { "type": "MONSTER_FACTION", "name": "whately", - "friendly": [ "human", "player" ], + "friendly": [ "human", "player", "whately", "whately_family" ], "neutral": "herbivore", "by_mood": [ "insect", "small_animal" ], "hate": "zombie" diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json index 9afe780c675ff..23afb0b848916 100644 --- a/data/mods/Aftershock/mobs/robots.json +++ b/data/mods/Aftershock/mobs/robots.json @@ -41,7 +41,8 @@ "name": { "str": "Whately family brain blaster" }, "description": "The Whately family deploys mi-go style techno-organic defensive turrets. They claim that these turrets are made from family members near death, but you have doubts.", "default_faction": "whately", - "copy-from": "afs_mon_migoturret" + "copy-from": "afs_mon_migoturret", + "aggression": 1 }, { "id": "mon_chickenbot", diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json index cf63b826f6afe..18d5841177a5f 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json @@ -17,5 +17,21 @@ { "trait": "BGSS_VATGROWN_1" }, { "trait": "BGSS_CRIMINAL_EXPERIMENT" } ] + }, + { + "//": "This group picks out background traits that could apply to any Frankenstein revivee.", + "type": "trait_group", + "id": "BG_revival_story_FRANKENSTEIN", + "subtype": "distribution", + "traits": [ + { "trait": "BGRS_Confused_1" }, + { "trait": "BGRS_No_Past_1" }, + { "trait": "BGRS_No_Past_2" }, + { "trait": "BGRS_No_Past_3" }, + { "trait": "BGRS_Religious_1" }, + { "trait": "BGRS_Religious_2" }, + { "trait": "BGRS_Dreamer" }, + { "trait": "BGRS_Bonesinger_1" } + ] } ] diff --git a/data/mods/Aftershock/npcs/frankenstein_classes.json b/data/mods/Aftershock/npcs/frankenstein_classes.json index ebc3be8ba5692..fe9156eeeb4ce 100644 --- a/data/mods/Aftershock/npcs/frankenstein_classes.json +++ b/data/mods/Aftershock/npcs/frankenstein_classes.json @@ -6,7 +6,7 @@ "job_description": "The mi-go took me and vivisected me. Now you've given me a body again.", "//": "Make a Frankenstein BG story", "traits": [ - { "group": "BG_survival_story_UNIVERSAL" }, + { "group": "BG_revival_story_FRANKENSTEIN" }, { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" }, [ "SHOUT1", 75 ] diff --git a/data/mods/Aftershock/npcs/whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json similarity index 99% rename from data/mods/Aftershock/npcs/whately_dialogue.json rename to data/mods/Aftershock/npcs/milly_whately_dialogue.json index de877c8ce63e2..05a4a691ea9e7 100644 --- a/data/mods/Aftershock/npcs/whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -196,7 +196,7 @@ "type": "mission_definition", "name": "Find my great uncle Cyrus Whately", "description": "Cyrus and his family were poorly liked even for Whately's before the end of the world. They went so far off grid that they may not even know anything has changed. I need to know he's alive and where his research has taken him.", - "goal": "MGOAL_TALK_TO_NPC", + "goal": "MGOAL_GO_TO_TYPE", "difficulty": 2, "value": 150000, "origins": [ "ORIGIN_SECONDARY" ], From b9ae9000981632494c18ef7de9834e6e0a8ed417 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 10 Jul 2020 09:45:24 -0500 Subject: [PATCH 25/75] Update BG_tableofcontents_AFS.JSON --- .../Aftershock/npcs/Backgrounds/BG_tableofcontents_AFS.JSON | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_tableofcontents_AFS.JSON b/data/mods/Aftershock/npcs/Backgrounds/BG_tableofcontents_AFS.JSON index ab902d29257da..42c433e67a0c6 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_tableofcontents_AFS.JSON +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_tableofcontents_AFS.JSON @@ -69,4 +69,6 @@ "condition": { "npc_has_trait": "BGSS_CRIMINAL_EXPERIMENT" }, "switch": true } + ] + } ] From 51e09f845bea63efee6d90696c4a893beda65a04 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 10 Jul 2020 16:20:32 -0500 Subject: [PATCH 26/75] fixes --- data/mods/Aftershock/maps/mapgen/whately_lmoe.json | 2 +- data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index 3220230cd90b9..d6bcb250af35d 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -269,6 +269,6 @@ "X": "t_grass_dead" }, "items": { " ": [ { "item": "forest", "chance": 1 }, { "item": "field", "chance": 2 } ] }, - "monster": { "X": { "monster": "mon_migoturret_whately", "friendly": "true" } } + "monster": { "X": { "monster": "mon_migoturret_whately", "friendly": true } } } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json index 62568660c8241..8c5177048e393 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json @@ -1,8 +1,4 @@ [ - { - "type": "mutation_type", - "id": "BACKGROUND_SURVIVAL_STORY" - }, { "type": "mutation", "id": "BGSS_RECENT_MUTATION_1", From d8956b9c24cb3dd3767543c5cdce19f109e9458f Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 12 Jul 2020 00:09:33 -0500 Subject: [PATCH 27/75] All hail Wapcaplet! fixing background traits --- ...FS.JSON => BG_BR_tableofcontents_AFS.json} | 48 +++++++++++++++++++ .../npcs/Backgrounds/BG_trait_groups_afs.json | 6 +-- 2 files changed, 51 insertions(+), 3 deletions(-) rename data/mods/Aftershock/npcs/Backgrounds/{BG_tableofcontents_AFS.JSON => BG_BR_tableofcontents_AFS.json} (60%) diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_tableofcontents_AFS.JSON b/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json similarity index 60% rename from data/mods/Aftershock/npcs/Backgrounds/BG_tableofcontents_AFS.JSON rename to data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json index 42c433e67a0c6..685a53e6ab193 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_tableofcontents_AFS.JSON +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json @@ -68,6 +68,54 @@ "topic": "BGSS_CRIMINAL_EXPERIMENT_STORY1", "condition": { "npc_has_trait": "BGSS_CRIMINAL_EXPERIMENT" }, "switch": true + }, + { + "text": "", + "topic": "BGRS_AFTERLIFE_1_STORY1", + "condition": { "npc_has_trait": "BGSS_RADIATION_1" }, + "switch": true + }, + { + "text": "", + "topic": "BGRS_MIGO_1_STORY1", + "condition": { "npc_has_trait": "BGSS_RADIATION_2" }, + "switch": true + }, + { + "text": "", + "topic": "BGRS_MIGO_2_STORY1", + "condition": { "npc_has_trait": "BGSS_SELFTEST" }, + "switch": true + }, + { + "text": "", + "topic": "BGRS_MIGO_3_STORY1", + "condition": { "npc_has_trait": "BGSS_VATGROWN_1" }, + "switch": true + }, + { + "text": "", + "topic": "BGRS_SCHIZO_1_STORY1", + "condition": { "npc_has_trait": "BGSS_CRIMINAL_EXPERIMENT" }, + "switch": true + }, + { + "text": "", + "topic": "BGRS_SCHIZO_2_STORY1", + "condition": { "npc_has_trait": "BGSS_SELFTEST" }, + "switch": true + }, + { + "text": "", + "topic": "BGRS_Dreamer_STORY1", + "condition": { "npc_has_trait": "BGSS_VATGROWN_1" }, + "switch": true + }, + { + "text": "", + "topic": "BGRS_Bonesinger_1_STORY1", + "condition": { "npc_has_trait": "BGSS_CRIMINAL_EXPERIMENT" }, + "switch": true } ] } diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json index 18d5841177a5f..9105de16fed48 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json @@ -25,9 +25,9 @@ "subtype": "distribution", "traits": [ { "trait": "BGRS_Confused_1" }, - { "trait": "BGRS_No_Past_1" }, - { "trait": "BGRS_No_Past_2" }, - { "trait": "BGRS_No_Past_3" }, + { "trait": "BGRS_MIGO_1" }, + { "trait": "BGRS_MIGO_2" }, + { "trait": "BGRS_MIGO_3" }, { "trait": "BGRS_Religious_1" }, { "trait": "BGRS_Religious_2" }, { "trait": "BGRS_Dreamer" }, From 1df56fb09b284547163b99d39f6ccbd7ab1c370d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 12 Jul 2020 00:46:44 -0500 Subject: [PATCH 28/75] broken stuff --- data/mods/Aftershock/maps/mapgen/whately_lmoe.json | 1 + data/mods/Aftershock/maps/terrain.json | 2 +- .../Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json | 6 +++--- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index d6bcb250af35d..75b73d82f8cad 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -263,6 +263,7 @@ "+": "t_door_metal_c", ".": "t_rock_floor", ">": "t_stairs_down", + "<": "t_stairs_up", ")": "t_slope_up", "(": "t_slope_down", "T": [ "t_region_tree_fruit", "t_region_tree_nut" ], diff --git a/data/mods/Aftershock/maps/terrain.json b/data/mods/Aftershock/maps/terrain.json index e14d72a6075ee..0a8e426411cc2 100644 --- a/data/mods/Aftershock/maps/terrain.json +++ b/data/mods/Aftershock/maps/terrain.json @@ -38,7 +38,7 @@ "type": "terrain", "id": "t_metal_floor_olight", "name": "metal floor, with overhead light", - "description": "High-quality and tough checkered flooring to reduce risk of slips and falls, with a still-functioning light attached to the ceiling above.", + "description": "High-quality and tough checkered flooring to reduce risk of slips and falls, with a still-functioning light attached to the ceiling above.", "symbol": ".", "color": "light_cyan", "move_cost": 2, diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json index 9105de16fed48..ac243ae76da16 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json @@ -24,12 +24,12 @@ "id": "BG_revival_story_FRANKENSTEIN", "subtype": "distribution", "traits": [ - { "trait": "BGRS_Confused_1" }, + { "trait": "BGRS_AFTERLIFE_1" }, { "trait": "BGRS_MIGO_1" }, { "trait": "BGRS_MIGO_2" }, { "trait": "BGRS_MIGO_3" }, - { "trait": "BGRS_Religious_1" }, - { "trait": "BGRS_Religious_2" }, + { "trait": "BGRS_SCHIZO_1" }, + { "trait": "BGRS_SCHIZO_2" }, { "trait": "BGRS_Dreamer" }, { "trait": "BGRS_Bonesinger_1" } ] diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 05a4a691ea9e7..3aed3e8bbde80 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -229,7 +229,7 @@ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ], - "effect": { "u_buy_item": "millyficents_diary", "count": 1 } + "effect": [ "u_buy_item": "millyficents_diary", "count": 1 ] } ] } From 3cfcb731e8d6c0be720420fa36b0f4c0530563c3 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 12 Jul 2020 01:26:30 -0500 Subject: [PATCH 29/75] linting and nerf cargo trough --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 2 +- data/mods/Aftershock/vehicles/vehicle_parts.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 3aed3e8bbde80..ce06aa574d3f6 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -229,7 +229,7 @@ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ], - "effect": [ "u_buy_item": "millyficents_diary", "count": 1 ] + "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] } ] } diff --git a/data/mods/Aftershock/vehicles/vehicle_parts.json b/data/mods/Aftershock/vehicles/vehicle_parts.json index d73701ac55381..754a468909f8a 100644 --- a/data/mods/Aftershock/vehicles/vehicle_parts.json +++ b/data/mods/Aftershock/vehicles/vehicle_parts.json @@ -10,7 +10,7 @@ "location": "center", "durability": 200, "description": "This is little more than a sheetmetal basin welded to the bottom of the vehicle, extending below it. Though it holds a lot of stuff, its shoddiness makes it fragile.", - "size": 1200, + "size": 600, "breaks_into": [ { "item": "steel_lump", "count": [ 4, 6 ] }, { "item": "scrap", "count": [ 4, 6 ] } ] }, { From cbbe852fd28e5f53c86101a6d4625dd586dafab5 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 13 Jul 2020 00:07:18 -0500 Subject: [PATCH 30/75] move effect out of update magpen --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index ce06aa574d3f6..8c650b0a8ebf7 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -225,11 +225,11 @@ }, "end": { "opinion": { "trust": 1, "value": 1 }, + "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ { "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ], - "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] + "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ] } ] } From e97a16b7f14a74196e4ee0f45b9891c602266810 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 14 Jul 2020 00:33:22 -0500 Subject: [PATCH 31/75] Whately family BG and BG Revival traits --- .../BG_BR_tableofcontents_AFS.json | 38 +++++++++++++---- .../npcs/Backgrounds/BG_traits_afs.json | 12 ++++++ .../Aftershock/npcs/Backgrounds/whately.json | 41 +++++++++++++++++++ data/mods/Aftershock/npcs/classes.json | 3 +- 4 files changed, 86 insertions(+), 8 deletions(-) create mode 100644 data/mods/Aftershock/npcs/Backgrounds/whately.json diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json b/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json index 685a53e6ab193..74b19bc3532c6 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json @@ -78,43 +78,67 @@ { "text": "", "topic": "BGRS_MIGO_1_STORY1", - "condition": { "npc_has_trait": "BGSS_RADIATION_2" }, + "condition": { "npc_has_trait": "BGRS_MIGO_1" }, "switch": true }, { "text": "", "topic": "BGRS_MIGO_2_STORY1", - "condition": { "npc_has_trait": "BGSS_SELFTEST" }, + "condition": { "npc_has_trait": "BGRS_MIGO_2" }, "switch": true }, { "text": "", "topic": "BGRS_MIGO_3_STORY1", - "condition": { "npc_has_trait": "BGSS_VATGROWN_1" }, + "condition": { "npc_has_trait": "BGRS_MIGO_3" }, "switch": true }, { "text": "", "topic": "BGRS_SCHIZO_1_STORY1", - "condition": { "npc_has_trait": "BGSS_CRIMINAL_EXPERIMENT" }, + "condition": { "npc_has_trait": "BGRS_SCHIZO_1" }, "switch": true }, { "text": "", "topic": "BGRS_SCHIZO_2_STORY1", - "condition": { "npc_has_trait": "BGSS_SELFTEST" }, + "condition": { "npc_has_trait": "BGRS_SCHIZO_2" }, "switch": true }, { "text": "", "topic": "BGRS_Dreamer_STORY1", - "condition": { "npc_has_trait": "BGSS_VATGROWN_1" }, + "condition": { "npc_has_trait": "BGRS_Dreamer" }, "switch": true }, { "text": "", "topic": "BGRS_Bonesinger_1_STORY1", - "condition": { "npc_has_trait": "BGSS_CRIMINAL_EXPERIMENT" }, + "condition": { "npc_has_trait": "BGRS_Bonesinger_1" }, + "switch": true + }, + { + "text": "", + "topic": "BGSS_GANGER_1_STORY1", + "condition": { "npc_has_trait": "BGSS_GANGER_1" }, + "switch": true + }, + { + "text": "", + "topic": "BGSS_GANGER_2_STORY1", + "condition": { "npc_has_trait": "BGSS_GANGER_2" }, + "switch": true + }, + { + "text": "", + "topic": "BGSS_GANGER_3_STORY1", + "condition": { "npc_has_trait": "BGSS_GANGER_3" }, + "switch": true + }, + { + "text": "", + "topic": "BGSS_CYBERNINJA_STORY1", + "condition": { "npc_has_trait": "BGSS_CYBERNINJA" }, "switch": true } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json index 8c5177048e393..fe75c929030fe 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json @@ -130,5 +130,17 @@ "purifiable": false, "types": [ "BACKGROUND_SURVIVAL_STORY" ], "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGSS_Whately", + "name": { "str": "Whately Story" }, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "player_display": false, + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/whately.json b/data/mods/Aftershock/npcs/Backgrounds/whately.json new file mode 100644 index 0000000000000..1712704d2d4bf --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/whately.json @@ -0,0 +1,41 @@ +[ + { + "id": "BGSS_Whately_STORY1", + "type": "talk_topic", + "dynamic_line": "Staying at the family compounds scattered across New England, we've managed to maintain some organization post Cataclysm.", + "responses": [ + { "text": "Where are you from?", "topic": "BGSS_Whately_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_Whately_STORY2", + "type": "talk_topic", + "dynamic_line": "The Whately family has been outcast in these parts for centuries. But it made us stronger as a family.", + "responses": [ + { "text": "Tell me more?", "topic": "BGSS_Whately_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_Whately_STORY3", + "type": "talk_topic", + "dynamic_line": "We've been talking to those from other places from the beginning.", + "responses": [ + { "text": "How did it end?", "topic": "BGSS_Whately_STORY4" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_Whately_STORY4", + "type": "talk_topic", + "dynamic_line": "All the earth was flame in a holocaust of ecstasy and freedom.", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 44f763e0a66f4..23ff6b22d69b5 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -95,7 +95,8 @@ "traits": [ { "group": "trait_mutant_npc_common" }, { "group": "trait_group_migo" }, - { "distribution": [ { "group": "trait_group_migo_nonthres" }, { "group": "trait_group_migo_postthres" } ] } + { "distribution": [ { "group": "trait_group_migo_nonthres" }, { "group": "trait_group_migo_postthres" } ] }, + [ "BGSS_Whately" ] ] } ] From 2ba846602939d1445670ed5a9ff3e4232f325450 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 14 Jul 2020 00:37:42 -0500 Subject: [PATCH 32/75] Linting --- data/mods/Aftershock/npcs/Backgrounds/whately.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/mods/Aftershock/npcs/Backgrounds/whately.json b/data/mods/Aftershock/npcs/Backgrounds/whately.json index 1712704d2d4bf..195f93124e417 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/whately.json +++ b/data/mods/Aftershock/npcs/Backgrounds/whately.json @@ -33,9 +33,6 @@ "id": "BGSS_Whately_STORY4", "type": "talk_topic", "dynamic_line": "All the earth was flame in a holocaust of ecstasy and freedom.", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] From df296b988cdcf8e98272e62924ea23e9d9558f57 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 14 Jul 2020 01:07:03 -0500 Subject: [PATCH 33/75] Update classes.json --- data/mods/Aftershock/npcs/classes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 23ff6b22d69b5..cda025520d7c2 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -96,7 +96,7 @@ { "group": "trait_mutant_npc_common" }, { "group": "trait_group_migo" }, { "distribution": [ { "group": "trait_group_migo_nonthres" }, { "group": "trait_group_migo_postthres" } ] }, - [ "BGSS_Whately" ] + [ "BGSS_Whately", 100 ] ] } ] From a1fb41ffa2534b5055f227b7ae07c6e7823c1730 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 14 Jul 2020 18:30:39 -0500 Subject: [PATCH 34/75] Update whately_lmoe.json --- data/mods/Aftershock/maps/mapgen/whately_lmoe.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index 75b73d82f8cad..d6b87f4cb5453 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -4,9 +4,8 @@ "method": "json", "om_terrain": [ "whately_lmoe" ], "//": "Above ground", - "weight": 100, - "//2": "ask curstwist how to appropriately remove weight based on quest generated mapgen.", "object": { + "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ], "fill_ter": "t_dirt", "rows": [ " S S S", @@ -42,8 +41,8 @@ "method": "json", "om_terrain": [ "whately_lmoe_roof" ], "//": "Above ground", - "weight": 100, "object": { + "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ], "fill_ter": "t_dirt", "rows": [ "vvvvvvvvvvvvvvvvvvvvvvvv", @@ -79,8 +78,8 @@ "method": "json", "om_terrain": [ "whately_lmoe_under_first_floor" ], "//": "Residence of Cyrus Whately and his clan", - "weight": 100, "object": { + "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ], "fill_ter": "t_metal_floor", "rows": [ "########################", @@ -118,8 +117,8 @@ "//": "Whately clan dwellings.", "//2": "This is a commercially built 4-bed LMOE shelter based on IRL plans.", "//3": "There are extensive secret rooms which might contain a lot of treasure in the non-looted version.", - "weight": 100, "object": { + "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ], "fill_ter": "t_carpet_metal", "rows": [ "##|||||#################", From b51307355b33725fd604d46610cd774e6d4ada48 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 15 Jul 2020 23:01:13 -0500 Subject: [PATCH 35/75] cyrus questline need to place npcs in whately bunker --- data/mods/Aftershock/mutations/mutations.json | 6 + data/mods/Aftershock/npcs/classes.json | 39 +++- data/mods/Aftershock/npcs/cyrus_whately.json | 195 ++++++++++++++++++ .../npcs/milly_whately_dialogue.json | 6 +- 4 files changed, 242 insertions(+), 4 deletions(-) create mode 100644 data/mods/Aftershock/npcs/cyrus_whately.json diff --git a/data/mods/Aftershock/mutations/mutations.json b/data/mods/Aftershock/mutations/mutations.json index 04107e28dbe1c..69f54236af365 100644 --- a/data/mods/Aftershock/mutations/mutations.json +++ b/data/mods/Aftershock/mutations/mutations.json @@ -171,6 +171,7 @@ "description": "You no longer move like a human, others find it disconcerting. Dexterity + 4", "prereqs": [ "ENHANCED_REACTIONS" ], "threshreq": "THRESH_YUGGOTH", + "social_modifiers": { "persuade": -10, "lie": -6 }, "category": [ "MIGO" ], "passive_mods": { "dex_mod": 4 } }, @@ -182,6 +183,7 @@ "description": "You see some new muscles that you aren't sure you've seen on humans before. Strength + 1", "changes_to": [ "MUSCLE_FIBER" ], "category": [ "MIGO" ], + "social_modifiers": { "persuade": -3, "intimidate": 2 }, "passive_mods": { "str_mod": 1 } }, { @@ -192,6 +194,8 @@ "description": "Fibrous tissue seems to be spreading through your body. Strength + 2", "prereqs": [ "STR_UP" ], "category": [ "MIGO" ], + "social_modifiers": { "persuade": -3, "intimidate": 2 }, + "ugliness": 2, "passive_mods": { "str_mod": 2 } }, { @@ -203,6 +207,7 @@ "description": "Your ears have split into a series of tuberous projections. They waggle towards far away sounds.", "types": [ "EARS" ], "category": [ "MIGO" ], + "ugliness": 4, "hearing_modifier": 1.4 }, { @@ -256,6 +261,7 @@ "prereqs": [ "SMELLY", "SMELLY2" ], "threshreq": [ "THRESH_YUGGOTH" ], "category": [ "MIGO" ], + "ugliness": 1, "scent_type": "sc_fetid" }, { diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index cda025520d7c2..19b13f5b4008e 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -45,7 +45,7 @@ { "type": "npc", "id": "millyficent_whately", - "name_unique": "Millyficen Whately", + "name_unique": "Millyficent Whately", "name_suffix": "Xenobiologist, madwoman", "class": "afs_xenobiologist_madwoman", "attitude": 0, @@ -98,5 +98,42 @@ { "distribution": [ { "group": "trait_group_migo_nonthres" }, { "group": "trait_group_migo_postthres" } ] }, [ "BGSS_Whately", 100 ] ] + }, + { + "type": "npc", + "id": "cyrus_whately", + "name_unique": "Cyrus Whately", + "name_suffix": "Patriarch, doomseer", + "class": "afs_whately_patriarch", + "attitude": 0, + "mission": 7, + "chat": "TALK_CYRUS_1", + "mission_offered": "MISSION_FRANKENSTEIN_1", + "faction": "whately_family", + "gender": "male" + }, + { + "type": "npc_class", + "id": "afs_whately_patriarch", + "name": "Aspiring Frankenstein", + "job_description": "Friend to outsiders…", + "common": false, + "traits": [ + [ "SKIN_LIGHT", 100 ], + [ "MIGO_HEAT_RESIST", 100 ], + [ "ALIEN_INT", 100 ], + [ "THRESH_YUGGOTH", 100 ], + [ "OTHERWORLDLY_GRACE", 100 ], + [ "MIGO_BREATHE", 100 ] + ], + "bonus_dex": { "rng": [ -1, 0 ] }, + "bonus_int": { "rng": [ 2, 5 ] }, + "skills": [ + { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -4 } ] } ] } }, + { "skill": "computer", "bonus": { "rng": [ 1, 5 ] } }, + { "skill": "electronics", "bonus": { "rng": [ 1, 5 ] } }, + { "skill": "firstaid", "bonus": { "rng": [ 1, 4 ] } }, + { "skill": "chemistry", "bonus": { "rng": [ 6, 8 ] } } + ] } ] diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json new file mode 100644 index 0000000000000..3cd425e7de7f1 --- /dev/null +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -0,0 +1,195 @@ +[ + { + "type": "effect_type", + "id": "u_met_cyrus" + }, + { + "type": "talk_topic", + "id": "TALK_CYRUS_1", + "dynamic_line": { + "u_has_var": "u_met_cyrus", + "type": "general", + "context": "meeting", + "value": "yes", + "yes": [ "What brings you here today?", "Hello.", "How are you?", "Welcome!", "Are you ready to leave this marble?" ], + "no": "You look like one of my niece's lab assistants." + }, + "responses": [ + { + "text": "Who are you?", + "effect": { "u_add_var": "u_met_cyrus", "type": "general", "context": "meeting", "value": "yes" }, + "condition": { "not": { "u_has_var": "u_met_cyrus", "type": "general", "context": "meeting", "value": "yes" } }, + "topic": "TALK_CYRUS_firstmeet" + }, + { + "text": "What is this place?", + "condition": { "u_has_var": "u_met_cyrus", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_CYRUS_place" + }, + { + "text": "How did you get here?", + "condition": { "u_has_var": "u_met_cyrus", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_CYRUS_ask_past" + }, + { + "text": "How are things here?", + "condition": { "u_has_var": "u_met_cyrus", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_CYRUS_ask_mood" + }, + { + "text": "Can I do anything for you? Are you as crazy as your niece?", + "condition": { "u_has_var": "u_met_cyrus", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_MISSION_LIST" + }, + { "text": "I'm going on my way now.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_CYRUS_firstmeet", + "dynamic_line": ".", + "responses": [ + { "text": "Your niece is looking for you.", "topic": "TALK_CYRUS_millyficent" }, + { "text": "How did you survive the Cataclysm?", "topic": "TALK_CYRUS_cataclysm" }, + { "text": "Quite the setup you have here.", "topic": "TALK_CYRUS_1" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_CYRUS_place", + "dynamic_line": "This is a Whately family property. And you are an intruder.", + "responses": [ + { "text": "I've met your niece.", "topic": "TALK_CYRUS_millyficent" }, + { "text": "I didn't mean to intrude.", "topic": "TALK_CYRUS_1" }, + { "text": "I think there's been a mistake.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_CYRUS_millyficent", + "dynamic_line": "She's always been so precocious! I knew that she was going places and we'd see great things from her.", + "responses": [ + { "text": "She needed a lab assistant, do you?", "topic": "TALK_MISSION_LIST" }, + { "text": "This whole family is deranged.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_CYRUS_ask_past", + "dynamic_line": "The Whately family has been part of the fabric of New England since before the Revolutionary War. And I have been growing our interests for the last few decades.", + "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_CYRUS_1" } ] + }, + { + "type": "talk_topic", + "id": "TALK_CYRUS_cataclysm", + "dynamic_line": "Muttering 'They whispered of a prison. Ragnarok engine humming. Wrapped they in darkness dreaming'. He shakes himself, 'Anyway it looks like something woke up, for at least a little bit.'", + "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_CYRUS_1" } ] + }, + { + "type": "talk_topic", + "id": "TALK_CYRUS_ask_mood", + "dynamic_line": "This is a time of great danger and great opportunity and it must not be squandered.", + "responses": [ { "text": "This is not reassuring.", "topic": "TALK_CYRUS_1" } ] + }, + { + "id": "MISSION_FRANKENSTEIN_1", + "type": "mission_definition", + "name": "In the absence of life", + "description": "Find self healing polymers.", + "goal": "MGOAL_FIND_ITEM", + "difficulty": 5, + "value": 0, + "item": "self healing polymers", + "count": 4, + "origins": [ "ORIGIN_SECONDARY" ], + "followup": "MISSION_FRANKENSTEIN_2", + "dialogue": { + "describe": "I need 4 self healing polymers from wherever you can find them.", + "offer": "My experiments are at a critical point. Could you find about… 4 self healing polymers for me?", + "accepted": "Don't forget to tell me when you have them.", + "rejected": "Then why are you even here? Just let me know if you reconsider.", + "advice": "Hospitals, DIY geneticists.", + "inquire": "Why aren't you done yet?", + "success": "My niece shared her research, show me if it works.", + "success_lie": "Thanks for trying… I guess.", + "failure": "Put a stopper in death? No you never will." + }, + "end": { "effect": [ { "u_buy_item": "mutagen_migo", "container": "bottle_glass", "count": 3 } ] } + }, + { + "id": "MISSION_FRANKENSTEIN_2", + "type": "mission_definition", + "name": "Making Connections", + "description": "I need a neurosynaptic interface matrix.", + "goal": "MGOAL_FIND_ITEM", + "difficulty": 6, + "value": 0, + "item": "afs_neural_io_5", + "count": 1, + "origins": [ "ORIGIN_SECONDARY" ], + "followup": "MISSION_FRANKENSTEIN_3", + "dialogue": { + "describe": "I need one neurosynaptic interface matrix.", + "offer": "I want to test something and I need a viable version to reverse engineer.", + "accepted": "Without this all that's possible is 'Ye liveliest awfulness'.", + "rejected": "You'd give up a new world just to bring back Foodplace!", + "advice": "You're going to have to hunt this down.", + "inquire": "Have you found my matrix?", + "success": "Have this.", + "success_lie": "How could you possibly lie to me about an object you have not put in my hands.", + "failure": "Do you have any head cybernetics? I could possibly salvage one out of your skull." + }, + "end": { "effect": [ { "u_buy_item": "afs_energy_storage_4", "count": 4 } ] } + }, + { + "id": "MISSION_FRANKENSTEIN_3", + "type": "mission_definition", + "name": "Alpha Mutagen", + "description": "Bring me 3 alpha mutagen.", + "goal": "MGOAL_FIND_ITEM", + "difficulty": 4, + "value": 0, + "item": "mutagen", + "count": 3, + "origins": [ "ORIGIN_SECONDARY" ], + "followup": "MISSION_FRANKENSTEIN_4", + "dialogue": { + "describe": "I need three alpha mutagen.", + "offer": "I know that one of the corporations were creating a so called Alpha mutagen. I need some to prepare the body.", + "accepted": "Better living through chemistry.", + "rejected": "Would you take it yourself?", + "advice": "If you can't make it yourself go hit up a lab. Be prepared for anything in there.", + "inquire": "Did you get taller since the last time I saw you?", + "success": "I've got something more potent for you this time.", + "success_lie": "Lies and the lying liars who tell them.", + "failure": "You are keeping me from my experiments. Would you like to become one?" + }, + "end": { "effect": [ { "u_buy_item": "iv_mutagen_migo", "container": "flask_glass", "count": 1 } ] } + }, + { + "id": "MISSION_FRANKENSTEIN_4", + "type": "mission_definition", + "name": "A Mi-go, You-go find me some brains", + "description": "Find 6 living brains in jars.", + "//": "Sometime consider changing the end effect of this item and making the test site it's own quest.", + "goal": "MGOAL_FIND_ITEM", + "difficulty": 8, + "value": 0, + "item": "living_brain_jar", + "count": 2, + "origins": [ "ORIGIN_SECONDARY" ], + "followup": "MISSION_FIND_CYRUS", + "dialogue": { + "describe": "I need some brains, but brains that are still living. We've got our own brain blasters, but I won't risk them in experiments.", + "offer": "If this works I may be able to give some of these poor souls bodies again.", + "accepted": "I knew I could count on your generosity.", + "rejected": "I would have given you the title of Whately family Igor.", + "advice": "Brain blasters, that's what I call them. Some kind of automated weapon system the mi-go use.", + "inquire": "They speak sometimes. I wonder if they still think.", + "success": "Go somewhere, far away, and then connect the power system. Come back and tell me how things went.", + "success_lie": "Thanks for trying… I guess.", + "failure": "I can't be Dr Frankenstein unless you get me these." + }, + "end": { "effect": [ { "u_buy_item": "inactive_frankenstein" "count": 1 } ] } + } +] diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 8c650b0a8ebf7..e7192c6536c86 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -129,8 +129,8 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_migo_biology_3", "dialogue": { - "describe": "I need 56 chunks of mi-go resin.", - "offer": "I need to understand more about their environment and how they create it. This research wasn't even possible previously. Bring me fifty six chunks of mi-go resin.", + "describe": "I need 50 chunks of mi-go resin.", + "offer": "I need to understand more about their environment and how they create it. This research wasn't even possible previously. Bring me fifty chunks of mi-go resin.", "accepted": "My notes suggest that their building materials are alive. I need you to help me confirm that.", "rejected": "You can't just walk away from this. We're changing the world!", "advice": "Find their buildings, jackhammer them. What did you do before the world changed for the better, cold call salesman?", @@ -196,7 +196,7 @@ "type": "mission_definition", "name": "Find my great uncle Cyrus Whately", "description": "Cyrus and his family were poorly liked even for Whately's before the end of the world. They went so far off grid that they may not even know anything has changed. I need to know he's alive and where his research has taken him.", - "goal": "MGOAL_GO_TO_TYPE", + "goal": "MGOAL_GO_TO", "difficulty": 2, "value": 150000, "origins": [ "ORIGIN_SECONDARY" ], From 4c5653a9637f37bd6a2cb37b3d8af760fef95d8c Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 15 Jul 2020 23:36:27 -0500 Subject: [PATCH 36/75] comma missing --- data/mods/Aftershock/npcs/cyrus_whately.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 3cd425e7de7f1..0eb5088792866 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -190,6 +190,6 @@ "success_lie": "Thanks for trying… I guess.", "failure": "I can't be Dr Frankenstein unless you get me these." }, - "end": { "effect": [ { "u_buy_item": "inactive_frankenstein" "count": 1 } ] } + "end": { "effect": [ { "u_buy_item": "inactive_frankenstein", "count": 1 } ] } } ] From 286aebe0960511098a0b57c3c9b21884063c3aa5 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 17 Jul 2020 00:43:58 -0500 Subject: [PATCH 37/75] Update cyrus_whately.json --- data/mods/Aftershock/npcs/cyrus_whately.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 0eb5088792866..154c234e1aa95 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -99,7 +99,7 @@ "goal": "MGOAL_FIND_ITEM", "difficulty": 5, "value": 0, - "item": "self healing polymers", + "item": "afs_biomaterial_4", "count": 4, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_FRANKENSTEIN_2", @@ -164,7 +164,7 @@ "success_lie": "Lies and the lying liars who tell them.", "failure": "You are keeping me from my experiments. Would you like to become one?" }, - "end": { "effect": [ { "u_buy_item": "iv_mutagen_migo", "container": "flask_glass", "count": 1 } ] } + "end": { "effect": [ { "u_buy_item": "iv_mutagen_migo", "container": "bottle_glass", "count": 3 } ] } }, { "id": "MISSION_FRANKENSTEIN_4", @@ -178,7 +178,6 @@ "item": "living_brain_jar", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], - "followup": "MISSION_FIND_CYRUS", "dialogue": { "describe": "I need some brains, but brains that are still living. We've got our own brain blasters, but I won't risk them in experiments.", "offer": "If this works I may be able to give some of these poor souls bodies again.", From 1ec48066031fd616859e118c4c57f0abce4c493b Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 17 Jul 2020 01:39:10 -0500 Subject: [PATCH 38/75] background story and itemgroup spawn --- .../Aftershock/itemgroups/bionics_groups.json | 8 +- .../npcs/Backgrounds/BGRS_bonesinger.json | 32 +++++++ .../npcs/Backgrounds/BG_traits_afs.json | 84 +++++++++++++++++++ 3 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json diff --git a/data/mods/Aftershock/itemgroups/bionics_groups.json b/data/mods/Aftershock/itemgroups/bionics_groups.json index 2fee362616910..765ea580ab243 100644 --- a/data/mods/Aftershock/itemgroups/bionics_groups.json +++ b/data/mods/Aftershock/itemgroups/bionics_groups.json @@ -8,7 +8,8 @@ [ "afs_bio_missiles", 10 ], [ "afs_bio_linguistic_coprocessor", 10 ], [ "afs_bio_dopamine_stimulators", 10 ], - [ "bio_blaster", 5 ] + [ "bio_blaster", 5 ], + [ "afs_bio_skullgun", 5] ] }, { @@ -19,7 +20,7 @@ { "id": "bionics_mil", "type": "item_group", - "items": [ [ "bio_blaster", 5 ] ] + "items": [ [ "bio_blaster", 5 ], [ "afs_bio_skullgun", 2] ] }, { "id": "bionics_sci", @@ -33,7 +34,8 @@ [ "bn_bio_solar", 15 ], [ "afs_bio_wind_turbine", 10 ], [ "afs_bio_missiles", 10 ], - [ "afs_bio_dopamine_stimulators", 10 ] + [ "afs_bio_dopamine_stimulators", 10 ], + [ "afs_bio_skullgun", 2 ] ] }, { diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json new file mode 100644 index 0000000000000..c99624228133f --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json @@ -0,0 +1,32 @@ +[ + { + "id": "BGRS_Bonesinger_STORY1", + "type": "talk_topic", + "dynamic_line": "I heard the song before the aliens captured me. I did what I could to help the other Bonesingers.", + "responses": [ + { "text": "Where are you from?", "topic": "BGSS_CRIMINAL_EXPERIMENT_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_Bonesinger_STORY2", + "type": "talk_topic", + "dynamic_line": "One day I was being chased by some aliens and suddenly I was ambushed by another one that shot me with some kind of pain ray.", + "responses": [ + { "text": "Tell me more?", "topic": "BGSS_CRIMINAL_EXPERIMENT_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_Bonesinger_STORY3", + "type": "talk_topic", + "dynamic_line": "Eventually they took the bones from my body. It's strange though, I still hear the song calling to me, even in this new body.", + "responses": [ + { "text": "How did it end?", "topic": "BGSS_CRIMINAL_EXPERIMENT_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json index fe75c929030fe..3b92cd3478640 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json @@ -142,5 +142,89 @@ "purifiable": false, "types": [ "BACKGROUND_SURVIVAL_STORY" ], "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGRS_MIGO_1", + "name": { "str": "Survivor Story" }, + "player_display": false, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGRS_MIGO_2", + "name": { "str": "Survivor Story" }, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "player_display": false, + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGRS_MIGO_3", + "name": { "str": "Survivor Story" }, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "player_display": false, + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGRS_SCHIZO_1", + "name": { "str": "Survivor Story" }, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "player_display": false, + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGRS_SCHIZO_2", + "name": { "str": "Survivor" }, + "player_display": false, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGRS_Dreamer", + "name": { "str": "Survivor Story" }, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "player_display": false, + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGRS_Bonesinger", + "name": { "str": "Whately Story" }, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "player_display": false, + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] } ] From 12da5c1556a841c7c9f478e364c2fe9ebdb00452 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 17 Jul 2020 12:38:57 -0500 Subject: [PATCH 39/75] Create BGRS_mi-go_1.json Portuguese --- .../npcs/Backgrounds/BGRS_mi-go_1.json | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGRS_mi-go_1.json diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_mi-go_1.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_mi-go_1.json new file mode 100644 index 0000000000000..04b77d912afcd --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_mi-go_1.json @@ -0,0 +1,28 @@ +[ + { + "id": "BGRS_MIGO_STORY1", + "type": "talk_topic", + "dynamic_line": "Antes do Cataclisma eu era o cientista que encabeçava um laboratório militar no meu país. Foram dias difíceis…", + "responses": [ + { "text": "Where are you from?", "topic": "BGRS_MIGO_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_STORY2", + "type": "talk_topic", + "dynamic_line": "Nós estávamos pesquisando um remédio que curasse um virus altamente letal na época, mas os resultados dos testes mostravam que o remédio era mais letal do que o próprio virus. Então, ao invés de recolherem os remédios das prateleiras, eles nos forçaram a vendê-lo como sendo a cura para o vírus.", + "responses": [ + { "text": "Tell me more?", "topic": "BGRS_MIGO_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_STORY3", + "type": "talk_topic", + "dynamic_line": "Bem… aqueles sem cérebro seguiram cegamente o líder. Quanto àqueles com algum cérebro… bom, acho que você está conversando com um deles agora", + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] + } +] From 5647a7d8639707f2524bf1155f7b62aa054ab7ae Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 17 Jul 2020 12:41:00 -0500 Subject: [PATCH 40/75] Update bionics_groups.json --- data/mods/Aftershock/itemgroups/bionics_groups.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/itemgroups/bionics_groups.json b/data/mods/Aftershock/itemgroups/bionics_groups.json index 765ea580ab243..c8b2b9248dfb1 100644 --- a/data/mods/Aftershock/itemgroups/bionics_groups.json +++ b/data/mods/Aftershock/itemgroups/bionics_groups.json @@ -9,7 +9,7 @@ [ "afs_bio_linguistic_coprocessor", 10 ], [ "afs_bio_dopamine_stimulators", 10 ], [ "bio_blaster", 5 ], - [ "afs_bio_skullgun", 5] + [ "afs_bio_skullgun", 5 ] ] }, { @@ -20,7 +20,7 @@ { "id": "bionics_mil", "type": "item_group", - "items": [ [ "bio_blaster", 5 ], [ "afs_bio_skullgun", 2] ] + "items": [ [ "bio_blaster", 5 ], [ "afs_bio_skullgun", 2 ] ] }, { "id": "bionics_sci", From d2b7f72714073cbf2a60e01fc7d9caf40d662c62 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 18 Jul 2020 20:57:16 -0500 Subject: [PATCH 41/75] reanimation backgrounds --- .../{BGRS_mi-go_1.json => BGRS_migo_1.json} | 10 +++--- .../npcs/Backgrounds/BGRS_migo_2.json | 31 +++++++++++++++++++ .../npcs/Backgrounds/BGRS_migo_3.json | 31 +++++++++++++++++++ 3 files changed, 67 insertions(+), 5 deletions(-) rename data/mods/Aftershock/npcs/Backgrounds/{BGRS_mi-go_1.json => BGRS_migo_1.json} (84%) create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_mi-go_1.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json similarity index 84% rename from data/mods/Aftershock/npcs/Backgrounds/BGRS_mi-go_1.json rename to data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json index 04b77d912afcd..d8184f0cc5972 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_mi-go_1.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json @@ -1,26 +1,26 @@ [ { - "id": "BGRS_MIGO_STORY1", + "id": "BGRS_MIGO_1_STORY1", "type": "talk_topic", "dynamic_line": "Antes do Cataclisma eu era o cientista que encabeçava um laboratório militar no meu país. Foram dias difíceis…", "responses": [ - { "text": "Where are you from?", "topic": "BGRS_MIGO_STORY2" }, + { "text": "Where are you from?", "topic": "BGRS_MIGO_1_STORY2" }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] }, { - "id": "BGRS_MIGO_STORY2", + "id": "BGRS_MIGO_1_STORY2", "type": "talk_topic", "dynamic_line": "Nós estávamos pesquisando um remédio que curasse um virus altamente letal na época, mas os resultados dos testes mostravam que o remédio era mais letal do que o próprio virus. Então, ao invés de recolherem os remédios das prateleiras, eles nos forçaram a vendê-lo como sendo a cura para o vírus.", "responses": [ - { "text": "Tell me more?", "topic": "BGRS_MIGO_STORY3" }, + { "text": "Ummm?", "topic": "BGRS_MIGO_1_STORY3" }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] }, { - "id": "BGRS_MIGO_STORY3", + "id": "BGRS_MIGO_1_STORY3", "type": "talk_topic", "dynamic_line": "Bem… aqueles sem cérebro seguiram cegamente o líder. Quanto àqueles com algum cérebro… bom, acho que você está conversando com um deles agora", "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json new file mode 100644 index 0000000000000..661fdd3c3d242 --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json @@ -0,0 +1,31 @@ +[ + { + "id": "BGRS_MIGO_2_STORY1", + "type": "talk_topic", + "dynamic_line": "Things have been getting weird for the last couple of years. Then we started hearing rumors of strange lights in the sky at night.", + "responses": [ + { "text": "Where are you from?", "topic": "BGRS_MIGO_2_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_2_STORY2", + "type": "talk_topic", + "dynamic_line": "One night I heard my neighbor calling for me to come help him. I went outside wondering what he could possibly need my help with in the middle of the night.", + "responses": [ + { "text": "What happened next?", "topic": "BGRS_MIGO_2_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_2_STORY3", + "type": "talk_topic", + "dynamic_line": "Some kind of hideos alien was standing over my neighbors disembowled corpse. It looked at me and said 'You're a great neighbor' then everything faded to black. I feel like everything in my body fits differently now.", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json new file mode 100644 index 0000000000000..a838164f1bb5d --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json @@ -0,0 +1,31 @@ +[ + { + "id": "BGRS_MIGO_3_STORY1", + "type": "talk_topic", + "dynamic_line": "I worked in a top secret lab. Things kept getting crazier and crazier outside and the scientists inside started making desperate experiments. They worked on something called interdimensional portals.", + "responses": [ + { "text": "Where are you from?", "topic": "BGRS_MIGO_3_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_3_STORY2", + "type": "talk_topic", + "dynamic_line": "The eggheads kept sayig we needed to find a way out of here before everything went sideways. So we needed to open more portals even if we hadn't had time to take all the precautions.", + "responses": [ + { "text": "What happened next?", "topic": "BGRS_MIGO_3_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_2_STORY3", + "type": "talk_topic", + "dynamic_line": "One day they opened a portal trying to find an earthlike planet and suddenly portals were opening all over the lab and these fast and dangerous aliens overwhelmed the lab. The killed most of the staff and took the rest prisoner.", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] From e6e040f6610ec7d5e2a34e26d5c2e9eb7133bc17 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 18 Jul 2020 21:47:37 -0500 Subject: [PATCH 42/75] schizo revivification stories --- .../npcs/Backgrounds/BGRS_schizo_1.json | 31 +++++++++++++++++++ .../npcs/Backgrounds/BGRS_schizo_2.json | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json new file mode 100644 index 0000000000000..cf7af2412909a --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json @@ -0,0 +1,31 @@ +[ + { + "id": "BGRS_SCHIZO_1_STORY1", + "type": "talk_topic", + "dynamic_line": "Monsters! Monsters everywhere. Everyone is suspect, how do I know you aren't a monster?", + "responses": [ + { "text": "Are you ok?", "topic": "BGRS_MIGO_3_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_3_STORY2", + "type": "talk_topic", + "dynamic_line": "You can't trust anyone these days. Everyone is either a cannibal or a monster or a government spook.", + "responses": [ + { "text": "Why would you trust me then?", "topic": "BGRS_MIGO_3_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_2_STORY3", + "type": "talk_topic", + "dynamic_line": "Because, what if I'm the monster?", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json new file mode 100644 index 0000000000000..1c9fb428602ec --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json @@ -0,0 +1,31 @@ +[ + { + "id": "BGRS_SCHIZO_1_STORY1", + "type": "talk_topic", + "dynamic_line": "If you think this Universe is bad, you should see some of the others.", + "responses": [ + { "text": "Where are you from then?", "topic": "BGRS_MIGO_3_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_3_STORY2", + "type": "talk_topic", + "dynamic_line": "Believing something existed and then finding out it didn't was like reaching the top of the stairs and thinking there was one more step.", + "responses": [ + { "text": "What does that have to do with anything?", "topic": "BGRS_MIGO_3_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_MIGO_2_STORY3", + "type": "talk_topic", + "dynamic_line": "I think a lot of psychopaths are just geniuses who drove so fast that they lost control.", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] From 4190e7b40456db495b4c30ca0fa67c8a8c3f4d67 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 18 Jul 2020 21:52:12 -0500 Subject: [PATCH 43/75] linting --- .../Aftershock/npcs/Backgrounds/BGRS_migo_2.json | 5 +---- .../Aftershock/npcs/Backgrounds/BGRS_migo_3.json | 5 +---- .../npcs/Backgrounds/BGRS_schizo_1.json | 13 +++++-------- .../npcs/Backgrounds/BGRS_schizo_2.json | 15 ++++++--------- 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json index 661fdd3c3d242..f4292c97e33e5 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json @@ -23,9 +23,6 @@ "id": "BGRS_MIGO_2_STORY3", "type": "talk_topic", "dynamic_line": "Some kind of hideos alien was standing over my neighbors disembowled corpse. It looked at me and said 'You're a great neighbor' then everything faded to black. I feel like everything in my body fits differently now.", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json index a838164f1bb5d..18711e8407d39 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json @@ -23,9 +23,6 @@ "id": "BGRS_MIGO_2_STORY3", "type": "talk_topic", "dynamic_line": "One day they opened a portal trying to find an earthlike planet and suddenly portals were opening all over the lab and these fast and dangerous aliens overwhelmed the lab. The killed most of the staff and took the rest prisoner.", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json index cf7af2412909a..19c0a55b36308 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json @@ -4,28 +4,25 @@ "type": "talk_topic", "dynamic_line": "Monsters! Monsters everywhere. Everyone is suspect, how do I know you aren't a monster?", "responses": [ - { "text": "Are you ok?", "topic": "BGRS_MIGO_3_STORY2" }, + { "text": "Are you ok?", "topic": "BGRS_SCHIZO_1_STORY2" }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] }, { - "id": "BGRS_MIGO_3_STORY2", + "id": "BGRS_SCHIZO_1_STORY2", "type": "talk_topic", "dynamic_line": "You can't trust anyone these days. Everyone is either a cannibal or a monster or a government spook.", "responses": [ - { "text": "Why would you trust me then?", "topic": "BGRS_MIGO_3_STORY3" }, + { "text": "Why would you trust me then?", "topic": "BGRS_SCHIZO_1_STORY3" }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] }, { - "id": "BGRS_MIGO_2_STORY3", + "id": "BGRS_SCHIZO_1_STORY3", "type": "talk_topic", "dynamic_line": "Because, what if I'm the monster?", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json index 1c9fb428602ec..97c9268886da5 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json @@ -1,31 +1,28 @@ [ { - "id": "BGRS_SCHIZO_1_STORY1", + "id": "BGRS_SCHIZO_2_STORY1", "type": "talk_topic", "dynamic_line": "If you think this Universe is bad, you should see some of the others.", "responses": [ - { "text": "Where are you from then?", "topic": "BGRS_MIGO_3_STORY2" }, + { "text": "Where are you from then?", "topic": "BGRS_SCHIZO_2_STORY2" }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] }, { - "id": "BGRS_MIGO_3_STORY2", + "id": "BGRS_SCHIZO_2_STORY2", "type": "talk_topic", "dynamic_line": "Believing something existed and then finding out it didn't was like reaching the top of the stairs and thinking there was one more step.", "responses": [ - { "text": "What does that have to do with anything?", "topic": "BGRS_MIGO_3_STORY3" }, + { "text": "What does that have to do with anything?", "topic": "BGRS_SCHIZO_2_STORY3" }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] }, { - "id": "BGRS_MIGO_2_STORY3", + "id": "BGRS_SCHIZO_2_STORY3", "type": "talk_topic", "dynamic_line": "I think a lot of psychopaths are just geniuses who drove so fast that they lost control.", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] From b983fce773e47f073e680df01762a46c5b5e4576 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 18 Jul 2020 23:09:03 -0500 Subject: [PATCH 44/75] final backgrounds --- .../npcs/Backgrounds/BGRS_afterlife.json | 28 +++++++++++++++++++ .../npcs/Backgrounds/BGRS_dreamer.json | 28 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json new file mode 100644 index 0000000000000..d24cf9e4ae9bf --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json @@ -0,0 +1,28 @@ +[ + { + "id": "BGRS_AFTERLIFE_1_STORY1", + "type": "talk_topic", + "dynamic_line": "What level of hell is this? I spent weeks in a sulforous hell being tortured.", + "responses": [ + { "text": "What was that like?", "topic": "BGRS_AFTERLIFE_1_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_AFTERLIFE_1_STORY2", + "type": "talk_topic", + "dynamic_line": "Then they started cutting me open and taking out my organs but adding new ones.", + "responses": [ + { "text": "How did it end?", "topic": "BGRS_AFTERLIFE_1_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_AFTERLIFE_1_STORY3", + "type": "talk_topic", + "dynamic_line": "Now that I finally am able to move and have some freedom, I plan on finding some of these demons and punching through them until I find the devil himself.", + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] + } +] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json new file mode 100644 index 0000000000000..15fe198607e21 --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json @@ -0,0 +1,28 @@ +[ + { + "id": "BGRS_Dreamer_STORY1", + "type": "talk_topic", + "dynamic_line": "I just spent what felt like weeks in a dream that I was acting as a targeting computer for some kind of alien turret.", + "responses": [ + { "text": "Where are you from then?", "topic": "BGRS_Dreamer_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_Dreamer_STORY2", + "type": "talk_topic", + "dynamic_line": "Now I'm in some kind of Mary Shelley nightmare? I mean at least I have mobility.", + "responses": [ + { "text": "What does that have to do with anything?", "topic": "BGRS_Dreamer_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGRS_Dreamer_STORY3", + "type": "talk_topic", + "dynamic_line": "I'm going to keep going with this dream, hopefully soon I'll get to one where I can fly.", + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] + } +] From 88b1ba9a092c759498f905c29bb595a6b0a349f0 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jul 2020 01:12:17 -0500 Subject: [PATCH 45/75] npc spawns --- .../Aftershock/maps/mapgen/whately_lmoe.json | 8 ++++--- data/mods/Aftershock/npcs/classes.json | 24 +++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index d6b87f4cb5453..53c05616541b2 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -107,8 +107,9 @@ "########################", "########################" ], - "palettes": [ "whately_bunker", "whately_empty_bunker_items" ] - } + "palettes": [ "whately_bunker", "whately_empty_bunker_items" ], + "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10 }, { "class": "wilhemina_whately", "x": 7, "y": 16 }, { "class": "whately_cousin", "x": 19, "y": 8 } ] + }, }, { "type": "mapgen", @@ -151,7 +152,8 @@ { "chunks": [ "lmoe3_storage_11x11" ], "x": 13, "y": 6 }, { "chunks": [ "lmoe3_tankroom_11x11" ], "x": 1, "y": 18 }, { "chunks": [ "lmoe3_crafting_11x11" ], "x": 13, "y": 18 } - ] + ], + "place_npcs": [ { "class": "nicodemus_whately", "x": 9, "y": 7 }, { "class": "whately_cousin", "x": 5, "y": 14 } ] } }, { diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 19b13f5b4008e..d47407bb25909 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -135,5 +135,29 @@ { "skill": "firstaid", "bonus": { "rng": [ 1, 4 ] } }, { "skill": "chemistry", "bonus": { "rng": [ 6, 8 ] } } ] + }, + { + "type": "npc", + "id": "wilhemina_whately", + "name_unique": "Wilhemina Whately", + "name_suffix": "Shopkeeper", + "class": "whately_cousin", + "attitude": 0, + "mission": 3, + "//": "Do I need a chat here?", + "faction": "whately_family", + "gender": "female" + }, + { + "type": "npc", + "id": "nicodemus_whately", + "name_unique": "Nicodemus Whately", + "name_suffix": "Whately, Hatchetman", + "class": "whately_cousin", + "attitude": 0, + "mission": 3, + "//": "Set chat and missions here later", + "faction": "whately_family", + "gender": "male" } ] From fe6db2770b2352bec6b2b8248c0c5008b33f49c4 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jul 2020 01:18:02 -0500 Subject: [PATCH 46/75] linting --- data/mods/Aftershock/maps/mapgen/whately_lmoe.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index 53c05616541b2..daad341f971d0 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -108,8 +108,12 @@ "########################" ], "palettes": [ "whately_bunker", "whately_empty_bunker_items" ], - "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10 }, { "class": "wilhemina_whately", "x": 7, "y": 16 }, { "class": "whately_cousin", "x": 19, "y": 8 } ] - }, + "place_npcs": [ + { "class": "cyrus_whately", "x": 11, "y": 10 }, + { "class": "wilhemina_whately", "x": 7, "y": 16 }, + { "class": "whately_cousin", "x": 19, "y": 8 } + ] + } }, { "type": "mapgen", @@ -153,7 +157,7 @@ { "chunks": [ "lmoe3_tankroom_11x11" ], "x": 1, "y": 18 }, { "chunks": [ "lmoe3_crafting_11x11" ], "x": 13, "y": 18 } ], - "place_npcs": [ { "class": "nicodemus_whately", "x": 9, "y": 7 }, { "class": "whately_cousin", "x": 5, "y": 14 } ] + "place_npcs": [ { "class": "nicodemus_whately", "x": 9, "y": 7 }, { "class": "whately_cousin", "x": 5, "y": 14 } ] } }, { From 4a7f41480494131f7f832829e1102f6a858bdebc Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jul 2020 20:14:24 -0500 Subject: [PATCH 47/75] fixes --- .../Aftershock/maps/mapgen/whately_lmoe.json | 1 - data/mods/Aftershock/npcs/classes.json | 4 +- .../npcs/milly_whately_dialogue.json | 13 ++- .../npcs/mutant_npcs/trait_groups.json | 1 - data/mods/Aftershock/npcs/npc.json | 2 +- .../npcs/whately_generic_dialogue.json | 106 ++++++++++++++++++ 6 files changed, 118 insertions(+), 9 deletions(-) create mode 100644 data/mods/Aftershock/npcs/whately_generic_dialogue.json diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index daad341f971d0..c6d6b07f92a89 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -109,7 +109,6 @@ ], "palettes": [ "whately_bunker", "whately_empty_bunker_items" ], "place_npcs": [ - { "class": "cyrus_whately", "x": 11, "y": 10 }, { "class": "wilhemina_whately", "x": 7, "y": 16 }, { "class": "whately_cousin", "x": 19, "y": 8 } ] diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index d47407bb25909..cc5696dbc594b 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -144,7 +144,7 @@ "class": "whately_cousin", "attitude": 0, "mission": 3, - "//": "Do I need a chat here?", + "chat": "TALK_WHATELY_GENERIC1", "faction": "whately_family", "gender": "female" }, @@ -156,7 +156,7 @@ "class": "whately_cousin", "attitude": 0, "mission": 3, - "//": "Set chat and missions here later", + "chat": "TALK_WHATELY_GENERIC1", "faction": "whately_family", "gender": "male" } diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index e7192c6536c86..8715aea7fee84 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -196,7 +196,7 @@ "type": "mission_definition", "name": "Find my great uncle Cyrus Whately", "description": "Cyrus and his family were poorly liked even for Whately's before the end of the world. They went so far off grid that they may not even know anything has changed. I need to know he's alive and where his research has taken him.", - "goal": "MGOAL_GO_TO", + "goal": "MGOAL_TALK_TO_NPC", "difficulty": 2, "value": 150000, "origins": [ "ORIGIN_SECONDARY" ], @@ -221,7 +221,8 @@ "must_see": false, "random": true, "search_range": 180 - } + }, + "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "z": -1, "x": 11, "y": 10, "target": true } ] } }, "end": { "opinion": { "trust": 1, "value": 1 }, @@ -229,8 +230,12 @@ "update_mapgen": [ { "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": [ [ "whately_cousin", 5 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ] - } + "place_nested": [ { "chunks": [ [ "whately_cousin", 15 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ] + }, + { + "om_terrain": "mortuary_2story", + "place_nested": [ { "chunks": [ [ "whately_bioturret_update", 15 ], [ "null", 35 ] ], "x": [ 19, 23 ], "y": [ 15, 22 ] } ] + }, ] } } diff --git a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json index 785987eb876f6..b66b06ffc801b 100644 --- a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json +++ b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json @@ -1007,7 +1007,6 @@ "subtype": "collection", "traits": [ { "trait": "THRESH_YUGGOTH" }, - { "trait": "MIGO" }, { "distribution": [ { "trait": "UPLIFTED" }, { "trait": "ALIEN_INT" } ] }, { "trait": "MIGO_HEAT_RESIST", "prob": 50 }, { "trait": "OTHERWORLDLY_GRACE", "prob": 20 }, diff --git a/data/mods/Aftershock/npcs/npc.json b/data/mods/Aftershock/npcs/npc.json index fcca2e30d48de..34ced1f4a8b27 100644 --- a/data/mods/Aftershock/npcs/npc.json +++ b/data/mods/Aftershock/npcs/npc.json @@ -18,7 +18,7 @@ "class": "whately_cousin", "attitude": 1, "mission": 0, - "chat": "TALK_PrepNet_gardener_1", + "chat": "TALK_WHATELY_1", "faction": "whately_family" } ] diff --git a/data/mods/Aftershock/npcs/whately_generic_dialogue.json b/data/mods/Aftershock/npcs/whately_generic_dialogue.json new file mode 100644 index 0000000000000..7d471ed6b47b0 --- /dev/null +++ b/data/mods/Aftershock/npcs/whately_generic_dialogue.json @@ -0,0 +1,106 @@ +[ + { + "type": "effect_type", + "id": "u_met_whately" + }, + { + "type": "talk_topic", + "id": "TALK_WHATELY_1", + "dynamic_line": { + "u_has_var": "u_met_whately", + "type": "general", + "context": "meeting", + "value": "yes", + "yes": [ "Outsider.", "Hello.", "Hospitality rites are civilization.", "Guest.", "How's the madness outside?" ], + "no": "We don't get outsiders around here all that much." + }, + "responses": [ + { + "text": "Who are you?", + "effect": { "u_add_var": "u_met_whately", "type": "general", "context": "meeting", "value": "yes" }, + "condition": { "not": { "u_has_var": "u_met_whately", "type": "general", "context": "meeting", "value": "yes" } }, + "topic": "TALK_WHATELY_firstmeet" + }, + { + "text": "What is this place?", + "condition": { "u_has_var": "u_met_whately", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_WHATELY_place" + }, + { + "text": "What's your story?", + "condition": { "u_has_var": "u_met_whately", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_WHATELY_ask_past" + }, + { + "text": "How are things here?", + "condition": { "u_has_var": "u_met_whately", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_WHATELY_ask_mood" + }, + { + "text": "Can I do anything for you?", + "condition": { "u_has_var": "u_met_whately", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_MISSION_LIST" + }, + { "text": "How do I join the family?", "topic": "TALK_WHATELY_ask_membership" }, + { "text": "I'm going on my way now.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_WHATELY_firstmeet", + "dynamic_line": "I'm a member of the Whately Family. Who are you?", + "responses": [ + { "text": "I am lost and really need something to eat.", "topic": "TALK_WHATELY_food" }, + { "text": "I am just a fellow survivor.", "topic": "TALK_WHATELY_1" }, + { "text": "I've done some tasks for your relatives.", "topic": "TALK_WHATELY_1" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_WHATELY_place", + "dynamic_line": "Welcome to Whately lands. Behave yourself or we'll harvest you for parts.", + "responses": [ + { "text": "Can you give me something to eat then?", "topic": "TALK_WHATELY_food" }, + { "text": "What can I buy here?", "topic": "TALK_WHATELY_ask_goods" }, + { "text": "Oh, okay.", "topic": "TALK_WHATELY_1" }, + { "text": "Family bonds above all, huh?", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_WHATELY_food", + "dynamic_line": "We aren't in the habit of breaking bread with outsiders.", + "responses": [ + { "text": "I can pay.", "topic": "TALK_WHATELY_ask_goods" }, + { "text": "How do I join your family?", "topic": "TALK_WHATELY_ask_membership" }, + { "text": "Well I'm heading out then", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_WHATELY_ask_goods", + "dynamic_line": "Then let's see what you've got to trade.", + "responses": [ + { "text": "It was worth a try.", "topic": "TALK_WHATELY_1" }, + { "text": "What can I buy here?", "effect": "start_trade", "topic": "TALK_WHATELY_1" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_WHATELY_ask_membership", + "dynamic_line": "Only blood allowed, and the family Elders can make you of the blood.", + "responses": [ { "text": "Well that sounds creepy.", "topic": "TALK_WHATELY_1" } ] + }, + { + "type": "talk_topic", + "id": "TALK_WHATELY_past", + "dynamic_line": "I was born part of the family. We've never been accepted here but our wealth and talents have kept us alive through the centuries.", + "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_WHATELY_1" } ] + }, + { + "type": "talk_topic", + "id": "TALK_WHATELY_ask_mood", + "dynamic_line": "Family keeps me busy and our experiments and projects take up the rest of my time.", + "responses": [ { "text": "I'm glad you stay busy.", "topic": "TALK_WHATELY_1" } ] + } +] From 7d2ddc886945458a0fd8b5a58c6bcd15bf150e53 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jul 2020 20:43:55 -0500 Subject: [PATCH 48/75] more fixes --- .../Aftershock/maps/mapgen/millyficent_lab.json | 13 +++++++++++++ .../Aftershock/npcs/milly_whately_dialogue.json | 2 +- .../Aftershock/npcs/whately_generic_dialogue.json | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json index d8f91d6cda519..4ea76b9f694ac 100644 --- a/data/mods/Aftershock/maps/mapgen/millyficent_lab.json +++ b/data/mods/Aftershock/maps/mapgen/millyficent_lab.json @@ -5,6 +5,7 @@ "om_terrain": [ "mortuary_2story" ], "weight": 100, "object": { + "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ], "fill_ter": "t_floor", "rows": [ "..,,,,,...uuuu...,,,,,..", @@ -95,6 +96,7 @@ "om_terrain": [ "mortuary_basement" ], "weight": 200, "object": { + "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ], "rotation": [ 0, 3 ], "fill_ter": "t_rock", "rows": [ @@ -200,6 +202,7 @@ "method": "json", "om_terrain": [ "mortuary_2story_second" ], "object": { + "faction_owner": [ { "id": "whately_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ], "fill_ter": "t_floor", "rows": [ "________________________", @@ -282,6 +285,16 @@ "v": "f_ventilator", "Z": "f_bed" }, + "items": { + "U": [ + { "item": "cleaning", "chance": 30 }, + { "item": "supplies_reagents_lab", "chance": 10 }, + { "item": "home_hw", "chance": 50 }, + { "item": "supplies_electronics", "chance": 50 } + ], + "B": [ { "item": "exotic_books", "chance": 70 } ], + "T": [ { "item": "SUS_office_filing_cabinet", "chance": 70 } ] + }, "place_npcs": [ { "class": "millyficent_whately", "x": 17, "y": 14 } ] } }, diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 8715aea7fee84..f574fbd1946e0 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -235,7 +235,7 @@ { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ [ "whately_bioturret_update", 15 ], [ "null", 35 ] ], "x": [ 19, 23 ], "y": [ 15, 22 ] } ] - }, + } ] } } diff --git a/data/mods/Aftershock/npcs/whately_generic_dialogue.json b/data/mods/Aftershock/npcs/whately_generic_dialogue.json index 7d471ed6b47b0..103efa7e472d0 100644 --- a/data/mods/Aftershock/npcs/whately_generic_dialogue.json +++ b/data/mods/Aftershock/npcs/whately_generic_dialogue.json @@ -93,7 +93,7 @@ }, { "type": "talk_topic", - "id": "TALK_WHATELY_past", + "id": "TALK_WHATELY_ask_past", "dynamic_line": "I was born part of the family. We've never been accepted here but our wealth and talents have kept us alive through the centuries.", "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_WHATELY_1" } ] }, From a735bee873232645b0b6489dc3c8a7d1e6622e93 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 19 Jul 2020 21:04:16 -0500 Subject: [PATCH 49/75] Update whately_lmoe.json --- data/mods/Aftershock/maps/mapgen/whately_lmoe.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json index c6d6b07f92a89..100ba8190e6cb 100644 --- a/data/mods/Aftershock/maps/mapgen/whately_lmoe.json +++ b/data/mods/Aftershock/maps/mapgen/whately_lmoe.json @@ -108,10 +108,7 @@ "########################" ], "palettes": [ "whately_bunker", "whately_empty_bunker_items" ], - "place_npcs": [ - { "class": "wilhemina_whately", "x": 7, "y": 16 }, - { "class": "whately_cousin", "x": 19, "y": 8 } - ] + "place_npcs": [ { "class": "wilhemina_whately", "x": 7, "y": 16 }, { "class": "whately_cousin", "x": 19, "y": 8 } ] } }, { From 484f718b2f7d9302dd2911bab03165c98cef27c1 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 24 Jul 2020 22:43:18 -0500 Subject: [PATCH 50/75] Update cyrus_whately.json --- data/mods/Aftershock/npcs/cyrus_whately.json | 27 +++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 154c234e1aa95..b590bf8fd472b 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -169,7 +169,32 @@ { "id": "MISSION_FRANKENSTEIN_4", "type": "mission_definition", - "name": "A Mi-go, You-go find me some brains", + "name": "Broken Cyborg Corpse", + "description": "We need a strong base for our experiment.", + "goal": "MGOAL_FIND_ITEM", + "difficulty": 6, + "value": 0, + "item": "broken_broken_cyborg", + "count": 3, + "origins": [ "ORIGIN_SECONDARY" ], + "followup": "MISSION_FRANKENSTEIN_5", + "dialogue": { + "describe": "I need the corpse of a broken cyborg. They are already brain dead so it won't be murder.", + "offer": "If you go to labs you should find some broken cyborg experiments. Bring me the corpse of one.", + "accepted": "Are you ready for a little necromancy?", + "rejected": "I'm telling you they're already brain dead.", + "advice": "Look for surgical centers inside the labs.", + "inquire": "So where are my fresh parts?", + "success": "I've got something more potent for you this time.", + "success_lie": "Lies and the lying liars who tell them.", + "failure": "You are keeping me from my experiments. Would you like to become one?" + }, + "end": { "effect": [ { "u_buy_item": "iv_mutagen_migo", "container": "bottle_glass", "count": 3 } ] } + }, + { + "id": "MISSION_FRANKENSTEIN_5", + "type": "mission_definition", + "name": "A-Mi-go, You-go find me some brains", "description": "Find 6 living brains in jars.", "//": "Sometime consider changing the end effect of this item and making the test site it's own quest.", "goal": "MGOAL_FIND_ITEM", From 1c8e95f5a85532cfc3e5baf520c09f7c41ee8f76 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 25 Jul 2020 22:01:22 -0500 Subject: [PATCH 51/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index f574fbd1946e0..764820f8de6b2 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -214,7 +214,7 @@ }, "start": { "assign_mission_target": { - "om_terrain": "whately_lmoe", + "om_terrain": "whately_lmoe_under_first_floor", "om_special": "Strange LMOE Shelter", "z": 0, "reveal_radius": 3, @@ -222,7 +222,7 @@ "random": true, "search_range": 180 }, - "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "z": -1, "x": 11, "y": 10, "target": true } ] } + "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10, "target": true } ] } }, "end": { "opinion": { "trust": 1, "value": 1 }, From faaaa6cf3a7d2afcdb19208dd16bf7a78802df25 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 25 Jul 2020 22:11:05 -0500 Subject: [PATCH 52/75] Update cyrus_whately.json --- data/mods/Aftershock/npcs/cyrus_whately.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index b590bf8fd472b..1a85d1e31f148 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -47,7 +47,7 @@ { "type": "talk_topic", "id": "TALK_CYRUS_firstmeet", - "dynamic_line": ".", + "dynamic_line": "Are you here because you are morally flexible and willing to take questionable directions from obviously insane people.", "responses": [ { "text": "Your niece is looking for you.", "topic": "TALK_CYRUS_millyficent" }, { "text": "How did you survive the Cataclysm?", "topic": "TALK_CYRUS_cataclysm" }, From 792b52a6e0622051fd48a0c4109289ac57f6d9cf Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 25 Jul 2020 22:15:04 -0500 Subject: [PATCH 53/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 764820f8de6b2..d3e031a6f3f73 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -230,11 +230,11 @@ "update_mapgen": [ { "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": [ [ "whately_cousin", 15 ], [ "null", 35 ] ], "x": [ 16, 19 ], "y": [ 15, 22 ] } ] + "place_nested": [ { "chunks": "whately_cousin", "x": 16, "y": 15 } ] }, { "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": [ [ "whately_bioturret_update", 15 ], [ "null", 35 ] ], "x": [ 19, 23 ], "y": [ 15, 22 ] } ] + "place_nested": [ { "chunks": "whately_bioturret_update", "x": 19, "y": 15 } ] } ] } From 6da125b1d2896b0dd3a8c73aafd5354ce46b7d8c Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 25 Jul 2020 22:27:24 -0500 Subject: [PATCH 54/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index d3e031a6f3f73..f000e0ac1069a 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -228,13 +228,10 @@ "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ + { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": "whately_cousin", "x": 16, "y": 15 } ] }, { "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": "whately_cousin", "x": 16, "y": 15 } ] - }, - { - "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": "whately_bioturret_update", "x": 19, "y": 15 } ] + "place_nested": [ { "chunks": "whately_bioturret_update", "x": 19, "y": 15 } ] } ] } From c4f82c4223defc10a864a5b92ecf015909434ef0 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 25 Jul 2020 23:57:46 -0500 Subject: [PATCH 55/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index f000e0ac1069a..3914e9cd830b4 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -222,16 +222,16 @@ "random": true, "search_range": 180 }, - "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10, "target": true } ] } + "update_mapgen": { "place_npcs": [ { "class": [ "cyrus_whately", "x": 11, "y": 10, "target": true ] } ] } }, "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ - { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": "whately_cousin", "x": 16, "y": 15 } ] }, + { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_cousin", "x": 16, "y": 15 ] } ] }, { "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": "whately_bioturret_update", "x": 19, "y": 15 } ] + "place_nested": [ { "chunks": [ "whately_bioturret_update", "x": 19, "y": 15 ] } ] } ] } From 103f5f029011168528f4b5db8bc1f51598eee8ee Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 26 Jul 2020 00:05:13 -0500 Subject: [PATCH 56/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 3914e9cd830b4..8456c07a55a07 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -222,16 +222,18 @@ "random": true, "search_range": 180 }, - "update_mapgen": { "place_npcs": [ { "class": [ "cyrus_whately", "x": 11, "y": 10, "target": true ] } ] } - }, + "update_mapgen": { "place_npcs": [ { "class": [ "cyrus_whately" ], "x": 11, "y": 10, "target": true } ] } + } + }, + { "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ - { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_cousin", "x": 16, "y": 15 ] } ] }, + { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_cousin", "x", 16, "y", 15 ] } ] }, { "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": [ "whately_bioturret_update", "x": 19, "y": 15 ] } ] + "place_nested": [ { "chunks": [ "whately_bioturret_update", "x", 19, "y", 15 ] } ] } ] } From a5ac2cdb1de00ce7ba30c3fe995cd9b8728bf5c4 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 26 Jul 2020 09:30:52 -0500 Subject: [PATCH 57/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 8456c07a55a07..f5b7f7da7d50f 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -222,7 +222,7 @@ "random": true, "search_range": 180 }, - "update_mapgen": { "place_npcs": [ { "class": [ "cyrus_whately" ], "x": 11, "y": 10, "target": true } ] } + "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10, "target": true } ] } } }, { From 9d320e1575fdc311bd05b011d0a9c16a914ff6b9 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 27 Jul 2020 23:56:21 -0500 Subject: [PATCH 58/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index f5b7f7da7d50f..f6807fcd975dc 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -223,9 +223,7 @@ "search_range": 180 }, "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10, "target": true } ] } - } - }, - { + }, "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], From ec416673e9c48d928ebe7f9998b67159e231828a Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jul 2020 01:01:58 -0500 Subject: [PATCH 59/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index f6807fcd975dc..21537e3590fc4 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -228,7 +228,7 @@ "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ - { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_cousin", "x", 16, "y", 15 ] } ] }, + { "om_terrain": "mortuary_2story", "place_nested": { "chunks": [ "whately_cousin", "x", 16, "y", 15 ] } }, { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_bioturret_update", "x", 19, "y", 15 ] } ] From 73a51fbd8add636a4e299f3cdc971df05d3b494d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jul 2020 16:03:21 -0500 Subject: [PATCH 60/75] CI build fix --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 21537e3590fc4..c56a3417e7a17 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -228,7 +228,7 @@ "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ - { "om_terrain": "mortuary_2story", "place_nested": { "chunks": [ "whately_cousin", "x", 16, "y", 15 ] } }, + { "om_terrain": "mortuary_2story", "place_nested": [ "chunks": { "whately_cousin", "x", 16, "y", 15 } ] }, { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_bioturret_update", "x", 19, "y", 15 ] } ] From 729c7fe5c57b968b80b7511ff3ef9d4fa82a2057 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:34:08 -0500 Subject: [PATCH 61/75] Revert "CI build fix" This reverts commit 73a51fbd8add636a4e299f3cdc971df05d3b494d. --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index c56a3417e7a17..21537e3590fc4 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -228,7 +228,7 @@ "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ - { "om_terrain": "mortuary_2story", "place_nested": [ "chunks": { "whately_cousin", "x", 16, "y", 15 } ] }, + { "om_terrain": "mortuary_2story", "place_nested": { "chunks": [ "whately_cousin", "x", 16, "y", 15 ] } }, { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_bioturret_update", "x", 19, "y", 15 ] } ] From 21482dcac5db249aba0a360181a55e592944695e Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jul 2020 18:43:15 -0500 Subject: [PATCH 62/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 21537e3590fc4..6f656cef5547e 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -228,11 +228,7 @@ "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ - { "om_terrain": "mortuary_2story", "place_nested": { "chunks": [ "whately_cousin", "x", 16, "y", 15 ] } }, - { - "om_terrain": "mortuary_2story", - "place_nested": [ { "chunks": [ "whately_bioturret_update", "x", 19, "y", 15 ] } ] - } + { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_bioturret_update", "x", 19, "y", 15 ] } ] } ] } } From 6e75219e7319f6c0717b4a7ad0115c54c8918d14 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jul 2020 20:46:46 -0500 Subject: [PATCH 63/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 6f656cef5547e..991f61f5b566c 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -228,7 +228,7 @@ "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], "update_mapgen": [ - { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_bioturret_update", "x", 19, "y", 15 ] } ] } + { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_bioturret_update", "x": 19, "y": 15 ] } ] } ] } } From 674d3155405ab5898e1967dfd21bc0d2b7460d27 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 28 Jul 2020 23:05:04 -0500 Subject: [PATCH 64/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 991f61f5b566c..8e8919f723467 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -227,9 +227,7 @@ "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], - "update_mapgen": [ - { "om_terrain": "mortuary_2story", "place_nested": [ { "chunks": [ "whately_bioturret_update", "x": 19, "y": 15 ] } ] } - ] + "update_mapgen": [ { "om_terrain": "mortuary_2story", "place_monster": [ "whately_bioturret", "x", 19, "y", 15 ] } ] } } ] From c0ab689d4889718f53a609efd39e6a26f6b6c8a2 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:10:23 -0500 Subject: [PATCH 65/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 8e8919f723467..718664c01d81b 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -226,8 +226,7 @@ }, "end": { "opinion": { "trust": 1, "value": 1 }, - "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ], - "update_mapgen": [ { "om_terrain": "mortuary_2story", "place_monster": [ "whately_bioturret", "x", 19, "y", 15 ] } ] + "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] } } ] From 9c99547746da7d4d0b6aebb8c66401995245e079 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 29 Jul 2020 00:41:54 -0500 Subject: [PATCH 66/75] Update milly_whately_dialogue.json --- data/mods/Aftershock/npcs/milly_whately_dialogue.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 718664c01d81b..107d1c4f55810 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -224,9 +224,6 @@ }, "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10, "target": true } ] } }, - "end": { - "opinion": { "trust": 1, "value": 1 }, - "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] - } + "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "millyficents_diary", "count": 1 } ] } } ] From 3f24b79a367d0fd0e1503dbb9516f3c29178bbad Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 29 Jul 2020 20:01:31 -0500 Subject: [PATCH 67/75] spacing fixes --- data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json | 4 ++-- data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json | 6 +++--- data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json | 2 +- data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json index c99624228133f..492d144278107 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json @@ -4,7 +4,7 @@ "type": "talk_topic", "dynamic_line": "I heard the song before the aliens captured me. I did what I could to help the other Bonesingers.", "responses": [ - { "text": "Where are you from?", "topic": "BGSS_CRIMINAL_EXPERIMENT_STORY2" }, + { "text": "Where are you from?", "topic": "BGRS_Bonesinger_STORY2" }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] @@ -14,7 +14,7 @@ "type": "talk_topic", "dynamic_line": "One day I was being chased by some aliens and suddenly I was ambushed by another one that shot me with some kind of pain ray.", "responses": [ - { "text": "Tell me more?", "topic": "BGSS_CRIMINAL_EXPERIMENT_STORY3" }, + { "text": "Tell me more?", "topic": "BGRS_Bonesinger_STORY3" }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json index d8184f0cc5972..d5d2a0d9e2408 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json @@ -2,7 +2,7 @@ { "id": "BGRS_MIGO_1_STORY1", "type": "talk_topic", - "dynamic_line": "Antes do Cataclisma eu era o cientista que encabeçava um laboratório militar no meu país. Foram dias difíceis…", + "dynamic_line": "Antes do Cataclisma eu era o cientista que encabeçava um laboratório militar no meu país. Foram dias difíceis…", "responses": [ { "text": "Where are you from?", "topic": "BGRS_MIGO_1_STORY2" }, { "text": "", "topic": "TALK_FRIEND" }, @@ -12,7 +12,7 @@ { "id": "BGRS_MIGO_1_STORY2", "type": "talk_topic", - "dynamic_line": "Nós estávamos pesquisando um remédio que curasse um virus altamente letal na época, mas os resultados dos testes mostravam que o remédio era mais letal do que o próprio virus. Então, ao invés de recolherem os remédios das prateleiras, eles nos forçaram a vendê-lo como sendo a cura para o vírus.", + "dynamic_line": "Nós estávamos pesquisando um remédio que curasse um virus altamente letal na época, mas os resultados dos testes mostravam que o remédio era mais letal do que o próprio virus. Então, ao invés de recolherem os remédios das prateleiras, eles nos forçaram a vendê-lo como sendo a cura para o vírus.", "responses": [ { "text": "Ummm?", "topic": "BGRS_MIGO_1_STORY3" }, { "text": "", "topic": "TALK_FRIEND" }, @@ -22,7 +22,7 @@ { "id": "BGRS_MIGO_1_STORY3", "type": "talk_topic", - "dynamic_line": "Bem… aqueles sem cérebro seguiram cegamente o líder. Quanto àqueles com algum cérebro… bom, acho que você está conversando com um deles agora", + "dynamic_line": "Bem… aqueles sem cérebro seguiram cegamente o líder. Quanto àqueles com algum cérebro… bom, acho que você está conversando com um deles agora", "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json index f4292c97e33e5..398889a983378 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json @@ -22,7 +22,7 @@ { "id": "BGRS_MIGO_2_STORY3", "type": "talk_topic", - "dynamic_line": "Some kind of hideos alien was standing over my neighbors disembowled corpse. It looked at me and said 'You're a great neighbor' then everything faded to black. I feel like everything in my body fits differently now.", + "dynamic_line": "Some kind of hideos alien was standing over my neighbors disembowled corpse. It looked at me and said 'You're a great neighbor' then everything faded to black. I feel like everything in my body fits differently now.", "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json index 18711e8407d39..895c14bae4553 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json @@ -22,7 +22,7 @@ { "id": "BGRS_MIGO_2_STORY3", "type": "talk_topic", - "dynamic_line": "One day they opened a portal trying to find an earthlike planet and suddenly portals were opening all over the lab and these fast and dangerous aliens overwhelmed the lab. The killed most of the staff and took the rest prisoner.", + "dynamic_line": "One day they opened a portal trying to find an earthlike planet and suddenly portals were opening all over the lab and these fast and dangerous aliens overwhelmed the lab. They killed most of the staff and took the rest prisoner.", "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] From 52a3f0813b83d8a7e2be550b9318181895743055 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 30 Jul 2020 16:07:49 -0500 Subject: [PATCH 68/75] Update BGRS_dreamer.json --- data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json b/data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json index 15fe198607e21..befce7e530d53 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json @@ -12,7 +12,7 @@ { "id": "BGRS_Dreamer_STORY2", "type": "talk_topic", - "dynamic_line": "Now I'm in some kind of Mary Shelley nightmare? I mean at least I have mobility.", + "dynamic_line": "Now I'm in some kind of Mary Shelley nightmare? I mean at least I have mobility.", "responses": [ { "text": "What does that have to do with anything?", "topic": "BGRS_Dreamer_STORY3" }, { "text": "", "topic": "TALK_FRIEND" }, From 8ef6d65619ecc784a663cb624add86b589fe9748 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 30 Jul 2020 17:02:24 -0500 Subject: [PATCH 69/75] Update cyrus_whately.json --- data/mods/Aftershock/npcs/cyrus_whately.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 1a85d1e31f148..48c9217a3b004 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -174,7 +174,7 @@ "goal": "MGOAL_FIND_ITEM", "difficulty": 6, "value": 0, - "item": "broken_broken_cyborg", + "item": "broken_cyborg_corpse", "count": 3, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_FRANKENSTEIN_5", From e57509a656c5ade45fdf9b96740c8d7df845efe3 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 30 Jul 2020 18:47:57 -0500 Subject: [PATCH 70/75] Update cyrus_whately.json --- data/mods/Aftershock/npcs/cyrus_whately.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 48c9217a3b004..60b71f2ba3438 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -169,25 +169,25 @@ { "id": "MISSION_FRANKENSTEIN_4", "type": "mission_definition", - "name": "Broken Cyborg Corpse", + "name": "Broken Cyborg", "description": "We need a strong base for our experiment.", "goal": "MGOAL_FIND_ITEM", "difficulty": 6, "value": 0, - "item": "broken_cyborg_corpse", + "item": "bot_broken_cyborg", "count": 3, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_FRANKENSTEIN_5", "dialogue": { - "describe": "I need the corpse of a broken cyborg. They are already brain dead so it won't be murder.", - "offer": "If you go to labs you should find some broken cyborg experiments. Bring me the corpse of one.", + "describe": "I need an unconscious broken cyborg. They are already brain dead so it won't be murder.", + "offer": "If you go to labs you should find some broken cyborg experiments. Bring an inactive one to me.", "accepted": "Are you ready for a little necromancy?", "rejected": "I'm telling you they're already brain dead.", "advice": "Look for surgical centers inside the labs.", "inquire": "So where are my fresh parts?", "success": "I've got something more potent for you this time.", "success_lie": "Lies and the lying liars who tell them.", - "failure": "You are keeping me from my experiments. Would you like to become one?" + "failure": "What kinds of body modifications do you have?" }, "end": { "effect": [ { "u_buy_item": "iv_mutagen_migo", "container": "bottle_glass", "count": 3 } ] } }, From db5806f8f49da2605a408c2c9147bb37f96edae0 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 30 Jul 2020 23:58:35 -0500 Subject: [PATCH 71/75] Update cyrus_whately.json --- data/mods/Aftershock/npcs/cyrus_whately.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 60b71f2ba3438..e42509a09d772 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -130,7 +130,7 @@ "followup": "MISSION_FRANKENSTEIN_3", "dialogue": { "describe": "I need one neurosynaptic interface matrix.", - "offer": "I want to test something and I need a viable version to reverse engineer.", + "offer": "I want to test something and I need a viable version to reverse engineer. Bring me one neurosynaptic interface matrix.", "accepted": "Without this all that's possible is 'Ye liveliest awfulness'.", "rejected": "You'd give up a new world just to bring back Foodplace!", "advice": "You're going to have to hunt this down.", @@ -155,7 +155,7 @@ "followup": "MISSION_FRANKENSTEIN_4", "dialogue": { "describe": "I need three alpha mutagen.", - "offer": "I know that one of the corporations were creating a so called Alpha mutagen. I need some to prepare the body.", + "offer": "I know that one of the corporations were creating a so called Alpha mutagen. I need three doses to prepare the body.", "accepted": "Better living through chemistry.", "rejected": "Would you take it yourself?", "advice": "If you can't make it yourself go hit up a lab. Be prepared for anything in there.", @@ -205,7 +205,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": "I need some brains, but brains that are still living. We've got our own brain blasters, but I won't risk them in experiments.", - "offer": "If this works I may be able to give some of these poor souls bodies again.", + "offer": "If this works I may be able to give some of these poor souls bodies again. Six should do.", "accepted": "I knew I could count on your generosity.", "rejected": "I would have given you the title of Whately family Igor.", "advice": "Brain blasters, that's what I call them. Some kind of automated weapon system the mi-go use.", From 1c91ab2146c3f016afe04327e0430c1ccfc214c5 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 31 Jul 2020 17:30:26 -0500 Subject: [PATCH 72/75] Update frankenstein_items.json --- data/mods/Aftershock/items/frankenstein_items.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/frankenstein_items.json b/data/mods/Aftershock/items/frankenstein_items.json index 1f684e20835ba..5829f3a037897 100644 --- a/data/mods/Aftershock/items/frankenstein_items.json +++ b/data/mods/Aftershock/items/frankenstein_items.json @@ -16,7 +16,7 @@ "type": "place_npc", "npc_class_id": "frankenstein", "summon_msg": "It's alive!", - "place_randomly": true, + "place_randomly": false, "moves": 50 } } From 61b8f20b5b5f8c679e053499274a7683f7702e04 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 31 Jul 2020 22:55:21 -0500 Subject: [PATCH 73/75] fixes and backgrounds --- .../BG_BR_tableofcontents_AFS.json | 4 +- .../npcs/Backgrounds/BG_traits_afs.json | 12 ++ .../npcs/Backgrounds/cyberninja.json | 31 +++++ .../Aftershock/npcs/Backgrounds/ganger_1.json | 31 +++++ .../Aftershock/npcs/Backgrounds/ganger_2.json | 31 +++++ .../Aftershock/npcs/Backgrounds/ganger_3.json | 31 +++++ .../Backgrounds/talk_cyborg_abomination.json | 130 ++++++++++++++++++ .../npcs/cyborg_npcs/npc_classes_cyborg.json | 2 - .../Aftershock/npcs/frankenstein_classes.json | 11 ++ 9 files changed, 279 insertions(+), 4 deletions(-) create mode 100644 data/mods/Aftershock/npcs/Backgrounds/cyberninja.json create mode 100644 data/mods/Aftershock/npcs/Backgrounds/ganger_1.json create mode 100644 data/mods/Aftershock/npcs/Backgrounds/ganger_2.json create mode 100644 data/mods/Aftershock/npcs/Backgrounds/ganger_3.json create mode 100644 data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json b/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json index 74b19bc3532c6..dbbcd754ead53 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json @@ -113,8 +113,8 @@ }, { "text": "", - "topic": "BGRS_Bonesinger_1_STORY1", - "condition": { "npc_has_trait": "BGRS_Bonesinger_1" }, + "topic": "BGRS_Bonesinger_STORY1", + "condition": { "npc_has_trait": "BGRS_Bonesinger" }, "switch": true }, { diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json index 3b92cd3478640..9dfb7d43d6634 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json @@ -226,5 +226,17 @@ "purifiable": false, "types": [ "BACKGROUND_SURVIVAL_STORY" ], "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "id": "BGSS_CYBERNINJA", + "name": { "str": "Whately Story" }, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "player_display": false, + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/cyberninja.json b/data/mods/Aftershock/npcs/Backgrounds/cyberninja.json new file mode 100644 index 0000000000000..cf3d6a08cdf2b --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/cyberninja.json @@ -0,0 +1,31 @@ +[ + { + "id": "BGSS_CYBERNINJA_STORY1", + "type": "talk_topic", + "dynamic_line": "As a corporate wetworks specialist I'm used to crazy situations. But this is like nothing I've ever experienced.", + "responses": [ + { "text": "What are you going to do now?", "topic": "BGSS_CYBERNINJA_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_CYBERNINJA_STORY2", + "type": "talk_topic", + "dynamic_line": "I'm gonna find somewhere that people are making a stand. And if I can agree with their plans I'll make my stand with them.", + "responses": [ + { "text": "Where is that?", "topic": "BGSS_CYBERNINJA_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_CYBERNINJA_STORY3", + "type": "talk_topic", + "dynamic_line": "Right now you are looking like the best leader I've met so far in this Cataclysm.", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Aftershock/npcs/Backgrounds/ganger_1.json b/data/mods/Aftershock/npcs/Backgrounds/ganger_1.json new file mode 100644 index 0000000000000..cba2502cc50a1 --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/ganger_1.json @@ -0,0 +1,31 @@ +[ + { + "id": "BGSS_GANGER_1_STORY1", + "type": "talk_topic", + "dynamic_line": "I was born at the bottom of the habitat. No silver spoon in my mouth.", + "responses": [ + { "text": "That must have been rough.", "topic": "BGSS_GANGER_1_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_GANGER_1_STORY2", + "type": "talk_topic", + "dynamic_line": "I saw my best friend die in front of me by the time I was eight.", + "responses": [ + { "text": "Where is that?", "topic": "BGSS_GANGER_1_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_GANGEER_1_STORY3", + "type": "talk_topic", + "dynamic_line": "I guess it prepared me for everyone dying yesterday.", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Aftershock/npcs/Backgrounds/ganger_2.json b/data/mods/Aftershock/npcs/Backgrounds/ganger_2.json new file mode 100644 index 0000000000000..8757cee11bd4c --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/ganger_2.json @@ -0,0 +1,31 @@ +[ + { + "id": "BGSS_GANGER_2_STORY1", + "type": "talk_topic", + "dynamic_line": "I've spent my life in the hive. When things started turning strange I snuck out of the city.", + "responses": [ + { "text": "You seem like you are out of your element.", "topic": "BGSS_GANGER_2_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_GANGER_2_STORY2", + "type": "talk_topic", + "dynamic_line": "I've never seen so many trees outside of a video. And there is so much wildlife.", + "responses": [ + { "text": "What will you do?", "topic": "BGSS_GANGER_2_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_GANGEER_2_STORY3", + "type": "talk_topic", + "dynamic_line": "I'm going to live my best life in a dead world.", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Aftershock/npcs/Backgrounds/ganger_3.json b/data/mods/Aftershock/npcs/Backgrounds/ganger_3.json new file mode 100644 index 0000000000000..37cf5536ed9e6 --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/ganger_3.json @@ -0,0 +1,31 @@ +[ + { + "id": "BGSS_GANGER_3_STORY1", + "type": "talk_topic", + "dynamic_line": "There's so much sky out here. It's horrible.", + "responses": [ + { "text": "You seem like you are out of your element.", "topic": "BGSS_GANGER_3_STORY2" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_GANGER_3_STORY2", + "type": "talk_topic", + "dynamic_line": "It might be worse than the dead rising.", + "responses": [ + { "text": "What will you do?", "topic": "BGSS_GANGER_3_STORY3" }, + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_GANGEER_3_STORY3", + "type": "talk_topic", + "dynamic_line": "I'm going to kill my way back into the city so I can get out from under this sky.", + "responses": [ + { "text": "", "topic": "TALK_FRIEND" }, + { "text": "", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json b/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json new file mode 100644 index 0000000000000..053d603888d57 --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json @@ -0,0 +1,130 @@ +[ + { + "id": "TALK_CYBORG_Abomination_1", + "type": "talk_topic", + "dynamic_line": { + "npc_has_var": "cyborg_abomination_has_talked", + "type": "dialogue", + "context": "cyborg_abomination", + "value": "yes", + "no": "I… can move again. I have a real body! Is this a body?", + "yes": "Hey again. *kzzz*" + }, + "speaker_effect": { "effect": { "npc_add_var": "cyborg_abomination_has_talked", "type": "dialogue", "context": "cyborg_abomination", "value": "yes" } }, + "responses": [ + { + "switch": true, + "condition": { "npc_has_var": "cyborg_abomination_has_talked", "type": "dialogue", "context": "cyborg_abomination", "value": "yes" }, + "text": "So you must have seen some weird stuff?", + "topic": "TALK_STRANGER_NEUTRAL" + }, + { + "switch": true, + "default": true, + "text": "I built this body and rescued you…", + "trial": { "type": "PERSUADE", "difficulty": 0 }, + "success": { "topic": "TALK_CYBORG_ABOMINATION_FRIENDLY", "opinion": { "trust": 1, "value": 1 } }, + "failure": { "topic": "TALK_CYBORG_ABOMINATION_WARY", "opinion": { "anger": 1, "fear": 1 } } + }, + { + "switch": true, + "default": true, + "text": "I can put you back in the pieces I found you in.", + "trial": { "type": "INTIMIDATE", "difficulty": 20, "mod": [ [ "AGGRESSION", -2 ], [ "BRAVERY", -2 ] ] }, + "success": { "topic": "TALK_CYBORG_ABOMINATION_FEARFUL", "opinion": { "trust": -4, "fear": 3, "value": -1, "anger": 4 } }, + "failure": { "topic": "TALK_CYBORG_ABOMINATION_BREAKDOWN", "opinion": { "trust": -4, "value": -5, "anger": 10 } } + }, + { + "switch": true, + "default": true, + "text": "No one deserves the hell you've been through. I hope you find peace.", + "topic": "TALK_DONE" + } + ] + }, + { + "id": "TALK_CYBORG_ABOMINATION_FRIENDLY", + "type": "talk_topic", + "dynamic_line": "*crackle* So why would you do this?", + "responses": [ + { + "text": "Come with me. We can help each other out.", + "trial": { "type": "PERSUADE", "difficulty": 0, "mod": [ [ "value", 2 ] ] }, + "success": { "topic": "TALK_AGREE_FOLLOW", "effect": "follow", "opinion": { "trust": 1, "value": 1 } }, + "failure": { "topic": "TALK_DENY_FOLLOW", "effect": "deny_follow", "opinion": { "trust": -1, "fear": 1 } } + }, + { "text": "We both go our separate ways. Enjoy your freedom.", "topic": "TALK_DONE" } + ] + }, + { + "id": "TALK_CYBORG_ABOMINATION_WARY", + "type": "talk_topic", + "dynamic_line": "…This is just another torture isn't it!", + "responses": [ + { + "text": "I went to a lot of trouble to provide you with a body.", + "trial": { "type": "PERSUADE", "difficulty": 5, "mod": [ [ "TRUST", 2 ], [ "VALUE", 2 ] ] }, + "success": { "topic": "TALK_CYBORG_ABOMINATION_FRIENDLY", "opinion": { "trust": 1, "value": 1 } }, + "failure": { "topic": "TALK_CYBORG_ABOMINATION_LEAVES" } + }, + { + "text": "For all you know, I did. I'm being nice for now. You'd better hope that it lasts.", + "trial": { "type": "INTIMIDATE", "difficulty": 20, "mod": [ [ "AGGRESSION", -2 ], [ "BRAVERY", -2 ] ] }, + "success": { "topic": "TALK_CYBORG_ABOMINATION_FEARFUL", "opinion": { "trust": -4, "fear": 3, "value": -1, "anger": 4 } }, + "failure": { "topic": "TALK_CYBORG_ABOMINATION_BREAKDOWN", "opinion": { "trust": -4, "value": -5, "anger": 10 } } + }, + { "text": "Forget it. Enjoy your freedom.", "topic": "TALK_DONE" } + ] + }, + { + "id": "TALK_CYBORG_ABOMINATION_FEARFUL", + "type": "talk_topic", + "dynamic_line": "Okay, okay, *sizzle* I'm sorry! Don't hurt me again! Anything to stay away from those fiends!", + "responses": [ + { + "text": "Follow me and do my bidding, then.", + "trial": { "type": "INTIMIDATE", "difficulty": 20, "mod": [ [ "FEAR", 8 ], [ "VALUE", 2 ], [ "TRUST", 2 ], [ "BRAVERY", -2 ] ] }, + "success": { "topic": "TALK_AGREE_FOLLOW", "effect": "follow", "opinion": { "trust": -4, "fear": 3, "value": -1, "anger": 4 } }, + "failure": { "topic": "TALK_CYBORG_ABOMINATION_BREAKDOWN", "opinion": { "trust": 4, "value": -5, "anger": 10 } } + }, + { + "text": "Get out of my sight.", + "topic": "TALK_DONE", + "effect": "flee", + "opinion": { "trust": -1, "fear": -2, "anger": -2 } + }, + { + "text": "No, *I'm* sorry, I didn't mean that. Go do what you want.", + "trial": { "type": "PERSUADE", "difficulty": 10 }, + "success": { "topic": "TALK_DONE", "opinion": { "trust": 1, "value": 1, "anger": -1 } }, + "failure": { "topic": "TALK_CYBORG_ABOMINATION_BREAKDOWN", "opinion": { "trust": 4, "value": -5, "anger": 10 } } + } + ] + }, + { + "id": "TALK_CYBORG_ABOMINATION_BREAKDOWN", + "type": "talk_topic", + "dynamic_line": "…You're one of those mocking monsters! I'm going to tear you apart!", + "responses": [ + { + "text": "Run while you still can!", + "trial": { "type": "INTIMIDATE", "difficulty": 20, "mod": [ [ "FEAR", 8 ], [ "VALUE", 2 ], [ "TRUST", 2 ], [ "BRAVERY", -2 ] ] }, + "success": { "topic": "TALK_DONE", "effect": "flee" }, + "failure": { "topic": "TALK_DONE", "effect": "hostile" } + }, + { "text": "Not if I kill you first!", "topic": "TALK_DONE", "effect": "hostile" }, + { + "text": "I'm sorry! I shouldn't have said that!", + "trial": { "type": "PERSUADE", "difficulty": 30 }, + "success": { "topic": "TALK_DONE", "opinion": { "trust": 1, "value": 1, "anger": -1 } }, + "failure": { "topic": "TALK_DONE", "effect": "hostile" } + } + ] + }, + { + "id": "TALK_CYBORG_ABOMINATION_LEAVES", + "type": "talk_topic", + "dynamic_line": "I don't know what's happening but I'm going back home.", + "responses": [ { "text": "Suit yourself.", "topic": "TALK_DONE" } ] + } +] diff --git a/data/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json b/data/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json index cc5b097fe2965..422bd5beb6e95 100644 --- a/data/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json +++ b/data/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json @@ -13,7 +13,6 @@ { "skill": "pistol", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "unarmed", "bonus": { "rng": [ 3, 6 ] } } ], - "common": true, "worn_override": "NC_GANGER_worn", "carry_override": "NC_GANGER_carried", "weapon_override": "NC_GANGER_wield", @@ -67,7 +66,6 @@ { "skill": "rifle", "bonus": { "rng": [ 1, 6 ] } }, { "skill": "smg", "bonus": { "rng": [ 1, 4 ] } } ], - "common": true, "worn_override": "NC_CYBERNINJA_worn", "carry_override": "NC_CYBERNINJA_carried", "weapon_override": "NC_CYBERNINJA_wield", diff --git a/data/mods/Aftershock/npcs/frankenstein_classes.json b/data/mods/Aftershock/npcs/frankenstein_classes.json index fe9156eeeb4ce..2108b34a7879f 100644 --- a/data/mods/Aftershock/npcs/frankenstein_classes.json +++ b/data/mods/Aftershock/npcs/frankenstein_classes.json @@ -46,5 +46,16 @@ { "id": "bio_power_storage", "chance": 100 }, { "id": "bio_torsionratchet", "chance": 100 } ] + }, + { + "type": "npc", + "id": "frankenstein", + "//": "An abomination you have revived.", + "name_suffix": "Cyborg Abomination", + "class": "frankenstein", + "attitude": 1, + "mission": 0, + "chat": "TALK_CYBORG_Abomination_1", + "faction": "no_faction" } ] From 06d2a920342e96c3ef88dd6090734d19e96022bb Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 1 Aug 2020 04:57:58 -0500 Subject: [PATCH 74/75] a linting we will go --- data/mods/Aftershock/npcs/Backgrounds/cyberninja.json | 5 +---- data/mods/Aftershock/npcs/Backgrounds/ganger_1.json | 5 +---- data/mods/Aftershock/npcs/Backgrounds/ganger_2.json | 5 +---- data/mods/Aftershock/npcs/Backgrounds/ganger_3.json | 5 +---- .../Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json | 4 +++- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/data/mods/Aftershock/npcs/Backgrounds/cyberninja.json b/data/mods/Aftershock/npcs/Backgrounds/cyberninja.json index cf3d6a08cdf2b..ad2c1f782f147 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/cyberninja.json +++ b/data/mods/Aftershock/npcs/Backgrounds/cyberninja.json @@ -23,9 +23,6 @@ "id": "BGSS_CYBERNINJA_STORY3", "type": "talk_topic", "dynamic_line": "Right now you are looking like the best leader I've met so far in this Cataclysm.", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/ganger_1.json b/data/mods/Aftershock/npcs/Backgrounds/ganger_1.json index cba2502cc50a1..230bcf1b8f732 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/ganger_1.json +++ b/data/mods/Aftershock/npcs/Backgrounds/ganger_1.json @@ -23,9 +23,6 @@ "id": "BGSS_GANGEER_1_STORY3", "type": "talk_topic", "dynamic_line": "I guess it prepared me for everyone dying yesterday.", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/ganger_2.json b/data/mods/Aftershock/npcs/Backgrounds/ganger_2.json index 8757cee11bd4c..3e05001255ecc 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/ganger_2.json +++ b/data/mods/Aftershock/npcs/Backgrounds/ganger_2.json @@ -23,9 +23,6 @@ "id": "BGSS_GANGEER_2_STORY3", "type": "talk_topic", "dynamic_line": "I'm going to live my best life in a dead world.", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/ganger_3.json b/data/mods/Aftershock/npcs/Backgrounds/ganger_3.json index 37cf5536ed9e6..e6b158c598efe 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/ganger_3.json +++ b/data/mods/Aftershock/npcs/Backgrounds/ganger_3.json @@ -23,9 +23,6 @@ "id": "BGSS_GANGEER_3_STORY3", "type": "talk_topic", "dynamic_line": "I'm going to kill my way back into the city so I can get out from under this sky.", - "responses": [ - { "text": "", "topic": "TALK_FRIEND" }, - { "text": "", "topic": "TALK_DONE" } - ] + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] } ] diff --git a/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json b/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json index 053d603888d57..c9f6b8c4ed9a0 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json +++ b/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json @@ -10,7 +10,9 @@ "no": "I… can move again. I have a real body! Is this a body?", "yes": "Hey again. *kzzz*" }, - "speaker_effect": { "effect": { "npc_add_var": "cyborg_abomination_has_talked", "type": "dialogue", "context": "cyborg_abomination", "value": "yes" } }, + "speaker_effect": { + "effect": { "npc_add_var": "cyborg_abomination_has_talked", "type": "dialogue", "context": "cyborg_abomination", "value": "yes" } + }, "responses": [ { "switch": true, From f9d76cbc3c1af96ca330557b1ea0b580343d9a60 Mon Sep 17 00:00:00 2001 From: ZhilkinSerg Date: Mon, 3 Aug 2020 09:53:10 +0300 Subject: [PATCH 75/75] Apply suggestions from code review --- .../Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json b/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json index c9f6b8c4ed9a0..03ab9420ce416 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json +++ b/data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json @@ -106,7 +106,7 @@ { "id": "TALK_CYBORG_ABOMINATION_BREAKDOWN", "type": "talk_topic", - "dynamic_line": "…You're one of those mocking monsters! I'm going to tear you apart!", + "dynamic_line": "…You're one of those mocking monsters! I'm going to tear you apart!", "responses": [ { "text": "Run while you still can!",