144 files changed, 730 insertions(+), 423 deletions(-)

diff --git config_190813_0233/Items/Primary Weapons/sniper_ultrarares.txt config_190816_0038/Items/Primary Weapons/sniper_ultrarares.txt
index e42b6e0..d939e58 100644
--- config_190813_0233/Items/Primary Weapons/sniper_ultrarares.txt	
+++ config_190816_0038/Items/Primary Weapons/sniper_ultrarares.txt	
@@ -243,11 +243,11 @@
       bulletPalette: glow
       bulletPrefab: scytheBullet
       bulletSize: '5'
       burst: '1'
       cooldown: '2.5'
-      damage: '415.15'
+      damage: '435'
       isPiercing: 'true'
       lifetime: '0.15'
       multi: '1'
       multiOffset:
       - '0.5'
diff --git config_190813_0233/Items/Primary Weapons/triple_ultrarares.txt config_190816_0038/Items/Primary Weapons/triple_ultrarares.txt
index d756048..6d38f7d 100644
--- config_190813_0233/Items/Primary Weapons/triple_ultrarares.txt	
+++ config_190816_0038/Items/Primary Weapons/triple_ultrarares.txt	
@@ -407,24 +407,83 @@
       bulletPalette: ringing_white
       bulletPrefab: tracerBullet
       bulletSize: '0.75'
       burst: '24'
       cooldown: '0'
-      damage: '15.75'
+      damage: '13.3875'
+      effect: Burn
+      effectAmount: '0.1'
+      effectDamage: '2.3625'
+      effectTime: '0.1'
       isPiercing: 'true'
       lifetime: '0.5'
       localBulletPrefab: mg_tracer_3
-      multi: '3'
-      multiSpread: '5'
+      multi: '1'
+      multiSpread: '0'
       name: triple_forward_10_1
       rof: '5'
       speed: '14.0'
       spread: '0'
+    mountAngle: '0'
     mountName: triple_forward_10mount1
     sfx:
       pitch: '1.5'
       sound: blaster
+  - flashOffset: '3'
+    flashPrefab: muzzleFlashEffect_generic_T9
+    gunTypeConfig:
+      bulletHue: teal
+      bulletPalette: ringing_white
+      bulletPrefab: tracerBullet
+      bulletSize: '0.75'
+      burst: '24'
+      cooldown: '0'
+      damage: '13.3875'
+      effect: Lightning
+      effectAmount: '0.1'
+      effectDamage: '2.3625'
+      effectTime: '0.1'
+      isPiercing: 'true'
+      lifetime: '0.5'
+      localBulletPrefab: mg_tracer_3
+      multi: '1'
+      multiSpread: '0'
+      name: triple_forward_10_2
+      rof: '5'
+      speed: '14.0'
+      spread: '0'
+    mountAngle: '-5'
+    mountName: triple_forward_10mount2
+    sfx:
+      sound: 'null'
+  - flashOffset: '3'
+    flashPrefab: muzzleFlashEffect_generic_T9
+    gunTypeConfig:
+      bulletHue: purple
+      bulletPalette: ringing_white
+      bulletPrefab: tracerBullet
+      bulletSize: '0.75'
+      burst: '24'
+      cooldown: '0'
+      damage: '13.3875'
+      effect: Water
+      effectAmount: '0.1'
+      effectDamage: '2.3625'
+      effectTime: '0.1'
+      isPiercing: 'true'
+      lifetime: '0.5'
+      localBulletPrefab: mg_tracer_3
+      multi: '1'
+      multiSpread: '0'
+      name: triple_forward_10_3
+      rof: '5'
+      speed: '14.0'
+      spread: '0'
+    mountAngle: '5'
+    mountName: triple_forward_10mount3
+    sfx:
+      sound: 'null'
   icon: ItemLootTriple_10_legendary
   id: triple_forward_10
   slot: MainGun
   soulbound: 'true'
   tag: triple
diff --git config_190813_0233/Items/Secondary Weapons/cloud.txt config_190816_0038/Items/Secondary Weapons/cloud.txt
index 458fe5c..3d29169 100644
--- config_190813_0233/Items/Secondary Weapons/cloud.txt	
+++ config_190816_0038/Items/Secondary Weapons/cloud.txt	
@@ -244,11 +244,11 @@
 - actions:
   - cloud: shieldblast0
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2'
+      duration: '3'
       mods:
       - amount: '1.2'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
@@ -265,13 +265,13 @@
 - actions:
   - cloud: shieldblast1
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.1'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.21'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -286,13 +286,13 @@
 - actions:
   - cloud: shieldblast2
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.2'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.22'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -307,13 +307,13 @@
 - actions:
   - cloud: shieldblast3
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.3'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.23'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -328,13 +328,13 @@
 - actions:
   - cloud: shieldblast4
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.4'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.24'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -349,13 +349,13 @@
 - actions:
   - cloud: shieldblast5
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.5'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.25'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -370,13 +370,13 @@
 - actions:
   - cloud: shieldblast6
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.6'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.26'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -391,13 +391,13 @@
 - actions:
   - cloud: shieldblast7
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.7'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.27'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -412,13 +412,13 @@
 - actions:
   - cloud: shieldblast8
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.8'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.28'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -433,13 +433,13 @@
 - actions:
   - cloud: shieldblast9
   - buff:
       cooldown: '4'
       cost: '0'
-      duration: '2.9'
+      duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.29'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
@@ -457,11 +457,11 @@
   - buff:
       cooldown: '4'
       cost: '0'
       duration: '3'
       mods:
-      - amount: '1.2'
+      - amount: '1.3'
         math: multiply
         name: gunDamageMod
       - amount: '0.25'
         math: multiply
         name: gunRangeMod
diff --git config_190813_0233/Items/armor/armor_10_m2g.txt config_190816_0038/Items/armor/armor_10_m2g.txt
index d2bb773..b0ad41b 100644
--- config_190813_0233/Items/armor/armor_10_m2g.txt
+++ config_190816_0038/Items/armor/armor_10_m2g.txt
@@ -3,14 +3,14 @@ extraTags:
 icon: ItemLootShield_10
 id: armor_10_m2g
 slot: Armor
 soulbound: 'true'
 statMods:
-- amount: '30'
+- amount: '27'
   math: add
   name: maxHitPoints
-- amount: '14'
+- amount: '20'
   math: add
   name: maxEnergyPoints
 - amount: '0.5'
   math: multiply
   name: energyRegenRate
diff --git config_190813_0233/Quests/quests_tutorial.txt config_190816_0038/Quests/quests_tutorial.txt
index 771374e..1b4b9ef 100644
--- config_190813_0233/Quests/quests_tutorial.txt
+++ config_190816_0038/Quests/quests_tutorial.txt
@@ -124,35 +124,5 @@
   requirements:
     quests:
     - id: tut_05
   source: auto
   tier: '-1'
-- activateOnAcquire: 'true'
-  autoComplete: 'true'
-  goals:
-  - target: '1'
-    type: kill
-    units:
-    - id: crawler
-  - target: '1'
-    type: kill
-    units:
-    - id: tank
-  - target: '1'
-    type: kill
-    units:
-    - id: clockboss
-  id: campaign_bosshunt_01
-  interestingToAcquire: 'true'
-  joinTimeout: '0'
-  listSortPriority: '-10000'
-  permanent: 'true'
-  replayConfig: never
-  requirements:
-    finishedTutorial: 'true'
-    planeLevelMax: '20'
-    planeLevelMin: '10'
-    quests:
-    - id: tut_complete
-  showInaccessible: 'false'
-  source: auto
-  tier: '5'
diff --git config_190813_0233/Texts/en-US/bark.txt config_190816_0038/Texts/en-US/bark.txt
index 42d2445..e6f8d4f 100644
--- config_190813_0233/Texts/en-US/bark.txt
+++ config_190816_0038/Texts/en-US/bark.txt
@@ -1062,10 +1062,14 @@ icebosssnakeegg:
   randomOptions:
   - text: Shssss...
 icesnakeegg:
   randomOptions:
   - text: Ca-chhissss...
+idle_moved_to_nexus:
+  randomOptions:
+  - text: We recalled you to the Rebel City because you weren't responding to our transmissions.
+    weight: '1'
 ikaruga_2:
   randomOptions:
   - text: Electric Slide
 ikaruga_2b:
   randomOptions:
@@ -1175,10 +1179,18 @@ meowza2_death:
     weight: '1'
 meowza2_death2:
   randomOptions:
   - text: You cannot kill what is already dead!
     weight: '1'
+meowza2_silence_long:
+  randomOptions:
+  - text: '<color=#050405ff>Silence</color><color=#ffffffff>: -90% Steam</color>'
+    weight: '1'
+meowza2_silence_short:
+  randomOptions:
+  - text: '<color=#050405ff>Silence</color><color=#ffffffff>: -90% Steam</color>'
+    weight: '1'
 meowza2_start:
   randomOptions:
   - text: Ooh, you're still alive! This is going to be FUN!
     weight: '1'
 meowza_playerkicker:
diff --git config_190813_0233/Texts/en-US/buffs.txt config_190816_0038/Texts/en-US/buffs.txt
index 962f7ac..3ff4d29 100644
--- config_190813_0233/Texts/en-US/buffs.txt
+++ config_190816_0038/Texts/en-US/buffs.txt
@@ -38,9 +38,13 @@ dungeonmod_restless:
   title: Restless
 dungeonmod_rush_hour:
   title: Rush Hour
 dungeonmod_touchy:
   title: Touchy
+meowza2_silence_long:
+  title: Silence
+meowza2_silence_short:
+  title: Silence
 test_curse:
   title: Cursed
 test_slow:
   title: Slowed
diff --git config_190813_0233/Texts/en-US/conversations.txt config_190816_0038/Texts/en-US/conversations.txt
index 977366f..d87ebd0 100644
--- config_190813_0233/Texts/en-US/conversations.txt
+++ config_190816_0038/Texts/en-US/conversations.txt
@@ -33,10 +33,12 @@ text:
   dungeonmod_itchy_trigger_01: "<align=center>Dungeon modifier:\n <size=50><color=#c1b38eff>Itchy Trigger</color></size>\n +30% ROF & Ammo\n -30% Cooldown & Gun Damage</align>"
   dungeonmod_nearsighted_01: "<align=center>Dungeon modifier:\n <size=50><color=#ff7900ff><sprite=0 tint=1> Nearsighted (Difficult) <sprite=0 tint=1></color></size>\n -35% Camera View\n <color=#c1b38eff><size=30>Loot: 2x plane upgrades, 3x chance of special loot</size></color></align>"
   dungeonmod_restless_01: "<align=center>Dungeon modifier:\n <size=50><color=#c1b38eff>Restless</color></size>\n -50% Armor Regen\n +25% Superspeed</align>"
   dungeonmod_rush_hour_01: "<align=center>Dungeon modifier:\n <size=50><color=#ff7900ff><sprite=0 tint=1> Rush Hour (Difficult) <sprite=0 tint=1></color></size>\n +50% Superspeed\n +35% Damage Taken\n <color=#c1b38eff><size=30>Loot: 2x plane upgrades, 3x chance of special loot</size></color></align>"
   dungeonmod_touchy_01: "<align=center>Dungeon modifier:\n <size=50><color=#c1b38eff>Touchy</color></size>\n +30% Armor Regen\n +20% Damage Taken</align>"
+  idle-warning-disconnect_01: Hey, Pilot, if you don't move or do something, I'm gonna disconnect you so no one else catches you napping!
+  idle-warning-recall_01: Yo, Pilot! Are you there? You disappeared from radar. Move or shoot or do something so we can see you.
   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.
@@ -88,10 +90,14 @@ text:
   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.
+  meowza1_warning_belowL30_01: <size=50><color=#d40009ff><sprite=0 tint=1><sprite=0 tint=1><sprite=0 tint=1> Danger ahead, Pilot! <sprite=0 tint=1><sprite=0 tint=1><sprite=0 tint=1></color></size>
+  meowza1_warning_belowL30_02: This is the final battle with Meowza. There's a <color=#d40009ff>very high chance you'll be shot down.</color>
+  meowza1_warning_belowL30_03: This mission is voluntary. There's no shame in teleporting to the Rebel City now and sitting this one out.
+  meowza1_warning_belowL30_04: You can level up and practice your skills until you feel ready. The choice is yours. Good skies!
   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 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.
@@ -104,10 +110,12 @@ text:
   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-quest-item-storage_01: 'Just a tip, Pilot: crafting materials can be inserted into recipes at the Workshop and quest items can be submitted at the Pub.'
+  tutorial-quest-item-storage_02: You don't need to put them in Storage if you don't want to.
   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 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. 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.
diff --git config_190813_0233/Texts/en-US/events.txt config_190816_0038/Texts/en-US/events.txt
index b0cb85b..d945504 100644
--- config_190813_0233/Texts/en-US/events.txt
+++ config_190816_0038/Texts/en-US/events.txt
@@ -1,88 +1,88 @@
 event_biweekly_week1and3_friday:
   description: "Posted bounties for today\n- Kill 1 Jinn\n- Kill 100 Guard Lions, Guard Beasts, Estate Guards, Slave Drivers, Bureaucrats, Groundkeepers, City Officers, Inquisitors, Secret Police, Riot Guards, Crowd Controls or Assassins while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Red Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Raijin_Imperial
   title: 'Bounty: Jinn'
 event_biweekly_week1and3_monday:
   description: "Posted bounties for today\n- Kill 1 Dr. Geckelsto\n- Kill 20 Slave Drivers or Estate Guards while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Yellow Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Geckelsten_SlaveDrivers
   title: 'Bounty: Dr. Geckelston'
 event_biweekly_week1and3_saturday:
   description: "Posted bounties for today\n- Complete 1 Dig\n- Kill 20 Marksman or Dualist while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - 2 random Steels\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Dig_DuelistMarksman
   title: 'Special Mission: The Dig'
 event_biweekly_week1and3_sunday:
   description: "Posted bounties for today\n- Kill 1 Meowza\n- Kill 5 Grand Lions while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Dark Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Meowza_GrandLion
   title: 'Bounty: Throne of Meowza'
 event_biweekly_week1and3_thursday:
   description: "Posted bounties for today\n- Kill 1 Frozen Horror in the Owl Monastery \n- Kill 20 Inquisitors or Assassins while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - White Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_FrozenHorror_Assassins
   title: 'Bounty: The Frozen Horror'
 event_biweekly_week1and3_tuesday:
   description: "Posted bounties for today\n- Kill 1 Priestess Tiffany\n- Kill 20 Guard Lions or Groundskeepers while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Blue Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Temple_Groundskeeper
   title: 'Bounty: High Priestess Tiffany'
 event_biweekly_week1and3_wednesday:
   description: "Posted bounties for today\n- Kill 1 White Spider\n- Kill 20 City Officers or Crowd Controls while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Purple Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_WhiteSpider_CityOfficer
   title: 'Bounty: White Spider'
 event_biweekly_week2and4_friday:
   description: "Posted bounties for today\n- Kill 1 Rei\n- Kill 100 Guard Lions, Guard Beasts, Estate Guards, Slave Drivers, Bureaucrats, Groundkeepers, City Officers, Inquisitors, Secret Police, Riot Guards, Crowd Controls or Assassins while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Yellow Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Thunderboss_Imperial
   title: 'Bounty: Rei'
 event_biweekly_week2and4_monday:
   description: "Posted bounties for today\n- Kill 1 Kai\n- Kill 20 Slave Drivers or Estate Guards while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Blue Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Kai_SlaveDrivers
   title: 'Bounty: Kai'
 event_biweekly_week2and4_saturday:
   description: "Posted bounties for today\n- Complete 1 Dig\n- Kill 20 Marksman or Dualist while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Two random Steels\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Dig_DuelistMarksman
   title: 'Special Mission: The Vaults'
 event_biweekly_week2and4_sunday:
   description: "Posted bounties for today\n- Kill 1 SN-Z\n- Kill 5 Grand Lions while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Dark Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_SNS_GrandLion
   title: 'Bounty: SN-Z'
 event_biweekly_week2and4_thursday:
   description: "Posted bounties for today\n- Kill 1 Traitor Phoenix in the Reeducation Camp \n- Kill 20 Inquisitors or Assassins while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Red Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Phoenix_Assassins
   title: 'Bounty: Traitor Phoenix'
 event_biweekly_week2and4_tuesday:
   description: "Posted bounties for today\n- Kill 1 Doomsday Mechanism\n- Kill 20 Guard Lions or Groundskeepers while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - White Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Doomsday_Groundskeeper
   title: 'Bounty: Doomsday Mechanism'
 event_biweekly_week2and4_wednesday:
   description: "Posted bounties for today\n- Kill 1 Poison God\n- Kill 20 City Officers or Crowd Controls while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Purple Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_PoisonGod_CityOfficer
   title: 'Bounty: Poison God'
 event_biweekly_week5_friday:
   description: "Posted bounties for today\n- Kill 1 Jinn\n- Kill 100 Guard Lions, Guard Beasts, Estate Guards, Slave Drivers, Bureaucrats, Groundkeepers, City Officers, Inquisitors, Secret Police, Riot Guards, Crowd Controls or Assassins while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Red Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Raijin_Imperial
   title: 'Bounty: Imperial City'
 event_biweekly_week5_monday:
   description: "Posted bounties for today\n- Kill 1 Dr. Geckelston\n- Kill 20 Slave Drivers or Estate Guards while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Yellow Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Geckelston_SlaveDrivers
   title: 'Bounty: Dr. Geckelston'
 event_biweekly_week5_saturday:
   description: "Posted bounties for today\n- Complete 1 Dig\n- Kill 20 Marksman or Dualist while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - 2 random Steels\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Dig_DuelistMarksman
   title: 'Bounty: The Dig'
 event_biweekly_week5_sunday:
   description: "Posted bounties for today\n- Kill 1 Meowza\n- Kill 5 Grand Lions while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Dark Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Meowza_GrandLion
   title: 'Bounty: Throne of Meowza'
 event_biweekly_week5_thursday:
   description: "Posted bounties for today\n- Kill 1 Frozen Horror in the Owl Monastery \n- Kill 20 Inquisitors or Assassins while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - White Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_FrozenHorror_Assassins
   title: 'Bounty: Frozen Horror in the Owl Monastery'
 event_biweekly_week5_tuesday:
   description: "Posted bounties for today\n- Kill 1 Priestess Tiffany\n- Kill 20 Guard Lions or Groundskeepers while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Blue Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_Temple_Groundskeeper
   title: 'Bounty: High Priestess Tiffany'
 event_biweekly_week5_wednesday:
   description: "Posted bounties for today\n- Kill 1 White Spider\n- Kill 20 City Officers or Crowd Controls while flying with 2 fellow pilots\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Purple Steel\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
