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
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
 46 files changed, 121 insertions(+), 44 deletions(-)

diff --git config_180706_1705/Items/laser/hadouken.txt config_180710_1354/Items/laser/hadouken.txt
index ebb3b35..7fab7ae 100644
--- config_180706_1705/Items/laser/hadouken.txt
+++ config_180710_1354/Items/laser/hadouken.txt
@@ -70,10 +70,10 @@ gunMounts:
     soundMinInterval:
     - '0.02'
     - '0.05'
   syncOffset: '1'
   syncTo: hadouken_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootLaser_UltraRare
 id: hadouken
 slot: MainGun
 tag: laser
 tier: '100'
diff --git config_180706_1705/Items/laser/laser_blackhole.txt config_180710_1354/Items/laser/laser_blackhole.txt
index da41074..cacbccd 100644
--- config_180706_1705/Items/laser/laser_blackhole.txt
+++ config_180710_1354/Items/laser/laser_blackhole.txt
@@ -35,10 +35,10 @@ gunMounts:
     volume: '0.3'
   sprinklerFlyback: 'false'
   sprinklerIncrementAngle: '22.5'
   sprinklerStartAngle: '0'
   sprinklerTurnbackAngle: '8000'
-icon: ItemLootGun_UltraRare
+icon: ItemLootLaser_UltraRare
 id: laser_blackhole
 slot: MainGun
 tag: laser
 tier: '100'
diff --git config_180706_1705/Items/laser/laser_moon.txt config_180710_1354/Items/laser/laser_moon.txt
index 5636202..2b496f2 100644
--- config_180706_1705/Items/laser/laser_moon.txt
+++ config_180710_1354/Items/laser/laser_moon.txt
@@ -77,10 +77,10 @@ gunMounts:
   sprinklerIncrementAngle: '-30'
   sprinklerStartAngle: '-180'
   sprinklerTurnbackAngle: '-3600'
   syncOffset: '1'
   syncTo: lasermoon_mount
-icon: ItemLootGun_UltraRare
+icon: ItemLootLaser_UltraRare
 id: laser_moon
 slot: MainGun
 tag: laser
 tier: '100'
diff --git config_180706_1705/Items/laser/laser_rear.txt config_180710_1354/Items/laser/laser_rear.txt
index dd4ff11..6e00a49 100644
--- config_180706_1705/Items/laser/laser_rear.txt
+++ config_180710_1354/Items/laser/laser_rear.txt
@@ -51,10 +51,10 @@ gunMounts:
     soundMinInterval:
     - '0.02'
     - '0.05'
   syncOffset: '0.33'
   syncTo: laserrearcharge_mount
-icon: ItemLootGun_UltraRare
+icon: ItemLootLaser_UltraRare
 id: laser_rear
 slot: MainGun
 tag: laser
 tier: '100'
diff --git config_180706_1705/Items/machinegun/machinegun_apache.txt config_180710_1354/Items/machinegun/machinegun_apache.txt
index 5ba5263..42d9fbf 100644
--- config_180706_1705/Items/machinegun/machinegun_apache.txt
+++ config_180710_1354/Items/machinegun/machinegun_apache.txt
@@ -55,10 +55,10 @@ gunMounts:
     soundMinInterval:
     - '0.02'
     - '0.05'
   syncOffset: '1'
   syncTo: machinegunapache_mount
-icon: ItemLootGun_UltraRare
+icon: ItemLootMachineGun_UltraRare
 id: machinegun_apache
 slot: MainGun
 tag: machinegun
 tier: '100'
diff --git config_180706_1705/Items/machinegun/machinegun_blizzard.txt config_180710_1354/Items/machinegun/machinegun_blizzard.txt
index 66845e7..d616aa6 100644
--- config_180706_1705/Items/machinegun/machinegun_blizzard.txt
+++ config_180710_1354/Items/machinegun/machinegun_blizzard.txt
@@ -69,10 +69,10 @@ gunMounts:
     pitch: '2'
     sound: machinegun
     soundMinInterval:
     - '0.02'
     - '0.05'
-icon: ItemLootGun_UltraRare
+icon: ItemLootMachineGun_UltraRare
 id: machinegun_blizzard
 slot: MainGun
 tag: machinegun
 tier: '50'
