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
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
 17 files changed, 385 insertions(+), 42 deletions(-)

diff --git config_190509_0158/Texts/en-US/bark.txt config_190509_2353/Texts/en-US/bark.txt
index 192e34a..b8fa008 100644
--- config_190509_0158/Texts/en-US/bark.txt
+++ config_190509_2353/Texts/en-US/bark.txt
@@ -1322,13 +1322,13 @@ raijin_1:
   - text: The rule of nature say you must fail.
   - text: Scatter, birds!
   - text: Bow to your superiors.
 raijin_2:
   randomOptions:
-  - text: What!
   - text: You've scratched my lovely armor!
   - text: Damage? You just make work for my servants.
+  - weight: '1'
 raijin_3:
   randomOptions:
   - text: None shall enter the high circle!
   - text: From the eye of the storm, I witness your demise!
 raijin_4:
diff --git config_190509_0158/Texts/en-US/conversations.txt config_190509_2353/Texts/en-US/conversations.txt
index 5ce3e77..d020508 100644
--- config_190509_0158/Texts/en-US/conversations.txt
+++ config_190509_2353/Texts/en-US/conversations.txt
@@ -5,10 +5,17 @@ characters:
   portaloperator: Portal Operator
   scientist_owl: Doc Barnhouse
   sergeant: Sergeant
   stevedore_pelican: Coop
 text:
+  boss-hunt_01: You're doing well, Pilot. I think you're ready to help us with something bigger.
+  boss-hunt_02: Meowza's empire is protected by a collection of giant war machines.
+  boss-hunt_03: The weakest of those machines are still very dangerous. We keep wrecking 'em, but Meowza just keeps making 'em.
+  boss-hunt_04: The strongest war machines are incredibly powerful, but fortunately also harder for Meowza to replace.
+  boss-hunt_05: When her top war machines are all annihilated, Meowza will have no choice but to confront us herself!
+  boss-hunt_06: Your job today is to kill three of Meowza's toy war machines, as practice for more serious things to come.
+  boss-hunt_07: Good skies!
   intro-hangar_01: Coop! I've told you a dozen times to quit leaving rusty scrap in my Hangar! Storing junk is your business!
   intro-hangar_02: Oh! Hello there, pilot. I was just interfacing with a business colleague.
   intro-hangar_03: You in need of some wings? I've got you covered.
   intro-hangar_04: If you've crashed your previous aircraft or want to try flying something new, pay me a visit.
   intro-hangar_05: When you unlock a new class, I'll have it ready for you here at the Hangar.
@@ -52,36 +59,36 @@ text:
   intro-workshop_07: Off you go now, pilot.
   intro_01: <size=200%>Recruits!</size>
   intro_02: 40 years ago, the Republic was betrayed.
   intro_03: And from the ashes of that final war, rose our nemesis...
   intro_04: <size=200%>The Feline Empire!</size>
-  intro_05: 'Their leader: Meowza. He calls himself a god. He drove us from our homes and enslaved the survivors.'
-  intro_06: Now Meowza hides in his command bunker while his nobles control the continent.
+  intro_05: 'Their leader: Meowza. She calls herself a god. She drove us from our homes and enslaved the survivors.'
+  intro_06: Now Meowza hides in her command bunker while her nobles control the continent.
   intro_07: The Empire hunts the wastes for ancient powers. Every day they grow stronger.
   intro_08: Those damned cats thought they exterminated all of bird-kind in the War.
   intro_09: But they were wrong. We are rising up! The Rebellion flies again!
   intro_10: Together, we will knock each of those nobles from the sky.
   intro_11: Together, we will destroy Meowza and free this world!
   intro_12: Got it? Good. Time to fly, recruit.
   mewoza-new-player_01: Stand down, recruit!
   mewoza-new-player_02: I know you're wondering why I just teleported you back to the Rebel City.
   mewoza-new-player_03: Our forces just took out the last of Meowza's Lieutenants.