-  header_image: EventHeader_Updates
+  header_image: EventHeader_WhiteSpider_CityOfficer
   title: 'Bounty: White Spider'
 event_daily_friday:
   description: "Every Friday, the feline nobles spend leisure time with their families. It is a time of pleasant excess. \n\nRodent worshippers of the state religion are barbequed in succulent sauces and the servant dogs are made to dance.\n\n<b><size=18><color=ffffffff>Special Rewards</color></size></b>\n - Superior salvage in noble estates\n - Double XP in noble estates\n\n<b><size=18><color=ffffffff>Schedule</color></size></b>\n{0}{1}\n"
   ending_server_message: Enemy activity in the noble estates returning to normal.
   header_image: EventHeader_NobleEstates
@@ -144,11 +144,11 @@ event_trail_betahearts_20190812_9days:
     - It will not drop up again. This is a unique reward for active Open Beta players.
 
     - It is tradeable.
 
     '
-  header_image: EventHeader_PlayerGroup
+  header_image: EventHeader_BetaHearts
   title: Open Beta Treasure Hunt
 event_trail_bubbles_20181024_3weeks:
   description: 'For the next 3 weeks, some bosses and enemies drop the rare Alpha Bubbley Trail.
 
     - The trail only shows up for the next few weeks.
diff --git config_190813_0233/Texts/en-US/item.txt config_190816_0038/Texts/en-US/item.txt
index d496901..cab455a 100644
--- config_190813_0233/Texts/en-US/item.txt
+++ config_190816_0038/Texts/en-US/item.txt
@@ -2339,11 +2339,14 @@ trail_afterburner:
 
 
     [PERMANENT. Place in storage so you don''t lose it when your plane explodes.]'
   name: Alpha Afterburner Trail
 trail_betahearts:
-  description: Show a little love for the players who were with us before we launched.
+  description: 'Show a little love for the players who were with us before we launched.
+
+
+    [PERMANENT. Place in storage so you don''t lose it when your plane explodes.]'
   name: Open Beta Trail
 trail_boss_arenacube:
   description: 'Why do to the Arenas exist. Who is doing the testing? What are they testing for?
 
 
diff --git config_190813_0233/Texts/en-US/maneuvers.txt config_190816_0038/Texts/en-US/maneuvers.txt
index 8ee04a0..0f2cd04 100644
--- config_190813_0233/Texts/en-US/maneuvers.txt
+++ config_190816_0038/Texts/en-US/maneuvers.txt
@@ -8,7 +8,8 @@ reverse: Reverse
 shortShield: Clear
 siege: Siege
 slow: Slow
 superspeed: Afterburner
 tank: Absorb
+teleportToTurret: Teleport to Turret
 warpForward: Blink
 warpToAim: Aimed Blink
diff --git config_190813_0233/Texts/en-US/planeclasses.txt config_190816_0038/Texts/en-US/planeclasses.txt
index 09cedde..91b7a87 100644
--- config_190813_0233/Texts/en-US/planeclasses.txt
+++ config_190816_0038/Texts/en-US/planeclasses.txt
@@ -156,11 +156,11 @@ engineer:
       name: Specialist
     VariantB:
       flavor: <color=#FBB040>[Engineer Variant]</color> The Docks used a thousand different types of gears. Small brass ones, immense stone ones. A vast whirring steam ecosystem, turning, driving, breaking and building. The coggers loved them all. One day, they will rebuild them.
       name: Cogger
     default:
-      flavor: <color=#FBB040>[Engineer Variant]</color> A medium-armored area-controller with <color=#FBB040>single-stick controls</color>. Can equip <color=#FBB040>Blasters</color> and The <color=#FBB040>Wasps</color>. The <color=#FBB040>Turret</color> ability spawns a stationary gun that targets enemies. The <color=#FBB040>Flip 180º</color> manuever allows for a quick retreat.
+      flavor: <color=#FBB040>[Engineer Variant]</color> A medium-armored area-controller with <color=#FBB040>single-stick controls</color>. Can equip <color=#FBB040>Blasters</color> and The <color=#FBB040>Wasps</color>. The <color=#FBB040>Turret</color> ability spawns a stationary gun that targets enemies. The <color=#FBB040>Teleport to Turret</color> manuever is... self-explanatory.
       name: Engineer
     flames:
       flavor: <color=#FBB040>[Engineer Variant]</color> Raw materials for new work come from salvaging old wrecks. The land's a layer cake of era, each with their own machines and mysteries. A breaker rips it all down, melts it, separates out the good stuff.
       name: Breaker
     spikes:
diff --git config_190813_0233/Texts/en-US/quests.txt config_190816_0038/Texts/en-US/quests.txt
index fe674a7..c5e9b92 100644
--- config_190813_0233/Texts/en-US/quests.txt
+++ config_190816_0038/Texts/en-US/quests.txt
@@ -1488,10 +1488,58 @@ overworldboss_teslahq:
   description: Kill the designated target!
   title: 'Bounty: Temple of Ra'
 overworldboss_ufo:
   description: Kill the designated target!
   title: 'Bounty: Ambassador'
+preisland1_kill_x_highlands_T5:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the highlands
+preisland1_kill_x_highmountains_T8:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the Imperial City
+preisland1_kill_x_lowlands_T2:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces
+preisland1_kill_x_midlands_T3:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the midlands
+preisland1_kill_x_midlands_T4:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the midlands
+preisland1_kill_x_mountains_T6:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces near the heart of the empire
+preisland1_kill_x_mountains_T7:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the Noble Estates
+preisland1_kill_x_mountains_T8:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy the Imperial guards
+preisland2_kill_x_highlands_T5:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the highlands
+preisland2_kill_x_highmountains_T8:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the Imperial City
+preisland2_kill_x_lowlands_T2:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces
+preisland2_kill_x_midlands_T3:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the midlands
+preisland2_kill_x_midlands_T4:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the midlands
+preisland2_kill_x_mountains_T6:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces near the heart of the empire
+preisland2_kill_x_mountains_T7:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy Imperial Forces in the Noble Estates
+preisland2_kill_x_mountains_T8:
+  description: Level up your skills quickly by destroying targeted enemies. Follow the marker on your radar
+  title: Destroy the Imperial guards
 test_auto:
   description: Just a test
   title: Test Auto Quest
 test_basic:
   description: Find stuff and we'll give you stuff, it's simple
diff --git config_190813_0233/Texts/en-US/skills.txt config_190816_0038/Texts/en-US/skills.txt
index c7901ca..c60574b 100644
--- config_190813_0233/Texts/en-US/skills.txt
+++ config_190816_0038/Texts/en-US/skills.txt
@@ -159,11 +159,11 @@ machinegun_3a:
 machinegun_3b:
   name: Steam Up
 machinegun_4a:
   name: Social Resilience
 machinegun_4b:
-  name: Social Agility
+  name: Gunner Agility
 medic_1a:
   name: Microsurgery
 medic_1b:
   name: Major Surgery
 medic_2a:
@@ -327,11 +327,11 @@ strike_1a:
 strike_1b:
   name: Persistent
 strike_2a:
   name: At First Sight
 strike_2b:
-  name: Present
+  name: Speedy Spin
 strike_3a:
   name: Commitment
 strike_3b:
   name: Passion
 strike_4a:
diff --git config_190813_0233/Texts/en-US/ui.txt config_190816_0038/Texts/en-US/ui.txt
index 39e0a52..1a5c9a8 100644
--- config_190813_0233/Texts/en-US/ui.txt
+++ config_190816_0038/Texts/en-US/ui.txt
@@ -101,10 +101,11 @@ context_menu_inventory_equip: Equip as active
 context_menu_inventory_equip_alt: Equip as alternative
 context_menu_inventory_mark: Move
 context_menu_inventory_move_info: Select target slot or item to move or switch item positions.
 context_menu_inventory_title: ''
 context_menu_inventory_use: Use
+conversation_continue_any: Press any key or button to continue
 conversation_continue_custom: '{0} [<action:43>]'
 conversation_continue_default: Continue [<action:43>]
 damage_critical: critical!
 damage_resisted: resisted!
 damage_shielded: shielded!
@@ -134,11 +135,11 @@ dialogue_name_doomsdayboss: Doomsday Mechanism
 dialogue_name_drilloperator: Drill Operator
 dialogue_name_dungeonmod: Dungeon Modifier
 dialogue_name_escortboss: Stone Worm Leader
 dialogue_name_eyeboss: Corrupted Father Edmund
 dialogue_name_gargantua: Lady Blacksberg
-dialogue_name_gekelstein: Mad Doctor Gekelstein
+dialogue_name_gekelstein: Mad Doctor Geckelston
 dialogue_name_hangarpenguin: Spocket
 dialogue_name_icedungeon: Frozen Horror
 dialogue_name_jinn: Commander Jinn
 dialogue_name_kaiju: Commander Kai
 dialogue_name_lobbyist: Sir Mesmer the Lobbyist
@@ -213,10 +214,11 @@ email_validation_title: Email validation
 emote_purple_fireworks: Purple fireworks
 error_dialog_account_maintenance: Account support is currently underway! Please check back again later. It should not take that long.
 error_dialog_already_connected: You can not connect because your account is already connected. Please wait a couple of minutes and try again. If this persists, contact support. Thanks.
 error_dialog_connection_failure: We seem to be having trouble with the network between your computer and our servers. See if any other programs are making heavy use of the network!
 error_dialog_deliberate_disconnection: 'The server doesn''t want to talk to you.  It told us: {0}.  If you believe this is a bug, please report it via the bug form.'
+error_dialog_idle_kicked: We disconnected you because you were idle. Please launch the game again when you're ready to play again.
 error_dialog_kicked: You have been kicked.  Why?  Only you, and the person who kicked you, know.
 error_dialog_lnc00: Error LNC00. Can't find a Rebel City. Probably no connectivity to the internet, or the backend is down. Please check your connectivity and try again.
 error_dialog_lnc01: Error LNC01. Logged in, but no Rebel Cities currently available. Please try again in a few minutes. If this problem persists, please contact support.
 error_dialog_lnc02: Error LNC02. Client seems to be out of date and the Rebel City is on a newer version. Please update your client. Restarting Steam can often kick this process off.
 error_dialog_lnc03: Error LNC03. Your client version is too new! Server update is probably rolling out and will be available again soon. If this persists, contact support. If you are helping test a new version, check if you're on the test branch trying to connect to the production server.
@@ -315,10 +317,11 @@ header_hangar_empty: '<color=#fffffff><b>New plane</b></color>
 
   Select a plane to fly.'
 header_hangar_newplane_armor: '• Armor: <color=#fde7aaff>{0}</color>'
 header_hangar_newplane_engine: '• Engine: <color=#fde7aaff>{0}</color>'
 header_hangar_newplane_highest_level: '• Highest level: <color=#fde7aaff>{0}</color>'
+header_hangar_newplane_maneuver: '• Maneuver: <color=#fde7aaff>{0}</color>'
 header_hangar_newplane_primary: '• Primary Weapon: <color=#fde7aaff>{0}</color>'
 header_hangar_newplane_secondary: '• Secondary: <color=#fde7aaff>{0}</color>'
 header_hangar_newplane_title: <b><size=21><color=ffffffff>{0} Class</color></size></b>
 header_hangar_select_armor: '• Armor: {0} <color=#fde7aaff>{1}</color>
 
@@ -607,10 +610,15 @@ login_forgot_password: Forgot your password?
 login_forgot_password_info: Select this to retrieve it
 login_login: Login
 login_new_player_subtitle: Select this to register
 login_new_player_title: New player?
 login_password: Password
+login_queue_info_desc: The Steambirds Alliance servers are under heavy load right now. You've reserved your place in the queue and should hopefully get to play very soon!
+login_queue_info_info: 'Position in Queue: {0}
+
+  <size=80%>Updating in {1}s...</size>'
+login_queue_info_title: Servers Are Full!
 login_register: Register
 login_request_reset: Request Reset
 login_reset: Reset
 login_retype_password: Retype Password
 login_sign_in: Sign in
@@ -774,11 +782,11 @@ options_menu_keyboard_controls_rel_inventory_navigation: Inventory controls
 options_menu_keyboard_controls_rel_system: System controls
 options_menu_keyboard_controls_relative_plane_controls: Plane Controls
 options_menu_keyboard_controls_shared_controls: Interaction Controls
 options_menu_keyboard_controls_system: System Controls
 options_menu_keyboard_controls_system_controls: Systems Controls
-options_menu_locale: Locale
+options_menu_locale: Language
 options_menu_locale_old: <color=#e84f4f>(needs restart)</color>
 options_menu_low_bullet_alpha: Dim Ally Bullets
 options_menu_main: Options
 options_menu_maingunshooting_type_joystick: Main Gun Gamepad
 options_menu_maingunshooting_type_keyboard: Main Gun Keyboard
@@ -862,11 +870,12 @@ pilot_school_action_loadouts: Change Skill Loadout
 pilot_school_action_new: 'Learn new skill (Skill Points: {0})'
 pilot_school_action_remove: 'Forget skill (Skill Points: {0})'
 pilot_school_action_switch: 'Switch to skill (Skill Points: {0})'
 pilot_school_action_switch_free: Switch to skill
 pilot_school_action_up: 'Upgrade skill (Skill Points: {0})'
-pilot_school_details_points: 'Unspent Skill Points: {0}'
+pilot_school_details_points: 'Unspent Skill Points: <color=#55ff55>{0}</color>'
+pilot_school_details_points_zero: '<color=#ff5555>Unspent Skill Points: {0}</color>'
 pilot_school_details_rank: Rank {0} - {1}
 pilot_school_filter_heading: Filter Skills
 pilot_school_filter_label: 'Filter: {0}'
 pilot_school_filter_menu_back_label: All Skills
 pilot_school_filter_menu_subtitle: '[<action:43>]: select a class to filter skills by'