diff --git config_180706_1705/Items/machinegun/machinegun_gattling.txt config_180710_1354/Items/machinegun/machinegun_gattling.txt
index 34b80eb..a79381b 100644
--- config_180706_1705/Items/machinegun/machinegun_gattling.txt
+++ config_180710_1354/Items/machinegun/machinegun_gattling.txt
@@ -31,10 +31,10 @@ gunMounts:
     pitch: '0.5'
     sound: machinegun
     soundMinInterval:
     - '0.02'
     - '0.05'
-icon: ItemLootGun_UltraRare
+icon: ItemLootMachineGun_UltraRare
 id: machinegun_gattling
 slot: MainGun
 tag: machinegun
 tier: '100'
diff --git config_180706_1705/Items/machinegun/machinegun_kraken.txt config_180710_1354/Items/machinegun/machinegun_kraken.txt
index 35121a4..38ca3a6 100644
--- config_180706_1705/Items/machinegun/machinegun_kraken.txt
+++ config_180710_1354/Items/machinegun/machinegun_kraken.txt
@@ -94,10 +94,10 @@ gunMounts:
   offset:
   - '0'
   - '-1'
   sfx:
     sound: 'null'
-icon: ItemLootGun_UltraRare
+icon: ItemLootMachineGun_UltraRare
 id: machinegun_kraken
 slot: MainGun
 tag: machinegun
 tier: '100'
diff --git config_180706_1705/Items/machinegun/machinegun_wide.txt config_180710_1354/Items/machinegun/machinegun_wide.txt
index 402a3a4..72e0373 100644
--- config_180706_1705/Items/machinegun/machinegun_wide.txt
+++ config_180710_1354/Items/machinegun/machinegun_wide.txt
@@ -40,10 +40,10 @@ gunMounts:
     spread: '0'
   mountAngle: '60'
   mountName: machinegun_wide_mount2
   sfx:
     sound: 'null'
-icon: ItemLootGun_UltraRare
+icon: ItemLootMachineGun_UltraRare
 id: machinegun_wide
 slot: MainGun
 tag: machinegun
 tier: '100'
diff --git config_180706_1705/Items/shotgun/shotgun_backshot.txt config_180710_1354/Items/shotgun/shotgun_backshot.txt
index 663ef39..123f252 100644
--- config_180706_1705/Items/shotgun/shotgun_backshot.txt
+++ config_180710_1354/Items/shotgun/shotgun_backshot.txt
@@ -40,10 +40,10 @@ gunMounts:
     spread: '0'
   mountAngle: '-180'
   mountName: shotgun_backshot_mount2
   sfx:
     sound: 'null'
-icon: ItemLootGun_UltraRare
+icon: ItemLootShotgun_UltraRare
 id: shotgun_backshot
 slot: MainGun
 tag: shotgun
 tier: '100'
diff --git config_180706_1705/Items/shotgun/shotgun_combat.txt config_180710_1354/Items/shotgun/shotgun_combat.txt
index 9d27efb..43abe23 100644
--- config_180706_1705/Items/shotgun/shotgun_combat.txt
+++ config_180710_1354/Items/shotgun/shotgun_combat.txt
@@ -23,10 +23,10 @@ gunMounts:
     spread: '20'
   mountName: shotgun_combat_mount
   sfx:
     pitch: '0.5'
     sound: shotgun
-icon: ItemLootGun_UltraRare
+icon: ItemLootShotgun_UltraRare
 id: shotgun_combat
 slot: MainGun
 tag: shotgun
 tier: '100'
diff --git config_180706_1705/Items/shotgun/shotgun_doomsday_3.txt config_180710_1354/Items/shotgun/shotgun_doomsday_3.txt
index fac4083..17c3dfa 100644
--- config_180706_1705/Items/shotgun/shotgun_doomsday_3.txt
+++ config_180710_1354/Items/shotgun/shotgun_doomsday_3.txt
@@ -50,10 +50,10 @@ gunMounts:
     spread: '0'
   mountAngle: '-90'
   mountName: shotgun_doomsday_mount2
   sfx:
     sound: 'null'
-icon: ItemLootGun_UltraRare
+icon: ItemLootShotgun_UltraRare
 id: shotgun_doomsday_3
 slot: MainGun
 tag: shotgun
 tier: '100'
