Skip to content

Commit e910189

Browse files
authored
Merge pull request #322 from WatWowMap/update-rockets
Update Rockets
2 parents 2040060 + 1177422 commit e910189

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/data/grunttypes.json

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"grunt": "Female",
2121
"second_reward": false,
2222
"encounters": {
23-
"first": [142],
23+
"first": [143],
2424
"second": [62, 143, 282],
2525
"third": [130, 143, 149]
2626
}
@@ -34,8 +34,8 @@
3434
"grunt": "Male",
3535
"second_reward": false,
3636
"encounters": {
37-
"first": [13, 48, 213],
38-
"second": [14, 49, 212],
37+
"first": [48, 213, 347],
38+
"second": [49, 127, 212],
3939
"third": [15, 123, 212]
4040
}
4141
},
@@ -58,9 +58,9 @@
5858
"grunt": "Female",
5959
"second_reward": false,
6060
"encounters": {
61-
"first": [434],
62-
"second": [302, 434],
63-
"third": [275, 435]
61+
"first": [302, 434],
62+
"second": [274, 435],
63+
"third": [275, 332]
6464
}
6565
},
6666
"11": {
@@ -74,7 +74,7 @@
7474
"encounters": {
7575
"first": [147],
7676
"second": [148, 330],
77-
"third": [148, 149, 371]
77+
"third": [130, 148, 149]
7878
}
7979
},
8080
"13": {
@@ -95,8 +95,8 @@
9595
"second_reward": false,
9696
"encounters": {
9797
"first": [66, 106],
98-
"second": [106],
99-
"third": [67]
98+
"second": [67],
99+
"third": [67, 106]
100100
}
101101
},
102102
"17": {
@@ -109,8 +109,8 @@
109109
"second_reward": true,
110110
"encounters": {
111111
"first": [37, 228],
112-
"second": [38, 229],
113-
"third": [5, 59, 229]
112+
"second": [38, 126, 229],
113+
"third": [8, 38, 59]
114114
}
115115
},
116116
"19": {
@@ -122,7 +122,7 @@
122122
"grunt": "Female",
123123
"second_reward": false,
124124
"encounters": {
125-
"first": [41, 42, 227],
125+
"first": [42, 207, 227],
126126
"second": [42, 123, 169],
127127
"third": [130, 149, 169]
128128
}
@@ -140,7 +140,7 @@
140140
"grunt": "Male",
141141
"second_reward": true,
142142
"encounters": {
143-
"first": [1, 187],
143+
"first": [43, 187, 345],
144144
"second": [2, 44, 70],
145145
"third": [45, 71, 275]
146146
}
@@ -154,19 +154,19 @@
154154
"grunt": "Male",
155155
"second_reward": false,
156156
"encounters": {
157-
"first": [50, 207],
157+
"first": [50, 220],
158158
"second": [105, 247, 329],
159159
"third": [330, 472]
160160
}
161161
},
162162
"26": {
163163
"type": "Ice",
164164
"grunt": "Female",
165-
"second_reward": false,
165+
"second_reward": true,
166166
"encounters": {
167-
"first": [91, 459],
168-
"second": [459, 460],
169-
"third": [131, 460]
167+
"first": [363, 459],
168+
"second": [91, 220, 364],
169+
"third": [91, 131, 460]
170170
}
171171
},
172172
"27": {
@@ -200,9 +200,9 @@
200200
"grunt": "Female",
201201
"second_reward": false,
202202
"encounters": {
203-
"first": [29, 32],
204-
"second": [42, 88, 89],
205-
"third": [30, 33]
203+
"first": [29, 32, 41],
204+
"second": [88, 89],
205+
"third": [30, 89, 110]
206206
}
207207
},
208208
"33": {
@@ -218,9 +218,9 @@
218218
"grunt": "Male",
219219
"second_reward": false,
220220
"encounters": {
221-
"first": [63, 79, 202],
222-
"second": [96, 97, 280],
223-
"third": [64, 97, 281]
221+
"first": [79, 102, 202],
222+
"second": [64, 96, 281],
223+
"third": [80, 97, 281]
224224
}
225225
},
226226
"36": {
@@ -230,10 +230,10 @@
230230
"37": {
231231
"type": "Rock",
232232
"grunt": "Male",
233-
"second_reward": false,
233+
"second_reward": true,
234234
"encounters": {
235-
"first": [142, 246],
236-
"second": [246],
235+
"first": [299, 304],
236+
"second": [246, 247, 305],
237237
"third": [247, 248]
238238
}
239239
},
@@ -242,7 +242,7 @@
242242
"grunt": "Female",
243243
"second_reward": false,
244244
"encounters": {
245-
"first": [54, 90],
245+
"first": [54, 90, 194],
246246
"second": [55, 61],
247247
"third": [62, 186]
248248
}
@@ -266,29 +266,29 @@
266266
"grunt": "",
267267
"second_reward": false,
268268
"encounters": {
269-
"first": [138],
270-
"second": [68, 95, 466],
271-
"third": [248, 260, 389]
269+
"first": [142],
270+
"second": [199, 346, 475],
271+
"third": [248, 473, 477]
272272
}
273273
},
274274
"42": {
275275
"type": "Executive Arlo",
276276
"grunt": "",
277277
"second_reward": false,
278278
"encounters": {
279-
"first": [58],
280-
"second": [6, 9, 208],
281-
"third": [149, 212, 373]
279+
"first": [374],
280+
"second": [282, 306, 392],
281+
"third": [212, 348, 373]
282282
}
283283
},
284284
"43": {
285285
"type": "Executive Sierra",
286286
"grunt": "",
287287
"second_reward": false,
288288
"encounters": {
289-
"first": [96],
290-
"second": [103, 131, 319],
291-
"third": [65, 228, 275]
289+
"first": [318],
290+
"second": [429, 450, 474],
291+
"third": [228, 330, 365]
292292
}
293293
},
294294
"44": {

0 commit comments

Comments
 (0)