@@ -1115,10 +1124,14 @@ radar_mission: 'Target
   <color=#ffa500ff>{0}</color>'
 radar_teleport: '[<action:7>] to teleport'
 radar_teleport_click: '[<action:7>] or click
 
   to teleport'
+region:
+  EU.DE: Europe
+  NA.US: N. America
+  OC.AU: Australia
 report_cmd_chat: Report Chat
 report_cmd_cheating: Report Cheating
 report_cmd_other: Report Other
 report_cmd_title: User Report Menu
 restart_announce: Everybody grab everything! We need to shutdown this Rebel City for a short while. This way we can hide from their scanners.
diff --git config_190813_0233/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whaleshark.txt config_190816_0038/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whaleshark.txt
index 0cff29b..848dcb8 100644
--- config_190813_0233/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whaleshark.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whaleshark.txt	
@@ -5,10 +5,11 @@ cameraZoomRadius: '24.00'
 colliderHeight: '1.4'
 colliderRadius: '0'
 colliderWidth: '1'
 colliderX: '0'
 colliderY: '0.1'
+deactivationType: ai_delayed
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
 energyRegenRate: '0'
 gunMounts:
diff --git config_190813_0233/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whalesharkDEATH.txt config_190816_0038/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whalesharkDEATH.txt
index 6fbd046..ab65ff4 100644
--- config_190813_0233/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whalesharkDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/Daily Quests - Special/DQ_KS_23MID_whaleshark_T3/DQ_KS_23MID_whalesharkDEATH.txt	
@@ -6,10 +6,11 @@ colliderHeight: '1.4'
 colliderRadius: '0'
 colliderWidth: '1'
 colliderX: '0'
 colliderY: '0.1'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_command.txt config_190816_0038/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_command.txt
index 2ae5809..53faa0e 100644
--- config_190813_0233/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_command.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_command.txt	
@@ -2,10 +2,11 @@ art: EnemyGasstationCommand
 artScale: '1'
 colliderHeight: '1.9'
 colliderWidth: '1.2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '100'
diff --git config_190813_0233/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_commandDEATH.txt config_190816_0038/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_commandDEATH.txt
index 3752935..f8c665b 100644
--- config_190813_0233/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_commandDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/Daily Quests - Special/DQ_SP_2XMID_gasstation/DQ_SP_2XMID_gasstation_commandDEATH.txt	
@@ -5,10 +5,11 @@ cameraZoomRadius: '24.00'
 colliderHeight: '1.9'
 colliderWidth: '1.2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/escort_01/escort_01_escortmission.txt config_190816_0038/Units/00 - Quest Enemies/escort_01/escort_01_escortmission.txt
index b74c953..d55f44a 100644
--- config_190813_0233/Units/00 - Quest Enemies/escort_01/escort_01_escortmission.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/escort_01/escort_01_escortmission.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
 isVisibleInRadar: 'true'
 maxEnergyPoints: '1'
diff --git config_190813_0233/Units/00 - Quest Enemies/escort_01/escort_01_escortmissionDEATH.txt config_190816_0038/Units/00 - Quest Enemies/escort_01/escort_01_escortmissionDEATH.txt
index ca13d5c..8c809eb 100644
--- config_190813_0233/Units/00 - Quest Enemies/escort_01/escort_01_escortmissionDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/escort_01/escort_01_escortmissionDEATH.txt	
@@ -1,10 +1,11 @@
 art: AllyGoosePrefab_Death
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/escort_02/escort_02_escortmission.txt config_190816_0038/Units/00 - Quest Enemies/escort_02/escort_02_escortmission.txt
index 96493a0..450663f 100644
--- config_190813_0233/Units/00 - Quest Enemies/escort_02/escort_02_escortmission.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/escort_02/escort_02_escortmission.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
 isVisibleInRadar: 'true'
 maxEnergyPoints: '1'
diff --git config_190813_0233/Units/00 - Quest Enemies/escort_02/escort_02_escortmissionDEATH.txt config_190816_0038/Units/00 - Quest Enemies/escort_02/escort_02_escortmissionDEATH.txt
index c02aefe..f35f767 100644
--- config_190813_0233/Units/00 - Quest Enemies/escort_02/escort_02_escortmissionDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/escort_02/escort_02_escortmissionDEATH.txt	
@@ -1,10 +1,11 @@
 art: AllyGoosePrefab_Death
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/escort_03/escort_03_escortmission.txt config_190816_0038/Units/00 - Quest Enemies/escort_03/escort_03_escortmission.txt
index ceace39..b4ba84c 100644
--- config_190813_0233/Units/00 - Quest Enemies/escort_03/escort_03_escortmission.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/escort_03/escort_03_escortmission.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
 isVisibleInRadar: 'true'
 maxEnergyPoints: '1'
diff --git config_190813_0233/Units/00 - Quest Enemies/escort_03/escort_03_escortmissionDEATH.txt config_190816_0038/Units/00 - Quest Enemies/escort_03/escort_03_escortmissionDEATH.txt
index 5d0121b..137216b 100644
--- config_190813_0233/Units/00 - Quest Enemies/escort_03/escort_03_escortmissionDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/escort_03/escort_03_escortmissionDEATH.txt	
@@ -1,10 +1,11 @@
 art: AllyGoosePrefab_Death
 artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimp.txt config_190816_0038/Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimp.txt
index 1cff28f..4ee4f97 100644
--- config_190813_0233/Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimp.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimp.txt	
@@ -2,10 +2,11 @@ art: EnemyTutFatBlimp
 artScale: '1'
 colliderHeight: '1.9'
 colliderWidth: '1.2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
diff --git config_190813_0233/Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimpDEATH.txt config_190816_0038/Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimpDEATH.txt
index 93f9dfd..55f1129 100644
--- config_190813_0233/Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimpDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/tut_02/BOS_tut_02_fatblimpDEATH.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 colliderHeight: '1.9'
 colliderWidth: '1.2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantua.txt config_190816_0038/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantua.txt
index de2d381..2c00f9d 100644
--- config_190813_0233/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantua.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantua.txt	
@@ -3,10 +3,11 @@ artScale: '0.75'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '20.00'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuaDEATH.txt config_190816_0038/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuaDEATH.txt
index cae61c0..7a8a4bd 100644
--- config_190813_0233/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuaDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/tut_03/BOS1_tut_03_gargantuaDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/tut_04/BOS_tut_04_berserker.txt config_190816_0038/Units/00 - Quest Enemies/tut_04/BOS_tut_04_berserker.txt
index 0f574d5..8ac6b28 100644
--- config_190813_0233/Units/00 - Quest Enemies/tut_04/BOS_tut_04_berserker.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/tut_04/BOS_tut_04_berserker.txt	
@@ -3,10 +3,11 @@ artScale: '0.8'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
diff --git config_190813_0233/Units/00 - Quest Enemies/tut_04/BOS_tut_04_berserkerDEATH.txt config_190816_0038/Units/00 - Quest Enemies/tut_04/BOS_tut_04_berserkerDEATH.txt
index e6ab98f..21c585c 100644
--- config_190813_0233/Units/00 - Quest Enemies/tut_04/BOS_tut_04_berserkerDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/tut_04/BOS_tut_04_berserkerDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/tut_05/BOS_tut_05_navileader.txt config_190816_0038/Units/00 - Quest Enemies/tut_05/BOS_tut_05_navileader.txt
index bb02f1e..83c5255 100644
--- config_190813_0233/Units/00 - Quest Enemies/tut_05/BOS_tut_05_navileader.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/tut_05/BOS_tut_05_navileader.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderHeight: '2.85'
 colliderWidth: '3'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Quest Enemies/tut_05/BOS_tut_05_navileaderDEATH.txt config_190816_0038/Units/00 - Quest Enemies/tut_05/BOS_tut_05_navileaderDEATH.txt
index 10baf20..36b5a9b 100644
--- config_190813_0233/Units/00 - Quest Enemies/tut_05/BOS_tut_05_navileaderDEATH.txt	
+++ config_190816_0038/Units/00 - Quest Enemies/tut_05/BOS_tut_05_navileaderDEATH.txt	
@@ -5,10 +5,11 @@ cameraZoomRadius: '24.00'
 colliderHeight: '2.85'
 colliderWidth: '3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/00 - Tutorial Dungeon/unit_tutorialattacker4.txt config_190816_0038/Units/00 - Tutorial Dungeon/unit_tutorialattacker4.txt
index f8dab21..c8f9b84 100644
--- config_190813_0233/Units/00 - Tutorial Dungeon/unit_tutorialattacker4.txt	
+++ config_190816_0038/Units/00 - Tutorial Dungeon/unit_tutorialattacker4.txt	
@@ -3,10 +3,11 @@ artScale: '2'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '50'
diff --git config_190813_0233/Units/00 - Tutorial Dungeon/unit_tutorialattacker4DEATH.txt config_190816_0038/Units/00 - Tutorial Dungeon/unit_tutorialattacker4DEATH.txt
index 6d1e16d..717b7af 100644
--- config_190813_0233/Units/00 - Tutorial Dungeon/unit_tutorialattacker4DEATH.txt	
+++ config_190816_0038/Units/00 - Tutorial Dungeon/unit_tutorialattacker4DEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tank.txt config_190816_0038/Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tank.txt
index 7919815..d4e674b 100644
--- config_190813_0233/Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tank.txt	
+++ config_190816_0038/Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tank.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '3.2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tankDEATH.txt config_190816_0038/Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tankDEATH.txt
index e58c1bd..4b0a331 100644
--- config_190813_0233/Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tankDEATH.txt	
+++ config_190816_0038/Units/21 - Midlands (City) - WWII_ModernTech/BOS1_tankDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '3.2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockboss.txt config_190816_0038/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockboss.txt
index 5296883..58e2a94 100644
--- config_190813_0233/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockboss.txt	
+++ config_190816_0038/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockboss.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '.9'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossDEATH.txt config_190816_0038/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossDEATH.txt
index 2a0c7aa..7957b86 100644
--- config_190813_0233/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossDEATH.txt	
+++ config_190816_0038/Units/22 - Midlands (Ruins) - Ghosts_Spooky/BOS2_clockbossDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/23 - Midlands (Rural) - Water_Aquatic/BOS4_crawler.txt config_190816_0038/Units/23 - Midlands (Rural) - Water_Aquatic/BOS4_crawler.txt
index cb8b8fa..4b58ea0 100644
--- config_190813_0233/Units/23 - Midlands (Rural) - Water_Aquatic/BOS4_crawler.txt	
+++ config_190816_0038/Units/23 - Midlands (Rural) - Water_Aquatic/BOS4_crawler.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/23 - Midlands (Rural) - Water_Aquatic/BOS4_crawlerDEATH.txt config_190816_0038/Units/23 - Midlands (Rural) - Water_Aquatic/BOS4_crawlerDEATH.txt
index febf087..acf8b0b 100644
--- config_190813_0233/Units/23 - Midlands (Rural) - Water_Aquatic/BOS4_crawlerDEATH.txt	
+++ config_190816_0038/Units/23 - Midlands (Rural) - Water_Aquatic/BOS4_crawlerDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantua.txt config_190816_0038/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantua.txt
index 56109da..a4a0241 100644
--- config_190813_0233/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantua.txt	
+++ config_190816_0038/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantua.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuaDEATH.txt config_190816_0038/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuaDEATH.txt
index 1ccf3cd..3628134 100644
--- config_190813_0233/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuaDEATH.txt	
+++ config_190816_0038/Units/31 - Highlands (City) - MadScience_Energy/BOS1_gargantuaDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserker.txt config_190816_0038/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserker.txt
index 465efb1..c36d0b4 100644
--- config_190813_0233/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserker.txt	
+++ config_190816_0038/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserker.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
diff --git config_190813_0233/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserkerDEATH.txt config_190816_0038/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserkerDEATH.txt
index ff220a1..f47fceb 100644
--- config_190813_0233/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserkerDEATH.txt	
+++ config_190816_0038/Units/32 - Highlands (Ruins) - Hell_Cthulu_Demonic/BOS_berserkerDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaoh.txt config_190816_0038/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaoh.txt
index 9bca53e..3b9bdc6 100644
--- config_190813_0233/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaoh.txt	
+++ config_190816_0038/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaoh.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohDEATH.txt config_190816_0038/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohDEATH.txt
index 4ef2346..ef9b33d 100644
--- config_190813_0233/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohDEATH.txt	
+++ config_190816_0038/Units/33 - Highlands (Rural) - Desert_Bones/BOS2_pharaohDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/33 - Highlands (Rural) - Desert_Bones/BOS3_teslahq.txt config_190816_0038/Units/33 - Highlands (Rural) - Desert_Bones/BOS3_teslahq.txt
index 4786d56..3c7cb80 100644
--- config_190813_0233/Units/33 - Highlands (Rural) - Desert_Bones/BOS3_teslahq.txt	
+++ config_190816_0038/Units/33 - Highlands (Rural) - Desert_Bones/BOS3_teslahq.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '3.2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
diff --git config_190813_0233/Units/33 - Highlands (Rural) - Desert_Bones/BOS3_teslahqDEATH.txt config_190816_0038/Units/33 - Highlands (Rural) - Desert_Bones/BOS3_teslahqDEATH.txt
index 98878b0..a5655a3 100644
--- config_190813_0233/Units/33 - Highlands (Rural) - Desert_Bones/BOS3_teslahqDEATH.txt	
+++ config_190816_0038/Units/33 - Highlands (Rural) - Desert_Bones/BOS3_teslahqDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '4.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS1_hypnotist.txt config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS1_hypnotist.txt
index f66accc..bb750fe 100644
--- config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS1_hypnotist.txt	
+++ config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS1_hypnotist.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '2.2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS1_hypnotistDEATH.txt config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS1_hypnotistDEATH.txt
index 936d72b..d5706cf 100644
--- config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS1_hypnotistDEATH.txt	
+++ config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS1_hypnotistDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '2.2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS2_jester.txt config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS2_jester.txt
index 806e235..b0d4568 100644
--- config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS2_jester.txt	
+++ config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS2_jester.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS2_jesterDEATH.txt config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS2_jesterDEATH.txt
index 435756c..1cdfc87 100644
--- config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS2_jesterDEATH.txt	
+++ config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS2_jesterDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS3_bosstrain01.txt config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS3_bosstrain01.txt
index 22e6bbb..b743731 100644
--- config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS3_bosstrain01.txt	
+++ config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS3_bosstrain01.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderHeight: '2.3'
 colliderWidth: '1.5'
 colliderX: '0'
 colliderY: '0.5'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS3_bosstrain01DEATH.txt config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS3_bosstrain01DEATH.txt
index 7d45262..3a60f19 100644
--- config_190813_0233/Units/41 - Mountains (City) - SpaceTravel/BOS3_bosstrain01DEATH.txt	
+++ config_190816_0038/Units/41 - Mountains (City) - SpaceTravel/BOS3_bosstrain01DEATH.txt	
@@ -5,10 +5,11 @@ cameraZoomRadius: '30'
 colliderHeight: '2.3'
 colliderWidth: '1.5'
 colliderX: '0'
 colliderY: '0.5'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt
index c91f9a8..d5c77ef 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissun.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '1.8'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissunDEATH.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissunDEATH.txt
index 89c3176..a57d5fb 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissunDEATH.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_solarissunDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '1.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufo.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufo.txt
index ab5c390..51e45c7 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufo.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufo.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '3'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufoDEATH.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufoDEATH.txt
index ed080dc..a05539a 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufoDEATH.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS1_ufoDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt
index f0ffa41..0a690c4 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinkles.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinklesDEATH.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinklesDEATH.txt
index 362ab46..9eab678 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinklesDEATH.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS3_sprinklesDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt
index 32913d0..c865778 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notra.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '100'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraDEATH.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraDEATH.txt
index 638511e..facb4be 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraDEATH.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/BOS_notraDEATH.txt	
@@ -5,10 +5,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/HVY_duelist.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/HVY_duelist.txt
index 7b30ee8..7eaf34d 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/HVY_duelist.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/HVY_duelist.txt	
@@ -6,27 +6,27 @@ colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '1.5'
+  flashOffset: '0'
   gunTemplateName: duelistgun
   mountAngle: '0'
   mountName: main
   offset:
   - '0'
