1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
|
--- a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
@@ -64,7 +64,7 @@
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_BARRY_TOWER",
- "dynamic_line": [ "Yeah, I think we need to talk about it, but I'm not ready yet. Let me reclaim my life for a while. " ],
+ "dynamic_line": [ "Yeah, I think we need to talk about it, but I'm not ready yet. Let me reclaim my life for a while." ],
"responses": [ { "text": "Sounds good, Barry.", "topic": "TALK_DONE" } ]
},
{
@@ -77,7 +77,7 @@
"destination": "dairy_farm_isherwood_W",
"start": {
"effect": [ { "u_add_var": "u_have_barry_escape", "type": "general", "context": "meeting", "value": "yes" } ],
- "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "reveal_radius": 3 }
+ "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "om_special": "Isherwood Farm", "reveal_radius": 3, "search_range": 240 }
},
"end": {
"opinion": { "trust": 5, "value": 5 },
--- a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
@@ -28,7 +28,7 @@
"skill": "ALL",
"level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
},
- { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
+ { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
{ "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
{ "skill": "survival", "bonus": { "rng": [ 7, 10 ] } },
{ "skill": "gun", "bonus": { "rng": [ 4, 8 ] } },
@@ -47,14 +47,14 @@
"responses": [
{
"text": "Yeah, I'm a Marshal, what are you going to do about it?",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL",
"effect": "hostile",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
{
"text": "…",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
@@ -144,14 +144,8 @@
},
{
"type": "talk_topic",
- "id": "TALK_LEAVE_NOW",
- "dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
- "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
- },
- {
- "type": "talk_topic",
"id": "TALK_ISHERWOOD_CARLOS_TOPICS",
- "dynamic_line": "Go on...",
+ "dynamic_line": "Go on…",
"responses": [
{
"text": "I heard about Barry, can you tell me what captured him?",
--- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
@@ -28,7 +28,7 @@
"skill": "ALL",
"level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
},
- { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
+ { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
{ "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
{ "skill": "survival", "bonus": { "rng": [ 7, 10 ] } },
{ "skill": "gun", "bonus": { "rng": [ 4, 8 ] } },
@@ -47,7 +47,7 @@
"responses": [
{
"text": "…",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL_CHRIS",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
@@ -137,14 +137,14 @@
},
{
"type": "talk_topic",
- "id": "TALK_LEAVE_NOW",
+ "id": "TALK_LEAVE_NOW_MARSHAL_CHRIS",
"dynamic_line": "You should leave before my family sees you.",
"responses": [ { "text": "…", "topic": "TALK_DONE" } ]
},
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_CHRIS_TOPICS",
- "dynamic_line": "Go on...",
+ "dynamic_line": "Go on…",
"responses": [
{
"text": "Your dad asked me to come find you, said you've been looking for your uncle.",
--- a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
@@ -28,7 +28,7 @@
"skill": "ALL",
"level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
},
- { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
+ { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
{ "skill": "cooking", "bonus": { "rng": [ 4, 8 ] } },
{ "skill": "firstaid", "bonus": { "rng": [ 3, 6 ] } },
{ "skill": "survival", "bonus": { "rng": [ 3, 6 ] } },
@@ -113,13 +113,13 @@
"responses": [
{
"text": "Yes, I'm a marshal.",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL_CLAIRE",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
{
"text": "…",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL_CLAIRE",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
@@ -251,7 +251,7 @@
},
{
"type": "talk_topic",
- "id": "TALK_LEAVE_NOW",
+ "id": "TALK_LEAVE_NOW_MARSHAL_CLAIRE",
"dynamic_line": "You should get off our land, you have no business here.",
"responses": [ { "text": "…", "topic": "TALK_DONE" } ]
},
--- a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
@@ -29,7 +29,7 @@
"skill": "ALL",
"level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
},
- { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
+ { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
{ "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
{ "skill": "survival", "bonus": { "rng": [ 3, 6 ] } },
{ "skill": "gun", "bonus": { "rng": [ 3, 6 ] } },
@@ -61,14 +61,14 @@
"responses": [
{
"text": "Yeah, I'm a Marshal, what are you going to do about it?",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL",
"effect": "hostile",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
{
"text": "…",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
@@ -174,14 +174,8 @@
},
{
"type": "talk_topic",
- "id": "TALK_LEAVE_NOW",
- "dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
- "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
- },
- {
- "type": "talk_topic",
"id": "TALK_ISHERWOOD_EDDIE_TOPICS",
- "dynamic_line": "Go on...",
+ "dynamic_line": "Go on…",
"responses": [
{ "text": "Your son helps with the dairy?", "topic": "TALK_EDDIE_LUKE" },
{ "text": "So, Jesse runs the horse farm?", "topic": "TALK_EDDIE_JESSE" },
--- a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
@@ -29,7 +29,7 @@
"skill": "ALL",
"level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
},
- { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
+ { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
{ "skill": "gun", "bonus": { "rng": [ 4, 8 ] } },
{ "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
{ "skill": "survival", "bonus": { "rng": [ 3, 6 ] } },
@@ -96,7 +97,7 @@
{ "item": "cheese_hard", "prob": 50 },
{ "item": "vinegar", "prob": 55 },
{ "item": "veggy_pickled", "prob": 50, "charges": 2, "container-item": "jar_glass_sealed" },
- { "item": "jar_sauerkraut_pickled", "prob": 50 },
+ { "item": "sauerkraut", "prob": 50, "charges": 4, "container-item": "jar_glass_sealed" },
{ "item": "meat_pickled", "prob": 50, "charges": 2, "container-item": "jar_glass_sealed" },
{ "item": "fish_pickled", "prob": 60, "charges": 2, "container-item": "jar_glass_sealed" },
{ "item": "meat_canned", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" },
@@ -122,14 +123,14 @@
"responses": [
{
"text": "Yes, I'm a marshal.",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL_JACK",
"effect": "hostile",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
{
"text": "…",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL_JACK",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
@@ -198,7 +199,7 @@
{
"type": "talk_topic",
"id": "TALK_JACK_FARM",
- "dynamic_line": "Even out here we've had some attacks and seen … other things. We have been working on our defenses, but it takes time. We've been able to keep up with the crops and animals though so we won't have to risk our necks for supplies.",
+ "dynamic_line": "Even out here we've had some attacks and seen… other things. We have been working on our defenses, but it takes time. We've been able to keep up with the crops and animals though so we won't have to risk our necks for supplies.",
"responses": [
{ "text": "What sort of defenses do you want?", "topic": "TALK_FARM_DEFENSE" },
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JACK_TOPICS" },
@@ -250,14 +251,14 @@
},
{
"type": "talk_topic",
- "id": "TALK_LEAVE_NOW",
+ "id": "TALK_LEAVE_NOW_MARSHAL_JACK",
"dynamic_line": "You should get off my land, the government proved its incompetence with this catastrophe.",
"responses": [ { "text": "…", "topic": "TALK_DONE" } ]
},
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_JACK_TOPICS",
- "dynamic_line": "Go on ...",
+ "dynamic_line": "Go on…",
"responses": [
{
"text": "I'm here to deliver some resources.",
--- a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
@@ -28,7 +28,7 @@
"skill": "ALL",
"level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
},
- { "skill": "barter", "bonus": { "rng": [ 6, 9 ] } },
+ { "skill": "speech", "bonus": { "rng": [ 6, 9 ] } },
{ "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
{ "skill": "survival", "bonus": { "rng": [ 3, 6 ] } },
{ "skill": "gun", "bonus": { "rng": [ 3, 6 ] } },
@@ -51,14 +51,14 @@
"responses": [
{
"text": "Yeah, I'm a Marshal, what are you going to do about it?",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL",
"effect": "hostile",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
{
"text": "…",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
@@ -124,7 +124,7 @@
"id": "TALK_MET_JACK_CLAIRE",
"dynamic_line": "Oh good, I'm sure Jack wanted to put you to work. If you're interested, I could use a hand clearing out the woods. My son, Chris has his hands full trying to keep the predators under control.",
"responses": [
- { "text": "I'd like to speak with Carlos too about some work.", "topic": "TALK_JESSE_CARLOS" },
+ { "text": "I'd like to speak with Carlos too about some work.", "topic": "TALK_JESSE_CARLOS1" },
{
"text": "Is Chris around? I'd like to know what he's run into out in the woods.",
"topic": "TALK_JESSE_CHRIS"
@@ -136,7 +136,7 @@
},
{
"type": "talk_topic",
- "id": "TALK_JESSE_CARLOS",
+ "id": "TALK_JESSE_CARLOS1",
"dynamic_line": "He's out back in the workshop.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JESSE_TOPICS" },
@@ -154,7 +154,7 @@
},
{
"type": "talk_topic",
- "id": "TALK_JESSE_CARLOS",
+ "id": "TALK_JESSE_CARLOS2",
"dynamic_line": "Carlos will be in his workshop if he isn't out hunting. He is trying to get a forge set up.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JESSE_TOPICS" },
@@ -163,19 +163,19 @@
},
{
"type": "talk_topic",
- "id": "TALK_LEAVE_NOW",
+ "id": "TALK_LEAVE_NOW_MARSHAL",
"dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
"responses": [ { "text": "…", "topic": "TALK_DONE" } ]
},
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_JESSE_TOPICS",
- "dynamic_line": "Go on...",
+ "dynamic_line": "Go on…",
"responses": [
{ "text": "Looks like you are doing well here.", "topic": "TALK_ISHERWOOD_JESSE_TALK1" },
{ "text": "Do you have any animal care tips?", "topic": "TALK_ISHERWOOD_JESSE_TIPS" },
{ "text": "Jack and Claire suggested I come talk to you.", "topic": "TALK_MET_JACK_CLAIRE" },
- { "text": "I'd like to speak with Carlos too about some work.", "topic": "TALK_JESSE_CARLOS" },
+ { "text": "I'd like to speak with Carlos too about some work.", "topic": "TALK_JESSE_CARLOS2" },
{ "text": "Is Chris around?", "topic": "TALK_JESSE_CHRIS" },
{ "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
--- a/data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
@@ -45,7 +45,7 @@
"responses": [
{
"text": "…",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_MARSHAL",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
@@ -123,17 +123,11 @@
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_LISA_TOPICS",
- "dynamic_line": "Go on...",
+ "dynamic_line": "Go on…",
"responses": [
{ "text": "Hi, I'm looking for Jesse.", "topic": "TALK_LISA_JESSE" },
{ "text": "Hi, I'm looking for Chris.", "topic": "TALK_LISA_CHRIS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
]
- },
- {
- "type": "talk_topic",
- "id": "TALK_LEAVE_NOW",
- "dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
- "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
}
]
--- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
+++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
@@ -47,7 +47,7 @@
"responses": [
{
"text": "…",
- "topic": "TALK_LEAVE_NOW",
+ "topic": "TALK_LEAVE_NOW_LUKE",
"opinion": { "trust": -20, "value": -20 },
"condition": { "u_is_wearing": "badge_marshal" }
},
@@ -135,14 +135,14 @@
},
{
"type": "talk_topic",
- "id": "TALK_LEAVE_NOW",
+ "id": "TALK_LEAVE_NOW_LUKE",
"dynamic_line": "You won't find any help here.",
"responses": [ { "text": "…", "topic": "TALK_DONE" } ]
},
{
"type": "talk_topic",
"id": "TALK_ISHERWOOD_LUKE_TOPICS",
- "dynamic_line": "Go on...",
+ "dynamic_line": "Go on…",
"responses": [
{
"text": "Must be tough having the world fall apart when you had you future to look forward to.",
|
