From 2f00d3778fe161132fc0ad311c347ef43f0ac99c Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Mon, 29 Apr 2024 14:31:39 -0400 Subject: [PATCH 01/41] Start of the PR --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index f236a0a51a86f..2fc90d0251ff5 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -89,6 +89,10 @@ "topic": "TALK_ISHERWOOD_LUKE_BOOKS1", "condition": { "not": { "u_has_var": "u_saved_barry_isherwood", "value": "yes" } } }, + { + "text": "Chris and I have a little project for you that we've cooked up, if you're interested.", + "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb" + }, { "text": "How are those books doing for you?", "topic": "TALK_ISHERWOOD_LUKE_BOOKS2", From 899cbd2f8892e415e65f6523f5b51c16f1e28e5d Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Sat, 4 May 2024 13:31:41 -0400 Subject: [PATCH 02/41] Allow riot gear to be purchased from Hub01 for Barry's rescue mission --- .../robofac_intercom/robofac_intercom.json | 36 ++++++++++ .../robofac_intercom_missions.json | 54 ++++++++++++++ .../robofac_intercom_trades.json | 71 +++++++++++++++++++ 3 files changed, 161 insertions(+) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json index 9d50fe413820a..40d2c9216e83a 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json @@ -393,6 +393,42 @@ }, "topic": "TALK_ROBOFAC_INTERCOM_BUY_LOCAL_MAP" }, + { + "text": "[can i buy riot armor? I need 5 whole sets]", + "condition": { + "and": [ + { "u_has_faction_trust": 5 }, + { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1_GET_GEAR" }, + { "math": [ "isherwood_gear_status", "<", "1" ] }, + { + "not": { "npc_has_var": "npc_bought_riot_gear", "type": "dialogue", "context": "intercom", "value": "yes" } + } + ] + }, + "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR" + }, + { + "text": "[i come to pay back riot armor]", + "condition": { + "and": [ + { "npc_has_var": "u_pay_back_on_cash", "type": "dialogue", "context": "intercom", "value": "yes" }, + { "u_has_items": { "item": "RobofacCoin", "count": 8 } }, + { "u_has_mission": "MISSION_HUB01_PAY_BACK_RIOT_GEAR" } + ] + }, + "topic": "TALK_ROBOFAC_INTERCOM_PAY_BACK_RIOT_GEAR" + }, + { + "text": "[i come to pay back riot armor]", + "condition": { + "and": [ + { "npc_has_var": "u_pay_back_on_specimens", "type": "dialogue", "context": "intercom", "value": "yes" }, + { "math": [ "isherwood_barry_rescued", "==", "1" ] }, + { "u_has_mission": "MISSION_HUB01_PAY_BACK_RIOT_GEAR" } + ] + }, + "topic": "TALK_ROBOFAC_INTERCOM_PAY_BACK_RIOT_GEAR_SPECIMENS" + }, { "text": "I have to go.", "topic": "TALK_DONE" } ] }, diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json index 92bbc80c915cc..fcfef35c9c64b 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json @@ -1064,5 +1064,59 @@ "type": "talk_topic", "dynamic_line": "Uh… Yeah, sorry. I'll, um… I'll make a note to try and see if we can't get any better information for your future contracts.", "responses": [ { "text": "Good.", "topic": "TALK_DONE" } ] + }, + { + "id": "MISSION_HUB01_PAY_BACK_RIOT_GEAR", + "type": "mission_definition", + "name": { "str": "Pay Back The Riot Gear to Hub 01" }, + "goal": "MGOAL_NULL", + "difficulty": 1, + "value": 0, + "fail": { "effect": { "math": [ "faction_trust('robofac')", "-=", "20" ] } }, + "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, + "deadline_low": 20, + "deadline_high": 20, + "//": "Dialogue for this mission is handled externally.", + "dialogue": { + "describe": ".", + "offer": ".", + "accepted": ".", + "rejected": ".", + "advice": ".", + "inquire": ".", + "success": ".", + "success_lie": ".", + "failure": "." + } + }, + { + "id": "TALK_ROBOFAC_INTERCOM_PAY_BACK_RIOT_GEAR", + "type": "talk_topic", + "dynamic_line": "[thanks bro]", + "responses": [ + { + "text": "[you're welcome.]", + "effect": [ + { "u_sell_item": "RobofacCoin", "count": 8 }, + { "finish_mission": "MISSION_HUB01_PAY_BACK_RIOT_GEAR", "success": true } + ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, + { "text": "I'll have to give it some thought.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } + ] + }, + { + "id": "TALK_ROBOFAC_INTERCOM_PAY_BACK_RIOT_GEAR_SPECIMENS", + "type": "talk_topic", + "dynamic_line": "[thanks bro this will be very interesting wheres the tower?]", + "responses": [ + { + "text": "[tell them where scout tower is]", + "effect": [ { "finish_mission": "MISSION_HUB01_PAY_BACK_RIOT_GEAR", "success": true } ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, + { "text": "I'll have to give it some thought.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } + ] } ] diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 9e83b12897ac3..19d87ab76f873 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -167,5 +167,76 @@ ], "sentinel": "nre_trade" } + }, + { + "id": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR", + "type": "talk_topic", + "dynamic_line": "[we got some bro that'll be $400]", + "responses": [ + { + "text": "[8 HGC] Deal!", + "condition": { "u_has_items": { "item": "RobofacCoin", "count": 8 } }, + "effect": [ + { "u_sell_item": "RobofacCoin", "count": 8 }, + { "u_spawn_item": "armor_riot", "count": 5 }, + { "u_spawn_item": "helmet_riot", "count": 5 }, + { "u_spawn_item": "armor_riot_arm", "count": 5 }, + { "u_spawn_item": "armor_riot_leg", "count": 5 }, + { "npc_add_var": "npc_bought_riot_gear", "type": "dialogue", "context": "intercom", "value": "yes" } + ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, + { + "text": "[ayo I aint got that cash can I buy on credit?]", + "condition": { "not": { "u_has_items": { "item": "RobofacCoin", "count": 8 } } }, + "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_NEGOTIATE" + }, + { "text": "I'll have to give it some thought.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } + ] + }, + { + "id": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_NEGOTIATE", + "type": "talk_topic", + "dynamic_line": "[what have you got to offer?]", + "responses": [ + { + "text": "[i can get you money and stuff]", + "effect": [ { "npc_add_var": "u_pay_back_on_cash", "type": "dialogue", "context": "intercom", "value": "yes" } ], + "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_ON_CREDIT_ACCEPT" + }, + { + "text": "[i can get you alien corpses and stuff plus a scout tower]", + "effect": [ { "npc_add_var": "u_pay_back_on_specimens", "type": "dialogue", "context": "intercom", "value": "yes" } ], + "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_ON_CREDIT_ACCEPT" + }, + { "text": "I'll have to give it some thought.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } + ] + }, + { + "id": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_ON_CREDIT_ACCEPT", + "type": "talk_topic", + "dynamic_line": { + "npc_has_var": "u_pay_back_on_specimens", + "type": "dialogue", + "context": "intercom", + "value": "yes", + "yes": "[yeah that'd be interesting tell us when its clear. you got 20 days to pay.]", + "no": "[okie dokie you got 20 days to pay]" + }, + "responses": [ + { + "text": "[thanks bro.]", + "effect": [ + { "u_spawn_item": "armor_riot", "count": 5 }, + { "u_spawn_item": "helmet_riot", "count": 5 }, + { "u_spawn_item": "armor_riot_arm", "count": 5 }, + { "u_spawn_item": "armor_riot_leg", "count": 5 }, + { "assign_mission": "MISSION_HUB01_PAY_BACK_RIOT_GEAR" }, + { "npc_add_var": "npc_bought_riot_gear", "type": "dialogue", "context": "intercom", "value": "yes" } + ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, + { "text": "I'll have to give it some thought.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } + ] } ] From ec6151035a0f95ddd60ca6be16794c6b50987533 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Sat, 4 May 2024 14:27:20 -0400 Subject: [PATCH 03/41] Allow the Exodii to trade the player riot gear --- .../npcs/exodii/exodii_merchant_missions.json | 25 +++++ .../npcs/exodii/exodii_merchant_talk.json | 94 +++++++++++++++++++ 2 files changed, 119 insertions(+) diff --git a/data/json/npcs/exodii/exodii_merchant_missions.json b/data/json/npcs/exodii/exodii_merchant_missions.json index 1e9ecff74237b..99d243ffac3ed 100644 --- a/data/json/npcs/exodii/exodii_merchant_missions.json +++ b/data/json/npcs/exodii/exodii_merchant_missions.json @@ -509,5 +509,30 @@ "topic": "TALK_DONE" } ] + }, + { + "id": "MISSION_EXODII_PAY_BACK_RIOT_GEAR", + "type": "mission_definition", + "name": { "str": "Pay Back The Riot Gear to Rubik" }, + "goal": "MGOAL_NULL", + "difficulty": 1, + "value": 0, + "fail": { "effect": { "math": [ "faction_trust('exodii')", "-=", "20" ] } }, + "origins": [ "ORIGIN_SECONDARY" ], + "has_generic_rewards": false, + "deadline_low": 20, + "deadline_high": 20, + "//": "Dialogue for this mission is handled externally.", + "dialogue": { + "describe": ".", + "offer": ".", + "accepted": ".", + "rejected": ".", + "advice": ".", + "inquire": ".", + "success": ".", + "success_lie": ".", + "failure": "." + } } ] diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index 00333fd06bd9e..2716aa6d0bc8c 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -82,6 +82,25 @@ ] }, "topic": "TALK_EXODII_MERCHANT_Talk_Intro2a" + }, + { + "text": "[can i buy riot armor? I need 5 whole sets]", + "condition": { + "and": [ + { "u_has_faction_trust": 2 }, + { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1_GET_GEAR" }, + { "math": [ "isherwood_gear_status", "<", "1" ] }, + { + "not": { "npc_has_var": "npc_bought_riot_gear", "type": "dialogue", "context": "exodii", "value": "yes" } + } + ] + }, + "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear" + }, + { + "text": "[i'm here to pay my riot gear off.]", + "condition": { "u_has_mission": "MISSION_EXODII_PAY_BACK_RIOT_GEAR" }, + "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_Payback" } ] }, @@ -1297,5 +1316,80 @@ { "text": "I've got some stuff I'd like to install.", "topic": "TALK_DONE", "effect": "bionic_install" }, { "text": "Would you be able to take out one of my implants?", "topic": "TALK_DONE", "effect": "bionic_remove" } ] + }, + { + "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear", + "type": "talk_topic", + "dynamic_line": "[yeah i think we got some that'll be $400]", + "responses": [ + { + "text": "[deal]", + "effect": [ + { + "u_spend_cash": 40000, + "true_eocs": { + "id": "exodii_buy_riot_gear_success", + "effect": [ + { "u_spawn_item": "armor_riot", "count": 5 }, + { "u_spawn_item": "helmet_riot", "count": 5 }, + { "u_spawn_item": "armor_riot_arm", "count": 5 }, + { "u_spawn_item": "armor_riot_leg", "count": 5 }, + { "npc_add_var": "npc_bought_riot_gear", "type": "dialogue", "context": "exodii", "value": "yes" } + ] + } + } + ], + "topic": "TALK_EXODII_MERCHANT_Talk" + }, + { + "text": "[ayo I aint got that cash can I buy on credit?]", + "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_On_Credit" + }, + { "text": "Can we talk about something else?", "topic": "TALK_EXODII_MERCHANT_Talk" }, + { "text": "I've gotta go. See you later, Rubik.", "topic": "TALK_DONE" } + ] + }, + { + "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_On_Credit", + "type": "talk_topic", + "dynamic_line": "[okie dokie you got 20 days to pay me back.]", + "responses": [ + { + "text": "[thanks bro.]", + "effect": [ + { "u_spawn_item": "armor_riot", "count": 5 }, + { "u_spawn_item": "helmet_riot", "count": 5 }, + { "u_spawn_item": "armor_riot_arm", "count": 5 }, + { "u_spawn_item": "armor_riot_leg", "count": 5 }, + { "assign_mission": "MISSION_EXODII_PAY_BACK_RIOT_GEAR" }, + { "npc_add_var": "npc_bought_riot_gear", "type": "dialogue", "context": "exodii", "value": "yes" } + ], + "topic": "TALK_EXODII_MERCHANT_Talk" + }, + { "text": "Can we talk about something else?", "topic": "TALK_EXODII_MERCHANT_Talk" }, + { "text": "I've gotta go. See you later, Rubik.", "topic": "TALK_DONE" } + ] + }, + { + "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_Payback", + "type": "talk_topic", + "dynamic_line": "[okay bro show me what u got.]", + "responses": [ + { + "text": "[here it is]", + "effect": [ + { + "u_spend_cash": 40000, + "true_eocs": { + "id": "exodii_pay_back_riot_gear_success", + "effect": [ { "finish_mission": "MISSION_EXODII_PAY_BACK_RIOT_GEAR", "success": true } ] + } + } + ], + "topic": "TALK_EXODII_MERCHANT_Talk" + }, + { "text": "Can we talk about something else?", "topic": "TALK_EXODII_MERCHANT_Talk" }, + { "text": "I've gotta go. See you later, Rubik.", "topic": "TALK_DONE" } + ] } ] From 4db2baa8ecd3ee51e6cac24e65561ffd1ecc8548 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Mon, 6 May 2024 08:45:55 -0400 Subject: [PATCH 04/41] Add Luke Isherwood's truck bomb mission --- data/json/itemgroups/tools.json | 6 + data/json/items/fake.json | 22 +++ .../isherwood_farm/NPC_Luke_Isherwood.json | 153 ++++++++++++++++++ data/json/vehicles/custom_vehicles.json | 114 +++++++++++++ 4 files changed, 295 insertions(+) diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index e9a07f6efa24a..0bcbcf726c740 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -1065,5 +1065,11 @@ "//": "This group was created automatically and may contain errors.", "container-item": "bottle_plastic_small", "entries": [ { "item": "pur_tablets", "count": [ 75, 100 ] } ] + }, + { + "type": "item_group", + "subtype": "collection", + "id": "dynamite_shipment", + "items": [ { "item": "dynamite", "count": [ 5, 9 ] } ] } ] diff --git a/data/json/items/fake.json b/data/json/items/fake.json index b770cc0d96476..62a00d675d021 100644 --- a/data/json/items/fake.json +++ b/data/json/items/fake.json @@ -413,5 +413,27 @@ "name": { "str": "concrete mixer" }, "copy-from": "fake_appliance_tool", "charges_per_use": 20 + }, + { + "id": "fake_dynamite_50lbs", + "//": "This is used exclusively in the rescue mission for Barry to blow a hole in the scout tower.", + "type": "TOOL", + "category": "weapons", + "name": { "str": "fake 50lbs dynamite car bomb" }, + "description": "Several sticks of explosives, bundled together with a fuse attached. Use this item to light the fuse. You will, of course, need a lighter or matches in your inventory to do this. Shortly after lighting the fuse, this item will explode, so get away!", + "weight": "22680 g", + "volume": "15020 ml", + "price": 6000, + "price_postapoc": 1000, + "to_hit": -3, + "material": [ { "type": "tnt", "portion": 95 }, { "type": "paper", "portion": 5 } ], + "symbol": "*", + "color": "red", + "explode_in_fire": true, + "explosion": { "power": 18779 }, + "countdown_action": { "type": "explosion", "explosion": { "power": 18779, "max_noise": 0 } }, + "countdown_interval": "1 seconds", + "flags": [ "BOMB" ], + "melee_damage": { "bash": 4 } } ] diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 2fc90d0251ff5..1391391b04175 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -91,8 +91,50 @@ }, { "text": "Chris and I have a little project for you that we've cooked up, if you're interested.", + "//": "This should require that you first suggest the idea to Chris during mission planning.", + "condition": { + "and": [ + { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1" }, + { + "and": [ + { "not": { "u_has_mission": "MISSION_LUKE_RETRIEVE_TRUCK" } }, + { "math": [ "isherwood_luke_truck_status", "<", "1" ] } + ] + } + ] + }, "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb" }, + { + "text": "[okie we got truck now what]", + "condition": { + "and": [ + { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1" }, + { + "and": [ + { "not": { "u_has_mission": "MISSION_LUKE_RETRIEVE_TRUCK_EXPLOSIVES" } }, + { "math": [ "isherwood_luke_truck_coming", "<", "1" ] }, + { "math": [ "isherwood_luke_truck_status", "==", "1" ] } + ] + } + ] + }, + "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan_Part_2" + }, + { + "text": "[heres the dynamite]", + "condition": { + "and": [ + { "u_has_mission": "MISSION_LUKE_RETRIEVE_TRUCK_EXPLOSIVES" }, + { "u_has_items": { "item": "dynamite", "count": 20 } } + ] + }, + "effect": [ + { "u_sell_item": "dynamite", "count": 20 }, + { "finish_mission": "MISSION_LUKE_RETRIEVE_TRUCK_EXPLOSIVES", "success": true } + ], + "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan_Done" + }, { "text": "How are those books doing for you?", "topic": "TALK_ISHERWOOD_LUKE_BOOKS2", @@ -340,6 +382,56 @@ { "text": "I'd better get going.", "topic": "TALK_DONE" } ] }, + { + "type": "talk_topic", + "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb", + "dynamic_line": "[whats that?]", + "responses": [ + { "text": "[explain plan about truck bomb]", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy" }, + { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy", + "dynamic_line": "[that sounds crazy are u sure its a good idea]", + "responses": [ + { "text": "[trust me bro i know what im doing]", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan" }, + { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan", + "dynamic_line": "[okie dokie i got an idea 4 how we can do this. theres 2 bandits who got a shitmobile, good enough to blow up i need u to go kill em. i'll pick it up later]", + "responses": [ + { "text": "[heck yeah bro]", "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK" }, "topic": "TALK_DONE" }, + { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, + { "text": "[nah bro]", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan_Part_2", + "dynamic_line": "[okie now we need explosives. i know mines have a lot of dynamite so that should be good. go get it and i'll rig that up to a kitchen timer and we'll have a bomb on wheels. i need 50lbs]", + "responses": [ + { + "text": "[heck yeah bro]", + "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK_EXPLOSIVES" }, + "topic": "TALK_DONE" + }, + { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, + { "text": "[nah bro]", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan_Done", + "dynamic_line": "[sweet now I'll make the bomb thanks bro.]", + "responses": [ { "text": "[heck yeah]", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" } ] + }, { "id": "MISSION_ISHERWOOD_LUKE_1", "type": "mission_definition", @@ -391,5 +483,66 @@ "success_lie": "I don't see a book…?", "failure": "At least you escaped with your life…" } + }, + { + "id": "MISSION_LUKE_RETRIEVE_TRUCK", + "type": "mission_definition", + "name": { "str": "Retrieve the Truck for Luke Isherwood" }, + "description": "Kill the two bandits for Luke Isherwood to get their truck.", + "goal": "MGOAL_ASSASSINATE", + "difficulty": 5, + "value": 0, + "start": { + "assign_mission_target": { "om_terrain": "trailhead_shack_z0", "om_special": "trailhead_shack", "reveal_radius": 1, "search_range": 100 }, + "update_mapgen": { + "place_npcs": [ { "class": "bandit", "x": 5, "y": 8, "target": true }, { "class": "bandit", "x": 5, "y": 9, "target": true } ], + "place_vehicles": [ + { "vehicle": "pickup", "chance": 100, "fuel": 100, "rotation": 0, "faction": "hells_raiders", "x": [ 5 ], "y": [ 8 ] } + ] + } + }, + "end": { "effect": [ { "queue_eocs": "EOC_LUKE_RETRIEVE_TRUCK_END", "time_in_future": 100 } ] }, + "origins": [ "ORIGIN_SECONDARY" ], + "//": "Dialogue for this mission is handled externally.", + "dialogue": { + "describe": ".", + "offer": ".", + "accepted": ".", + "rejected": ".", + "advice": ".", + "inquire": ".", + "success": ".", + "success_lie": ".", + "failure": "." + } + }, + { + "id": "MISSION_LUKE_RETRIEVE_TRUCK_EXPLOSIVES", + "type": "mission_definition", + "name": { "str": "Retrieve Some Dynamite for Luke" }, + "description": "Get 50 pounds of dynamite for Luke Isherwood to make a bomb. There's a known shipment at a mine in the region.", + "goal": "MGOAL_NULL", + "difficulty": 5, + "value": 0, + "start": { + "assign_mission_target": { "om_terrain": "mine_entrance_loading_zone", "om_special": "Generic mine", "reveal_radius": 1, "search_range": 200 }, + "update_mapgen": { + "place_vehicles": [ { "vehicle": "truck_trailer_explosives", "chance": 100, "rotation": 270, "x": [ 7 ], "y": [ 7 ] } ] + } + }, + "end": { "effect": [ { "math": [ "isherwood_luke_truck_coming", "++" ] } ] }, + "origins": [ "ORIGIN_SECONDARY" ], + "//2": "Dialogue for this mission is handled externally.", + "dialogue": { + "describe": ".", + "offer": ".", + "accepted": ".", + "rejected": ".", + "advice": ".", + "inquire": ".", + "success": ".", + "success_lie": ".", + "failure": "." + } } ] diff --git a/data/json/vehicles/custom_vehicles.json b/data/json/vehicles/custom_vehicles.json index fcd762a8307fd..e90a428d5921e 100644 --- a/data/json/vehicles/custom_vehicles.json +++ b/data/json/vehicles/custom_vehicles.json @@ -149,5 +149,119 @@ { "x": -2, "y": 0, "chance": 10, "items": [ "308", "308" ] }, { "x": -2, "y": 0, "chance": 5, "items": [ "308", "308" ] } ] + }, + { + "id": "truck_trailer_explosives", + "//": "This is for use in part 2 of Luke Isherwoods' truck explosive mission.", + "type": "vehicle", + "name": "Truck Trailer", + "blueprint": [ + [ "--OO------" ], + [ "||OO||||||" ], + [ "+|++|=|++|" ], + [ "||OO||||||" ], + [ "--OO------" ] + ], + "parts": [ + { "x": 0, "y": 0, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 0, "y": -1, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 0, "y": -2, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 0, "y": -3, "parts": [ "hdframe#vertical_left", "board#vertical_left", "roof" ] }, + { "x": 0, "y": 1, "parts": [ "hdframe#vertical_right", "board#vertical_right", "roof" ] }, + { "x": 1, "y": -1, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 1, "y": -2, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 1, "y": -3, "parts": [ "hdframe#vertical_left", "board#vertical_left", "roof" ] }, + { "x": 1, "y": 0, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 1, "y": 1, "parts": [ "hdframe#vertical_right", "board#vertical_right", "roof" ] }, + { "x": 2, "y": -1, "parts": [ "hdframe#horizontal", "cargo_space", "roof" ] }, + { "x": 2, "y": -2, "parts": [ "hdframe#horizontal", "cargo_space", "roof" ] }, + { "x": 2, "y": -3, "parts": [ "hdframe#vertical_T_left", "board#vertical_left", "roof" ] }, + { "x": 2, "y": 0, "parts": [ "hdframe#horizontal", "cargo_space", "roof" ] }, + { "x": 2, "y": 1, "parts": [ "hdframe#vertical_T_right", "board#vertical_right", "roof" ] }, + { "x": 3, "y": -1, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 3, "y": -2, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 3, "y": -3, "parts": [ "hdframe#vertical_left", "board#vertical_left", "roof" ] }, + { "x": 3, "y": 0, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 3, "y": 1, "parts": [ "hdframe#vertical_right", "board#vertical_right", "roof" ] }, + { "x": 4, "y": -1, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 4, "y": -2, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 4, "y": -3, "parts": [ "hdframe#vertical_left", "board#vertical_left", "roof" ] }, + { "x": 4, "y": 0, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": 4, "y": 1, "parts": [ "hdframe#vertical_right", "board#vertical_right", "roof" ] }, + { "x": 5, "y": -1, "parts": [ "hdframe#horizontal_front", "board#horizontal_front" ] }, + { "x": 5, "y": -1, "parts": [ "roof" ] }, + { "x": 5, "y": -2, "parts": [ "hdframe#horizontal_front", "board#horizontal_front" ] }, + { "x": 5, "y": -2, "parts": [ "roof" ] }, + { "x": 5, "y": -3, "parts": [ "hdframe#nw", "board#nw", "roof" ] }, + { "x": 5, "y": 0, "parts": [ "hdframe#horizontal_front", "board#horizontal_front" ] }, + { "x": 5, "y": 0, "parts": [ "roof" ] }, + { "x": 5, "y": 1, "parts": [ "hdframe#ne", "board#ne", "roof" ] }, + { "x": -1, "y": -1, "parts": [ "hdframe#horizontal", "cargo_space", "roof" ] }, + { "x": -1, "y": -2, "parts": [ "hdframe#horizontal", "cargo_space", "roof" ] }, + { "x": -1, "y": -3, "parts": [ "hdframe#vertical_T_left", "board#vertical_left", "roof" ] }, + { "x": -1, "y": -3, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -1, "y": -2, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -1, "y": 0, "parts": [ "hdframe#horizontal", "cargo_space", "roof" ] }, + { "x": -1, "y": 0, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -1, "y": 1, "parts": [ "hdframe#vertical_T_right", "board#vertical_right", "roof" ] }, + { "x": -1, "y": 1, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -2, "y": -1, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": -2, "y": -2, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": -2, "y": -3, "parts": [ "hdframe#vertical_left", "board#vertical_left", "roof" ] }, + { "x": -2, "y": -2, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -2, "y": -3, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -2, "y": 0, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": -2, "y": 0, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -2, "y": 1, "parts": [ "hdframe#vertical_right", "board#vertical_right", "roof" ] }, + { "x": -2, "y": 1, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -3, "y": -1, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": -3, "y": -2, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": -3, "y": -3, "parts": [ "hdframe#vertical_left", "board#vertical_left", "roof" ] }, + { "x": -3, "y": 0, "parts": [ "hdframe#vertical", "cargo_space", "roof" ] }, + { "x": -3, "y": 1, "parts": [ "hdframe#vertical_right", "board#vertical_right", "roof" ] }, + { "x": -4, "y": -1, "parts": [ "hdframe#horizontal_rear", "door_shutter", "roof" ] }, + { "x": -4, "y": -2, "parts": [ "hdframe#horizontal_rear", "door_shutter", "roof" ] }, + { "x": -4, "y": -3, "parts": [ "hdframe#sw", "board#sw", "roof" ] }, + { "x": -4, "y": 0, "parts": [ "hdframe#horizontal_rear", "door_shutter", "roof" ] }, + { "x": -4, "y": 1, "parts": [ "hdframe#se", "board#se", "roof" ] } + ], + "items": [ + { "x": 4, "y": -2, "chance": 2, "items": [ "bubblewrap" ] }, + { "x": 4, "y": -2, "chance": 100, "item_groups": [ "dynamite_shipment" ] }, + { "x": 4, "y": -1, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": 4, "y": -1, "chance": 100, "item_groups": [ "dynamite_shipment" ] }, + { "x": 4, "y": 0, "chance": 5, "items": [ "rope_30" ] }, + { "x": 4, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": 3, "y": -2, "chance": 4, "items": [ "bubblewrap" ] }, + { "x": 3, "y": -1, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": 2, "y": -2, "chance": 100, "item_groups": [ "dynamite_shipment" ] }, + { "x": 3, "y": 0, "chance": 2, "items": [ "rope_30" ] }, + { "x": 3, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": 2, "y": -2, "chance": 2, "items": [ "bubblewrap" ] }, + { "x": 2, "y": -2, "chance": 100, "item_groups": [ "dynamite_shipment" ] }, + { "x": 2, "y": -1, "chance": 1, "items": [ "bubblewrap" ] }, + { "x": 2, "y": 0, "chance": 4, "items": [ "bubblewrap" ] }, + { "x": 2, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": 1, "y": -2, "chance": 2, "items": [ "bubblewrap" ] }, + { "x": 1, "y": -1, "chance": 5, "items": [ "bubblewrap" ] }, + { "x": 1, "y": 0, "chance": 3, "items": [ "rope_30" ] }, + { "x": 1, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": 0, "y": -2, "chance": 1, "items": [ "bubblewrap" ] }, + { "x": 0, "y": -1, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": 0, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": 0, "y": 0, "chance": 2, "items": [ "bubblewrap" ] }, + { "x": -1, "y": -2, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": -1, "y": -1, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": -1, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": -1, "y": 0, "chance": 1, "items": [ "bubblewrap" ] }, + { "x": -2, "y": -2, "chance": 3, "items": [ "rope_6" ] }, + { "x": -2, "y": -1, "chance": 1, "items": [ "bubblewrap" ] }, + { "x": -2, "y": 0, "chance": 2, "items": [ "bubblewrap" ] }, + { "x": -2, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": -3, "y": -2, "chance": 1, "items": [ "bubblewrap" ] }, + { "x": -3, "y": -1, "chance": 3, "items": [ "bubblewrap" ] }, + { "x": -3, "y": 0, "chance": 2, "items": [ "bubblewrap" ] }, + { "x": -3, "y": 0, "chance": 5, "items": [ "bubblewrap" ] } + ] } ] From 8f8ae3acb57568894fd8409156ddfc1258b8fcfe Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Mon, 13 May 2024 22:25:02 -0400 Subject: [PATCH 05/41] Spread out dynamite spawns throughout the trailer --- data/json/itemgroups/tools.json | 2 +- data/json/vehicles/custom_vehicles.json | 38 +++++++++++++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 0bcbcf726c740..db8ba09dd933d 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -1070,6 +1070,6 @@ "type": "item_group", "subtype": "collection", "id": "dynamite_shipment", - "items": [ { "item": "dynamite", "count": [ 5, 9 ] } ] + "items": [ { "item": "dynamite", "count": [ 2, 3 ] } ] } ] diff --git a/data/json/vehicles/custom_vehicles.json b/data/json/vehicles/custom_vehicles.json index e90a428d5921e..68709cd864733 100644 --- a/data/json/vehicles/custom_vehicles.json +++ b/data/json/vehicles/custom_vehicles.json @@ -227,18 +227,14 @@ ], "items": [ { "x": 4, "y": -2, "chance": 2, "items": [ "bubblewrap" ] }, - { "x": 4, "y": -2, "chance": 100, "item_groups": [ "dynamite_shipment" ] }, { "x": 4, "y": -1, "chance": 3, "items": [ "bubblewrap" ] }, - { "x": 4, "y": -1, "chance": 100, "item_groups": [ "dynamite_shipment" ] }, { "x": 4, "y": 0, "chance": 5, "items": [ "rope_30" ] }, { "x": 4, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, { "x": 3, "y": -2, "chance": 4, "items": [ "bubblewrap" ] }, { "x": 3, "y": -1, "chance": 3, "items": [ "bubblewrap" ] }, - { "x": 2, "y": -2, "chance": 100, "item_groups": [ "dynamite_shipment" ] }, { "x": 3, "y": 0, "chance": 2, "items": [ "rope_30" ] }, { "x": 3, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, { "x": 2, "y": -2, "chance": 2, "items": [ "bubblewrap" ] }, - { "x": 2, "y": -2, "chance": 100, "item_groups": [ "dynamite_shipment" ] }, { "x": 2, "y": -1, "chance": 1, "items": [ "bubblewrap" ] }, { "x": 2, "y": 0, "chance": 4, "items": [ "bubblewrap" ] }, { "x": 2, "y": 0, "chance": 3, "items": [ "bubblewrap" ] }, @@ -261,7 +257,39 @@ { "x": -3, "y": -2, "chance": 1, "items": [ "bubblewrap" ] }, { "x": -3, "y": -1, "chance": 3, "items": [ "bubblewrap" ] }, { "x": -3, "y": 0, "chance": 2, "items": [ "bubblewrap" ] }, - { "x": -3, "y": 0, "chance": 5, "items": [ "bubblewrap" ] } + { "x": -3, "y": 0, "chance": 5, "items": [ "bubblewrap" ] }, + { "x": 4, "y": -2, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 4, "y": -1, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 4, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 4, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 3, "y": -2, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 3, "y": -1, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 3, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 3, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 2, "y": -2, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 2, "y": -1, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 2, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 2, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 1, "y": -2, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 1, "y": -1, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 1, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 1, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 0, "y": -2, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 0, "y": -1, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 0, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": 0, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -1, "y": -2, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -1, "y": -1, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -1, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -1, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -2, "y": -2, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -2, "y": -1, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -2, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -2, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -3, "y": -2, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -3, "y": -1, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -3, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] }, + { "x": -3, "y": 0, "chance": 70, "item_groups": [ "dynamite_shipment" ] } ] } ] From 0d581021fdc6d01a6b7f1c84b76f4d14f19e897c Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Sun, 19 May 2024 23:30:43 -0400 Subject: [PATCH 06/41] Add some dialogue trying Luke to Chris's plan. --- .../npc_eocs/isherwood_barry_rescue_eocs.json | 24 +++++++++ .../isherwood_farm/NPC_Chris_Isherwood.json | 50 +++++++++++++++++++ .../isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 3 files changed, 75 insertions(+), 1 deletion(-) diff --git a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json index 6a053775fa1c9..5e6c5385e5013 100644 --- a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json +++ b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json @@ -379,5 +379,29 @@ "else": { "set_string_var": "blames_you", "target_var": { "global_val": "isherwood_barry_death_opinion" } } } ] + }, + { + "type": "effect_on_condition", + "eoc_type": "OM_MOVE", + "id": "EOC_HAVE_U_BEEN_TO_MIGOS", + "condition": { + "or": [ + { "u_near_om_location": "mi-go_portal", "range": 3 }, + { "u_near_om_location": "mi-go_camp1", "range": 3 }, + { "u_near_om_location": "mi-go_camp2", "range": 3 }, + { "u_near_om_location": "mi-go_camp2-1", "range": 3 }, + { "u_near_om_location": "mi-go_camp2-2", "range": 3 }, + { "u_near_om_location": "mi-go_scout_tower_1", "range": 3 }, + { "u_near_om_location": "mi-go_scout_tower_2", "range": 3 }, + { "u_near_om_location": "mi-go_scout_tower_3", "range": 3 }, + { "u_near_om_location": "mi-go_scout_tower_4", "range": 3 }, + { "u_near_om_location": "barry_mi-go_scout_tower_1", "range": 3 }, + { "u_near_om_location": "barry_mi-go_scout_tower_2", "range": 3 }, + { "u_near_om_location": "barry_mi-go_scout_tower_3", "range": 3 }, + { "u_near_om_location": "barry_mi-go_scout_tower_4", "range": 3 } + ] + }, + "deactivate_condition": { "u_has_var": "u_been_to_migos", "value": "yes" }, + "effect": [ { "u_add_var": "u_been_to_migos", "value": "yes" } ] } ] diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json index 70caf55cb8a62..c5ced04437fe1 100644 --- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json @@ -484,6 +484,16 @@ }, "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Wall" }, + { + "text": "We're going to need some way to breach the tower itself, possibly some form of explosives. Do you know anyone who could help us with that?", + "condition": { + "and": [ + { "u_has_var": "u_been_to_migos", "value": "yes" }, + { "not": { "u_has_var": "chris_planned_for_bomb", "value": "yes" } } + ] + }, + "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb" + }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } ] @@ -530,6 +540,16 @@ }, "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Wall" }, + { + "text": "We're going to need some way to breach the tower itself, possibly some form of explosives. Do you know anyone who could help us with that?", + "condition": { + "and": [ + { "u_has_var": "u_been_to_migos", "value": "yes" }, + { "not": { "u_has_var": "chris_planned_for_bomb", "value": "yes" } } + ] + }, + "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb" + }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } ] @@ -648,6 +668,36 @@ { "text": "I'll let you get on that, I've got my own preparations to take care of.", "topic": "TALK_DONE" } ] }, + { + "type": "talk_topic", + "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb", + "dynamic_line": "* looks thoughtful for a moment, then becomes a bit nervous. \"Wait, wont't that run the risk of injuring Barry, or possibly collapsing the tower? I don't want him hurt during this, or anyone else if this bomb sends back a bunch of shrapnel. What do you think about it?\"", + "responses": [ + { + "text": "Don't worry, I know what I'm doing. I've taken a look at these sorts of towers before, and I know that the structure itself is pretty solid. If we tune it right, then the tower won't fall over.", + "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb_Luke" + }, + { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb_Luke", + "dynamic_line": "Well, I trust you on this. If you need a good hand with chemistry, go see Luke about it. He knows a lot, you'd be suprised. \" He pauses for a momnet, and thinks as if trying to recall something. \" Luke should be over in the old outbuilding near the dairy, that's on the other end of the property.", + "responses": [ + { + "text": "That sounds great, I'll go talk to him about it. Let's talk about something else first, though.", + "effect": { "u_add_var": "chris_planned_for_bomb", "value": "yes" }, + "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" + }, + { + "text": "That sounds great, I'll go talk to him about it.", + "effect": { "u_add_var": "chris_planned_for_bomb", "value": "yes" }, + "topic": "TALK_DONE" + } + ] + }, { "type": "talk_topic", "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_CHRIS_TRY_AGAIN", diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 6fca64bae1ad8..bae37850a9ac6 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -101,10 +101,10 @@ }, { "text": "Chris and I have a little project for you that we've cooked up, if you're interested.", - "//": "This should require that you first suggest the idea to Chris during mission planning.", "condition": { "and": [ { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1" }, + { "u_has_var": "chris_planned_for_bomb", "value": "yes" }, { "and": [ { "not": { "u_has_mission": "MISSION_LUKE_RETRIEVE_TRUCK" } }, From b0e926d51833334f889b20456c1bbf0cae7ef50b Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Tue, 21 May 2024 22:04:45 -0400 Subject: [PATCH 07/41] Spellchecking and bugfixes --- data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json index c5ced04437fe1..3b68b3b218552 100644 --- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json @@ -671,7 +671,7 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb", - "dynamic_line": "* looks thoughtful for a moment, then becomes a bit nervous. \"Wait, wont't that run the risk of injuring Barry, or possibly collapsing the tower? I don't want him hurt during this, or anyone else if this bomb sends back a bunch of shrapnel. What do you think about it?\"", + "dynamic_line": "* looks thoughtful for a moment, then becomes a bit nervous. \"Wait, won't that run the risk of injuring Barry, or possibly collapsing the tower? I don't want him hurt during this, or anyone else if this bomb sends back a bunch of shrapnel. What do you think about it?\"", "responses": [ { "text": "Don't worry, I know what I'm doing. I've taken a look at these sorts of towers before, and I know that the structure itself is pretty solid. If we tune it right, then the tower won't fall over.", @@ -684,7 +684,7 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb_Luke", - "dynamic_line": "Well, I trust you on this. If you need a good hand with chemistry, go see Luke about it. He knows a lot, you'd be suprised. \" He pauses for a momnet, and thinks as if trying to recall something. \" Luke should be over in the old outbuilding near the dairy, that's on the other end of the property.", + "dynamic_line": "Well, I trust you on this. If you need a good hand with chemistry, go see Luke about it. He knows a lot, you'd be surprised. \" He pauses for a moment, and thinks as if trying to recall something. \"Luke should be over in the old outbuilding near the dairy, that's on the other end of the property.", "responses": [ { "text": "That sounds great, I'll go talk to him about it. Let's talk about something else first, though.", From 55bf39d3b92ed70b733616e8020de28b1da30487 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Sun, 2 Jun 2024 00:07:54 -0400 Subject: [PATCH 08/41] Update exodii_merchant_talk.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/exodii/exodii_merchant_talk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index d65af3df246d3..e759f6e34b0b9 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -1352,7 +1352,7 @@ { "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_On_Credit", "type": "talk_topic", - "dynamic_line": "[okie dokie you got 20 days to pay me back.]", + "dynamic_line": "If'n you survive, We can give you a fortnight and six odd days to pay us'n back.", "responses": [ { "text": "[thanks bro.]", From f0f11e3e97643232d296cc72ae59066e902ef910 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:46:55 -0400 Subject: [PATCH 09/41] Update exodii_merchant_talk.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/exodii/exodii_merchant_talk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index e759f6e34b0b9..e115035f7ecc6 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -1320,7 +1320,7 @@ { "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear", "type": "talk_topic", - "dynamic_line": "[yeah i think we got some that'll be $400]", + "dynamic_line": "Mayhaps this gear will do you better than it did the scuffers wot trained with it. [$400]", "responses": [ { "text": "[deal]", From 37308a70950537027b6eb95dc5458a8f339213a9 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:47:18 -0400 Subject: [PATCH 10/41] Update exodii_merchant_talk.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/exodii/exodii_merchant_talk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index e115035f7ecc6..b02231aac7ffd 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -84,7 +84,7 @@ "topic": "TALK_EXODII_MERCHANT_Talk_Intro2a" }, { - "text": "[can i buy riot armor? I need 5 whole sets]", + "text": "Anychance I can buy some riot armor? I need five complete sets.", "condition": { "and": [ { "u_has_faction_trust": 2 }, From 5cb2bb40b87429fcf932f13d532bec29fdc2f5c4 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:47:39 -0400 Subject: [PATCH 11/41] Update exodii_merchant_talk.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/exodii/exodii_merchant_talk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index b02231aac7ffd..cae0fb64a2c0b 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -1342,7 +1342,7 @@ "topic": "TALK_EXODII_MERCHANT_Talk" }, { - "text": "[ayo I aint got that cash can I buy on credit?]", + "text": "Any chance I can buy gear this on layaway?", "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_On_Credit" }, { "text": "Can we talk about something else?", "topic": "TALK_EXODII_MERCHANT_Talk" }, From 358e27b6845288daf7c1b9ca619b442f99e7d86c Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:47:46 -0400 Subject: [PATCH 12/41] Update exodii_merchant_talk.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/exodii/exodii_merchant_talk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index cae0fb64a2c0b..b551699aa1232 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -1373,7 +1373,7 @@ { "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_Payback", "type": "talk_topic", - "dynamic_line": "[okay bro show me what u got.]", + "dynamic_line": "Thanks Rubik, I'll be back with your payment soon.", "responses": [ { "text": "[here it is]", From 9359fe634dff61f642d8ff6197772074fcd64c0e Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:47:53 -0400 Subject: [PATCH 13/41] Update exodii_merchant_talk.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/exodii/exodii_merchant_talk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index b551699aa1232..4063f5dfc3d1d 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -1376,7 +1376,7 @@ "dynamic_line": "Thanks Rubik, I'll be back with your payment soon.", "responses": [ { - "text": "[here it is]", + "text": "Right and done, don't let whatever you are going after turn you into a pork loin well done. I's expectin, you back.", "effect": [ { "u_spend_cash": 40000, From 381c819812112ae14ea63a2a3a4814145af07ded Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:48:00 -0400 Subject: [PATCH 14/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index bae37850a9ac6..b325c559949b9 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -116,7 +116,7 @@ "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb" }, { - "text": "[okie we got truck now what]", + "text": "We've got the truck, what's next?", "condition": { "and": [ { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1" }, From 8c31eb4d094c97057dd69e1b1a7aa4fd916280a1 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:48:10 -0400 Subject: [PATCH 15/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index b325c559949b9..61e9e8d005b5e 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -132,7 +132,7 @@ "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan_Part_2" }, { - "text": "[heres the dynamite]", + "text": "I've got the dynamite you requested, I can't wait to see how this works out.", "condition": { "and": [ { "u_has_mission": "MISSION_LUKE_RETRIEVE_TRUCK_EXPLOSIVES" }, From 0eba81c0b8d3ccf48814b67d57c27c482d0739cb Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:48:18 -0400 Subject: [PATCH 16/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 61e9e8d005b5e..012143a5a8bbc 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -395,7 +395,7 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb", - "dynamic_line": "[whats that?]", + "dynamic_line": "How does this all come together?", "responses": [ { "text": "[explain plan about truck bomb]", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy" }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, From 7d1a588a41c473d1a6838e9edf6108aa8f927a26 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:48:33 -0400 Subject: [PATCH 17/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 012143a5a8bbc..4ca7ca061dc8a 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -397,7 +397,7 @@ "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb", "dynamic_line": "How does this all come together?", "responses": [ - { "text": "[explain plan about truck bomb]", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy" }, + { "text": "Well, we are going to turn this truck into a bomb that'll give us a big enough opening in the tower to let out some of the heat and gas. But small enough that it won't kill Luke unless it's right next to him.", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy" }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } ] From fe1cb58edf9744c2f73e142e8d3db4f6f90de173 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:48:43 -0400 Subject: [PATCH 18/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 4ca7ca061dc8a..cd8e859149662 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -405,7 +405,7 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy", - "dynamic_line": "[that sounds crazy are u sure its a good idea]", + "dynamic_line": "Are you serious? This is your brother we are risking here!", "responses": [ { "text": "[trust me bro i know what im doing]", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan" }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, From d3cc4fa7c3205f0b9ed9a6b5ee4eea8c1be57360 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:48:54 -0400 Subject: [PATCH 19/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index cd8e859149662..2c0eaa7c58f42 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -407,7 +407,7 @@ "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy", "dynamic_line": "Are you serious? This is your brother we are risking here!", "responses": [ - { "text": "[trust me bro i know what im doing]", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan" }, + { "text": "Exactly, and I wouldn't do anything to risk him unnecessarily.", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan" }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } ] From ee44634db1b3454fa80dd79a138f74a9dd775ccc Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:49:13 -0400 Subject: [PATCH 20/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 2c0eaa7c58f42..4534ec47a8369 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -415,7 +415,7 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan", - "dynamic_line": "[okie dokie i got an idea 4 how we can do this. theres 2 bandits who got a shitmobile, good enough to blow up i need u to go kill em. i'll pick it up later]", + "dynamic_line": "OK so I have an idea on how we can breach that tower. We need a truck and some dynamite. I've heard about some bandits in a truck robbing people nearby. If you can take care of the bandits I'll pick up the truck later", "responses": [ { "text": "[heck yeah bro]", "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK" }, "topic": "TALK_DONE" }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, From 5332102b59fefebe26e750efe25e982da673b682 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:49:20 -0400 Subject: [PATCH 21/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 4534ec47a8369..ecf315bae42cd 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -417,7 +417,7 @@ "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan", "dynamic_line": "OK so I have an idea on how we can breach that tower. We need a truck and some dynamite. I've heard about some bandits in a truck robbing people nearby. If you can take care of the bandits I'll pick up the truck later", "responses": [ - { "text": "[heck yeah bro]", "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK" }, "topic": "TALK_DONE" }, + { "text": "I think I can manage two bandits.", "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK" }, "topic": "TALK_DONE" }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, { "text": "[nah bro]", "topic": "TALK_DONE" } ] From f3aad1e012e6db9876787abc68ba63abf1a8fb06 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:49:30 -0400 Subject: [PATCH 22/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index ecf315bae42cd..31412d868b656 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -419,7 +419,7 @@ "responses": [ { "text": "I think I can manage two bandits.", "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK" }, "topic": "TALK_DONE" }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, - { "text": "[nah bro]", "topic": "TALK_DONE" } + { "text": "Surely we can think of a better way in.", "topic": "TALK_DONE" } ] }, { From 6a672f7bee921f4292d50d1960fe340dab3219fe Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:49:48 -0400 Subject: [PATCH 23/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 31412d868b656..b4c19d232f8c0 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -425,7 +425,7 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan_Part_2", - "dynamic_line": "[okie now we need explosives. i know mines have a lot of dynamite so that should be good. go get it and i'll rig that up to a kitchen timer and we'll have a bomb on wheels. i need 50lbs]", + "dynamic_line": "So now that we've got the truck we need the boom. See if you can find some dynamite at the old mines? Once we got the dynamite I'll rig that up to a kitchen timer and we'll have a bomb on wheels. I'll need 50lbs to light that truck up like the 4th of July!", "responses": [ { "text": "[heck yeah bro]", From a36785c1393c026bd95c03a7a34be60de23d1b29 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:49:55 -0400 Subject: [PATCH 24/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index b4c19d232f8c0..ec9b0bd687d40 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -428,7 +428,7 @@ "dynamic_line": "So now that we've got the truck we need the boom. See if you can find some dynamite at the old mines? Once we got the dynamite I'll rig that up to a kitchen timer and we'll have a bomb on wheels. I'll need 50lbs to light that truck up like the 4th of July!", "responses": [ { - "text": "[heck yeah bro]", + "text": "This is gonna rad as heck as long as it works.", "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK_EXPLOSIVES" }, "topic": "TALK_DONE" }, From fef0c4d879927921b28c8fb48073ed8d79d4f400 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:50:03 -0400 Subject: [PATCH 25/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index ec9b0bd687d40..3800764d720ae 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -433,7 +433,7 @@ "topic": "TALK_DONE" }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, - { "text": "[nah bro]", "topic": "TALK_DONE" } + { "text": "Not doing it.", "topic": "TALK_DONE" } ] }, { From 13523d17334e72e477f23169429280513cad224e Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:50:12 -0400 Subject: [PATCH 26/41] Update NPC_Luke_Isherwood.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 3800764d720ae..c4277b6664366 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -439,7 +439,7 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan_Done", - "dynamic_line": "[sweet now I'll make the bomb thanks bro.]", + "dynamic_line": "I've got everything I need to make this breaching truck for us. Thanks!", "responses": [ { "text": "[heck yeah]", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" } ] }, { From 9932a8e0b5dd869dfce1fe25059f0f44b3472be4 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:50:23 -0400 Subject: [PATCH 27/41] Update robofac_intercom.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/robofac/robofac_intercom/robofac_intercom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json index 40d2c9216e83a..78b2e1c8442c8 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json @@ -394,7 +394,7 @@ "topic": "TALK_ROBOFAC_INTERCOM_BUY_LOCAL_MAP" }, { - "text": "[can i buy riot armor? I need 5 whole sets]", + "text": "I need some gear to outfit my crew, I think five sets of police riot armor would do the trick.", "condition": { "and": [ { "u_has_faction_trust": 5 }, From c99bba37e8ef638810134875522dc1bf07d14ccd Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:50:32 -0400 Subject: [PATCH 28/41] Update robofac_intercom_missions.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../robofac/robofac_intercom/robofac_intercom_missions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json index 3fda3f4e58d5f..3f534dabf8de0 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json @@ -1093,7 +1093,7 @@ { "id": "TALK_ROBOFAC_INTERCOM_PAY_BACK_RIOT_GEAR", "type": "talk_topic", - "dynamic_line": "[thanks bro]", + "dynamic_line": "I appreciate the credit. I've got your payment now.", "responses": [ { "text": "[you're welcome.]", From 636c2eff830083581fb3fa4c57df8771343f44ad Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:50:42 -0400 Subject: [PATCH 29/41] Update robofac_intercom_missions.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../robofac/robofac_intercom/robofac_intercom_missions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json index 3f534dabf8de0..7beec9d2528e1 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json @@ -1096,7 +1096,7 @@ "dynamic_line": "I appreciate the credit. I've got your payment now.", "responses": [ { - "text": "[you're welcome.]", + "text": "Good thing you came back with the money. Your mission work out?", "effect": [ { "u_sell_item": "RobofacCoin", "count": 8 }, { "finish_mission": "MISSION_HUB01_PAY_BACK_RIOT_GEAR", "success": true } From 3460af5e2ec858536986a8c958d0e12529690612 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:50:48 -0400 Subject: [PATCH 30/41] Update robofac_intercom.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/robofac/robofac_intercom/robofac_intercom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json index 78b2e1c8442c8..5d3895b06be03 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json @@ -408,7 +408,7 @@ "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR" }, { - "text": "[i come to pay back riot armor]", + "text": "I'm here and I've got the goods.", "condition": { "and": [ { "npc_has_var": "u_pay_back_on_cash", "type": "dialogue", "context": "intercom", "value": "yes" }, From b19a7fab298f0a03a7465a1032058abf67a92279 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:50:59 -0400 Subject: [PATCH 31/41] Update robofac_intercom.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/npcs/robofac/robofac_intercom/robofac_intercom.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json index 5d3895b06be03..5c94f7e2a0a1d 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json @@ -419,7 +419,7 @@ "topic": "TALK_ROBOFAC_INTERCOM_PAY_BACK_RIOT_GEAR" }, { - "text": "[i come to pay back riot armor]", + "text": "Cost of the armor plus everything left in the tower.", "condition": { "and": [ { "npc_has_var": "u_pay_back_on_specimens", "type": "dialogue", "context": "intercom", "value": "yes" }, From 1c143932374d79f1c3829d74ea17e6e08be2e183 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:51:13 -0400 Subject: [PATCH 32/41] Update robofac_intercom_trades.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../npcs/robofac/robofac_intercom/robofac_intercom_trades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 19d87ab76f873..9541678262942 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -171,7 +171,7 @@ { "id": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR", "type": "talk_topic", - "dynamic_line": "[we got some bro that'll be $400]", + "dynamic_line": "There is an infinite supply of the stuff but I guess from us you can get it clean and undamaged. That'll be $400.", "responses": [ { "text": "[8 HGC] Deal!", From bf19d7877bd7839aaf4c6d0a6de27a4cbf62c70f Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:51:22 -0400 Subject: [PATCH 33/41] Update robofac_intercom_trades.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../npcs/robofac/robofac_intercom/robofac_intercom_trades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 9541678262942..031c5ce852c1f 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -187,7 +187,7 @@ "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, { - "text": "[ayo I aint got that cash can I buy on credit?]", + "text": "I'm a little tight on funds right now. Can we work out a buy now pay later deal?", "condition": { "not": { "u_has_items": { "item": "RobofacCoin", "count": 8 } } }, "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_NEGOTIATE" }, From 9f5c8879d935ce257fcd3fb9e2ea2e6b3e59c2f4 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:51:31 -0400 Subject: [PATCH 34/41] Update robofac_intercom_trades.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../npcs/robofac/robofac_intercom/robofac_intercom_trades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 031c5ce852c1f..d3039db9bddc0 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -197,7 +197,7 @@ { "id": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_NEGOTIATE", "type": "talk_topic", - "dynamic_line": "[what have you got to offer?]", + "dynamic_line": "So we'd need a sweeter deal than just the money if we did this.", "responses": [ { "text": "[i can get you money and stuff]", From 6103033ebb8445b041220647e34ae9bf6f7c481e Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:51:39 -0400 Subject: [PATCH 35/41] Update robofac_intercom_trades.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../npcs/robofac/robofac_intercom/robofac_intercom_trades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index d3039db9bddc0..d932bef4e7417 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -200,7 +200,7 @@ "dynamic_line": "So we'd need a sweeter deal than just the money if we did this.", "responses": [ { - "text": "[i can get you money and stuff]", + "text": "I can pay you what I owe in cash and looted gear.", "effect": [ { "npc_add_var": "u_pay_back_on_cash", "type": "dialogue", "context": "intercom", "value": "yes" } ], "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_ON_CREDIT_ACCEPT" }, From 36b24f9512147af2c7bfa2099c0ebea93c5e6edb Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:51:50 -0400 Subject: [PATCH 36/41] Update robofac_intercom_trades.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../npcs/robofac/robofac_intercom/robofac_intercom_trades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index d932bef4e7417..c4a0f85497602 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -205,7 +205,7 @@ "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_ON_CREDIT_ACCEPT" }, { - "text": "[i can get you alien corpses and stuff plus a scout tower]", + "text": "If you give me this deal you can have all the alien corpses, their stuff and their tower", "effect": [ { "npc_add_var": "u_pay_back_on_specimens", "type": "dialogue", "context": "intercom", "value": "yes" } ], "topic": "TALK_ROBOFAC_INTERCOM_BUY_RIOT_GEAR_ON_CREDIT_ACCEPT" }, From fa0356e92a65bf356928b7496c931148cc4b3b53 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:52:03 -0400 Subject: [PATCH 37/41] Update robofac_intercom_trades.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../npcs/robofac/robofac_intercom/robofac_intercom_trades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index c4a0f85497602..656a5eaa78200 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -220,7 +220,7 @@ "type": "dialogue", "context": "intercom", "value": "yes", - "yes": "[yeah that'd be interesting tell us when its clear. you got 20 days to pay.]", + "yes": "Well it might be more interesting than straight gear. Tell us when it's available for inspection. We expect you back in 20 days or less.", "no": "[okie dokie you got 20 days to pay]" }, "responses": [ From 97fe96caa1e60f272200ea9216f6c76d4104216e Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:52:16 -0400 Subject: [PATCH 38/41] Update robofac_intercom_trades.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../npcs/robofac/robofac_intercom/robofac_intercom_trades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 656a5eaa78200..1fe5f9201211e 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -221,7 +221,7 @@ "context": "intercom", "value": "yes", "yes": "Well it might be more interesting than straight gear. Tell us when it's available for inspection. We expect you back in 20 days or less.", - "no": "[okie dokie you got 20 days to pay]" + "no": "20 days then for payment." }, "responses": [ { From ce68d5ea4739dec04e53461e028e3c59c796ddf4 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:52:23 -0400 Subject: [PATCH 39/41] Update robofac_intercom_trades.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../npcs/robofac/robofac_intercom/robofac_intercom_trades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 1fe5f9201211e..5ff2eb1233593 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -225,7 +225,7 @@ }, "responses": [ { - "text": "[thanks bro.]", + "text": "Much obliged.", "effect": [ { "u_spawn_item": "armor_riot", "count": 5 }, { "u_spawn_item": "helmet_riot", "count": 5 }, From f5942e31ad14c975665f10cd7f8a124ee7ef34bd Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:45:04 -0500 Subject: [PATCH 40/41] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../npcs/isherwood_farm/NPC_Luke_Isherwood.json | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index c4277b6664366..e599a01b7bc32 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -397,7 +397,10 @@ "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb", "dynamic_line": "How does this all come together?", "responses": [ - { "text": "Well, we are going to turn this truck into a bomb that'll give us a big enough opening in the tower to let out some of the heat and gas. But small enough that it won't kill Luke unless it's right next to him.", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy" }, + { + "text": "Well, we are going to turn this truck into a bomb that'll give us a big enough opening in the tower to let out some of the heat and gas. But small enough that it won't kill Luke unless it's right next to him.", + "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy" + }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } ] @@ -407,7 +410,10 @@ "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Is_Crazy", "dynamic_line": "Are you serious? This is your brother we are risking here!", "responses": [ - { "text": "Exactly, and I wouldn't do anything to risk him unnecessarily.", "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan" }, + { + "text": "Exactly, and I wouldn't do anything to risk him unnecessarily.", + "topic": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan" + }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } ] @@ -417,7 +423,11 @@ "id": "TALK_ISHERWOOD_LUKE_Truck_Bomb_Plan", "dynamic_line": "OK so I have an idea on how we can breach that tower. We need a truck and some dynamite. I've heard about some bandits in a truck robbing people nearby. If you can take care of the bandits I'll pick up the truck later", "responses": [ - { "text": "I think I can manage two bandits.", "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK" }, "topic": "TALK_DONE" }, + { + "text": "I think I can manage two bandits.", + "effect": { "assign_mission": "MISSION_LUKE_RETRIEVE_TRUCK" }, + "topic": "TALK_DONE" + }, { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_LUKE_TOPICS" }, { "text": "Surely we can think of a better way in.", "topic": "TALK_DONE" } ] From 99832278b9104f3afc88d9907810de4ac5cf0dad Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Thu, 11 Jul 2024 19:45:40 -0400 Subject: [PATCH 41/41] Update dialogue and organize the spellchecker dictionary, add more words. --- .../npcs/exodii/exodii_merchant_talk.json | 14 +- tools/spell_checker/dictionary.txt | 217 +++++++++--------- 2 files changed, 118 insertions(+), 113 deletions(-) diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index 4063f5dfc3d1d..8914ba426d391 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -84,7 +84,7 @@ "topic": "TALK_EXODII_MERCHANT_Talk_Intro2a" }, { - "text": "Anychance I can buy some riot armor? I need five complete sets.", + "text": "Any chance I can buy some riot armor? I need five complete sets.", "condition": { "and": [ { "u_has_faction_trust": 2 }, @@ -98,7 +98,7 @@ "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear" }, { - "text": "[i'm here to pay my riot gear off.]", + "text": "Remember that riot gear you gave me?", "condition": { "u_has_mission": "MISSION_EXODII_PAY_BACK_RIOT_GEAR" }, "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_Payback" } @@ -1323,7 +1323,7 @@ "dynamic_line": "Mayhaps this gear will do you better than it did the scuffers wot trained with it. [$400]", "responses": [ { - "text": "[deal]", + "text": "I'll buy it.", "effect": [ { "u_spend_cash": 40000, @@ -1352,10 +1352,10 @@ { "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_On_Credit", "type": "talk_topic", - "dynamic_line": "If'n you survive, We can give you a fortnight and six odd days to pay us'n back.", + "dynamic_line": "If'n you survive, we can give you a fortnight and six odd days to pay us'n back.", "responses": [ { - "text": "[thanks bro.]", + "text": "Thanks Rubik, I'll be back with your payment soon.", "effect": [ { "u_spawn_item": "armor_riot", "count": 5 }, { "u_spawn_item": "helmet_riot", "count": 5 }, @@ -1373,10 +1373,10 @@ { "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_Payback", "type": "talk_topic", - "dynamic_line": "Thanks Rubik, I'll be back with your payment soon.", + "dynamic_line": "Right and done, don't let whatever you are going after turn you into a pork loin well done. I's expectin' you back.", "responses": [ { - "text": "Right and done, don't let whatever you are going after turn you into a pork loin well done. I's expectin, you back.", + "text": "Here's the money to pay off that debt.", "effect": [ { "u_spend_cash": 40000, diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index c53a9ae506f8f..52058cb011c1f 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -7,8 +7,8 @@ Abanaderly Abbie Abby ABC -Abdu'l Abdul +Abdu'l Abelard Abenaki Aberystwyth @@ -90,6 +90,8 @@ airsoft AIs Aitareya AK +Âkankheyya +Âkârânga aketon aketons Akhnai @@ -162,6 +164,7 @@ Amor amt Amur Amy +Anáhuac ananassa Anatolia anchisaurus @@ -226,11 +229,11 @@ Antwerp Anugitâ Anush anzu -Anáhuac Ao AoE AP Apastamba +Âpastamba APC apeirohedra apeirohedron @@ -259,6 +262,7 @@ Arabic Arachis Aralia Aramaic +Âranyaka arapaimas Arapaimidae arbalist @@ -334,6 +338,8 @@ asswagon asswipe astrolaspis astrolaspises +Aśvaghosa +Āsvalāyana Atchisson ATF ATGM @@ -423,8 +429,6 @@ Aztec Aztecs Aztlan Aztlani -Aśvaghosa -b'Av Baal Babadook Babar @@ -447,15 +451,15 @@ badass bagh Baghdad Bagȣnizabȣnak +Bahá Baha'i +Bahá'í Baha'is -Baha'u'llah Bahamanain +Baha'u'llah +Bahá'u'lláh Bahman Bahrainian -Bahá -Bahá'u'lláh -Bahá'í Baikonur Bakelite baklavas @@ -519,11 +523,13 @@ bassline Bastiat batcave batlike +Bátoriová Battaglia Battlehammer batts Baudhâyana Baudrillard +b'Av Bava Baxter BB @@ -704,6 +710,8 @@ blutwurst blutwursts BMG Bo +Bó +bō Boann boardable Boba @@ -724,6 +732,7 @@ Boeing Boer bogart boing +Bōjutsu bokken bolases bolded @@ -778,6 +787,7 @@ Bradley Brady Brahman Brahmana +Brâhmana brainburner brainburners brainer @@ -831,14 +841,13 @@ Brookline Brooklyn Broomhandle Bruce +Brügger Bruneian Bruno brushland bruv Bryan Bryant -Brâhmana -Brügger BT bubbe bubblicious @@ -887,11 +896,6 @@ buzzcut BX bzzt bzzz -Bátoriová -Bó -bō -Bōjutsu -c'mon Cabanillas Cabron cadabra @@ -1016,6 +1020,7 @@ cepa ceratopsian ceratosaurus Cerberus +Česká Cessna cesti cetera @@ -1153,6 +1158,7 @@ Clymer cm CMES CMMG +c'mon CO Co co @@ -1163,8 +1169,8 @@ coffeetable coffeetree Cohasset coilgun -coilpistol coilguns +coilpistol coincidently coipo coipos @@ -1254,6 +1260,7 @@ CRC creeped Creighton creped +crêpes crewmember criniere CRISPR @@ -1291,12 +1298,13 @@ cryosleep cryptid cryptids crypto -crêpes CSA CT cthonic Cthulhu ctrl +Cú +Cúailnge Cuban Cucina cuck @@ -1340,12 +1348,11 @@ Cyrus CZ Czechoslovak Czechoslovakia -Cú -Cúailnge DA da Dabrowski Dacian +Dâdistân Daewoo dagnabbit Dahila @@ -1534,6 +1541,7 @@ DMR DMRs DMSO DNA +dō Dobbs Dodecagram dodgeball @@ -1546,9 +1554,10 @@ Dolichovespula dollkin dolm domestica -don'tcha Donatello donburi +döner +don'tcha doomseer doorstopper doot @@ -1642,9 +1651,6 @@ dysmorphia dysrhythmia Dze Dzvonko -Dâdistân -döner -dō EAA earbuds earthbag @@ -1772,6 +1778,8 @@ eolocanths eoraptor eoraptors EPA +épée +épées Ephesus epicuticle epicuticles @@ -1863,6 +1871,7 @@ exospatial exosuit exosuits exp +expectin explosivity exposé exsanguinated @@ -2151,6 +2160,7 @@ Gabonese gadol Gaelic gah +Gâhs Gaia Gainesville galeae @@ -2228,12 +2238,12 @@ Gevuina Ghanaian ghast ghasts +Ghâzkhud +ghâzkhudians ghillie Ghostface Ghoulodon Ghoulodons -Ghâzkhud -ghâzkhudians gi Gibson Gideon @@ -2380,6 +2390,7 @@ Guin Guinean Guinness guls +Gümanik Gumps gunblade gunblades @@ -2407,8 +2418,6 @@ Gy Gyges Gymnocladus Gyurza -Gâhs -Gümanik HAADF Haba Haber @@ -2489,6 +2498,7 @@ Hastur hatchetman hatchlings Hatfield +Hávamál Haverhill Hawaii Hawaiian @@ -2745,11 +2755,6 @@ hypogaea hypovolemic Hypsiphrone Hz -Hávamál -I'd -I'll -I'm -I've Iain IAR IC @@ -2767,6 +2772,7 @@ ichthys ick iconical ICs +I'd idolators IDW IDWs @@ -2777,13 +2783,16 @@ Ierda Ierde IFAK IFF +If'n Ignus Igor II III IIIA Ikea +I'll illinoinensis +I'm Ima imager imagers @@ -2851,6 +2860,7 @@ Ipadê IPAV Ipswich IQ +Íqán IR Iranian Iraqi @@ -2863,27 +2873,27 @@ irising Ironfist ironshod irradiance -irremovable +Irradiants irrecoverable +irremovable irritants +Isaac isable isassembled -isk -isopod -Irradiants -Isaac isekai ish Isha Ishaan Isherwood Isherwoods +isk iskender Islam Islamic Islay Isohypsa Isohypsas +isopod Israeli Israelites ISS @@ -2893,6 +2903,7 @@ Italiana ITAS Ithaca IV +I've IWI IX Izchak @@ -2982,12 +2993,13 @@ Jones Jordanian jorts Jose +José Joseph Josephus Joshua Josie -José Jotunn +jötunn Jotunns Jovian Joyce @@ -3006,6 +3018,7 @@ Julie July jumpstart June +Jünger junglefowl Juniperus junkfood @@ -3016,9 +3029,6 @@ Jurgensen Justina Justo Justus -jötunn -Jünger -K'iche Kabura kabuto Kaczynski @@ -3032,8 +3042,8 @@ Kaje kakka Kalashnikov kaleidoscoping -kalimotxo Kalimát +kalimotxo kaluptic Kama Kamma @@ -3070,6 +3080,7 @@ Katha Katherine Katty Katyusha +Kâu Kaushîtaki Kazakhstani kcal @@ -3108,12 +3119,13 @@ keyrings kg Khadia Khanda +Khândogya khirad khopesh khopeshes Khorat -Khândogya KIA +K'iche kickboard kickboards kickboxer @@ -3140,10 +3152,10 @@ kippahs Kippur kirpan kirpans +Kitáb KITT kittel kittels -Kitáb kiymali kJ Klapaucius @@ -3221,7 +3233,7 @@ Kurukshetra Kuwaiti kW Kyrgyz -Kâu +lâ labbit labbits labcoat @@ -3247,9 +3259,9 @@ lajatangs lakeshore Lakeville lambeosaurus -Lampetia lamé lamés +Lampetia LAN Lancaster Lancea @@ -3495,7 +3507,6 @@ Lyotard Lythraceae Lytton LZ -lâ Maasai Maaser Maasrot @@ -3525,6 +3536,7 @@ madaniyyih Maddy Madeira Madeline +Mâdhyandina Madison Madisonville MAG @@ -3544,14 +3556,14 @@ Magnadrive Magnastorm magwell magwells +Mahâ +Mahā Mahabharata Mahal Mahapuranas Mahavagga -Mahayana -Mahâ Mahâvagga -Mahā +Mahayana Maiar maiasaura Maimon @@ -3613,9 +3625,11 @@ Mansfield manti Manu Manurhin +Mânûskihar manwich manwiches Maori +Māori mapgen maracuya Marblehead @@ -3684,6 +3698,7 @@ mayaheri mayaheros Mayfield mayfieldi +Mayhaps Maynard McCaffordy McDowell @@ -4050,8 +4065,8 @@ musculoskeletal Muslim Muslims Muspelhiem -must've Mustela +must've mutagenically mutagenicity mutus @@ -4066,9 +4081,6 @@ mycoid mycorrhizal Mycus Myers -Mâdhyandina -Mânûskihar -Māori nagamaki Nagant naginata @@ -4140,9 +4152,9 @@ nd NDA ndo Neal +nearsightedness Nebraska NECC -nearsightedness necco neccos neckbeard @@ -4247,6 +4259,7 @@ Nimue Nina Ninhursag ninjutsu +niño Nipâta Nishan Niten @@ -4254,7 +4267,6 @@ Nitron nitrox Niven Nixon -niño NMR Nobel nodachi @@ -4325,20 +4337,17 @@ NV NW NY Nyâyis -O'Brian -O'Connor -o'lantern -o'lanterns -O'Reilly OA Oakham Oakland Oakley Oates Obrez +O'Brian obscura Oceania oceanside +O'Connor Oct Octavia octo @@ -4355,9 +4364,9 @@ offsite offworld offworlders Ofudekasi +Ogã Ogam ogg -Ogã Ohio Ojibwe ok @@ -4365,6 +4374,8 @@ okie Okinawan Olaf Olam +o'lantern +o'lanterns Olcott olieribos Oliver @@ -4399,6 +4410,7 @@ ophanims orc orcs ordinator +O'Reilly Oreo orgs orichalcum @@ -4446,6 +4458,7 @@ OTM OTMSS Otomo Otten +Ötzi OU Ouija outdoorsman @@ -4497,6 +4510,7 @@ packmule Packstone pacu pacus +Pâda Pahlavi paintballs Pakistani @@ -4533,6 +4547,7 @@ parachuter Paraclesian Paraguayan parajubea +pâramitâ parasaurolophus parasitoid parasitoids @@ -4554,6 +4569,7 @@ passionfruit Pastafarian Patagonia pathfinding +Pātimokkha Patrick Paul pauldrons @@ -4570,8 +4586,8 @@ PD PDCurses PDW PDWs -Pe'ah Peabody +Pe'ah peanutbutter pearlescent Pearlman @@ -4853,9 +4869,6 @@ pyrolusite Pyroportation pyrrolidone Pyrus -Pâda -pâramitâ -Pātimokkha Qatari QDSS qiang @@ -4887,9 +4900,8 @@ quillbags Quincy Quinn Quixote -Qur'an Quran -R'lyeh +Qur'an Rabba racecar Rachel @@ -4917,6 +4929,7 @@ Rallidae Ralph Rama Ramadan +Râmânuja Ramayana Rambo Ramin @@ -4988,6 +5001,7 @@ refurb regenerators Reggie regia +Régime Regin Rego Rehobeth @@ -5078,6 +5092,7 @@ riverstone RivOS Rivtech Rizzo +R'lyeh RMB RMES roadheader @@ -5124,6 +5139,7 @@ Romans Rome Romero roncone +rōnin Roosevelt ropemaking Rosa @@ -5182,10 +5198,6 @@ Rycon Ryder Ryu ryūsei -Râmânuja -Régime -rōnin -s'mores SA sabalo sabalos @@ -5222,6 +5234,7 @@ Sambal Sambucus samghati samghatis +Sâmhita Sammarinese Sammy Samoan @@ -5338,6 +5351,7 @@ screenshot screwdriving scrying SCT +scuffers scutcher scutchers scutellosaurus @@ -5434,6 +5448,7 @@ Sharon Sharptooth Shaun Shawn +Shâyast Shayla Shazgra Sheba @@ -5498,18 +5513,20 @@ shoryuken shotcestus shotcestuses shotgunner +Shōtōkan Shotpistol Shotpistols shotshell shotshells -should've shoulderblades +should've Shrewsbury shriekling shrieklings shroom shrooms shrubland +Shû Shuchan Shui Shulchan @@ -5517,9 +5534,6 @@ Shunryū Shutesbury shuttlecraft shuttlepod -Shâyast -Shû -Shōtōkan Siamese siats Siberia @@ -5567,6 +5581,7 @@ Sioux sippy Sirach Sirhan +Sîrôzahs Sisyphus Sita Sivi @@ -5613,6 +5628,7 @@ SMLE smokable smoothbores smoots +s'mores SMR Smythe snakelet @@ -5631,6 +5647,7 @@ SOCOM Soergelia SOF softcovers +sōjutsu Sokoban Solaris solarpunk @@ -5648,6 +5665,7 @@ Sophia Sophie SOPMOD Soren +Søren sotah souffles Soulbinder @@ -5982,10 +6000,6 @@ synthesization Syracuse Syrian sysadmin -Sâmhita -Sîrôzahs -Søren -sōjutsu Taanit tabi tabula @@ -5999,6 +6013,7 @@ taegeuk taekwondo tagline Tai +Táin taitsu Taittiriya Taiwan @@ -6133,8 +6148,8 @@ Theodore theologist there'd there'll -there've Theresa +there've therizinosaurus thermite thermobaric @@ -6241,6 +6256,7 @@ Torrance torvosaurus totipotent Toto +töttchen tourmalines Tov Tovarishch @@ -6351,6 +6367,7 @@ turipaches Turkish Turkmen Tuscany +Tūtahi Tuvaluan Tuyen TV @@ -6369,9 +6386,6 @@ Tyringham Tyruckusaurus Tyson tze -Táin -töttchen -Tūtahi UAC UASTA UAV @@ -6508,6 +6522,7 @@ USB USC USD USMC +us'n USP USS USSR @@ -6532,6 +6547,7 @@ Vader Vafthrúdnismál Vagrakkhedika Vaishnava +Vâjasaneyi vajra Vajrayana Valencia @@ -6556,9 +6572,12 @@ var varanid Varanus Vargas +Vâsishtha +Vâta vatforged vatgrown Vaughn +Vâyu Ve Vedanta Vedas @@ -6653,10 +6672,6 @@ Vulcanist Vurt vyuha vz -Vâjasaneyi -Vâsishtha -Vâta -Vâyu Wabanaki wabbits wacked @@ -6756,14 +6771,14 @@ WETCODEs wetworks Weymouth whakapapa -what'd -what'll -what're -what've whatcha +what'd Whateley Whately +what'll +what're whattya +what've wheatberries Wheater where'd @@ -6909,8 +6924,6 @@ xxx XXXIII XXXL xxxx -y'know -y'see yacare Yahya Yajna @@ -6944,6 +6957,7 @@ Yibbum Yiddish Ying Yisrael +y'know Ymir Yochai Yoda @@ -6963,6 +6977,7 @@ yoyos yr Yrax yrs +y'see Yu yugg Yuggoth @@ -6975,6 +6990,7 @@ Yuni Yusuke Zachary Zack +Zâd zahir Zambian Zamyatin @@ -6990,6 +7006,7 @@ Zara Zardust Zastava zbrojovka +Zé zeindeer zeindeers Zelda @@ -7063,15 +7080,3 @@ zweitimber zweitimbers zygomaticus zzz -Zâd -Zé -Âkankheyya -Âkârânga -Âpastamba -Âranyaka -épée -épées -Íqán -Ötzi -Āsvalāyana -Česká