-  - '2.5'
+  - '0'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: duelistgun2
   mountAngle: '0'
   mountName: main2
   offset:
   - '0'
-  - '3'
+  - '0'
   slewRate: '0'
 - fireMode: SprinklerTurnback
   firingArc: '0'
   flashOffset: '4'
   gunTypeConfig:
@@ -98,11 +98,11 @@ gunTypes:
   - '0'
   - '0'
   multiSpread: '0'
   name: duelistgun
   rof: '10'
-  speed: '20'
+  speed: '30'
   spread: '15'
 - bulletPalette: glow
   bulletPrefab: rapierBullet
   bulletSize: '2'
   burst: '1000'
@@ -138,11 +138,11 @@ lootGlobal:
     - items:
       - id: dungeon_arena2
       weight: '1'
 maxEnergyPoints: '1'
 maxHitPoints: '200'
-maxHomeDistance: '60'
+maxHomeDistance: '45'
 maxSpeed: '0'
 maxTurnRate: '0'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '2'
 templateName: duelist
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/HVY_marksman.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/HVY_marksman.txt
index 3a660e7..4e7b65c 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/HVY_marksman.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/HVY_marksman.txt	
@@ -48,11 +48,11 @@ lootGlobal:
     - items:
       - id: dungeon_arena2
       weight: '1'
 maxEnergyPoints: '1'
 maxHitPoints: '150'
-maxHomeDistance: '60'
+maxHomeDistance: '45'
 maxSpeed: '2'
 maxTurnRate: '200'
 minSpeed: '1'
 particlePositions:
 - name: darkSmoke
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/SPC2_destroyer.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/SPC2_destroyer.txt
index 6dc4cd4..7a612ba 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/SPC2_destroyer.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/SPC2_destroyer.txt	
@@ -59,11 +59,11 @@ gunTypes:
   speed: '1'
   spread: '360'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '200'
-maxHomeDistance: '60'
+maxHomeDistance: '45'
 maxSpeed: '3.5'
 maxTurnRate: '40'
 minSpeed: '1.5'
 particlePositions:
 - name: darkSmoke
diff --git config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/SPC3_sentinel.txt config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/SPC3_sentinel.txt
index 488832b..7c172fa 100644
--- config_190813_0233/Units/51 - HighMountains (City) - Alien_Hologram/SPC3_sentinel.txt	
+++ config_190816_0038/Units/51 - HighMountains (City) - Alien_Hologram/SPC3_sentinel.txt	
@@ -62,11 +62,11 @@ gunTypes:
   speed: '2.3'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '150'
-maxHomeDistance: '60'
+maxHomeDistance: '45'
 maxSpeed: '0'
 maxTurnRate: '360'
 minSpeed: '0'
 spawnInvulnerabilitySeconds: '0'
 templateName: sentinel
diff --git config_190813_0233/Units/54 - Cancer Event/BOS1_spiderboss.txt config_190816_0038/Units/54 - Cancer Event/BOS1_spiderboss.txt
index bbeaa2c..355ceab 100644
--- config_190813_0233/Units/54 - Cancer Event/BOS1_spiderboss.txt	
+++ config_190816_0038/Units/54 - Cancer Event/BOS1_spiderboss.txt	
@@ -3,10 +3,11 @@ artScale: '1.0'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '1.9'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - burnWeakness
 - poisonResist
diff --git config_190813_0233/Units/54 - Cancer Event/BOS1_spiderbossDEATH.txt config_190816_0038/Units/54 - Cancer Event/BOS1_spiderbossDEATH.txt
index e9acbb1..c166217 100644
--- config_190813_0233/Units/54 - Cancer Event/BOS1_spiderbossDEATH.txt	
+++ config_190816_0038/Units/54 - Cancer Event/BOS1_spiderbossDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '1.2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/54 - Kaiju Event/BOS1_kaiju.txt config_190816_0038/Units/54 - Kaiju Event/BOS1_kaiju.txt
index b8bb143..caac79a 100644
--- config_190813_0233/Units/54 - Kaiju Event/BOS1_kaiju.txt	
+++ config_190816_0038/Units/54 - Kaiju Event/BOS1_kaiju.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
diff --git config_190813_0233/Units/54 - Kaiju Event/BOS2_kaijuDEATH.txt config_190816_0038/Units/54 - Kaiju Event/BOS2_kaijuDEATH.txt
index 69a8b1b..4614663 100644
--- config_190813_0233/Units/54 - Kaiju Event/BOS2_kaijuDEATH.txt	
+++ config_190816_0038/Units/54 - Kaiju Event/BOS2_kaijuDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/54 - Kraken Event/BOS2_kraken.txt config_190816_0038/Units/54 - Kraken Event/BOS2_kraken.txt
index b19307d..0c1e52f 100644
--- config_190813_0233/Units/54 - Kraken Event/BOS2_kraken.txt	
+++ config_190816_0038/Units/54 - Kraken Event/BOS2_kraken.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderHeight: '2'
 colliderWidth: '1.5'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
diff --git config_190813_0233/Units/54 - Kraken Event/BOS2_krakenDEATH.txt config_190816_0038/Units/54 - Kraken Event/BOS2_krakenDEATH.txt
index 483ee50..e8ad844 100644
--- config_190813_0233/Units/54 - Kraken Event/BOS2_krakenDEATH.txt	
+++ config_190816_0038/Units/54 - Kraken Event/BOS2_krakenDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '2.6'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/54 - Lightning Boss Event/BOS1_thunderbossDEATH.txt config_190816_0038/Units/54 - Lightning Boss Event/BOS1_thunderbossDEATH.txt
index 7e03cac..c3ceceb 100644
--- config_190813_0233/Units/54 - Lightning Boss Event/BOS1_thunderbossDEATH.txt	
+++ config_190816_0038/Units/54 - Lightning Boss Event/BOS1_thunderbossDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.4'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/54 - Lightning Boss Event/BOS_thunderboss.txt config_190816_0038/Units/54 - Lightning Boss Event/BOS_thunderboss.txt
index cacebc8..d57dff6 100644
--- config_190813_0233/Units/54 - Lightning Boss Event/BOS_thunderboss.txt	
+++ config_190816_0038/Units/54 - Lightning Boss Event/BOS_thunderboss.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.4'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
diff --git config_190813_0233/Units/54 - Raceboss Event/BOS_raceboss.txt config_190816_0038/Units/54 - Raceboss Event/BOS_raceboss.txt
index 529a303..51337ed 100644
--- config_190813_0233/Units/54 - Raceboss Event/BOS_raceboss.txt	
+++ config_190816_0038/Units/54 - Raceboss Event/BOS_raceboss.txt	
@@ -3,10 +3,11 @@ artScale: '1.5'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/54 - Raceboss Event/BOS_racebossDEATH.txt config_190816_0038/Units/54 - Raceboss Event/BOS_racebossDEATH.txt
index 2ca58d5..7f8bf4d 100644
--- config_190813_0233/Units/54 - Raceboss Event/BOS_racebossDEATH.txt	
+++ config_190816_0038/Units/54 - Raceboss Event/BOS_racebossDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/54 - Raijin Event/BOS2_raijin.txt config_190816_0038/Units/54 - Raijin Event/BOS2_raijin.txt
index b6d66d0..23978a2 100644
--- config_190813_0233/Units/54 - Raijin Event/BOS2_raijin.txt	
+++ config_190816_0038/Units/54 - Raijin Event/BOS2_raijin.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.4'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - waterWeakness
 - burnResist
diff --git config_190813_0233/Units/54 - Raijin Event/BOS2_raijinDEATH.txt config_190816_0038/Units/54 - Raijin Event/BOS2_raijinDEATH.txt
index cd422ac..40b7003 100644
--- config_190813_0233/Units/54 - Raijin Event/BOS2_raijinDEATH.txt	
+++ config_190816_0038/Units/54 - Raijin Event/BOS2_raijinDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/60D- Snake Dungeon/BOS_dragonsnakeDEATH.txt config_190816_0038/Units/60D- Snake Dungeon/BOS_dragonsnakeDEATH.txt
index 9271809..9a588d6 100644
--- config_190813_0233/Units/60D- Snake Dungeon/BOS_dragonsnakeDEATH.txt	
+++ config_190816_0038/Units/60D- Snake Dungeon/BOS_dragonsnakeDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '0.4'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/60D- Snake Dungeon/BOS_dragonsnakemaster.txt config_190816_0038/Units/60D- Snake Dungeon/BOS_dragonsnakemaster.txt
index a115d00..bf68046 100644
--- config_190813_0233/Units/60D- Snake Dungeon/BOS_dragonsnakemaster.txt	
+++ config_190816_0038/Units/60D- Snake Dungeon/BOS_dragonsnakemaster.txt	
@@ -2,10 +2,11 @@ art: '!EnemyInvisible'
 artScale: '2'
 colliderHeight: '0'
 colliderWidth: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - burnWeakness
 - poisonResist
diff --git config_190813_0233/Units/61D - Ice Dungeon/BOS_iceboss.txt config_190816_0038/Units/61D - Ice Dungeon/BOS_iceboss.txt
index 0c7403d..b13258c 100644
--- config_190813_0233/Units/61D - Ice Dungeon/BOS_iceboss.txt	
+++ config_190816_0038/Units/61D - Ice Dungeon/BOS_iceboss.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.1'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - poisonWeakness
 - slowResist
diff --git config_190813_0233/Units/61D - Ice Dungeon/BOS_icebossDEATH.txt config_190816_0038/Units/61D - Ice Dungeon/BOS_icebossDEATH.txt
index dac637d..e537f20 100644
--- config_190813_0233/Units/61D - Ice Dungeon/BOS_icebossDEATH.txt	
+++ config_190816_0038/Units/61D - Ice Dungeon/BOS_icebossDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.1'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/62D - Fire Dungeon/BOS1_phoenix5.txt config_190816_0038/Units/62D - Fire Dungeon/BOS1_phoenix5.txt
index 746cc18..ecc6528 100644
--- config_190813_0233/Units/62D - Fire Dungeon/BOS1_phoenix5.txt	
+++ config_190816_0038/Units/62D - Fire Dungeon/BOS1_phoenix5.txt	
@@ -2,10 +2,11 @@ art: EnemyPhoenix
 artScale: '1.5'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderHeight: '2.8'
 colliderWidth: '4'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - waterWeakness
 - burnResist
diff --git config_190813_0233/Units/62D - Fire Dungeon/BOS1_phoenixDEATH.txt config_190816_0038/Units/62D - Fire Dungeon/BOS1_phoenixDEATH.txt
index dacad16..c536024 100644
--- config_190813_0233/Units/62D - Fire Dungeon/BOS1_phoenixDEATH.txt	
+++ config_190816_0038/Units/62D - Fire Dungeon/BOS1_phoenixDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.1'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/63D - Bomb Dungeon/BOS1_bombboss.txt config_190816_0038/Units/63D - Bomb Dungeon/BOS1_bombboss.txt
index ee213b8..790209b 100644
--- config_190813_0233/Units/63D - Bomb Dungeon/BOS1_bombboss.txt	
+++ config_190816_0038/Units/63D - Bomb Dungeon/BOS1_bombboss.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2.5'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 healthRegenRate: '0'
diff --git config_190813_0233/Units/63D - Bomb Dungeon/BOS1_bombbossDEATH.txt config_190816_0038/Units/63D - Bomb Dungeon/BOS1_bombbossDEATH.txt
index fd2452e..8667969 100644
--- config_190813_0233/Units/63D - Bomb Dungeon/BOS1_bombbossDEATH.txt	
+++ config_190816_0038/Units/63D - Bomb Dungeon/BOS1_bombbossDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '0.75'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/64D - Obstacle Dungeon/BOS1_turbineking.txt config_190816_0038/Units/64D - Obstacle Dungeon/BOS1_turbineking.txt
index 75116ab..a300ac2 100644
--- config_190813_0233/Units/64D - Obstacle Dungeon/BOS1_turbineking.txt	
+++ config_190816_0038/Units/64D - Obstacle Dungeon/BOS1_turbineking.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2.7'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/64D - Obstacle Dungeon/BOS1_turbinekingDEATH.txt config_190816_0038/Units/64D - Obstacle Dungeon/BOS1_turbinekingDEATH.txt
index da8ac60..13c0a02 100644
--- config_190813_0233/Units/64D - Obstacle Dungeon/BOS1_turbinekingDEATH.txt	
+++ config_190816_0038/Units/64D - Obstacle Dungeon/BOS1_turbinekingDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2.7'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/65D - Grindhouse Dungeon/BOS_summonermaster.txt config_190816_0038/Units/65D - Grindhouse Dungeon/BOS_summonermaster.txt
index a653d4b..cdf2695 100644
--- config_190813_0233/Units/65D - Grindhouse Dungeon/BOS_summonermaster.txt	
+++ config_190816_0038/Units/65D - Grindhouse Dungeon/BOS_summonermaster.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
diff --git config_190813_0233/Units/65D - Grindhouse Dungeon/BOS_summonermasterDEATH.txt config_190816_0038/Units/65D - Grindhouse Dungeon/BOS_summonermasterDEATH.txt
index c9d582d..b7c08dc 100644
--- config_190813_0233/Units/65D - Grindhouse Dungeon/BOS_summonermasterDEATH.txt	
+++ config_190816_0038/Units/65D - Grindhouse Dungeon/BOS_summonermasterDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/66D - Space Dungeon/BOS1_avatar.txt config_190816_0038/Units/66D - Space Dungeon/BOS1_avatar.txt
index 9d2515c..4c09125 100644
--- config_190813_0233/Units/66D - Space Dungeon/BOS1_avatar.txt	
+++ config_190816_0038/Units/66D - Space Dungeon/BOS1_avatar.txt	
@@ -5,10 +5,11 @@ cameraZoomRadius: '24.00'
 colliderHeight: '0'
 colliderRadius: '2.6'
 colliderWidth: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - poisonWeakness
 - slowResist
diff --git config_190813_0233/Units/66D - Space Dungeon/BOS1_avatarDEATH.txt config_190816_0038/Units/66D - Space Dungeon/BOS1_avatarDEATH.txt
index 0165c6e..6a10ac4 100644
--- config_190813_0233/Units/66D - Space Dungeon/BOS1_avatarDEATH.txt	
+++ config_190816_0038/Units/66D - Space Dungeon/BOS1_avatarDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '2.6'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/67D - Thief Dungeon/BOS_thiefkey_glow.txt config_190816_0038/Units/67D - Thief Dungeon/BOS_thiefkey_glow.txt
index a3ebe64..1d5fcee 100644
--- config_190813_0233/Units/67D - Thief Dungeon/BOS_thiefkey_glow.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/BOS_thiefkey_glow.txt	
@@ -3,10 +3,40 @@ artScale: '1'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
+gunMounts:
+- fireMode: SprinklerTurnback
+  firingArc: '0'
+  flashOffset: '0'
+  gunTypeConfig:
+    bulletHue: green
+    bulletPrefab: shurikenBullet
+    bulletSize: '1'
+    burst: '30'
+    cooldown: '0'
+    damage: '0'
+    isIgnoringWalls: 'true'
+    lifetime: '0.5'
+    multi: '3'
+    multiLifetime: '0.1'
+    multiSpeed: '0.2'
+    multiSpread: '0'
+    rof: '10'
+    speed: '2'
+    spread: '360'
+    turn: '0'
+  mountAngle: '0'
+  mountName: main
+  sfx:
+    sound: 'null'
+  slewRate: '0'
+  sprinklerFlyback: 'true'
+  sprinklerIncrementAngle: '10'
+  sprinklerStartAngle: '0'
+  sprinklerTurnbackAngle: '5000000'
 healthRegenRate: '0'
 isVisibleInRadar: 'true'
 isVisibleToAI: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '10000000'