diff --git config_180706_1705/Items/shotgun/shotgun_flat.txt config_180710_1354/Items/shotgun/shotgun_flat.txt
index 9ac21d0..b13ed76 100644
--- config_180706_1705/Items/shotgun/shotgun_flat.txt
+++ config_180710_1354/Items/shotgun/shotgun_flat.txt
@@ -25,10 +25,10 @@ gunMounts:
     speed: '28.0'
     spread: '0'
   mountName: shotgunflat_mount
   sfx:
     sound: shotgun
-icon: ItemLootGun_UltraRare
+icon: ItemLootShotgun_UltraRare
 id: shotgun_flat
 slot: MainGun
 tag: shotgun
 tier: '100'
diff --git config_180706_1705/Items/sniper/sniper_hawkeye.txt config_180710_1354/Items/sniper/sniper_hawkeye.txt
index 1895ef5..f4e751e 100644
--- config_180706_1705/Items/sniper/sniper_hawkeye.txt
+++ config_180710_1354/Items/sniper/sniper_hawkeye.txt
@@ -39,10 +39,10 @@ gunMounts:
     speed: '5'
     spread: '10'
   mountName: sniperhawkeye_mount2
   sfx:
     sound: 'null'
-icon: ItemLootGun_UltraRare
+icon: ItemLootSniper_UltraRare
 id: sniper_hawkeye
 slot: MainGun
 tag: sniper
 tier: '100'
diff --git config_180706_1705/Items/sniper/sniper_reaper.txt config_180710_1354/Items/sniper/sniper_reaper.txt
index f4fdb8c..dd041af 100644
--- config_180706_1705/Items/sniper/sniper_reaper.txt
+++ config_180710_1354/Items/sniper/sniper_reaper.txt
@@ -56,10 +56,10 @@ gunMounts:
   - '3'
   sfx:
     sound: 'null'
   syncOffset: '0.0'
   syncTo: sniperreaper_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSniper_UltraRare
 id: sniper_reaper
 slot: MainGun
 tag: sniper
 tier: '100'
diff --git config_180706_1705/Items/sniper/sniper_side.txt config_180710_1354/Items/sniper/sniper_side.txt
index cf35fb3..496050d 100644
--- config_180706_1705/Items/sniper/sniper_side.txt
+++ config_180710_1354/Items/sniper/sniper_side.txt
@@ -70,10 +70,10 @@ gunMounts:
     spread: '20'
   mountAngle: '90'
   mountName: sniper_side_mount3
   sfx:
     sound: 'null'
-icon: ItemLootGun_UltraRare
+icon: ItemLootSniper_UltraRare
 id: sniper_side
 slot: MainGun
 tag: sniper
 tier: '100'
diff --git config_180706_1705/Items/sniper/sniper_wasp.txt config_180710_1354/Items/sniper/sniper_wasp.txt
index 51b39c0..784455c 100644
--- config_180706_1705/Items/sniper/sniper_wasp.txt
+++ config_180710_1354/Items/sniper/sniper_wasp.txt
@@ -78,10 +78,10 @@ gunMounts:
     speed: '35.0'
     spread: '0'
   mountName: sniper_wasp_mount3
   sfx:
     sound: 'null'
-icon: ItemLootGun_UltraRare
+icon: ItemLootSniper_UltraRare
 id: sniper_wasp
 slot: MainGun
 tag: sniper
 tier: '100'
diff --git config_180706_1705/Items/sword/sword_plasmashiv.txt config_180710_1354/Items/sword/sword_plasmashiv.txt
index 2fa8ab9..fa98d75 100644
--- config_180706_1705/Items/sword/sword_plasmashiv.txt
+++ config_180710_1354/Items/sword/sword_plasmashiv.txt
@@ -72,10 +72,10 @@ actions:
     - '1.875'
     sfx:
       sound: 'null'
     syncOffset: '0.0'
     syncTo: sword_plasmashiv_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootSword_UltraRare
 id: sword_plasmashiv
 slot: MainGun
 tag: sword
 tier: '100'
