Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistently show merch cost in conversation #55737

Merged
merged 2 commits into from
Mar 4, 2022
Merged

Consistently show merch cost in conversation #55737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42c6205
Consistently show merch cost in conversation
haveric Feb 28, 2022
ccbd31b
Check for FMCNot consume effects. Add commas to cody's merch text.
haveric Feb 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions data/json/npcs/isolated_road/isolated_road_cody_fabricate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -74,7 +74,7 @@
"responses": [
{ "text": "Forget it.", "topic": "TALK_BLACKSMITH_SERVICES" },
{
"text": "[100 merch] Sounds good see you in <u_val:npctalk_var_number_artisans_blacksmith_wait> weeks.",
"text": "[100 merch] Sounds good. See you in <u_val:npctalk_var_number_artisans_blacksmith_wait> weeks.",
"condition": {
"and": [
{ "u_has_items": { "item": "FMCNote", "count": 100 } },
Expand All @@ -90,7 +90,7 @@
"topic": "TALK_DONE"
},
{
"text": "[200 merch] Sounds good see you in <u_val:npctalk_var_number_artisans_blacksmith_wait> weeks.",
"text": "[200 merch] Sounds good. See you in <u_val:npctalk_var_number_artisans_blacksmith_wait> weeks.",
"condition": {
"and": [
{ "u_has_items": { "item": "FMCNote", "count": 200 } },
Expand All @@ -106,7 +106,7 @@
"topic": "TALK_DONE"
},
{
"text": "[300 merch] Sounds good see you in <u_val:npctalk_var_number_artisans_blacksmith_wait> weeks.",
"text": "[300 merch] Sounds good. See you in <u_val:npctalk_var_number_artisans_blacksmith_wait> weeks.",
"condition": {
"and": [
{ "u_has_items": { "item": "FMCNote", "count": 300 } },
Expand Down
8 changes: 4 additions & 4 deletions data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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": [
Expand Down Expand Up @@ -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": [
Expand All @@ -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": [
Expand Down
6 changes: 3 additions & 3 deletions data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand All @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/tacoma_ranch/NPC_ranch_barber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing full stop at the end.

"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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing full stop at the end.

"topic": "TALK_RANCH_BARBER_CUT",
"condition": { "u_has_items": { "item": "FMCNote", "count": 6 } },
"effect": [ "buy_haircut", { "u_sell_item": "FMCNote", "count": 6 }, "barber_hair" ]
Expand Down