diff --git config_190813_0233/Units/67D - Thief Dungeon/unit_lasergateNS.txt config_190816_0038/Units/67D - Thief Dungeon/unit_lasergateNS.txt
index 05cd508..bb042ca 100644
--- config_190813_0233/Units/67D - Thief Dungeon/unit_lasergateNS.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/unit_lasergateNS.txt	
@@ -8,128 +8,135 @@ explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSWarnGun
+  isShowingFlash: 'false'
   mountAngle: '-90'
   mountName: warning
   offset:
   - '0'
   - '0'
   sfx:
     sound: Enemy Laser Loop5
-    volume: '0.5'
+    volume: '0.25'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSWarnGun
+  isShowingFlash: 'false'
   mountAngle: '90'
   mountName: warning2
   offset:
   - '0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
-  syncTo: main
+  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSWarnGun
+  isShowingFlash: 'false'
   mountAngle: '90'
   mountName: warning3
   offset:
   - '-0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
-  syncTo: main
+  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSGun
   mountAngle: '-90'
   mountName: main
   offset:
   - '0'
   - '0'
   sfx:
     sound: Enemy Laser Loop5
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSGun
   mountAngle: '90'
   mountName: main2
   offset:
   - '0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
+  syncOffset: '0'
+  syncTo: main
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSGun
   mountAngle: '90'
   mountName: main3
   offset:
   - '-0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
+  syncOffset: '0'
+  syncTo: main
 gunTypes:
-- bulletPrefab: mediumlaserBullet
-  bulletSize: '0.3'
-  burst: '18'
-  cooldown: '1000'
-  damage: '0.01'
-  effect: Burn
-  effectAmount: '0.55'
-  effectDamage: '0.3'
-  effectTime: '1'
-  lifetime: '10'
-  multi: '2'
+- bulletPalette: all_color
+  bulletPrefab: laserBeamBullet_long
+  bulletSize: '1.5'
+  burst: '1000000000'
+  cooldown: '0'
+  damage: '0'
+  isIgnoringWalls: 'true'
+  isPiercing: 'true'
+  lifetime: '1.5'
+  multi: '1'
   multiOffset:
   - '0'
   - '0'
-  multiSpread: '180'
+  multiSpeed: '0'
+  multiSpread: '0'
   name: lasergateNSWarnGun
-  rof: '6'
-  speed: '3'
+  rof: '2'
+  speed: '0'
   spread: '0'
-- bulletPrefab: mediumlaserBullet
-  bulletSize: '1'
-  burst: '10000'
+  turn: '90'
+- bulletPalette: glow
+  bulletPrefab: laserBeamBullet_long
+  bulletSize: '1.5'
+  burst: '1000000000'
   cooldown: '0'
   damage: '0.01'
   effect: Burn
   effectAmount: '1.1'
   effectDamage: '0.3'
   effectTime: '3'
-  lifetime: '10'
-  multi: '2'
+  isIgnoringWalls: 'true'
+  isPiercing: 'true'
+  lifetime: '0.5'
+  multi: '1'
   multiOffset:
   - '0'
   - '0'
-  multiSpread: '180'
+  multiSpeed: '0'
+  multiSpread: '0'
   name: lasergateNSGun
-  rof: '6'
-  speed: '3'
+  rof: '5'
+  speed: '0'
   spread: '0'
+  turn: '90'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '1000'
 maxSpeed: '0'
diff --git config_190813_0233/Units/67D - Thief Dungeon/unit_lasergateWE.txt config_190816_0038/Units/67D - Thief Dungeon/unit_lasergateWE.txt
index 823062b..813ea96 100644
--- config_190813_0233/Units/67D - Thief Dungeon/unit_lasergateWE.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/unit_lasergateWE.txt	
@@ -15,11 +15,11 @@ gunMounts:
   offset:
   - '0'
   - '0'
   sfx:
     sound: Enemy Laser Loop5
-    volume: '0.5'
+    volume: '0.25'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSWarnGun
@@ -30,67 +30,65 @@ gunMounts:
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
-  syncTo: main
+  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSWarnGun
   mountAngle: '90'
   mountName: warning3
   offset:
   - '-0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
-  syncTo: main
+  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSGun
   mountAngle: '-90'
   mountName: main
   offset:
   - '0'
   - '0'
   sfx:
     sound: Enemy Laser Loop5
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSGun
   mountAngle: '90'
   mountName: main2
   offset:
   - '0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
+  syncOffset: '0'
+  syncTo: main
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergateNSGun
   mountAngle: '90'
   mountName: main3
   offset:
   - '-0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
+  syncOffset: '0'
+  syncTo: main
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '1000'
 maxSpeed: '0'
diff --git config_190813_0233/Units/67D - Thief Dungeon/unit_lasergatediagonal1.txt config_190816_0038/Units/67D - Thief Dungeon/unit_lasergatediagonal1.txt
index 30a3d9a..9cd1a0e 100644
--- config_190813_0233/Units/67D - Thief Dungeon/unit_lasergatediagonal1.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/unit_lasergatediagonal1.txt	
@@ -15,11 +15,11 @@ gunMounts:
   offset:
   - '0'
   - '0'
   sfx:
     sound: Enemy Laser Loop5
-    volume: '0.5'
+    volume: '0.25'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalWarnGun
@@ -30,106 +30,110 @@ gunMounts:
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
-  syncTo: main
+  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalWarnGun
   mountAngle: '90'
   mountName: warning3
   offset:
   - '-0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
-  syncTo: main
+  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalGun
   mountAngle: '-90'
   mountName: main
   offset:
   - '0'
   - '0'
   sfx:
     sound: Enemy Laser Loop5
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalGun
   mountAngle: '90'
   mountName: main2
   offset:
   - '0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
+  syncOffset: '0'
+  syncTo: main
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalGun
   mountAngle: '90'
   mountName: main3
   offset:
   - '-0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
+  syncOffset: '0'
+  syncTo: main
 gunTypes:
-- bulletPrefab: mediumlaserBullet
-  bulletSize: '0.3'
-  burst: '18'
-  cooldown: '1000'
-  damage: '0.01'
-  effect: Burn
-  effectAmount: '0.6'
-  effectDamage: '0.3'
-  effectTime: '1'
-  lifetime: '10'
-  multi: '2'
+- bulletPalette: all_color
+  bulletPrefab: laserBeamBullet_long
+  bulletSize: '2.1'
+  burst: '1000000000'
+  cooldown: '0'
+  damage: '0'
+  isIgnoringWalls: 'true'
+  isPiercing: 'true'
+  lifetime: '1.5'
+  multi: '1'
   multiOffset:
   - '0'
   - '0'
-  multiSpread: '180'
+  multiSpeed: '0'
+  multiSpread: '0'
   name: lasergatediagonalWarnGun
-  rof: '6'
-  speed: '3'
+  rof: '2'
+  speed: '0'
   spread: '0'
-- bulletPrefab: mediumlaserBullet
-  bulletSize: '1'
-  burst: '10000'
+  turn: '90'
+- bulletPalette: glow
+  bulletPrefab: laserBeamBullet_long
+  bulletSize: '2.1'
+  burst: '1000000000'
   cooldown: '0'
   damage: '0.01'
   effect: Burn
   effectAmount: '1.1'
   effectDamage: '0.3'
   effectTime: '3'
-  lifetime: '10'
-  multi: '2'
+  isIgnoringWalls: 'true'
+  isPiercing: 'true'
+  lifetime: '0.5'
+  multi: '1'
   multiOffset:
   - '0'
   - '0'
-  multiSpread: '180'
+  multiSpeed: '0'
+  multiSpread: '0'
   name: lasergatediagonalGun
-  rof: '6'
-  speed: '3'
+  rof: '5'
+  speed: '0'
   spread: '0'
+  turn: '90'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '1000'
 maxSpeed: '0'
diff --git config_190813_0233/Units/67D - Thief Dungeon/unit_lasergatediagonal2.txt config_190816_0038/Units/67D - Thief Dungeon/unit_lasergatediagonal2.txt
index 04f3715..ab29df5 100644
--- config_190813_0233/Units/67D - Thief Dungeon/unit_lasergatediagonal2.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/unit_lasergatediagonal2.txt	
@@ -15,11 +15,11 @@ gunMounts:
   offset:
   - '0'
   - '0'
   sfx:
     sound: Enemy Laser Loop5
-    volume: '0.5'
+    volume: '0.25'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalWarnGun
@@ -30,67 +30,65 @@ gunMounts:
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
-  syncTo: main
+  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalWarnGun
   mountAngle: '90'
   mountName: warning3
   offset:
   - '-0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
-  syncTo: main
+  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalGun
   mountAngle: '-90'
   mountName: main
   offset:
   - '0'
   - '0'
   sfx:
     sound: Enemy Laser Loop5
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalGun
   mountAngle: '90'
   mountName: main2
   offset:
   - '0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
+  syncOffset: '0'
+  syncTo: main
 - fireMode: JustShootDammit
   firingArc: '0'
   flashOffset: '0'
   gunTemplateName: lasergatediagonalGun
   mountAngle: '90'
   mountName: main3
   offset:
   - '-0.9'
   - '0'
   sfx:
     sound: 'null'
   slewRate: '0'
-  syncOffset: '1.5'
-  syncTo: warning
+  syncOffset: '0'
+  syncTo: main
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '1000'
 maxSpeed: '0'
diff --git config_190813_0233/Units/67D - Thief Dungeon/unit_lasergrid.txt config_190816_0038/Units/67D - Thief Dungeon/unit_lasergrid.txt
index 80933ba..79dee2e 100644
--- config_190813_0233/Units/67D - Thief Dungeon/unit_lasergrid.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/unit_lasergrid.txt	
@@ -17,28 +17,31 @@ gunMounts:
   - '0'
   sfx:
     sound: Enemy Laser Loop5
   slewRate: '0'
 gunTypes:
-- bulletPrefab: laserBullet
+- bulletPalette: glow
+  bulletPrefab: laserBeamBullet
   bulletSize: '1.5'
   burst: '10000'
   cooldown: '0'
   damage: '0.01'
   effect: Burn
   effectAmount: '0.4'
   effectDamage: '0.3'
   effectTime: '3'
-  lifetime: '0.25'
-  multi: '7'
+  isIgnoringWalls: 'true'
+  isPiercing: 'true'
+  lifetime: '0.15'
+  multi: '1'
   multiOffset:
   - '0.75'
   - '0'
   multiSpread: '0'
   name: lasergridGun
-  rof: '6'
-  speed: '1'
+  rof: '10'
+  speed: '0'
   spread: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '1000'
diff --git config_190813_0233/Units/67D - Thief Dungeon/unit_thiefwatcher.txt config_190816_0038/Units/67D - Thief Dungeon/unit_thiefwatcher.txt
index 29dc0ec..a257675 100644
--- config_190813_0233/Units/67D - Thief Dungeon/unit_thiefwatcher.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/unit_thiefwatcher.txt	
@@ -18,29 +18,31 @@ gunMounts:
   sfx:
     sound: Enemy Laser Loop4
   signalTime: '2'
   slewRate: '0'
 gunTypes:
-- bulletPrefab: laserBullet
+- bulletPalette: glow
+  bulletPrefab: laserBeamBullet
   bulletSize: '2'
   burst: '210'
-  cooldown: '3'
+  cooldown: '0'
   damage: '0.01'
   effect: Burn
   effectAmount: '0.4'
   effectDamage: '0.3'
   effectTime: '3'
+  isIgnoringWalls: 'true'
   isPiercing: 'true'
-  lifetime: '0.2'
-  multi: '8'
+  lifetime: '0.15'
+  multi: '1'
   multiOffset:
   - '0'
-  - '1'
+  - '1.5'
   multiSpread: '0'
   name: thiefwatchergun
-  rof: '5'
-  speed: '5'
+  rof: '10'
+  speed: '0'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '6'
 maxSpeed: '3'
diff --git config_190813_0233/Units/67D - Thief Dungeon/unit_trapmine.txt config_190816_0038/Units/67D - Thief Dungeon/unit_trapmine.txt
index d374327..ca5e01e 100644
--- config_190813_0233/Units/67D - Thief Dungeon/unit_trapmine.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/unit_trapmine.txt	
@@ -15,42 +15,42 @@ gunMounts:
   mountAngle: '0'
   mountName: boom
   slewRate: '360'
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0'
+  flashOffset: '4.7'
   gunTemplateName: trapminewarningGun
   mountAngle: '45'
   mountName: warning1
   sfx:
     sound: 'null'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0'
+  flashOffset: '4.7'
   gunTemplateName: trapminewarningGun
   mountAngle: '135'
   mountName: warning2
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
   syncTo: warning1
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0'
+  flashOffset: '4.7'
   gunTemplateName: trapminewarningGun
   mountAngle: '225'
   mountName: warning3
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
   syncTo: warning1
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0'
+  flashOffset: '4.7'
   gunTemplateName: trapminewarningGun
   mountAngle: '315'
   mountName: warning4
   sfx:
     sound: 'null'
@@ -74,29 +74,32 @@ gunTypes:
   name: trapmineboomGun2
   rof: '1'
   speed: '3'
   spread: '0'
   turn: '18'
-- bulletPrefab: laserBullet
-  bulletSize: '2'
+- bulletPalette: glow
+  bulletPrefab: laserBeamBullet
+  bulletSize: '2.5'
   burst: '1'
   cooldown: '0'
   damage: '0.01'
   effect: Burn
   effectAmount: '0.8'
   effectDamage: '0.3'
   effectTime: '3'
-  lifetime: '2'
+  isIgnoringWalls: 'true'
+  isPiercing: 'true'
+  lifetime: '0.5'
   multi: '1'
   multiOffset:
   - '0'
   - '0'
   multiSpeed: '0'
   multiSpread: '0'
   name: trapminewarningGun
   rof: '3'
-  speed: '4.5'
+  speed: '0'
   spread: '0'
 healthRegenRate: '0'
 isVisibleInRadar: 'false'
 maxEnergyPoints: '1'
 maxHitPoints: '10'
diff --git config_190813_0233/Units/67D - Thief Dungeon/unit_trapmineshort.txt config_190816_0038/Units/67D - Thief Dungeon/unit_trapmineshort.txt
index 9814877..38e33f1 100644
--- config_190813_0233/Units/67D - Thief Dungeon/unit_trapmineshort.txt	
+++ config_190816_0038/Units/67D - Thief Dungeon/unit_trapmineshort.txt	
@@ -12,42 +12,42 @@ gunMounts:
   mountAngle: '0'
   mountName: boom
   slewRate: '360'
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0'
+  flashOffset: '4.7'
   gunTemplateName: trapminewarningGun
   mountAngle: '45'
   mountName: warning1
   sfx:
     sound: 'null'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0'
+  flashOffset: '4.7'
   gunTemplateName: trapminewarningGun
   mountAngle: '135'
   mountName: warning2
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
   syncTo: warning1
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0'
+  flashOffset: '4.7'
   gunTemplateName: trapminewarningGun
   mountAngle: '225'
   mountName: warning3
   sfx:
     sound: 'null'
   slewRate: '0'
   syncOffset: '0.0'
   syncTo: warning1
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0'
+  flashOffset: '4.7'
   gunTemplateName: trapminewarningGun
   mountAngle: '315'
   mountName: warning4
   sfx:
     sound: 'null'
diff --git config_190813_0233/Units/68D - Eyeball Dungeon/BOS_octopus.txt config_190816_0038/Units/68D - Eyeball Dungeon/BOS_octopus.txt
index d391f01..a925e4f 100644
--- config_190813_0233/Units/68D - Eyeball Dungeon/BOS_octopus.txt	
+++ config_190816_0038/Units/68D - Eyeball Dungeon/BOS_octopus.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.68'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
@@ -74,31 +75,33 @@ gunMounts:
   - '0'
   signalTime: '2'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '360'
-  flashOffset: '5'
+  flashOffset: '8'
   gunTypeConfig:
-    bulletPrefab: laserBullet
-    bulletSize: '6'
+    bulletPalette: glow
+    bulletPrefab: laserBeamBullet_wide
+    bulletSize: '3.5'
     burst: '210'
-    cooldown: '3'
-    damage: '0.9'
+    cooldown: '0'
+    damage: '0.01'
     effect: Water
     effectAmount: '0.1'
