Skip to content

C
Cataclysm DDA

GitCode / Cataclysm DDA

通知 4
Star 6383
Fork 0
C
Cataclysm DDA

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 5ac5eec8 编写于 作者: D Dillon Matchett 提交者： GitHub
浏览文件
操作

suggestions by Faalagorn (#54459)

上级 7ab36f1a
隐藏空白更改
内联 并排
Showing with 49 addition and 49 deletion
data/json/npcs/isolated_road/isolated_road_cody_dialogue.json
浏览文件 @ 5ac5eec8
......@@ -13,7 +13,7 @@
"responses": [
{ "text": "About that contract…", "topic": "TALK_MISSION_INQUIRE", "condition": "has_assigned_mission" },
{ "text": "Who are you?", "topic": "TALK_BLACKSMITH_ABOUT" },
{ "text": "Whats with all the weapons and armor?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT" },
{ "text": "What's with all the weapons and armor?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT" },
{
"text": "What is this place?",
"condition": { "not": { "u_has_var": "blacksmith_mentioned_jay", "type": "dialogue", "context": "artisans", "value": "yes" } },
......@@ -87,7 +87,7 @@
"I'm Cody, was an engineer before everything went to hell. I guess I still am but I don't have to consult anymore so I consider that a plus at least."
],
"responses": [
{ "text": "Whats with all the weapons and armor?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT" },
{ "text": "What's with all the weapons and armor?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT" },
{ "text": "What is this place?", "topic": "TALK_BLACKSMITH_LOCATION_ABOUT" },
{ "text": "Alright.", "topic": "TALK_BLACKSMITH_SERVICES" }
]
......@@ -100,7 +100,7 @@
],
"speaker_effect": { "effect": [ { "u_add_var": "blacksmith_mentioned_jay", "type": "dialogue", "context": "artisans", "value": "yes" } ] },
"responses": [
{ "text": "Whats with all the weapons and armor?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT" },
{ "text": "What's with all the weapons and armor?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT" },
{ "text": "Who are you?", "topic": "TALK_BLACKSMITH_ABOUT" },
{ "text": "Are you and Jay close?", "topic": "TALK_BLACKSMITH_JAY" },
{ "text": "Alright.", "topic": "TALK_BLACKSMITH_SERVICES" }
......@@ -247,7 +247,7 @@
"topic": "TALK_BLACKSMITH_SERVICES"
},
{ "text": "Not really interested.", "topic": "TALK_DONE" },
{ "text": "I'll think about it", "topic": "TALK_BLACKSMITH_SERVICES" }
{ "text": "I'll think about it.", "topic": "TALK_BLACKSMITH_SERVICES" }
]
},
{
......
data/json/npcs/isolated_road/isolated_road_jay_convert.json
浏览文件 @ 5ac5eec8
......@@ -245,7 +245,7 @@
"context": "artisans",
"op": "==",
"value": 556,
"yes": "Sure, 5.56 to what?",
"yes": "Sure, 5.56x45 to what?",
"no": {
"u_compare_var": "gunsmith_ammo_from",
"type": "number",
......@@ -274,7 +274,7 @@
"op": "==",
"value": 300,
"yes": "Sure, 300 BLK to what?",
"no": "If you are seeing this I am bugged and confused. You should report this fact on the github."
"no": "If you are seeing this I am bugged and confused. You should report this fact on the GitHub."
}
}
}
......@@ -370,7 +370,7 @@
"responses": [
{ "//": "ALL 556 Converts" },
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 },
......@@ -397,7 +397,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 },
......@@ -424,7 +424,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 },
......@@ -445,7 +445,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 },
......@@ -466,7 +466,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 },
......@@ -493,7 +493,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 },
......@@ -520,7 +520,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 },
......@@ -541,7 +541,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 },
......@@ -563,7 +563,7 @@
},
{ "//": "ALL 762x39 Converts" },
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 },
......@@ -584,7 +584,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 },
......@@ -605,7 +605,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 },
......@@ -626,7 +626,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 },
......@@ -647,7 +647,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 },
......@@ -674,7 +674,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 },
......@@ -701,7 +701,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 },
......@@ -722,7 +722,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 },
......@@ -744,7 +744,7 @@
},
{ "//": "ALL 545 Converts" },
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 },
......@@ -765,7 +765,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 },
......@@ -786,7 +786,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 },
......@@ -813,7 +813,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 },
......@@ -840,7 +840,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 },
......@@ -867,7 +867,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 },
......@@ -894,7 +894,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 },
......@@ -915,7 +915,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 },
......@@ -937,7 +937,7 @@
},
{ "//": "ALL 762 NATO Converts" },
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 },
......@@ -958,7 +958,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 },
......@@ -979,7 +979,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 },
......@@ -1006,7 +1006,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 },
......@@ -1033,7 +1033,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 },
......@@ -1054,7 +1054,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 },
......@@ -1075,7 +1075,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 },
......@@ -1096,7 +1096,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 },
......@@ -1118,7 +1118,7 @@
},
{ "//": "ALL Blackout Converts" },
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 },
......@@ -1139,7 +1139,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 },
......@@ -1160,7 +1160,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 },
......@@ -1187,7 +1187,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 },
......@@ -1214,7 +1214,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 },
......@@ -1235,7 +1235,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 },
......@@ -1256,7 +1256,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 },
......@@ -1283,7 +1283,7 @@
"topic": "TALK_DONE"
},
{
"text": "[Pickup ammo] Thanks.",
"text": "[pickup ammo] Thanks.",
"condition": {
"and": [
{ "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 },
......
data/json/npcs/isolated_road/isolated_road_jay_dialogue.json
浏览文件 @ 5ac5eec8
......@@ -225,7 +225,7 @@
"topic": "TALK_GUNSMITH_Q1_DETAILS"
},
{ "text": "Not really interested.", "topic": "TALK_DONE" },
{ "text": "I'll think about it", "topic": "TALK_GUNSMITH_SERVICES" }
{ "text": "I'll think about it.", "topic": "TALK_GUNSMITH_SERVICES" }
]
},
{
......
data/json/npcs/isolated_road/isolated_road_missions.json
浏览文件 @ 5ac5eec8
......@@ -83,7 +83,7 @@
"accepted": "Thanks, I'll start working on an apology.",
"rejected": "Let me know if you change your mind.",
"advice": "I'd be careful, guy was a bit of a nut I don't know what he was planning to do with that software.",
"inquire": "Any luck finding that usb?",
"inquire": "Any luck finding that USB?",
"success": "Thanks bud I'll take it from here on the apology you enjoy the new munitions.",
"success_lie": "Shame. Shame, Shame.",
"failure": "Well fuck me then."
......
data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json
浏览文件 @ 5ac5eec8
......@@ -117,7 +117,7 @@
"no": {
"compare_int": [ { "npc_val": "var", "var_name": "direction", "type": "randomize", "context": "dialogue" }, { "const": 4 } ],
"op": "=",
"yes": "A few of my people have come back now talkin' about some yuppie trying to start a bank that uses bullets for money. Silly idea but the lad lives on a homestead with a women who wouldn't let my guys leave without a full belly.",
"yes": "A few of my people have come back now talkin' about some yuppie trying to start a bank that uses bullets for money. Silly idea but the lad lives on a homestead with a woman who wouldn't let my guys leave without a full belly.",
"no": "ERROR: out of bounds on randomize_directions."
}
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或