diff --git config_180706_1705/Items/triple/triple_charge.txt config_180710_1354/Items/triple/triple_charge.txt
index 6a340b0..9daa6cb 100644
--- config_180706_1705/Items/triple/triple_charge.txt
+++ config_180710_1354/Items/triple/triple_charge.txt
@@ -100,10 +100,10 @@ gunMounts:
   mountName: triple_charge_mount4
   sfx:
     sound: blaster
   syncOffset: '3'
   syncTo: triple_charge_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootTriple_UltraRare
 id: triple_charge
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180706_1705/Items/triple/triple_stun.txt config_180710_1354/Items/triple/triple_stun.txt
index 4fa5dfa..f4abbc5 100644
--- config_180706_1705/Items/triple/triple_stun.txt
+++ config_180710_1354/Items/triple/triple_stun.txt
@@ -39,10 +39,10 @@ gunMounts:
     speed: '14.0'
     spread: '0'
   mountName: triple_stunmount2
   sfx:
     sound: 'null'
-icon: ItemLootGun_UltraRare
+icon: ItemLootTriple_UltraRare
 id: triple_stun
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180706_1705/Items/triple/triple_terror.txt config_180710_1354/Items/triple/triple_terror.txt
index 9008d7a..b3d3903 100644
--- config_180706_1705/Items/triple/triple_terror.txt
+++ config_180710_1354/Items/triple/triple_terror.txt
@@ -23,10 +23,10 @@ gunMounts:
     pitch: '2'
     sound: blaster
     soundMinInterval:
     - '0.02'
     - '0.05'
-icon: ItemLootGun_UltraRare
+icon: ItemLootTriple_UltraRare
 id: triple_terror
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180706_1705/Items/triple/triple_trident.txt config_180710_1354/Items/triple/triple_trident.txt
index c013f79..240b2c9 100644
--- config_180706_1705/Items/triple/triple_trident.txt
+++ config_180710_1354/Items/triple/triple_trident.txt
@@ -81,10 +81,10 @@ gunMounts:
   mountName: triple_trident_mount3
   sfx:
     sound: laser
   syncOffset: '2'
   syncTo: triple_trident_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootTriple_UltraRare
 id: triple_trident
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180706_1705/Items/wasp/wasp_beam.txt config_180710_1354/Items/wasp/wasp_beam.txt
index 584b19f..325a156 100644
--- config_180706_1705/Items/wasp/wasp_beam.txt
+++ config_180710_1354/Items/wasp/wasp_beam.txt
@@ -22,10 +22,10 @@ gunMounts:
     sound: wasp
   sprinklerFlyback: 'false'
   sprinklerIncrementAngle: '120'
   sprinklerStartAngle: '0'
   sprinklerTurnbackAngle: '360'
-icon: ItemLootGun_UltraRare
+icon: ItemLootWasp_UltraRare
 id: wasp_beam
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180706_1705/Items/wasp/wasp_kaiju_3.txt config_180710_1354/Items/wasp/wasp_kaiju_3.txt
index ecc097b..019ea07 100644
--- config_180706_1705/Items/wasp/wasp_kaiju_3.txt
+++ config_180710_1354/Items/wasp/wasp_kaiju_3.txt
@@ -51,10 +51,10 @@ gunMounts:
   slewRate: '180'
   sprinklerFlyback: 'false'
   sprinklerIncrementAngle: '-2'
   sprinklerStartAngle: '0'
   sprinklerTurnbackAngle: '-8000'
-icon: ItemLootGun_UltraRare
+icon: ItemLootWasp_UltraRare
 id: wasp_kaiju_3
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180706_1705/Items/wasp/wasp_phoenix.txt config_180710_1354/Items/wasp/wasp_phoenix.txt
index df266bd..768cb66 100644
--- config_180706_1705/Items/wasp/wasp_phoenix.txt
+++ config_180710_1354/Items/wasp/wasp_phoenix.txt
@@ -55,10 +55,10 @@ gunMounts:
   sprinklerIncrementAngle: '2'
   sprinklerStartAngle: '-10'
   sprinklerTurnbackAngle: '10'
   syncOffset: '0.75'
   syncTo: waspphoenix_mount1
-icon: ItemLootGun_UltraRare
+icon: ItemLootWasp_UltraRare
 id: wasp_phoenix
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180706_1705/Items/wasp/wasp_space.txt config_180710_1354/Items/wasp/wasp_space.txt
index c84b37f..e637111 100644
--- config_180706_1705/Items/wasp/wasp_space.txt
+++ config_180710_1354/Items/wasp/wasp_space.txt
@@ -112,10 +112,10 @@ gunMounts:
     sound: 'null'
   sprinklerFlyback: 'false'
   sprinklerIncrementAngle: '0'
   sprinklerStartAngle: '0'
   sprinklerTurnbackAngle: '360000'