-    effectDamage: '0.45'
+    effectDamage: '1'
     effectTime: '0.1'
+    isIgnoringWalls: 'true'
     isPiercing: 'true'
-    lifetime: '0.2'
-    multi: '7'
+    lifetime: '0.15'
+    multi: '1'
     multiOffset:
     - '0'
-    - '1.5'
+    - '0'
     multiSpread: '0'
     name: octopuslasergun
-    rof: '5'
-    speed: '5'
+    rof: '10'
+    speed: '0'
     spread: '0'
   mountAngle: '0'
   mountName: eyelaser
   offset:
   - '0'
diff --git config_190813_0233/Units/68D - Eyeball Dungeon/BOS_octopusDEATH.txt config_190816_0038/Units/68D - Eyeball Dungeon/BOS_octopusDEATH.txt
index 77b103e..7b532e9 100644
--- config_190813_0233/Units/68D - Eyeball Dungeon/BOS_octopusDEATH.txt	
+++ config_190816_0038/Units/68D - Eyeball Dungeon/BOS_octopusDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/69D - Temple Dungeon/BOS1_smokeboss.txt config_190816_0038/Units/69D - Temple Dungeon/BOS1_smokeboss.txt
index 2e9912d..9c48d23 100644
--- config_190813_0233/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
+++ config_190816_0038/Units/69D - Temple Dungeon/BOS1_smokeboss.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.6'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
diff --git config_190813_0233/Units/69D - Temple Dungeon/BOS1_smokebossDEATH.txt config_190816_0038/Units/69D - Temple Dungeon/BOS1_smokebossDEATH.txt
index 032078a..f45ef55 100644
--- config_190813_0233/Units/69D - Temple Dungeon/BOS1_smokebossDEATH.txt	
+++ config_190816_0038/Units/69D - Temple Dungeon/BOS1_smokebossDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '0.75'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt config_190816_0038/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt
index d806c69..b7b1930 100644
--- config_190813_0233/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt	
+++ config_190816_0038/Units/70D - Sneezy Mini Dungeon/BOS_sneezy.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '45'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
diff --git config_190813_0233/Units/70D - Sneezy Mini Dungeon/BOS_sneezyDEATH.txt config_190816_0038/Units/70D - Sneezy Mini Dungeon/BOS_sneezyDEATH.txt
index d1d2b71..bb32537 100644
--- config_190813_0233/Units/70D - Sneezy Mini Dungeon/BOS_sneezyDEATH.txt	
+++ config_190816_0038/Units/70D - Sneezy Mini Dungeon/BOS_sneezyDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/71D - Escort Mission Dungeon/BOS0_escortmission.txt config_190816_0038/Units/71D - Escort Mission Dungeon/BOS0_escortmission.txt
index 59a023c..d0992ac 100644
--- config_190813_0233/Units/71D - Escort Mission Dungeon/BOS0_escortmission.txt	
+++ config_190816_0038/Units/71D - Escort Mission Dungeon/BOS0_escortmission.txt	
@@ -2,10 +2,11 @@ art: FriendlyDrillShipPrefab
 artScale: '1.5'
 bankSmoothing: '10000'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   flashOffset: '0.4'
diff --git config_190813_0233/Units/71D - Escort Mission Dungeon/BOS0_escortmissionDEATH.txt config_190816_0038/Units/71D - Escort Mission Dungeon/BOS0_escortmissionDEATH.txt
index 967e200..c690b78 100644
--- config_190813_0233/Units/71D - Escort Mission Dungeon/BOS0_escortmissionDEATH.txt	
+++ config_190816_0038/Units/71D - Escort Mission Dungeon/BOS0_escortmissionDEATH.txt	
@@ -2,10 +2,11 @@ art: FriendlyDrillShipPrefab_Death
 artScale: '1.5'
 colliderRadius: '0'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/71D - Escort Mission Dungeon/BOS3_escortevilorb.txt config_190816_0038/Units/71D - Escort Mission Dungeon/BOS3_escortevilorb.txt
index 4e59e81..d93b7bf 100644
--- config_190813_0233/Units/71D - Escort Mission Dungeon/BOS3_escortevilorb.txt	
+++ config_190816_0038/Units/71D - Escort Mission Dungeon/BOS3_escortevilorb.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '25'
 colliderRadius: '3'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/71D - Escort Mission Dungeon/BOS3_escortevilorbDEATH.txt config_190816_0038/Units/71D - Escort Mission Dungeon/BOS3_escortevilorbDEATH.txt
index 541ac10..ffbb812 100644
--- config_190813_0233/Units/71D - Escort Mission Dungeon/BOS3_escortevilorbDEATH.txt	
+++ config_190816_0038/Units/71D - Escort Mission Dungeon/BOS3_escortevilorbDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '30'
 colliderRadius: '3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
diff --git config_190813_0233/Units/72D - Arena Dungeon 1/BOS_swarmboss.txt config_190816_0038/Units/72D - Arena Dungeon 1/BOS_swarmboss.txt
index c471d54..8f5b0ff 100644
--- config_190813_0233/Units/72D - Arena Dungeon 1/BOS_swarmboss.txt	
+++ config_190816_0038/Units/72D - Arena Dungeon 1/BOS_swarmboss.txt	
@@ -3,10 +3,11 @@ artScale: '1'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.25'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
diff --git config_190813_0233/Units/72D - Arena Dungeon 1/BOS_swarmbossDEATH.txt config_190816_0038/Units/72D - Arena Dungeon 1/BOS_swarmbossDEATH.txt
index 92a50be..e11862a 100644
--- config_190813_0233/Units/72D - Arena Dungeon 1/BOS_swarmbossDEATH.txt	
+++ config_190816_0038/Units/72D - Arena Dungeon 1/BOS_swarmbossDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '24.00'
 colliderRadius: '1.25'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/73D - Arena Dungeon 2/BOS_arenacube.txt config_190816_0038/Units/73D - Arena Dungeon 2/BOS_arenacube.txt
index 1d55e1d..e66d556 100644
--- config_190813_0233/Units/73D - Arena Dungeon 2/BOS_arenacube.txt	
+++ config_190816_0038/Units/73D - Arena Dungeon 2/BOS_arenacube.txt	
@@ -3,10 +3,11 @@ artScale: '1.0'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '90'
 colliderRadius: '2.5'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
diff --git config_190813_0233/Units/73D - Arena Dungeon 2/BOS_arenacubeDEATH.txt config_190816_0038/Units/73D - Arena Dungeon 2/BOS_arenacubeDEATH.txt
index 2dbfc77..b1f049a 100644
--- config_190813_0233/Units/73D - Arena Dungeon 2/BOS_arenacubeDEATH.txt	
+++ config_190816_0038/Units/73D - Arena Dungeon 2/BOS_arenacubeDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '90'
 colliderRadius: '2.5'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/999D - Three Brothers/BOS_kaiju3B.txt config_190816_0038/Units/999D - Three Brothers/BOS_kaiju3B.txt
index 60d430f..6a67e51 100644
--- config_190813_0233/Units/999D - Three Brothers/BOS_kaiju3B.txt	
+++ config_190816_0038/Units/999D - Three Brothers/BOS_kaiju3B.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - lightningWeakness
 - waterResist
@@ -155,12 +156,13 @@ gunMounts:
     cooldown: '10'
     damage: '1'
     effect: Water
     effectAmount: '3'
     effectTime: '3'
+    isIgnoringWalls: 'true'
     isPiercing: 'true'
-    lifetime: '3'
+    lifetime: '1'
     multi: '2'
     multiSpread: '0'
     name: meowzafinalbeam
     range: '8'
     rof: '15'
diff --git config_190813_0233/Units/999D - Three Brothers/BOS_kaiju3BDEATH.txt config_190816_0038/Units/999D - Three Brothers/BOS_kaiju3BDEATH.txt
index 8e60403..c02e9a5 100644
--- config_190813_0233/Units/999D - Three Brothers/BOS_kaiju3BDEATH.txt	
+++ config_190816_0038/Units/999D - Three Brothers/BOS_kaiju3BDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/999D - Three Brothers/BOS_raijin3B.txt config_190816_0038/Units/999D - Three Brothers/BOS_raijin3B.txt
index c7b28cb..421eb68 100644
--- config_190813_0233/Units/999D - Three Brothers/BOS_raijin3B.txt	
+++ config_190816_0038/Units/999D - Three Brothers/BOS_raijin3B.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.4'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - waterWeakness
 - burnResist
@@ -212,12 +213,13 @@ gunMounts:
     cooldown: '10'
     damage: '1'
     effect: Burn
     effectAmount: '3'
     effectTime: '3'
+    isIgnoringWalls: 'true'
     isPiercing: 'true'
-    lifetime: '3'
+    lifetime: '1'
     multi: '2'
     multiSpread: '0'
     name: meowzafinalbeam
     range: '8'
     rof: '15'
diff --git config_190813_0233/Units/999D - Three Brothers/BOS_raijin3BDEATH.txt config_190816_0038/Units/999D - Three Brothers/BOS_raijin3BDEATH.txt
index d654db7..28b7551 100644
--- config_190813_0233/Units/999D - Three Brothers/BOS_raijin3BDEATH.txt	
+++ config_190816_0038/Units/999D - Three Brothers/BOS_raijin3BDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.3'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/999D - Three Brothers/BOS_thunderboss3B.txt config_190816_0038/Units/999D - Three Brothers/BOS_thunderboss3B.txt
index d93648c..8e61763 100644
--- config_190813_0233/Units/999D - Three Brothers/BOS_thunderboss3B.txt	
+++ config_190816_0038/Units/999D - Three Brothers/BOS_thunderboss3B.txt	
@@ -4,10 +4,11 @@ bankSmoothing: '10000'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.4'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 elementSusceptibilityIds:
 - slowWeakness
 - lightningResist
@@ -192,12 +193,13 @@ gunMounts:
     cooldown: '10'
     damage: '1'
     effect: Lightning
     effectAmount: '3'
     effectTime: '3'
+    isIgnoringWalls: 'true'
     isPiercing: 'true'
-    lifetime: '3'
+    lifetime: '1'
     multi: '2'
     multiSpread: '0'
     name: meowzafinalbeam
     range: '8'
     rof: '15'
diff --git config_190813_0233/Units/999D - Three Brothers/BOS_thunderboss3BDEATH.txt config_190816_0038/Units/999D - Three Brothers/BOS_thunderboss3BDEATH.txt
index 3b3428d..3b36841 100644
--- config_190813_0233/Units/999D - Three Brothers/BOS_thunderboss3BDEATH.txt	
+++ config_190816_0038/Units/999D - Three Brothers/BOS_thunderboss3BDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.4'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
 - fireMode: SprinklerTurnback
   firingArc: '360'
diff --git config_190813_0233/Units/99D - Boss Dungeon/BOS1_meowza.txt config_190816_0038/Units/99D - Boss Dungeon/BOS1_meowza.txt
index ea39e87..20ccb97 100644
--- config_190813_0233/Units/99D - Boss Dungeon/BOS1_meowza.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon/BOS1_meowza.txt	
@@ -3,10 +3,11 @@ artScale: '1.75'
 cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '2'
 colliderX: '0'
 colliderY: '0'
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
@@ -62,10 +63,11 @@ gunMounts:
     cooldown: '10'
     damage: '1'
     effect: Burn
     effectAmount: '3'
     effectTime: '3'
+    isIgnoringWalls: 'true'
     isPiercing: 'true'
     lifetime: '3'
     multi: '2'
     multiSpread: '0'
     name: meowzafinalbeam
diff --git config_190813_0233/Units/99D - Boss Dungeon/BOS1_meowzaDEATH.txt config_190816_0038/Units/99D - Boss Dungeon/BOS1_meowzaDEATH.txt
index ccf28a6..a7469a0 100644
--- config_190813_0233/Units/99D - Boss Dungeon/BOS1_meowzaDEATH.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon/BOS1_meowzaDEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '1.5'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
diff --git config_190813_0233/Units/99D - Boss Dungeon/ph2_meowzaB1.txt config_190816_0038/Units/99D - Boss Dungeon/ph2_meowzaB1.txt
index 090876a..6add844 100644
--- config_190813_0233/Units/99D - Boss Dungeon/ph2_meowzaB1.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon/ph2_meowzaB1.txt	
@@ -1,7 +1,7 @@
 art: EnemyMeowzaTurret
-artScale: '1'
+artScale: '1.5'
 colliderRadius: '0.6'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 healthRegenRate: '0'
diff --git config_190813_0233/Units/99D - Boss Dungeon/ph2_meowzaB2.txt config_190816_0038/Units/99D - Boss Dungeon/ph2_meowzaB2.txt
index 47bad64..cf49c12 100644
--- config_190813_0233/Units/99D - Boss Dungeon/ph2_meowzaB2.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon/ph2_meowzaB2.txt	
@@ -1,139 +1,96 @@
-art: '!EnemyInvisible'
+art: EnemyMeowzaTurret
 artScale: '0.1'
 colliderRadius: '0.0'
 colliderX: '0'
 colliderY: '0'
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
-  flashOffset: '0.33'
+  flashOffset: '9'
   gunTemplateName: meowzaB2Gun0warning
   mountAngle: '0'
   mountName: warning
   sfx:
     sound: 'null'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '360'
-  flashOffset: '0.33'
+  flashOffset: '9'
   gunTemplateName: meowzaB2Gun0
   mountAngle: '0'
   mountName: main
   sfx:
     pitch: '0.25'
     sound: Enemy Laser Loop8
-    volume: '1'
+    volume: '1.5'
   slewRate: '0'
   syncOffset: '1'
   syncTo: warning
 gunTypes:
-- bulletPrefab: laserBullet
-  bulletSize: '5'
-  burst: '10'
+- bulletPalette: glow
+  bulletPrefab: laserBeamBullet_wide
+  bulletSize: '3.5'
+  burst: '20'
   cooldown: '4000000'
   damage: '1'
+  isIgnoringWalls: 'true'
   isPiercing: 'true'
   lifetime: '1'
   multi: '1'
   multiSpread: '0'
   name: meowzaB2Gun0
   rof: '10'
-  speed: '15'
+  speed: '0'
   spread: '0'
-- bulletPrefab: laserBullet
-  burst: '10'
+- bulletPalette: all_color
+  bulletPrefab: laserBeamBullet_wide
+  bulletSize: '3.5'
+  burst: '1'
   cooldown: '4000000'
-  damage: '0.1'
+  damage: '0.01'
+  isIgnoringWalls: 'true'
   isPiercing: 'true'
   lifetime: '1'
   multi: '1'
   multiSpread: '0'
   name: meowzaB2Gun0warning
-  rof: '10'
-  speed: '15'
+  rof: '1'
+  speed: '0'
   spread: '0'
-- bulletPrefab: laserBullet
-  bulletSize: '5'
-  burst: '10'
-  cooldown: '400000'
+- bulletPalette: glow
+  bulletPrefab: laserBeamBullet
+  bulletSize: '8.4'
+  burst: '20'
+  cooldown: '4000000'
   damage: '1'
+  isIgnoringWalls: 'true'
   isPiercing: 'true'
   lifetime: '1'
   multi: '1'
   multiSpread: '0'
   name: meowzaB2Gun
   rof: '10'
-  speed: '29'
+  speed: '0'
   spread: '0'
-- bulletPrefab: laserBullet
-  bulletSize: '0.5'
-  burst: '10'
-  cooldown: '400000'
-  damage: '0.1'
-  isPiercing: 'true'
-  lifetime: '1'
-  multi: '1'
-  multiSpread: '0'
-  name: meowzaB2Gun2
-  rof: '10'
-  speed: '1'
-  spread: '90'
-- bulletPrefab: laserBullet
-  burst: '10'
-  cooldown: '400000'
-  damage: '0.1'
+- bulletPalette: all_color
+  bulletPrefab: laserBeamBullet
+  bulletSize: '8.4'
+  burst: '1'
+  cooldown: '4000000'
+  damage: '0.01'
+  isIgnoringWalls: 'true'
   isPiercing: 'true'
   lifetime: '1'
   multi: '1'
   multiSpread: '0'
   name: meowzaB2GunWarning