-  mewoza-new-player_04: In retaliation, Meowza warped all of our pilots to his lair for a final battle. Let's hope for the best.
+  mewoza-new-player_04: In retaliation, Meowza warped all of our pilots to her lair for a final battle. Let's hope for the best.
   mewoza-new-player_05: Frankly, I didn't think you were ready, so I brought you here. I hope you understand.
   mewoza-new-player_06: For now, just focus on your missions. Good Skies!
   test-01: Welcome new recruit!
   test-01b: I'll give you a quick intro...
   test-02: This chart shows how cats are bad...
   test-03: Don't forget that! Cats = bad
   test-04: This is how we'll show them what's what...
   test-04b: Over to my trusty friend... the portal operator!
   test-05: Here, grab this item to help you a bit
   test-05-continue: Thanks!
   test-06: Any questions?
   test2-01: This is a quick test. We're not quite sure what we're testing, but make sure you stay sharp!
   tutorial-quests-complete_01: Now that you've got a few missions under your belt, I should brief you on the larger campaign.
-  tutorial-quests-complete_02: Our ultimate goal is to free the world from Meowza and his Feline Empire. That's no simple task.
+  tutorial-quests-complete_02: Our ultimate goal is to free the world from Meowza and her Feline Empire. That's no simple task.
   tutorial-quests-complete_03: To even get a shot at Meowza, we need to take out all of his <color=#FBB040>Lieutenants</color> across around the map.
-  tutorial-quests-complete_04: That'll make Meowza take notice. He'll teleport every bird in the sky to his lair for a final battle.
+  tutorial-quests-complete_04: That'll make Meowza take notice. She'll teleport every bird in the sky to his lair for a final battle.
   tutorial-quests-complete_05: Sound intimidating? Well it is. But remember that we're in this together.
   tutorial-quests-complete_06: Complete missions, level up your plane, upgrade your gear, team up with friends. Prepare yourself for when we get the call.
   tutorial-quests-complete_07: Good skies, recruit.
diff --git config_190509_0158/Texts/en-US/quests.txt config_190509_2353/Texts/en-US/quests.txt
index 15cef4a..0dc7e63 100644
--- config_190509_0158/Texts/en-US/quests.txt
+++ config_190509_2353/Texts/en-US/quests.txt
@@ -929,17 +929,10 @@ bounty_thunderboss:
 bounty_thunderboss_week5:
   description: Kill today's bounty and receive Yellow Steel.
   title: 'Bounty: Rei'
 campaign_bosshunt_01:
   description: The bigger they are, the harder they fall.
-  dialogueOnStart:
-  - sergeant: You're doing well, Pilot. I think you're ready to help us with something bigger.
-  - sergeant: Meowza's empire is protected by a collection of giant war machines.
-  - sergeant: The weakest of those machines are still very dangerous. We keep wrecking 'em, but Meowza just keeps making 'em.
-  - sergeant: The strongest war machines are incredibly powerful, but fortunately also harder for Meowza to replace.
-  - sergeant: When her top war machines are all annihilated, Meowza will have no choice but to confront us herself!
-  - sergeant: Your job today is to kill three of Meowza's toy war machines, as practice for more serious things to come.
   title: Boss Hunt
 craft_armor_8:
   title: 'Craft: Black Armor'
 craft_engine_destruction_8:
   title: 'Craft: Death Engine'
@@ -1011,12 +1004,12 @@ dailyreward_Wednesday:
   title: 'Daily Reward: Wednesday'
 dungeon_finalboss_01:
   description: This is the real deal.  Fight Meowza!
   dialogueOnStart:
   - sergeant: Mother of God... It's the lair of <color=#FBB040>Meowza</color>!!
-  - sergeant: His war machine is the <color=#FBB040>strongest in the world</color>.
-  - sergeant: Fancy yourself to be an ace pilot? Otherwise, you'll be his breakfast.
+  - sergeant: Her war machine is the <color=#FBB040>strongest in the world</color>.
+  - sergeant: Fancy yourself to be an ace pilot? Otherwise, you'll be her breakfast.
   goal_0: <color=#FBB040>KILL MEOWZA</color>
   title: Kill the Emperor
 dungeon_rescue_01:
   description: Escort our drill through the monster-filled caves. Reach the end to get the best rewards.
   dialogueOnStart:
diff --git config_190509_0158/Texts/en-US/ui.txt config_190509_2353/Texts/en-US/ui.txt
index e80de97..f894956 100644
--- config_190509_0158/Texts/en-US/ui.txt
+++ config_190509_2353/Texts/en-US/ui.txt
@@ -1029,10 +1029,11 @@ trade_canceled_in_chat: Trade canceled!
 trade_complete_in_chat: Trade completed!
 trade_complete_the_trade: Complete the trade
 trade_description: Opened between You and {0}
 trade_error_not_enough_cargo_space: You have NOT enough cargo space
 trade_error_not_enough_currency: You have NOT enough currency
+trade_error_on_cooldown: You can accept in {0}
 trade_error_unknown: You can NOT fulfil the offer
 trade_fee_button: Payed in {0}
 trade_fee_by_both: Both players split fee
 trade_fee_by_name: '{0} pays the fee'
 trade_fee_by_you: You pay the fee
diff --git config_190509_0158/Texts/en-US/units.txt config_190509_2353/Texts/en-US/units.txt
index 3852b97..0f04c36 100644
--- config_190509_0158/Texts/en-US/units.txt
+++ config_190509_2353/Texts/en-US/units.txt
@@ -1021,10 +1021,12 @@ thunderbossorb: Defence Orb
 thunderbossorb2: Defence Orb
 thunderbossorb3: Defence Orb
 thunderbossorbmaster: Defence Orb
 thunderbossshieldblade: Defence Grid 2
 thunderbossshieldbladeleader: Defence Grid 2
+thunderbossthunderball: Rei Plasma
+thunderbossthunderball2: Rei Plasma
 thunderminion: Rei
 thunderminion2: Rei
 tieleader2: Dread Rachel
 tiewingman: Peg Boy
 tiewingman_big: Big Boy