-icon: ItemLootGun_UltraRare
+icon: ItemLootWasp_UltraRare
 id: wasp_space
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180706_1705/Items/wasp/wasp_zem.txt config_180710_1354/Items/wasp/wasp_zem.txt
index 8280e5d..bfd770e 100644
--- config_180706_1705/Items/wasp/wasp_zem.txt
+++ config_180710_1354/Items/wasp/wasp_zem.txt
@@ -23,10 +23,10 @@ gunMounts:
   - '0'
   - '0'
   sfx:
     pitch: '1.3'
     sound: wasp
-icon: ItemLootGun_UltraRare
+icon: ItemLootWasp_UltraRare
 id: wasp_zem
 slot: MainGun
 tag: triple
 tier: '100'
diff --git config_180710_1354/Texts/en-US/popupSetpieces.txt config_180710_1354/Texts/en-US/popupSetpieces.txt
new file mode 100644
index 0000000..7245e65
--- /dev/null
+++ config_180710_1354/Texts/en-US/popupSetpieces.txt
@@ -0,0 +1,3 @@
+psp_test:
+  announceOnDeath: The testing popup setpiece is no more!
+  announceOnSpawn: Welcome the testing popup setpiece!
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_22MID_wraith_T3/DQ_CS_22MID_wraith.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_22MID_wraith_T3/DQ_CS_22MID_wraith.txt
index fb0aa2b..adec6c2 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_22MID_wraith_T3/DQ_CS_22MID_wraith.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_22MID_wraith_T3/DQ_CS_22MID_wraith.txt	
@@ -1,6 +1,6 @@
-art: EnemyWraith
+art: EnemyWraithQuest
 artScale: '1.8'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0.01'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_22MID_wraith_T3/DQ_CS_22MID_wraithDEATH.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_22MID_wraith_T3/DQ_CS_22MID_wraithDEATH.txt
index 5fe48b9..28e7207 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_22MID_wraith_T3/DQ_CS_22MID_wraithDEATH.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_22MID_wraith_T3/DQ_CS_22MID_wraithDEATH.txt	
@@ -1,6 +1,6 @@
-art: EnemyWraith
+art: EnemyWraithQuest
 artScale: '1.8'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_31HGH_angel2/DQ_CS_31HGH_angel2.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_31HGH_angel2/DQ_CS_31HGH_angel2.txt
index d588212..e04201b 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_31HGH_angel2/DQ_CS_31HGH_angel2.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_31HGH_angel2/DQ_CS_31HGH_angel2.txt	
@@ -1,6 +1,6 @@
-art: EnemyMechaAngel
+art: EnemyMechaAngelQuest
 artScale: '0.7'
 colliderRadius: '0.8'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_41MTN_vampire/DQ_CS_41MTN_vampire.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_41MTN_vampire/DQ_CS_41MTN_vampire.txt
index 68feb78..9eac006 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_41MTN_vampire/DQ_CS_41MTN_vampire.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_CS_41MTN_vampire/DQ_CS_41MTN_vampire.txt	
@@ -1,6 +1,6 @@
-art: EnemyEstateGuard
+art: EnemyEstateGuardQuest
 artScale: '2'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderRadius: '1'
 colliderX: '0'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_12LOW_gridboss_T3/DQ_KS_12LOW_gridboss.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_12LOW_gridboss_T3/DQ_KS_12LOW_gridboss.txt
index 96b3c5a..ba7de25 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_12LOW_gridboss_T3/DQ_KS_12LOW_gridboss.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_12LOW_gridboss_T3/DQ_KS_12LOW_gridboss.txt	
@@ -1,6 +1,6 @@
-art: EnemyGuardTurret
+art: EnemyGuardTurretQuest
 artScale: '2'
 bankSmoothing: '10000'
 colliderRadius: '.8'
 colliderX: '0'
 colliderY: '0'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_21MID_dogturret_T3/DQ_KS_21MID_dogturretrepairdrone.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_21MID_dogturret_T3/DQ_KS_21MID_dogturretrepairdrone.txt
