From 42c620558cc7449d9008b66f7cef030b6cd179e3 Mon Sep 17 00:00:00 2001 From: Ryan Breuer Date: Sun, 27 Feb 2022 18:12:18 -0600 Subject: [PATCH 1/2] Consistently show merch cost in conversation --- .../npcs/isolated_road/isolated_road_cody_fabricate.json | 6 +++--- .../refugee_center/surface_refugees/NPC_Dana_Nunez.json | 8 ++++---- .../surface_refugees/NPC_Fatima_Al_Jadir.json | 6 +++--- .../refugee_center/surface_refugees/NPC_Vanessa_Toby.json | 4 ++-- data/json/npcs/tacoma_ranch/NPC_ranch_barber.json | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json b/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json index feeca1d44c818..08d68f677945c 100644 --- a/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json +++ b/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json @@ -74,7 +74,7 @@ "responses": [ { "text": "Forget it.", "topic": "TALK_BLACKSMITH_SERVICES" }, { - "text": "[100 merch] Sounds good see you in weeks.", + "text": "[100 merch] Sounds good. See you in weeks.", "condition": { "and": [ { "u_has_items": { "item": "FMCNote", "count": 100 } }, @@ -90,7 +90,7 @@ "topic": "TALK_DONE" }, { - "text": "[200 merch] Sounds good see you in weeks.", + "text": "[200 merch] Sounds good. See you in weeks.", "condition": { "and": [ { "u_has_items": { "item": "FMCNote", "count": 200 } }, @@ -106,7 +106,7 @@ "topic": "TALK_DONE" }, { - "text": "[300 merch] Sounds good see you in weeks.", + "text": "[300 merch] Sounds good. See you in weeks.", "condition": { "and": [ { "u_has_items": { "item": "FMCNote", "count": 300 } }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json index bfdb65b63395b..62724c7997ade 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json @@ -194,7 +194,7 @@ }, { "//": "Regular sourdough, trade merch, regular price", - "text": "I got two merch for you.", + "text": "[2 merch] I got two merch for you.", "topic": "TALK_REFUGEE_Dana_Background_baking2", "condition": { "and": [ @@ -221,7 +221,7 @@ }, { "//": "Regular sourdough, trade merch, barter price", - "text": "All right, one merch as agreed.", + "text": "[1 merch] All right, one merch as agreed.", "topic": "TALK_REFUGEE_Dana_Background_baking2", "condition": { "and": [ @@ -249,7 +249,7 @@ }, { "//": "Special sourdough, trade merch, regular price", - "text": "I got two merch for you.", + "text": "[2 merch] I got two merch for you.", "topic": "TALK_REFUGEE_Dana_Background_baking2", "condition": { "and": [ @@ -275,7 +275,7 @@ }, { "//": "Special sourdough, trade merch, barter price", - "text": "All right, one merch as agreed.", + "text": "[1 merch] All right, one merch as agreed.", "topic": "TALK_REFUGEE_Dana_Background_baking2", "condition": { "and": [ diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json index 94c2b3100e0d0..faf82b6e9bb8f 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json @@ -176,7 +176,7 @@ "responses": [ { "//": "5 merch if player has not bartered nor finished mission", - "text": "All right, here's your money.", + "text": "[5 merch] All right, here's your money.", "topic": "TALK_TRAIN", "condition": { "and": [ @@ -189,7 +189,7 @@ }, { "//": "4 merch if player has not bartered but has done the mission", - "text": "All right, here's your money.", + "text": "[4 merch] All right, here's your money.", "topic": "TALK_TRAIN", "condition": { "and": [ @@ -202,7 +202,7 @@ }, { "//": "3 merch if player has successfully bartered price down", - "text": "All right, here's your money.", + "text": "[3 merch] All right, here's your money.", "topic": "TALK_TRAIN", "condition": { "and": [ diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json index 9b40653d4afb4..038bd0698ff3f 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json @@ -195,7 +195,7 @@ "dynamic_line": "Sure, I can give you a haircut. It'll be six merch for a haircut, or three for a shave, okay?", "responses": [ { - "text": "Please give me a haircut.", + "text": "[6 merch] Please give me a haircut.", "topic": "TALK_DONE", "condition": { "u_has_items": { "item": "FMCNote", "count": 6 } }, "effect": [ @@ -206,7 +206,7 @@ ] }, { - "text": "Please give me a shave.", + "text": "[3 merch] Please give me a shave.", "topic": "TALK_DONE", "condition": { "u_has_items": { "item": "FMCNote", "count": 3 } }, "effect": [ diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_barber.json b/data/json/npcs/tacoma_ranch/NPC_ranch_barber.json index 823ffa9106c48..ebb260483ccce 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_barber.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_barber.json @@ -18,13 +18,13 @@ { "text": "What is your job here?", "topic": "TALK_RANCH_BARBER_JOB" }, { "text": "Do you need any help?", "topic": "TALK_RANCH_BARBER_HIRE" }, { - "text": "[$5] I'll have a shave", + "text": "[3 merch] I'll have a shave", "topic": "TALK_RANCH_BARBER_CUT", "condition": { "u_has_items": { "item": "FMCNote", "count": 3 } }, "effect": [ "buy_shave", { "u_sell_item": "FMCNote", "count": 3 }, "barber_beard" ] }, { - "text": "[$10] I'll get a haircut", + "text": "[6 merch] I'll get a haircut", "topic": "TALK_RANCH_BARBER_CUT", "condition": { "u_has_items": { "item": "FMCNote", "count": 6 } }, "effect": [ "buy_haircut", { "u_sell_item": "FMCNote", "count": 6 }, "barber_hair" ] From ccbd31bb8f0da0c660209bb31de3e0082b7d5b7d Mon Sep 17 00:00:00 2001 From: Ryan Breuer Date: Sun, 27 Feb 2022 18:24:40 -0600 Subject: [PATCH 2/2] Check for FMCNot consume effects. Add commas to cody's merch text. --- .../npcs/isolated_road/isolated_road_cody_fabricate.json | 6 +++--- .../Smokes/free_merchant_shopkeep_missions.json | 4 ++-- .../surface_visitors/NPC_scavenger_mercenary.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json b/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json index 08d68f677945c..c0cc005e191f0 100644 --- a/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json +++ b/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json @@ -18,19 +18,19 @@ "responses": [ { "text": "Forget it.", "topic": "TALK_BLACKSMITH_SERVICES" }, { - "text": "[100 merch 2 mm] I like to stay light.", + "text": "[100 merch, 2 mm] I like to stay light.", "condition": { "u_has_items": { "item": "FMCNote", "count": 100 } }, "effect": [ { "u_add_var": "blacksmith_thickness", "type": "number", "context": "artisans", "value": "2" } ], "topic": "TALK_BLACKSMITH_FABRICATE_TYPE" }, { - "text": "[200 merch 4 mm] A middle ground would be good.", + "text": "[200 merch, 4 mm] A middle ground would be good.", "condition": { "u_has_items": { "item": "FMCNote", "count": 200 } }, "effect": [ { "u_add_var": "blacksmith_thickness", "type": "number", "context": "artisans", "value": "4" } ], "topic": "TALK_BLACKSMITH_FABRICATE_TYPE" }, { - "text": "[300 merch 6 mm] Never skimp on protection.", + "text": "[300 merch, 6 mm] Never skimp on protection.", "condition": { "u_has_items": { "item": "FMCNote", "count": 300 } }, "effect": [ { "u_add_var": "blacksmith_thickness", "type": "number", "context": "artisans", "value": "6" } ], "topic": "TALK_BLACKSMITH_FABRICATE_TYPE" diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json index 7d047038831b6..5f1ca2912d12d 100644 --- a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json +++ b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json @@ -332,7 +332,7 @@ "dynamic_line": "Hmm.\" Smokes looks thoughtful, rubbing his chin. \"Well, most of the people downstairs aren't willing to come up for things like that, and a lot of folks that are up here have a lot of bad memories from that. You could try asking around some of the people we have upstairs, but it'll be tough. If you have some Merch you could spare, though, I could get some people off guard duty and into your little crew for some hazard pay. You might also have luck asking the Old Guard rep in the southwest bay, near the library - I hear they've got some volunteers lately.", "responses": [ { - "text": "Five Merch for someone sounds fair to me.", + "text": "[5 merch] Five Merch for someone sounds fair to me.", "condition": { "u_has_items": { "item": "FMCNote", "count": 5 } }, "effect": [ { "u_adjust_var": "Boris_mission_1", "type": "mission", "context": "cleanup_promises", "adjustment": 1 }, @@ -342,7 +342,7 @@ "topic": "TALK_FREE_MERCHANTS_MERCHANT_BorisCleanup1" }, { - "text": "How about ten Merch to do it?", + "text": "[10 merch] How about ten Merch to do it?", "condition": { "u_has_items": { "item": "FMCNote", "count": 10 } }, "effect": [ { "u_adjust_var": "Boris_mission_1", "type": "mission", "context": "cleanup_promises", "adjustment": 3 }, diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json index 7dc0c4629f7e4..2a6819704550f 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json @@ -111,7 +111,7 @@ { "text": "What the heck is a Merch?", "topic": "TALK_SCAVENGER_MERC_MERCH" }, { "text": "I might be back.", "topic": "TALK_SCAVENGER_MERC" }, { - "text": "[FMC750] You have a deal.", + "text": "[750 merch] You have a deal.", "topic": "TALK_SCAVENGER_MERC_HIRE_SUCCESS", "condition": { "u_has_items": { "item": "FMCNote", "count": 750 } }, "effect": { "u_consume_item": "FMCNote", "count": 750 }