diff --git config_190509_2353/Units/54 - Lightning Boss Event/BOS1_thunderbossthunderball.txt config_190509_2353/Units/54 - Lightning Boss Event/BOS1_thunderbossthunderball.txt
new file mode 100644
index 0000000..3b4423e
--- /dev/null
+++ config_190509_2353/Units/54 - Lightning Boss Event/BOS1_thunderbossthunderball.txt	
@@ -0,0 +1,84 @@
+art: ThunderbossOrbPrefab
+artScale: '2'
+colliderRadius: '1'
+colliderX: '0'
+colliderY: '0'
+effectImmunities:
+- Confuse
+elementSusceptibilityIds:
+- waterWeakness
+- burnResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionSmall
+gunMounts:
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '0'
+  gunTemplateName: thunderbossthunderballgun
+  mountAngle: '0'
+  mountName: main
+  offset:
+  - '0'
+  - '0'
+  sfx:
+    pitch: '0.5'
+    sound: Enemy Energy Loop1
+  slewRate: '0'
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '0'
+  gunTemplateName: thunderbossthunderballgun2
+  mountAngle: '0'
+  mountName: main2
+  offset:
+  - '0'
+  - '0'
+  sfx:
+    pitch: '0.5'
+    sound: Enemy Loop Flame Thrower
+  slewRate: '0'
+gunTypes:
+- bulletPrefab: superlonglightningBullet
+  bulletSize: '0.7'
+  burst: '100'
+  cooldown: '0'
+  damage: '0.1'
+  effect: Lightning
+  effectAmount: '0.1'
+  effectDamage: '0.1'
+  effectTime: '0.1'
+  lifetime: '0.2'
+  multi: '3'
+  multiSpread: '120'
+  name: thunderbossthunderballgun
+  rof: '10'
+  speed: '3'
+  spread: '360'
+- bulletPrefab: ringBullet
+  bulletSize: '9'
+  burst: '100'
+  cooldown: '0'
+  damage: '0.1'
+  effect: Lightning
+  effectAmount: '0.1'
+  effectDamage: '0.7'
+  effectTime: '0.1'
+  isPiercing: 'true'
+  lifetime: '0.5'
+  multi: '1'
+  multiSpread: '0'
+  name: thunderbossthunderballgun2
+  rof: '2'
+  speed: '0'
+  spread: '0'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000001'
+maxSpeed: '4'
+maxTurnRate: '10'
+minSpeed: '4'
+spawnInvulnerabilitySeconds: '10'
+templateName: thunderbossthunderball
+tier: '10'
+xpMultiplier: '0'
diff --git config_190509_2353/Units/54 - Lightning Boss Event/BOS1_thunderbossthunderball2.txt config_190509_2353/Units/54 - Lightning Boss Event/BOS1_thunderbossthunderball2.txt
new file mode 100644
index 0000000..ebfa096
--- /dev/null
+++ config_190509_2353/Units/54 - Lightning Boss Event/BOS1_thunderbossthunderball2.txt	
@@ -0,0 +1,84 @@
+art: ThunderbossOrbPrefab
+artScale: '2'
+colliderRadius: '1'
+colliderX: '0'
+colliderY: '0'
+effectImmunities:
+- Confuse
+elementSusceptibilityIds:
+- waterWeakness
+- burnResist
+energyRegenRate: '0'
+explosionPrefab: ExplosionSmall
+gunMounts:
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '0'
+  gunTemplateName: thunderbossthunderball2gun
+  mountAngle: '0'
+  mountName: main
+  offset:
+  - '0'
+  - '0'
+  sfx:
+    pitch: '0.5'
+    sound: Enemy Energy Loop1
+  slewRate: '0'
+- fireMode: JustShootDammit
+  firingArc: '360'
+  flashOffset: '0'
+  gunTemplateName: thunderbossthunderball2gun2
+  mountAngle: '0'
+  mountName: main2
+  offset:
+  - '0'
+  - '0'
+  sfx:
+    pitch: '0.5'
+    sound: Enemy Loop Flame Thrower
+  slewRate: '0'
+gunTypes:
+- bulletPrefab: superlonglightningBullet
+  bulletSize: '0.7'
+  burst: '100'
+  cooldown: '0'
+  damage: '0.1'
+  effect: Lightning
+  effectAmount: '0.1'
+  effectDamage: '0.3'
+  effectTime: '0.1'
+  lifetime: '0.2'
+  multi: '3'
+  multiSpread: '120'
+  name: thunderbossthunderball2gun
+  rof: '10'
+  speed: '3'
+  spread: '360'
+- bulletPrefab: ringBullet
+  bulletSize: '9'
+  burst: '100'
+  cooldown: '0'
+  damage: '0.1'
+  effect: Lightning
+  effectAmount: '0.1'
+  effectDamage: '0.5'
+  effectTime: '0.1'
+  isPiercing: 'true'
+  lifetime: '0.5'
+  multi: '1'
+  multiSpread: '0'
+  name: thunderbossthunderball2gun2
+  rof: '2'
+  speed: '0'
+  spread: '0'
+healthRegenRate: '0'
+isVisibleInRadar: 'false'
+maxEnergyPoints: '1'
+maxHitPoints: '10000001'
+maxSpeed: '8'
+maxTurnRate: '20'
+minSpeed: '8'
+spawnInvulnerabilitySeconds: '10'
+templateName: thunderbossthunderball2
+tier: '10'
+xpMultiplier: '0'
diff --git config_190509_0158/Units/54 - Lightning Boss Event/BOS_thunderboss.txt config_190509_2353/Units/54 - Lightning Boss Event/BOS_thunderboss.txt
index b6d3f83..d0d3e6e 100644
--- config_190509_0158/Units/54 - Lightning Boss Event/BOS_thunderboss.txt	
+++ config_190509_2353/Units/54 - Lightning Boss Event/BOS_thunderboss.txt	
@@ -101,12 +101,12 @@ gunMounts:
   syncTo: lightningfield
 - fireMode: SprinklerTurnback
   firingArc: '0'
   flashOffset: '-2'
   gunTypeConfig:
-    bulletPrefab: superlonglightningBullet
-    bulletSize: '0.5'
+    bulletPrefab: laserBullet
+    bulletSize: '1.2'
     burst: '1'
     cooldown: '100000'
     damage: '0.05'
     effect: Lightning
     effectAmount: '0.1'
@@ -242,11 +242,11 @@ gunTypes:
   spread: '0'
   turn: '-30'
 - bulletPrefab: laserBullet
   bulletSize: '1.5'
   burst: '15'