index 296ec32..8624779 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_21MID_dogturret_T3/DQ_KS_21MID_dogturretrepairdrone.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_21MID_dogturret_T3/DQ_KS_21MID_dogturretrepairdrone.txt	
@@ -1,6 +1,6 @@
-art: EnemyBombKitten
+art: EnemyImperialRepairDrone
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_21MID_dogturret_T3/DQ_KS_21MID_dogturretrepairdroneattack.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_21MID_dogturret_T3/DQ_KS_21MID_dogturretrepairdroneattack.txt
index dfe9251..7d3746e 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_21MID_dogturret_T3/DQ_KS_21MID_dogturretrepairdroneattack.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_21MID_dogturret_T3/DQ_KS_21MID_dogturretrepairdroneattack.txt	
@@ -1,6 +1,6 @@
-art: EnemyBombKitten
+art: EnemyImperialRepairDrone
 artScale: '1'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whaleshark.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whaleshark.txt
index 94ef64a..db398da 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whaleshark.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whaleshark.txt	
@@ -1,6 +1,6 @@
-art: EnemyWhaleshark
+art: EnemyWhaleSharkQuest
 artScale: '1.5'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderHeight: '1.4'
 colliderRadius: '0'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whalesharkDEATH.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whalesharkDEATH.txt
index 22f14ff..a7f0957 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whalesharkDEATH.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whalesharkDEATH.txt	
@@ -1,6 +1,6 @@
-art: EnemyWhaleshark
+art: EnemyWhaleSharkQuest
 artScale: '1.5'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderHeight: '1.4'
 colliderRadius: '0'
diff --git config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_31HGH_flakboss/DQ_KS_31HGH_flakboss.txt config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_31HGH_flakboss/DQ_KS_31HGH_flakboss.txt
index 7ffed43..a6974ce 100644
--- config_180706_1705/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_31HGH_flakboss/DQ_KS_31HGH_flakboss.txt	
+++ config_180710_1354/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_31HGH_flakboss/DQ_KS_31HGH_flakboss.txt	
@@ -1,6 +1,6 @@
-art: EnemyRoboBomber
+art: EnemyFireBomberQuest
 artScale: '1.5'
 bankSmoothing: '10000'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderHeight: '4.4'
diff --git config_180706_1705/Units/63D - Bomb Dungeon/BOS1_bombbossDEATH.txt config_180710_1354/Units/63D - Bomb Dungeon/BOS1_bombbossDEATH.txt
index 4348e0c..44038ef 100644
--- config_180706_1705/Units/63D - Bomb Dungeon/BOS1_bombbossDEATH.txt	
+++ config_180710_1354/Units/63D - Bomb Dungeon/BOS1_bombbossDEATH.txt	
@@ -1,15 +1,15 @@
-art: EnemyBombBoss_Prefab
+art: EnemyBombBossDeath_Prefab
 artScale: '1'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderRadius: '0.75'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
 energyRegenRate: '0'
-explosionPrefab: ExplosionBig2
+explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
   flashOffset: '0'
   gunTemplateName: gargantuaDEATHgun
diff --git config_180706_1705/Units/69D - Temple Dungeon/BOS1_smokeboss.txt config_180710_1354/Units/69D - Temple Dungeon/BOS1_smokeboss.txt
index 3ee1317..da87d27 100644
--- config_180706_1705/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
+++ config_180710_1354/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
@@ -243,11 +243,11 @@ additionalStates:
         value: '0.5'
     transitions:
     - code: Time
       toState: main
       value: '10'
-art: EnemyTempleBoss
+art: EnemyTempleBossPrefab
 artScale: '1'
 bankSmoothing: '10000'
 cameraZoomMultiplier: '1.3'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.6'
diff --git config_180710_1354/cloud_fx.txt config_180710_1354/cloud_fx.txt
new file mode 100644
index 0000000..a7cfc60
--- /dev/null
+++ config_180710_1354/cloud_fx.txt
@@ -0,0 +1,26 @@
+damageAura:
+  prefabName: damageAuraFX
+damageBlast:
+  prefabName: damageBlastFXDefault
+damageBlastPremium:
+  prefabName: damageBlastFXPremium
+damageCloud:
+  prefabName: damageCloudFX
+damageResistAura:
+  prefabName: damageResistAuraFX
+healAura:
+  prefabName: healAuraFX
+healCloud:
+  prefabName: healCloudFXDefault
+healCloudFountain:
+  prefabName: healCloudFXFountain
+healCloudPremium:
+  prefabName: healCloudFXPremium
+poisonBlast:
+  prefabName: poisonBlastFXDefault
+poisonBlastPremium:
+  prefabName: poisonBlastFXPremium
+poisonCloud:
+  prefabName: poisonCloudFX
+rechargeCloud:
+  prefabName: rechargeCloudFX
diff --git config_180706_1705/index.txt config_180710_1354/index.txt
index 6ae33fd..fccce21 100644
--- config_180706_1705/index.txt
+++ config_180710_1354/index.txt
@@ -1,8 +1,9 @@
 - allocs
 - bullets
 - camera
