Skip to content

Commit 2819c78

Browse files
MuparadziMuparadzi
authored
Merge branch 'master' into droob/voice-commands
2 parents 1ec70dd + 3f03e58 commit 2819c78

15 files changed

Lines changed: 169 additions & 78 deletions

File tree

‎data/constants.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@
8686
"marketplaceGoldFeePercent": 5,
8787
"questDailyQuestsPerUser": 3,
8888
"questWeeklyQuestsPerUser": 1,
89-
"questRerollDailyQuestPrice": 300
89+
"questRerollDailyQuestPrice": 150
9090
}

‎data/quests.json‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"aggregationType": "Sum",
99
"aggregationField": "Damage",
1010
"requiredValue": 1500,
11-
"rewardGold": 3000,
12-
"rewardExperience": 100000,
11+
"rewardGold": 500,
12+
"rewardExperience": 25000,
1313
"isActive": true
1414
},
1515
{
@@ -21,8 +21,8 @@
2121
"aggregationType": "Sum",
2222
"aggregationField": "Damage",
2323
"requiredValue": 750,
24-
"rewardGold": 3000,
25-
"rewardExperience": 100000,
24+
"rewardGold": 500,
25+
"rewardExperience": 25000,
2626
"isActive": true
2727
},
2828
{
@@ -34,8 +34,8 @@
3434
"aggregationType": "Sum",
3535
"aggregationField": "Damage",
3636
"requiredValue": 750,
37-
"rewardGold": 3000,
38-
"rewardExperience": 100000,
37+
"rewardGold": 500,
38+
"rewardExperience": 25000,
3939
"isActive": true
4040
},
4141
{
@@ -47,8 +47,8 @@
4747
"aggregationType": "Sum",
4848
"aggregationField": "Damage",
4949
"requiredValue": 750,
50-
"rewardGold": 3000,
51-
"rewardExperience": 100000,
50+
"rewardGold": 500,
51+
"rewardExperience": 25000,
5252
"isActive": true
5353
},
5454
{
@@ -60,8 +60,8 @@
6060
"aggregationType": "Sum",
6161
"aggregationField": "Damage",
6262
"requiredValue": 1000,
63-
"rewardGold": 3000,
64-
"rewardExperience": 100000,
63+
"rewardGold": 500,
64+
"rewardExperience": 25000,
6565
"isActive": true
6666
},
6767
{
@@ -73,8 +73,8 @@
7373
"aggregationType": "Sum",
7474
"aggregationField": "Damage",
7575
"requiredValue": 1250,
76-
"rewardGold": 3000,
77-
"rewardExperience": 100000,
76+
"rewardGold": 500,
77+
"rewardExperience": 25000,
7878
"isActive": true
7979
},
8080
{
@@ -86,8 +86,8 @@
8686
"aggregationType": "Sum",
8787
"aggregationField": "Damage",
8888
"requiredValue": 1250,
89-
"rewardGold": 3000,
90-
"rewardExperience": 100000,
89+
"rewardGold": 500,
90+
"rewardExperience": 25000,
9191
"isActive": true
9292
},
9393
{
@@ -99,8 +99,8 @@
9999
"aggregationType": "Sum",
100100
"aggregationField": "Damage",
101101
"requiredValue": 500,
102-
"rewardGold": 3000,
103-
"rewardExperience": 100000,
102+
"rewardGold": 500,
103+
"rewardExperience": 25000,
104104
"isActive": true
105105
},
106106
{
@@ -112,8 +112,8 @@
112112
"aggregationType": "Count",
113113
"aggregationField": null,
114114
"requiredValue": 20,
115-
"rewardGold": 3000,
116-
"rewardExperience": 100000,
115+
"rewardGold": 500,
116+
"rewardExperience": 25000,
117117
"isActive": true
118118
},
119119
{
@@ -125,8 +125,8 @@
125125
"aggregationType": "Count",
126126
"aggregationField": null,
127127
"requiredValue": 5,
128-
"rewardGold": 3000,
129-
"rewardExperience": 100000,
128+
"rewardGold": 500,
129+
"rewardExperience": 25000,
130130
"isActive": true
131131
},
132132
{
@@ -138,8 +138,8 @@
138138
"aggregationType": "Count",
139139
"aggregationField": null,
140140
"requiredValue": 15,
141-
"rewardGold": 3000,
142-
"rewardExperience": 100000,
141+
"rewardGold": 500,
142+
"rewardExperience": 25000,
143143
"isActive": true
144144
},
145145
{
@@ -151,8 +151,8 @@
151151
"aggregationType": "Count",
152152
"aggregationField": null,
153153
"requiredValue": 10,
154-
"rewardGold": 3000,
155-
"rewardExperience": 100000,
154+
"rewardGold": 500,
155+
"rewardExperience": 25000,
156156
"isActive": true
157157
},
158158
{
@@ -164,8 +164,8 @@
164164
"aggregationType": "Count",
165165
"aggregationField": null,
166166
"requiredValue": 80,
167-
"rewardGold": 3000,
168-
"rewardExperience": 100000,
167+
"rewardGold": 500,
168+
"rewardExperience": 25000,
169169
"isActive": true
170170
},
171171
{
@@ -177,8 +177,8 @@
177177
"aggregationType": "Count",
178178
"aggregationField": null,
179179
"requiredValue": 200,
180-
"rewardGold": 3000,
181-
"rewardExperience": 100000,
180+
"rewardGold": 500,
181+
"rewardExperience": 25000,
182182
"isActive": true
183183
},
184184
{
@@ -190,8 +190,8 @@
190190
"aggregationType": "Sum",
191191
"aggregationField": "Damage",
192192
"requiredValue": 500,
193-
"rewardGold": 3000,
194-
"rewardExperience": 100000,
193+
"rewardGold": 500,
194+
"rewardExperience": 25000,
195195
"isActive": true
196196
},
197197
{
@@ -203,8 +203,8 @@
203203
"aggregationType": "Sum",
204204
"aggregationField": "Damage",
205205
"requiredValue": 750,
206-
"rewardGold": 3000,
207-
"rewardExperience": 100000,
206+
"rewardGold": 500,
207+
"rewardExperience": 25000,
208208
"isActive": true
209209
},
210210
{
@@ -216,8 +216,8 @@
216216
"aggregationType": "Sum",
217217
"aggregationField": "Damage",
218218
"requiredValue": 500,
219-
"rewardGold": 3000,
220-
"rewardExperience": 100000,
219+
"rewardGold": 500,
220+
"rewardExperience": 25000,
221221
"isActive": true
222222
},
223223
{
@@ -229,8 +229,8 @@
229229
"aggregationType": "Count",
230230
"aggregationField": null,
231231
"requiredValue": 10,
232-
"rewardGold": 3000,
233-
"rewardExperience": 100000,
232+
"rewardGold": 500,
233+
"rewardExperience": 25000,
234234
"isActive": true
235235
},
236236
{
@@ -242,8 +242,8 @@
242242
"aggregationType": "Count",
243243
"aggregationField": null,
244244
"requiredValue": 30,
245-
"rewardGold": 3000,
246-
"rewardExperience": 100000,
245+
"rewardGold": 500,
246+
"rewardExperience": 25000,
247247
"isActive": true
248248
},
249249
{
@@ -255,8 +255,8 @@
255255
"aggregationType": "Sum",
256256
"aggregationField": "Damage",
257257
"requiredValue": 5000,
258-
"rewardGold": 10000,
259-
"rewardExperience": 350000,
258+
"rewardGold": 5000,
259+
"rewardExperience": 150000,
260260
"isActive": true
261261
},
262262
{
@@ -268,8 +268,8 @@
268268
"aggregationType": "Count",
269269
"aggregationField": null,
270270
"requiredValue": 100,
271-
"rewardGold": 10000,
272-
"rewardExperience": 350000,
271+
"rewardGold": 5000,
272+
"rewardExperience": 150000,
273273
"isActive": true
274274
},
275275
{
@@ -281,8 +281,8 @@
281281
"aggregationType": "Count",
282282
"aggregationField": null,
283283
"requiredValue": 25,
284-
"rewardGold": 10000,
285-
"rewardExperience": 350000,
284+
"rewardGold": 5000,
285+
"rewardExperience": 150000,
286286
"isActive": true
287287
},
288288
{
@@ -294,8 +294,8 @@
294294
"aggregationType": "Count",
295295
"aggregationField": null,
296296
"requiredValue": 50,
297-
"rewardGold": 10000,
298-
"rewardExperience": 350000,
297+
"rewardGold": 5000,
298+
"rewardExperience": 150000,
299299
"isActive": true
300300
},
301301
{
@@ -307,8 +307,8 @@
307307
"aggregationType": "Sum",
308308
"aggregationField": "Damage",
309309
"requiredValue": 5000,
310-
"rewardGold": 10000,
311-
"rewardExperience": 350000,
310+
"rewardGold": 5000,
311+
"rewardExperience": 150000,
312312
"isActive": true
313313
},
314314
{
@@ -320,8 +320,8 @@
320320
"aggregationType": "Count",
321321
"aggregationField": null,
322322
"requiredValue": 500,
323-
"rewardGold": 10000,
324-
"rewardExperience": 350000,
323+
"rewardGold": 5000,
324+
"rewardExperience": 150000,
325325
"isActive": true
326326
}
327327
]

0 commit comments

Comments
 (0)