-  cooldown: '1'
+  cooldown: '3'
   damage: '0.05'
   effect: Lightning
   effectAmount: '0.1'
   effectDamage: '1.5'
   effectTime: '0.1'
diff --git config_190509_0158/Units/54 - Raijin Event/BOS1_raijinring.txt config_190509_2353/Units/54 - Raijin Event/BOS1_raijinring.txt
index 25c9087..0c64a7f 100644
--- config_190509_0158/Units/54 - Raijin Event/BOS1_raijinring.txt	
+++ config_190509_2353/Units/54 - Raijin Event/BOS1_raijinring.txt	
@@ -1,7 +1,8 @@
 art: RaijinRing
 artScale: '1'
+bankSmoothing: '10000'
 colliderRadius: '0.75'
 colliderX: '0'
 colliderY: '0'
 difficultyTable: standardBoss
 effectImmunities:
@@ -39,9 +40,9 @@ maxEnergyPoints: '1'
 maxHitPoints: '300'
 maxSpeed: '5'
 maxTurnRate: '270'
 minSpeed: '5'
 recoilScale: '0'
-spawnInvulnerabilitySeconds: '2'
+spawnInvulnerabilitySeconds: '10'
 templateName: raijinring
 tier: '10'
 xpMultiplier: '0'
diff --git config_190509_0158/Units/54 - Raijin Event/BOS1_raijinringminion.txt config_190509_2353/Units/54 - Raijin Event/BOS1_raijinringminion.txt
index 8567a7a..500800e 100644
--- config_190509_0158/Units/54 - Raijin Event/BOS1_raijinringminion.txt	
+++ config_190509_2353/Units/54 - Raijin Event/BOS1_raijinringminion.txt	
@@ -1,7 +1,8 @@
 art: RaijinRingMinion
 artScale: '1'
+bankSmoothing: '10000'
 colliderRadius: '0.5'
 colliderX: '0'
 colliderY: '0'
 difficultyTable: standardBoss
 effectImmunities:
@@ -17,43 +18,43 @@ gunMounts:
   flashOffset: '0.33'
   gunTemplateName: raijinringminionBurstGun
   mountAngle: '0'
   mountName: burst
   sfx:
-    pitch: '2'
+    pitch: '1'
     sound: Enemy Laser Loop17
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0.33'
   gunTemplateName: raijinringminionBurstGun_2
   mountAngle: '0'
   mountName: burst_2
   sfx:
-    pitch: '2'
+    pitch: '1'
     sound: Enemy Laser Loop17
   slewRate: '0'
   syncOffset: '0.25'
   syncTo: burst
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0.33'
   gunTemplateName: raijinringminionBurstGun2
   mountAngle: '0'
   mountName: burst2
   sfx:
-    pitch: '2'
+    pitch: '1'
     sound: Enemy Laser Loop17
   slewRate: '0'
 - fireMode: SprinklerTurnback
   firingArc: '360'
   flashOffset: '1'
   gunTemplateName: raijinringminionBurstGungreen
   mountAngle: '0'
   mountName: burstgreen
   sfx:
-    pitch: '4'
+    pitch: '2'
     sound: Enemy Laser Loop17
   slewRate: '0'
   sprinklerFlyback: 'true'
   sprinklerIncrementAngle: '3'
   sprinklerStartAngle: '0'
@@ -175,9 +176,9 @@ isVisibleInRadar: 'true'
 maxEnergyPoints: '1'
 maxHitPoints: '36'
 maxSpeed: '20'
 maxTurnRate: '270'
 minSpeed: '20'
-spawnInvulnerabilitySeconds: '5'
+spawnInvulnerabilitySeconds: '12'
 templateName: raijinringminion
 tier: '10'
 xpMultiplier: '0'