-  rof: '10'
-  speed: '29'
-  spread: '0'
-- bulletPrefab: laserBullet
-  bulletSize: '0.5'
-  burst: '10'
-  cooldown: '400000'
-  damage: '0.1'
-  isPiercing: 'true'
-  lifetime: '1'
-  multi: '1'
-  multiSpread: '0'
-  name: meowzaB2Gun2Warning
-  rof: '10'
-  speed: '1'
-  spread: '90'
-- bulletPrefab: laserBullet
-  bulletSize: '5'
-  burst: '10'
-  cooldown: '400000'
-  damage: '1'
-  isPiercing: 'true'
-  lifetime: '1'
-  multi: '1'
-  multiSpread: '0'
-  name: meowzaB2Gun_prev
-  rof: '10'
-  speed: '29'
-  spread: '0'
-  turn: '180'
-- bulletPrefab: laserBullet
-  burst: '10'
-  cooldown: '400000'
-  damage: '0.1'
-  isPiercing: 'true'
-  lifetime: '1'
-  multi: '1'
-  multiSpread: '0'
-  name: meowzaB2GunWarning_prev
-  rof: '10'
-  speed: '29'
+  rof: '1'
+  speed: '0'
   spread: '0'
-  turn: '180'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '9999'
 maxSpeed: '0'
 maxTurnRate: '270'
diff --git config_190813_0233/Units/99D - Boss Dungeon/ph2_meowzaB2m.txt config_190816_0038/Units/99D - Boss Dungeon/ph2_meowzaB2m.txt
index 4bc5aa2..e5dc79d 100644
--- config_190813_0233/Units/99D - Boss Dungeon/ph2_meowzaB2m.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon/ph2_meowzaB2m.txt	
@@ -8,49 +8,27 @@ effectImmunities:
 energyRegenRate: '0'
 explosionPrefab: ExplosionSmall
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '0.33'
+  flashOffset: '16'
   gunTemplateName: meowzaB2GunWarning
   mountAngle: '162.5'
   mountName: warning
   sfx:
     sound: 'null'
   slewRate: '0'
 - fireMode: JustShootDammit
   firingArc: '0'
-  flashOffset: '1'
-  gunTemplateName: meowzaB2Gun2Warning
-  mountAngle: '180'
-  mountName: warningreflect
-  sfx:
-    sound: 'null'
-  slewRate: '0'
-  syncOffset: '0'
-  syncTo: warning
-- fireMode: JustShootDammit
-  firingArc: '0'
-  flashOffset: '0.33'
+  flashOffset: '16'
   gunTemplateName: meowzaB2Gun
   mountAngle: '162.5'
   mountName: main
   sfx:
-    pitch: '0.25'
-    sound: Enemy Laser Loop8
-    volume: '1'
-  slewRate: '0'
-  syncOffset: '1'
-  syncTo: warning
-- fireMode: JustShootDammit
-  firingArc: '0'
-  flashOffset: '1'
-  gunTemplateName: meowzaB2Gun2
-  mountAngle: '180'
-  mountName: mainreflect
-  sfx:
-    sound: 'null'
+    pitch: '0.5'
+    sound: Enemy Laser Charging Hot
+    volume: '1.5'
   slewRate: '0'
   syncOffset: '1'
   syncTo: warning
 healthRegenRate: '0'
 maxEnergyPoints: '1'
diff --git config_190813_0233/Units/99D - Boss Dungeon/phx_meowzalaserD.txt config_190816_0038/Units/99D - Boss Dungeon/phx_meowzalaserD.txt
index faf1032..3f4f17d 100644
--- config_190813_0233/Units/99D - Boss Dungeon/phx_meowzalaserD.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon/phx_meowzalaserD.txt	
@@ -49,23 +49,25 @@ gunTypes:
 - bulletPrefab: octagonBullet
   bulletSize: '3'
   burst: '180'
   cooldown: '0'
   damage: '1.3'
+  isIgnoringWalls: 'true'
   isPiercing: 'true'
   lifetime: '4'
   multi: '3'
   multiSpread: '120'
   name: meowzalaserD
   rof: '2.5'
   speed: '6'
   spread: '0'
 - bulletPrefab: octagonBullet
   bulletSize: '3'
   burst: '180'
   cooldown: '0'
   damage: '0'
+  isIgnoringWalls: 'true'
   isPiercing: 'true'
   lifetime: '1'
   multi: '3'
   multiSpread: '120'
   name: meowzalaserD2
diff --git config_190813_0233/Units/99D - Boss Dungeon 2/BOS1_meowza2.txt config_190816_0038/Units/99D - Boss Dungeon 2/BOS1_meowza2.txt
index 8889efc..fb46bf8 100644
--- config_190813_0233/Units/99D - Boss Dungeon 2/BOS1_meowza2.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon 2/BOS1_meowza2.txt	
@@ -4,11 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '10000'
 colliderRadius: '1'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
-deactivationType: never
+deactivationType: ai_delayed
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionMed
 gunMounts:
@@ -22,10 +22,11 @@ gunMounts:
     cooldown: '10'
     damage: '1'
     effect: Burn
     effectAmount: '3'
     effectTime: '3'
+    isIgnoringWalls: 'true'
     isPiercing: 'true'
     lifetime: '3'
     multi: '1'
     multiSpread: '0'
     name: meowza2finalbeam
diff --git config_190813_0233/Units/99D - Boss Dungeon 2/BOS1_meowza2DEATH.txt config_190816_0038/Units/99D - Boss Dungeon 2/BOS1_meowza2DEATH.txt
index ee2ef3c..2f3194c 100644
--- config_190813_0233/Units/99D - Boss Dungeon 2/BOS1_meowza2DEATH.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon 2/BOS1_meowza2DEATH.txt	
@@ -4,10 +4,11 @@ cameraZoomMultiplier: '1.25'
 cameraZoomRadius: '40'
 colliderRadius: '2.6'
 colliderX: '0'
 colliderY: '0'
 damageThreshold: '0'
+deactivationType: never
 effectImmunities:
 - Confuse
 energyRegenRate: '0'
 explosionPrefab: ExplosionB_Final
 gunMounts:
diff --git config_190813_0233/Units/99D - Boss Dungeon 2/BOS1_meowza2_lasereye.txt config_190816_0038/Units/99D - Boss Dungeon 2/BOS1_meowza2_lasereye.txt
index f2a43ee..398df83 100644
--- config_190813_0233/Units/99D - Boss Dungeon 2/BOS1_meowza2_lasereye.txt	
+++ config_190816_0038/Units/99D - Boss Dungeon 2/BOS1_meowza2_lasereye.txt	
@@ -9,39 +9,41 @@ elementSusceptibilityIds:
 energyRegenRate: '0'
 explosionPrefab: planeExplosionEmpty
 gunMounts:
 - fireMode: JustShootDammit
   firingArc: '360'
-  flashOffset: '10'
+  flashOffset: '9.7'
   gunTemplateName: meowza2_lasereyegun
   mountAngle: '0'
   mountName: main
   sfx:
     sound: Enemy Laser Loop4
   signalTime: '2'
   slewRate: '0'
 gunTypes:
-- bulletPrefab: tracerBullet
-  bulletSize: '5'
-  burst: '410'
-  cooldown: '3'
+- bulletPalette: glow
+  bulletPrefab: laserBeamBullet_long
+  bulletSize: '2.7'
+  burst: '210'
+  cooldown: '0'
   damage: '0.01'
   effect: Water
   effectAmount: '0.1'
-  effectDamage: '0.44'
+  effectDamage: '0.5'
   effectTime: '0.1'
   hashOverride: '6666'
+  isIgnoringWalls: 'true'
   isPiercing: 'true'
-  lifetime: '0.2'
-  multi: '7'
+  lifetime: '0.15'
+  multi: '1'
   multiOffset:
   - '0'
-  - '3'
+  - '1.5'
   multiSpread: '0'
   name: meowza2_lasereyegun
   rof: '10'
-  speed: '5'
+  speed: '0'
   spread: '0'
 healthRegenRate: '0'
 maxEnergyPoints: '1'
 maxHitPoints: '6'
 maxSpeed: '3'
diff --git config_190813_0233/banned_words.txt config_190816_0038/banned_words.txt
index 0399bc3..4360e25 100644
--- config_190813_0233/banned_words.txt
+++ config_190816_0038/banned_words.txt
@@ -357,11 +357,10 @@
   - l3i\+ch
   - l3itch
   - labia
   - lesbian
   - lesbo
-  - lmfao
   - m0f0
   - m0fo
   - m45terbate
   - ma5terb8
   - ma5terbate
diff --git config_190813_0233/buffTags.txt config_190816_0038/buffTags.txt
index 13f9637..1c63836 100644
--- config_190813_0233/buffTags.txt
+++ config_190816_0038/buffTags.txt
@@ -51,5 +51,10 @@
   - dungeonmod_hot_to_handle
   - dungeonmod_dead_to_world
   - dungeonmod_insomniac
   id: dungeonmods_all
   stacks: '1'
+- buffs:
+  - meowza2_silence_short
+  - meowza2_silence_long
+  id: meowza2
+  stacks: '1'
diff --git config_190813_0233/buffs.txt config_190816_0038/buffs.txt
index 8e7041c..527af64 100644
--- config_190813_0233/buffs.txt
+++ config_190816_0038/buffs.txt
@@ -523,5 +523,56 @@
   expireOnServerLeave: 'true'
   hudColorBackground: 2C1447FF
   hudColorBar: d40009ff
   id: dungeonmod_insomniac
   stackOverflowRule: ReplaceOldest
+- dialogue:
+    onStart:
+    - speechOptions:
+      - format: conversation
+        id: meowza1_warning_belowL30
+  effects:
+  - statMod:
+      amount: '1.0'
+      math: multiply
+      name: maxHitPoints
+  expireAfter: 0:00:01
+  expireOnServerLeave: 'true'
+  hudColorBackground: '00000000'
+  hudColorBar: '00000000'
+  hudVisible: 'false'
+  id: meowza1_warning_belowL30
+  stackOverflowRule: Ignore
+- dialogue:
+    onStart:
+    - speechOptions:
+      - format: HideSpeechBubble
+        id: meowza2_silence_short
+        portrait: meowza_grinning
+  effects:
+  - statMod:
+      amount: '0.1'
+      math: multiply
+      name: maxEnergyPoints
+  expireAfter: 0:00:10
+  expireOnServerLeave: 'true'
+  hudColorBackground: 050405ff
+  hudColorBar: 48444cff
+  id: meowza2_silence_short
+  stackOverflowRule: ReplaceOldest
+- dialogue:
+    onStart:
+    - speechOptions:
+      - format: HideSpeechBubble
+        id: meowza2_silence_long
+        portrait: meowza_grinning
+  effects:
+  - statMod:
+      amount: '0.1'
+      math: multiply
+      name: maxEnergyPoints
+  expireAfter: 0:00:20
+  expireOnServerLeave: 'true'
+  hudColorBackground: 050405ff
+  hudColorBar: 48444cff
+  id: meowza2_silence_long
+  stackOverflowRule: ReplaceOldest
diff --git config_190813_0233/clouds.txt config_190816_0038/clouds.txt
index c365d43..72e8057 100644
--- config_190813_0233/clouds.txt
+++ config_190816_0038/clouds.txt
@@ -1159,155 +1159,155 @@ resistaura9:
   initialRadius: '0.1'
   isAttachedToSpawner: 'true'
   layer: HitHuman
   lifetime: '20.5'
 shieldblast0:
-  bufftime: '2'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '4'
+  effect: '2.5'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '3.25'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '3.25'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast1:
-  bufftime: '2.1'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '4.16'
+  effect: '2.564'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '3.375'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '3.375'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast10:
   bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '6.66'
+  effect: '3.333'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '4.5'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '4.5'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast2:
-  bufftime: '2.2'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '4.34'
+  effect: '2.632'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '3.5'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '3.5'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast3:
-  bufftime: '2.3'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '4.54'
+  effect: '2.703'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '3.625'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '3.625'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast4:
-  bufftime: '2.4'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '4.76'
+  effect: '2.778'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '3.75'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '3.75'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast5:
-  bufftime: '2.5'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '5'
+  effect: '2.857'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '3.875'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '3.875'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast6:
-  bufftime: '2.6'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '5.26'
+  effect: '2.941'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '4'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '4'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast7:
-  bufftime: '2.7'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '5.55'
+  effect: '3.03'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '4.125'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '4.125'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast8:
-  bufftime: '2.8'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '5.88'
+  effect: '3.125'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '4.25'
   growtime: '0'
   initialAlpha: '0.65'
   initialRadius: '4.25'
   layer: HitHuman
   lifetime: '0.5'
 shieldblast9:
-  bufftime: '2.9'
+  bufftime: '3'
   cloudPrefab: shieldBlast
   cooldown: '4'
   cost: '50'
-  effect: '6.25'
+  effect: '3.226'
   fadeoutTime: '0.1'
   finalAlpha: '0'
   finalRadius: '4.375'
   growtime: '0'
   initialAlpha: '0.65'
diff --git config_190813_0233/conversations.txt config_190816_0038/conversations.txt
index e753844..c2aa42d 100644
--- config_190813_0233/conversations.txt
+++ config_190816_0038/conversations.txt
@@ -444,10 +444,21 @@ conversations:
     pose: armships_smiling
   - text: tutorial-quests-complete_07
   id: tutorial-quests-complete
 - clientTriggerable: 'true'
   content:
+  - character: stevedore_pelican
+    pose: default
+    position: rightFlipped
+  - text: tutorial-quest-item-storage_01
+  - character: stevedore_pelican
+    pose: smiling
+    position: rightFlipped
+  - text: tutorial-quest-item-storage_02
+  id: tutorial-quest-item-storage
+- clientTriggerable: 'true'
+  content:
   - character: sergeant
     pose: shout
   - text: mewoza-new-player_01
   - character: sergeant
     pose: default_frowning
@@ -466,10 +477,33 @@ conversations:
   - text: mewoza-new-player_06
   id: meowza-new-player
 - clientTriggerable: 'true'
   content:
   - character: sergeant
+    pose: shout
+  - background: color
+    color: 2a02005f
+  - text: meowza1_warning_belowL30_01
+  - character: sergeant
+    pose: default_frowning
+  - background: color
+    color: 2a02005f
+  - text: meowza1_warning_belowL30_02
+  - character: sergeant
+    pose: armships
+  - background: color
+    color: 2a02005f
+  - text: meowza1_warning_belowL30_03
+  - character: sergeant
+    pose: armships_smiling
+  - background: color
+    color: 2a02005f
+  - text: meowza1_warning_belowL30_04
+  id: meowza1_warning_belowL30
+- clientTriggerable: 'true'
+  content:
+  - character: sergeant
     pose: armships_smiling
   - text: boss-hunt_01
   - character: sergeant
     pose: pointing
   - background: image
@@ -500,10 +534,22 @@ conversations:
   - character: sergeant
     pose: default
   - background: none
   - text: boss-hunt_07
   id: boss-hunt
+- clientTriggerable: 'true'
+  content:
+  - character: sergeant
+    pose: default
+  - text: idle-warning-recall_01
+  id: idle-warning-recall
+- clientTriggerable: 'true'
+  content:
+  - character: sergeant
+    pose: shout
+  - text: idle-warning-disconnect_01
+  id: idle-warning-disconnect
 - chatPanelVisibleAfterwards: 'true'
   clientTriggerable: 'true'
   content:
   - background: color
     color: 00000095f
diff --git config_190813_0233/global.txt config_190816_0038/global.txt
index 3f81f36..66dfcf9 100644
--- config_190813_0233/global.txt
+++ config_190816_0038/global.txt
@@ -129,10 +129,13 @@ islandGenerationSteps:
   runs: '10'
   type: GrowIntoEmptySpaces
 jamFadedOpacity: '0.5'
 jamFadingTime: '2'
 jamShowThreshold: '0.8'
+kickForCombatZoneIdleAfterSeconds: '300'
+kickForNexusIdleAfterSeconds: '600'
+kickForTutorialIdleAfterSeconds: '600'
 levelGapForWarning: '4'
 logNetwork: 'true'
 lootbagDriftTime: '8'
 lootbagLifetime: '30'
 lootbagLifetimeIfDrifting: '60'