+- cloud_fx
 - clouds
 - connection
 - events
 - global
 - gradientNames
@@ -109,10 +110,11 @@
 - Texts/en-US/item
 - Texts/en-US/legal
 - Texts/en-US/lore
 - Texts/en-US/maneuvers
 - Texts/en-US/planeclasses
+- Texts/en-US/popupSetpieces
 - Texts/en-US/questGivers
 - Texts/en-US/quests
 - Texts/en-US/ranks
 - Texts/en-US/skills
 - Texts/en-US/stats
diff --git config_180706_1705/instantEffects.txt config_180710_1354/instantEffects.txt
index 5c96112..8828674 100644
--- config_180706_1705/instantEffects.txt
+++ config_180710_1354/instantEffects.txt
@@ -414,10 +414,39 @@ explosion:
       - '0'
     prefab: ExplosionSmall
     sfx:
       sound: Explosion medium
     time: '0.00'
+explosionBossDebris:
+  steps:
+  - offset:
+      pos:
+      - '0'
+      - '0'
+      - '0'
+    prefab: ExplosionB_Debris
+    time: '0.00'
+explosionBossInitial:
+  steps:
+  - offset:
+      pos:
+      - '0'
+      - '0'
+      - '0'
+    prefab: ExplosionB_Initial
+    sfx:
+      sound: Explosion medium
+    time: '0.00'
+explosionBossSustained:
+  steps:
+  - offset:
+      pos:
+      - '0'
+      - '0'
+      - '0'
+    prefab: ExplosionB_Sustained
+    time: '0.00'
 explosionLarge:
   steps:
   - offset:
       pos:
       - '0'
diff --git config_180706_1705/quick_chat.txt config_180710_1354/quick_chat.txt
index 0465559..9a70196 100644
--- config_180706_1705/quick_chat.txt
+++ config_180710_1354/quick_chat.txt
@@ -30,10 +30,18 @@ D:
   isInUILayer: 'false'
   leakyBucketInterval: '3'
   leakyBucketMax: '3'
   text_key: quick_chat_whee
   text_key_empty: quick_chat_whee
+LoveCommon:
+  isInUILayer: 'false'
+  prefabName: QuickChat_LoveCommon
+  unlock_item_id: emote_love_common
+LoveEpic:
+  isInUILayer: 'false'
+  prefabName: QuickChat_LoveEpic
+  unlock_item_id: emote_love_epic
 LoveFireworks:
   isInUILayer: 'false'
   prefabName: QuickChat_Love
   unlock_item_id: emote_love_fireworks
 None:
@@ -49,13 +57,13 @@ RRR:
   duration: '3'
   isInUILayer: 'true'
   prefabName: QuickChat_RRR
   unlock_item_id: emote_rrr
 ThumbsUp:
-  duration: '1.5'
+  duration: '1.9'
   hidden: 'false'
-  isInUILayer: 'true'
+  isInUILayer: 'false'
   prefabName: QuickChat_ThumbsUp
   unlock_item_id: emote_thumbsup
 Wings:
   duration: '3'
   isInUILayer: 'false'
diff --git config_180706_1705/store.txt config_180710_1354/store.txt
index 2dd2a05..0541718 100644
--- config_180706_1705/store.txt
+++ config_180710_1354/store.txt
@@ -1401,10 +1401,11 @@ products:
   - id: scrap
     price:
       amount: '750'
       currency: scrap
   disabled: 'false'
+  icon: ItemConsumableHealth
   id: store_consumable_health
   items:
   - health_boost
   tags:
   - item_consumable
@@ -1416,10 +1417,11 @@ products:
   - id: scrap
     price:
       amount: '2250'
       currency: scrap
   disabled: 'false'
+  icon: ItemConsumableSteam
   id: store_consumable_steam
   items:
   - consumable_steam
   tags:
   - item_consumable