diff --git config_190509_0158/Units/54 - Raijin Event/BOS2_raijin.txt config_190509_2353/Units/54 - Raijin Event/BOS2_raijin.txt
index 82ba4e8..bc3aaa5 100644
--- config_190509_0158/Units/54 - Raijin Event/BOS2_raijin.txt	
+++ config_190509_2353/Units/54 - Raijin Event/BOS2_raijin.txt	
@@ -63,21 +63,21 @@ gunMounts:
   sprinklerIncrementAngle: '31'
   sprinklerStartAngle: '0'
   sprinklerTurnbackAngle: '8000'
   syncOffset: '0.0'
   syncTo: main
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '180'
   flashOffset: '0.4'
   gunTemplateName: raijinbfggun
   mountAngle: '0'
   mountName: bfg
   sfx:
     pitch: '0.7'
     sound: Enemy Rocket Deploy
   slewRate: '60'
-- fireMode: Aimed
+- fireMode: JustShootDammit
   firingArc: '180'
   flashOffset: '0.4'
   gunTemplateName: raijinbfggun2
   mountAngle: '0'
   mountName: bfg2
@@ -266,18 +266,20 @@ gunTypes:
   rof: '3'
   speed: '0'
   spread: '0'
 - bulletPrefab: leisurelyBullet
   bulletSize: '5'
-  burst: '3'
+  burst: '9'
   cooldown: '2'
   damage: '0.1'
   effect: Burn
   effectAmount: '0.1'
   effectDamage: '1.8'
   effectTime: '0.1'
   lifetime: '5'
+  multi: '3'
+  multiSpread: '120'
   name: raijinbfggun
   rof: '1'
   speed: '6'
   spread: '0'
 - bulletPrefab: leisurelyBullet
@@ -288,10 +290,12 @@ gunTypes:
   effect: Burn
   effectAmount: '0.1'
   effectDamage: '2.1'
   effectTime: '0.1'
   lifetime: '4'
+  multi: '3'
+  multiSpread: '120'
   name: raijinbfggun2
   rof: '1'
   speed: '2.2'
   spread: '0'
 - bulletPrefab: laserBullet
@@ -308,23 +312,23 @@ gunTypes:
   name: raijinvortexgun
   rof: '30'
   speed: '7.5'
   spread: '0'
 - bulletPrefab: laserBullet
-  burst: '100'
+  burst: '150'
   cooldown: '100'
   damage: '0.1'
   effect: Burn
   effectAmount: '0.1'
   effectDamage: '0.15'
   effectTime: '0.1'
-  lifetime: '4'
-  multi: '3'
-  multiSpread: '120'
+  lifetime: '6'
+  multi: '6'
+  multiSpread: '60'
   name: raijinvortexgun2
   rof: '30'
-  speed: '4'
+  speed: '6'
   spread: '0'
 - bulletPrefab: laserBullet
   burst: '180'
   cooldown: '0'
   damage: '0.1'
@@ -348,11 +352,11 @@ gunTypes:
   damage: '0.1'
   effect: Burn
   effectAmount: '0.1'
   effectDamage: '0.15'
   effectTime: '0.1'
-  lifetime: '1'
+  lifetime: '3'
   multi: '4'
   multiOffset:
   - '-0.25'
   - '0.75'
   multiSpread: '0'
@@ -366,11 +370,11 @@ gunTypes:
   damage: '0.1'
   effect: Burn
   effectAmount: '0.1'
   effectDamage: '0.15'
   effectTime: '0.1'
-  lifetime: '1'
+  lifetime: '3'
   multi: '4'
   multiOffset:
   - '0.66'
   - '0'
   multiSpread: '0'
diff --git config_190509_0158/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt config_190509_2353/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt
index 64e0cf3..e652326 100644
--- config_190509_0158/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt	
+++ config_190509_2353/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt	
@@ -1,6 +1,128 @@
 additionalStates:
+  shoot_bombs_at_shoulder_left:
+  - name: initial
+    transitions:
+    - code: EnemyWithinArc
+      name: relative
+      toState: wait
+      value: '45'
+      value2: '179'
+      valueR: '15'
+  - name: wait
+    transitions:
+    - code: Time
+      toState: fireandchill
+      value: '5'
+  - events:
+    - code: Spawn
+      name: sneezybomb
+      offset:
+        addRotation: '180'
+        angle: '10'
+        distance: '5'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      name: sneezybomb
+      offset:
+        addRotation: '180'
+        angle: '50'
+        distance: '5'
+        isRelative: 'true'
+      value: '1'
+    name: fireandchill
+    transitions:
+    - code: HealthBelow
+      toState: fireandchill_2
+      value: '0.5'
+    - code: Time
+      toState: initial
+      value: '12'
+  - events:
+    - code: Spawn
+      name: sneezybomb
+      offset:
+        addRotation: '180'
+        angle: '30'
+        distance: '5'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      name: sneezybomb
+      offset:
+        addRotation: '180'
+        angle: '70'
+        distance: '5'
+        isRelative: 'true'
+      value: '1'
+    name: fireandchill_2
+    transitions:
+    - code: Time
+      toState: initial
+      value: '10'
+  shoot_bombs_at_shoulder_right:
+  - name: initial
+    transitions:
+    - code: EnemyWithinArc
+      name: relative
+      toState: wait
+      value: '-179'
+      value2: '-45'
+      valueR: '15'
+  - name: wait
+    transitions:
+    - code: Time
+      toState: fireandchill
+      value: '5'
+  - events:
+    - code: Spawn
+      name: sneezybomb
+      offset:
+        addRotation: '180'
+        angle: '-10'
+        distance: '5'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      name: sneezybomb
+      offset:
+        addRotation: '180'
+        angle: '-50'
+        distance: '5'
+        isRelative: 'true'
+      value: '1'
+    name: fireandchill
+    transitions:
+    - code: HealthBelow
+      toState: fireandchill_2
+      value: '0.5'
+    - code: Time
+      toState: initial
+      value: '12'
+  - events:
+    - code: Spawn
+      name: sneezybomb
+      offset:
+        addRotation: '180'
+        angle: '-30'
+        distance: '5'
+        isRelative: 'true'
+      value: '1'
+    - code: Spawn
+      name: sneezybomb
+      offset:
+        addRotation: '180'
+        angle: '-70'
+        distance: '5'
+        isRelative: 'true'
+      value: '1'
+    name: fireandchill_2
+    transitions:
+    - code: Time
+      toState: initial
+      value: '10'
   toggle_safety:
   - events:
     - code: VariableSet
       name: healthtriggershield1
       value: '0'
diff --git config_190509_0158/Units/70D - Sneezy Mini Dungeon/BOS_sneezybomb.txt config_190509_2353/Units/70D - Sneezy Mini Dungeon/BOS_sneezybomb.txt
index dd180bd..687acb0 100644
--- config_190509_0158/Units/70D - Sneezy Mini Dungeon/BOS_sneezybomb.txt	
+++ config_190509_2353/Units/70D - Sneezy Mini Dungeon/BOS_sneezybomb.txt	
@@ -1,39 +1,41 @@
 art: EnemyRoboMine
-artScale: '1'
+artScale: '1.25'
 cloudOffset: '0'
 colliderRadius: '0.3'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
   flashOffset: '0.0'
   gunTemplateName: sneezybombGrenadeLauncher
   mountAngle: '0'
   mountName: main
+  sfx:
+    sound: 'null'
   slewRate: '0'
 gunTypes:
-- bulletPrefab: leisurelyBullet
-  bulletSize: '8'
-  burst: '10'
-  cooldown: '10'
-  damage: '2'
+- bulletPrefab: invisibleBullet
+  bulletSize: '20'
+  burst: '100000'
+  cooldown: '0'
+  damage: '0.4'
   isPiercing: 'true'
   lifetime: '0.25'
   multi: '1'
   multiSpread: '60'
   name: sneezybombGrenadeLauncher
-  rof: '2'
+  rof: '5'
   speed: '0'
   spread: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
-maxHitPoints: '9'
+maxHitPoints: '15'
 maxSpeed: '1.5'
 maxTurnRate: '55'
 minSpeed: '0.8'
 spawnInvulnerabilitySeconds: '0'
 superspeedFactor: '0'
diff --git config_190509_0158/art_replacements.txt config_190509_2353/art_replacements.txt
index ed74936..ab6d053 100644
--- config_190509_0158/art_replacements.txt
+++ config_190509_2353/art_replacements.txt
@@ -5,10 +5,11 @@ duster_EpicA:
   prefabs:
     damageCloudFX: damageCloudFXPremium
 engineer_EpicA:
   prefabs:
     PlayerEngineerTurret: PlayerEngineerTurretPremium