@@ -700,10 +703,13 @@ textAndTimeChat: 'true'
 usePermadeath: 'true'
 usingWalls: 'false'
 wallStopsEnemyBullets: 'true'
 wallStopsPlayerBullets: 'true'
 wallTurnRadius: '0.5'
+warnForCombatZoneIdleNSecondsPrior: '60'
+warnForNexusIdleNSecondsPrior: '60'
+warnForTutorialIdleNSecondsPrior: '60'
 xpCollectRadius: '18'
 xpLimitForMaxLevel: '40000'
 xpTargets:
 - level: '2'
   xp: '50'
diff --git config_190813_0233/index.txt config_190816_0038/index.txt
index 92ef963..65c1b36 100644
--- config_190813_0233/index.txt
+++ config_190816_0038/index.txt
@@ -86,10 +86,11 @@
 - Quests/quests_beta
 - Quests/quests_bosses
 - Quests/quests_crafting
 - Quests/quests_daily
 - Quests/quests_escort
+- Quests/quests_island
 - Quests/quests_test
 - Quests/quests_tutorial
 - Texts/locales
 - Units/unit_chest1
 - Units/unit_chest1item
diff --git config_190813_0233/maneuvers.txt config_190816_0038/maneuvers.txt
index 5cff741..2a763b2 100644
--- config_190813_0233/maneuvers.txt
+++ config_190816_0038/maneuvers.txt
@@ -9,11 +9,11 @@
   energy: '20'
   name: bash
   secondsToVelocity1: '0.19'
   target1Speed: '10'
 - deceleration: '50'
-  energy: '15'
+  energy: '8'
   name: dash
   secondsToVelocity1: '0.13'
   target1Speed: '10'
 - cooldown: '1'
   deceleration: '50'
@@ -29,11 +29,11 @@
   target1Speed: '2.5'
 - energy: '5'
   energySustained: '0.1'
   name: strafe
   target1Speed: '1.5'
-- damageReduction: '0.85'
+- damageReduction: '0.75'
   energy: '30'
   name: tank
   scale: '2.25'
   secondsToVelocity1: '2.8'
 - acceleration: '1.25'
@@ -63,11 +63,11 @@
   name: flak
   scale: '4'
   secondsToVelocity1: '0.2'
 - cooldown: '0.25'
   distance: '2'
-  energy: '15'
+  energy: '9'
   name: teleportToTurret
   secondsToVelocity1: '0.2'
 - doesNotSpamOnKeepingPressed: 'true'
   duration: '1'
   duration2: '0.5'
@@ -87,11 +87,11 @@
   secondsToVelocity1: '0.2'
   target1Speed: '1'
   target2Speed: '5'
 - acceleration: '1.25'
   deceleration: '0.375'
-  energy: '2.5'
+  energy: '4'
   name: himmelman
   target1Speed: '1'
   target2Speed: '0'
   turnRate: '720'
 - acceleration: '2'
diff --git config_190813_0233/playerclasses.txt config_190816_0038/playerclasses.txt
index 34ef001..f097d25 100644
--- config_190813_0233/playerclasses.txt
+++ config_190816_0038/playerclasses.txt
@@ -105,11 +105,11 @@ assault:
     math: multiply
     name: bashDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_assault
   upgradeCaps:
-  - cap: '50'
+  - cap: '35'
     statName: maxHitPoints
   - cap: '40'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -356,11 +356,11 @@ daggerknight:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_daggerknight
   upgradeCaps:
-  - cap: '50'
+  - cap: '30'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -613,11 +613,11 @@ duster:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_duster
   upgradeCaps:
-  - cap: '50'
+  - cap: '35'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -777,11 +777,11 @@ engineer:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '450'
   unlockItemId: playerclass_engineer
   upgradeCaps:
-  - cap: '50'
+  - cap: '35'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -937,11 +937,11 @@ medic:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_medic
   upgradeCaps:
-  - cap: '25'
+  - cap: '26'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -1105,11 +1105,11 @@ olfaithful:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '200'
   unlockItemId: playerclass_olfaithful
   upgradeCaps:
-  - cap: '50'
+  - cap: '35'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -1266,11 +1266,11 @@ paladin:
     math: multiply
     name: energyRegenRate
   totalUpgradeCap: '400'
   unlockItemId: playerclass_paladin
   upgradeCaps:
-  - cap: '25'
+  - cap: '23'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -1429,11 +1429,11 @@ pirate:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '450'
   unlockItemId: playerclass_pirate
   upgradeCaps:
-  - cap: '50'
+  - cap: '30'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -1607,11 +1607,11 @@ rapier:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_rapier
   upgradeCaps:
-  - cap: '40'
+  - cap: '32'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -1772,11 +1772,11 @@ siegetank:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_siegetank
   upgradeCaps:
-  - cap: '50'
+  - cap: '30'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -1938,11 +1938,11 @@ support:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_support
   upgradeCaps:
-  - cap: '50'
+  - cap: '30'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -2097,11 +2097,11 @@ tank:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_hog
   upgradeCaps:
-  - cap: '50'
+  - cap: '35'
     statName: maxHitPoints
   - cap: '40'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -2256,11 +2256,11 @@ walker:
     math: multiply
     name: gunDamageMod
   totalUpgradeCap: '400'
   unlockItemId: playerclass_walker
   upgradeCaps:
-  - cap: '50'
+  - cap: '30'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
@@ -2430,11 +2430,11 @@ wizard:
     math: multiply
     name: maxTurnRate
   totalUpgradeCap: '400'
   unlockItemId: playerclass_wizard
   upgradeCaps:
-  - cap: '50'
+  - cap: '35'
     statName: maxHitPoints
   - cap: '50'
     statName: maxTurnRate
   - cap: '40'
     statName: gunDamageMod
diff --git config_190813_0233/skills.txt config_190816_0038/skills.txt
index 52bf2d6..16f3893 100644
--- config_190813_0233/skills.txt
+++ config_190816_0038/skills.txt
@@ -391,20 +391,25 @@
   label: 1-A
   maxLevel: '5'
   passives:
   - mods:
     - statMod:
-        amount: '1.4'
+        amount: '1.25'
         math: multiply
         name: gunRangeMod
     - statMod:
-        amount: '1.05'
+        amount: '1.07'
         leveling: 'true'
         math: multiply
         name: gunRangeMod
     - statMod:
-        amount: '1.35'
+        amount: '1.15'
+        math: multiply
+        name: gunDamageMod
+    - statMod:
+        amount: '1.03'
+        leveling: 'true'
         math: multiply
         name: gunDamageMod
     - statMod:
         amount: '0.5'
         math: multiply
@@ -417,11 +422,11 @@
   label: 1-B
   maxLevel: '5'
   passives:
   - mods:
     - statMod:
-        amount: '0.05'
+        amount: '0.1'
         math: multiply
         name: gunCooldownMod
     - statMod:
         amount: '0.65'
         math: multiply
@@ -441,65 +446,66 @@
   triggers:
   - actions:
     - duration: '5'
       mods:
       - statMod:
-          amount: '1.25'
+          amount: '1.2'
           math: multiply
           name: gunRangeMod
       - statMod:
-          amount: '1.02'
+          amount: '1.03'
           leveling: 'true'
           math: multiply
           name: gunRangeMod
       - statMod:
-          amount: '0.0'
+          amount: '0.1'
           math: multiply
           name: energyRegenRate
       - effectIcon: effecticon_rangeboost
     trigger: OnKill
 - conditions:
   - itemTag: strike
   cost: '2'
   icon: skillicon_strike
   id: strike_2b
   label: 2-B
   maxLevel: '5'
-  triggers:
-  - actions:
-    - duration: '3'
-      mods:
-      - statMod:
-          amount: '0.8'
-          math: postAdd
-          name: energyRegenRate
-      - statMod:
-          amount: '1.05'
-          leveling: 'true'
-          math: multiply
-          name: energyRegenRate
-      - statMod:
-          amount: '1.2'
-          math: multiply
-          name: damageReceivedMod
-      - effectIcon: effecticon_steamboost
-    trigger: OnKill
+  passives:
+  - mods:
+    - statMod:
+        amount: '1.04'
+        math: multiply
+        name: maxTurnRate
+    - statMod:
+        amount: '1.02'
+        leveling: 'true'
+        math: multiply
+        name: maxTurnRate
+    - statMod:
+        amount: '1.05'
+        math: multiply
+        name: superspeedFactor
+    - statMod:
+        amount: '1.03'
+        leveling: 'true'
+        math: multiply
+        name: superspeedFactor
 - conditions:
   - itemTag: strike
   cost: '3'
   icon: skillicon_strike
   id: strike_3a
   label: 3-A
   maxLevel: '5'
   passives:
   - mods:
     - statMod:
-        amount: '1.65'
+        amount: '1.5'
         math: multiply
         name: gunAmmoMod
     - statMod:
-        amount: '1.15'
+        amount: '1.16'
         leveling: 'true'
         math: multiply
         name: gunAmmoMod
     - effectIcon: effecticon_ammoboost
     volatileConditions:
@@ -512,11 +518,11 @@
   label: 3-B
   maxLevel: '5'
   passives:
   - mods:
     - statMod:
-        amount: '1.3'
+        amount: '1.25'
         math: multiply
         name: gunRangeMod
     - statMod:
         amount: '1.05'
         leveling: 'true'
@@ -576,11 +582,11 @@
           burst: '1'
           cooldown: '0'
           damage: '0.01'
           effect: Slow
           effectAmount: '0.4'
-          effectDamage: '0.01'
+          effectDamage: '1'
           effectTime: '0.5'
           guaranteedHitArcA: '-30'
           guaranteedHitArcB: '30'
           guaranteedHitMaxRange: '6.75'
           guaranteedHitMinRange: '4.2'
@@ -628,10 +634,14 @@
     - cooldown: '1'
       duration: '3'
       mods:
       - statMod:
           amount: '0.3'
+          math: postAdd
+          name: energyRegenRate
+      - statMod:
+          amount: '0.3'
           leveling: 'true'
           math: postAdd
           name: energyRegenRate
       - effectIcon: effecticon_steamboost
     trigger: OnManeuverStart
@@ -648,20 +658,20 @@
       - flashOffset: '0.4'
         gunTypeConfig:
           bulletHue: purple
           bulletPalette: ringing_white
           bulletPrefab: leisurelyBullet
-          bulletSize: '0.5'
+          bulletSize: '0.75'
           burst: '1'
           cooldown: '1000000000'
           damage: '0.1'
           effect: Slow
           effectAmount: '0.7'
           effectDamage: '11'
           effectTime: '3'
           lifetime: '0.35'
-          multi: '9'
+          multi: '10'
           multiSpread: '40'
           rof: '1'
           speed: '20.0'
           spread: '0'
         mountAngle: '0'
@@ -1196,22 +1206,22 @@
   id: machinegun_3a
   label: 3-A
   maxLevel: '1'
   triggers:
   - actions:
-    - health: '3'
+    - health: '2'
     trigger: OnKill
 - conditions:
   - itemTag: machinegun
   cost: '8'
   icon: skillicon_machinegun
   id: machinegun_3b
   label: 3-B
   maxLevel: '1'
   triggers:
   - actions:
-    - Energy: '3.0'
+    - Energy: '2'
     trigger: OnKill
 - conditions:
   - itemTag: machinegun
   cost: '3'
   icon: skillicon_machinegun
@@ -1252,12 +1262,10 @@
     - statMod:
         amount: '1.05'
         math: multiply
         name: cameraZoomMod
     - effectIcon: effecticon_speedboost
-    volatileConditions:
-    - nearbyPlayersAboveOrEq: '3'
 - conditions:
   - itemTag: shotgun
   cost: '2'
   icon: skillicon_shotgun
   id: shotgun_1a
@@ -3462,11 +3470,11 @@
   label: 3-B
   maxLevel: '5'
   triggers:
   - actions:
     - cooldown: '3'
-      duration: '1.5'
+      duration: '2'
       mods:
       - statMod:
           amount: '1.2'
           math: multiply
           name: gunDamageMod
@@ -4343,19 +4351,19 @@
     - statMod:
         amount: '2.0'
         math: multiply
         name: gunDamageMod
     - statMod:
-        amount: '1.2'
+        amount: '1.15'
         math: multiply
         name: damageReceivedMod
     - effectIcon: effecticon_damageboost
     volatileConditions:
     - superspeed: 'true'
   - mods:
     - statMod:
-        amount: '0.75'
+        amount: '0.8'
         math: multiply
         name: gunDamageMod
     volatileConditions:
     - superspeed: 'false'
 - conditions:
diff --git config_190813_0233/territories.txt config_190816_0038/territories.txt
index dbb12d5..efa7044 100644
--- config_190813_0233/territories.txt
+++ config_190816_0038/territories.txt
@@ -557,17 +557,10 @@
     minElevation: '0'
     name: highmountains
     secondsPerStandardEnemyIn10x10: '30'
     sortOrder: '1'
     tier: '8'
-  - maxBossEnemies: '100'
-    maxElevation: '9'
-    minElevation: '0'
-    name: highmountains_outskirt
-    secondsPerStandardEnemyIn10x10: '30'
-    sortOrder: '1'
-    tier: '8'
   - maxBossEnemies: '0'
     maxElevation: '1000'
     minElevation: '1000'
     name: highlandsboss
     secondsPerStandardEnemyIn10x10: '0'
diff --git config_190813_0233/unitPaletteTextures.txt config_190816_0038/unitPaletteTextures.txt
index 5f389b5..830a6ae 100644
--- config_190813_0233/unitPaletteTextures.txt
+++ config_190816_0038/unitPaletteTextures.txt
@@ -173,10 +173,11 @@ EnemySecretPoliceLeaderPrefab: enemyPal_highmountain
 EnemySecretPoliceMine: enemyPal_highmountain
 EnemySecretPoliceMissile: enemyPal_highmountain
 EnemySecretPolicePrefab: enemyPal_highmountain
 EnemySentinel: enemyPal_spaceDungeon
 EnemySentinelB: enemyPal_spaceDungeon
+EnemySentinelC: enemyPal_spaceDungeon
 EnemySentinelLaser: enemyPal_highmountain
 EnemySentinelWatcher: enemyPal_highmountain
 EnemySisterBomber: enemyPal_highlands1
 EnemySkull: enemyPal_midlands2
 EnemySlaveDriver: enemyPal_mountain
diff --git config_190813_0233/unlocks.txt config_190816_0038/unlocks.txt
index 51a7cff..8914fc9 100644
--- config_190813_0233/unlocks.txt
+++ config_190816_0038/unlocks.txt
@@ -13,25 +13,22 @@
 - classToUnlock: support
   conditions:
   - amount: '15'
     classname: walker
     type: classLevelGreater
-  - amount: '5'
-    classname: paladin
-    type: classLevelGreater
   skillTreeIcon: skillicon_shieldmaiden
   skillTreeRelevantRank: '7'
 - classToUnlock: olfaithful
   conditions:
   - amount: '15'
     classname: paladin
     type: classLevelGreater
   skillTreeIcon: skillicon_oldfaithful
   skillTreeRelevantRank: '8'
 - classToUnlock: medic
   conditions:
-  - amount: '5'
+  - amount: '10'
     classname: olfaithful
     type: classLevelGreater
   skillTreeIcon: skillicon_medic
   skillTreeRelevantRank: '13'
 - classToUnlock: daggerknight
@@ -58,13 +55,10 @@
 - classToUnlock: pirate
   conditions:
   - amount: '20'
     classname: daggerknight
     type: classLevelGreater
-  - amount: '15'
-    classname: tank
-    type: classLevelGreater
   skillTreeIcon: skillicon_bandit
   skillTreeRelevantRank: '21'
 - classToUnlock: wizard
   conditions:
   - amount: '20'
@@ -75,13 +69,10 @@
 - classToUnlock: engineer
   conditions:
   - amount: '20'
     classname: tank
     type: classLevelGreater
-  - amount: '15'
-    classname: assault
-    type: classLevelGreater
   skillTreeIcon: skillicon_engineer
   skillTreeRelevantRank: '25'
 - classToUnlock: siegetank
   conditions:
   - amount: '20'