@@ -1431,18 +1433,19 @@ products:
   - id: scrap
     price:
       amount: '6000'
       currency: scrap
   disabled: 'false'
+  icon: ItemConsumableXPBoost
   id: store_consumable_xpboost
   items:
   - consumable_xpboost
   tags:
   - item_consumable
 - account_items:
   - hangar_slot
-  icon: ItemCrate
+  icon: ItemHangerSlot
   id: hangar_slot
   normal_price:
     amount: '10000'
     amount_sub_item_tag: hangar_slot
     amount_subs:
@@ -1458,11 +1461,11 @@ products:
   - storage_slot
   - storage_slot
   - storage_slot
   - storage_slot
   - store_storage_slot
-  icon: ItemCrate
+  icon: ItemStorageSlot
   id: store_storage_slot
   normal_price:
     amount: '10000'
     amount_sub_item_tag: store_storage_slot
     amount_subs:
diff --git config_180706_1705/unitPaletteTextures.txt config_180710_1354/unitPaletteTextures.txt
index 4d5faae..98556f5 100644
--- config_180706_1705/unitPaletteTextures.txt
+++ config_180710_1354/unitPaletteTextures.txt
@@ -47,10 +47,11 @@ EnemyDoctorOctoA: enemyPal_highlands2
 EnemyDoctorOctoB: enemyPal_highlands2
 EnemyDoctorOctoC: enemyPal_highlands2
 EnemyDrone: enemyPal_midlands1
 EnemyEstateGuard: enemyPal_mountain
 EnemyFighter: enemyPal_lowlands1
+EnemyFireBomberQuest: enemyPal_highlands1
 EnemyFivestar: enemyPal_ruins
 EnemyFivestarleader: enemyPal_ruins
 EnemyFlamer: enemyPal_lowlands1
 EnemyFoxtrot: enemyPal_lowlands1
 EnemyGasstationCommand: enemyPalette_Gasstation
@@ -67,20 +68,23 @@ EnemyGroundskeeperBomb: enemyPal_mountain
 EnemyGrunt: enemyPal_ruins
 EnemyGruntleader: enemyPal_ruins
 EnemyGuardBeast: enemyPal_mountain
 EnemyGuardLion: enemyPal_mountain
 EnemyGuardTurret: enemyPal_lowlands2
+EnemyGuardTurretQuest: enemyPal_lowlands2
 EnemyHammerbot: enemyPal_highlands1
 EnemyHopper: enemyPal_midlands1
 EnemyHopperleader: enemyPal_midlands1
 EnemyHospHurtsnake: enemyPal_highlands2
 EnemyHunter: enemyPal_ruins
+EnemyImperialRepairDrone: enemyPal_lowlands2
 EnemyInquisitor: enemyPal_highmountain
 EnemyLasership: enemyPal_lowlands2
 EnemyLasershipleader: enemyPal_lowlands2
 EnemyMantaray: enemyPal_midlands3
 EnemyMechaAngel: enemyPal_highlands1
+EnemyMechaAngelQuest: enemyPal_highlands1
 EnemyMegapouncer: enemyPal_highlands1
 EnemyMinelayer: enemyPal_midlands1
 EnemyNavi: enemyPal_lowlands3
 EnemyNaviLeader: enemyPal_lowlands3
 EnemyPleasureDronePrefab: enemyPal_highmountain
@@ -139,13 +143,15 @@ EnemyTut3Turret: enemyPal_tut03
 EnemyTutFatBlimp: enemyPal_questBoss
 EnemyTutFlakBlimp: enemyPal_questBoss
 EnemyUltraPouncer: enemyPal_highlands1
 EnemyUnicorn: enemyPal_lowlands2
 EnemyWarhorse: enemyPal_midlands2
+EnemyWhaleSharkQuest: enemyPal_midlands3
 EnemyWhaleshark: enemyPal_midlands3
 EnemyWorkerBee: enemyPal_lowlands3
 EnemyWraith: enemyPal_midlands2
+EnemyWraithQuest: enemyPal_midlands2
 EnemyWrenchGuard: enemyPal_highlands1
 EnemyZombie: enemyPal_midlands2
 EnemyZombieHerder: enemyPal_midlands2
 EnemyZombieQueen: enemyPal_midlands2
 Enemytemplemonk: enemyPal_templeDungeon