+    roundFadeBullet: engineerTurretPremiumBullet
 hog_EpicA:
   prefabs:
     poisonBlastFXDefault: poisonBlastFXPremium
 medic_EpicA:
   prefabs:
diff --git config_190509_0158/conversations.txt config_190509_2353/conversations.txt
index c5e9511..11ffd8f 100644
--- config_190509_0158/conversations.txt
+++ config_190509_2353/conversations.txt
@@ -463,5 +463,42 @@ conversations:
   - text: mewoza-new-player_05
   - character: sergeant
     pose: default
   - text: mewoza-new-player_06
   id: meowza-new-player
+- clientTriggerable: 'true'
+  content:
+  - character: sergeant
+    pose: armships_smiling
+  - text: boss-hunt_01
+  - character: sergeant
+    pose: pointing
+  - background: image
+    image: introslide_07
+    offset:
+    - '250'
+    - '150'
+    scale:
+    - '0.6'
+    - '0.6'
+  - text: boss-hunt_02
+  - character: sergeant
+    pose: default_frowning
+  - background: none
+  - text: boss-hunt_03
+  - character: sergeant
+    pose: default
+  - background: none
+  - text: boss-hunt_04
+  - character: sergeant
+    pose: armships
+  - background: none
+  - text: boss-hunt_05
+  - character: sergeant
+    pose: armships_smiling
+  - background: none
+  - text: boss-hunt_06
+  - character: sergeant
+    pose: default
+  - background: none
+  - text: boss-hunt_07
+  id: boss-hunt
diff --git config_190509_0158/index.txt config_190509_2353/index.txt
index 3ed5155..b1fd8a0 100644
--- config_190509_0158/index.txt
+++ config_190509_2353/index.txt
@@ -569,10 +569,12 @@
 - Units/54 - Lightning Boss Event/BOS1_thunderbossorb
 - Units/54 - Lightning Boss Event/BOS1_thunderbossorb2
 - Units/54 - Lightning Boss Event/BOS1_thunderbossorb3
 - Units/54 - Lightning Boss Event/BOS1_thunderbossshieldblade
 - Units/54 - Lightning Boss Event/BOS1_thunderbossshieldbladeleader
+- Units/54 - Lightning Boss Event/BOS1_thunderbossthunderball
+- Units/54 - Lightning Boss Event/BOS1_thunderbossthunderball2
 - Units/54 - Raceboss Event/BOS_raceboss
 - Units/54 - Raceboss Event/BOS_racebossDEATH
 - Units/54 - Raceboss Event/BOS_racebossminion01
 - Units/54 - Raceboss Event/BOS_racebossminion02
 - Units/54 - Raceboss Event/BOS_racehunter
diff --git config_190509_0158/questGivers.txt config_190509_2353/questGivers.txt
index 99fa7bb..2ad39bf 100644
--- config_190509_0158/questGivers.txt
+++ config_190509_2353/questGivers.txt
@@ -187,10 +187,11 @@
       - id: DQ_CX_33HGH_blinks_T5
       - id: DQ_KX_41MTN_vampire_T6
       - id: DQ_CX_41MTN_tuna_T7
       - id: DQ_KS_41MTN_bosstrain01
       - id: DQ_CS_41MTN_vampire
+      - id: escort_02
       - id: DQ_KB_berserker
         weight: '1.66'
       - id: DQ_KB_teslahq
         weight: '1.66'
       - id: DQ_KB_gargantua
@@ -208,10 +209,11 @@
       - id: DQ_CX_51HMT_highmountainhunter
       - id: DQ_CX_51HMT_ninjaleader
       - id: DQ_CS_51HMT_hammerplanet2
       - id: DQ_SP_5XHMT_heist
       - id: DQ_SP_5XHMT_mine
+      - id: escort_03
       - id: DQ_KB_pharaoh
         weight: '1'
       schedule: 0 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23 * * *
     biweekly:
       genCount: '1'